From 8ae1cce7ef3941125344dcb2f459c989f87de182 Mon Sep 17 00:00:00 2001
From: Theo Buehler <tb@openbsd.org>
Date: Tue, 22 Nov 2022 18:41:54 +0100
Subject: Update autoconf framework to build again

---
 Makefile.am.common |  3 ++-
 crypto/Makefile.am | 18 +++++++++++++++---
 ssl/Makefile.am    |  3 +++
 update.sh          |  4 +++-
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/Makefile.am.common b/Makefile.am.common
index 87aa807..2c641c5 100644
--- a/Makefile.am.common
+++ b/Makefile.am.common
@@ -1,3 +1,4 @@
 AM_CFLAGS =
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/include/compat -DLIBRESSL_INTERNAL
+AM_CPPFLAGS = -I$(top_srcdir)/crypto/hidden -I$(top_srcdir)/ssl/hidden
+AM_CPPFLAGS += -I$(top_srcdir)/include -I$(top_srcdir)/include/compat -DLIBRESSL_INTERNAL
 AM_CPPFLAGS += -D__BEGIN_HIDDEN_DECLS= -D__END_HIDDEN_DECLS=
diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index 01833d2..48067a2 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -6,6 +6,7 @@ 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/dh
 AM_CPPFLAGS += -I$(top_srcdir)/crypto/dsa
 AM_CPPFLAGS += -I$(top_srcdir)/crypto/ec
@@ -285,12 +286,10 @@ libcrypto_la_SOURCES += mem_dbg.c
 libcrypto_la_SOURCES += o_fips.c
 libcrypto_la_SOURCES += o_init.c
 libcrypto_la_SOURCES += o_str.c
-libcrypto_la_SOURCES += o_time.c
 noinst_HEADERS += arm_arch.h
 noinst_HEADERS += constant_time_locl.h
 noinst_HEADERS += cryptlib.h
 noinst_HEADERS += md32_common.h
-noinst_HEADERS += o_time.h
 noinst_HEADERS += x86_arch.h
 
 # aes
@@ -317,6 +316,7 @@ libcrypto_la_SOURCES += asn1/a_strex.c
 libcrypto_la_SOURCES += asn1/a_string.c
 libcrypto_la_SOURCES += asn1/a_strnid.c
 libcrypto_la_SOURCES += asn1/a_time.c
+libcrypto_la_SOURCES += asn1/a_time_posix.c
 libcrypto_la_SOURCES += asn1/a_time_tm.c
 libcrypto_la_SOURCES += asn1/a_type.c
 libcrypto_la_SOURCES += asn1/a_utf8.c
@@ -376,7 +376,6 @@ libcrypto_la_SOURCES += bf/bf_enc.c
 libcrypto_la_SOURCES += bf/bf_ofb64.c
 libcrypto_la_SOURCES += bf/bf_skey.c
 noinst_HEADERS += bf/bf_locl.h
-noinst_HEADERS += bf/bf_pi.h
 
 # bio
 libcrypto_la_SOURCES += bio/b_dump.c
@@ -436,6 +435,7 @@ libcrypto_la_SOURCES += bn/bn_print.c
 libcrypto_la_SOURCES += bn/bn_rand.c
 libcrypto_la_SOURCES += bn/bn_recp.c
 libcrypto_la_SOURCES += bn/bn_shift.c
+libcrypto_la_SOURCES += bn/bn_small_primes.c
 libcrypto_la_SOURCES += bn/bn_sqr.c
 libcrypto_la_SOURCES += bn/bn_sqrt.c
 libcrypto_la_SOURCES += bn/bn_word.c
@@ -619,6 +619,7 @@ libcrypto_la_SOURCES += ec/ecp_mont.c
 libcrypto_la_SOURCES += ec/ecp_nist.c
 libcrypto_la_SOURCES += ec/ecp_oct.c
 libcrypto_la_SOURCES += ec/ecp_smpl.c
+libcrypto_la_SOURCES += ec/ecx_methods.c
 noinst_HEADERS += ec/ec_lcl.h
 
 # ecdh
@@ -746,6 +747,17 @@ libcrypto_la_SOURCES += gost/streebog.c
 noinst_HEADERS += gost/gost_asn1.h
 noinst_HEADERS += gost/gost_locl.h
 
+# hidden
+noinst_HEADERS += hidden/crypto_namespace.h
+noinst_HEADERS += hidden/openssl/hmac.h
+noinst_HEADERS += hidden/openssl/pkcs12.h
+noinst_HEADERS += hidden/openssl/pkcs7.h
+noinst_HEADERS += hidden/openssl/stack.h
+noinst_HEADERS += hidden/openssl/ui.h
+noinst_HEADERS += hidden/openssl/x509.h
+noinst_HEADERS += hidden/openssl/x509_vfy.h
+noinst_HEADERS += hidden/openssl/x509v3.h
+
 # hkdf
 libcrypto_la_SOURCES += hkdf/hkdf.c
 
diff --git a/ssl/Makefile.am b/ssl/Makefile.am
index f1bd897..8750f77 100644
--- a/ssl/Makefile.am
+++ b/ssl/Makefile.am
@@ -39,6 +39,9 @@ libbs_la_SOURCES += bs_cbb.c
 libbs_la_SOURCES += bs_cbs.c
 noinst_HEADERS = bytestring.h
 
+noinst_HEADERS += hidden/ssl_namespace.h
+noinst_HEADERS += hidden/openssl/ssl.h
+
 libssl_la_SOURCES = bio_ssl.c
 libssl_la_SOURCES += d1_both.c
 libssl_la_SOURCES += d1_lib.c
diff --git a/update.sh b/update.sh
index 3aea129..e7d9e6b 100755
--- a/update.sh
+++ b/update.sh
@@ -277,7 +277,9 @@ done
 echo "copying libssl source"
 rm -f ssl/*.c ssl/*.h
 for i in `awk '/SOURCES|HEADERS/ { print $3 }' ssl/Makefile.am` ; do
-	$CP $libssl_src/$i ssl
+	dir=`dirname $i`
+	mkdir -p ssl/$dir
+	$CP $libssl_src/$i ssl/$i
 done
 # add the libssl symbol export list
 $GREP '^[A-Za-z0-9_]' < $libssl_src/Symbols.list > ssl/ssl.sym
-- 
cgit v1.2.3-55-g6feb