]> git.ipfire.org Git - thirdparty/openssl.git/commit
Fix building of test/pbetest.c
authorPetr Gotthard <petr.gotthard@centrum.cz>
Mon, 24 May 2021 09:40:15 +0000 (11:40 +0200)
committerPauli <pauli@openssl.org>
Wed, 26 May 2021 00:20:24 +0000 (10:20 +1000)
commit9080ed2175532df8ecee4a2de9979037133d2601
treea918285ed530f7316c1910fb11583df8d33816aa
parentb8c09a893c00588ea4e5ea615b9b0d117e952144
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)
test/pbetest.c