From 5e974ea695aa57965c3037c787850012e188dfdb Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Sun, 8 May 2022 22:23:36 -0500 Subject: update for latest upstream --- crypto/CMakeLists.txt | 2 ++ crypto/Makefile.am | 5 +++++ update.sh | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index 9b66d9f..2d23332 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt @@ -602,6 +602,8 @@ set( idea/i_ecb.c idea/i_ofb64.c idea/i_skey.c + kdf/hkdf_evp.c + kdf/kdf_err.c lhash/lh_stats.c lhash/lhash.c md4/md4_dgst.c diff --git a/crypto/Makefile.am b/crypto/Makefile.am index 0f39753..888270b 100644 --- a/crypto/Makefile.am +++ b/crypto/Makefile.am @@ -760,6 +760,11 @@ libcrypto_la_SOURCES += idea/i_ofb64.c libcrypto_la_SOURCES += idea/i_skey.c noinst_HEADERS += idea/idea_lcl.h +# kdf +libcrypto_la_SOURCES += kdf/hkdf_evp.c +libcrypto_la_SOURCES += kdf/kdf_err.c +noinst_HEADERS += kdf/kdf.h + # lhash libcrypto_la_SOURCES += lhash/lh_stats.c libcrypto_la_SOURCES += lhash/lhash.c diff --git a/update.sh b/update.sh index b8f8337..f2aaf19 100755 --- a/update.sh +++ b/update.sh @@ -124,7 +124,7 @@ copy_hdrs $libcrypto_src "stack/stack.h lhash/lhash.h stack/safestack.h rc2/rc2.h rc4/rc4.h ui/ui_compat.h txt_db/txt_db.h sm3/sm3.h sm4/sm4.h chacha/chacha.h evp/evp.h poly1305/poly1305.h camellia/camellia.h gost/gost.h curve25519/curve25519.h - ct/ct.h ct/cterr.h" + ct/ct.h" copy_hdrs $libssl_src "srtp.h ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h" -- cgit v1.2.3-55-g6feb