Commit 46793451 authored by Simo Sorce's avatar Simo Sorce Committed by Dr. Matthias St. Pierre
Browse files

Change the digest string from "md" to "digest" 



Conform to other modules which were changed at the last minute and this
discrepancy was not noticed.
Retain "md" as an alias so not to break 3rd party backports/tests scripts.

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

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
Reviewed-by: default avatarMatthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/8783)
parent ff8029c1

crypto/kdf/sshkdf.c

+3 −0
Original line number Diff line number Diff line
@@ -125,6 +125,9 @@ static int kdf_sshkdf_ctrl_str(EVP_KDF_IMPL *impl, const char *type, 
        return 0;

    }



    if (strcmp(type, "digest") == 0)

        return kdf_md2ctrl(impl, kdf_sshkdf_ctrl, EVP_KDF_CTRL_SET_MD, value);

    /* alias, for historical reasons */

    if (strcmp(type, "md") == 0)

        return kdf_md2ctrl(impl, kdf_sshkdf_ctrl, EVP_KDF_CTRL_SET_MD, value);

test/recipes/20-test_kdf.t

100644 → 100755
+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ my @kdf_tests = ( 
    { cmd => [qw{openssl kdf -keylen 14 -kdfopt digest:SHA224 -kdfopt hexkey:6dbdc23f045488e4062757b06b9ebae183fc5a5946d80db93fec6f62ec07e3727f0126aed12ce4b262f47d48d54287f81d474c7c3b1850e9 -kdfopt hexinfo:a1b2c3d4e54341565369643c832e9849dcdba71e9a3139e606e095de3c264a66e98a165854cd07989b1ee0ec3f8dbe SSKDF}],

      expected => 'a4:62:de:16:a8:9d:e8:46:6e:f5:46:0b:47:b8',

      desc => 'SSKDF HASH SHA224'},

    { cmd => [qw{openssl kdf -keylen 16 -kdfopt md:SHA256 -kdfopt hexkey:0102030405 -kdfopt hexxcghash:06090A -kdfopt hexsession_id:01020304 -kdfopt type:A SSHKDF}],

    { cmd => [qw{openssl kdf -keylen 16 -kdfopt digest:SHA256 -kdfopt hexkey:0102030405 -kdfopt hexxcghash:06090A -kdfopt hexsession_id:01020304 -kdfopt type:A SSHKDF}],

    expected => '5C:49:94:47:3B:B1:53:3A:58:EB:19:42:04:D3:78:16',

    desc => 'SSHKDF SHA256'},

);

test/recipes/30-test_evp_data/evpkdf.txt

+606 −605

File changed.

Preview size limit exceeded, changes collapsed.