Module Name: src
Committed By: christos
Date: Sat Feb 24 21:45:57 UTC 2018
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto: ec.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc: crypto.inc
ec.inc poly1305.inc
Log Message:
fix sparc.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/poly1305.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/ec.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc:1.5 src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc:1.6
--- src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc:1.5 Sun Feb 18 18:41:44 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc Sat Feb 24 16:45:57 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ec.inc,v 1.5 2018/02/18 23:41:44 christos Exp $
+# $NetBSD: ec.inc,v 1.6 2018/02/24 21:45:57 christos Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -38,15 +38,17 @@ ecp_nistp224.c \
ecp_nistp256.c \
ecp_nistp521.c \
ecp_nistputil.c \
-ecp_nistz256.c \
ecp_oct.c \
ecp_smpl.c \
ecx_meth.c
SRCS += ${EC_SRCS}
+.if defined(ECNI)
COPTS.ecp_nistz256.c+=-Wno-error=stack-protector
+SRCS+= ecp_nistz256.c
+.endif
.for cryptosrc in ${EC_SRCS}
-CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/ec
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/ec ${ECCPPFLAGS}
.endfor
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.4 src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc:1.4 Thu Nov 3 18:18:29 2016
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc Sat Feb 24 16:45:57 2018
@@ -1,5 +1,5 @@
-.if ${MACHINE} == "sparc64"
.PATH.S: ${.PARSEDIR}
+.if ${MACHINE} == "sparc64"
CPUID_SRCS = sparcv9cap.c sparccpuid.S sparcv9-mont.S sparcv9a-mont.S
CPUID_SRCS += sparct4-mont.S vis3-mont.S
CPUID = yes
@@ -8,5 +8,8 @@ AFLAGS.sparcv9-mont.S+= -Wa,-Av9
AFLAGS.sparcv9a-mont.S+= -Wa,-Av9a
AFLAGS.sparct4-mont.S+= -Wa,-Av9a
AFLAGS.vis3-mont.S+= -Wa,-Av9a
+.else
+CPUID = yes
+CPUID_SRCS = sparccpuid.S
.endif
.include "../../crypto.inc"
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.4 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.4 Sat Feb 24 15:23:58 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc Sat Feb 24 16:45:57 2018
@@ -1,7 +1,12 @@
+.if ${MACHINE} == "sparc64"
.PATH.S: ${.PARSEDIR}
EC_SRCS += \
+ ecp_nistz256-sparcv9.S
ECNI = yes
AFLAGS.ecp_nistz256-sparcv9.S += -Wa,-Av9
+.else
+ECCPPFLAGS+=-DECP_NISTZ256_REFERENCE_IMPLEMENTATION
+.endif
.include "../../ec.inc"
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/poly1305.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/poly1305.inc:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/poly1305.inc:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/poly1305.inc:1.4 Sat Feb 24 15:23:58 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/poly1305.inc Sat Feb 24 16:45:57 2018
@@ -1,8 +1,10 @@
+.if ${MACHINE} == "sparc64"
.PATH.S: ${.PARSEDIR}
POLY1305_SRCS = poly1305-sparcv9.S
POLY1305_CPPFLAGS+=-DPOLY1305_ASM
AFLAGS.poly1305-sparcv9.S+= -Wa,-Av9
+.endif
.include "../../poly1305.inc"
