Skip to content

Changes for openvpn tests to run successfully #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dgarske merged 4 commits into from
Feb 27, 2025
Merged

Changes for openvpn tests to run successfully #75

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ee96d10
Changes for openvpn tests to run successfully
ColtonWilley Feb 13, 2025
ef66711
Address code comments, add new workflow for openvpn tests
ColtonWilley Feb 13, 2025
09bc76c
Only test openvpn with master for now to avoid des-ecb test dependency
ColtonWilley Feb 13, 2025
ffee404
Merge branch 'master' of github.com:ColtonWilley/wolfProvider into wp…
ColtonWilley Feb 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/utils-openssl.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ install_openssl() {
if [ ! -d ${OPENSSL_INSTALL_DIR} ]; then
printf "\tConfigure OpenSSL ${OPENSSL_TAG} ... "
if [ "$WOLFPROV_DEBUG" = "1" ]; then
./config shared --prefix=${OPENSSL_INSTALL_DIR} --debug >>$LOG_FILE 2>&1
./config shared enable-trace --prefix=${OPENSSL_INSTALL_DIR} --debug >>$LOG_FILE 2>&1
RET=$?
else
./config shared --prefix=${OPENSSL_INSTALL_DIR} >>$LOG_FILE 2>&1
Expand Down
2 changes: 1 addition & 1 deletion src/wp_dh_kmgmt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2119,7 +2119,7 @@ static int wp_dh_decode(wp_DhEncDecCtx* ctx, OSSL_CORE_BIO *cBio,
ok = 0;
}
if (ok && (ctx->format == WP_ENC_FORMAT_TYPE_SPECIFIC)) {
if (selection == OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS) {
if (selection & OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS) {
if (!wp_dh_decode_params(dh, data, len)) {
ok = 0;
decoded = 0;
Expand Down
69 changes: 46 additions & 23 deletions src/wp_ecc_kmgmt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1644,6 +1644,12 @@ static wp_Ecc* wp_ecc_gen(wp_EccGenCtx *ctx, OSSL_CALLBACK *cb, void *cbArg)
}
}
}
if (ok && ((ctx->selection & OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS) != 0)) {
rc = wc_ecc_set_curve(&ecc->key, 0, ecc->curveId);
if (rc != 0) {
ok = 0;
}
}
if (!ok) {
wp_ecc_free(ecc);
ecc = NULL;
Expand Down Expand Up @@ -2131,11 +2137,19 @@ static int wp_ecc_decode(wp_EccEncDecCtx* ctx, OSSL_CORE_BIO *cBio,
*/
static int wp_ecc_encode_params_size(const wp_Ecc *ecc, size_t* keyLen)
{
/* ASN.1 type, len and data. */
*keyLen = ecc->key.dp->oidSz + 2;
int ok = 1;
word32 len = 0;

WOLFPROV_LEAVE(WP_LOG_PK, __FILE__ ":" WOLFPROV_STRINGIZE(__LINE__), 1);
return 1;
if (wc_ecc_get_oid(ecc->key.dp->oidSum, NULL, &len) <= 0) {
ok = 0;
}
if (ok) {
/* ASN.1 type, len and data. */
*keyLen = len + 2;
}

WOLFPROV_LEAVE(WP_LOG_PK, __FILE__ ":" WOLFPROV_STRINGIZE(__LINE__), ok);
return ok;
}

/**
Expand All @@ -2151,14 +2165,22 @@ static int wp_ecc_encode_params_size(const wp_Ecc *ecc, size_t* keyLen)
static int wp_ecc_encode_params(const wp_Ecc *ecc, unsigned char* keyData,
size_t* keyLen)
{
keyData[0] = 0x06;
keyData[1] = ecc->key.dp->oidSz;
XMEMCPY(keyData + 2, ecc->key.dp->oid, ecc->key.dp->oidSz);
int ok = 1;
word32 len;
const byte *oid;

*keyLen = ecc->key.dp->oidSz + 2;
if (wc_ecc_get_oid(ecc->key.dp->oidSum, &oid, &len) <= 0) {
ok = 0;
}
if (ok) {
keyData[0] = 0x06;
keyData[1] = len;
XMEMCPY(keyData + 2, oid, len);
*keyLen = len + 2;
}

WOLFPROV_LEAVE(WP_LOG_PK, __FILE__ ":" WOLFPROV_STRINGIZE(__LINE__), 1);
return 1;
WOLFPROV_LEAVE(WP_LOG_PK, __FILE__ ":" WOLFPROV_STRINGIZE(__LINE__), ok);
return ok;
}

/**
Expand Down Expand Up @@ -2442,14 +2464,14 @@ static int wp_ecc_encode(wp_EccEncDecCtx* ctx, OSSL_CORE_BIO *cBio,

if (ok && ((ctx->format == WP_ENC_FORMAT_TYPE_SPECIFIC) ||
(ctx->format == WP_ENC_FORMAT_X9_62))) {
if (selection == OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS) {
if (!wp_ecc_encode_params_size(key, &derLen)) {
if (selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) {
private = 1;
if (!wp_ecc_encode_priv_size(key, &derLen)) {
ok = 0;
}
}
else {
private = 1;
if (!wp_ecc_encode_priv_size(key, &derLen)) {
else if(selection & OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS) {
if (!wp_ecc_encode_params_size(key, &derLen)) {
ok = 0;
}
}
Expand Down Expand Up @@ -2484,13 +2506,7 @@ static int wp_ecc_encode(wp_EccEncDecCtx* ctx, OSSL_CORE_BIO *cBio,

if (ok && ((ctx->format == WP_ENC_FORMAT_TYPE_SPECIFIC) ||
(ctx->format == WP_ENC_FORMAT_X9_62))) {
if (selection == OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS) {
pemType = DH_PARAM_TYPE;
if (!wp_ecc_encode_params(key, derData, &derLen)) {
ok = 0;
}
}
else {
if (selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) {
if (ctx->format == WP_ENC_FORMAT_X9_62) {
pemType = ECC_PRIVATEKEY_TYPE;
}
Expand All @@ -2499,6 +2515,12 @@ static int wp_ecc_encode(wp_EccEncDecCtx* ctx, OSSL_CORE_BIO *cBio,
ok = 0;
}
}
else if(selection & OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS) {
pemType = DH_PARAM_TYPE;
if (!wp_ecc_encode_params(key, derData, &derLen)) {
ok = 0;
}
}
}
else if (ok && (ctx->format == WP_ENC_FORMAT_SPKI)) {
pemType = PUBLICKEY_TYPE;
Expand Down Expand Up @@ -2551,7 +2573,8 @@ static int wp_ecc_encode(wp_EccEncDecCtx* ctx, OSSL_CORE_BIO *cBio,
}
if (ok && ((ctx->format == WP_ENC_FORMAT_TYPE_SPECIFIC) ||
(ctx->format == WP_ENC_FORMAT_X9_62)) &&
(selection == OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS)) {
((selection & OSSL_KEYMGMT_SELECT_KEYPAIR) == 0) &&
(selection & OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS)) {
pemData[11] = 'E';
pemData[12] = 'C';
pemData[pemLen - 19] = 'E';
Expand Down
5 changes: 4 additions & 1 deletion src/wp_file_store.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,10 @@ static wp_FileCtx* wp_file_open(WOLFPROV_CTX* provCtx, const char* uri)
if (ctx != NULL) {
int ok = 1;

/* TODO: support URI form 'file:'. */
if (OPENSSL_strncasecmp(uri, "file:", 5) == 0) {
/* TODO: may need more uri processing for extended/windows cases */
uri += 5;
}
ctx->uri = OPENSSL_strdup(uri);
if (ctx->uri == NULL) {
ok = 0;
Expand Down
1 change: 0 additions & 1 deletion src/wp_wolfprov.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,7 +718,6 @@ static const OSSL_ALGORITHM wolfprov_encoder[] = {
wp_rsa_kp_pem_encoder_functions,
"" },
#ifdef WOLFSSL_RSA_PSS_ENCODING
/* TODO: RSA-PSS encoding isn't supported in wolfSSL */
{ WP_NAMES_RSA_PSS, WP_ENCODER_PROPERTIES(SubjectPublicKeyInfo, der),
wp_rsapss_spki_der_encoder_functions,
"" },
Expand Down
Loading