From 86c64f3daf0079e96f4694b10fe1bc53944110fc Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Fri, 18 Oct 2013 15:37:18 +0200 Subject: curl_sasl: initialize NSS before using crypto --- RELEASE-NOTES | 4 ++-- lib/curl_sasl.c | 13 ++++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index c884bba66..157b148af 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -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: - \ No newline at end of file + diff --git a/lib/curl_sasl.c b/lib/curl_sasl.c index b3ffc6615..9a0bc0fa8 100644 --- a/lib/curl_sasl.c +++ b/lib/curl_sasl.c @@ -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 @@ -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, -- cgit v1.2.3