aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Dudka <kdudka@redhat.com>2013-10-18 15:37:18 +0200
committerKamil Dudka <kdudka@redhat.com>2013-10-18 15:37:18 +0200
commit86c64f3daf0079e96f4694b10fe1bc53944110fc (patch)
tree552bef57cc387d5fef50d5f38633b5c41d3db8af
parent65e556d0ce1d788ce5649145b44cad836114dca8 (diff)
curl_sasl: initialize NSS before using crypto
-rw-r--r--RELEASE-NOTES4
-rw-r--r--lib/curl_sasl.c13
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 <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,