commit a17b5c6ba2bc56ee65cf741dde78c09f0d246b44
author Przemek Stekiel <przemyslaw.stekiel@mobica.com> Mon May 02 13:50:24 2022 +0200
committer Przemek Stekiel <przemyslaw.stekiel@mobica.com> Thu May 05 10:17:01 2022 +0200
tree 9622303dbe924bd1903ba5c276ac95453ac2dfb6
parent 01396a16dae33ab104bf5d93a41165d64fba1b25

ssl_client: use key opaque algs given from command line

Signed-off-by: Przemek Stekiel <przemyslaw.stekiel@mobica.com>

programs/ssl/ssl_client2.c

diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c
index 73c81fd..65c7c63 100644
--- a/programs/ssl/ssl_client2.c
+++ b/programs/ssl/ssl_client2.c
@@ -1718,16 +1718,32 @@
     if( opt.key_opaque != 0 )
     {
         psa_algorithm_t psa_alg, psa_alg2;
+        psa_key_usage_t usage = PSA_KEY_USAGE_SIGN_HASH;
 
-        if( mbedtls_pk_get_type( &pkey ) == MBEDTLS_PK_ECKEY )
+        if ( strcmp( opt.key_opaque_alg1, DFL_KEY_OPAQUE_ALG ) != 0 )
         {
-            psa_alg = PSA_ALG_ECDSA( PSA_ALG_ANY_HASH );
-            psa_alg2 = PSA_ALG_NONE;
+            ret = key_opaque_set_alg_usage( opt.key_opaque_alg1,
+                                            opt.key_opaque_alg2,
+                                            &psa_alg, &psa_alg2, &usage );
+            if( ret != 0 )
+            {
+                mbedtls_printf( " failed\n  !  key_opaque_set_alg_usage returned -0x%x\n\n",
+                                (unsigned int) -ret );
+                goto exit;
+            }
         }
         else
         {
-            psa_alg = PSA_ALG_RSA_PKCS1V15_SIGN( PSA_ALG_ANY_HASH );
-            psa_alg2 = PSA_ALG_RSA_PSS( PSA_ALG_ANY_HASH );
+            if( mbedtls_pk_get_type( &pkey ) == MBEDTLS_PK_ECKEY )
+            {
+                psa_alg = PSA_ALG_ECDSA( PSA_ALG_ANY_HASH );
+                psa_alg2 = PSA_ALG_NONE;
+            }
+            else
+            {
+                psa_alg = PSA_ALG_RSA_PKCS1V15_SIGN( PSA_ALG_ANY_HASH );
+                psa_alg2 = PSA_ALG_RSA_PSS( PSA_ALG_ANY_HASH );
+            }
         }
 
         if( ( ret = mbedtls_pk_wrap_as_opaque( &pkey, &key_slot, psa_alg,