From 3378e9772667155263acfbfda99ee5152458d631 Mon Sep 17 00:00:00 2001 From: Theo Buehler Date: Thu, 19 Dec 2024 18:58:48 -0700 Subject: Remove mlkem and bytestring from public visibility for now --- crypto/Makefile.am | 1 + tests/CMakeLists.txt | 1 + tests/Makefile.am | 1 + update.sh | 3 +-- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/crypto/Makefile.am b/crypto/Makefile.am index 31fcffd..990582f 100644 --- a/crypto/Makefile.am +++ b/crypto/Makefile.am @@ -709,6 +709,7 @@ libcrypto_la_SOURCES += md5/md5.c # mlkem libcrypto_la_SOURCES += mlkem/mlkem768.c libcrypto_la_SOURCES += mlkem/mlkem1024.c +noinst_HEADERS += mlkem/mlkem.h noinst_HEADERS += mlkem/mlkem_internal.h # modes diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 8b079f4..2639ee6 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -6,6 +6,7 @@ include_directories( ../crypto/asn1 ../crypto/bio ../crypto/bn + ../crypto/bytestring ../crypto/curve25519 ../crypto/evp ../crypto/mlkem diff --git a/tests/Makefile.am b/tests/Makefile.am index 6cb2d3f..e5d3bec 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -10,6 +10,7 @@ AM_CPPFLAGS += -I $(top_srcdir)/crypto/ AM_CPPFLAGS += -I $(top_srcdir)/crypto/asn1 AM_CPPFLAGS += -I $(top_srcdir)/crypto/bio AM_CPPFLAGS += -I $(top_srcdir)/crypto/bn +AM_CPPFLAGS += -I $(top_srcdir)/crypto/bytestring AM_CPPFLAGS += -I $(top_srcdir)/crypto/curve25519 AM_CPPFLAGS += -I $(top_srcdir)/crypto/evp AM_CPPFLAGS += -I $(top_srcdir)/crypto/mlkem diff --git a/update.sh b/update.sh index 11a244d..164f68f 100755 --- a/update.sh +++ b/update.sh @@ -127,11 +127,10 @@ copy_hdrs() { copy_hdrs $libcrypto_src "stack/stack.h lhash/lhash.h stack/safestack.h ossl_typ.h err/err.h crypto.h comp/comp.h x509/x509.h buffer/buffer.h - bytestring/bytestring.h objects/objects.h asn1/asn1.h asn1/posix_time.h bn/bn.h ec/ec.h ecdsa/ecdsa.h ecdh/ecdh.h rsa/rsa.h sha/sha.h x509/x509_vfy.h pkcs7/pkcs7.h pem/pem.h hkdf/hkdf.h hmac/hmac.h rand/rand.h md5/md5.h - x509/x509v3.h conf/conf.h mlkem/mlkem.h ocsp/ocsp.h + x509/x509v3.h conf/conf.h ocsp/ocsp.h aes/aes.h modes/modes.h asn1/asn1t.h bf/blowfish.h bio/bio.h cast/cast.h cmac/cmac.h cms/cms.h des/des.h dh/dh.h dsa/dsa.h engine/engine.h ui/ui.h pkcs12/pkcs12.h ts/ts.h -- cgit v1.2.3-55-g6feb