PSA: Adapt ssl_server2 to modified key allocation API

Hanno Becker · Hanno Becker · commit 330b9a458624 · 2019-01-25T14:36:28.000Z
diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c
@@ -2667,7 +2667,7 @@ int main( int argc, char *argv[] )
 #if defined(MBEDTLS_USE_PSA_CRYPTO)
         if( opt.psk_opaque != 0 )
         {
-            status = psa_allocate_key( PSA_KEY_TYPE_DERIVE, psk_len * 8, &psk_slot );
+            status = psa_allocate_key( &psk_slot );
             if( status != PSA_SUCCESS )
             {
                 fprintf( stderr, "ALLOC FAIL\n" );
@@ -2711,7 +2711,7 @@ int main( int argc, char *argv[] )
             psk_entry *cur_psk;
             for( cur_psk = psk_info; cur_psk != NULL; cur_psk = cur_psk->next )
             {
-                status = psa_allocate_key( PSA_KEY_TYPE_DERIVE, cur_psk->key_len * 8, &cur_psk->slot );
+                status = psa_allocate_key( &cur_psk->slot );
                 if( status != PSA_SUCCESS )
                 {
                     ret = MBEDTLS_ERR_SSL_HW_ACCEL_FAILED;

Original file line number	Diff line number	Diff line change
`@@ -2667,7 +2667,7 @@ int main( int argc, char *argv[] )`
`2667`	`2667`	`#if defined(MBEDTLS_USE_PSA_CRYPTO)`
`2668`	`2668`	`if( opt.psk_opaque != 0 )`
`2669`	`2669`	`{`
`2670`		`- status = psa_allocate_key( PSA_KEY_TYPE_DERIVE, psk_len * 8, &psk_slot );`
	`2670`	`+ status = psa_allocate_key( &psk_slot );`
`2671`	`2671`	`if( status != PSA_SUCCESS )`
`2672`	`2672`	`{`
`2673`	`2673`	`fprintf( stderr, "ALLOC FAIL\n" );`
`@@ -2711,7 +2711,7 @@ int main( int argc, char *argv[] )`
`2711`	`2711`	`psk_entry *cur_psk;`
`2712`	`2712`	`for( cur_psk = psk_info; cur_psk != NULL; cur_psk = cur_psk->next )`
`2713`	`2713`	`{`
`2714`		`- status = psa_allocate_key( PSA_KEY_TYPE_DERIVE, cur_psk->key_len * 8, &cur_psk->slot );`
	`2714`	`+ status = psa_allocate_key( &cur_psk->slot );`
`2715`	`2715`	`if( status != PSA_SUCCESS )`
`2716`	`2716`	`{`
`2717`	`2717`	`ret = MBEDTLS_ERR_SSL_HW_ACCEL_FAILED;`