From: Marcel Poul <marcel.poul@cern.ch>
Date: Thu, 21 Feb 2013 15:52:16 +0000 (+0000)
Subject: Cache proxy private key in separete files for each delegation ID, (savannah bug ... 
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=238f0f1b05bb7f831c62865a2b7fe58d13345341;p=jra1mw.git

Cache proxy private key in separete files for each delegation ID, (savannah bug #94843).
---

diff --git a/org.gridsite.core/interface/gridsite.h b/org.gridsite.core/interface/gridsite.h
index ccdb943..7e1b9d4 100644
--- a/org.gridsite.core/interface/gridsite.h
+++ b/org.gridsite.core/interface/gridsite.h
@@ -208,6 +208,9 @@ typedef struct { GRSTx509Cert *firstcert; } GRSTx509Chain;
 #ifndef GRST_NO_OPENSSL
 int GRSTx509CertLoad(GRSTx509Cert *, X509 *);
 int GRSTx509ChainLoadCheck(GRSTx509Chain **, STACK_OF(X509) *, X509 *, char *, char *);
+/* For mod_gridsite.so only */
+int GRSTx509ChainLoad(GRSTx509Chain **, STACK_OF(X509) *,
+ X509 *, char *, char *);
 #endif
 int GRSTx509ChainFree(GRSTx509Chain *);
 
@@ -403,7 +406,9 @@ int GRSTx509CompactCreds(int *, int, size_t, char *, STACK_OF(X509) *, char *, X
 char *GRSTx509CachedProxyFind(char *, char *, char *);
 char *GRSTx509FindProxyFileName(void);
 int GRSTx509MakeProxyCert(char **, FILE *, char *, char *, char *, int);
-char *GRSTx509CachedProxyKeyFind(char *, char *, char *);
+#ifndef GRST_NO_OPENSSL
+char *GRSTx509CachedProxyKeyFind(char *, char *, char *, STACK_OF(X509) *);
+#endif 
 int GRSTx509ProxyDestroy(char *, char *, char *);
 int GRSTx509ProxyGetTimes(char *, char *, char *, time_t *, time_t *);
 int GRSTx509CreateProxyRequest(char **, char **, char *);