From: Andrew McNab <andrew.mcnab@manchester.ac.uk>
Date: Tue, 8 Feb 2005 11:06:02 +0000 (+0000)
Subject: Bug #6357
X-Git-Tag: gridsite-core_R_1_1_5~43
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=823cc2a26e67e13a3a5d45088858c4d7165cb5f2;p=jra1mw.git

Bug #6357
---

diff --git a/org.gridsite.core/src/grst_x509.c b/org.gridsite.core/src/grst_x509.c
index 8c22381..75376dc 100644
--- a/org.gridsite.core/src/grst_x509.c
+++ b/org.gridsite.core/src/grst_x509.c
@@ -1445,10 +1445,6 @@ char *GRSTx509MakeProxyFileName(char *delegation_id,
     }
 
   EVP_DigestInit(&ctx, m);
-  EVP_DigestUpdate(&ctx, der_name, der_name_len);
-  EVP_DigestFinal(&ctx, hash_name, &hash_name_len);
-
-  EVP_DigestInit(&ctx, m);
   EVP_DigestUpdate(&ctx, delegation_id, strlen(delegation_id));
   EVP_DigestFinal(&ctx, hash_delegation_id, &delegation_id_len);
 
@@ -1460,6 +1456,10 @@ char *GRSTx509MakeProxyFileName(char *delegation_id,
    
   filename[16] = '-';
   
+  EVP_DigestInit(&ctx, m);
+  EVP_DigestUpdate(&ctx, der_name, der_name_len);
+  EVP_DigestFinal(&ctx, hash_name, &hash_name_len);
+
   for (i=0; i <=7; ++i)
    sprintf(&filename[17 + i*2], "%02x", hash_name[i]);