commit 81e742333ee2bc302dea27f2784ee8e89792f568
author Leonid Rozenboim <leonid.rozenboim@oracle.com> Mon Aug 08 15:43:44 2022 -0700
committer Dave Rodgman <dave.rodgman@arm.com> Fri Aug 19 13:42:08 2022 +0100
tree 22228e7f78bdcbe7a5b9639a8fd2c62f2f259100
parent 928527cba911281dd3a660f773ba14d4d791c348

ssl_tls12_server: fix potential NULL-dereferencing if local certificate was not set.

Signed-off-by: Leonid Rozenboim <leonid.rozenboim@oracle.com>

library/ssl_srv.c

diff --git a/library/ssl_srv.c b/library/ssl_srv.c
index 2efb13c..08af74d 100644
--- a/library/ssl_srv.c
+++ b/library/ssl_srv.c
@@ -3903,8 +3903,14 @@
                                       size_t peer_pmssize )
 {
     int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
+
+    mbedtls_x509_crt *own_cert = mbedtls_ssl_own_cert( ssl );
+    if( own_cert == NULL ) {
+        MBEDTLS_SSL_DEBUG_MSG( 1, ( "got no local certificate" ) );
+        return( MBEDTLS_ERR_SSL_NO_CLIENT_CERTIFICATE );
+    }
+    mbedtls_pk_context *public_key = &own_cert->pk;
     mbedtls_pk_context *private_key = mbedtls_ssl_own_key( ssl );
-    mbedtls_pk_context *public_key = &mbedtls_ssl_own_cert( ssl )->pk;
     size_t len = mbedtls_pk_get_len( public_key );
 
 #if defined(MBEDTLS_SSL_ASYNC_PRIVATE)