Browse Source

Fix arm compilation with openssl <1.1

Bug 27781; bugfix on 0.3.5.1-alpha.
Nick Mathewson 5 years ago
parent
commit
6c739c3fb2
1 changed files with 6 additions and 4 deletions
  1. 6 4
      src/lib/crypt_ops/aes_openssl.c

+ 6 - 4
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);