From: Andrew McNab <andrew.mcnab@manchester.ac.uk>
Date: Mon, 25 Apr 2005 09:40:28 +0000 (+0000)
Subject: Try pre-0.9.7 fix for Globus compatibility
X-Git-Tag: gridsite-core_R_1_1_8~1
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=b57975e068eb19743c60d72ddb93739862fdddc9;p=jra1mw.git

Try pre-0.9.7 fix for Globus compatibility
---

diff --git a/org.gridsite.core/CHANGES b/org.gridsite.core/CHANGES
index 4cc687c..bf6495c 100644
--- a/org.gridsite.core/CHANGES
+++ b/org.gridsite.core/CHANGES
@@ -1,3 +1,8 @@
+* Mon Apr 25 2005 Andrew McNab <Andrew.McNab@man.ac.uk>
+- Avoid build problems when using pre-0.9.7 OpenSSL
+  (ie with Globus compatibility.)
+* Mon Apr 25 2005 Andrew McNab <Andrew.McNab@man.ac.uk>
+- ==== GridSite version 1.1.8 ====
 * Mon Feb 28 2005 Andrew McNab <Andrew.McNab@man.ac.uk>
 - Fix to GRSTgaclUndenyPerm in gridsite.h (bug #7135)
   from Marco Sottilaro <marco.sottilaro@datamat.it>
diff --git a/org.gridsite.core/VERSION b/org.gridsite.core/VERSION
index d6bccc5..1b84e6f 100644
--- a/org.gridsite.core/VERSION
+++ b/org.gridsite.core/VERSION
@@ -1,4 +1,4 @@
 MAJOR_VERSION=1
 MINOR_VERSION=1.1
-PATCH_VERSION=1.1.7
+PATCH_VERSION=1.1.8
 VERSION=$(PATCH_VERSION)
diff --git a/org.gridsite.core/project/version.properties b/org.gridsite.core/project/version.properties
index 5290b42..5711198 100644
--- a/org.gridsite.core/project/version.properties
+++ b/org.gridsite.core/project/version.properties
@@ -1,2 +1,2 @@
-module.version=1.1.7
+module.version=1.1.8
 module.age=1
diff --git a/org.gridsite.core/src/grst_asn1.c b/org.gridsite.core/src/grst_asn1.c
index 2d4c657..e47c143 100644
--- a/org.gridsite.core/src/grst_asn1.c
+++ b/org.gridsite.core/src/grst_asn1.c
@@ -71,7 +71,9 @@ static int asn1_print_info(BIO *bp, int tag, int xclass, int constructed,
 	else
 		p="prim: ";
 	if (BIO_write(bp,p,6) < 6) goto err;
+#if OPENSSL_VERSION_NUMBER >= 0x0090701fL
 	BIO_indent(bp,indent,128);
+#endif
 
 	p=str;
 	if ((xclass & V_ASN1_PRIVATE) == V_ASN1_PRIVATE)
diff --git a/org.gridsite.core/src/grst_x509.c b/org.gridsite.core/src/grst_x509.c
index 37cb8a9..ec2b385 100644
--- a/org.gridsite.core/src/grst_x509.c
+++ b/org.gridsite.core/src/grst_x509.c
@@ -430,8 +430,10 @@ static int GRSTx509VerifyVomsSig(time_t *time1_time, time_t *time2_time,
             }
             
           OpenSSL_add_all_digests();
+#if OPENSSL_VERSION_NUMBER >= 0x0090701fL
           EVP_MD_CTX_init(&ctx);
           EVP_VerifyInit_ex(&ctx, EVP_md5(), NULL);
+#endif
           
           EVP_VerifyUpdate(&ctx, 
                            &asn1string[taglist[iinfo].start+
@@ -444,7 +446,9 @@ static int GRSTx509VerifyVomsSig(time_t *time1_time, time_t *time2_time,
                                 taglist[isig].length - 1, 
                                 prvkey);
 
-          EVP_MD_CTX_cleanup(&ctx);                      
+#if OPENSSL_VERSION_NUMBER >= 0x0090701fL
+          EVP_MD_CTX_cleanup(&ctx);      
+#endif                
           EVP_PKEY_free(prvkey);
 
           if (ret != 1) /* signature doesnt match, look for more */