]> git.ipfire.org Git - thirdparty/openssl.git/commit
projects / thirdparty / openssl.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e0ae058) | patch
Added new EVP/KDF API.
authorDavid Makepeace <david.p.makepeace@oracle.com>
Thu, 21 Jun 2018 21:16:18 +0000 (07:16 +1000)
committerRichard Levitte <levitte@openssl.org>
Wed, 13 Feb 2019 11:11:49 +0000 (12:11 +0100)
commit5a285addbf39f91d567f95f04b2b41764127950d
tree4cdf512d4217da5b6b959552a20a33b6a23a9aaatree | snapshot
parente0ae0585bee898184cbbe8144d2fa8ce25e8ca72commit | diff
Added new EVP/KDF API.
Changed PKEY/KDF API to call the new API.
Added wrappers for PKCS5_PBKDF2_HMAC() and EVP_PBE_scrypt() to call the new EVP KDF APIs.
Documentation updated.

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6674)
40 files changed:
CHANGES diff | blob | blame | history
crypto/err/openssl.txt diff | blob | blame | history
crypto/evp/build.info diff | blob | blame | history
crypto/evp/e_chacha20_poly1305.c diff | blob | blame | history
crypto/evp/encode.c diff | blob | blame | history
crypto/evp/evp_err.c diff | blob | blame | history
crypto/evp/evp_locl.h diff | blob | blame | history
crypto/evp/evp_pbe.c diff | blob | blame | history
crypto/evp/kdf_lib.c [new file with mode: 0644] blob
crypto/evp/p5_crpt2.c diff | blob | blame | history
crypto/evp/pbe_scrypt.c diff | blob | blame | history
crypto/evp/pkey_kdf.c [new file with mode: 0644] blob
crypto/include/internal/evp_int.h diff | blob | blame | history
crypto/kdf/build.info diff | blob | blame | history
crypto/kdf/hkdf.c diff | blob | blame | history
crypto/kdf/kdf_err.c diff | blob | blame | history
crypto/kdf/kdf_local.h [new file with mode: 0644] blob
crypto/kdf/kdf_util.c [new file with mode: 0644] blob
crypto/kdf/pbkdf2.c [new file with mode: 0644] blob
crypto/kdf/scrypt.c diff | blob | blame | history
crypto/kdf/tls1_prf.c diff | blob | blame | history
doc/man3/EVP_KDF_CTX.pod [new file with mode: 0644] blob
doc/man7/EVP_KDF_HKDF.pod [new file with mode: 0644] blob
doc/man7/EVP_KDF_PBKDF2.pod [new file with mode: 0644] blob
doc/man7/EVP_KDF_SCRYPT.pod [moved from doc/man7/scrypt.pod with 53% similarity] diff | blob | blame | history
doc/man7/EVP_KDF_TLS1_PRF.pod [new file with mode: 0644] blob
include/openssl/evperr.h diff | blob | blame | history
include/openssl/kdf.h diff | blob | blame | history
include/openssl/kdferr.h diff | blob | blame | history
include/openssl/ossl_typ.h diff | blob | blame | history
test/build.info diff | blob | blame | history
test/evp_kdf_test.c [new file with mode: 0644] blob
test/evp_test.c diff | blob | blame | history
test/pkey_meth_kdf_test.c diff | blob | blame | history
test/recipes/30-test_evp.t diff | blob | blame | history
test/recipes/30-test_evp_data/evpkdf.txt diff | blob | blame | history
test/recipes/30-test_evp_data/evppkey_kdf.txt [new file with mode: 0644] blob
test/recipes/30-test_evp_kdf.t [new file with mode: 0644] blob
util/libcrypto.num diff | blob | blame | history
util/private.num diff | blob | blame | history
A mirror of the official openssl repository