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

Add flag to support cofactor ECDH

Browse Source
This commit is contained in:
Dr. Stephen Henson 2011-11-19 17:03:44 +00:00
parent 52876c3100
commit f6385248f6
5 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -4,6 +4,9 @@
Changes between 1.0.1 and 1.1.0 [xx XXX xxxx] Changes between 1.0.1 and 1.1.0 [xx XXX xxxx]
*) Add flag to EC_KEY to use cofactor ECDH if set.
[Steve Henson]
*) Update fips_test_suite to support multiple command line options. New *) Update fips_test_suite to support multiple command line options. New
test to induce all self test errors in sequence and check expected test to induce all self test errors in sequence and check expected
failures. failures.

2
crypto/ecdh/ecdh.h
View File

@ -85,6 +85,8 @@
extern "C" { extern "C" {
#endif #endif
#define EC_FLAG_COFACTOR_ECDH 0x1000
const ECDH_METHOD *ECDH_OpenSSL(void); const ECDH_METHOD *ECDH_OpenSSL(void);
void ECDH_set_default_method(const ECDH_METHOD *); void ECDH_set_default_method(const ECDH_METHOD *);

12
crypto/ecdh/ech_ossl.c
View File

@ -146,6 +146,18 @@ static int ecdh_compute_key(void *out, size_t outlen, const EC_POINT *pub_key,
} }
group = EC_KEY_get0_group(ecdh); group = EC_KEY_get0_group(ecdh);
if (EC_KEY_get_flags(ecdh) & EC_FLAG_COFACTOR_ECDH)
{
if (!EC_GROUP_get_cofactor(group, x, ctx) ||
!BN_mul(x, x, priv_key, ctx))
{
ECDHerr(ECDH_F_ECDH_COMPUTE_KEY, ERR_R_MALLOC_FAILURE);
goto err;
}
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); ECDHerr(ECDH_F_ECDH_COMPUTE_KEY,ERR_R_MALLOC_FAILURE);

2
fips/ecdh/fips_ecdh_selftest.c
View File

@ -166,6 +166,7 @@ int FIPS_selftest_ecdh(void)
rv = -1; rv = -1;
goto err; goto err;
} }
EC_KEY_set_flags(ec1, EC_FLAG_COFACTOR_ECDH);
if (!EC_KEY_set_public_key_affine_coordinates(ec1, x, y)) if (!EC_KEY_set_public_key_affine_coordinates(ec1, x, y))
{ {
@ -194,6 +195,7 @@ int FIPS_selftest_ecdh(void)
rv = -1; rv = -1;
goto err; goto err;
} }
EC_KEY_set_flags(ec1, EC_FLAG_COFACTOR_ECDH);
if (!EC_KEY_set_public_key_affine_coordinates(ec2, x, y)) if (!EC_KEY_set_public_key_affine_coordinates(ec2, x, y))
{ {

1
fips/ecdh/fips_ecdhvs.c
View File

@ -261,6 +261,7 @@ static void ec_output_Zhash(FILE *out, int exout, EC_GROUP *group,
unsigned char chash[EVP_MAX_MD_SIZE]; unsigned char chash[EVP_MAX_MD_SIZE];
int Zlen; int Zlen;
ec = EC_KEY_new(); ec = EC_KEY_new();
EC_KEY_set_flags(ec, EC_FLAG_COFACTOR_ECDH);
EC_KEY_set_group(ec, group); EC_KEY_set_group(ec, group);
peerkey = make_peer(group, cx, cy); peerkey = make_peer(group, cx, cy);
if (rhash == NULL) if (rhash == NULL)