Updated libtor dependencies.

berty · Dec 3, 2020 · 0d6461b · 0d6461b
1 parent 6f11236
commit 0d6461b
Show file tree

Hide file tree

Showing 7 changed files with 9 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 | [`657e180694a97c6d70d58cd60b82e43dc23ac4b2`](https://github.com/libevent/libevent/commit/657e180694a97c6d70d58cd60b82e43dc23ac4b2) |
-| openssl | 1.1.1-stable | [`409c59e8f44ae56f2587cdd8a7ce611d0e3d91d9`](https://github.com/openssl/openssl/commit/409c59e8f44ae56f2587cdd8a7ce611d0e3d91d9) |
+| openssl | 1.1.1-stable | [`9d5580612887b0c37016e7b65707e8e9dc27f4bb`](https://github.com/openssl/openssl/commit/9d5580612887b0c37016e7b65707e8e9dc27f4bb) |
 | tor | 0.3.5.12-dev | [`6cd23b29d262da3ecd07208804804d66550a6c9a`](https://gitweb.torproject.org/tor.git/commit/?id=6cd23b29d262da3ecd07208804804d66550a6c9a) |
 
 The library is currently supported on:

diff --git a/darwin/openssl/ssl/record/rec_layer_d1.c b/darwin/openssl/ssl/record/rec_layer_d1.c
@@ -808,8 +808,8 @@ int do_dtls1_write(SSL *s, int type, const unsigned char *buf,
     wb = &s->rlayer.wbuf[0];
 
     /*
-     * first check if there is a SSL3_BUFFER still being written out.  This
-     * will happen with non blocking IO
+     * DTLS writes whole datagrams, so there can't be anything left in
+     * the buffer.
      */
     if (!ossl_assert(SSL3_BUFFER_get_left(wb) == 0)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_DO_DTLS1_WRITE,

diff --git a/linux/openssl/ssl/record/rec_layer_d1.c b/linux/openssl/ssl/record/rec_layer_d1.c
@@ -808,8 +808,8 @@ int do_dtls1_write(SSL *s, int type, const unsigned char *buf,
     wb = &s->rlayer.wbuf[0];
 
     /*
-     * first check if there is a SSL3_BUFFER still being written out.  This
-     * will happen with non blocking IO
+     * DTLS writes whole datagrams, so there can't be anything left in
+     * the buffer.
      */
     if (!ossl_assert(SSL3_BUFFER_get_left(wb) == 0)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_DO_DTLS1_WRITE,

diff --git a/lock.json b/lock.json
@@ -1 +1 @@
-{"zlib":"cacf7f1d4e3d44d871b605da3b647f07d718623f","libevent":"657e180694a97c6d70d58cd60b82e43dc23ac4b2","openssl":"409c59e8f44ae56f2587cdd8a7ce611d0e3d91d9","tor":"6cd23b29d262da3ecd07208804804d66550a6c9a"}
+{"zlib":"cacf7f1d4e3d44d871b605da3b647f07d718623f","libevent":"657e180694a97c6d70d58cd60b82e43dc23ac4b2","openssl":"9d5580612887b0c37016e7b65707e8e9dc27f4bb","tor":"6cd23b29d262da3ecd07208804804d66550a6c9a"}
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: Tue Dec 1 14:27:48 2020 +0100"
+#define DATE "built on: Wed Dec 2 15:35:34 2020 -0800"
 
 /*
  * 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: Tue Dec 1 14:27:48 2020 +0100"
+#define DATE "built on: Wed Dec 2 15:35:34 2020 -0800"
 
 /*
  * 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: Tue Dec 1 14:27:48 2020 +0100"
+#define DATE "built on: Wed Dec 2 15:35:34 2020 -0800"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a