Enable NTLM support (#428)

* Enable NTLM support

* fix formating and mssing curl_des.c

* use feature flag for ntlm

Co-authored-by: Philipp Engelbert <pengelbert@slashwhy.de>
Co-authored-by: pbert <p.engelbert@posteo.net>

Author: 3 people

Cargo.toml

@@ -51,6 +51,7 @@ protocol-ftp = ["curl-sys/protocol-ftp"]
 zlib-ng-compat = ["curl-sys/zlib-ng-compat", "static-curl"]
 upkeep_7_62_0 = ["curl-sys/upkeep_7_62_0"]
 poll_7_68_0 = ["curl-sys/poll_7_68_0"]
+ntlm = ["curl-sys/ntlm"]
 
 [[test]]
 name = "atexit"

README.md

@@ -130,6 +130,7 @@ with various Cargo features:
 - `spnego`: Enable SPNEGO support. Disabled by default.
 - `upkeep_7_62_0`: Enable curl_easy_upkeep() support, introduced in curl 7.62.0. Disabled by default.
 - `poll_7_68_0`: Enable curl_multi_poll()/curl_multi_wakeup() support, requires curl 7.68.0 or later. Disabled by default.
+- `ntlm`: Enable NTLM support in curl. Disabled by default.
 
 ## Version Support
 

ci/run.sh

@@ -6,7 +6,7 @@ cargo test --target $TARGET --no-run
 # First test with no extra protocols enabled.
 cargo test --target $TARGET --no-run --features static-curl
 # Then with all extra protocols enabled.
-cargo test --target $TARGET --no-run --features static-curl,protocol-ftp
+cargo test --target $TARGET --no-run --features static-curl,protocol-ftp,ntlm
 if [ -z "$NO_RUN" ]; then
     cargo test --target $TARGET
     cargo test --target $TARGET --features static-curl

curl-sys/Cargo.toml

@@ -55,3 +55,4 @@ protocol-ftp = []
 zlib-ng-compat = ["libz-sys/zlib-ng", "static-curl"]
 upkeep_7_62_0 = []
 poll_7_68_0 = []
+ntlm = []

curl-sys/build.rs

@@ -116,7 +116,6 @@ fn main() {
         .define("CURL_DISABLE_IMAP", None)
         .define("CURL_DISABLE_LDAP", None)
         .define("CURL_DISABLE_LDAPS", None)
-        .define("CURL_DISABLE_NTLM", None)
         .define("CURL_DISABLE_POP3", None)
         .define("CURL_DISABLE_RTSP", None)
         .define("CURL_DISABLE_SMB", None)
@@ -215,6 +214,20 @@ fn main() {
         .define("HAVE_GETSOCKNAME", None)
         .warnings(false);
 
+    if cfg!(feature = "ntlm") {
+        cfg.file("curl/lib/curl_des.c")
+            .file("curl/lib/curl_endian.c")
+            .file("curl/lib/curl_gethostname.c")
+            .file("curl/lib/curl_ntlm_core.c")
+            .file("curl/lib/curl_ntlm_wb.c")
+            .file("curl/lib/http_ntlm.c")
+            .file("curl/lib/md4.c")
+            .file("curl/lib/vauth/ntlm.c")
+            .file("curl/lib/vauth/ntlm_sspi.c");
+    } else {
+        cfg.define("CURL_DISABLE_NTLM", None);
+    }
+
     if cfg!(feature = "protocol-ftp") {
         cfg.file("curl/lib/curl_fnmatch.c")
             .file("curl/lib/ftp.c")