From: Richard Levitte <levitte@openssl.org>
Date: Mon, 3 Feb 2020 14:36:15 +0000 (+0100)
Subject: Adapt test/keymgmt_internal_test.c to the redesigned interface
X-Git-Tag: openssl-3.0.0-alpha1~521
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=72ec9648fee5612a9cf83ed2df1c6c0e240fa7de;p=oweals%2Fopenssl.git

Adapt test/keymgmt_internal_test.c to the redesigned interface

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/11006)
---

diff --git a/test/keymgmt_internal_test.c b/test/keymgmt_internal_test.c
index ccb5f7f9b5..ad2e1deb5c 100644
--- a/test/keymgmt_internal_test.c
+++ b/test/keymgmt_internal_test.c
@@ -145,7 +145,7 @@ static int test_pass_rsa(FIXTURE *fixture)
     BIGNUM *bn1 = NULL, *bn2 = NULL, *bn3 = NULL;
     EVP_PKEY *pk = NULL;
     EVP_KEYMGMT *km1 = NULL, *km2 = NULL;
-    void *provdata = NULL;
+    void *provkey = NULL;
     /*
      * 32-bit RSA key, extracted from this command,
      * executed with OpenSSL 1.0.2:
@@ -207,12 +207,13 @@ static int test_pass_rsa(FIXTURE *fixture)
         || !TEST_ptr_ne(km1, km2))
         goto err;
 
-    if (!TEST_ptr(evp_keymgmt_util_export_to_provider(pk, km1, 0))
-        || !TEST_ptr(provdata =
-                     evp_keymgmt_util_export_to_provider(pk, km2, 0)))
+    if (!TEST_ptr(evp_keymgmt_util_export_to_provider(pk, km1))
+        || !TEST_ptr(provkey = evp_keymgmt_util_export_to_provider(pk, km2)))
         goto err;
 
-    if (!TEST_true(evp_keymgmt_exportkey(km2, provdata, &export_cb, keydata)))
+    if (!TEST_true(evp_keymgmt_export(km2, provkey,
+                                      OSSL_KEYMGMT_SELECT_KEYPAIR,
+                                      &export_cb, keydata)))
         goto err;
 
     /*