curl_sasl: initialize NSS before using crypto

This commit is contained in:
Kamil Dudka 2013-10-18 15:37:18 +02:00
parent 65e556d0ce
commit 86c64f3daf
2 changed files with 14 additions and 3 deletions

View File

@ -13,7 +13,7 @@ This release includes the following changes:
This release includes the following bugfixes:
o
o nss: missing initialization in NTLM code causing test 906 to fail
This release includes the following known bugs:
@ -28,4 +28,4 @@ advice from friends like these:
References to bug reports and discussions on issues:

View File

@ -40,6 +40,10 @@
#include "warnless.h"
#include "curl_memory.h"
#ifdef USE_NSS
#include "nssg.h" /* for Curl_nss_force_init() */
#endif
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
@ -468,7 +472,14 @@ CURLcode Curl_sasl_create_ntlm_type3_message(struct SessionHandle *data,
struct ntlmdata *ntlm,
char **outptr, size_t *outlen)
{
CURLcode result = Curl_ntlm_decode_type2_message(data, header, ntlm);
CURLcode result;
#ifdef USE_NSS
/* make sure the crypto backend is initialized */
result = Curl_nss_force_init(data);
if(result)
return result;
#endif
result = Curl_ntlm_decode_type2_message(data, header, ntlm);
if(!result)
result = Curl_ntlm_create_type3_message(data, userp, passwdp, ntlm,