OLD | NEW |
(Empty) | |
| 1 diff --git a/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpcertstore.c b/nss/li
b/libpkix/pkix_pl_nss/module/pkix_pl_httpcertstore.c |
| 2 index 30aefb8..ac814cd 100755 |
| 3 --- a/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpcertstore.c |
| 4 +++ b/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpcertstore.c |
| 5 @@ -201,7 +201,10 @@ certCallback(void *arg, SECItem **secitemCerts, int numcert
s) |
| 6 |
| 7 typedef SECStatus (*pkix_DecodeCertsFunc)(char *certbuf, int certlen, |
| 8 CERTImportCertificateFunc f, void *ar
g); |
| 9 - |
| 10 +#ifdef NSS_STATIC |
| 11 +extern SECStatus CERT_DecodeCertPackage(char* certbuf, int certlen, |
| 12 + CERTImportCertificateFunc f, void* arg)
; |
| 13 +#endif |
| 14 |
| 15 struct pkix_DecodeFuncStr { |
| 16 pkix_DecodeCertsFunc func; /* function pointer to the |
| 17 @@ -223,6 +226,11 @@ static const PRCallOnceType pkix_pristine; |
| 18 */ |
| 19 static PRStatus PR_CALLBACK pkix_getDecodeFunction(void) |
| 20 { |
| 21 +#ifdef NSS_STATIC |
| 22 + pkix_decodeFunc.smimeLib = NULL; |
| 23 + pkix_decodeFunc.func = CERT_DecodeCertPackage; |
| 24 + return PR_SUCCESS; |
| 25 +#else |
| 26 pkix_decodeFunc.smimeLib = |
| 27 PR_LoadLibrary(SHLIB_PREFIX"smime3."SHLIB_SUFFIX); |
| 28 if (pkix_decodeFunc.smimeLib == NULL) { |
| 29 @@ -235,7 +243,7 @@ static PRStatus PR_CALLBACK pkix_getDecodeFunction(void) |
| 30 return PR_FAILURE; |
| 31 } |
| 32 return PR_SUCCESS; |
| 33 - |
| 34 +#endif |
| 35 } |
| 36 |
| 37 /* |
OLD | NEW |