diff options
author | Petr Gotthard <petr.gotthard@centrum.cz> | 2021-05-24 11:40:15 +0200 |
---|---|---|
committer | Pauli <pauli@openssl.org> | 2021-05-26 10:20:24 +1000 |
commit | 9080ed2175532df8ecee4a2de9979037133d2601 (patch) | |
tree | a918285ed530f7316c1910fb11583df8d33816aa /include/crypto/tserr.h | |
parent | b8c09a893c00588ea4e5ea615b9b0d117e952144 (diff) |
Fix building of test/pbetest.c
The test_pkcs5_pbe() function is required twice:
once `if !defined OPENSSL_NO_RC4 && !defined OPENSSL_NO_MD5`
and once `if !defined OPENSSL_NO_DES && !defined OPENSSL_NO_SHA1`
Hence there should be `||` between those. Currently the build fails
if the first condition is false, while the second is true.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15432)
Diffstat (limited to 'include/crypto/tserr.h')
0 files changed, 0 insertions, 0 deletions