2 files changed, 10 insertions, 0 deletions

diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 2d23332..2c0268c 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -333,6 +333,7 @@ set(
         bn/bn_add.c
         bn/bn_asm.c
         bn/bn_blind.c
+        bn/bn_bpsw.c
         bn/bn_const.c
         bn/bn_ctx.c
         bn/bn_depr.c
@@ -342,6 +343,7 @@ set(
         bn/bn_exp2.c
         bn/bn_gcd.c
         bn/bn_gf2m.c
+        bn/bn_isqrt.c
         bn/bn_kron.c
         bn/bn_lib.c
         bn/bn_mod.c
@@ -656,6 +658,7 @@ set(
         pkcs12/p12_npas.c
         pkcs12/p12_p8d.c
         pkcs12/p12_p8e.c
+        pkcs12/p12_sbag.c
         pkcs12/p12_utl.c
         pkcs12/pk12err.c
         pkcs7/bio_pk7.c
@@ -996,6 +999,7 @@ target_include_directories(crypto_obj
                 hmac
                 modes
                 ocsp
+                pkcs12
                 rsa
                 x509
                 ../include/compat
diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index b78f491..01833d2 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -15,6 +15,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/crypto/evp
 AM_CPPFLAGS += -I$(top_srcdir)/crypto/hmac
 AM_CPPFLAGS += -I$(top_srcdir)/crypto/modes
 AM_CPPFLAGS += -I$(top_srcdir)/crypto/ocsp
+AM_CPPFLAGS += -I$(top_srcdir)/crypto/pkcs12
 AM_CPPFLAGS += -I$(top_srcdir)/crypto/rsa
 AM_CPPFLAGS += -I$(top_srcdir)/crypto/x509
 AM_CPPFLAGS += -I$(top_srcdir)/crypto
@@ -412,6 +413,7 @@ noinst_HEADERS += bio/bio_local.h
 libcrypto_la_SOURCES += bn/bn_add.c
 libcrypto_la_SOURCES += bn/bn_asm.c
 libcrypto_la_SOURCES += bn/bn_blind.c
+libcrypto_la_SOURCES += bn/bn_bpsw.c
 libcrypto_la_SOURCES += bn/bn_const.c
 libcrypto_la_SOURCES += bn/bn_ctx.c
 libcrypto_la_SOURCES += bn/bn_depr.c
@@ -421,6 +423,7 @@ libcrypto_la_SOURCES += bn/bn_exp.c
 libcrypto_la_SOURCES += bn/bn_exp2.c
 libcrypto_la_SOURCES += bn/bn_gcd.c
 libcrypto_la_SOURCES += bn/bn_gf2m.c
+libcrypto_la_SOURCES += bn/bn_isqrt.c
 libcrypto_la_SOURCES += bn/bn_kron.c
 libcrypto_la_SOURCES += bn/bn_lib.c
 libcrypto_la_SOURCES += bn/bn_mod.c
@@ -837,8 +840,10 @@ libcrypto_la_SOURCES += pkcs12/p12_mutl.c
 libcrypto_la_SOURCES += pkcs12/p12_npas.c
 libcrypto_la_SOURCES += pkcs12/p12_p8d.c
 libcrypto_la_SOURCES += pkcs12/p12_p8e.c
+libcrypto_la_SOURCES += pkcs12/p12_sbag.c
 libcrypto_la_SOURCES += pkcs12/p12_utl.c
 libcrypto_la_SOURCES += pkcs12/pk12err.c
+noinst_HEADERS += pkcs12/pkcs12_local.h
 
 # pkcs7
 libcrypto_la_SOURCES += pkcs7/bio_pk7.c
@@ -927,6 +932,7 @@ libcrypto_la_SOURCES += ts/ts_rsp_sign.c
 libcrypto_la_SOURCES += ts/ts_rsp_utils.c
 libcrypto_la_SOURCES += ts/ts_rsp_verify.c
 libcrypto_la_SOURCES += ts/ts_verify_ctx.c
+noinst_HEADERS += ts/ts_local.h
 
 # txt_db
 libcrypto_la_SOURCES += txt_db/txt_db.c