From 253b750304b919e3a1496d7df9c89fee36d665b4 Mon Sep 17 00:00:00 2001 From: Andrew McNab Date: Wed, 12 Oct 2005 12:20:59 +0000 Subject: [PATCH] Older OpenSSL fix --- org.gridsite.core/CHANGES | 5 +++++ org.gridsite.core/VERSION | 2 +- org.gridsite.core/project/version.properties | 2 +- org.gridsite.core/src/grst_x509.c | 4 +++- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/org.gridsite.core/CHANGES b/org.gridsite.core/CHANGES index 50989db..aa0ac3a 100644 --- a/org.gridsite.core/CHANGES +++ b/org.gridsite.core/CHANGES @@ -1,3 +1,8 @@ +* Wed Oct 12 2005 Andrew McNab +- Fix for older OpenSSL to grst_x509.c from + Zoltan.Farkas +* Wed Oct 12 2005 Andrew McNab +- ==== GridSite version 1.1.14 ==== * Tue Oct 11 2005 Andrew McNab - Modify VOMS AC parsing to handle multiple ACs inside the same X.509 AC extension. diff --git a/org.gridsite.core/VERSION b/org.gridsite.core/VERSION index e138811..ed036b5 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.13 +PATCH_VERSION=1.1.14 VERSION=$(PATCH_VERSION) diff --git a/org.gridsite.core/project/version.properties b/org.gridsite.core/project/version.properties index 18e2e4a..55c7065 100644 --- a/org.gridsite.core/project/version.properties +++ b/org.gridsite.core/project/version.properties @@ -1,2 +1,2 @@ -module.version=1.1.13 +module.version=1.1.14 module.age=1 diff --git a/org.gridsite.core/src/grst_x509.c b/org.gridsite.core/src/grst_x509.c index a1312f4..4bbdc04 100644 --- a/org.gridsite.core/src/grst_x509.c +++ b/org.gridsite.core/src/grst_x509.c @@ -441,6 +441,8 @@ static int GRSTx509VerifyVomsSig(time_t *time1_time, time_t *time2_time, #if OPENSSL_VERSION_NUMBER >= 0x0090701fL EVP_MD_CTX_init(&ctx); EVP_VerifyInit_ex(&ctx, EVP_md5(), NULL); +#else + EVP_VerifyInit(&ctx, EVP_md5()); #endif EVP_VerifyUpdate(&ctx, @@ -456,7 +458,7 @@ static int GRSTx509VerifyVomsSig(time_t *time1_time, time_t *time2_time, #if OPENSSL_VERSION_NUMBER >= 0x0090701fL EVP_MD_CTX_cleanup(&ctx); -#endif +#endif EVP_PKEY_free(prvkey); if (ret != 1) /* signature doesnt match, look for more */ -- 1.8.2.3