commit f5a9996088582742ac60030d7a1119a7c28ecfaf
author Gilles Peskine <Gilles.Peskine@arm.com> Mon Apr 30 16:37:23 2018 +0200
committer Gilles Peskine <Gilles.Peskine@arm.com> Thu Jun 14 13:26:52 2018 +0200
tree a9ca900f73a21a479aee97886beabfde6cbcfb33
parent ef30742a27ea37ef9bbeef457a6c2e3469046ec6

ssl_server2: get op_name from context in ssl_async_resume as well

programs/ssl/ssl_server2.c

diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c
index d550b7c..ac3d1b1 100644
--- a/programs/ssl/ssl_server2.c
+++ b/programs/ssl/ssl_server2.c
@@ -1039,7 +1039,7 @@
         mbedtls_ssl_conf_get_async_config_data( ssl->conf );
     ssl_async_key_slot_t *key_slot = &config_data->slots[ctx->slot];
     int ret;
-    const char *op_name = NULL;
+    const char *op_name;
 
     if( ctx->remaining_delay > 0 )
     {
@@ -1052,14 +1052,12 @@
     switch( ctx->operation_type )
     {
         case ASYNC_OP_DECRYPT:
-            op_name = "decrypt";
             ret = mbedtls_pk_decrypt( key_slot->pk,
                                       ctx->input, ctx->input_len,
                                       output, output_len, output_size,
                                       config_data->f_rng, config_data->p_rng );
             break;
         case ASYNC_OP_SIGN:
-            op_name = "sign";
             ret = mbedtls_pk_sign( key_slot->pk,
                                    ctx->md_alg,
                                    ctx->input, ctx->input_len,
@@ -1073,6 +1071,8 @@
             break;
     }
 
+    op_name = ssl_async_operation_names[ctx->operation_type];
+
     if( config_data->inject_error == SSL_ASYNC_INJECT_ERROR_RESUME )
     {
         mbedtls_printf( "Async resume callback: %s done but injected error\n",