mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-05 01:59:01 +08:00
fe2d25fa90
* Add wolfSSL port * Add wolfMQTT * Add wolfTPM * Update ci.baseline.txt for wolfSSL, wolfMQTT, wolfTPM * curl: Add wolfSSL feature * wolfSSL: Always build out of tree and enable DES3 * wolfssl: support !uwp and use PORT variable for copyright install * curl: use `VCPKG_TARGET_IS_WINDOWS` instead of triplet and `MATCHES` Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> * curl[wolfssl]: add DES_ECB and add patch to resolve ntlm includes * Fix version database. Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
39 lines
1007 B
Diff
39 lines
1007 B
Diff
--- a/lib/curl_ntlm_core.c
|
|
+++ b/lib/curl_ntlm_core.c
|
|
@@ -60,12 +60,17 @@
|
|
|
|
#ifdef USE_WOLFSSL
|
|
#include <wolfssl/options.h>
|
|
-#endif
|
|
-
|
|
+# include <wolfssl/openssl/des.h>
|
|
+# include <wolfssl/openssl/md5.h>
|
|
+# include <wolfssl/openssl/ssl.h>
|
|
+# include <wolfssl/openssl/rand.h>
|
|
+#else
|
|
# include <openssl/des.h>
|
|
# include <openssl/md5.h>
|
|
# include <openssl/ssl.h>
|
|
# include <openssl/rand.h>
|
|
+#endif
|
|
+
|
|
# if (defined(OPENSSL_VERSION_NUMBER) && \
|
|
(OPENSSL_VERSION_NUMBER < 0x00907001L)) && !defined(USE_WOLFSSL)
|
|
# define DES_key_schedule des_key_schedule
|
|
diff -ur a/lib/curl_ntlm_core.h b/lib/curl_ntlm_core.h
|
|
--- a/lib/curl_ntlm_core.h 2022-05-10 23:11:15.000000000 -0700
|
|
+++ b/lib/curl_ntlm_core.h 2022-05-16 16:48:39.931726300 -0700
|
|
@@ -35,10 +35,10 @@
|
|
#define NTLM_NEEDS_NSS_INIT
|
|
#endif
|
|
|
|
-#if defined(USE_OPENSSL) || defined(USE_WOLFSSL)
|
|
#ifdef USE_WOLFSSL
|
|
# include <wolfssl/options.h>
|
|
-#endif
|
|
+# include <wolfssl/openssl/ssl.h>
|
|
+#else
|
|
# include <openssl/ssl.h>
|
|
#endif
|
|
|