Module Name: src
Committed By: snj
Date: Wed Apr 15 04:30:11 UTC 2015
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto [netbsd-6-0]: evp.inc
modes.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386 [netbsd-6-0]:
aes.inc
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #832):
crypto/external/bsd/openssl/lib/libcrypto/evp.inc: revision 1.5
crypto/external/bsd/openssl/lib/libcrypto/modes.inc: revision 1.3
crypto/external/bsd/openssl/lib/libcrypto/arch/i386/aes.inc: revision
1.3
Fix build goo for OpenSSL AES-NI support.
OpenSSL now supports AES-NI in evp, not in an engine. We can now get
rid of the no longer maintained aesni engine, which was broken last
summer. Not only can OpenSSL now use AES-NI for everything it did
before we broke it last summer, but it can also use AES-NI for more
encryption modes than before, such as CTR.
Tested on amd64, both vanilla and in an i386 chroot.
ok christos
To generate a diff of this commit:
cvs rdiff -u -r1.2.4.1.4.2 -r1.2.4.1.4.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/evp.inc
cvs rdiff -u -r1.1.8.1.4.2 -r1.1.8.1.4.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/modes.inc
cvs rdiff -u -r1.2 -r1.2.10.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/aes.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/evp.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/evp.inc:1.2.4.1.4.2 src/crypto/external/bsd/openssl/lib/libcrypto/evp.inc:1.2.4.1.4.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/evp.inc:1.2.4.1.4.2 Thu Apr 2 17:58:49 2015
+++ src/crypto/external/bsd/openssl/lib/libcrypto/evp.inc Wed Apr 15 04:30:11 2015
@@ -1,4 +1,4 @@
-# $NetBSD: evp.inc,v 1.2.4.1.4.2 2015/04/02 17:58:49 snj Exp $
+# $NetBSD: evp.inc,v 1.2.4.1.4.3 2015/04/15 04:30:11 snj Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -25,3 +25,14 @@ SRCS += ${EVP_SRCS}
.for cryptosrc in ${EVP_SRCS}
CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/evp
.endfor
+
+EVP_AES_SRCS = e_aes.c
+
+# XXX Should do this too, but it requires some other asm changes.
+#EVP_AES_SRCS += e_aes_cbc_hmac_sha1.c
+
+.for cryptosrc in ${EVP_AES_SRCS}
+CPPFLAGS.${cryptosrc} += ${AESCPPFLAGS}
+.endfor
+
+CPPFLAGS.e_aes.c += -I${OPENSSLSRC}/crypto/modes
Index: src/crypto/external/bsd/openssl/lib/libcrypto/modes.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/modes.inc:1.1.8.1.4.2 src/crypto/external/bsd/openssl/lib/libcrypto/modes.inc:1.1.8.1.4.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/modes.inc:1.1.8.1.4.2 Thu Apr 2 17:58:49 2015
+++ src/crypto/external/bsd/openssl/lib/libcrypto/modes.inc Wed Apr 15 04:30:11 2015
@@ -1,4 +1,4 @@
-# $NetBSD: modes.inc,v 1.1.8.1.4.2 2015/04/02 17:58:49 snj Exp $
+# $NetBSD: modes.inc,v 1.1.8.1.4.3 2015/04/15 04:30:11 snj Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -16,4 +16,3 @@ SRCS += ${MODES_SRCS}
.for cryptosrc in ${MODES_SRCS}
CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/modes ${MODESCPPFLAGS}
.endfor
-CPPFLAGS.e_aes.c = -I${OPENSSLSRC}/crypto/modes
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/aes.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/aes.inc:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/aes.inc:1.2.10.1
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/aes.inc:1.2 Tue Jul 5 16:53:58 2011
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/aes.inc Wed Apr 15 04:30:11 2015
@@ -1,5 +1,5 @@
.PATH.S: ${.PARSEDIR}
-AES_SRCS = aes-586.S aesni-586.S
+AES_SRCS = aes-586.S aesni-x86.S
AESNI = yes
AESCPPFLAGS = -DAES_ASM -DOPENSSL_IA32_SSE2
.include "../../aes.inc"
