diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-12-07 05:46:22 +0100 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-12-07 06:11:21 +0100 |
| commit | 4fe37a0343f3c341ab112607736caac8746d2db1 (patch) | |
| tree | 147f5909eea1bc13c4dd26bed7db288beeccf9b1 | |
| parent | 5e28bca364c6e8cc44f994c8e3aad8c639b092e1 (diff) | |
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>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
| -rw-r--r-- | src/crypto/zinc/chacha20/chacha20-x86_64.pl | 6 |
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 |