diff options
Diffstat (limited to 'src/crypto/ecdh/ecdh.c')
-rw-r--r-- | src/crypto/ecdh/ecdh.c | 72 |
1 files changed, 32 insertions, 40 deletions
diff --git a/src/crypto/ecdh/ecdh.c b/src/crypto/ecdh/ecdh.c index 14856db..4a1964a 100644 --- a/src/crypto/ecdh/ecdh.c +++ b/src/crypto/ecdh/ecdh.c @@ -75,33 +75,27 @@ int ECDH_compute_key(void *out, size_t outlen, const EC_POINT *pub_key, - EC_KEY *priv_key, void *(*KDF)(const void *in, size_t inlen, - void *out, size_t *outlen)) { - BN_CTX *ctx; - EC_POINT *tmp = NULL; - BIGNUM *x = NULL, *y = NULL; - const BIGNUM *priv; - const EC_GROUP *group; - int ret = -1; - size_t buflen; - uint8_t *buf = NULL; - - if ((ctx = BN_CTX_new()) == NULL) { - goto err; - } - BN_CTX_start(ctx); - x = BN_CTX_get(ctx); - y = BN_CTX_get(ctx); - - priv = EC_KEY_get0_private_key(priv_key); + EC_KEY *priv_key, + void *(*kdf)(const void *in, size_t inlen, void *out, + size_t *outlen)) { + const BIGNUM *const priv = EC_KEY_get0_private_key(priv_key); if (priv == NULL) { OPENSSL_PUT_ERROR(ECDH, ECDH_R_NO_PRIVATE_VALUE); - goto err; + return -1; } - group = EC_KEY_get0_group(priv_key); + BN_CTX *ctx = BN_CTX_new(); + if (ctx == NULL) { + return -1; + } + BN_CTX_start(ctx); + + int ret = -1; + size_t buflen = 0; + uint8_t *buf = NULL; - tmp = EC_POINT_new(group); + const EC_GROUP *const group = EC_KEY_get0_group(priv_key); + EC_POINT *tmp = EC_POINT_new(group); if (tmp == NULL) { OPENSSL_PUT_ERROR(ECDH, ERR_R_MALLOC_FAILURE); goto err; @@ -112,7 +106,13 @@ int ECDH_compute_key(void *out, size_t outlen, const EC_POINT *pub_key, goto err; } - if (!EC_POINT_get_affine_coordinates_GFp(group, tmp, x, y, ctx)) { + BIGNUM *x = BN_CTX_get(ctx); + if (!x) { + OPENSSL_PUT_ERROR(ECDH, ERR_R_MALLOC_FAILURE); + goto err; + } + + if (!EC_POINT_get_affine_coordinates_GFp(group, tmp, x, NULL, ctx)) { OPENSSL_PUT_ERROR(ECDH, ECDH_R_POINT_ARITHMETIC_FAILURE); goto err; } @@ -129,33 +129,25 @@ int ECDH_compute_key(void *out, size_t outlen, const EC_POINT *pub_key, goto err; } - if (KDF != 0) { - if (KDF(buf, buflen, out, &outlen) == NULL) { + if (kdf != NULL) { + if (kdf(buf, buflen, out, &outlen) == NULL) { OPENSSL_PUT_ERROR(ECDH, ECDH_R_KDF_FAILED); goto err; } - ret = outlen; } else { /* no KDF, just copy as much as we can */ - if (outlen > buflen) { + if (buflen < outlen) { outlen = buflen; } memcpy(out, buf, outlen); - ret = outlen; } + ret = outlen; + err: - if (tmp) { - EC_POINT_free(tmp); - } - if (ctx) { - BN_CTX_end(ctx); - } - if (ctx) { - BN_CTX_free(ctx); - } - if (buf) { - OPENSSL_free(buf); - } + OPENSSL_free(buf); + EC_POINT_free(tmp); + BN_CTX_end(ctx); + BN_CTX_free(ctx); return ret; } |