[src/netbsd-6-0]: src/crypto/external/bsd/openssl/lib/libcrypto Pull up follo...

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

details:   https://anonhg.NetBSD.org/src/rev/b1fd7a265c77
branches:  netbsd-6-0
changeset: 775067:b1fd7a265c77
user:      snj <snj%NetBSD.org@localhost>
date:      Wed Apr 15 04:30:11 2015 +0000

description:
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

diffstat:

 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/aes.inc |   2 +-
 crypto/external/bsd/openssl/lib/libcrypto/evp.inc           |  13 ++++++++++++-
 crypto/external/bsd/openssl/lib/libcrypto/modes.inc         |   3 +--
 3 files changed, 14 insertions(+), 4 deletions(-)

diffs (48 lines):

diff -r 52b0920e1ee4 -r b1fd7a265c77 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/aes.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/aes.inc       Tue Apr 14 15:25:46 2015 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/aes.inc       Wed Apr 15 04:30:11 2015 +0000
@@ -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"
diff -r 52b0920e1ee4 -r b1fd7a265c77 crypto/external/bsd/openssl/lib/libcrypto/evp.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/evp.inc Tue Apr 14 15:25:46 2015 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/evp.inc Wed Apr 15 04:30:11 2015 +0000
@@ -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 @@
 .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
diff -r 52b0920e1ee4 -r b1fd7a265c77 crypto/external/bsd/openssl/lib/libcrypto/modes.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/modes.inc       Tue Apr 14 15:25:46 2015 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/modes.inc       Wed Apr 15 04:30:11 2015 +0000
@@ -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 @@
 .for cryptosrc in ${MODES_SRCS}
 CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/modes ${MODESCPPFLAGS}
 .endfor
-CPPFLAGS.e_aes.c = -I${OPENSSLSRC}/crypto/modes