Commit 9b2a219c authored by Andy Polyakov's avatar Andy Polyakov Committed by Matt Caswell
Browse files

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



It's being replaced with constant-time alternative.

Reviewed-by: default avatarPaul Dale <paul.dale@oracle.com>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7589)

(cherry picked from commit b34446cc)
parent cc4e37f1

Configurations/10-main.conf

+1 −4
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ my %targets = ( 
        inherit_from     => [ "BASE_unix" ],

        template         => 1,

        cppflags         => threads("-D_SGI_MP_SOURCE"),

        lib_cppflags     => "-DB_ENDIAN -DBN_DIV3W",

        lib_cppflags     => "-DB_ENDIAN",

        ex_libs          => add(threads("-lpthread")),

        thread_scheme    => "pthreads",

        dso_scheme       => "dlfcn",
@@ -733,7 +733,6 @@ my %targets = ( 
        inherit_from     => [ "linux-generic32", asm("mips32_asm") ],

        cflags           => add("-mabi=32"),

        cxxflags         => add("-mabi=32"),

        lib_cppflags     => add("-DBN_DIV3W"),

        perlasm_scheme   => "o32",

    },

    # mips32 and mips64 below refer to contemporary MIPS Architecture
@@ -742,7 +741,6 @@ my %targets = ( 
        inherit_from     => [ "linux-generic32", asm("mips64_asm") ],

        cflags           => add("-mabi=n32"),

        cxxflags         => add("-mabi=n32"),

        lib_cppflags     => add("-DBN_DIV3W"),

        bn_ops           => "SIXTY_FOUR_BIT RC4_CHAR",

        perlasm_scheme   => "n32",

        multilib         => "32",
@@ -751,7 +749,6 @@ my %targets = ( 
        inherit_from     => [ "linux-generic64", asm("mips64_asm") ],

        cflags           => add("-mabi=64"),

        cxxflags         => add("-mabi=64"),

        lib_cppflags     => add("-DBN_DIV3W"),

        perlasm_scheme   => "64",

        multilib         => "64",

    },

crypto/bn/asm/mips.pl

+6 −0
Original line number Diff line number Diff line
@@ -798,6 +798,11 @@ $code.=<<___; 
	move	$a0,$v0

.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

.globl	bn_div_3_words

.ent	bn_div_3_words
@@ -877,6 +882,7 @@ $code.=<<___; 
	jr	$ra

	move	$a0,$v0

.end	bn_div_3_words_internal

#endif



.align	5

.globl	bn_div_words