[voms/el5] Clean up SHA2 patch

[Mattias Ellert]

commit fbbd4b8409acaca43830b36c2aef678a4aaf7c06
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Thu Jun 26 23:17:43 2014 +0200

    Clean up SHA2 patch

 voms-sha2-proxy.patch |   38 +++++++++++++++++---------------------
 voms.spec             |    5 ++++-
 2 files changed, 21 insertions(+), 22 deletions(-)
---
diff --git a/voms-sha2-proxy.patch b/voms-sha2-proxy.patch
index 9fc42fd..e4e87d1 100644
--- a/voms-sha2-proxy.patch
+++ b/voms-sha2-proxy.patch
@@ -1,20 +1,26 @@
---- voms-2_0_11/src/sslutils/sslutils.c.orig	2014-05-08 08:03:33.461316510 -0500
-+++ voms-2_0_11/src/sslutils/sslutils.c	2014-05-08 08:03:44.134314804 -0500
-@@ -893,7 +893,8 @@
+diff --git a/src/sslutils/sslutils.c b/src/sslutils/sslutils.c
+index dca69d9..b094a76 100644
+--- a/src/sslutils/sslutils.c
++++ b/src/sslutils/sslutils.c
+@@ -892,21 +892,22 @@ proxy_sign(
+ 
      unsigned char                       md[SHA_DIGEST_LENGTH];
      unsigned int                        len;
-     EVP_MD* sig_algo; 
+-    EVP_MD* sig_algo; 
 -    
++    EVP_MD*                             sig_algo;
 +
-+    OpenSSL_add_all_digests();
      sig_algo = EVP_get_digestbyobj(req->sig_alg->algorithm);
      if (sig_algo == NULL) sig_algo = EVP_sha1();
  
-@@ -904,10 +904,11 @@
+-
+     if(proxyver>=3) {
+       long sub_hash;
++      EVP_MD* cn_sig_algo;
  
++      cn_sig_algo = EVP_sha1();
        user_public_key = X509_get_pubkey(user_cert);
  
-+      EVP_MD* cn_sig_algo = EVP_sha1();
  #ifdef TYPEDEF_I2D_OF
 -      ASN1_digest((i2d_of_void*)i2d_PUBKEY, sig_algo, (char *) user_public_key, md, &len);
 +      ASN1_digest((i2d_of_void*)i2d_PUBKEY, cn_sig_algo, (char *) user_public_key, md, &len);
@@ -24,23 +30,13 @@
  #endif
        EVP_PKEY_free(user_public_key);
  
-@@ -1042,7 +1043,6 @@
+@@ -1041,8 +1042,7 @@ proxy_sign_ext(
      unsigned int                        len;
      EVP_MD*                             sig_algo;
  
 -    sig_algo = EVP_get_digestbyobj(req->sig_alg->algorithm);
-     if (sig_algo == NULL) sig_algo = EVP_sha1();
+-    if (sig_algo == NULL) sig_algo = EVP_sha1();
++    sig_algo = EVP_sha1();
  
      if (!selfsigned)
-@@ -1118,9 +1118,9 @@
-           
-       new_public_key = X509_REQ_get_pubkey(req);
- #ifdef TYPEDEF_I2D_OF
--      ASN1_digest((i2d_of_void*)i2d_PUBKEY, sig_algo, (char *) new_public_key, md, &len);
-+      ASN1_digest((i2d_of_void*)i2d_PUBKEY, EVP_sha1(), (char *) new_public_key, md, &len);
- #else
--      ASN1_digest(i2d_PUBKEY, sig_algo, (char *) new_public_key, md, &len);
-+      ASN1_digest(i2d_PUBKEY, EVP_sha1(), (char *) new_public_key, md, &len);
- #endif
-       EVP_PKEY_free(new_public_key);
-       new_public_key = NULL;
+       user_cert_info = user_cert->cert_info;
diff --git a/voms.spec b/voms.spec
index 588dce8..581f8bc 100644
--- a/voms.spec
+++ b/voms.spec
@@ -5,7 +5,7 @@
 Name:		voms
 Version:	2.0.11
 %global tagver %(tr . _ <<< %{version})
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Virtual Organization Membership Service
 
 Group:		System Environment/Libraries
@@ -270,6 +270,9 @@ fi
 %doc README.Fedora
 
 %changelog
+* Thu Jun 26 2014 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.0.11-6
+- Clean up SHA2 patch
+
 * Thu Jun 26 2014 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.0.11-5
 - Fix compilation problems when strndup is already defined