Updated libtor dependencies.

berty · Mar 19, 2021 · ed0bc8f · ed0bc8f
1 parent f276a81
commit ed0bc8f
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ The `go-libtor` project is a self-contained, fully statically linked Tor library
 |:-:|:-:|:-:|
 | zlib | 1.2.11 | [`cacf7f1d4e3d44d871b605da3b647f07d718623f`](https://github.com/madler/zlib/commit/cacf7f1d4e3d44d871b605da3b647f07d718623f) |
 | libevent | 2.2.0-alpha-dev | [`00b92f42b69af29a820b46049fd00be9cd3fb7d4`](https://github.com/libevent/libevent/commit/00b92f42b69af29a820b46049fd00be9cd3fb7d4) |
-| openssl | 1.1.1-stable | [`081a7061f3da07318c4b0f5de67b82285630bf6b`](https://github.com/openssl/openssl/commit/081a7061f3da07318c4b0f5de67b82285630bf6b) |
+| openssl | 1.1.1-stable | [`f9398cc2b31858ddaaea3f5cfec2fce7f9b90347`](https://github.com/openssl/openssl/commit/f9398cc2b31858ddaaea3f5cfec2fce7f9b90347) |
 | tor | 0.3.5.14-dev | [`1693b6151e1369ce0938761cac95e7a0a524f5f3`](https://gitweb.torproject.org/tor.git/commit/?id=1693b6151e1369ce0938761cac95e7a0a524f5f3) |
 
 The library is currently supported on:

diff --git a/darwin/openssl/crypto/modes/cbc128.c b/darwin/openssl/crypto/modes/cbc128.c
@@ -69,7 +69,8 @@ void CRYPTO_cbc128_encrypt(const unsigned char *in, unsigned char *out,
         in += 16;
         out += 16;
     }
-    memcpy(ivec, iv, 16);
+    if (ivec != iv)
+        memcpy(ivec, iv, 16);
 }
 
 void CRYPTO_cbc128_decrypt(const unsigned char *in, unsigned char *out,
@@ -114,7 +115,8 @@ void CRYPTO_cbc128_decrypt(const unsigned char *in, unsigned char *out,
                 out += 16;
             }
         }
-        memcpy(ivec, iv, 16);
+        if (ivec != iv)
+            memcpy(ivec, iv, 16);
     } else {
         if (STRICT_ALIGNMENT &&
             ((size_t)in | (size_t)out | (size_t)ivec) % sizeof(size_t) != 0) {

diff --git a/darwin/openssl/ssl/statem/statem_clnt.c b/darwin/openssl/ssl/statem/statem_clnt.c
@@ -2905,6 +2905,7 @@ static int tls_construct_cke_psk_preamble(SSL *s, WPACKET *pkt)
     if (psklen > PSK_MAX_PSK_LEN) {
         SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE,
                  SSL_F_TLS_CONSTRUCT_CKE_PSK_PREAMBLE, ERR_R_INTERNAL_ERROR);
+        psklen = PSK_MAX_PSK_LEN;   /* Avoid overrunning the array on cleanse */
         goto err;
     } else if (psklen == 0) {
         SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE,

diff --git a/linux/openssl/crypto/modes/cbc128.c b/linux/openssl/crypto/modes/cbc128.c
@@ -69,7 +69,8 @@ void CRYPTO_cbc128_encrypt(const unsigned char *in, unsigned char *out,
         in += 16;
         out += 16;
     }
-    memcpy(ivec, iv, 16);
+    if (ivec != iv)
+        memcpy(ivec, iv, 16);
 }
 
 void CRYPTO_cbc128_decrypt(const unsigned char *in, unsigned char *out,
@@ -114,7 +115,8 @@ void CRYPTO_cbc128_decrypt(const unsigned char *in, unsigned char *out,
                 out += 16;
             }
         }
-        memcpy(ivec, iv, 16);
+        if (ivec != iv)
+            memcpy(ivec, iv, 16);
     } else {
         if (STRICT_ALIGNMENT &&
             ((size_t)in | (size_t)out | (size_t)ivec) % sizeof(size_t) != 0) {

diff --git a/linux/openssl/ssl/statem/statem_clnt.c b/linux/openssl/ssl/statem/statem_clnt.c
@@ -2905,6 +2905,7 @@ static int tls_construct_cke_psk_preamble(SSL *s, WPACKET *pkt)
     if (psklen > PSK_MAX_PSK_LEN) {
         SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE,
                  SSL_F_TLS_CONSTRUCT_CKE_PSK_PREAMBLE, ERR_R_INTERNAL_ERROR);
+        psklen = PSK_MAX_PSK_LEN;   /* Avoid overrunning the array on cleanse */
         goto err;
     } else if (psklen == 0) {
         SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE,

diff --git a/lock.json b/lock.json
@@ -1 +1 @@
-{"zlib":"cacf7f1d4e3d44d871b605da3b647f07d718623f","libevent":"00b92f42b69af29a820b46049fd00be9cd3fb7d4","openssl":"081a7061f3da07318c4b0f5de67b82285630bf6b","tor":"1693b6151e1369ce0938761cac95e7a0a524f5f3"}
+{"zlib":"cacf7f1d4e3d44d871b605da3b647f07d718623f","libevent":"00b92f42b69af29a820b46049fd00be9cd3fb7d4","openssl":"f9398cc2b31858ddaaea3f5cfec2fce7f9b90347","tor":"1693b6151e1369ce0938761cac95e7a0a524f5f3"}
diff --git a/openssl_config/buildinf.macos64.h b/openssl_config/buildinf.macos64.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: darwin64-x86_64-cc"
-#define DATE "built on: Fri Mar 12 10:14:13 2021 +0100"
+#define DATE "built on: Thu Mar 18 21:25:10 2021 +1000"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a

diff --git a/openssl_config/buildinf.x64.h b/openssl_config/buildinf.x64.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: linux-x86_64"
-#define DATE "built on: Fri Mar 12 10:14:13 2021 +0100"
+#define DATE "built on: Thu Mar 18 21:25:10 2021 +1000"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a

diff --git a/openssl_config/buildinf.x86.h b/openssl_config/buildinf.x86.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: linux-x86"
-#define DATE "built on: Fri Mar 12 10:14:13 2021 +0100"
+#define DATE "built on: Thu Mar 18 21:25:10 2021 +1000"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a