Skip to content

Commit

Permalink
OpenSSL 1.1.0: Don't encrypt with CCM ciphers
Browse files Browse the repository at this point in the history
See openssl/openssl#8810

Will not be backported to 1.1.0, so work around
it in the fuzzer.
  • Loading branch information
guidovranken committed Jul 4, 2019
1 parent 0842da2 commit 5d17214
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions modules/openssl/module.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1687,6 +1687,12 @@ std::optional<component::Ciphertext> OpenSSL::OpSymmetricEncrypt(operation::Symm
return AES_Encrypt(op, ds);
}

#if defined(CRYPTOFUZZ_OPENSSL_110)
if ( repository::IsCCM( op.cipher.cipherType.Get() ) ) {
return std::nullopt;
}
#endif

#if defined(CRYPTOFUZZ_OPENSSL_102) || defined(CRYPTOFUZZ_OPENSSL_110)
/* Prevent OOB write for large keys in RC5.
* Fixed in OpenSSL master, but will not be fixed for OpenSSL 1.0.2 and 1.1.0
Expand Down

0 comments on commit 5d17214

Please sign in to comment.