root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Configurations/10-main.conf: remove MIPS bn_div_3_words. 

It's being replaced with constant-time alternative.

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7589)
This commit is contained in:
Andy Polyakov 2018-11-12 15:03:39 +01:00 committed by Matt Caswell
parent 871493a2be
commit b34446cca2
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Configurations/10-main.conf
View File

@ -360,7 +360,7 @@ my %targets = (
inherit_from => [ "BASE_unix" ], inherit_from => [ "BASE_unix" ],
template => 1, template => 1,
cppflags => threads("-D_SGI_MP_SOURCE"), cppflags => threads("-D_SGI_MP_SOURCE"),
lib_cppflags => "-DB_ENDIAN -DBN_DIV3W", lib_cppflags => "-DB_ENDIAN",
ex_libs => add(threads("-lpthread")), ex_libs => add(threads("-lpthread")),
thread_scheme => "pthreads", thread_scheme => "pthreads",
dso_scheme => "dlfcn", dso_scheme => "dlfcn",
@ -733,7 +733,6 @@ my %targets = (
inherit_from => [ "linux-generic32", asm("mips32_asm") ], inherit_from => [ "linux-generic32", asm("mips32_asm") ],
cflags => add("-mabi=32"), cflags => add("-mabi=32"),
cxxflags => add("-mabi=32"), cxxflags => add("-mabi=32"),
lib_cppflags => add("-DBN_DIV3W"),
perlasm_scheme => "o32", perlasm_scheme => "o32",
}, },
# mips32 and mips64 below refer to contemporary MIPS Architecture # mips32 and mips64 below refer to contemporary MIPS Architecture
@ -742,7 +741,6 @@ my %targets = (
inherit_from => [ "linux-generic32", asm("mips64_asm") ], inherit_from => [ "linux-generic32", asm("mips64_asm") ],
cflags => add("-mabi=n32"), cflags => add("-mabi=n32"),
cxxflags => add("-mabi=n32"), cxxflags => add("-mabi=n32"),
lib_cppflags => add("-DBN_DIV3W"),
bn_ops => "SIXTY_FOUR_BIT RC4_CHAR", bn_ops => "SIXTY_FOUR_BIT RC4_CHAR",
perlasm_scheme => "n32", perlasm_scheme => "n32",
multilib => "32", multilib => "32",
@ -751,7 +749,6 @@ my %targets = (
inherit_from => [ "linux-generic64", asm("mips64_asm") ], inherit_from => [ "linux-generic64", asm("mips64_asm") ],
cflags => add("-mabi=64"), cflags => add("-mabi=64"),
cxxflags => add("-mabi=64"), cxxflags => add("-mabi=64"),
lib_cppflags => add("-DBN_DIV3W"),
perlasm_scheme => "64", perlasm_scheme => "64",
multilib => "64", multilib => "64",
}, },

6
crypto/bn/asm/mips.pl
View File

@ -798,6 +798,11 @@ $code.=<<___;
move $a0,$v0 move $a0,$v0
.end bn_sub_words_internal .end bn_sub_words_internal
#if 0
/*
* The bn_div_3_words entry point is re-used for constant-time interface.
* Implementation is retained as hystorical reference.
*/
.align 5 .align 5
.globl bn_div_3_words .globl bn_div_3_words
.ent bn_div_3_words .ent bn_div_3_words
@ -877,6 +882,7 @@ $code.=<<___;
jr $ra jr $ra
move $a0,$v0 move $a0,$v0
.end bn_div_3_words_internal .end bn_div_3_words_internal
#endif
.align 5 .align 5
.globl bn_div_words .globl bn_div_words