Land #702: Add ct to libcrypto

3 files changed, 27 insertions, 1 deletions

diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 72fe5a4..8cfa9fe 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -412,6 +412,16 @@ set(
         conf/conf_mall.c
         conf/conf_mod.c
         conf/conf_sap.c
+        ct/ct_b64.c
+        ct/ct_err.c
+        ct/ct_log.c
+        ct/ct_oct.c
+        ct/ct_policy.c
+        ct/ct_prn.c
+        ct/ct_sct.c
+        ct/ct_sct_ctx.c
+        ct/ct_vfy.c
+        ct/ct_x509v3.c
         curve25519/curve25519-generic.c
         curve25519/curve25519.c
         des/cbc_cksm.c
diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index f2ef151..ceab628 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -1,5 +1,7 @@
 include $(top_srcdir)/Makefile.am.common
 
+AM_CPPFLAGS += -DLIBRESSL_CRYPTO_INTERNAL
+
 AM_CPPFLAGS += -I$(top_srcdir)/crypto/asn1
 AM_CPPFLAGS += -I$(top_srcdir)/crypto/bn
 AM_CPPFLAGS += -I$(top_srcdir)/crypto/ec
@@ -500,6 +502,19 @@ libcrypto_la_SOURCES += conf/conf_mod.c
 libcrypto_la_SOURCES += conf/conf_sap.c
 noinst_HEADERS += conf/conf_def.h
 
+# ct
+libcrypto_la_SOURCES += ct/ct_b64.c
+libcrypto_la_SOURCES += ct/ct_err.c
+libcrypto_la_SOURCES += ct/ct_log.c
+libcrypto_la_SOURCES += ct/ct_oct.c
+libcrypto_la_SOURCES += ct/ct_policy.c
+libcrypto_la_SOURCES += ct/ct_prn.c
+libcrypto_la_SOURCES += ct/ct_sct.c
+libcrypto_la_SOURCES += ct/ct_sct_ctx.c
+libcrypto_la_SOURCES += ct/ct_vfy.c
+libcrypto_la_SOURCES += ct/ct_x509v3.c
+noinst_HEADERS += ct/ct_local.h
+
 # curve25519
 libcrypto_la_SOURCES += curve25519/curve25519-generic.c
 libcrypto_la_SOURCES += curve25519/curve25519.c
diff --git a/update.sh b/update.sh
index fe91b51..311ce4e 100755
--- a/update.sh
+++ b/update.sh
@@ -122,7 +122,8 @@ copy_hdrs $libcrypto_src "stack/stack.h lhash/lhash.h stack/safestack.h
         md4/md4.h ripemd/ripemd.h whrlpool/whrlpool.h idea/idea.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"
+        camellia/camellia.h gost/gost.h curve25519/curve25519.h
+        ct/ct.h ct/cterr.h"
 
 copy_hdrs $libssl_src "srtp.h ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h"