feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Add EC_POINT_hex2point: zd #17090

Browse Source
This commit is contained in:
Takashi Kojo
2024-05-21 08:33:33 +09:00
parent 791c9e7aba
commit bc2b184c98
1 changed files with 22 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/pk.c
View File

@@ -32,6 +32,12 @@
#ifdef HAVE_ECC #ifdef HAVE_ECC
#include <wolfssl/wolfcrypt/ecc.h> #include <wolfssl/wolfcrypt/ecc.h>
#ifdef HAVE_SELFTEST
/* point compression types. */
#define ECC_POINT_COMP_EVEN 0x02
#define ECC_POINT_COMP_ODD 0x03
#define ECC_POINT_UNCOMP 0x04
#endif
#endif #endif
#ifndef WOLFSSL_HAVE_ECC_KEY_GET_PRIV #ifndef WOLFSSL_HAVE_ECC_KEY_GET_PRIV
/* FIPS build has replaced ecc.h. */ /* FIPS build has replaced ecc.h. */
@@ -9787,12 +9793,12 @@ char* wolfSSL_EC_POINT_point2hex(const WOLFSSL_EC_GROUP* group,
* odd. * odd.
*/ */
hex[0] = mp_isodd((mp_int*)point->Y->internal) ? hex[0] = mp_isodd((mp_int*)point->Y->internal) ?
0x03 : 0x02; ECC_POINT_COMP_ODD : ECC_POINT_COMP_EVEN;
/* No y-ordinate. */ /* No y-ordinate. */
} }
else { else {
/* Put in uncompressed format byte. */ /* Put in uncompressed format byte. */
hex[0] = 0x04; hex[0] = ECC_POINT_UNCOMP;
/* Calculate offset as leading zeros not encoded. */ /* Calculate offset as leading zeros not encoded. */
i = 1 + 2 * sz - mp_unsigned_bin_size((mp_int*)point->Y->internal); i = 1 + 2 * sz - mp_unsigned_bin_size((mp_int*)point->Y->internal);
/* Put in y-ordinate after x-ordinate. */ /* Put in y-ordinate after x-ordinate. */
@@ -9826,13 +9832,11 @@ char* wolfSSL_EC_POINT_point2hex(const WOLFSSL_EC_GROUP* group,
static size_t hex_to_bytes(const char *hex, unsigned char *output, size_t sz) static size_t hex_to_bytes(const char *hex, unsigned char *output, size_t sz)
{ {
word32 i; word32 i;
for (i = 0; i < sz; i++) for (i = 0; i < sz; i++) {
{
signed char ch1, ch2; signed char ch1, ch2;
ch1 = HexCharToByte(hex[i * 2]); ch1 = HexCharToByte(hex[i * 2]);
ch2 = HexCharToByte(hex[i * 2 + 1]); ch2 = HexCharToByte(hex[i * 2 + 1]);
if ((ch1 < 0) || (ch2 < 0)) if ((ch1 < 0) || (ch2 < 0)) {
{
WOLFSSL_MSG("hex_to_bytes: syntax error"); WOLFSSL_MSG("hex_to_bytes: syntax error");
return 0; return 0;
} }
@@ -9841,20 +9845,19 @@ static size_t hex_to_bytes(const char *hex, unsigned char *output, size_t sz)
return sz; return sz;
} }
WOLFSSL_EC_POINT*wolfSSL_EC_POINT_hex2point(const EC_GROUP *group, WOLFSSL_EC_POINT* wolfSSL_EC_POINT_hex2point(const EC_GROUP *group,
const char *hex, WOLFSSL_EC_POINT*p, WOLFSSL_BN_CTX *ctx) const char *hex, WOLFSSL_EC_POINT*p, WOLFSSL_BN_CTX *ctx)
{ {
/* for uncompressed mode */ /* for uncompressed mode */
size_t str_sz; size_t str_sz;
BIGNUM *Gx = NULL; BIGNUM *Gx = NULL;
BIGNUM *Gy = NULL; BIGNUM *Gy = NULL;
char *strGx = NULL; char strGx[MAX_ECC_BYTES * 2 + 1];
/* for compressed mode */ /* for compressed mode */
int key_sz; int key_sz;
byte *octGx = NULL; byte *octGx = (byte *)strGx; /* octGx[MAX_ECC_BYTES] */
#define P_ALLOC 1
int p_alloc = 0; int p_alloc = 0;
int ret; int ret;
@@ -9868,24 +9871,20 @@ WOLFSSL_EC_POINT*wolfSSL_EC_POINT_hex2point(const EC_GROUP *group,
WOLFSSL_MSG("wolfSSL_EC_POINT_new"); WOLFSSL_MSG("wolfSSL_EC_POINT_new");
goto err; goto err;
} }
p_alloc = P_ALLOC; p_alloc = 1;
} }
key_sz = (wolfSSL_EC_GROUP_get_degree(group) + 7) / 8;
if (hex[0] == '0' && hex[1] == '4') { /* uncompressed mode */ if (hex[0] == '0' && hex[1] == '4') { /* uncompressed mode */
str_sz = ((wolfSSL_EC_GROUP_get_degree(group) + 7) / 8) * 2; str_sz = key_sz * 2;
strGx = (char *)XMALLOC(str_sz + 1, NULL, DYNAMIC_TYPE_ECC);
if (strGx == NULL) {
WOLFSSL_MSG("malloc error");
goto err;
}
XMEMSET(strGx, 0x0, str_sz + 1); XMEMSET(strGx, 0x0, str_sz + 1);
XMEMCPY(strGx, hex + 2, str_sz); XMEMCPY(strGx, hex + 2, str_sz);
if (BN_hex2bn(&Gx, strGx) == 0) if (wolfSSL_BN_hex2bn(&Gx, strGx) == 0)
goto err; goto err;
if (BN_hex2bn(&Gy, hex + 2 + str_sz) == 0) if (wolfSSL_BN_hex2bn(&Gy, hex + 2 + str_sz) == 0)
goto err; goto err;
ret = wolfSSL_EC_POINT_set_affine_coordinates_GFp ret = wolfSSL_EC_POINT_set_affine_coordinates_GFp
@@ -9897,16 +9896,10 @@ WOLFSSL_EC_POINT*wolfSSL_EC_POINT_hex2point(const EC_GROUP *group,
} }
} }
else if (hex[0] == '0' && (hex[1] == '2' || hex[1] == '3')) { else if (hex[0] == '0' && (hex[1] == '2' || hex[1] == '3')) {
size_t sz = XSTRLEN(hex + 2) / 2;
/* compressed mode */ /* compressed mode */
key_sz = ((wolfSSL_EC_GROUP_get_degree(group) + 7) / 8); octGx[0] = ECC_POINT_COMP_ODD;
octGx = (byte *)XMALLOC(key_sz + 1, NULL, DYNAMIC_TYPE_ECC); if (hex_to_bytes(hex + 2, octGx + 1, sz) != sz) {
if (octGx == NULL) {
WOLFSSL_MSG("EEC_KEY_get_byte_size, XMALLOC");
goto err;
}
octGx[0] = 0x03;
if (hex_to_bytes(hex + 2, octGx + 1, XSTRLEN(hex + 2) / 2)
!= XSTRLEN(hex + 2) / 2) {
goto err; goto err;
} }
if (wolfSSL_ECPoint_d2i(octGx, key_sz + 1, group, p) if (wolfSSL_ECPoint_d2i(octGx, key_sz + 1, group, p)
@@ -9917,15 +9910,11 @@ WOLFSSL_EC_POINT*wolfSSL_EC_POINT_hex2point(const EC_GROUP *group,
else else
goto err; goto err;
XFREE(strGx, NULL, DYNAMIC_TYPE_ECC);
XFREE(octGx, NULL, DYNAMIC_TYPE_ECC);
wolfSSL_BN_free(Gx); wolfSSL_BN_free(Gx);
wolfSSL_BN_free(Gy); wolfSSL_BN_free(Gy);
return p; return p;
err: err:
XFREE(strGx, NULL, DYNAMIC_TYPE_ECC);
XFREE(octGx, NULL, DYNAMIC_TYPE_ECC);
wolfSSL_BN_free(Gx); wolfSSL_BN_free(Gx);
wolfSSL_BN_free(Gy); wolfSSL_BN_free(Gy);
if (p_alloc) { if (p_alloc) {