QuasarApp/openssl
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-05-18 12:29:42 +00:00
Code Issues Projects Releases Wiki Activity

Fix no-des build

Browse Source 
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10643)
This commit is contained in:
Bernd Edlinger 2019-12-18 11:14:45 +01:00
parent cc731bc3f6
commit 74a5808b3b
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
providers/implementations/kdfs/krb5kdf.c
View File

@ -336,19 +336,25 @@ static int KRB5KDF(const EVP_CIPHER *cipher, ENGINE *engine,
size_t blocksize; size_t blocksize;
size_t cipherlen; size_t cipherlen;
size_t osize; size_t osize;
#ifndef OPENSSL_NO_DES
int des3_no_fixup = 0; int des3_no_fixup = 0;
#endif
int ret; int ret;
if (key_len != okey_len) { if (key_len != okey_len) {
#ifndef OPENSSL_NO_DES
/* special case for 3des, where the caller may be requesting /* special case for 3des, where the caller may be requesting
* the random raw key, instead of the fixed up key */ * the random raw key, instead of the fixed up key */
if (EVP_CIPHER_nid(cipher) == NID_des_ede3_cbc && if (EVP_CIPHER_nid(cipher) == NID_des_ede3_cbc &&
key_len == 24 && okey_len == 21) { key_len == 24 && okey_len == 21) {
des3_no_fixup = 1; des3_no_fixup = 1;
} else { } else {
#endif
ERR_raise(ERR_LIB_PROV, PROV_R_WRONG_OUTPUT_BUFFER_SIZE); ERR_raise(ERR_LIB_PROV, PROV_R_WRONG_OUTPUT_BUFFER_SIZE);
return 0; return 0;
#ifndef OPENSSL_NO_DES
} }
#endif
} }
ctx = EVP_CIPHER_CTX_new(); ctx = EVP_CIPHER_CTX_new();