<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e28696c9ed08ae208681eb1a200ad6683a24a5ef">https://github.com/macports/macports-ports/commit/e28696c9ed08ae208681eb1a200ad6683a24a5ef</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e28696c9ed08ae208681eb1a200ad6683a24a5ef
</span>Author: bastien <bastien@loftorbital.com>
AuthorDate: Sat Jun 12 23:42:34 2021 +0200
<span style='display:block; white-space:pre;color:#404040;'> libgit2: update to 1.1.0
</span>---
devel/libgit2/Portfile | 13 +--
devel/libgit2/files/htonll.patch | 93 --------------------
devel/libgit2/files/patch-htonll.diff | 157 ++++++++++++++++++++++++++++++++++
3 files changed, 164 insertions(+), 99 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libgit2/Portfile b/devel/libgit2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ce89f84bcaa..cbf81dae6b4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libgit2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libgit2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,8 +7,9 @@ PortGroup legacysupport 1.0
</span> PortGroup muniversal 1.0
# don't forget to update py-pygit2 and libgit2-glib as well
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup libgit2 libgit2 1.0.1 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup libgit2 libgit2 1.1.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from releases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> epoch 1
categories devel
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,9 +26,9 @@ long_description libgit2 is a portable, pure C implementation of the \
</span>
homepage https://libgit2.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 3f9ced0e0dff170a8156e4aa8fcb0abce66c8f60 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5dae7cb32b6977cd95ed849d24f3692f0b7e9eb9b0ee9ffaa14baebb9cac76e1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5304918
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e55f79b4da11d6eb0aca3e7b95ef2cf0afa8d7cd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ad73f845965cfd528e70f654e428073121a3fa0dc23caac81a1b1300277d4dba \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5425697
</span>
depends_build-append \
port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,7 +39,7 @@ depends_lib port:curl \
</span> path:lib/libssl.dylib:openssl \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append htonll.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-htonll.diff
</span>
configure.args-append \
-DTHREADSAFE:BOOL=OFF \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libgit2/files/htonll.patch b/devel/libgit2/files/htonll.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 005c2e89e11..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libgit2/files/htonll.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,93 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Use a private implementation of htonll to accommodate systems that don't
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-have one (like OS X 10.9 and earlier).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/libgit2/libgit2/issues/5613
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/libgit2/libgit2/pull/5614
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- deps/ntlmclient/CMakeLists.txt.orig 2020-06-04 03:46:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ deps/ntlmclient/CMakeLists.txt 2020-08-24 09:58:38.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,9 +1,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+INCLUDE(TestBigEndian)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FILE(GLOB SRC_NTLMCLIENT "ntlm.c" "unicode_builtin.c" "util.c")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ADD_DEFINITIONS(-DNTLM_STATIC=1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DISABLE_WARNINGS(implicit-fallthrough)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+TEST_BIG_ENDIAN(BIG_ENDIAN)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IF(BIG_ENDIAN)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ADD_DEFINITIONS(-DNTLM_BIG_ENDIAN)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ENDIF()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IF (HTTPS_BACKEND STREQUAL "SecureTransport")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ADD_DEFINITIONS(-DCRYPT_COMMONCRYPTO)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(SRC_NTLMCLIENT_CRYPTO "crypt_commoncrypto.c")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- deps/ntlmclient/compat.h.orig 2020-06-04 03:46:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ deps/ntlmclient/compat.h 2020-08-24 10:00:04.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,31 +21,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <stdbool.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef __linux__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--/* See man page endian(3) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# include <endian.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define htonll htobe64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif defined(__NetBSD__) || defined(__OpenBSD__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--/* See man page htobe64(3) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# include <endian.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define htonll htobe64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif defined(__FreeBSD__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--/* See man page bwaps64(9) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# include <sys/endian.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define htonll htobe64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif defined(sun) || defined(__sun)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--/* See man page byteorder(3SOCKET) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# include <netinet/in.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# include <inttypes.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# if !defined(htonll)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# if defined(_BIG_ENDIAN)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define htonll(x) (x)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define htonll(x) ((((uint64_t)htonl(x)) << 32) + htonl((uint64_t)(x) >> 32))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(NTLM_BIG_ENDIAN)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static inline uint64_t ntlm_htonll(uint64_t value)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return value;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# include <arpa/inet.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static inline uint64_t ntlm_htonll(uint64_t value)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return ((uint64_t)htonl(value) << 32) + htonl((uint64_t)value >> 32);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef MIN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- deps/ntlmclient/ntlm.c.orig 2020-06-04 03:46:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ deps/ntlmclient/ntlm.c 2020-08-24 09:57:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1126,7 +1126,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size_t lm2_len = 16;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uint64_t local_nonce;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- local_nonce = htonll(ntlm->nonce);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ local_nonce = ntlm_htonll(ntlm->nonce);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!ntlm_hmac_ctx_reset(ntlm->hmac_ctx) ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- !ntlm_hmac_md5_init(ntlm->hmac_ctx,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1198,8 +1198,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* the blob's integer values are in network byte order */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- signature = htonl(0x01010000);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- timestamp = htonll(ntlm->timestamp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- nonce = htonll(ntlm->nonce);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ timestamp = ntlm_htonll(ntlm->timestamp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ nonce = ntlm_htonll(ntlm->nonce);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* construct the blob */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- memcpy(&blob[0], &signature, 4);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libgit2/files/patch-htonll.diff b/devel/libgit2/files/patch-htonll.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0b73ebc8a55
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libgit2/files/patch-htonll.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,157 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From d79bb1595ce3678b925da02542bc97f789697d97 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Edward Thomson <ethomson@edwardthomson.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 11 Oct 2020 11:41:38 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] ntlm: update ntlm dependency for htonll
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Update ntlm to include an htonll that is not dependent on system
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+libraries.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ deps/ntlmclient/compat.h | 34 ---------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ deps/ntlmclient/crypt_openssl.c | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ deps/ntlmclient/ntlm.c | 10 +++++-----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ deps/ntlmclient/util.c | 16 +++++++++++++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ deps/ntlmclient/util.h | 3 ++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5 files changed, 23 insertions(+), 42 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/deps/ntlmclient/compat.h b/deps/ntlmclient/compat.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6e5ef6466c2..befc7cc4fb3 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- deps/ntlmclient/compat.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ deps/ntlmclient/compat.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,40 +21,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <stdbool.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(_WIN32) || defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/* winsock and macOS > 10.9 have htonll already */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif defined(__linux__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/* See man page endian(3) */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# include <endian.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define htonll htobe64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif defined(__NetBSD__) || defined(__OpenBSD__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/* See man page htobe64(3) */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# include <endian.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define htonll htobe64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif defined(__FreeBSD__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/* See man page bwaps64(9) */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# include <sys/endian.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define htonll htobe64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif defined(sun) || defined(__sun)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/* See man page byteorder(3SOCKET) */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# include <netinet/in.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# include <inttypes.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# if !defined(htonll)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# if defined(_BIG_ENDIAN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define htonll(x) (x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define htonll(x) ((((uint64_t)htonl(x)) << 32) + htonl((uint64_t)(x) >> 32))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif defined(__HAIKU__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# include <ByteOrder.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define htonll B_HOST_TO_BENDIAN_INT64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# error "Please implement htonll for your platform"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef MIN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define MIN(x, y) (((x) < (y)) ? (x) : (y))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/deps/ntlmclient/crypt_openssl.c b/deps/ntlmclient/crypt_openssl.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 785be10e50f..c0d36d891bc 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- deps/ntlmclient/crypt_openssl.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ deps/ntlmclient/crypt_openssl.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -71,7 +71,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static inline int HMAC_CTX_reset(HMAC_CTX *ctx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HMAC_CTX_cleanup(ctx);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- memzero(ctx, sizeof(HMAC_CTX));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ntlm_memzero(ctx, sizeof(HMAC_CTX));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/deps/ntlmclient/ntlm.c b/deps/ntlmclient/ntlm.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 74224bbea10..470a9014373 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- deps/ntlmclient/ntlm.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ deps/ntlmclient/ntlm.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -132,10 +132,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void free_credentials(ntlm_client *ntlm)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ntlm->password)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- memzero(ntlm->password, strlen(ntlm->password));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ntlm_memzero(ntlm->password, strlen(ntlm->password));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ntlm->password_utf16)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- memzero(ntlm->password_utf16, ntlm->password_utf16_len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ntlm_memzero(ntlm->password_utf16, ntlm->password_utf16_len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ free(ntlm->username);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ free(ntlm->username_upper);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1125,7 +1125,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size_t lm2_len = 16;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint64_t local_nonce;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- local_nonce = htonll(ntlm->nonce);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ local_nonce = ntlm_htonll(ntlm->nonce);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!ntlm_hmac_ctx_reset(ntlm->hmac_ctx) ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !ntlm_hmac_md5_init(ntlm->hmac_ctx,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1197,8 +1197,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* the blob's integer values are in network byte order */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ signature = htonl(0x01010000);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- timestamp = htonll(ntlm->timestamp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- nonce = htonll(ntlm->nonce);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ timestamp = ntlm_htonll(ntlm->timestamp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ nonce = ntlm_htonll(ntlm->nonce);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* construct the blob */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ memcpy(&blob[0], &signature, 4);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/deps/ntlmclient/util.c b/deps/ntlmclient/util.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d0e3e53be5a..07d10f6c609 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- deps/ntlmclient/util.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ deps/ntlmclient/util.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8,14 +8,28 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdint.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <arpa/inet.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "compat.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "util.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-void memzero(void *data, size_t size)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void ntlm_memzero(void *data, size_t size)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ volatile uint8_t *scan = (volatile uint8_t *)data;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while (size--)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *scan++ = 0x0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++uint64_t ntlm_htonll(uint64_t value)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static union {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint32_t i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char c[8];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } test = { 0x01020304 };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (test.c[0] == 0x01)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return value;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return ((uint64_t)htonl(value) << 32) | htonl((uint64_t)value >> 32);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/deps/ntlmclient/util.h b/deps/ntlmclient/util.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 1c1806ba37d..d4bb472ccc4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- deps/ntlmclient/util.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ deps/ntlmclient/util.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9,6 +9,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef PRIVATE_UTIL_H__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define PRIVATE_UTIL_H__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern void memzero(void *data, size_t size);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern void ntlm_memzero(void *data, size_t size);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern uint64_t ntlm_htonll(uint64_t value);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* PRIVATE_UTIL_H__ */
</span></pre><pre style='margin:0'>
</pre>