Module Name: src
Committed By: christos
Date: Mon Feb 26 01:33:06 UTC 2018
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc: crypto.inc
ec.inc
Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc: sparccap.c
Log Message:
make this link again:
- we don't want to define the reference impl flag because there is no
complete c reference impl for nistz256
- we want to define an empty OPENSSL_cpuid_setup() because we don't want
to use the v9 one... this function is called from 2 places:
1. in the sparccpuid.S assembly, which we need for the CRYPTO_mem*
functions -- but we could get rid of the v9 stuff with
#ifdef __sparc_v9__ for size and we don't bother
2. crypto/init.c
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/sparccap.c
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/arch/sparc/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc:1.6 src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc:1.7
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc:1.6 Sat Feb 24 16:51:22 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc Sun Feb 25 20:33:05 2018
@@ -1,9 +1,10 @@
.PATH.S: ${.PARSEDIR}
+.PATH.c: ${.PARSEDIR}
CPUID = yes
-CPUID_SRCS += sparccpuid.S
+CPUID_SRCS += sparccpuid.S sparccap.c
.if ${MACHINE} == "sparc64"
-CPUID_SRCS += sparcv9cap.c sparcv9-mont.S sparcv9a-mont.S
+CPUID_SRCS += sparcv9-mont.S sparcv9a-mont.S
CPUID_SRCS += sparct4-mont.S vis3-mont.S
#CPPFLAGS += -DOPENSSL_BN_ASM_MONT
AFLAGS.sparcv9-mont.S+= -Wa,-Av9
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc:1.5 src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc:1.6
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc:1.5 Sat Feb 24 16:45:57 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc Sun Feb 25 20:33:05 2018
@@ -6,7 +6,6 @@ EC_SRCS += \
ECNI = yes
AFLAGS.ecp_nistz256-sparcv9.S += -Wa,-Av9
.else
-ECCPPFLAGS+=-DECP_NISTZ256_REFERENCE_IMPLEMENTATION
.endif
.include "../../ec.inc"
Added files:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/sparccap.c
diff -u /dev/null src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/sparccap.c:1.1
--- /dev/null Sun Feb 25 20:33:06 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/sparccap.c Sun Feb 25 20:33:05 2018
@@ -0,0 +1,6 @@
+
+void OPENSSL_cpuid_setup(void);
+
+void OPENSSL_cpuid_setup(void)
+{
+}
