Commit 253d7622 authored by Victor Stinner's avatar Victor Stinner Committed by Pauli
Browse files

EVP_PBE_scrypt() handles salt=NULL as salt="" 



Modify EVP_PBE_scrypt() to maintain OpenSSL 1.1.1 behavior: salt=NULL
is now handled as salt="" (and saltlen=0).

Commit 5a285add changed the behavior
of EVP_PBE_scrypt(salt=NULL). Previously, salt=NULL was accepted, but
the function now fails with KDF_R_MISSING_SALT.

CLA: trivial

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
Reviewed-by: default avatarPaul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8483)
parent f7f2a55a

crypto/evp/pbe_scrypt.c

+4 −0
Original line number Diff line number Diff line
@@ -52,6 +52,10 @@ int EVP_PBE_scrypt(const char *pass, size_t passlen, 
        pass = empty;

        passlen = 0;

    }

    if (salt == NULL) {

        salt = (const unsigned char *)empty;

        saltlen = 0;

    }

    if (maxmem == 0)

        maxmem = SCRYPT_MAX_MEM;