Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openssl: Nix trailing whitespace in build goo. 

No functional change intended.
This commit is contained in:
riastradh 2023-05-25 15:52:28 +00:00
parent 2a673dcfdb
commit f68d28ccb5
23 changed files with 49 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/external/bsd/openssl/lib/engines/engines.mk vendored
View File

@ -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"

9
crypto/external/bsd/openssl/lib/libapps/Makefile vendored
View File

@ -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:
# sjg@quick.com.au
#
@ -50,4 +50,3 @@ AFLAGS+=-DELF
OS_VERSION!= ${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh
.include <bsd.lib.mk>

9
crypto/external/bsd/openssl/lib/libcommon/Makefile vendored
View File

@ -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:
# sjg@quick.com.au
#
@ -51,4 +51,3 @@ AFLAGS+=-DELF
OS_VERSION!= ${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh
.include <bsd.lib.mk>

13
crypto/external/bsd/openssl/lib/libcrypto/Makefile vendored
View File

@ -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:
# sjg@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>

2
crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ec.inc vendored
View File

@ -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

2
crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/ec.inc vendored
View File

@ -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

2
crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc vendored
View File

@ -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

2
crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc vendored
View File

@ -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

2
crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/ec.inc vendored
View File

@ -1,6 +1,6 @@
.PATH.S: ${.PARSEDIR}
EC_SRCS += \
ecp_nistz256-sparcv9.S
ecp_nistz256-sparcv9.S
ECCPPFLAGS+= -DECP_NISTZ256_ASM
ECNI = yes

2
crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/crypto.inc vendored
View File

@ -1,5 +1,5 @@
.PATH.S: ${.PARSEDIR}
CPUID_SRCS = x86_64cpuid.S
CPUID = yes
CPUID = yes
CPPFLAGS += -DOPENSSL_CPUID_OBJ
.include "../../crypto.inc"

2
crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ec.inc vendored
View File

@ -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

2
crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha.inc vendored
View File

@ -4,6 +4,6 @@ SHACPPFLAGS = -DSHA1_ASM -DKECCAK1600_ASM
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"

4
crypto/external/bsd/openssl/lib/libcrypto/bf.inc vendored
View File

@ -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 \

2
crypto/external/bsd/openssl/lib/libcrypto/gen vendored
View File

@ -44,7 +44,7 @@ V=V"#define sk_OPENSSL_STRING_is_sorted(sk) OPENSSL_sk_is_sorted(ossl_check_cons
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;
}

4
crypto/external/bsd/openssl/lib/libcrypto/libc-sha256.c vendored
View File

@ -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>

2
crypto/external/bsd/openssl/lib/libcrypto/libc-sha512.c vendored
View File

@ -29,7 +29,7 @@ unsigned char *SHA384(const unsigned char *d, size_t n, unsigned char *md)
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);

5
crypto/external/bsd/openssl/lib/libcrypto/man/Makefile vendored
View File

@ -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]

2
crypto/external/bsd/openssl/lib/libcrypto/mkinc vendored
View File

@ -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

4
crypto/external/bsd/openssl/lib/libcrypto/rc4.inc vendored
View File

@ -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

9
crypto/external/bsd/openssl/lib/libdefault/Makefile vendored
View File

@ -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:
# sjg@quick.com.au
#
@ -49,4 +49,3 @@ AFLAGS+=-DELF
OS_VERSION!= ${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh
.include <bsd.lib.mk>

8
crypto/external/bsd/openssl/lib/liblegacy/Makefile vendored
View File

@ -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:
# sjg@quick.com.au
#

8
crypto/external/bsd/openssl/lib/libssl/Makefile vendored
View File

@ -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:
# sjg@quick.com.au
#

4
crypto/external/bsd/openssl/lib/libssl/statem.inc vendored
View File

@ -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