moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-08-13 17:03:50 -04:00
Code Issues Releases Wiki Activity

ntlm: Moved NSS initialisation to base decode function

Browse Source
This commit is contained in:
Steve Holme 2014-11-23 15:58:24 +00:00
parent 8ed2420dbb
commit 33be9e29be
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/curl_ntlm_msgs.c
View File

@ -45,6 +45,10 @@
#include "vtls/vtls.h"
#ifdef USE_NSS
#include "vtls/nssg.h" /* for Curl_nss_force_init() */
#endif
#define BUILDING_CURL_NTLM_MSGS_C
#include "curl_ntlm_msgs.h"
#include "curl_sasl.h"
@ -271,7 +275,12 @@ CURLcode Curl_ntlm_decode_type2_message(struct SessionHandle *data,
unsigned char *type2 = NULL;
size_t type2_len = 0;
#if defined(CURL_DISABLE_VERBOSE_STRINGS)
#if defined(USE_NSS)
/* Make sure the crypto backend is initialized */
result = Curl_nss_force_init(data);
if(result)
return result;
#elif defined(CURL_DISABLE_VERBOSE_STRINGS)
(void)data;
#endif

13
lib/curl_sasl.c
View File

@ -45,10 +45,6 @@
#include "rawstr.h"
#include "non-ascii.h" /* included for Curl_convert_... prototypes */
#ifdef USE_NSS
#include "vtls/nssg.h" /* for Curl_nss_force_init() */
#endif
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
@ -1139,15 +1135,6 @@ CURLcode Curl_sasl_decode_ntlm_type2_message(struct SessionHandle *data,
const char *type2msg,
struct ntlmdata *ntlm)
{
#ifdef USE_NSS
CURLcode result;
/* make sure the crypto backend is initialized */
result = Curl_nss_force_init(data);
if(result)
return result;
#endif
return Curl_ntlm_decode_type2_message(data, type2msg, ntlm);
}