diff options
author | Brent Cook <busterb@gmail.com> | 2023-02-28 01:51:41 -0600 |
---|---|---|
committer | Brent Cook <busterb@gmail.com> | 2023-02-28 01:51:41 -0600 |
commit | b98c56fd5e86fa76eb55a98a2266a923f64f705c (patch) | |
tree | abfc4a6ae7db1cc78e3f9c530bead5ad353dc3aa /crypto | |
parent | 65af3925dcb7fc84000cedc373d5f84db3fc3265 (diff) | |
download | portable-b98c56fd5e86fa76eb55a98a2266a923f64f705c.tar.gz portable-b98c56fd5e86fa76eb55a98a2266a923f64f705c.tar.bz2 portable-b98c56fd5e86fa76eb55a98a2266a923f64f705c.zip |
stop exposing hidden defines in public opensslconf.h
pull in hidden headers instead, patching drectly for Windows support
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/CMakeLists.txt | 1 | ||||
-rw-r--r-- | crypto/Makefile.am | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index dc30a17..45d9786 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt | |||
@@ -1021,6 +1021,7 @@ target_include_directories(crypto_obj | |||
1021 | ecdh | 1021 | ecdh |
1022 | ecdsa | 1022 | ecdsa |
1023 | evp | 1023 | evp |
1024 | hidden | ||
1024 | hmac | 1025 | hmac |
1025 | modes | 1026 | modes |
1026 | ocsp | 1027 | ocsp |
diff --git a/crypto/Makefile.am b/crypto/Makefile.am index 733dcbd..c09d266 100644 --- a/crypto/Makefile.am +++ b/crypto/Makefile.am | |||
@@ -1,7 +1,6 @@ | |||
1 | include $(top_srcdir)/Makefile.am.common | 1 | include $(top_srcdir)/Makefile.am.common |
2 | 2 | ||
3 | AM_CPPFLAGS += -DLIBRESSL_CRYPTO_INTERNAL | 3 | AM_CPPFLAGS += -DLIBRESSL_CRYPTO_INTERNAL |
4 | |||
5 | AM_CPPFLAGS += -I$(top_srcdir)/crypto/asn1 | 4 | AM_CPPFLAGS += -I$(top_srcdir)/crypto/asn1 |
6 | AM_CPPFLAGS += -I$(top_srcdir)/crypto/bio | 5 | AM_CPPFLAGS += -I$(top_srcdir)/crypto/bio |
7 | AM_CPPFLAGS += -I$(top_srcdir)/crypto/bn | 6 | AM_CPPFLAGS += -I$(top_srcdir)/crypto/bn |
@@ -134,7 +133,7 @@ libcrypto_la_LIBADD = libcompat.la | |||
134 | if !HAVE_EXPLICIT_BZERO | 133 | if !HAVE_EXPLICIT_BZERO |
135 | libcrypto_la_LIBADD += libcompatnoopt.la | 134 | libcrypto_la_LIBADD += libcompatnoopt.la |
136 | endif | 135 | endif |
137 | libcrypto_la_CPPFLAGS = $(AM_CPPFLAGS) | 136 | libcrypto_la_CPPFLAGS = -I$(top_srcdir)/crypto/hidden ${AM_CPPFLAGS} |
138 | libcrypto_la_CPPFLAGS += -DLIBRESSL_INTERNAL | 137 | libcrypto_la_CPPFLAGS += -DLIBRESSL_INTERNAL |
139 | libcrypto_la_CPPFLAGS += -DOPENSSL_NO_HW_PADLOCK | 138 | libcrypto_la_CPPFLAGS += -DOPENSSL_NO_HW_PADLOCK |
140 | if OPENSSL_NO_ASM | 139 | if OPENSSL_NO_ASM |