commit 999f648437ebec0f93021ae7b638f96cc69ca14b
author Janos Follath <janos.follath@arm.com> Tue Jun 11 12:04:10 2019 +0100
committer Janos Follath <janos.follath@arm.com> Wed Jun 26 09:15:08 2019 +0100
tree 0fdbc5d6f7b3f286d620a3fa8bac2d2af70449a0
parent e3e8166cdd3e27684c63162fea7d0f3c0c18b67c

Add new psa_tls12_prf_key_derivation_t

As part of adapting TLS 1.2 key derivation to the PSA 1.0 API we need to
change the context structure.

library/psa_crypto.c

diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index 924b291..f4e94bf 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -2122,11 +2122,13 @@
     return( psa_hash_abort( &hmac->hash_ctx ) );
 }
 
+#if defined(PSA_PRE_1_0_KEY_DERIVATION)
 static void psa_hmac_init_internal( psa_hmac_internal_data *hmac )
 {
     /* Instances of psa_hash_operation_s can be initialized by zeroization. */
     memset( hmac, 0, sizeof( *hmac ) );
 }
+#endif /* PSA_PRE_1_0_KEY_DERIVATION */
 #endif /* MBEDTLS_MD_C */
 
 psa_status_t psa_mac_abort( psa_mac_operation_t *operation )
@@ -3879,6 +3881,7 @@
         mbedtls_free( operation->ctx.hkdf.info );
         status = psa_hmac_abort_internal( &operation->ctx.hkdf.hmac );
     }
+#if defined(PSA_PRE_1_0_KEY_DERIVATION)
     else if( PSA_ALG_IS_TLS12_PRF( kdf_alg ) ||
              /* TLS-1.2 PSK-to-MS KDF uses the same core as TLS-1.2 PRF */
              PSA_ALG_IS_TLS12_PSK_TO_MS( kdf_alg ) )
@@ -3897,6 +3900,7 @@
             mbedtls_free( operation->ctx.tls12_prf.Ai_with_seed );
         }
     }
+#endif /* PSA_PRE_1_0_KEY_DERIVATION */
     else
 #endif /* MBEDTLS_MD_C */
     {
@@ -4000,6 +4004,7 @@
     return( PSA_SUCCESS );
 }
 
+#if defined(PSA_PRE_1_0_KEY_DERIVATION)
 static psa_status_t psa_key_derivation_tls12_prf_generate_next_block(
     psa_tls12_prf_key_derivation_t *tls12_prf,
     psa_algorithm_t alg )
@@ -4111,7 +4116,9 @@
 
     return( status );
 }
+#endif /* PSA_PRE_1_0_KEY_DERIVATION */
 
+#if defined(PSA_PRE_1_0_KEY_DERIVATION)
 /* Read some bytes from an TLS-1.2-PRF-based operation.
  * See Section 5 of RFC 5246. */
 static psa_status_t psa_key_derivation_tls12_prf_read(
@@ -4151,6 +4158,7 @@
 
     return( PSA_SUCCESS );
 }
+#endif /* PSA_PRE_1_0_KEY_DERIVATION */
 #endif /* MBEDTLS_MD_C */
 
 psa_status_t psa_key_derivation_output_bytes( psa_key_derivation_operation_t *operation,
@@ -4210,6 +4218,7 @@
         status = psa_key_derivation_hkdf_read( &operation->ctx.hkdf, hash_alg,
                                           output, output_length );
     }
+#if defined(PSA_PRE_1_0_KEY_DERIVATION)
     else if( PSA_ALG_IS_TLS12_PRF( kdf_alg ) ||
              PSA_ALG_IS_TLS12_PSK_TO_MS( kdf_alg ) )
     {
@@ -4217,6 +4226,7 @@
                                                kdf_alg, output,
                                                output_length );
     }
+#endif /* PSA_PRE_1_0_KEY_DERIVATION */
     else
 #endif /* MBEDTLS_MD_C */
     {