Module Name: src
Committed By: riastradh
Date: Thu May 25 15:52:30 UTC 2023
Modified Files:
src/crypto/external/bsd/openssl/lib/engines: engines.mk
src/crypto/external/bsd/openssl/lib/libapps: Makefile
src/crypto/external/bsd/openssl/lib/libcommon: Makefile
src/crypto/external/bsd/openssl/lib/libcrypto: Makefile bf.inc gen
libc-sha256.c libc-sha512.c mkinc rc4.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386: ec.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64: ec.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc: crypto.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64: crypto.inc
ec.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64: crypto.inc
ec.inc sha.inc
src/crypto/external/bsd/openssl/lib/libcrypto/man: Makefile
src/crypto/external/bsd/openssl/lib/libdefault: Makefile
src/crypto/external/bsd/openssl/lib/liblegacy: Makefile
src/crypto/external/bsd/openssl/lib/libssl: Makefile statem.inc
Log Message:
openssl: Nix trailing whitespace in build goo.
No functional change intended.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/engines/engines.mk
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssl/lib/libapps/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcommon/Makefile
cvs rdiff -u -r1.29 -r1.30 \
src/crypto/external/bsd/openssl/lib/libcrypto/Makefile
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssl/lib/libcrypto/bf.inc
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/openssl/lib/libcrypto/gen \
src/crypto/external/bsd/openssl/lib/libcrypto/mkinc
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/libc-sha256.c
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcrypto/libc-sha512.c \
src/crypto/external/bsd/openssl/lib/libcrypto/rc4.inc
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ec.inc
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/ec.inc
cvs rdiff -u -r1.14 -r1.15 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/ec.inc
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/crypto.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha.inc
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ec.inc
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/openssl/lib/libcrypto/man/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/openssl/lib/libdefault/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssl/lib/liblegacy/Makefile
cvs rdiff -u -r1.14 -r1.15 \
src/crypto/external/bsd/openssl/lib/libssl/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libssl/statem.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/engines/engines.mk
diff -u src/crypto/external/bsd/openssl/lib/engines/engines.mk:1.2 src/crypto/external/bsd/openssl/lib/engines/engines.mk:1.3
--- src/crypto/external/bsd/openssl/lib/engines/engines.mk:1.2 Sun May 7 16:21:19 2023
+++ src/crypto/external/bsd/openssl/lib/engines/engines.mk Thu May 25 15:52:28 2023
@@ -1,4 +1,4 @@
-# $NetBSD: engines.mk,v 1.2 2023/05/07 16:21:19 christos Exp $
+# $NetBSD: engines.mk,v 1.3 2023/05/25 15:52:28 riastradh Exp $
NOLINT= # don't build a lint library
NOPROFILE= # don't build a profile library
@@ -14,7 +14,7 @@ CRYPTODIST= ${NETBSDSRCDIR}/crypto
.PATH: ${OPENSSLSRC}/engines
CPPFLAGS+= -I${OPENSSLSRC}/include -I${OPENSSLSRC}/../include
-
+
LIBDIR=${OSSL_ENGINESDIR}
.if ${MKPIC} != "no"
Index: src/crypto/external/bsd/openssl/lib/libapps/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libapps/Makefile:1.3 src/crypto/external/bsd/openssl/lib/libapps/Makefile:1.4
--- src/crypto/external/bsd/openssl/lib/libapps/Makefile:1.3 Tue May 23 12:04:42 2023
+++ src/crypto/external/bsd/openssl/lib/libapps/Makefile Thu May 25 15:52:28 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2023/05/23 12:04:42 christos Exp $
+# $NetBSD: Makefile,v 1.4 2023/05/25 15:52:28 riastradh Exp $
# RCSid:
# Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -8,10 +8,10 @@
# This file is provided in the hope that it will
# be of use. There is absolutely NO WARRANTY.
# Permission to copy, redistribute or otherwise
-# use this file is hereby granted provided that
+# use this file is hereby granted provided that
# the above copyright notice and this notice are
-# left intact.
-#
+# left intact.
+#
# Please send copies of changes and bug-fixes to:
# s...@quick.com.au
#
@@ -50,4 +50,3 @@ AFLAGS+=-DELF
OS_VERSION!= ${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh
.include <bsd.lib.mk>
-
Index: src/crypto/external/bsd/openssl/lib/libcommon/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libcommon/Makefile:1.4 src/crypto/external/bsd/openssl/lib/libcommon/Makefile:1.5
--- src/crypto/external/bsd/openssl/lib/libcommon/Makefile:1.4 Tue May 23 12:04:42 2023
+++ src/crypto/external/bsd/openssl/lib/libcommon/Makefile Thu May 25 15:52:28 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/05/23 12:04:42 christos Exp $
+# $NetBSD: Makefile,v 1.5 2023/05/25 15:52:28 riastradh Exp $
# RCSid:
# Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -8,10 +8,10 @@
# This file is provided in the hope that it will
# be of use. There is absolutely NO WARRANTY.
# Permission to copy, redistribute or otherwise
-# use this file is hereby granted provided that
+# use this file is hereby granted provided that
# the above copyright notice and this notice are
-# left intact.
-#
+# left intact.
+#
# Please send copies of changes and bug-fixes to:
# s...@quick.com.au
#
@@ -51,4 +51,3 @@ AFLAGS+=-DELF
OS_VERSION!= ${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh
.include <bsd.lib.mk>
-
Index: src/crypto/external/bsd/openssl/lib/libcrypto/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.29 src/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.30
--- src/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.29 Tue May 23 12:04:42 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/Makefile Thu May 25 15:52:28 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2023/05/23 12:04:42 christos Exp $
+# $NetBSD: Makefile,v 1.30 2023/05/25 15:52:28 riastradh Exp $
# RCSid:
# Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -8,10 +8,10 @@
# This file is provided in the hope that it will
# be of use. There is absolutely NO WARRANTY.
# Permission to copy, redistribute or otherwise
-# use this file is hereby granted provided that
+# use this file is hereby granted provided that
# the above copyright notice and this notice are
-# left intact.
-#
+# left intact.
+#
# Please send copies of changes and bug-fixes to:
# s...@quick.com.au
#
@@ -35,7 +35,7 @@ CRYPTODIST= ${NETBSDSRCDIR}/crypto
OPENSSLINC= ${OPENSSLSRC}/include/openssl
.include "${NETBSDSRCDIR}/crypto/Makefile.openssl"
-.PATH: ${OPENSSLSRC} ${OPENSSLINC}
+.PATH: ${OPENSSLSRC} ${OPENSSLINC}
.PATH: ${OPENSSLSRC}/../include/openssl
.include "srcs.inc"
@@ -224,7 +224,7 @@ CPPFLAGS+=-DOPENSSL_FIPS
SRCS+=fips_aes_core.c fips_aes_selftest.c
.PATH: ${OPENSSLSRC}/fips/des
SRCS+=fips_des_enc.c fips_des_selftest.c fips_set_key.c
-# asm/fips-dx86-elf.s
+# asm/fips-dx86-elf.s
.PATH: ${OPENSSLSRC}/fips/dh
SRCS+=fips_dh_check.c fips_dh_gen.c fips_dh_key.c
.PATH: ${OPENSSLSRC}/fips/dsa
@@ -283,4 +283,3 @@ $i: $i.in
.endfor
.include <bsd.lib.mk>
-
Index: src/crypto/external/bsd/openssl/lib/libcrypto/bf.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/bf.inc:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/bf.inc:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/bf.inc:1.2 Sat May 6 17:07:22 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/bf.inc Thu May 25 15:52:28 2023
@@ -1,8 +1,8 @@
-# $NetBSD: bf.inc,v 1.2 2023/05/06 17:07:22 christos Exp $
+# $NetBSD: bf.inc,v 1.3 2023/05/25 15:52:28 riastradh Exp $
.PATH: ${OPENSSLSRC}/crypto/bf
-BF_SRCS ?= bf_enc.c
+BF_SRCS ?= bf_enc.c
BF_SRCS += \
bf_cfb64.c \
Index: src/crypto/external/bsd/openssl/lib/libcrypto/gen
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/gen:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/gen:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/gen:1.1 Sat May 6 17:21:51 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/gen Thu May 25 15:52:28 2023
@@ -44,7 +44,7 @@ V=V"#define sk_OPENSSL_STRING_is_sorted(
V=V"#define sk_OPENSSL_STRING_dup(sk) ((STACK_OF(OPENSSL_STRING) *)OPENSSL_sk_dup(ossl_check_const_OPENSSL_STRING_sk_type(sk)))\n"
V=V"#define sk_OPENSSL_STRING_deep_copy(sk, copyfunc, freefunc) ((STACK_OF(OPENSSL_STRING) *)OPENSSL_sk_deep_copy(ossl_check_const_OPENSSL_STRING_sk_type(sk), ossl_check_OPENSSL_STRING_copyfunc_type(copyfunc), ossl_check_OPENSSL_STRING_freefunc_type(freefunc)))\n"
V=V"#define sk_OPENSSL_STRING_set_cmp_func(sk, cmp) ((sk_OPENSSL_STRING_compfunc)OPENSSL_sk_set_cmp_func(ossl_check_OPENSSL_STRING_sk_type(sk), ossl_check_OPENSSL_STRING_compfunc_type(cmp)))\n"
-
+
printf("%s", V);
next;
}
Index: src/crypto/external/bsd/openssl/lib/libcrypto/mkinc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/mkinc:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/mkinc:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/mkinc:1.1 Sat May 6 17:07:23 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/mkinc Thu May 25 15:52:28 2023
@@ -12,7 +12,7 @@ extract() {
else
c=$1
fi
- ls -1 ${BUILD}/crypto/$c/libcrypto-shlib-*.d | sed -e 's/.*-shlib-//' -e 's/\.d/.c \\/'
+ ls -1 ${BUILD}/crypto/$c/libcrypto-shlib-*.d | sed -e 's/.*-shlib-//' -e 's/\.d/.c \\/'
}
for d in ${DIRS} crypto; do
Index: src/crypto/external/bsd/openssl/lib/libcrypto/libc-sha256.c
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/libc-sha256.c:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/libc-sha256.c:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/libc-sha256.c:1.3 Sat May 6 17:07:23 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/libc-sha256.c Thu May 25 15:52:28 2023
@@ -15,8 +15,8 @@
#include <string.h>
#include <openssl/crypto.h>
-#undef OSSL_DEPRECATEDIN_3_0
-#define OSSL_DEPRECATEDIN_3_0
+#undef OSSL_DEPRECATEDIN_3_0
+#define OSSL_DEPRECATEDIN_3_0
#include <openssl/sha.h>
#include <openssl/opensslv.h>
Index: src/crypto/external/bsd/openssl/lib/libcrypto/libc-sha512.c
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/libc-sha512.c:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/libc-sha512.c:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/libc-sha512.c:1.4 Sat May 6 17:07:23 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/libc-sha512.c Thu May 25 15:52:28 2023
@@ -29,7 +29,7 @@ unsigned char *SHA384(const unsigned cha
if (md == NULL) md=m;
SHA384_Init(&c);
- SHA384_Update(&c, d, n);
+ SHA384_Update(&c, d, n);
SHA384_Final(md, &c);
OPENSSL_cleanse(&c, sizeof(c));
return(md);
Index: src/crypto/external/bsd/openssl/lib/libcrypto/rc4.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/rc4.inc:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/rc4.inc:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/rc4.inc:1.4 Sat May 6 17:07:23 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/rc4.inc Thu May 25 15:52:28 2023
@@ -1,10 +1,10 @@
-# $NetBSD: rc4.inc,v 1.4 2023/05/06 17:07:23 christos Exp $
+# $NetBSD: rc4.inc,v 1.5 2023/05/25 15:52:28 riastradh Exp $
.PATH: ${OPENSSLSRC}/crypto/rc4
RC4_SRCS ?= rc4_skey.c rc4_enc.c
-SRCS += ${RC4_SRCS}
+SRCS += ${RC4_SRCS}
.for cryptosrc in ${RC4_SRCS}
CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/rc4
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ec.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ec.inc:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ec.inc:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ec.inc:1.4 Wed May 17 19:09:41 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ec.inc Thu May 25 15:52:28 2023
@@ -1,6 +1,6 @@
.PATH.S: ${.PARSEDIR}
EC_SRCS += \
-ecp_nistz256-x86.S
+ecp_nistz256-x86.S
ECCPPFLAGS+= -DOPENSSL_NO_EC_NISTP_64_GCC_128
ECCPPFLAGS+= -DECP_NISTZ256_ASM
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/ec.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/ec.inc:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/ec.inc:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/ec.inc:1.4 Wed May 17 19:09:41 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/ec.inc Thu May 25 15:52:29 2023
@@ -3,7 +3,7 @@ EC_SRCS += \
ecp_nistz256-ppc64.S \
ecp_nistp521-ppc64.S \
ecp_ppc.c \
-x25519-ppc64.S
+x25519-ppc64.S
ECCPPFLAGS+= -DECP_NISTZ256_ASM
ECCPPFLAGS+= -DX25519_ASM
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.14 src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc:1.15
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc:1.14 Mon May 15 17:06:05 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc Thu May 25 15:52:29 2023
@@ -4,7 +4,7 @@ CPUID = yes
CPUID_SRCS += sparccpuid.S sparcv9cap.c
CPPFLAGS += -DOPENSSL_CPUID_OBJ
-CPUID_SRCS += 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/sparc64/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc:1.8 src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc:1.9
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc:1.8 Sat May 9 13:16:42 2020
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc Thu May 25 15:52:29 2023
@@ -1,5 +1,5 @@
.PATH.S: ${.PARSEDIR}
-CPUID_SRCS = sparcv9cap.c sparccpuid.S sparcv9-mont.S sparcv9a-mont.S
+CPUID_SRCS = sparcv9cap.c sparccpuid.S sparcv9-mont.S sparcv9a-mont.S
CPUID_SRCS += sparct4-mont.S vis3-mont.S
CPUID = yes
#CPPFLAGS += -DOPENSSL_BN_ASM_MONT
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/ec.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/ec.inc:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/ec.inc:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/ec.inc:1.2 Wed May 17 19:09:42 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/ec.inc Thu May 25 15:52:29 2023
@@ -1,6 +1,6 @@
.PATH.S: ${.PARSEDIR}
EC_SRCS += \
-ecp_nistz256-sparcv9.S
+ecp_nistz256-sparcv9.S
ECCPPFLAGS+= -DECP_NISTZ256_ASM
ECNI = yes
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/crypto.inc:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/crypto.inc:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/crypto.inc:1.3 Sat May 9 13:16:43 2020
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/crypto.inc Thu May 25 15:52:29 2023
@@ -1,5 +1,5 @@
.PATH.S: ${.PARSEDIR}
CPUID_SRCS = x86_64cpuid.S
-CPUID = yes
+CPUID = yes
CPPFLAGS += -DOPENSSL_CPUID_OBJ
.include "../../crypto.inc"
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha.inc:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha.inc:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha.inc:1.3 Sun Sep 23 13:33:05 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha.inc Thu May 25 15:52:29 2023
@@ -4,6 +4,6 @@ SHACPPFLAGS = -DSHA1_ASM -DKECCAK1600_AS
KECCAKNI = yes
.if 0
SHA_SRCS += sha512-x86_64.S sha256-mb-x86_64.S
-SHACPPFLAGS+= -DSHA256_ASM -DSHA512_ASM
+SHACPPFLAGS+= -DSHA256_ASM -DSHA512_ASM
.endif
.include "../../sha.inc"
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ec.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ec.inc:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ec.inc:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ec.inc:1.4 Wed May 17 19:09:42 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ec.inc Thu May 25 15:52:29 2023
@@ -1,7 +1,7 @@
.PATH.S: ${.PARSEDIR}
EC_SRCS += \
ecp_nistz256-x86_64.S \
-x25519-x86_64.S
+x25519-x86_64.S
ECCPPFLAGS+= -DECP_NISTZ256_ASM
ECCPPFLAGS+= -DX25519_ASM -DOPENSSL_NO_EC_NISTP_64_GCC_128
Index: src/crypto/external/bsd/openssl/lib/libcrypto/man/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/man/Makefile:1.8 src/crypto/external/bsd/openssl/lib/libcrypto/man/Makefile:1.9
--- src/crypto/external/bsd/openssl/lib/libcrypto/man/Makefile:1.8 Wed May 10 02:23:56 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/man/Makefile Thu May 25 15:52:29 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2023/05/10 02:23:56 christos Exp $
+# $NetBSD: Makefile,v 1.9 2023/05/25 15:52:29 riastradh Exp $
# the makefile is not, and should not be visited during normal build process.
# try to use latest pod2man, which comes with the latest perl.
@@ -7,7 +7,7 @@
CRYPTODIST= ${NETBSDSRCDIR}/crypto
.include "${NETBSDSRCDIR}/crypto/Makefile.openssl"
-VERSION!= awk '/\#\#\#/ { print $$6; exit 0; };' ${OPENSSLSRC}/CHANGES.md
+VERSION!= awk '/\#\#\#/ { print $$6; exit 0; };' ${OPENSSLSRC}/CHANGES.md
make-manpages:
for sec in 1 3 5 7; do \
@@ -37,4 +37,3 @@ make-manpages:
clean:
-/bin/rm -f *.[0-9]
-
Index: src/crypto/external/bsd/openssl/lib/libdefault/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libdefault/Makefile:1.5 src/crypto/external/bsd/openssl/lib/libdefault/Makefile:1.6
--- src/crypto/external/bsd/openssl/lib/libdefault/Makefile:1.5 Tue May 23 12:04:42 2023
+++ src/crypto/external/bsd/openssl/lib/libdefault/Makefile Thu May 25 15:52:29 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2023/05/23 12:04:42 christos Exp $
+# $NetBSD: Makefile,v 1.6 2023/05/25 15:52:29 riastradh Exp $
# RCSid:
# Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -8,10 +8,10 @@
# This file is provided in the hope that it will
# be of use. There is absolutely NO WARRANTY.
# Permission to copy, redistribute or otherwise
-# use this file is hereby granted provided that
+# use this file is hereby granted provided that
# the above copyright notice and this notice are
-# left intact.
-#
+# left intact.
+#
# Please send copies of changes and bug-fixes to:
# s...@quick.com.au
#
@@ -49,4 +49,3 @@ AFLAGS+=-DELF
OS_VERSION!= ${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh
.include <bsd.lib.mk>
-
Index: src/crypto/external/bsd/openssl/lib/liblegacy/Makefile
diff -u src/crypto/external/bsd/openssl/lib/liblegacy/Makefile:1.6 src/crypto/external/bsd/openssl/lib/liblegacy/Makefile:1.7
--- src/crypto/external/bsd/openssl/lib/liblegacy/Makefile:1.6 Tue May 23 12:04:42 2023
+++ src/crypto/external/bsd/openssl/lib/liblegacy/Makefile Thu May 25 15:52:29 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2023/05/23 12:04:42 christos Exp $
+# $NetBSD: Makefile,v 1.7 2023/05/25 15:52:29 riastradh Exp $
# RCSid:
# Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -8,10 +8,10 @@
# This file is provided in the hope that it will
# be of use. There is absolutely NO WARRANTY.
# Permission to copy, redistribute or otherwise
-# use this file is hereby granted provided that
+# use this file is hereby granted provided that
# the above copyright notice and this notice are
-# left intact.
-#
+# left intact.
+#
# Please send copies of changes and bug-fixes to:
# s...@quick.com.au
#
Index: src/crypto/external/bsd/openssl/lib/libssl/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libssl/Makefile:1.14 src/crypto/external/bsd/openssl/lib/libssl/Makefile:1.15
--- src/crypto/external/bsd/openssl/lib/libssl/Makefile:1.14 Wed May 17 19:09:42 2023
+++ src/crypto/external/bsd/openssl/lib/libssl/Makefile Thu May 25 15:52:29 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2023/05/17 19:09:42 christos Exp $
+# $NetBSD: Makefile,v 1.15 2023/05/25 15:52:29 riastradh Exp $
# RCSid:
# Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -8,10 +8,10 @@
# This file is provided in the hope that it will
# be of use. There is absolutely NO WARRANTY.
# Permission to copy, redistribute or otherwise
-# use this file is hereby granted provided that
+# use this file is hereby granted provided that
# the above copyright notice and this notice are
-# left intact.
-#
+# left intact.
+#
# Please send copies of changes and bug-fixes to:
# s...@quick.com.au
#
Index: src/crypto/external/bsd/openssl/lib/libssl/statem.inc
diff -u src/crypto/external/bsd/openssl/lib/libssl/statem.inc:1.2 src/crypto/external/bsd/openssl/lib/libssl/statem.inc:1.3
--- src/crypto/external/bsd/openssl/lib/libssl/statem.inc:1.2 Sun Sep 23 13:33:09 2018
+++ src/crypto/external/bsd/openssl/lib/libssl/statem.inc Thu May 25 15:52:29 2023
@@ -1,4 +1,4 @@
-# $NetBSD: statem.inc,v 1.2 2018/09/23 13:33:09 christos Exp $
+# $NetBSD: statem.inc,v 1.3 2023/05/25 15:52:29 riastradh Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -18,4 +18,4 @@ statem.c \
statem_clnt.c \
statem_dtls.c \
statem_lib.c \
-statem_srvr.c
+statem_srvr.c
