commit f216f0d5d4f69621d7d913a98a5655b5a9941af5
author Gilles Peskine <Gilles.Peskine@arm.com> Fri Jun 11 22:41:46 2021 +0200
committer Gilles Peskine <Gilles.Peskine@arm.com> Mon Jun 14 18:08:26 2021 +0200
tree 4fed732e7b69c38d2a32e3712e25b190914d92fe
parent d40a21cff12a76777bb4fd33e79c92dac7075c81

Fix missing state check for tls12_prf output

Fix PSA_ALG_TLS12_PRF and PSA_ALG_TLS12_PSK_TO_MS being too permissive
about missing inputs.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

library/psa_crypto.c

diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index 339370e..e36c82f 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -3785,6 +3785,17 @@
     psa_status_t status;
     uint8_t offset, length;
 
+    switch( tls12_prf->state )
+    {
+        case PSA_TLS12_PRF_STATE_LABEL_SET:
+            tls12_prf->state = PSA_TLS12_PRF_STATE_OUTPUT;
+            break;
+        case PSA_TLS12_PRF_STATE_OUTPUT:
+            break;
+        default:
+            return( PSA_ERROR_BAD_STATE );
+    }
+
     while( output_length != 0 )
     {
         /* Check if we have fully processed the current block. */