Module Name: src
Committed By: christos
Date: Sun May 7 19:13:15 UTC 2023
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto: Makefile crypto.inc
src/crypto/external/bsd/openssl/lib/libssl: Makefile
Log Message:
misc cleanups
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 \
src/crypto/external/bsd/openssl/lib/libcrypto/Makefile
cvs rdiff -u -r1.11 -r1.12 \
src/crypto/external/bsd/openssl/lib/libcrypto/crypto.inc
cvs rdiff -u -r1.11 -r1.12 \
src/crypto/external/bsd/openssl/lib/libssl/Makefile
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/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.24 src/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.25
--- src/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.24 Sat May 6 13:21:51 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/Makefile Sun May 7 15:13:15 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2023/05/06 17:21:51 christos Exp $
+# $NetBSD: Makefile,v 1.25 2023/05/07 19:13:15 christos Exp $
# RCSid:
# Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -43,18 +43,14 @@ CPPFLAGS+= -I${OPENSSLSRC}/include -I${O
CPPFLAGS+= -I${OPENSSLSRC}/crypto/asn1 -I${OPENSSLSRC}/crypto/evp
CPPFLAGS+= -I${OPENSSLSRC}/crypto/modes
CPPFLAGS+= -I${OPENSSLSRC}/../include
-CPPFLAGS+= -I${OPENSSLSRC}/providers/common/include
-CPPFLAGS+= -I${OPENSSLSRC}/providers/implementations/include
CRYPTODIST= ${NETBSDSRCDIR}/crypto
OPENSSLINC= ${OPENSSLSRC}/include/openssl
.include "${NETBSDSRCDIR}/crypto/Makefile.openssl"
-.PATH: ${OPENSSLSRC} ${OPENSSLINC}
+.PATH: ${OPENSSLSRC} ${OPENSSLINC}
.PATH: ${OPENSSLSRC}/../include/openssl
-.PATH: ${OPENSSLSRC}/providers/implementations/digests
-.PATH: ${OPENSSLSRC}/providers/implementations/macs
.include "srcs.inc"
.include "${.CURDIR}/../libdefault/srcs.inc"
@@ -286,7 +282,6 @@ pkcs12.h \
pkcs7.h \
safestack.h \
srp.h \
-ssl.h \
ui.h \
x509.h \
x509_vfy.h \
Index: src/crypto/external/bsd/openssl/lib/libcrypto/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/crypto.inc:1.11 src/crypto/external/bsd/openssl/lib/libcrypto/crypto.inc:1.12
--- src/crypto/external/bsd/openssl/lib/libcrypto/crypto.inc:1.11 Sat May 6 13:07:22 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/crypto.inc Sun May 7 15:13:15 2023
@@ -1,6 +1,6 @@
-# $NetBSD: crypto.inc,v 1.11 2023/05/06 17:07:22 christos Exp $
+# $NetBSD: crypto.inc,v 1.12 2023/05/07 19:13:15 christos Exp $
-.PATH: ${OPENSSLSRC}/crypto/crypto
+.PATH: ${OPENSSLSRC}/crypto
CRYPTO_SRCS += \
asn1_dsa.c \
Index: src/crypto/external/bsd/openssl/lib/libssl/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libssl/Makefile:1.11 src/crypto/external/bsd/openssl/lib/libssl/Makefile:1.12
--- src/crypto/external/bsd/openssl/lib/libssl/Makefile:1.11 Sat May 6 13:07:24 2023
+++ src/crypto/external/bsd/openssl/lib/libssl/Makefile Sun May 7 15:13:15 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2023/05/06 17:07:24 christos Exp $
+# $NetBSD: Makefile,v 1.12 2023/05/07 19:13:15 christos Exp $
# RCSid:
# Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -57,7 +57,7 @@ ssl.h
.for i in ${GENH}
$i: $i.in
${_MKTARGET_CREATE}
- ${.CURDIR}/../../gen ${.ALLSRC} > ${.TARGET}
+ ${.CURDIR}/../libcrypto/gen ${.ALLSRC} > ${.TARGET}
.endfor
.include <bsd.lib.mk>
