]> git.ipfire.org Git - thirdparty/openssl.git/commit
projects / thirdparty / openssl.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9ed79d8) | patch
Add interface to the scrypt KDF by means of PKEY_METHOD
authorJohannes Bauer <joe@johannes-bauer.com>
Sat, 22 Jul 2017 18:04:55 +0000 (20:04 +0200)
committerDr. Stephen Henson <steve@openssl.org>
Tue, 8 Aug 2017 14:44:49 +0000 (15:44 +0100)
commitcefa762ee5c28359986c6af5bf4db4e901f75846
tree6b55f77ca5b546c50f3010a8757d0e9e39ce3972tree
parent9ed79d8ee1ef845fce94739787d45ad03f675eaacommit | diff
Add interface to the scrypt KDF by means of PKEY_METHOD

Add an interface that allows accessing the scrypt KDF as a PKEY_METHOD.
This fixes #4021 (at least for the scrypt portion of the issue).

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Stephen Henson <steve@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4026)
14 files changed:
crypto/err/openssl.txt diff | blob | blame | history
crypto/evp/pmeth_lib.c diff | blob | blame | history
crypto/include/internal/evp_int.h diff | blob | blame | history
crypto/kdf/build.info diff | blob | blame | history
crypto/kdf/kdf_err.c diff | blob | blame | history
crypto/kdf/scrypt.c [new file with mode: 0644] blob
crypto/objects/obj_dat.h diff | blob | blame | history
crypto/objects/objects.txt diff | blob | blame | history
include/openssl/evp.h diff | blob | blame | history
include/openssl/kdf.h diff | blob | blame | history
include/openssl/kdferr.h diff | blob | blame | history
include/openssl/obj_mac.h diff | blob | blame | history
test/recipes/30-test_evp_data/evpkdf.txt diff | blob | blame | history
util/libcrypto.num diff | blob | blame | history
Mirror of https://github.com/openssl/openssl.git