Updated libtor dependencies.

berty · Jan 8, 2021 · 517c8ec · 517c8ec
1 parent afb3427
commit 517c8ec
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 13 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 | [`c5e4391b86ab0198c9878620d566a66043bd1f43`](https://github.com/libevent/libevent/commit/c5e4391b86ab0198c9878620d566a66043bd1f43) |
-| openssl | 1.1.1-stable | [`80d5badd8fa7dcc7dffc88745376df53161e392a`](https://github.com/openssl/openssl/commit/80d5badd8fa7dcc7dffc88745376df53161e392a) |
+| openssl | 1.1.1-stable | [`a953f26dba5dadf8ac69c6fcbf71ebe3efba9407`](https://github.com/openssl/openssl/commit/a953f26dba5dadf8ac69c6fcbf71ebe3efba9407) |
 | 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/crypto/poly1305/asm/poly1305-armv4.pl b/darwin/openssl/crypto/poly1305/asm/poly1305-armv4.pl
@@ -133,10 +133,10 @@
 #  ifdef __thumb2__
 	itete	eq
 #  endif
-	addeq	r12,r11,#(poly1305_emit-.Lpoly1305_init)
-	addne	r12,r11,#(poly1305_emit_neon-.Lpoly1305_init)
-	addeq	r11,r11,#(poly1305_blocks-.Lpoly1305_init)
-	addne	r11,r11,#(poly1305_blocks_neon-.Lpoly1305_init)
+	addeq	r12,r11,#(.Lpoly1305_emit-.Lpoly1305_init)
+	addne	r12,r11,#(.Lpoly1305_emit_neon-.Lpoly1305_init)
+	addeq	r11,r11,#(.Lpoly1305_blocks-.Lpoly1305_init)
+	addne	r11,r11,#(.Lpoly1305_blocks_neon-.Lpoly1305_init)
 # endif
 # ifdef	__thumb2__
 	orr	r12,r12,#1	@ thumb-ify address
@@ -352,6 +352,7 @@
 .type	poly1305_emit,%function
 .align	5
 poly1305_emit:
+.Lpoly1305_emit:
 	stmdb	sp!,{r4-r11}
 .Lpoly1305_emit_enter:
 
@@ -671,6 +672,7 @@
 .type	poly1305_blocks_neon,%function
 .align	5
 poly1305_blocks_neon:
+.Lpoly1305_blocks_neon:
 	ldr	ip,[$ctx,#36]		@ is_base2_26
 	ands	$len,$len,#-16
 	beq	.Lno_data_neon
@@ -1157,6 +1159,7 @@
 .type	poly1305_emit_neon,%function
 .align	5
 poly1305_emit_neon:
+.Lpoly1305_emit_neon:
 	ldr	ip,[$ctx,#36]		@ is_base2_26
 
 	stmdb	sp!,{r4-r11}

diff --git a/linux/openssl/crypto/poly1305/asm/poly1305-armv4.pl b/linux/openssl/crypto/poly1305/asm/poly1305-armv4.pl
@@ -133,10 +133,10 @@
 #  ifdef __thumb2__
 	itete	eq
 #  endif
-	addeq	r12,r11,#(poly1305_emit-.Lpoly1305_init)
-	addne	r12,r11,#(poly1305_emit_neon-.Lpoly1305_init)
-	addeq	r11,r11,#(poly1305_blocks-.Lpoly1305_init)
-	addne	r11,r11,#(poly1305_blocks_neon-.Lpoly1305_init)
+	addeq	r12,r11,#(.Lpoly1305_emit-.Lpoly1305_init)
+	addne	r12,r11,#(.Lpoly1305_emit_neon-.Lpoly1305_init)
+	addeq	r11,r11,#(.Lpoly1305_blocks-.Lpoly1305_init)
+	addne	r11,r11,#(.Lpoly1305_blocks_neon-.Lpoly1305_init)
 # endif
 # ifdef	__thumb2__
 	orr	r12,r12,#1	@ thumb-ify address
@@ -352,6 +352,7 @@
 .type	poly1305_emit,%function
 .align	5
 poly1305_emit:
+.Lpoly1305_emit:
 	stmdb	sp!,{r4-r11}
 .Lpoly1305_emit_enter:
 
@@ -671,6 +672,7 @@
 .type	poly1305_blocks_neon,%function
 .align	5
 poly1305_blocks_neon:
+.Lpoly1305_blocks_neon:
 	ldr	ip,[$ctx,#36]		@ is_base2_26
 	ands	$len,$len,#-16
 	beq	.Lno_data_neon
@@ -1157,6 +1159,7 @@
 .type	poly1305_emit_neon,%function
 .align	5
 poly1305_emit_neon:
+.Lpoly1305_emit_neon:
 	ldr	ip,[$ctx,#36]		@ is_base2_26
 
 	stmdb	sp!,{r4-r11}

diff --git a/lock.json b/lock.json
@@ -1 +1 @@
-{"zlib":"cacf7f1d4e3d44d871b605da3b647f07d718623f","libevent":"c5e4391b86ab0198c9878620d566a66043bd1f43","openssl":"80d5badd8fa7dcc7dffc88745376df53161e392a","tor":"6cd23b29d262da3ecd07208804804d66550a6c9a"}
+{"zlib":"cacf7f1d4e3d44d871b605da3b647f07d718623f","libevent":"c5e4391b86ab0198c9878620d566a66043bd1f43","openssl":"a953f26dba5dadf8ac69c6fcbf71ebe3efba9407","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: Mon Jan 4 15:06:52 2021 +0100"
+#define DATE "built on: Thu Jan 7 09:58:25 2021 +0100"
 
 /*
  * 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: Mon Jan 4 15:06:52 2021 +0100"
+#define DATE "built on: Thu Jan 7 09:58:25 2021 +0100"
 
 /*
  * 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: Mon Jan 4 15:06:52 2021 +0100"
+#define DATE "built on: Thu Jan 7 09:58:25 2021 +0100"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a