diff options
author | Brent Cook <bcook@openbsd.org> | 2018-11-11 09:14:41 -0600 |
---|---|---|
committer | Brent Cook <bcook@openbsd.org> | 2018-11-11 09:14:41 -0600 |
commit | 1cb05b51c1836d2b94ef93778dd197230092ea8d (patch) | |
tree | 876fa10fd9398b42f77d8c40bd72244461ac4c7c /crypto | |
parent | 1e2937e1a2e4ddfed1cf484b48b916d113f8fdac (diff) | |
parent | d4803f134fc485da2d538e759d184f961adee76f (diff) | |
download | portable-1cb05b51c1836d2b94ef93778dd197230092ea8d.tar.gz portable-1cb05b51c1836d2b94ef93778dd197230092ea8d.tar.bz2 portable-1cb05b51c1836d2b94ef93778dd197230092ea8d.zip |
Land #439, Add portable scaffold for SM3
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/CMakeLists.txt | 2 | ||||
-rw-r--r-- | crypto/Makefile.am | 5 |
2 files changed, 7 insertions, 0 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( | |||
447 | evp/m_sha1.c | 447 | evp/m_sha1.c |
448 | evp/m_sigver.c | 448 | evp/m_sigver.c |
449 | evp/m_streebog.c | 449 | evp/m_streebog.c |
450 | evp/m_sm3.c | ||
450 | evp/m_wp.c | 451 | evp/m_wp.c |
451 | evp/names.c | 452 | evp/names.c |
452 | evp/p5_crpt.c | 453 | evp/p5_crpt.c |
@@ -581,6 +582,7 @@ set( | |||
581 | sha/sha1dgst.c | 582 | sha/sha1dgst.c |
582 | sha/sha256.c | 583 | sha/sha256.c |
583 | sha/sha512.c | 584 | sha/sha512.c |
585 | sm3/sm3.c | ||
584 | stack/stack.c | 586 | stack/stack.c |
585 | ts/ts_asn1.c | 587 | ts/ts_asn1.c |
586 | ts/ts_conf.c | 588 | 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 | |||
620 | libcrypto_la_SOURCES += evp/m_sha1.c | 620 | libcrypto_la_SOURCES += evp/m_sha1.c |
621 | libcrypto_la_SOURCES += evp/m_sigver.c | 621 | libcrypto_la_SOURCES += evp/m_sigver.c |
622 | libcrypto_la_SOURCES += evp/m_streebog.c | 622 | libcrypto_la_SOURCES += evp/m_streebog.c |
623 | libcrypto_la_SOURCES += evp/m_sm3.c | ||
623 | libcrypto_la_SOURCES += evp/m_wp.c | 624 | libcrypto_la_SOURCES += evp/m_wp.c |
624 | libcrypto_la_SOURCES += evp/names.c | 625 | libcrypto_la_SOURCES += evp/names.c |
625 | libcrypto_la_SOURCES += evp/p5_crpt.c | 626 | libcrypto_la_SOURCES += evp/p5_crpt.c |
@@ -812,6 +813,10 @@ libcrypto_la_SOURCES += sha/sha256.c | |||
812 | libcrypto_la_SOURCES += sha/sha512.c | 813 | libcrypto_la_SOURCES += sha/sha512.c |
813 | noinst_HEADERS += sha/sha_locl.h | 814 | noinst_HEADERS += sha/sha_locl.h |
814 | 815 | ||
816 | # sm3 | ||
817 | libcrypto_la_SOURCES += sm3/sm3.c | ||
818 | noinst_HEADERS += sm3/sm3_locl.h | ||
819 | |||
815 | # stack | 820 | # stack |
816 | libcrypto_la_SOURCES += stack/stack.c | 821 | libcrypto_la_SOURCES += stack/stack.c |
817 | 822 | ||