aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo Buehler <tb@openbsd.org>2024-08-31 05:45:48 -0600
committerTheo Buehler <tb@openbsd.org>2024-08-31 05:58:34 -0600
commitb68767302eeba9b2a3ef03d521a45bab7b5dc937 (patch)
treeed2aba6d5b4a6146e7e87995f2badbe64ef39d05
parent64f8aa37017145dc2af27db20ce6b8b0fb2b214c (diff)
downloadportable-b68767302eeba9b2a3ef03d521a45bab7b5dc937.tar.gz
portable-b68767302eeba9b2a3ef03d521a45bab7b5dc937.tar.bz2
portable-b68767302eeba9b2a3ef03d521a45bab7b5dc937.zip
conf_api.h was removed, conf_local.h was added
-rw-r--r--crypto/CMakeLists.txt1
-rw-r--r--crypto/Makefile.am3
2 files changed, 3 insertions, 1 deletions
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 8500d32..d54525f 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -800,6 +800,7 @@ target_include_directories(crypto_obj
800 bio 800 bio
801 bn 801 bn
802 bytestring 802 bytestring
803 conf
803 dh 804 dh
804 dsa 805 dsa
805 curve25519 806 curve25519
diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index 05a2246..616063e 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -5,6 +5,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/crypto/asn1
5AM_CPPFLAGS += -I$(top_srcdir)/crypto/bio 5AM_CPPFLAGS += -I$(top_srcdir)/crypto/bio
6AM_CPPFLAGS += -I$(top_srcdir)/crypto/bn 6AM_CPPFLAGS += -I$(top_srcdir)/crypto/bn
7AM_CPPFLAGS += -I$(top_srcdir)/crypto/bytestring 7AM_CPPFLAGS += -I$(top_srcdir)/crypto/bytestring
8AM_CPPFLAGS += -I$(top_srcdir)/crypto/conf
8AM_CPPFLAGS += -I$(top_srcdir)/crypto/curve25519 9AM_CPPFLAGS += -I$(top_srcdir)/crypto/curve25519
9AM_CPPFLAGS += -I$(top_srcdir)/crypto/dh 10AM_CPPFLAGS += -I$(top_srcdir)/crypto/dh
10AM_CPPFLAGS += -I$(top_srcdir)/crypto/dsa 11AM_CPPFLAGS += -I$(top_srcdir)/crypto/dsa
@@ -481,6 +482,7 @@ libcrypto_la_SOURCES += conf/conf_mall.c
481libcrypto_la_SOURCES += conf/conf_mod.c 482libcrypto_la_SOURCES += conf/conf_mod.c
482libcrypto_la_SOURCES += conf/conf_sap.c 483libcrypto_la_SOURCES += conf/conf_sap.c
483noinst_HEADERS += conf/conf_def.h 484noinst_HEADERS += conf/conf_def.h
485noinst_HEADERS += conf/conf_local.h
484 486
485# ct 487# ct
486libcrypto_la_SOURCES += ct/ct_b64.c 488libcrypto_la_SOURCES += ct/ct_b64.c
@@ -647,7 +649,6 @@ noinst_HEADERS += hidden/openssl/chacha.h
647noinst_HEADERS += hidden/openssl/cmac.h 649noinst_HEADERS += hidden/openssl/cmac.h
648noinst_HEADERS += hidden/openssl/cms.h 650noinst_HEADERS += hidden/openssl/cms.h
649noinst_HEADERS += hidden/openssl/conf.h 651noinst_HEADERS += hidden/openssl/conf.h
650noinst_HEADERS += hidden/openssl/conf_api.h
651noinst_HEADERS += hidden/openssl/crypto.h 652noinst_HEADERS += hidden/openssl/crypto.h
652noinst_HEADERS += hidden/openssl/ct.h 653noinst_HEADERS += hidden/openssl/ct.h
653noinst_HEADERS += hidden/openssl/curve25519.h 654noinst_HEADERS += hidden/openssl/curve25519.h