Latest update.
This commit is contained in:
+71
-25
@@ -10,13 +10,13 @@
|
||||
|
||||
#include <string.h>
|
||||
#include <openssl/params.h>
|
||||
#include "internal/param_build.h"
|
||||
#include "openssl/param_build.h"
|
||||
#include "internal/nelem.h"
|
||||
#include "testutil.h"
|
||||
|
||||
static int template_public_test(void)
|
||||
{
|
||||
OSSL_PARAM_BLD bld;
|
||||
OSSL_PARAM_BLD *bld = OSSL_PARAM_BLD_new();
|
||||
OSSL_PARAM *params = NULL, *p;
|
||||
BIGNUM *bn = NULL, *bn_res = NULL;
|
||||
int i;
|
||||
@@ -28,20 +28,20 @@ static int template_public_test(void)
|
||||
const char *cutf;
|
||||
int res = 0;
|
||||
|
||||
ossl_param_bld_init(&bld);
|
||||
if (!TEST_true(ossl_param_bld_push_int(&bld, "i", -6))
|
||||
|| !TEST_true(ossl_param_bld_push_long(&bld, "l", 42))
|
||||
|| !TEST_true(ossl_param_bld_push_int32(&bld, "i32", 1532))
|
||||
|| !TEST_true(ossl_param_bld_push_int64(&bld, "i64", -9999999))
|
||||
|| !TEST_true(ossl_param_bld_push_double(&bld, "d", 1.61803398875))
|
||||
if (!TEST_ptr(bld)
|
||||
|| !TEST_true(OSSL_PARAM_BLD_push_int(bld, "i", -6))
|
||||
|| !TEST_true(OSSL_PARAM_BLD_push_long(bld, "l", 42))
|
||||
|| !TEST_true(OSSL_PARAM_BLD_push_int32(bld, "i32", 1532))
|
||||
|| !TEST_true(OSSL_PARAM_BLD_push_int64(bld, "i64", -9999999))
|
||||
|| !TEST_true(OSSL_PARAM_BLD_push_double(bld, "d", 1.61803398875))
|
||||
|| !TEST_ptr(bn = BN_new())
|
||||
|| !TEST_true(BN_set_word(bn, 1729))
|
||||
|| !TEST_true(ossl_param_bld_push_BN(&bld, "bignumber", bn))
|
||||
|| !TEST_true(ossl_param_bld_push_utf8_string(&bld, "utf8_s", "foo",
|
||||
|| !TEST_true(OSSL_PARAM_BLD_push_BN(bld, "bignumber", bn))
|
||||
|| !TEST_true(OSSL_PARAM_BLD_push_utf8_string(bld, "utf8_s", "foo",
|
||||
sizeof("foo")))
|
||||
|| !TEST_true(ossl_param_bld_push_utf8_ptr(&bld, "utf8_p", "bar-boom",
|
||||
|| !TEST_true(OSSL_PARAM_BLD_push_utf8_ptr(bld, "utf8_p", "bar-boom",
|
||||
0))
|
||||
|| !TEST_ptr(params = ossl_param_bld_to_param(&bld))
|
||||
|| !TEST_ptr(params = OSSL_PARAM_BLD_to_param(bld))
|
||||
/* Check int */
|
||||
|| !TEST_ptr(p = OSSL_PARAM_locate(params, "i"))
|
||||
|| !TEST_true(OSSL_PARAM_get_int(p, &i))
|
||||
@@ -95,7 +95,8 @@ static int template_public_test(void)
|
||||
goto err;
|
||||
res = 1;
|
||||
err:
|
||||
ossl_param_bld_free(params);
|
||||
OSSL_PARAM_BLD_free_params(params);
|
||||
OSSL_PARAM_BLD_free(bld);
|
||||
OPENSSL_free(utf);
|
||||
BN_free(bn);
|
||||
BN_free(bn_res);
|
||||
@@ -106,7 +107,7 @@ static int template_private_test(void)
|
||||
{
|
||||
static int data1[] = { 2, 3, 5, 7, 11, 15, 17 };
|
||||
static unsigned char data2[] = { 2, 4, 6, 8, 10 };
|
||||
OSSL_PARAM_BLD bld;
|
||||
OSSL_PARAM_BLD *bld = OSSL_PARAM_BLD_new();
|
||||
OSSL_PARAM *params = NULL, *p;
|
||||
unsigned int i;
|
||||
unsigned long int l;
|
||||
@@ -116,20 +117,20 @@ static int template_private_test(void)
|
||||
BIGNUM *bn = NULL, *bn_res = NULL;
|
||||
int res = 0;
|
||||
|
||||
ossl_param_bld_init(&bld);
|
||||
if (!TEST_true(ossl_param_bld_push_uint(&bld, "i", 6))
|
||||
|| !TEST_true(ossl_param_bld_push_ulong(&bld, "l", 42))
|
||||
|| !TEST_true(ossl_param_bld_push_uint32(&bld, "i32", 1532))
|
||||
|| !TEST_true(ossl_param_bld_push_uint64(&bld, "i64", 9999999))
|
||||
|| !TEST_true(ossl_param_bld_push_size_t(&bld, "st", 65537))
|
||||
if (!TEST_ptr(bld)
|
||||
|| !TEST_true(OSSL_PARAM_BLD_push_uint(bld, "i", 6))
|
||||
|| !TEST_true(OSSL_PARAM_BLD_push_ulong(bld, "l", 42))
|
||||
|| !TEST_true(OSSL_PARAM_BLD_push_uint32(bld, "i32", 1532))
|
||||
|| !TEST_true(OSSL_PARAM_BLD_push_uint64(bld, "i64", 9999999))
|
||||
|| !TEST_true(OSSL_PARAM_BLD_push_size_t(bld, "st", 65537))
|
||||
|| !TEST_ptr(bn = BN_secure_new())
|
||||
|| !TEST_true(BN_set_word(bn, 1729))
|
||||
|| !TEST_true(ossl_param_bld_push_BN(&bld, "bignumber", bn))
|
||||
|| !TEST_true(ossl_param_bld_push_octet_string(&bld, "oct_s", data1,
|
||||
|| !TEST_true(OSSL_PARAM_BLD_push_BN(bld, "bignumber", bn))
|
||||
|| !TEST_true(OSSL_PARAM_BLD_push_octet_string(bld, "oct_s", data1,
|
||||
sizeof(data1)))
|
||||
|| !TEST_true(ossl_param_bld_push_octet_ptr(&bld, "oct_p", data2,
|
||||
|| !TEST_true(OSSL_PARAM_BLD_push_octet_ptr(bld, "oct_p", data2,
|
||||
sizeof(data2)))
|
||||
|| !TEST_ptr(params = ossl_param_bld_to_param(&bld))
|
||||
|| !TEST_ptr(params = OSSL_PARAM_BLD_to_param(bld))
|
||||
/* Check unsigned int */
|
||||
|| !TEST_ptr(p = OSSL_PARAM_locate(params, "i"))
|
||||
|| !TEST_true(OSSL_PARAM_get_uint(p, &i))
|
||||
@@ -184,15 +185,60 @@ static int template_private_test(void)
|
||||
goto err;
|
||||
res = 1;
|
||||
err:
|
||||
ossl_param_bld_free(params);
|
||||
OSSL_PARAM_BLD_free_params(params);
|
||||
OSSL_PARAM_BLD_free(bld);
|
||||
BN_free(bn);
|
||||
BN_free(bn_res);
|
||||
return res;
|
||||
}
|
||||
|
||||
static int builder_limit_test(void)
|
||||
{
|
||||
const int n = 100;
|
||||
char names[100][3];
|
||||
OSSL_PARAM_BLD *bld = OSSL_PARAM_BLD_new();
|
||||
OSSL_PARAM *params = NULL;
|
||||
int i, res = 0;
|
||||
|
||||
if (!TEST_ptr(bld))
|
||||
goto err;
|
||||
|
||||
for (i = 0; i < n; i++) {
|
||||
names[i][0] = 'A' + (i / 26) - 1;
|
||||
names[i][0] = 'a' + (i % 26) - 1;
|
||||
names[i][2] = '\0';
|
||||
if (!TEST_true(OSSL_PARAM_BLD_push_int(bld, names[i], 3 * i + 1)))
|
||||
goto err;
|
||||
}
|
||||
if (!TEST_ptr(params = OSSL_PARAM_BLD_to_param(bld)))
|
||||
goto err;
|
||||
/* Count the elements in the params arrary, expecting n */
|
||||
for (i = 0; params[i].key != NULL; i++);
|
||||
if (!TEST_int_eq(i, n))
|
||||
goto err;
|
||||
|
||||
/* Verify that the build, cleared the builder structure */
|
||||
OSSL_PARAM_BLD_free_params(params);
|
||||
params = NULL;
|
||||
|
||||
if (!TEST_true(OSSL_PARAM_BLD_push_int(bld, "g", 2))
|
||||
|| !TEST_ptr(params = OSSL_PARAM_BLD_to_param(bld)))
|
||||
goto err;
|
||||
/* Count the elements in the params arrary, expecting 1 */
|
||||
for (i = 0; params[i].key != NULL; i++);
|
||||
if (!TEST_int_eq(i, 1))
|
||||
goto err;
|
||||
res = 1;
|
||||
err:
|
||||
OSSL_PARAM_BLD_free_params(params);
|
||||
OSSL_PARAM_BLD_free(bld);
|
||||
return res;
|
||||
}
|
||||
|
||||
int setup_tests(void)
|
||||
{
|
||||
ADD_TEST(template_public_test);
|
||||
ADD_TEST(template_private_test);
|
||||
ADD_TEST(builder_limit_test);
|
||||
return 1;
|
||||
}
|
||||
Reference in New Issue
Block a user