Skip to content

Implementing missing macros to openssl compatibility layer #10520

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

Closed
Roy-Carter wants to merge 11 commits into from
Closed

Implementing missing macros to openssl compatibility layer #10520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
386dda0
Introduce missing functionality that was found in compatibility layer…
Roy-Carter May 22, 2026
0de77c4
Refactor - Fix PR notes
Roy-Carter Jun 7, 2026
a35531e
Bugfix - fix tests failure
Roy-Carter Jun 21, 2026
fc60929
Fix SSL_set_ciphersuites test under NO_ERROR_STRINGS
julek-wolfssl Jul 28, 2026
02ce4ef
Fix X509V3_ADD_* semantics and extension removal state
julek-wolfssl Jul 28, 2026
b340414
Keep new test comment within 80 columns
julek-wolfssl Jul 28, 2026
60499d6
Record the point conversion form in EC_KEY_oct2key
julek-wolfssl Aug 27, 2026
59993c9
Consume extKeyUsage object stacks in X509_add_ext
julek-wolfssl Aug 27, 2026
ab01395
X509_add1_ext_i2d: report NIDs with no presence tracking
julek-wolfssl Aug 27, 2026
31e9207
X509_add1_ext_i2d: refuse an extension encoded under another NID
julek-wolfssl Aug 27, 2026
6225adf
X509_add1_ext_i2d: validate an extKeyUsage stack before replacing
julek-wolfssl Aug 27, 2026
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
68 changes: 68 additions & 0 deletions src/pk_ec.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4749,6 +4749,74 @@ int wolfSSL_EC_KEY_set_public_key(WOLFSSL_EC_KEY *key,
return ret;
}

/*
* Decode an octet-encoded EC public point into @key.
*
* The point conversion form of @key is set from the encoding byte so that
* re-encoding with wolfSSL_i2o_ECPublicKey() reproduces @buf. Hybrid
* encodings have no wolfSSL equivalent and leave the form unchanged.
*
* Return code compliant with OpenSSL.
*
* @param [in, out] key EC key (must already have a group set).
* @param [in] buf Octet-encoded public point.
* @param [in] len Length of @buf in bytes.
* @param [in] ctx BN context. May be NULL.
* @return 1 on success.
* @return 0 on failure.
*/
int wolfSSL_EC_KEY_oct2key(WOLFSSL_EC_KEY *key, const unsigned char *buf,

@dgarske dgarske Aug 3, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟠 [Medium] wolfSSL_EC_KEY_oct2key does not record the point conversion form

OpenSSL's EC_KEY_oct2key() saves the encoding form on the key (key->conv_form = (point_conversion_form_t)(buf[0] & ~0x01)), so that a later i2o_ECPublicKey() / EC_KEY_key2buf() re-emits the same form. The wolfSSL implementation never touches key->form, so a compressed input silently round-trips back as uncompressed.

Verified empirically on this branch:

compressed enc len=33 first=0x03
oct2key(compressed)=1 conv_form after=4 (OpenSSL sets 2)

This matters for applications that hash or compare the re-encoded public key (e.g. JWK/COSE key thumbprints, TLS raw public keys), because they will get a different byte string than OpenSSL would.

Fix: Call wolfSSL_EC_KEY_set_conv_form(key, buf[0] & ~0x01) on success, and document the behaviour in the function's doxygen block.

size_t len, WOLFSSL_BN_CTX *ctx)
{
int ret = 1;
const WOLFSSL_EC_GROUP *group = NULL;
WOLFSSL_EC_POINT *point = NULL;

WOLFSSL_ENTER("wolfSSL_EC_KEY_oct2key");

if ((key == NULL) || (buf == NULL) || (len == 0)) {
WOLFSSL_MSG("wolfSSL_EC_KEY_oct2key Bad arguments");
ret = 0;
}

if (ret == 1) {
group = wolfSSL_EC_KEY_get0_group(key);
if (group == NULL) {
WOLFSSL_MSG("EC_KEY has no group set");
ret = 0;
}
}

if (ret == 1) {
point = wolfSSL_EC_POINT_new((WOLFSSL_EC_GROUP*)group);
if (point == NULL) {
WOLFSSL_MSG("wolfSSL_EC_POINT_new failed");
ret = 0;
}
}

if ((ret == 1) &&
(wolfSSL_EC_POINT_oct2point(group, point, buf, len, ctx) != 1)) {
WOLFSSL_MSG("wolfSSL_EC_POINT_oct2point failed");
ret = 0;
}

if ((ret == 1) && (wolfSSL_EC_KEY_set_public_key(key, point) != 1)) {
WOLFSSL_MSG("wolfSSL_EC_KEY_set_public_key failed");
ret = 0;
}

if (ret == 1) {
/* SEC 1: 0x02/0x03 compressed, 0x04 uncompressed. Clearing the low
* bit turns the leading byte into the conversion form. */
wolfSSL_EC_KEY_set_conv_form(key, buf[0] & ~0x01);
}

wolfSSL_EC_POINT_free(point);

return ret;
}

#ifndef NO_WOLFSSL_STUB
/* Set the ASN.1 encoding flag against the EC key.
*
Expand Down
Loading
Loading