From 79ee5afa26da1f2e3d16376d20b273cc759b0c1b Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Mon, 9 Feb 2015 23:21:11 +0100 Subject: [PATCH 1/1] Engage ecp_nistz256-x86 module. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Emilia Käsper --- Configure | 2 +- TABLE | 60 +++++++++++++++++++++++++++---------------------------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/Configure b/Configure index 5fb5f13ec9..f6dd38e7fe 100755 --- a/Configure +++ b/Configure @@ -128,7 +128,7 @@ my $tlib="-lnsl -lsocket"; my $bits1="THIRTY_TWO_BIT "; my $bits2="SIXTY_FOUR_BIT "; -my $x86_asm="x86cpuid.o:bn-586.o co-586.o x86-mont.o x86-gf2m.o::des-586.o crypt586.o:aes-586.o vpaes-x86.o aesni-x86.o:bf-586.o:md5-586.o:sha1-586.o sha256-586.o sha512-586.o:cast-586.o:rc4-586.o:rmd-586.o:rc5-586.o:wp_block.o wp-mmx.o:cmll-x86.o:ghash-x86.o:e_padlock-x86.o"; +my $x86_asm="x86cpuid.o:bn-586.o co-586.o x86-mont.o x86-gf2m.o:ecp_nistz256.o ecp_nistz256-x86.o:des-586.o crypt586.o:aes-586.o vpaes-x86.o aesni-x86.o:bf-586.o:md5-586.o:sha1-586.o sha256-586.o sha512-586.o:cast-586.o:rc4-586.o:rmd-586.o:rc5-586.o:wp_block.o wp-mmx.o:cmll-x86.o:ghash-x86.o:e_padlock-x86.o"; my $x86_elf_asm="$x86_asm:elf"; diff --git a/TABLE b/TABLE index 6235666f10..7193a5a99c 100644 --- a/TABLE +++ b/TABLE @@ -248,7 +248,7 @@ $lflags = $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid.o $bn_obj = bn-586.o co-586.o x86-mont.o x86-gf2m.o -$ec_obj = +$ec_obj = ecp_nistz256.o ecp_nistz256-x86.o $des_obj = des-586.o crypt586.o $aes_obj = aes-586.o vpaes-x86.o aesni-x86.o $bf_obj = bf-586.o @@ -282,7 +282,7 @@ $lflags = $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid.o $bn_obj = bn-586.o co-586.o x86-mont.o x86-gf2m.o -$ec_obj = +$ec_obj = ecp_nistz256.o ecp_nistz256-x86.o $des_obj = des-586.o crypt586.o $aes_obj = aes-586.o vpaes-x86.o aesni-x86.o $bf_obj = bf-586.o @@ -350,7 +350,7 @@ $lflags = $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid.o $bn_obj = bn-586.o co-586.o x86-mont.o x86-gf2m.o -$ec_obj = +$ec_obj = ecp_nistz256.o ecp_nistz256-x86.o $des_obj = des-586.o crypt586.o $aes_obj = aes-586.o vpaes-x86.o aesni-x86.o $bf_obj = bf-586.o @@ -418,7 +418,7 @@ $lflags = -L/dev/env/WATT_ROOT/lib -lwatt $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid.o $bn_obj = bn-586.o co-586.o x86-mont.o x86-gf2m.o -$ec_obj = +$ec_obj = ecp_nistz256.o ecp_nistz256-x86.o $des_obj = des-586.o crypt586.o $aes_obj = aes-586.o vpaes-x86.o aesni-x86.o $bf_obj = bf-586.o @@ -588,7 +588,7 @@ $lflags = -lsocket $bn_ops = DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid.o $bn_obj = bn-586.o co-586.o x86-mont.o x86-gf2m.o -$ec_obj = +$ec_obj = ecp_nistz256.o ecp_nistz256-x86.o $des_obj = des-586.o crypt586.o $aes_obj = aes-586.o vpaes-x86.o aesni-x86.o $bf_obj = bf-586.o @@ -690,7 +690,7 @@ $lflags = $bn_ops = BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN RC4_INDEX MD2_INT $cpuid_obj = x86cpuid.o $bn_obj = bn-586.o co-586.o x86-mont.o x86-gf2m.o -$ec_obj = +$ec_obj = ecp_nistz256.o ecp_nistz256-x86.o $des_obj = des-586.o crypt586.o $aes_obj = aes-586.o vpaes-x86.o aesni-x86.o $bf_obj = bf-586.o @@ -1064,7 +1064,7 @@ $lflags = -ldl $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid.o $bn_obj = bn-586.o co-586.o x86-mont.o x86-gf2m.o -$ec_obj = +$ec_obj = ecp_nistz256.o ecp_nistz256-x86.o $des_obj = des-586.o crypt586.o $aes_obj = aes-586.o vpaes-x86.o aesni-x86.o $bf_obj = bf-586.o @@ -1132,7 +1132,7 @@ $lflags = -ldl $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid.o $bn_obj = bn-586.o co-586.o x86-mont.o x86-gf2m.o -$ec_obj = +$ec_obj = ecp_nistz256.o ecp_nistz256-x86.o $des_obj = des-586.o crypt586.o $aes_obj = aes-586.o vpaes-x86.o aesni-x86.o $bf_obj = bf-586.o @@ -1200,7 +1200,7 @@ $lflags = -Wl,-search_paths_first% $bn_ops = BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR $cpuid_obj = x86cpuid.o $bn_obj = bn-586.o co-586.o x86-mont.o x86-gf2m.o -$ec_obj = +$ec_obj = ecp_nistz256.o ecp_nistz256-x86.o $des_obj = des-586.o crypt586.o $aes_obj = aes-586.o vpaes-x86.o aesni-x86.o $bf_obj = bf-586.o @@ -1404,7 +1404,7 @@ $lflags = $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid.o $bn_obj = bn-586.o co-586.o x86-mont.o x86-gf2m.o -$ec_obj = +$ec_obj = ecp_nistz256.o ecp_nistz256-x86.o $des_obj = des-586.o crypt586.o $aes_obj = aes-586.o vpaes-x86.o aesni-x86.o $bf_obj = bf-586.o @@ -1438,7 +1438,7 @@ $lflags = $bn_ops = BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN RC4_INDEX MD2_INT $cpuid_obj = x86cpuid.o $bn_obj = bn-586.o co-586.o x86-mont.o x86-gf2m.o -$ec_obj = +$ec_obj = ecp_nistz256.o ecp_nistz256-x86.o $des_obj = des-586.o crypt586.o $aes_obj = aes-586.o vpaes-x86.o aesni-x86.o $bf_obj = bf-586.o @@ -1948,7 +1948,7 @@ $lflags = -Wl,-search_paths_first% $bn_ops = BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR $cpuid_obj = x86cpuid.o $bn_obj = bn-586.o co-586.o x86-mont.o x86-gf2m.o -$ec_obj = +$ec_obj = ecp_nistz256.o ecp_nistz256-x86.o $des_obj = des-586.o crypt586.o $aes_obj = aes-586.o vpaes-x86.o aesni-x86.o $bf_obj = bf-586.o @@ -2152,7 +2152,7 @@ $lflags = -ldl $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid.o $bn_obj = bn-586.o co-586.o x86-mont.o x86-gf2m.o -$ec_obj = +$ec_obj = ecp_nistz256.o ecp_nistz256-x86.o $des_obj = des-586.o crypt586.o $aes_obj = aes-586.o vpaes-x86.o aesni-x86.o $bf_obj = bf-586.o @@ -2186,7 +2186,7 @@ $lflags = -ldl $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid.o $bn_obj = bn-586.o co-586.o x86-mont.o x86-gf2m.o -$ec_obj = +$ec_obj = ecp_nistz256.o ecp_nistz256-x86.o $des_obj = des-586.o crypt586.o $aes_obj = aes-586.o vpaes-x86.o aesni-x86.o $bf_obj = bf-586.o @@ -2288,7 +2288,7 @@ $lflags = -lefence -ldl $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid.o $bn_obj = bn-586.o co-586.o x86-mont.o x86-gf2m.o -$ec_obj = +$ec_obj = ecp_nistz256.o ecp_nistz256-x86.o $des_obj = des-586.o crypt586.o $aes_obj = aes-586.o vpaes-x86.o aesni-x86.o $bf_obj = bf-586.o @@ -2322,7 +2322,7 @@ $lflags = -ldl $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid.o $bn_obj = bn-586.o co-586.o x86-mont.o x86-gf2m.o -$ec_obj = +$ec_obj = ecp_nistz256.o ecp_nistz256-x86.o $des_obj = des-586.o crypt586.o $aes_obj = aes-586.o vpaes-x86.o aesni-x86.o $bf_obj = bf-586.o @@ -2458,7 +2458,7 @@ $lflags = -ldl $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid.o $bn_obj = bn-586.o co-586.o x86-mont.o x86-gf2m.o -$ec_obj = +$ec_obj = ecp_nistz256.o ecp_nistz256-x86.o $des_obj = des-586.o crypt586.o $aes_obj = aes-586.o vpaes-x86.o aesni-x86.o $bf_obj = bf-586.o @@ -2492,7 +2492,7 @@ $lflags = -ldl $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid.o $bn_obj = bn-586.o co-586.o x86-mont.o x86-gf2m.o -$ec_obj = +$ec_obj = ecp_nistz256.o ecp_nistz256-x86.o $des_obj = des-586.o crypt586.o $aes_obj = aes-586.o vpaes-x86.o aesni-x86.o $bf_obj = bf-586.o @@ -2560,7 +2560,7 @@ $lflags = $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid.o $bn_obj = bn-586.o co-586.o x86-mont.o x86-gf2m.o -$ec_obj = +$ec_obj = ecp_nistz256.o ecp_nistz256-x86.o $des_obj = des-586.o crypt586.o $aes_obj = aes-586.o vpaes-x86.o aesni-x86.o $bf_obj = bf-586.o @@ -2764,7 +2764,7 @@ $lflags = -rdynamic -ldl $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid.o $bn_obj = bn-586.o co-586.o x86-mont.o x86-gf2m.o -$ec_obj = +$ec_obj = ecp_nistz256.o ecp_nistz256-x86.o $des_obj = des-586.o crypt586.o $aes_obj = aes-586.o vpaes-x86.o aesni-x86.o $bf_obj = bf-586.o @@ -3478,7 +3478,7 @@ $lflags = -ldl $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid.o $bn_obj = bn-586.o co-586.o x86-mont.o x86-gf2m.o -$ec_obj = +$ec_obj = ecp_nistz256.o ecp_nistz256-x86.o $des_obj = des-586.o crypt586.o $aes_obj = aes-586.o vpaes-x86.o aesni-x86.o $bf_obj = bf-586.o @@ -3954,7 +3954,7 @@ $lflags = $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid.o $bn_obj = bn-586.o co-586.o x86-mont.o x86-gf2m.o -$ec_obj = +$ec_obj = ecp_nistz256.o ecp_nistz256-x86.o $des_obj = des-586.o crypt586.o $aes_obj = aes-586.o vpaes-x86.o aesni-x86.o $bf_obj = bf-586.o @@ -4056,7 +4056,7 @@ $lflags = -ldl $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid.o $bn_obj = bn-586.o co-586.o x86-mont.o x86-gf2m.o -$ec_obj = +$ec_obj = ecp_nistz256.o ecp_nistz256-x86.o $des_obj = des-586.o crypt586.o $aes_obj = aes-586.o vpaes-x86.o aesni-x86.o $bf_obj = bf-586.o @@ -4158,7 +4158,7 @@ $lflags = -ldl -no_cpprt $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid.o $bn_obj = bn-586.o co-586.o x86-mont.o x86-gf2m.o -$ec_obj = +$ec_obj = ecp_nistz256.o ecp_nistz256-x86.o $des_obj = des-586.o crypt586.o $aes_obj = aes-586.o vpaes-x86.o aesni-x86.o $bf_obj = bf-586.o @@ -4770,7 +4770,7 @@ $lflags = -lws2_32 -lgdi32 -lcrypt32 $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT EXPORT_VAR_AS_FN $cpuid_obj = x86cpuid.o $bn_obj = bn-586.o co-586.o x86-mont.o x86-gf2m.o -$ec_obj = +$ec_obj = ecp_nistz256.o ecp_nistz256-x86.o $des_obj = des-586.o crypt586.o $aes_obj = aes-586.o vpaes-x86.o aesni-x86.o $bf_obj = bf-586.o @@ -5314,7 +5314,7 @@ $lflags = -lsocket -lnsl $bn_ops = DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid.o $bn_obj = bn-586.o co-586.o x86-mont.o x86-gf2m.o -$ec_obj = +$ec_obj = ecp_nistz256.o ecp_nistz256-x86.o $des_obj = des-586.o crypt586.o $aes_obj = aes-586.o vpaes-x86.o aesni-x86.o $bf_obj = bf-586.o @@ -5348,7 +5348,7 @@ $lflags = -lsocket -lnsl $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid.o $bn_obj = bn-586.o co-586.o x86-mont.o x86-gf2m.o -$ec_obj = +$ec_obj = ecp_nistz256.o ecp_nistz256-x86.o $des_obj = des-586.o crypt586.o $aes_obj = aes-586.o vpaes-x86.o aesni-x86.o $bf_obj = bf-586.o @@ -5620,7 +5620,7 @@ $lflags = -lsocket -lnsl -ldl $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid.o $bn_obj = bn-586.o co-586.o x86-mont.o x86-gf2m.o -$ec_obj = +$ec_obj = ecp_nistz256.o ecp_nistz256-x86.o $des_obj = des-586.o crypt586.o $aes_obj = aes-586.o vpaes-x86.o aesni-x86.o $bf_obj = bf-586.o @@ -6028,7 +6028,7 @@ $lflags = -lsocket -lnsl $bn_ops = BN_LLONG MD2_CHAR RC4_INDEX DES_PTR DES_RISC1 DES_UNROLL $cpuid_obj = x86cpuid.o $bn_obj = bn-586.o co-586.o x86-mont.o x86-gf2m.o -$ec_obj = +$ec_obj = ecp_nistz256.o ecp_nistz256-x86.o $des_obj = des-586.o crypt586.o $aes_obj = aes-586.o vpaes-x86.o aesni-x86.o $bf_obj = bf-586.o @@ -6062,7 +6062,7 @@ $lflags = -lsocket -lnsl $bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT $cpuid_obj = x86cpuid.o $bn_obj = bn-586.o co-586.o x86-mont.o x86-gf2m.o -$ec_obj = +$ec_obj = ecp_nistz256.o ecp_nistz256-x86.o $des_obj = des-586.o crypt586.o $aes_obj = aes-586.o vpaes-x86.o aesni-x86.o $bf_obj = bf-586.o -- 2.34.1