fix missing initialization in NTLM code
... causing test 906 to fail
This commit is contained in:
parent
b98b240818
commit
787e73101d
44
0002-curl-7.33.0-86c64f3d.patch
Normal file
44
0002-curl-7.33.0-86c64f3d.patch
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
From 8002bea97bdea4fcade466de2b88172ba03d5259 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Kamil Dudka <kdudka@redhat.com>
|
||||||
|
Date: Fri, 18 Oct 2013 15:37:18 +0200
|
||||||
|
Subject: [PATCH] curl_sasl: initialize NSS before using crypto
|
||||||
|
|
||||||
|
[upstream commit 86c64f3daf0079e96f4694b10fe1bc53944110fc]
|
||||||
|
---
|
||||||
|
lib/curl_sasl.c | 13 ++++++++++++-
|
||||||
|
1 files changed, 12 insertions(+), 1 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/lib/curl_sasl.c b/lib/curl_sasl.c
|
||||||
|
index b3ffc66..9a0bc0f 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,
|
||||||
|
--
|
||||||
|
1.7.1
|
||||||
|
|
@ -10,6 +10,9 @@ Source2: curlbuild.h
|
|||||||
# test906: Fixed failing test on some platforms
|
# test906: Fixed failing test on some platforms
|
||||||
Patch1: 0001-curl-7.33.0-4d49ffe1.patch
|
Patch1: 0001-curl-7.33.0-4d49ffe1.patch
|
||||||
|
|
||||||
|
# fix missing initialization in NTLM code causing test 906 to fail
|
||||||
|
Patch2: 0002-curl-7.33.0-86c64f3d.patch
|
||||||
|
|
||||||
# patch making libcurl multilib ready
|
# patch making libcurl multilib ready
|
||||||
Patch101: 0101-curl-7.32.0-multilib.patch
|
Patch101: 0101-curl-7.32.0-multilib.patch
|
||||||
|
|
||||||
@ -108,6 +111,7 @@ documentation of the library, too.
|
|||||||
|
|
||||||
# upstream patches
|
# upstream patches
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
|
%patch2 -p1
|
||||||
|
|
||||||
# Fedora patches
|
# Fedora patches
|
||||||
%patch101 -p1
|
%patch101 -p1
|
||||||
@ -228,6 +232,7 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%changelog
|
%changelog
|
||||||
* Mon Oct 14 2013 Kamil Dudka <kdudka@redhat.com> 7.33.0-1
|
* Mon Oct 14 2013 Kamil Dudka <kdudka@redhat.com> 7.33.0-1
|
||||||
- new upstream release
|
- new upstream release
|
||||||
|
- fix missing initialization in NTLM code causing test 906 to fail
|
||||||
|
|
||||||
* Fri Oct 11 2013 Kamil Dudka <kdudka@redhat.com> 7.32.0-3
|
* Fri Oct 11 2013 Kamil Dudka <kdudka@redhat.com> 7.32.0-3
|
||||||
- do not limit the speed of SCP upload on a fast connection
|
- do not limit the speed of SCP upload on a fast connection
|
||||||
|
Loading…
Reference in New Issue
Block a user