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

gilles-peskine-arm · gilles-peskine-arm · commit a1b67f7ff8b8 · 2019-04-17T15:47:14.000+02:00
Fix logic error that clang helpfully points out
diff --git a/library/psa_crypto.c b/library/psa_crypto.c
@@ -4334,7 +4334,7 @@ static psa_status_t psa_key_derivation_setup_kdf(
             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 );
         }

Original file line number	Diff line number	Diff line change
`@@ -4334,7 +4334,7 @@ static psa_status_t psa_key_derivation_setup_kdf(`
`4334`	`4334`	`return( PSA_ERROR_NOT_SUPPORTED );`
`4335`	`4335`	`if( ( PSA_ALG_IS_TLS12_PRF( kdf_alg ) \|\|`
`4336`	`4336`	`PSA_ALG_IS_TLS12_PSK_TO_MS( kdf_alg ) ) &&`
`4337`		`- ! ( hash_alg == PSA_ALG_SHA_256 && hash_alg == PSA_ALG_SHA_384 ) )`
	`4337`	`+ ! ( hash_alg == PSA_ALG_SHA_256 \|\| hash_alg == PSA_ALG_SHA_384 ) )`
`4338`	`4338`	`{`
`4339`	`4339`	`return( PSA_ERROR_NOT_SUPPORTED );`
`4340`	`4340`	`}`