Module Name: src
Committed By: nakayama
Date: Sun Mar 2 08:58:02 UTC 2014
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto: modes.inc sha.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64: crypto.inc
des.inc
Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64: aes.inc
modes.inc sha.inc
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/modes.inc
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/sha.inc
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/aes.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/modes.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/sha.inc
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/des.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/modes.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/modes.inc:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/modes.inc:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/modes.inc:1.3 Mon Feb 18 21:15:25 2013
+++ src/crypto/external/bsd/openssl/lib/libcrypto/modes.inc Sun Mar 2 08:58:02 2014
@@ -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 @@ MODES_SRCS += cbc128.c ctr128.c cts128.c
SRCS += ${MODES_SRCS}
.for cryptosrc in ${MODES_SRCS}
-CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/modes
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/modes ${MODESCPPFLAGS}
.endfor
Index: src/crypto/external/bsd/openssl/lib/libcrypto/sha.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/sha.inc:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/sha.inc:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/sha.inc:1.1 Sun Jul 19 23:30:44 2009
+++ src/crypto/external/bsd/openssl/lib/libcrypto/sha.inc Sun Mar 2 08:58:02 2014
@@ -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 @@ SHA_SRCS+= libc-sha512.c libc-sha256.c
SRCS += ${SHA_SRCS}
.for cryptosrc in ${SHA_SRCS}
-CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/sha
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/sha ${SHACPPFLAGS}
.endfor
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc:1.4 Tue Jul 31 11:08:34 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc Sun Mar 2 08:58:02 2014
@@ -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"
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/des.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/des.inc:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/des.inc:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/des.inc:1.1 Sun Jul 19 23:30:46 2009
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/des.inc Sun Mar 2 08:58:02 2014
@@ -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"
Added files:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/aes.inc
diff -u /dev/null src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/aes.inc:1.1
--- /dev/null Sun Mar 2 08:58:02 2014
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/aes.inc Sun Mar 2 08:58:02 2014
@@ -0,0 +1,4 @@
+.PATH.S: ${.PARSEDIR}
+AES_SRCS = aes_core.c aes_cbc.c aes-sparcv9.S
+AESCPPFLAGS = -DAES_ASM
+.include "../../aes.inc"
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/modes.inc
diff -u /dev/null src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/modes.inc:1.1
--- /dev/null Sun Mar 2 08:58:02 2014
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/modes.inc Sun Mar 2 08:58:02 2014
@@ -0,0 +1,4 @@
+.PATH.S: ${.PARSEDIR}
+MODES_SRCS = ghash-sparcv9.o
+MODESCPPFLAGS = -DGHASH_ASM
+.include "../../modes.inc"
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/sha.inc
diff -u /dev/null src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/sha.inc:1.1
--- /dev/null Sun Mar 2 08:58:02 2014
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/sha.inc Sun Mar 2 08:58:02 2014
@@ -0,0 +1,4 @@
+.PATH.S: ${.PARSEDIR}
+SHA_SRCS = sha1-sparcv9.S
+SHACPPFLAGS = -DSHA1_ASM
+.include "../../sha.inc"
