Commit 8d76481b authored by Simo Sorce's avatar Simo Sorce Committed by Matt Caswell
Browse files

Implement SSH KDF 



SSH's KDF is defined in RFC 4253 in Section 7.2

Signed-off-by: default avatarSimo Sorce <simo@redhat.com>

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/7290)
parent 149c12d5

crypto/err/openssl.txt

+7 −0
Original line number Diff line number Diff line
@@ -852,6 +852,10 @@ KDF_F_KDF_SCRYPT_CTRL_UINT32:121:kdf_scrypt_ctrl_uint32 
KDF_F_KDF_SCRYPT_CTRL_UINT64:122:kdf_scrypt_ctrl_uint64

KDF_F_KDF_SCRYPT_DERIVE:123:kdf_scrypt_derive

KDF_F_KDF_SCRYPT_NEW:124:kdf_scrypt_new

KDF_F_KDF_SSHKDF_CTRL:130:kdf_sshkdf_ctrl

KDF_F_KDF_SSHKDF_CTRL_STR:131:kdf_sshkdf_ctrl_str

KDF_F_KDF_SSHKDF_DERIVE:132:kdf_sshkdf_derive

KDF_F_KDF_SSHKDF_NEW:133:kdf_sshkdf_new

KDF_F_KDF_TLS1_PRF_CTRL_STR:125:kdf_tls1_prf_ctrl_str

KDF_F_KDF_TLS1_PRF_DERIVE:126:kdf_tls1_prf_derive

KDF_F_KDF_TLS1_PRF_NEW:127:kdf_tls1_prf_new
@@ -2353,6 +2357,9 @@ KDF_R_MISSING_PASS:110:missing pass 
KDF_R_MISSING_SALT:111:missing salt

KDF_R_MISSING_SECRET:107:missing secret

KDF_R_MISSING_SEED:106:missing seed

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_VALUE_ERROR:108:value error

KDF_R_VALUE_MISSING:102:value missing

crypto/evp/kdf_lib.c

+2 −1
Original line number Diff line number Diff line
@@ -29,7 +29,8 @@ static const EVP_KDF_METHOD *standard_methods[] = { 
    &scrypt_kdf_meth,

#endif

    &tls1_prf_kdf_meth,

    &hkdf_kdf_meth

    &hkdf_kdf_meth,

    &sshkdf_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
@@ -168,6 +168,7 @@ extern const EVP_KDF_METHOD pbkdf2_kdf_meth; 
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;



struct evp_md_st {

    int type;

crypto/kdf/build.info

+1 −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
 
        tls1_prf.c kdf_err.c kdf_util.c hkdf.c scrypt.c pbkdf2.c sshkdf.c

crypto/kdf/kdf_err.c

+8 −0
Original line number Diff line number Diff line
@@ -31,6 +31,11 @@ static const ERR_STRING_DATA KDF_str_functs[] = { 
     "kdf_scrypt_ctrl_uint64"},

    {ERR_PACK(ERR_LIB_KDF, KDF_F_KDF_SCRYPT_DERIVE, 0), "kdf_scrypt_derive"},

    {ERR_PACK(ERR_LIB_KDF, KDF_F_KDF_SCRYPT_NEW, 0), "kdf_scrypt_new"},

    {ERR_PACK(ERR_LIB_KDF, KDF_F_KDF_SSHKDF_CTRL, 0), "kdf_sshkdf_ctrl"},

    {ERR_PACK(ERR_LIB_KDF, KDF_F_KDF_SSHKDF_CTRL_STR, 0),

     "kdf_sshkdf_ctrl_str"},

    {ERR_PACK(ERR_LIB_KDF, KDF_F_KDF_SSHKDF_DERIVE, 0), "kdf_sshkdf_derive"},

    {ERR_PACK(ERR_LIB_KDF, KDF_F_KDF_SSHKDF_NEW, 0), "kdf_sshkdf_new"},

    {ERR_PACK(ERR_LIB_KDF, KDF_F_KDF_TLS1_PRF_CTRL_STR, 0),

     "kdf_tls1_prf_ctrl_str"},

    {ERR_PACK(ERR_LIB_KDF, KDF_F_KDF_TLS1_PRF_DERIVE, 0),
@@ -70,6 +75,9 @@ static const ERR_STRING_DATA KDF_str_reasons[] = { 
    {ERR_PACK(ERR_LIB_KDF, 0, KDF_R_MISSING_SALT), "missing salt"},

    {ERR_PACK(ERR_LIB_KDF, 0, KDF_R_MISSING_SECRET), "missing secret"},

    {ERR_PACK(ERR_LIB_KDF, 0, KDF_R_MISSING_SEED), "missing seed"},

    {ERR_PACK(ERR_LIB_KDF, 0, KDF_R_MISSING_SESSION_ID), "missing session id"},

    {ERR_PACK(ERR_LIB_KDF, 0, KDF_R_MISSING_TYPE), "missing type"},

    {ERR_PACK(ERR_LIB_KDF, 0, KDF_R_MISSING_XCGHASH), "missing xcghash"},

    {ERR_PACK(ERR_LIB_KDF, 0, KDF_R_UNKNOWN_PARAMETER_TYPE),

    "unknown parameter type"},

    {ERR_PACK(ERR_LIB_KDF, 0, KDF_R_VALUE_ERROR), "value error"},