commit 2224ccf390c39e34d16bb2631226cf09a7d4632a
author Hanno Becker <hanno.becker@arm.com> Fri Jun 28 10:52:45 2019 +0100
committer Hanno Becker <hanno.becker@arm.com> Fri Jun 28 14:48:31 2019 +0100
tree 976aedee86f8ebf8c077a5b31e911cfb856fbec3
parent d92078fc550883993e0d14ba229f34dabedd68e5

Don't use assertion for failures of mbedtls_x509_crt_x_acquire()

These functions may afil in a regular run, e.g. due to an out of memory
error.

library/ssl_cli.c

diff --git a/library/ssl_cli.c b/library/ssl_cli.c
index c3c28c7..0a1fce8 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -2328,9 +2328,8 @@
                                            &peer_pk );
         if( ret != 0 )
         {
-            /* Should never happen */
-            MBEDTLS_SSL_DEBUG_MSG( 1, ( "should never happen" ) );
-            return( MBEDTLS_ERR_SSL_INTERNAL_ERROR );
+            MBEDTLS_SSL_DEBUG_RET( 1, "mbedtls_x509_crt_pk_acquire", ret );
+            return( ret );
         }
     }
 #endif /* MBEDTLS_SSL_KEEP_PEER_CERTIFICATE */
@@ -2472,9 +2471,8 @@
                                        &peer_pk );
     if( ret != 0 )
     {
-        /* Should never happen */
-        MBEDTLS_SSL_DEBUG_MSG( 1, ( "should never happen" ) );
-        return( MBEDTLS_ERR_SSL_INTERNAL_ERROR );
+        MBEDTLS_SSL_DEBUG_RET( 1, "mbedtls_x509_crt_pk_acquire", ret );
+        return( ret );
     }
 #endif /* MBEDTLS_SSL_KEEP_PEER_CERTIFICATE */
 
@@ -2822,9 +2820,8 @@
                                            &peer_pk );
         if( ret != 0 )
         {
-            /* Should never happen */
-            MBEDTLS_SSL_DEBUG_MSG( 1, ( "should never happen" ) );
-            return( MBEDTLS_ERR_SSL_INTERNAL_ERROR );
+            MBEDTLS_SSL_DEBUG_RET( 1, "mbedtls_x509_crt_pk_acquire", ret );
+            return( ret );
         }
 #endif /* MBEDTLS_SSL_KEEP_PEER_CERTIFICATE */