commit ab4b20149713ad27087be59e5b92c353c8ccd9f0
author Gilles Peskine <Gilles.Peskine@arm.com> Fri Apr 12 15:06:27 2019 +0200
committer Gilles Peskine <Gilles.Peskine@arm.com> Thu Apr 18 09:42:21 2019 +0200
tree 2f5b286c7d34e095a6658d98e6bc864548a57bd0
parent c88644dd2485f815118444926079fa201b84e2eb

fixup! Key derivation by small input steps: proof-of-concept

Fix logic error that clang helpfully points out

library/psa_crypto.c

diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index 8e04051..77e7e5a 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -4334,7 +4334,7 @@
             return( PSA_ERROR_NOT_SUPPORTED );
         if( ( PSA_ALG_IS_TLS12_PRF( kdf_alg ) ||
               PSA_ALG_IS_TLS12_PSK_TO_MS( kdf_alg ) ) &&
-            ! ( hash_alg == PSA_ALG_SHA_256 && hash_alg == PSA_ALG_SHA_384 ) )
+            ! ( hash_alg == PSA_ALG_SHA_256 || hash_alg == PSA_ALG_SHA_384 ) )
         {
             return( PSA_ERROR_NOT_SUPPORTED );
         }