commit 461bd3dcca8a883cd5bbb87b58abcdc9989e83da
author Jaeden Amero <jaeden.amero@arm.com> Thu Feb 21 12:04:34 2019 +0000
committer Jaeden Amero <jaeden.amero@arm.com> Fri Feb 22 10:32:44 2019 +0000
tree 4a054216db5567c48566ece61f0dbafad56deb62
parent 9f47f82218f1632ae5188538c53d29e025507e17
parent 3497323f79c4a1f80a3d6a4806cae5cdfa223ea7

Merge remote-tracking branch 'origin/pr/2454' into development

library/cipher.c

diff --git a/library/cipher.c b/library/cipher.c
index 2465536..9ceea13 100644
--- a/library/cipher.c
+++ b/library/cipher.c
@@ -1238,7 +1238,7 @@
             (mbedtls_cipher_context_psa *) ctx->cipher_ctx;
 
         psa_status_t status;
-        psa_cipher_operation_t cipher_op;
+        psa_cipher_operation_t cipher_op = PSA_CIPHER_OPERATION_INIT;
         size_t part_len;
 
         if( ctx->operation == MBEDTLS_DECRYPT )

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index bef5a84..6e50c1e 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -6572,7 +6572,7 @@
     unsigned char padbuf[32];
 #if defined(MBEDTLS_USE_PSA_CRYPTO)
     size_t hash_size;
-    psa_hash_operation_t sha256_psa;
+    psa_hash_operation_t sha256_psa = PSA_HASH_OPERATION_INIT;
     psa_status_t status;
 #else
     mbedtls_sha256_context sha256;
@@ -6648,7 +6648,7 @@
     unsigned char padbuf[48];
 #if defined(MBEDTLS_USE_PSA_CRYPTO)
     size_t hash_size;
-    psa_hash_operation_t sha384_psa;
+    psa_hash_operation_t sha384_psa = PSA_HASH_OPERATION_INIT;
     psa_status_t status;
 #else
     mbedtls_sha512_context sha512;
@@ -10246,7 +10246,7 @@
                                             mbedtls_md_type_t md_alg )
 {
     psa_status_t status;
-    psa_hash_operation_t hash_operation;
+    psa_hash_operation_t hash_operation = PSA_HASH_OPERATION_INIT;
     psa_algorithm_t hash_alg = mbedtls_psa_translate_md( md_alg );
 
     MBEDTLS_SSL_DEBUG_MSG( 1, ( "Perform PSA-based computation of digest of ServerKeyExchange" ) );

library/x509_crt.c

diff --git a/library/x509_crt.c b/library/x509_crt.c
index a766daf..e3f169f 100644
--- a/library/x509_crt.c
+++ b/library/x509_crt.c
@@ -1929,7 +1929,7 @@
     if( mbedtls_md( md_info, child->tbs.p, child->tbs.len, hash ) != 0 )
         return( -1 );
 #else
-    psa_hash_operation_t hash_operation;
+    psa_hash_operation_t hash_operation = PSA_HASH_OPERATION_INIT;
     psa_algorithm_t hash_alg = mbedtls_psa_translate_md( child->sig_md );
 
     if( psa_hash_setup( &hash_operation, hash_alg ) != PSA_SUCCESS )

library/x509write_csr.c

diff --git a/library/x509write_csr.c b/library/x509write_csr.c
index f2950ad..777a632 100644
--- a/library/x509write_csr.c
+++ b/library/x509write_csr.c
@@ -142,7 +142,7 @@
     size_t len = 0;
     mbedtls_pk_type_t pk_alg;
 #if defined(MBEDTLS_USE_PSA_CRYPTO)
-    psa_hash_operation_t hash_operation;
+    psa_hash_operation_t hash_operation = PSA_HASH_OPERATION_INIT;
     size_t hash_len;
     psa_algorithm_t hash_alg = mbedtls_psa_translate_md( ctx->md_alg );
 #endif /* MBEDTLS_USE_PSA_CRYPTO */