factotum/libressl-portable
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add portable scaffold for SM3

Browse Source
This commit is contained in:
Jack Lloyd 2018-08-14 15:16:36 -04:00
parent 4dbf285573
commit d4803f134f
5 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/CMakeLists.txt
View File

@ -424,6 +424,7 @@ set(
evp/m_sha1.c evp/m_sha1.c
evp/m_sigver.c evp/m_sigver.c
evp/m_streebog.c evp/m_streebog.c
evp/m_sm3.c
evp/m_wp.c evp/m_wp.c
evp/names.c evp/names.c
evp/p5_crpt.c evp/p5_crpt.c
@ -558,6 +559,7 @@ set(
sha/sha1dgst.c sha/sha1dgst.c
sha/sha256.c sha/sha256.c
sha/sha512.c sha/sha512.c
sm3/sm3.c
stack/stack.c stack/stack.c
ts/ts_asn1.c ts/ts_asn1.c
ts/ts_conf.c ts/ts_conf.c

5
crypto/Makefile.am
View File

@ -614,6 +614,7 @@ libcrypto_la_SOURCES += evp/m_ripemd.c
libcrypto_la_SOURCES += evp/m_sha1.c libcrypto_la_SOURCES += evp/m_sha1.c
libcrypto_la_SOURCES += evp/m_sigver.c libcrypto_la_SOURCES += evp/m_sigver.c
libcrypto_la_SOURCES += evp/m_streebog.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/m_wp.c
libcrypto_la_SOURCES += evp/names.c libcrypto_la_SOURCES += evp/names.c
libcrypto_la_SOURCES += evp/p5_crpt.c libcrypto_la_SOURCES += evp/p5_crpt.c
@ -806,6 +807,10 @@ libcrypto_la_SOURCES += sha/sha256.c
libcrypto_la_SOURCES += sha/sha512.c libcrypto_la_SOURCES += sha/sha512.c
noinst_HEADERS += sha/sha_locl.h noinst_HEADERS += sha/sha_locl.h
# sm3
libcrypto_la_SOURCES += sm3/sm3.c
noinst_HEADERS += sm3/sm3_locl.h
# stack # stack
libcrypto_la_SOURCES += stack/stack.c libcrypto_la_SOURCES += stack/stack.c

5
tests/CMakeLists.txt
View File

@ -358,6 +358,11 @@ add_executable(sha512test sha512test.c)
target_link_libraries(sha512test ${OPENSSL_LIBS}) target_link_libraries(sha512test ${OPENSSL_LIBS})
add_test(sha512test sha512test) add_test(sha512test sha512test)
# sm3test
add_executable(sm3test sm3test.c)
target_link_libraries(sm3test ${OPENSSL_LIBS})
add_test(sm3test sm3test)
# ssl_versions # ssl_versions
if(NOT BUILD_SHARED_LIBS) if(NOT BUILD_SHARED_LIBS)
add_executable(ssl_versions ssl_versions.c) add_executable(ssl_versions ssl_versions.c)

5
tests/Makefile.am
View File

@ -347,6 +347,11 @@ TESTS += sha512test
check_PROGRAMS += sha512test check_PROGRAMS += sha512test
sha512test_SOURCES = sha512test.c sha512test_SOURCES = sha512test.c
# sm3test
TESTS += sm3test
check_PROGRAMS += sm3test
sm3test_SOURCES = sm3test.c
# ssl_versions # ssl_versions
TESTS += ssl_versions TESTS += ssl_versions
check_PROGRAMS += ssl_versions check_PROGRAMS += ssl_versions

2
update.sh
View File

@ -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 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 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 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" gost/gost.h curve25519/curve25519.h"
copy_hdrs $libssl_src "srtp.h ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h" copy_hdrs $libssl_src "srtp.h ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h"