Module Name: src
Committed By: christos
Date: Fri Jul 27 18:10:40 UTC 2012
Modified Files:
src/crypto/external/bsd/openssl/dist/crypto: cryptlib.c
src/crypto/external/bsd/openssl/lib/libcrypto: engine.inc
Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: crypto.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc: crypto.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64: crypto.inc
Log Message:
provide OPENSSL_cpuid_setup to the haves and the havenots
[still there are other platforms ia64, s370, powerpc64] where we can do better.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r1.2 \
src/crypto/external/bsd/openssl/dist/crypto/cryptlib.c
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssl/lib/libcrypto/engine.inc
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/crypto.inc
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.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/dist/crypto/cryptlib.c
diff -u src/crypto/external/bsd/openssl/dist/crypto/cryptlib.c:1.1.1.5 src/crypto/external/bsd/openssl/dist/crypto/cryptlib.c:1.2
--- src/crypto/external/bsd/openssl/dist/crypto/cryptlib.c:1.1.1.5 Thu Jul 26 10:59:06 2012
+++ src/crypto/external/bsd/openssl/dist/crypto/cryptlib.c Fri Jul 27 14:10:40 2012
@@ -718,7 +718,7 @@ void OPENSSL_cpuid_setup(void)
unsigned long *OPENSSL_ia32cap_loc(void) { return NULL; }
#endif
int OPENSSL_NONPIC_relocated = 0;
-#if !defined(OPENSSL_CPUID_SETUP) && !defined(OPENSSL_CPUID_OBJ)
+#if (!defined(OPENSSL_CPUID_SETUP) && !defined(OPENSSL_CPUID_OBJ)) || defined(NEED_CPUID_SETUP)
void OPENSSL_cpuid_setup(void) {}
#endif
Index: src/crypto/external/bsd/openssl/lib/libcrypto/engine.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/engine.inc:1.6 src/crypto/external/bsd/openssl/lib/libcrypto/engine.inc:1.7
--- src/crypto/external/bsd/openssl/lib/libcrypto/engine.inc:1.6 Fri Jul 27 12:05:27 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/engine.inc Fri Jul 27 14:10:40 2012
@@ -1,4 +1,4 @@
-# $NetBSD: engine.inc,v 1.6 2012/07/27 16:05:27 christos Exp $
+# $NetBSD: engine.inc,v 1.7 2012/07/27 18:10:40 christos Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -28,7 +28,7 @@ ENGINE_SRCS = eng_err.c eng_lib.c eng_li
.if defined(AESNI)
ENGINE_SRCS+= eng_aesni.c
.else
-AESCPPFLAGS=-DOPENSSL_NO_HW_AESNI
+CRYPTOCPPFLAGS+=-DOPENSSL_NO_HW_AESNI
.endif
ENGINE_SRCS += gost2001.c gost2001_keyx.c gost89.c gost94_keyx.c gost_ameth.c \
@@ -38,6 +38,10 @@ ENGINE_SRCS += gost2001.c gost2001_keyx.
SRCS += ${ENGINE_SRCS}
+.if !defined(CPUID)
+CRYPTOCPPFLAGS+=-DNEED_CPUID_SETUP
+.endif
+
.for cryptosrc in ${ENGINE_SRCS}
-CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/engine ${AESCPPFLAGS} -DHAVE_CRYPTODEV
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/engine ${CRYPTOCPPFLAGS} -DHAVE_CRYPTODEV
.endfor
Added files:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc
diff -u /dev/null src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.1
--- /dev/null Fri Jul 27 14:10:41 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc Fri Jul 27 14:10:40 2012
@@ -0,0 +1,3 @@
+CPUID_SRCS = armcap.c
+CPUID = yes
+.include "../../crypto.inc"
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/crypto.inc
diff -u /dev/null src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/crypto.inc:1.1
--- /dev/null Fri Jul 27 14:10:41 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/crypto.inc Fri Jul 27 14:10:40 2012
@@ -0,0 +1,3 @@
+CPUID_SRCS = ppccap.c
+CPUID = yes
+.include "../../crypto.inc"
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc
diff -u /dev/null src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc:1.1
--- /dev/null Fri Jul 27 14:10:41 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc Fri Jul 27 14:10:40 2012
@@ -0,0 +1,3 @@
+CPUID_SRCS = sparcv9cap.c
+CPUID = yes
+.include "../../crypto.inc"
