generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tool_metalink: do not use HAVE_NSS_INITCONTEXT

Browse Source 
... no longer provided by the configure script
This commit is contained in:
Kamil Dudka 2013-12-02 17:00:35 +01:00
parent e221b55f67
commit ff9b66a8d4
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/tool_metalink.c
View File

@ -54,9 +54,7 @@
# define MD5_CTX void * # define MD5_CTX void *
# define SHA_CTX void * # define SHA_CTX void *
# define SHA256_CTX void * # define SHA256_CTX void *
# ifdef HAVE_NSS_INITCONTEXT static NSSInitContext *nss_context;
static NSSInitContext *nss_context;
# endif
#elif (defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && \ #elif (defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && \
(__MAC_OS_X_VERSION_MAX_ALLOWED >= 1040)) || \ (__MAC_OS_X_VERSION_MAX_ALLOWED >= 1040)) || \
(defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && \ (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && \
@ -240,7 +238,6 @@ static int nss_hash_init(void **pctx, SECOidTag hash_alg)
PK11Context *ctx; PK11Context *ctx;
/* we have to initialize NSS if not initialized alraedy */ /* we have to initialize NSS if not initialized alraedy */
#ifdef HAVE_NSS_INITCONTEXT
if(!NSS_IsInitialized() && !nss_context) { if(!NSS_IsInitialized() && !nss_context) {
static NSSInitParameters params; static NSSInitParameters params;
params.length = sizeof params; params.length = sizeof params;
@ -248,7 +245,6 @@ static int nss_hash_init(void **pctx, SECOidTag hash_alg)
| NSS_INIT_NOCERTDB | NSS_INIT_NOMODDB | NSS_INIT_FORCEOPEN | NSS_INIT_NOCERTDB | NSS_INIT_NOMODDB | NSS_INIT_FORCEOPEN
| NSS_INIT_NOROOTINIT | NSS_INIT_OPTIMIZESPACE | NSS_INIT_PK11RELOAD); | NSS_INIT_NOROOTINIT | NSS_INIT_OPTIMIZESPACE | NSS_INIT_PK11RELOAD);
} }
#endif
ctx = PK11_CreateDigestContext(hash_alg); ctx = PK11_CreateDigestContext(hash_alg);
if(!ctx) if(!ctx)
@ -894,7 +890,7 @@ void clean_metalink(struct Configurable *config)
void metalink_cleanup(void) void metalink_cleanup(void)
{ {
#if defined(USE_NSS) && defined(HAVE_NSS_INITCONTEXT) #ifdef USE_NSS
if(nss_context) { if(nss_context) {
NSS_ShutdownContext(nss_context); NSS_ShutdownContext(nss_context);
nss_context = NULL; nss_context = NULL;