Commit 9537fe57 authored by Shane Lontis's avatar Shane Lontis Committed by Matt Caswell
Browse files

Single step kdf implementation 



Reviewed-by: default avatarPaul Dale <paul.dale@oracle.com>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8230)
parent 6098b69e

CHANGES

+6 −0
Original line number Diff line number Diff line
@@ -31,6 +31,12 @@ 
     'enable-buildtest-c++'.

     [Richard Levitte]













  *) Add Single Step KDF (EVP_KDF_SS) to EVP_KDF.













     [Shane Lontis]

























  *) Add KMAC to EVP_MAC.













     [Shane Lontis]



























  *) Added property based algorithm implementation selection framework to















     the core.















     [Paul Dale]

































crypto/err/openssl.txt



+8
−1






























Original line number
Diff line number
Diff line








@@ -898,6 +898,11 @@ KDF_F_PKEY_TLS1_PRF_CTRL_STR:100:pkey_tls1_prf_ctrl_str













KDF_F_PKEY_TLS1_PRF_DERIVE:101:pkey_tls1_prf_derive















KDF_F_PKEY_TLS1_PRF_INIT:110:pkey_tls1_prf_init















KDF_F_SCRYPT_SET_MEMBUF:129:scrypt_set_membuf













KDF_F_SSKDF_CTRL_STR:134:sskdf_ctrl_str













KDF_F_SSKDF_DERIVE:135:sskdf_derive













KDF_F_SSKDF_MAC2CTRL:136:sskdf_mac2ctrl













KDF_F_SSKDF_NEW:137:sskdf_new













KDF_F_SSKDF_SIZE:138:sskdf_size















KDF_F_TLS1_PRF_ALG:111:tls1_prf_alg















OBJ_F_OBJ_ADD_OBJECT:105:OBJ_add_object















OBJ_F_OBJ_ADD_SIGID:107:OBJ_add_sigid










@@ -2128,7 +2133,6 @@ CONF_R_UNKNOWN_MODULE_NAME:113:unknown module name













CONF_R_VARIABLE_EXPANSION_TOO_LONG:116:variable expansion too long















CONF_R_VARIABLE_HAS_NO_VALUE:104:variable has no value















CRMF_R_BAD_PBM_ITERATIONCOUNT:100:bad pbm iterationcount













CRMF_R_MALFORMED_IV:101:malformed iv















CRMF_R_CRMFERROR:102:crmferror















CRMF_R_ERROR:103:error















CRMF_R_ERROR_DECODING_CERTIFICATE:104:error decoding certificate









@@ -2136,6 +2140,7 @@ CRMF_R_ERROR_DECRYPTING_CERTIFICATE:105:error decrypting certificate













CRMF_R_ERROR_DECRYPTING_SYMMETRIC_KEY:106:error decrypting symmetric key















CRMF_R_FAILURE_OBTAINING_RANDOM:107:failure obtaining random















CRMF_R_ITERATIONCOUNT_BELOW_100:108:iterationcount below 100













CRMF_R_MALFORMED_IV:101:malformed iv















CRMF_R_NULL_ARGUMENT:109:null argument















CRMF_R_SETTING_MAC_ALGOR_FAILURE:110:setting mac algor failure















CRMF_R_SETTING_OWF_ALGOR_FAILURE:111:setting owf algor failure










@@ -2402,6 +2407,7 @@ EVP_R_UNSUPPORTED_SALT_TYPE:126:unsupported salt type













EVP_R_WRAP_MODE_NOT_ALLOWED:170:wrap mode not allowed















EVP_R_WRONG_FINAL_BLOCK_LENGTH:109:wrong final block length















KDF_R_INVALID_DIGEST:100:invalid digest













KDF_R_INVALID_MAC_TYPE:116:invalid mac type















KDF_R_MISSING_ITERATION_COUNT:109:missing iteration count















KDF_R_MISSING_KEY:104:missing key















KDF_R_MISSING_MESSAGE_DIGEST:105:missing message digest









@@ -2414,6 +2420,7 @@ KDF_R_MISSING_SESSION_ID:113:missing session id













KDF_R_MISSING_TYPE:114:missing type















KDF_R_MISSING_XCGHASH:115:missing xcghash















KDF_R_UNKNOWN_PARAMETER_TYPE:103:unknown parameter type













KDF_R_UNSUPPORTED_MAC_TYPE:117:unsupported mac type















KDF_R_VALUE_ERROR:108:value error















KDF_R_VALUE_MISSING:102:value missing















KDF_R_WRONG_OUTPUT_BUFFER_SIZE:112:wrong output buffer size

































crypto/evp/kdf_lib.c



+1
−0






























Original line number
Diff line number
Diff line








@@ -31,6 +31,7 @@ static const EVP_KDF_METHOD *standard_methods[] = {













    &tls1_prf_kdf_meth,















    &hkdf_kdf_meth,















    &sshkdf_kdf_meth,













    &ss_kdf_meth















};































DECLARE_OBJ_BSEARCH_CMP_FN(const EVP_KDF_METHOD *, const EVP_KDF_METHOD *,

































crypto/include/internal/evp_int.h



+1
−0






























Original line number
Diff line number
Diff line








@@ -169,6 +169,7 @@ extern const EVP_KDF_METHOD scrypt_kdf_meth;













extern const EVP_KDF_METHOD tls1_prf_kdf_meth;















extern const EVP_KDF_METHOD hkdf_kdf_meth;















extern const EVP_KDF_METHOD sshkdf_kdf_meth;













extern const EVP_KDF_METHOD ss_kdf_meth;































struct evp_md_st {















    int type;

































crypto/kdf/build.info



+2
−1






























Original line number
Diff line number
Diff line















LIBS=../../libcrypto















SOURCE[../../libcrypto]=\













        tls1_prf.c kdf_err.c kdf_util.c hkdf.c scrypt.c pbkdf2.c sshkdf.c












        tls1_prf.c kdf_err.c kdf_util.c hkdf.c scrypt.c pbkdf2.c sshkdf.c \













        sskdf.c