Commit 86c64f3d authored by Kamil Dudka's avatar Kamil Dudka
Browse files

curl_sasl: initialize NSS before using crypto

parent 65e556d0

RELEASE-NOTES

+2 −2
Original line number Original line Diff line number Diff line
@@ -13,7 +13,7 @@ This release includes the following changes: 




This release includes the following bugfixes:

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:

This release includes the following known bugs:

lib/curl_sasl.c

+12 −1
Original line number Original line Diff line number Diff line
@@ -40,6 +40,10 @@ 
#include "warnless.h"

#include "warnless.h"

#include "curl_memory.h"

#include "curl_memory.h"





#ifdef USE_NSS

#include "nssg.h" /* for Curl_nss_force_init() */

#endif



#define _MPRINTF_REPLACE /* use our functions only */

#define _MPRINTF_REPLACE /* use our functions only */

#include <curl/mprintf.h>

#include <curl/mprintf.h>
@@ -468,7 +472,14 @@ CURLcode Curl_sasl_create_ntlm_type3_message(struct SessionHandle *data, 
                                             struct ntlmdata *ntlm,

                                             struct ntlmdata *ntlm,

                                             char **outptr, size_t *outlen)

                                             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)

  if(!result)

    result = Curl_ntlm_create_type3_message(data, userp, passwdp, ntlm,

    result = Curl_ntlm_create_type3_message(data, userp, passwdp, ntlm,