1 files changed, 40 insertions, 14 deletions

diff --git a/src/es256.c b/src/es256.c
index c8fd9f4..020ecaa 100644
--- a/src/es256.c
+++ b/src/es256.c
@@ -176,10 +176,15 @@ es256_pk_free(es256_pk_t **pkp)
 int
 es256_pk_from_ptr(es256_pk_t *pk, const void *ptr, size_t len)
 {
+        const uint8_t *p = ptr;
+
         if (len < sizeof(*pk))
                 return (FIDO_ERR_INVALID_ARGUMENT);
 
-        memcpy(pk, ptr, sizeof(*pk));
+        if (len == sizeof(*pk) + 1 && *p == 0x04)
+                memcpy(pk, ++p, sizeof(*pk)); /* uncompressed format */
+        else
+                memcpy(pk, ptr, sizeof(*pk)); /* libfido2 x||y format */
 
         return (FIDO_OK);
 }
@@ -262,8 +267,12 @@ es256_pk_to_EVP_PKEY(const es256_pk_t *k)
         const int        nid = NID_X9_62_prime256v1;
         int              ok = -1;
 
-        if ((bnctx = BN_CTX_new()) == NULL ||
-            (x = BN_CTX_get(bnctx)) == NULL ||
+        if ((bnctx = BN_CTX_new()) == NULL)
+                goto fail;
+
+        BN_CTX_start(bnctx);
+
+        if ((x = BN_CTX_get(bnctx)) == NULL ||
             (y = BN_CTX_get(bnctx)) == NULL)
                 goto fail;
 
@@ -296,12 +305,16 @@ es256_pk_to_EVP_PKEY(const es256_pk_t *k)
 
         ok = 0;
 fail:
-        if (bnctx != NULL)
+        if (bnctx != NULL) {
+                BN_CTX_end(bnctx);
                 BN_CTX_free(bnctx);
+        }
+
         if (ec != NULL)
                 EC_KEY_free(ec);
         if (q != NULL)
                 EC_POINT_free(q);
+
         if (ok < 0 && pkey != NULL) {
                 EVP_PKEY_free(pkey);
                 pkey = NULL;
@@ -313,7 +326,7 @@ fail:
 int
 es256_pk_from_EC_KEY(es256_pk_t *pk, const EC_KEY *ec)
 {
-        BN_CTX          *ctx = NULL;
+        BN_CTX          *bnctx = NULL;
         BIGNUM          *x = NULL;
         BIGNUM          *y = NULL;
         const EC_POINT  *q = NULL;
@@ -322,15 +335,17 @@ es256_pk_from_EC_KEY(es256_pk_t *pk, const EC_KEY *ec)
         int              n;
 
         if ((q = EC_KEY_get0_public_key(ec)) == NULL ||
-            (g = EC_KEY_get0_group(ec)) == NULL)
+            (g = EC_KEY_get0_group(ec)) == NULL ||
+            (bnctx = BN_CTX_new()) == NULL)
                 goto fail;
 
-        if ((ctx = BN_CTX_new()) == NULL ||
-            (x = BN_CTX_get(ctx)) == NULL ||
-            (y = BN_CTX_get(ctx)) == NULL)
+        BN_CTX_start(bnctx);
+
+        if ((x = BN_CTX_get(bnctx)) == NULL ||
+            (y = BN_CTX_get(bnctx)) == NULL)
                 goto fail;
 
-        if (EC_POINT_get_affine_coordinates_GFp(g, q, x, y, ctx) == 0 ||
+        if (EC_POINT_get_affine_coordinates_GFp(g, q, x, y, bnctx) == 0 ||
             (n = BN_num_bytes(x)) < 0 || (size_t)n > sizeof(pk->x) ||
             (n = BN_num_bytes(y)) < 0 || (size_t)n > sizeof(pk->y)) {
                 fido_log_debug("%s: EC_POINT_get_affine_coordinates_GFp",
@@ -346,8 +361,10 @@ es256_pk_from_EC_KEY(es256_pk_t *pk, const EC_KEY *ec)
 
         ok = FIDO_OK;
 fail:
-        if (ctx != NULL)
-                BN_CTX_free(ctx);
+        if (bnctx != NULL) {
+                BN_CTX_end(bnctx);
+                BN_CTX_free(bnctx);
+        }
 
         return (ok);
 }
@@ -362,7 +379,12 @@ es256_sk_to_EVP_PKEY(const es256_sk_t *k)
         const int        nid = NID_X9_62_prime256v1;
         int              ok = -1;
 
-        if ((bnctx = BN_CTX_new()) == NULL || (d = BN_CTX_get(bnctx)) == NULL ||
+        if ((bnctx = BN_CTX_new()) == NULL)
+                goto fail;
+
+        BN_CTX_start(bnctx);
+
+        if ((d = BN_CTX_get(bnctx)) == NULL ||
             BN_bin2bn(k->d, sizeof(k->d), d) == NULL) {
                 fido_log_debug("%s: BN_bin2bn", __func__);
                 goto fail;
@@ -384,10 +406,14 @@ es256_sk_to_EVP_PKEY(const es256_sk_t *k)
 
         ok = 0;
 fail:
-        if (bnctx != NULL)
+        if (bnctx != NULL) {
+                BN_CTX_end(bnctx);
                 BN_CTX_free(bnctx);
+        }
+
         if (ec != NULL)
                 EC_KEY_free(ec);
+
         if (ok < 0 && pkey != NULL) {
                 EVP_PKEY_free(pkey);
                 pkey = NULL;