aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src/crypto/zinc
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2018-12-07 05:46:22 +0100
committerJason A. Donenfeld <Jason@zx2c4.com>2018-12-07 06:11:21 +0100
commit9d976b1a28006a21b8fe920b9337162a9a8d737b (patch)
tree240c0c38d95bef6451be08b16b2935b0e5e23caa /src/crypto/zinc
parentembeddable-wg-library: do not warn on unrecognized netlink attributes (diff)
downloadwireguard-monolithic-historical-9d976b1a28006a21b8fe920b9337162a9a8d737b.tar.xz
wireguard-monolithic-historical-9d976b1a28006a21b8fe920b9337162a9a8d737b.zip
chacha20: do not define unused asm function
This causes RAP to be unhappy, and we're not using it anyway. Reported-by: Ivan J. <parazyd@dyne.org>
Diffstat (limited to 'src/crypto/zinc')
-rw-r--r--src/crypto/zinc/chacha20/chacha20-x86_64.pl6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/crypto/zinc/chacha20/chacha20-x86_64.pl b/src/crypto/zinc/chacha20/chacha20-x86_64.pl
index 5c19142..47bf36b 100644
--- a/src/crypto/zinc/chacha20/chacha20-x86_64.pl
+++ b/src/crypto/zinc/chacha20/chacha20-x86_64.pl
@@ -280,14 +280,12 @@ my @x=map("\"$_\"",@x);
########################################################################
# Generic code path that handles all lengths on pre-SSSE3 processors.
+if(!$kernel) {
&declare_function("chacha20_ctr32", 64, 5);
$code.=<<___;
.cfi_startproc
cmp \$0,$len
je .Lno_data
-___
-if(!$kernel) {
-$code.=<<___;
mov OPENSSL_ia32cap_P+4(%rip),%r9
___
$code.=<<___ if ($avx>2);
@@ -300,7 +298,6 @@ $code.=<<___;
test \$`1<<(41-32)`,%r9d
jnz .Lchacha20_ssse3
___
-}
$code.=<<___;
push %rbx
.cfi_push %rbx
@@ -474,6 +471,7 @@ $code.=<<___;
.cfi_endproc
___
&end_function("chacha20_ctr32");
+}
########################################################################
# SSSE3 code path that handles shorter lengths