Skip to content

Commit

Permalink
Updated libtor dependencies.
Browse files Browse the repository at this point in the history
  • Loading branch information
Jorropo-berty-bot committed Dec 2, 2020
1 parent b2796ef commit 6f11236
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 33 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 | [`0c60676338f1e25faaa44117238d8e35e507feee`](https://github.com/openssl/openssl/commit/0c60676338f1e25faaa44117238d8e35e507feee) |
| openssl | 1.1.1-stable | [`409c59e8f44ae56f2587cdd8a7ce611d0e3d91d9`](https://github.com/openssl/openssl/commit/409c59e8f44ae56f2587cdd8a7ce611d0e3d91d9) |
| tor | 0.3.5.12-dev | [`6cd23b29d262da3ecd07208804804d66550a6c9a`](https://gitweb.torproject.org/tor.git/commit/?id=6cd23b29d262da3ecd07208804804d66550a6c9a) |

The library is currently supported on:
Expand Down
28 changes: 14 additions & 14 deletions darwin/openssl/crypto/aes/asm/aesv8-armx.pl
Original file line number Diff line number Diff line change
Expand Up @@ -740,17 +740,17 @@ ()
#ifndef __ARMEB__
rev $ctr, $ctr
#endif
vorr $dat1,$dat0,$dat0
add $tctr1, $ctr, #1
vorr $dat2,$dat0,$dat0
add $ctr, $ctr, #2
vorr $ivec,$dat0,$dat0
rev $tctr1, $tctr1
vmov.32 ${dat1}[3],$tctr1
vmov.32 ${ivec}[3],$tctr1
add $ctr, $ctr, #2
vorr $dat1,$ivec,$ivec
b.ls .Lctr32_tail
rev $tctr2, $ctr
vmov.32 ${ivec}[3],$tctr2
sub $len,$len,#3 // bias
vmov.32 ${dat2}[3],$tctr2
vorr $dat2,$ivec,$ivec
b .Loop3x_ctr32
.align 4
Expand All @@ -777,11 +777,11 @@ ()
aese $dat1,q8
aesmc $tmp1,$dat1
vld1.8 {$in0},[$inp],#16
vorr $dat0,$ivec,$ivec
add $tctr0,$ctr,#1
aese $dat2,q8
aesmc $dat2,$dat2
vld1.8 {$in1},[$inp],#16
vorr $dat1,$ivec,$ivec
rev $tctr0,$tctr0
aese $tmp0,q9
aesmc $tmp0,$tmp0
aese $tmp1,q9
Expand All @@ -790,8 +790,6 @@ ()
mov $key_,$key
aese $dat2,q9
aesmc $tmp2,$dat2
vorr $dat2,$ivec,$ivec
add $tctr0,$ctr,#1
aese $tmp0,q12
aesmc $tmp0,$tmp0
aese $tmp1,q12
Expand All @@ -807,20 +805,22 @@ ()
aese $tmp1,q13
aesmc $tmp1,$tmp1
veor $in2,$in2,$rndlast
rev $tctr0,$tctr0
vmov.32 ${ivec}[3], $tctr0
aese $tmp2,q13
aesmc $tmp2,$tmp2
vmov.32 ${dat0}[3], $tctr0
vorr $dat0,$ivec,$ivec
rev $tctr1,$tctr1
aese $tmp0,q14
aesmc $tmp0,$tmp0
vmov.32 ${ivec}[3], $tctr1
rev $tctr2,$ctr
aese $tmp1,q14
aesmc $tmp1,$tmp1
vmov.32 ${dat1}[3], $tctr1
rev $tctr2,$ctr
vorr $dat1,$ivec,$ivec
vmov.32 ${ivec}[3], $tctr2
aese $tmp2,q14
aesmc $tmp2,$tmp2
vmov.32 ${dat2}[3], $tctr2
vorr $dat2,$ivec,$ivec
subs $len,$len,#3
aese $tmp0,q15
aese $tmp1,q15
Expand Down
28 changes: 14 additions & 14 deletions linux/openssl/crypto/aes/asm/aesv8-armx.pl
Original file line number Diff line number Diff line change
Expand Up @@ -740,17 +740,17 @@ ()
#ifndef __ARMEB__
rev $ctr, $ctr
#endif
vorr $dat1,$dat0,$dat0
add $tctr1, $ctr, #1
vorr $dat2,$dat0,$dat0
add $ctr, $ctr, #2
vorr $ivec,$dat0,$dat0
rev $tctr1, $tctr1
vmov.32 ${dat1}[3],$tctr1
vmov.32 ${ivec}[3],$tctr1
add $ctr, $ctr, #2
vorr $dat1,$ivec,$ivec
b.ls .Lctr32_tail
rev $tctr2, $ctr
vmov.32 ${ivec}[3],$tctr2
sub $len,$len,#3 // bias
vmov.32 ${dat2}[3],$tctr2
vorr $dat2,$ivec,$ivec
b .Loop3x_ctr32
.align 4
Expand All @@ -777,11 +777,11 @@ ()
aese $dat1,q8
aesmc $tmp1,$dat1
vld1.8 {$in0},[$inp],#16
vorr $dat0,$ivec,$ivec
add $tctr0,$ctr,#1
aese $dat2,q8
aesmc $dat2,$dat2
vld1.8 {$in1},[$inp],#16
vorr $dat1,$ivec,$ivec
rev $tctr0,$tctr0
aese $tmp0,q9
aesmc $tmp0,$tmp0
aese $tmp1,q9
Expand All @@ -790,8 +790,6 @@ ()
mov $key_,$key
aese $dat2,q9
aesmc $tmp2,$dat2
vorr $dat2,$ivec,$ivec
add $tctr0,$ctr,#1
aese $tmp0,q12
aesmc $tmp0,$tmp0
aese $tmp1,q12
Expand All @@ -807,20 +805,22 @@ ()
aese $tmp1,q13
aesmc $tmp1,$tmp1
veor $in2,$in2,$rndlast
rev $tctr0,$tctr0
vmov.32 ${ivec}[3], $tctr0
aese $tmp2,q13
aesmc $tmp2,$tmp2
vmov.32 ${dat0}[3], $tctr0
vorr $dat0,$ivec,$ivec
rev $tctr1,$tctr1
aese $tmp0,q14
aesmc $tmp0,$tmp0
vmov.32 ${ivec}[3], $tctr1
rev $tctr2,$ctr
aese $tmp1,q14
aesmc $tmp1,$tmp1
vmov.32 ${dat1}[3], $tctr1
rev $tctr2,$ctr
vorr $dat1,$ivec,$ivec
vmov.32 ${ivec}[3], $tctr2
aese $tmp2,q14
aesmc $tmp2,$tmp2
vmov.32 ${dat2}[3], $tctr2
vorr $dat2,$ivec,$ivec
subs $len,$len,#3
aese $tmp0,q15
aese $tmp1,q15
Expand Down
2 changes: 1 addition & 1 deletion lock.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"zlib":"cacf7f1d4e3d44d871b605da3b647f07d718623f","libevent":"657e180694a97c6d70d58cd60b82e43dc23ac4b2","openssl":"0c60676338f1e25faaa44117238d8e35e507feee","tor":"6cd23b29d262da3ecd07208804804d66550a6c9a"}
{"zlib":"cacf7f1d4e3d44d871b605da3b647f07d718623f","libevent":"657e180694a97c6d70d58cd60b82e43dc23ac4b2","openssl":"409c59e8f44ae56f2587cdd8a7ce611d0e3d91d9","tor":"6cd23b29d262da3ecd07208804804d66550a6c9a"}
2 changes: 1 addition & 1 deletion openssl_config/buildinf.macos64.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: darwin64-x86_64-cc"
#define DATE "built on: Fri Nov 27 14:00:27 2020 +0100"
#define DATE "built on: Tue Dec 1 14:27:48 2020 +0100"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
2 changes: 1 addition & 1 deletion openssl_config/buildinf.x64.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: linux-x86_64"
#define DATE "built on: Fri Nov 27 14:00:27 2020 +0100"
#define DATE "built on: Tue Dec 1 14:27:48 2020 +0100"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
2 changes: 1 addition & 1 deletion openssl_config/buildinf.x86.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: linux-x86"
#define DATE "built on: Fri Nov 27 14:00:27 2020 +0100"
#define DATE "built on: Tue Dec 1 14:27:48 2020 +0100"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down

0 comments on commit 6f11236

Please sign in to comment.