generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adapt ecdh_compute_key

Browse Source 
Rename ecdh_compute_key into ossl_ecdh_compute_key and modify it
to use EC error codes. Remove superfluous old ECDH functions.

Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Dr. Stephen Henson 2015-10-22 18:47:11 +01:00
parent 168e8374ee
commit 647b223875
1 changed files with 18 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
crypto/ec/ecdh_ossl.c
View File

@ -72,28 +72,11 @@
#include "internal/cryptlib.h" #include "internal/cryptlib.h"
#include "ech_locl.h"
#include <openssl/err.h> #include <openssl/err.h>
#include <openssl/sha.h>
#include <openssl/obj_mac.h>
#include <openssl/bn.h> #include <openssl/bn.h>
#include <openssl/objects.h>
static int ecdh_compute_key(void *out, size_t len, const EC_POINT *pub_key, #include <openssl/ec.h>
EC_KEY *ecdh, #include "ec_lcl.h"
void *(*KDF) (const void *in, size_t inlen,
void *out, size_t *outlen));
static ECDH_METHOD openssl_ecdh_meth = {
"OpenSSL ECDH method",
ecdh_compute_key,
ECDH_FLAG_FIPS_METHOD, /* flags */
NULL /* app_data */
};
const ECDH_METHOD *ECDH_OpenSSL(void)
{
return &openssl_ecdh_meth;
}
/*- /*-
* This implementation is based on the following primitives in the IEEE 1363 standard: * This implementation is based on the following primitives in the IEEE 1363 standard:
@ -101,10 +84,10 @@ const ECDH_METHOD *ECDH_OpenSSL(void)
* - ECSVDP-DH * - ECSVDP-DH
* Finally an optional KDF is applied. * Finally an optional KDF is applied.
*/ */
static int ecdh_compute_key(void *out, size_t outlen, const EC_POINT *pub_key, int ossl_ecdh_compute_key(void *out, size_t outlen, const EC_POINT *pub_key,
EC_KEY *ecdh, EC_KEY *ecdh,
void *(*KDF) (const void *in, size_t inlen, void *(*KDF) (const void *in, size_t inlen,
void *out, size_t *outlen)) void *out, size_t *outlen))
{ {
BN_CTX *ctx; BN_CTX *ctx;
EC_POINT *tmp = NULL; EC_POINT *tmp = NULL;
@ -116,7 +99,7 @@ static int ecdh_compute_key(void *out, size_t outlen, const EC_POINT *pub_key,
unsigned char *buf = NULL; unsigned char *buf = NULL;
if (outlen > INT_MAX) { if (outlen > INT_MAX) {
ECDHerr(ECDH_F_ECDH_COMPUTE_KEY, ERR_R_MALLOC_FAILURE); /* sort of, ECerr(EC_F_OSSL_ECDH_COMPUTE_KEY, ERR_R_MALLOC_FAILURE); /* sort of,
* anyway */ * anyway */
return -1; return -1;
} }
@ -129,7 +112,7 @@ static int ecdh_compute_key(void *out, size_t outlen, const EC_POINT *pub_key,
priv_key = EC_KEY_get0_private_key(ecdh); priv_key = EC_KEY_get0_private_key(ecdh);
if (priv_key == NULL) { if (priv_key == NULL) {
ECDHerr(ECDH_F_ECDH_COMPUTE_KEY, ECDH_R_NO_PRIVATE_VALUE); ECerr(EC_F_OSSL_ECDH_COMPUTE_KEY, EC_R_NO_PRIVATE_VALUE);
goto err; goto err;
} }
@ -138,33 +121,33 @@ static int ecdh_compute_key(void *out, size_t outlen, const EC_POINT *pub_key,
if (EC_KEY_get_flags(ecdh) & EC_FLAG_COFACTOR_ECDH) { if (EC_KEY_get_flags(ecdh) & EC_FLAG_COFACTOR_ECDH) {
if (!EC_GROUP_get_cofactor(group, x, ctx) || if (!EC_GROUP_get_cofactor(group, x, ctx) ||
!BN_mul(x, x, priv_key, ctx)) { !BN_mul(x, x, priv_key, ctx)) {
ECDHerr(ECDH_F_ECDH_COMPUTE_KEY, ERR_R_MALLOC_FAILURE); ECerr(EC_F_OSSL_ECDH_COMPUTE_KEY, ERR_R_MALLOC_FAILURE);
goto err; goto err;
} }
priv_key = x; priv_key = x;
} }
if ((tmp = EC_POINT_new(group)) == NULL) { if ((tmp = EC_POINT_new(group)) == NULL) {
ECDHerr(ECDH_F_ECDH_COMPUTE_KEY, ERR_R_MALLOC_FAILURE); ECerr(EC_F_OSSL_ECDH_COMPUTE_KEY, ERR_R_MALLOC_FAILURE);
goto err; goto err;
} }
if (!EC_POINT_mul(group, tmp, NULL, pub_key, priv_key, ctx)) { if (!EC_POINT_mul(group, tmp, NULL, pub_key, priv_key, ctx)) {
ECDHerr(ECDH_F_ECDH_COMPUTE_KEY, ECDH_R_POINT_ARITHMETIC_FAILURE); ECerr(EC_F_OSSL_ECDH_COMPUTE_KEY, EC_R_POINT_ARITHMETIC_FAILURE);
goto err; goto err;
} }
if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) == if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) ==
NID_X9_62_prime_field) { NID_X9_62_prime_field) {
if (!EC_POINT_get_affine_coordinates_GFp(group, tmp, x, y, ctx)) { if (!EC_POINT_get_affine_coordinates_GFp(group, tmp, x, y, ctx)) {
ECDHerr(ECDH_F_ECDH_COMPUTE_KEY, ECDH_R_POINT_ARITHMETIC_FAILURE); ECerr(EC_F_OSSL_ECDH_COMPUTE_KEY, EC_R_POINT_ARITHMETIC_FAILURE);
goto err; goto err;
} }
} }
#ifndef OPENSSL_NO_EC2M #ifndef OPENSSL_NO_EC2M
else { else {
if (!EC_POINT_get_affine_coordinates_GF2m(group, tmp, x, y, ctx)) { if (!EC_POINT_get_affine_coordinates_GF2m(group, tmp, x, y, ctx)) {
ECDHerr(ECDH_F_ECDH_COMPUTE_KEY, ECDH_R_POINT_ARITHMETIC_FAILURE); ECerr(EC_F_OSSL_ECDH_COMPUTE_KEY, EC_R_POINT_ARITHMETIC_FAILURE);
goto err; goto err;
} }
} }
@ -173,23 +156,23 @@ static int ecdh_compute_key(void *out, size_t outlen, const EC_POINT *pub_key,
buflen = (EC_GROUP_get_degree(group) + 7) / 8; buflen = (EC_GROUP_get_degree(group) + 7) / 8;
len = BN_num_bytes(x); len = BN_num_bytes(x);
if (len > buflen) { if (len > buflen) {
ECDHerr(ECDH_F_ECDH_COMPUTE_KEY, ERR_R_INTERNAL_ERROR); ECerr(EC_F_OSSL_ECDH_COMPUTE_KEY, ERR_R_INTERNAL_ERROR);
goto err; goto err;
} }
if ((buf = OPENSSL_malloc(buflen)) == NULL) { if ((buf = OPENSSL_malloc(buflen)) == NULL) {
ECDHerr(ECDH_F_ECDH_COMPUTE_KEY, ERR_R_MALLOC_FAILURE); ECerr(EC_F_OSSL_ECDH_COMPUTE_KEY, ERR_R_MALLOC_FAILURE);
goto err; goto err;
} }
memset(buf, 0, buflen - len); memset(buf, 0, buflen - len);
if (len != (size_t)BN_bn2bin(x, buf + buflen - len)) { if (len != (size_t)BN_bn2bin(x, buf + buflen - len)) {
ECDHerr(ECDH_F_ECDH_COMPUTE_KEY, ERR_R_BN_LIB); ECerr(EC_F_OSSL_ECDH_COMPUTE_KEY, ERR_R_BN_LIB);
goto err; goto err;
} }
if (KDF != 0) { if (KDF != 0) {
if (KDF(buf, buflen, out, &outlen) == NULL) { if (KDF(buf, buflen, out, &outlen) == NULL) {
ECDHerr(ECDH_F_ECDH_COMPUTE_KEY, ECDH_R_KDF_FAILED); ECerr(EC_F_OSSL_ECDH_COMPUTE_KEY, EC_R_KDF_FAILED);
goto err; goto err;
} }
ret = outlen; ret = outlen;