aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo Buehler <tb@openbssd.org>2024-12-19 18:58:48 -0700
committerTheo Buehler <tb@openbssd.org>2024-12-19 19:11:43 -0700
commit3378e9772667155263acfbfda99ee5152458d631 (patch)
treea0e104270d21f8d72b81d0428cff83b0d2248dbb
parentbf808ea0fc581f58ec4aabd9d7f24d3a5275bc7a (diff)
downloadportable-3378e9772667155263acfbfda99ee5152458d631.tar.gz
portable-3378e9772667155263acfbfda99ee5152458d631.tar.bz2
portable-3378e9772667155263acfbfda99ee5152458d631.zip
Remove mlkem and bytestring from public visibility for now
-rw-r--r--crypto/Makefile.am1
-rw-r--r--tests/CMakeLists.txt1
-rw-r--r--tests/Makefile.am1
-rwxr-xr-xupdate.sh3
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
709# mlkem 709# mlkem
710libcrypto_la_SOURCES += mlkem/mlkem768.c 710libcrypto_la_SOURCES += mlkem/mlkem768.c
711libcrypto_la_SOURCES += mlkem/mlkem1024.c 711libcrypto_la_SOURCES += mlkem/mlkem1024.c
712noinst_HEADERS += mlkem/mlkem.h
712noinst_HEADERS += mlkem/mlkem_internal.h 713noinst_HEADERS += mlkem/mlkem_internal.h
713 714
714# modes 715# 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(
6 ../crypto/asn1 6 ../crypto/asn1
7 ../crypto/bio 7 ../crypto/bio
8 ../crypto/bn 8 ../crypto/bn
9 ../crypto/bytestring
9 ../crypto/curve25519 10 ../crypto/curve25519
10 ../crypto/evp 11 ../crypto/evp
11 ../crypto/mlkem 12 ../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/
10AM_CPPFLAGS += -I $(top_srcdir)/crypto/asn1 10AM_CPPFLAGS += -I $(top_srcdir)/crypto/asn1
11AM_CPPFLAGS += -I $(top_srcdir)/crypto/bio 11AM_CPPFLAGS += -I $(top_srcdir)/crypto/bio
12AM_CPPFLAGS += -I $(top_srcdir)/crypto/bn 12AM_CPPFLAGS += -I $(top_srcdir)/crypto/bn
13AM_CPPFLAGS += -I $(top_srcdir)/crypto/bytestring
13AM_CPPFLAGS += -I $(top_srcdir)/crypto/curve25519 14AM_CPPFLAGS += -I $(top_srcdir)/crypto/curve25519
14AM_CPPFLAGS += -I $(top_srcdir)/crypto/evp 15AM_CPPFLAGS += -I $(top_srcdir)/crypto/evp
15AM_CPPFLAGS += -I $(top_srcdir)/crypto/mlkem 16AM_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() {
127 127
128copy_hdrs $libcrypto_src "stack/stack.h lhash/lhash.h stack/safestack.h 128copy_hdrs $libcrypto_src "stack/stack.h lhash/lhash.h stack/safestack.h
129 ossl_typ.h err/err.h crypto.h comp/comp.h x509/x509.h buffer/buffer.h 129 ossl_typ.h err/err.h crypto.h comp/comp.h x509/x509.h buffer/buffer.h
130 bytestring/bytestring.h
131 objects/objects.h asn1/asn1.h asn1/posix_time.h bn/bn.h ec/ec.h ecdsa/ecdsa.h 130 objects/objects.h asn1/asn1.h asn1/posix_time.h bn/bn.h ec/ec.h ecdsa/ecdsa.h
132 ecdh/ecdh.h rsa/rsa.h sha/sha.h x509/x509_vfy.h pkcs7/pkcs7.h pem/pem.h 131 ecdh/ecdh.h rsa/rsa.h sha/sha.h x509/x509_vfy.h pkcs7/pkcs7.h pem/pem.h
133 hkdf/hkdf.h hmac/hmac.h rand/rand.h md5/md5.h 132 hkdf/hkdf.h hmac/hmac.h rand/rand.h md5/md5.h
134 x509/x509v3.h conf/conf.h mlkem/mlkem.h ocsp/ocsp.h 133 x509/x509v3.h conf/conf.h ocsp/ocsp.h
135 aes/aes.h modes/modes.h asn1/asn1t.h bf/blowfish.h 134 aes/aes.h modes/modes.h asn1/asn1t.h bf/blowfish.h
136 bio/bio.h cast/cast.h cmac/cmac.h cms/cms.h des/des.h dh/dh.h 135 bio/bio.h cast/cast.h cmac/cmac.h cms/cms.h des/des.h dh/dh.h
137 dsa/dsa.h engine/engine.h ui/ui.h pkcs12/pkcs12.h ts/ts.h 136 dsa/dsa.h engine/engine.h ui/ui.h pkcs12/pkcs12.h ts/ts.h