From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 19 Sep 2018 14:37:23 +0000 (-0400)
Subject: Fix arm compilation with openssl <1.1
X-Git-Tag: tor-0.3.5.3-alpha~44
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6c739c3fb2911338d68a77ea0a90cacbd868e4d7;p=thirdparty%2Ftor.git

Fix arm compilation with openssl <1.1

Bug 27781; bugfix on 0.3.5.1-alpha.
---

diff --git a/src/lib/crypt_ops/aes_openssl.c b/src/lib/crypt_ops/aes_openssl.c
index 387f5d3df0..f2990fc06d 100644
--- a/src/lib/crypt_ops/aes_openssl.c
+++ b/src/lib/crypt_ops/aes_openssl.c
@@ -11,7 +11,9 @@
 
 #include "orconfig.h"
 #include "lib/crypt_ops/aes.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "lib/log/util_bug.h"
+#include "lib/arch/bytes.h"
 
 #ifdef _WIN32 /*wrkard for dtls1.h >= 0.9.8m of "#include <winsock.h>"*/
   #include <winsock2.h>
@@ -396,10 +398,10 @@ static void
 aes_set_iv(aes_cnt_cipher_t *cipher, const uint8_t *iv)
 {
 #ifdef USING_COUNTER_VARS
-  cipher->counter3 = ntohl(get_uint32(iv));
-  cipher->counter2 = ntohl(get_uint32(iv+4));
-  cipher->counter1 = ntohl(get_uint32(iv+8));
-  cipher->counter0 = ntohl(get_uint32(iv+12));
+  cipher->counter3 = tor_ntohl(get_uint32(iv));
+  cipher->counter2 = tor_ntohl(get_uint32(iv+4));
+  cipher->counter1 = tor_ntohl(get_uint32(iv+8));
+  cipher->counter0 = tor_ntohl(get_uint32(iv+12));
 #endif /* defined(USING_COUNTER_VARS) */
   cipher->pos = 0;
   memcpy(cipher->ctr_buf.buf, iv, 16);