The branch master has been updated via 74a5808b3bde30df65c00939e8283deb0fe6ddfc (commit) from cc731bc3f66701cad1de07dfc9ba64d0fc709d45 (commit)
- Log ----------------------------------------------------------------- commit 74a5808b3bde30df65c00939e8283deb0fe6ddfc Author: Bernd Edlinger <bernd.edlin...@hotmail.de> Date: Wed Dec 18 11:14:45 2019 +0100 Fix no-des build Reviewed-by: Richard Levitte <levi...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/10643) ----------------------------------------------------------------------- Summary of changes: providers/implementations/kdfs/krb5kdf.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/providers/implementations/kdfs/krb5kdf.c b/providers/implementations/kdfs/krb5kdf.c index ee7742ea27..08a9495929 100644 --- a/providers/implementations/kdfs/krb5kdf.c +++ b/providers/implementations/kdfs/krb5kdf.c @@ -336,19 +336,25 @@ static int KRB5KDF(const EVP_CIPHER *cipher, ENGINE *engine, size_t blocksize; size_t cipherlen; size_t osize; +#ifndef OPENSSL_NO_DES int des3_no_fixup = 0; +#endif int ret; if (key_len != okey_len) { +#ifndef OPENSSL_NO_DES /* special case for 3des, where the caller may be requesting * the random raw key, instead of the fixed up key */ if (EVP_CIPHER_nid(cipher) == NID_des_ede3_cbc && key_len == 24 && okey_len == 21) { des3_no_fixup = 1; } else { +#endif ERR_raise(ERR_LIB_PROV, PROV_R_WRONG_OUTPUT_BUFFER_SIZE); return 0; +#ifndef OPENSSL_NO_DES } +#endif } ctx = EVP_CIPHER_CTX_new();