Module Name: src
Committed By: christos
Date: Fri Jul 27 16:05:27 UTC 2012
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto: engine.inc
Log Message:
only x86 has AESNI
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/openssl/lib/libcrypto/engine.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/engine.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/engine.inc:1.5 src/crypto/external/bsd/openssl/lib/libcrypto/engine.inc:1.6
--- src/crypto/external/bsd/openssl/lib/libcrypto/engine.inc:1.5 Thu Jul 26 16:21:20 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/engine.inc Fri Jul 27 12:05:27 2012
@@ -1,4 +1,4 @@
-# $NetBSD: engine.inc,v 1.5 2012/07/26 20:21:20 christos Exp $
+# $NetBSD: engine.inc,v 1.6 2012/07/27 16:05:27 christos Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -12,7 +12,6 @@
ENGINE_SRCS = eng_err.c eng_lib.c eng_list.c eng_init.c eng_ctrl.c \
eng_table.c eng_pkey.c eng_fat.c eng_all.c tb_asnmth.c \
tb_rsa.c tb_dsa.c tb_dh.c tb_rand.c tb_cipher.c tb_digest.c \
- eng_aesni.c \
eng_openssl.c eng_dyn.c eng_cnf.c eng_rdrand.c eng_rsax.c \
eng_cryptodev.c tb_store.c tb_ecdsa.c tb_ecdh.c tb_pkmeth.c \
e_4758cca.c e_4758cca_err.c \
@@ -26,11 +25,11 @@ ENGINE_SRCS = eng_err.c eng_lib.c eng_li
e_ubsec.c e_ubsec_err.c \
e_padlock.c e_seed.c
-#.if defined(AESNI)
-#ENGINE_SRCS+= eng_aesni.c
-#.else
-#AESCPPFLAGS=-DOPENSSL_NO_HW_AESNI
-#.endif
+.if defined(AESNI)
+ENGINE_SRCS+= eng_aesni.c
+.else
+AESCPPFLAGS=-DOPENSSL_NO_HW_AESNI
+.endif
ENGINE_SRCS += gost2001.c gost2001_keyx.c gost89.c gost94_keyx.c gost_ameth.c \
gost_asn1.c gost_crypt.c gost_ctl.c gost_eng.c gosthash.c \
