From 65d8c2651d89ff2d0e9a5a35f95d2c9b45e54046 Mon Sep 17 00:00:00 2001 From: Ron Eldor Date: Tue, 4 Jun 2019 13:05:36 +0300 Subject: [PATCH] Show failure in ssl-opts.sh when key export fails 1. When `ssl_server2` export key functionality fails, don't exit the server, but reset it, to have the server recover for next connection. 2. Add text filters for `export keys functionality` test in ssl-opt.sh to check for additional output, to verify if the export suceeded. This was discovered in the `ssl-opt.sh` script, where the server exited, before the test tried to kill the server priocess, resulting in a `kill: No such process` message. Fixes #2662 Signed-off-by: Ron Eldor --- programs/ssl/ssl_server2.c | 4 ++-- tests/ssl-opt.sh | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c index 5dd18715f..3fd065ef0 100644 --- a/programs/ssl/ssl_server2.c +++ b/programs/ssl/ssl_server2.c @@ -3718,7 +3718,7 @@ handshake: { mbedtls_printf( " failed\n ! mbedtls_ssl_tls_prf returned -0x%x\n\n", (unsigned int) -ret ); - goto exit; + goto reset; } mbedtls_printf( " EAP-TLS key material is:" ); @@ -3739,7 +3739,7 @@ handshake: { mbedtls_printf( " failed\n ! mbedtls_ssl_tls_prf returned -0x%x\n\n", (unsigned int) -ret ); - goto exit; + goto reset; } mbedtls_printf( " EAP-TLS IV is:" ); diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh index df3f53b3b..3c185e068 100755 --- a/tests/ssl-opt.sh +++ b/tests/ssl-opt.sh @@ -9141,7 +9141,11 @@ run_test "export keys functionality" \ -s "exported ivlen is " \ -c "exported maclen is " \ -c "exported keylen is " \ - -c "exported ivlen is " + -c "exported ivlen is " \ + -c "EAP-TLS key material is:"\ + -s "EAP-TLS key material is:"\ + -c "EAP-TLS IV is:" \ + -s "EAP-TLS IV is:" # Test heap memory usage after handshake requires_config_enabled MBEDTLS_MEMORY_DEBUG