projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
INSTALL.md: Restore $ as command prompt indicator
[oweals/openssl.git]
/
test
/
p_test.c
diff --git
a/test/p_test.c
b/test/p_test.c
index 93196f74c420c704fe0f4df9d86307f99d07d50f..dfd62ebd83911bbbb50ef84b80e639f849011506 100644
(file)
--- a/
test/p_test.c
+++ b/
test/p_test.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019
-2020
The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@
-27,54
+27,57
@@
#endif
#include <openssl/core.h>
#endif
#include <openssl/core.h>
-#include <openssl/core_
numbers
.h>
+#include <openssl/core_
dispatch
.h>
-static OSSL_
core_get_param_types_fn *c_get_param_type
s = NULL;
-static OSSL_core_get_params_fn *c_get_params = NULL;
+static OSSL_
FUNC_core_gettable_params_fn *c_gettable_param
s = NULL;
+static OSSL_
FUNC_
core_get_params_fn *c_get_params = NULL;
/* Tell the core what params we provide and what type they are */
/* Tell the core what params we provide and what type they are */
-static const OSSL_
ITE
M p_param_types[] = {
- {
OSSL_PARAM_UTF8_STRING, "greeting"
},
- {
0, NULL
}
+static const OSSL_
PARA
M 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 */
};
/* 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_get_params_fn p_get_params;
+static OSSL_FUNC_provider_gettable_params_fn p_gettable_params;
+static OSSL_FUNC_provider_get_params_fn p_get_params;
+static OSSL_FUNC_provider_get_reason_strings_fn p_get_reason_strings;
-static const OSSL_
ITEM *p_get_param_type
s(void *_)
+static const OSSL_
PARAM *p_gettable_param
s(void *_)
{
return p_param_types;
}
{
return p_param_types;
}
-static int p_get_params(void *v
prov, const
OSSL_PARAM params[])
+static int p_get_params(void *v
hand,
OSSL_PARAM params[])
{
{
- const OSSL_
PROVIDER *prov = vprov
;
-
const
OSSL_PARAM *p = params;
+ const OSSL_
CORE_HANDLE *hand = vhand
;
+ OSSL_PARAM *p = params;
int ok = 1;
for (; ok && p->key != NULL; p++) {
if (strcmp(p->key, "greeting") == 0) {
int ok = 1;
for (; ok && p->key != NULL; p++) {
if (strcmp(p->key, "greeting") == 0) {
- static char *opensslv
= NULL
;
- static char *provname
= NULL
;
- static char *greeting
= NULL
;
+ static char *opensslv;
+ static char *provname;
+ static char *greeting;
static OSSL_PARAM counter_request[] = {
/* Known libcrypto provided parameters */
{ "openssl-version", OSSL_PARAM_UTF8_PTR,
static OSSL_PARAM counter_request[] = {
/* Known libcrypto provided parameters */
{ "openssl-version", OSSL_PARAM_UTF8_PTR,
- &opensslv, sizeof(&opensslv),
NULL
},
+ &opensslv, sizeof(&opensslv),
0
},
{ "provider-name", OSSL_PARAM_UTF8_PTR,
{ "provider-name", OSSL_PARAM_UTF8_PTR,
- &provname, sizeof(&provname),
NULL
},
+ &provname, sizeof(&provname),
0
},
/* This might be present, if there's such a configuration */
{ "greeting", OSSL_PARAM_UTF8_PTR,
/* This might be present, if there's such a configuration */
{ "greeting", OSSL_PARAM_UTF8_PTR,
- &greeting, sizeof(&greeting),
NULL
},
+ &greeting, sizeof(&greeting),
0
},
- { NULL, 0, NULL, 0,
NULL
}
+ { NULL, 0, NULL, 0,
0
}
};
char buf[256];
size_t buf_l;
};
char buf[256];
size_t buf_l;
- if (c_get_params(prov, counter_request)) {
+ opensslv = provname = greeting = NULL;
+
+ if (c_get_params(hand, counter_request)) {
if (greeting) {
strcpy(buf, greeting);
} else {
if (greeting) {
strcpy(buf, greeting);
} else {
@@
-88,9
+91,9
@@
static int p_get_params(void *vprov, const OSSL_PARAM params[])
sprintf(buf, "Howdy stranger...");
}
sprintf(buf, "Howdy stranger...");
}
-
*
p->return_size = buf_l = strlen(buf) + 1;
+ p->return_size = buf_l = strlen(buf) + 1;
if (p->data_size >= buf_l)
if (p->data_size >= buf_l)
- str
ncpy(p->data, buf, buf_l
);
+ str
cpy(p->data, buf
);
else
ok = 0;
}
else
ok = 0;
}
@@
-98,24
+101,36
@@
static int p_get_params(void *vprov, const OSSL_PARAM params[])
return ok;
}
return ok;
}
+static const OSSL_ITEM *p_get_reason_strings(void *_)
+{
+ static const OSSL_ITEM reason_strings[] = {
+ {1, "dummy reason string"},
+ {0, NULL}
+ };
+
+ return reason_strings;
+}
+
static const OSSL_DISPATCH p_test_table[] = {
static const OSSL_DISPATCH p_test_table[] = {
- { OSSL_FUNC_PROVIDER_GET
_PARAM_TYPES, (void (*)(void))p_get_param_type
s },
+ { OSSL_FUNC_PROVIDER_GET
TABLE_PARAMS, (void (*)(void))p_gettable_param
s },
{ OSSL_FUNC_PROVIDER_GET_PARAMS, (void (*)(void))p_get_params },
{ OSSL_FUNC_PROVIDER_GET_PARAMS, (void (*)(void))p_get_params },
+ { OSSL_FUNC_PROVIDER_GET_REASON_STRINGS,
+ (void (*)(void))p_get_reason_strings},
{ 0, NULL }
};
{ 0, NULL }
};
-int OSSL_provider_init(const OSSL_
PROVIDER *provider
,
+int OSSL_provider_init(const OSSL_
CORE_HANDLE *handle
,
const OSSL_DISPATCH *in,
const OSSL_DISPATCH **out,
void **provctx)
{
for (; in->function_id != 0; in++) {
switch (in->function_id) {
const OSSL_DISPATCH *in,
const OSSL_DISPATCH **out,
void **provctx)
{
for (; in->function_id != 0; in++) {
switch (in->function_id) {
- case OSSL_FUNC_CORE_GET
_PARAM_TYPE
S:
- c_get
_param_types = OSSL_get_core_get_param_type
s(in);
+ case OSSL_FUNC_CORE_GET
TABLE_PARAM
S:
+ c_get
table_params = OSSL_FUNC_core_gettable_param
s(in);
break;
case OSSL_FUNC_CORE_GET_PARAMS:
break;
case OSSL_FUNC_CORE_GET_PARAMS:
- c_get_params = OSSL_
get
_core_get_params(in);
+ c_get_params = OSSL_
FUNC
_core_get_params(in);
break;
default:
/* Just ignore anything we don't understand */
break;
default:
/* Just ignore anything we don't understand */
@@
-124,7
+139,7
@@
int OSSL_provider_init(const OSSL_PROVIDER *provider,
}
/* Because we use this in get_params, we need to pass it back */
}
/* Because we use this in get_params, we need to pass it back */
- *provctx = (void *)
provider
;
+ *provctx = (void *)
handle
;
*out = p_test_table;
return 1;
*out = p_test_table;
return 1;