Land #439, Add portable scaffold for SM3

5 files changed, 18 insertions, 1 deletions

diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 5380268..e84a0f2 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -447,6 +447,7 @@ set(
         evp/m_sha1.c
         evp/m_sigver.c
         evp/m_streebog.c
+        evp/m_sm3.c
         evp/m_wp.c
         evp/names.c
         evp/p5_crpt.c
@@ -581,6 +582,7 @@ set(
         sha/sha1dgst.c
         sha/sha256.c
         sha/sha512.c
+        sm3/sm3.c
         stack/stack.c
         ts/ts_asn1.c
         ts/ts_conf.c
diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index 2d95359..e9f0f7a 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -620,6 +620,7 @@ libcrypto_la_SOURCES += evp/m_ripemd.c
 libcrypto_la_SOURCES += evp/m_sha1.c
 libcrypto_la_SOURCES += evp/m_sigver.c
 libcrypto_la_SOURCES += evp/m_streebog.c
+libcrypto_la_SOURCES += evp/m_sm3.c
 libcrypto_la_SOURCES += evp/m_wp.c
 libcrypto_la_SOURCES += evp/names.c
 libcrypto_la_SOURCES += evp/p5_crpt.c
@@ -812,6 +813,10 @@ libcrypto_la_SOURCES += sha/sha256.c
 libcrypto_la_SOURCES += sha/sha512.c
 noinst_HEADERS += sha/sha_locl.h
 
+# sm3
+libcrypto_la_SOURCES += sm3/sm3.c
+noinst_HEADERS += sm3/sm3_locl.h
+
 # stack
 libcrypto_la_SOURCES += stack/stack.c
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 921bc81..2a9389d 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -369,6 +369,11 @@ add_executable(sha512test sha512test.c)
 target_link_libraries(sha512test ${OPENSSL_LIBS})
 add_test(sha512test sha512test)
 
+# sm3test
+add_executable(sm3test sm3test.c)
+target_link_libraries(sm3test ${OPENSSL_LIBS})
+add_test(sm3test sm3test)
+
 # ssl_versions
 if(NOT BUILD_SHARED_LIBS)
         add_executable(ssl_versions ssl_versions.c)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ca0c5bb..256eb44 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -357,6 +357,11 @@ TESTS += sha512test
 check_PROGRAMS += sha512test
 sha512test_SOURCES = sha512test.c
 
+# sm3test
+TESTS += sm3test
+check_PROGRAMS += sm3test
+sm3test_SOURCES = sm3test.c
+
 # ssl_versions
 TESTS += ssl_versions
 check_PROGRAMS += ssl_versions
diff --git a/update.sh b/update.sh
index f68eefb..3315311 100755
--- a/update.sh
+++ b/update.sh
@@ -132,7 +132,7 @@ copy_hdrs $libcrypto_src "stack/stack.h lhash/lhash.h stack/safestack.h
         dsa/dsa.h engine/engine.h ui/ui.h pkcs12/pkcs12.h ts/ts.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
-        chacha/chacha.h evp/evp.h poly1305/poly1305.h camellia/camellia.h
+        sm3/sm3.h chacha/chacha.h evp/evp.h poly1305/poly1305.h camellia/camellia.h
         gost/gost.h curve25519/curve25519.h"
 
 copy_hdrs $libssl_src "srtp.h ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h"