[src/trunk]: src/crypto/external/bsd/openssl/lib/libcrypto Use more assembler...

[nakayama <nakayama%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/677a894e45f6
branches:  trunk
changeset: 327227:677a894e45f6
user:      nakayama <nakayama%NetBSD.org@localhost>
date:      Sun Mar 02 08:58:02 2014 +0000

description:
Use more assembler code on sparc64.
bn-sparcv9.S and OPENSSL_BN_ASM_MONT don't work well since they
assume BN_ULONG is 32-bit, so don't use them.

diffstat:

 crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/aes.inc    |  4 ++++
 crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc |  1 +
 crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/des.inc    |  4 +++-
 crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/modes.inc  |  4 ++++
 crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/sha.inc    |  4 ++++
 crypto/external/bsd/openssl/lib/libcrypto/modes.inc               |  4 ++--
 crypto/external/bsd/openssl/lib/libcrypto/sha.inc                 |  6 +++---
 7 files changed, 21 insertions(+), 6 deletions(-)

diffs (86 lines):

diff -r 47affd787197 -r 677a894e45f6 crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/aes.inc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/aes.inc    Sun Mar 02 08:58:02 2014 +0000
@@ -0,0 +1,4 @@
+.PATH.S: ${.PARSEDIR}
+AES_SRCS = aes_core.c aes_cbc.c aes-sparcv9.S
+AESCPPFLAGS = -DAES_ASM
+.include "../../aes.inc"
diff -r 47affd787197 -r 677a894e45f6 crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc Sun Mar 02 08:50:34 2014 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc Sun Mar 02 08:58:02 2014 +0000
@@ -1,4 +1,5 @@
 .PATH.S: ${.PARSEDIR}
 CPUID_SRCS = sparcv9cap.c sparccpuid.S sparcv9-mont.S sparcv9a-mont.S
 CPUID = yes
+#CPPFLAGS += -DOPENSSL_BN_ASM_MONT
 .include "../../crypto.inc"
diff -r 47affd787197 -r 677a894e45f6 crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/des.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/des.inc    Sun Mar 02 08:50:34 2014 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/des.inc    Sun Mar 02 08:58:02 2014 +0000
@@ -1,5 +1,7 @@
-#      $NetBSD: des.inc,v 1.1 2009/07/19 23:30:46 christos Exp $
+#      $NetBSD: des.inc,v 1.2 2014/03/02 08:58:02 nakayama Exp $
 
+.PATH.S: ${.PARSEDIR}
+DES_SRCS = des_enc-sparc.S fcrypt_b.c
 CPPFLAGS+=     -DDES_RISC2 -DDES_PTR
 
 .include "${.CURDIR}/des.inc"
diff -r 47affd787197 -r 677a894e45f6 crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/modes.inc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/modes.inc  Sun Mar 02 08:58:02 2014 +0000
@@ -0,0 +1,4 @@
+.PATH.S: ${.PARSEDIR}
+MODES_SRCS = ghash-sparcv9.o
+MODESCPPFLAGS = -DGHASH_ASM
+.include "../../modes.inc"
diff -r 47affd787197 -r 677a894e45f6 crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/sha.inc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/sha.inc    Sun Mar 02 08:58:02 2014 +0000
@@ -0,0 +1,4 @@
+.PATH.S: ${.PARSEDIR}
+SHA_SRCS = sha1-sparcv9.S
+SHACPPFLAGS = -DSHA1_ASM
+.include "../../sha.inc"
diff -r 47affd787197 -r 677a894e45f6 crypto/external/bsd/openssl/lib/libcrypto/modes.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/modes.inc       Sun Mar 02 08:50:34 2014 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/modes.inc       Sun Mar 02 08:58:02 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: modes.inc,v 1.3 2013/02/18 21:15:25 riastradh Exp $
+#      $NetBSD: modes.inc,v 1.4 2014/03/02 08:58:02 nakayama Exp $
 #
 #      @(#) Copyright (c) 1995 Simon J. Gerraty
 #
@@ -14,5 +14,5 @@
 SRCS += ${MODES_SRCS}
 
 .for cryptosrc in ${MODES_SRCS}
-CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/modes
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/modes ${MODESCPPFLAGS}
 .endfor
diff -r 47affd787197 -r 677a894e45f6 crypto/external/bsd/openssl/lib/libcrypto/sha.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/sha.inc Sun Mar 02 08:50:34 2014 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/sha.inc Sun Mar 02 08:58:02 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: sha.inc,v 1.1 2009/07/19 23:30:44 christos Exp $
+#      $NetBSD: sha.inc,v 1.2 2014/03/02 08:58:02 nakayama Exp $
 #
 #      @(#) Copyright (c) 1995 Simon J. Gerraty
 #
@@ -8,7 +8,7 @@
 .PATH: ${OPENSSLSRC}/crypto/sha
 
 
-SHA_SRCS = sha_dgst.c sha1dgst.c sha_one.c sha1_one.c
+SHA_SRCS += sha_dgst.c sha1dgst.c sha_one.c sha1_one.c
 
 # Replaced OpenSSL version to avoid overlap with libc
 SHA_SRCS+= libc-sha512.c libc-sha256.c
@@ -16,5 +16,5 @@
 SRCS += ${SHA_SRCS}
 
 .for cryptosrc in ${SHA_SRCS}
-CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/sha
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/sha ${SHACPPFLAGS}
 .endfor