52 lines
1.5 KiB
Diff
52 lines
1.5 KiB
Diff
commit bc7f1f33808ca9dcaea658b79c8a0fffd949612a
|
|
Author: w00513647 <wangshuangtao2@huawei.com>
|
|
Date: Mon Mar 15 17:18:16 2021 +0800
|
|
|
|
[Huawei] Adapt openssl 1.1.1
|
|
|
|
Offering: GaussDB Kernel
|
|
|
|
Adapt openssl 1.1.1
|
|
|
|
Signed-off-by: wangshuangtao2@huawei.com
|
|
|
|
diff --git a/lib/tftp.c b/lib/tftp.c
|
|
index 8aeb14a4f..76a61c65e 100644
|
|
--- a/lib/tftp.c
|
|
+++ b/lib/tftp.c
|
|
@@ -1008,7 +1008,7 @@ static CURLcode tftp_connect(struct Curl_easy *data, bool *done)
|
|
state->sockfd = conn->sock[FIRSTSOCKET];
|
|
state->state = TFTP_STATE_START;
|
|
state->error = TFTP_ERR_NONE;
|
|
- state->blksize = TFTP_BLKSIZE_DEFAULT; /* Unless updated by OACK response */
|
|
+ state->blksize = blksize;
|
|
state->requested_blksize = blksize;
|
|
|
|
((struct sockaddr *)&state->local_addr)->sa_family =
|
|
diff --git a/lib/vauth/digest.c b/lib/vauth/digest.c
|
|
index a04ffab6f..826202bfd 100644
|
|
--- a/lib/vauth/digest.c
|
|
+++ b/lib/vauth/digest.c
|
|
@@ -42,7 +42,7 @@
|
|
#include "strcase.h"
|
|
#include "non-ascii.h" /* included for Curl_convert_... prototypes */
|
|
#include "curl_printf.h"
|
|
-#include "rand.h"
|
|
+#include "../rand.h"
|
|
|
|
/* The last #include files should be: */
|
|
#include "curl_memory.h"
|
|
diff --git a/lib/vauth/ntlm.c b/lib/vauth/ntlm.c
|
|
index 0aa3f1c8c..27fbe3264 100644
|
|
--- a/lib/vauth/ntlm.c
|
|
+++ b/lib/vauth/ntlm.c
|
|
@@ -41,7 +41,7 @@
|
|
#include "curl_multibyte.h"
|
|
#include "curl_md5.h"
|
|
#include "warnless.h"
|
|
-#include "rand.h"
|
|
+#include "../rand.h"
|
|
#include "vtls/vtls.h"
|
|
|
|
/* SSL backend-specific #if branches in this file must be kept in the order
|