diff options
| author | kinichiro <kinichiro.inoguchi@gmail.com> | 2017-05-02 00:21:57 +0900 |
|---|---|---|
| committer | kinichiro <kinichiro.inoguchi@gmail.com> | 2017-05-13 23:59:59 +0900 |
| commit | 63042e98f8e5b5d204108506c4aeecdee84639ab (patch) | |
| tree | 5536b9652144e211b11a42921635dd9cd21945f8 | |
| parent | f494c6aaf71e03bcbd2f9bc08e8e0925fcd650e5 (diff) | |
| download | portable-63042e98f8e5b5d204108506c4aeecdee84639ab.tar.gz portable-63042e98f8e5b5d204108506c4aeecdee84639ab.tar.bz2 portable-63042e98f8e5b5d204108506c4aeecdee84639ab.zip | |
Add HKDF functionality
| -rw-r--r-- | crypto/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | crypto/Makefile.am | 3 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | tests/Makefile.am | 5 | ||||
| -rwxr-xr-x | update.sh | 2 |
5 files changed, 15 insertions, 1 deletions
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index 028d840..f8c5684 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt | |||
| @@ -463,6 +463,7 @@ set( | |||
| 463 | gost/gostr341001_pmeth.c | 463 | gost/gostr341001_pmeth.c |
| 464 | gost/gostr341194.c | 464 | gost/gostr341194.c |
| 465 | gost/streebog.c | 465 | gost/streebog.c |
| 466 | hkdf/hkdf.c | ||
| 466 | hmac/hm_ameth.c | 467 | hmac/hm_ameth.c |
| 467 | hmac/hm_pmeth.c | 468 | hmac/hm_pmeth.c |
| 468 | hmac/hmac.c | 469 | hmac/hmac.c |
diff --git a/crypto/Makefile.am b/crypto/Makefile.am index 0e7f9c8..701cd4a 100644 --- a/crypto/Makefile.am +++ b/crypto/Makefile.am | |||
| @@ -583,6 +583,9 @@ noinst_HEADERS += gost/gost.h | |||
| 583 | noinst_HEADERS += gost/gost_asn1.h | 583 | noinst_HEADERS += gost/gost_asn1.h |
| 584 | noinst_HEADERS += gost/gost_locl.h | 584 | noinst_HEADERS += gost/gost_locl.h |
| 585 | 585 | ||
| 586 | # hkdf | ||
| 587 | libcrypto_la_SOURCES += hkdf/hkdf.c | ||
| 588 | |||
| 586 | # hmac | 589 | # hmac |
| 587 | libcrypto_la_SOURCES += hmac/hm_ameth.c | 590 | libcrypto_la_SOURCES += hmac/hm_ameth.c |
| 588 | libcrypto_la_SOURCES += hmac/hm_pmeth.c | 591 | libcrypto_la_SOURCES += hmac/hm_pmeth.c |
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index e53a8d5..e9c1360 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt | |||
| @@ -178,6 +178,11 @@ add_executable(gost2814789t gost2814789t.c) | |||
| 178 | target_link_libraries(gost2814789t ${TESTS_LIBS}) | 178 | target_link_libraries(gost2814789t ${TESTS_LIBS}) |
| 179 | add_test(gost2814789t gost2814789t) | 179 | add_test(gost2814789t gost2814789t) |
| 180 | 180 | ||
| 181 | # hkdf_test | ||
| 182 | add_executable(hkdf_test hkdf_test.c) | ||
| 183 | target_link_libraries(hkdf_test ${TESTS_LIBS}) | ||
| 184 | add_test(hkdf_test hkdf_test) | ||
| 185 | |||
| 181 | # hmactest | 186 | # hmactest |
| 182 | add_executable(hmactest hmactest.c) | 187 | add_executable(hmactest hmactest.c) |
| 183 | target_link_libraries(hmactest ${TESTS_LIBS}) | 188 | target_link_libraries(hmactest ${TESTS_LIBS}) |
diff --git a/tests/Makefile.am b/tests/Makefile.am index 7a29787..741efb2 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am | |||
| @@ -184,6 +184,11 @@ TESTS += gost2814789t | |||
| 184 | check_PROGRAMS += gost2814789t | 184 | check_PROGRAMS += gost2814789t |
| 185 | gost2814789t_SOURCES = gost2814789t.c | 185 | gost2814789t_SOURCES = gost2814789t.c |
| 186 | 186 | ||
| 187 | # hkdf_test | ||
| 188 | TESTS += hkdf_test | ||
| 189 | check_PROGRAMS += hkdf_test | ||
| 190 | hmactest_SOURCES = hkdf_est.c | ||
| 191 | |||
| 187 | # hmactest | 192 | # hmactest |
| 188 | TESTS += hmactest | 193 | TESTS += hmactest |
| 189 | check_PROGRAMS += hmactest | 194 | check_PROGRAMS += hmactest |
| @@ -121,7 +121,7 @@ copy_hdrs $libcrypto_src "stack/stack.h lhash/lhash.h stack/safestack.h | |||
| 121 | ossl_typ.h err/err.h crypto.h comp/comp.h x509/x509.h buffer/buffer.h | 121 | ossl_typ.h err/err.h crypto.h comp/comp.h x509/x509.h buffer/buffer.h |
| 122 | objects/objects.h asn1/asn1.h bn/bn.h ec/ec.h ecdsa/ecdsa.h | 122 | objects/objects.h asn1/asn1.h bn/bn.h ec/ec.h ecdsa/ecdsa.h |
| 123 | ecdh/ecdh.h rsa/rsa.h sha/sha.h x509/x509_vfy.h pkcs7/pkcs7.h pem/pem.h | 123 | ecdh/ecdh.h rsa/rsa.h sha/sha.h x509/x509_vfy.h pkcs7/pkcs7.h pem/pem.h |
| 124 | pem/pem2.h hmac/hmac.h rand/rand.h md5/md5.h | 124 | pem/pem2.h hkdf/hkdf.h hmac/hmac.h rand/rand.h md5/md5.h |
| 125 | asn1/asn1_mac.h x509v3/x509v3.h conf/conf.h ocsp/ocsp.h | 125 | asn1/asn1_mac.h x509v3/x509v3.h conf/conf.h ocsp/ocsp.h |
| 126 | aes/aes.h modes/modes.h asn1/asn1t.h dso/dso.h bf/blowfish.h | 126 | aes/aes.h modes/modes.h asn1/asn1t.h dso/dso.h bf/blowfish.h |
| 127 | bio/bio.h cast/cast.h cmac/cmac.h conf/conf_api.h des/des.h dh/dh.h | 127 | bio/bio.h cast/cast.h cmac/cmac.h conf/conf_api.h des/des.h dh/dh.h |