Replace BUF_ string function calls with OPENSSL_ ones

[openssl.git] / test / p_test.c

diff --git a/test/p_test.c b/test/p_test.c
index 925e3b8948d92d526c00d1df7167a17eb04ca767..bc354be95d279fff02791678a3e627be69152dfe 100644 (file)
--- a/test/p_test.c
+++ b/test/p_test.c
@@ -29,20 +29,20 @@
 #include <openssl/core.h>
 #include <openssl/core_numbers.h>
 
-static OSSL_core_get_param_types_fn *c_get_param_types = NULL;
+static OSSL_core_gettable_params_fn *c_gettable_params = NULL;
 static OSSL_core_get_params_fn *c_get_params = NULL;
 
 /* Tell the core what params we provide and what type they are */
-static const OSSL_ITEM p_param_types[] = {
-    { OSSL_PARAM_UTF8_STRING, "greeting" },
-    { 0, NULL }
+static const OSSL_PARAM p_param_types[] = {
+    { "greeting", OSSL_PARAM_UTF8_STRING, NULL, 0, 0 },
+    { NULL, 0, NULL, 0, 0 }
 };
 
 /* This is a trick to ensure we define the provider functions correctly */
-static OSSL_provider_get_param_types_fn p_get_param_types;
+static OSSL_provider_gettable_params_fn p_gettable_params;
 static OSSL_provider_get_params_fn p_get_params;
 
-static const OSSL_ITEM *p_get_param_types(void *_)
+static const OSSL_PARAM *p_gettable_params(void *_)
 {
     return p_param_types;
 }
@@ -92,7 +92,7 @@ static int p_get_params(void *vprov, OSSL_PARAM params[])
 
             p->return_size = buf_l = strlen(buf) + 1;
             if (p->data_size >= buf_l)
-                strncpy(p->data, buf, buf_l);
+                strcpy(p->data, buf);
             else
                 ok = 0;
         }
@@ -101,7 +101,7 @@ static int p_get_params(void *vprov, OSSL_PARAM params[])
 }
 
 static const OSSL_DISPATCH p_test_table[] = {
-    { OSSL_FUNC_PROVIDER_GET_PARAM_TYPES, (void (*)(void))p_get_param_types },
+    { OSSL_FUNC_PROVIDER_GETTABLE_PARAMS, (void (*)(void))p_gettable_params },
     { OSSL_FUNC_PROVIDER_GET_PARAMS, (void (*)(void))p_get_params },
     { 0, NULL }
 };
@@ -113,8 +113,8 @@ int OSSL_provider_init(const OSSL_PROVIDER *provider,
 {
     for (; in->function_id != 0; in++) {
         switch (in->function_id) {
-        case OSSL_FUNC_CORE_GET_PARAM_TYPES:
-            c_get_param_types = OSSL_get_core_get_param_types(in);
+        case OSSL_FUNC_CORE_GETTABLE_PARAMS:
+            c_gettable_params = OSSL_get_core_gettable_params(in);
             break;
         case OSSL_FUNC_CORE_GET_PARAMS:
             c_get_params = OSSL_get_core_get_params(in);