[src/trunk]: src/crypto/external/bsd/openssl/lib misc cleanups

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f4338db1a924
branches:  trunk
changeset: 374607:f4338db1a924
user:      christos <christos%NetBSD.org@localhost>
date:      Sun May 07 19:13:15 2023 +0000

description:
misc cleanups

diffstat:

 crypto/external/bsd/openssl/lib/libcrypto/Makefile   |  9 ++-------
 crypto/external/bsd/openssl/lib/libcrypto/crypto.inc |  4 ++--
 crypto/external/bsd/openssl/lib/libssl/Makefile      |  4 ++--
 3 files changed, 6 insertions(+), 11 deletions(-)

diffs (67 lines):

diff -r 0ec9970faf81 -r f4338db1a924 crypto/external/bsd/openssl/lib/libcrypto/Makefile
--- a/crypto/external/bsd/openssl/lib/libcrypto/Makefile        Sun May 07 18:41:34 2023 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/Makefile        Sun May 07 19:13:15 2023 +0000
@@ -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 \
diff -r 0ec9970faf81 -r f4338db1a924 crypto/external/bsd/openssl/lib/libcrypto/crypto.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/crypto.inc      Sun May 07 18:41:34 2023 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/crypto.inc      Sun May 07 19:13:15 2023 +0000
@@ -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 \
diff -r 0ec9970faf81 -r f4338db1a924 crypto/external/bsd/openssl/lib/libssl/Makefile
--- a/crypto/external/bsd/openssl/lib/libssl/Makefile   Sun May 07 18:41:34 2023 +0000
+++ b/crypto/external/bsd/openssl/lib/libssl/Makefile   Sun May 07 19:13:15 2023 +0000
@@ -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>