DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

SAE: Use EC group context to get the group prime

Browse source 
Do not use the hardcoded group19_prime buffer for this to allow group
negotiation.

Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2013-01-01 12:27:00 +02:00
parent 09200a1166
commit a55f2eef71
3 changed files with 36 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/crypto/crypto.h
View file

@ -1,6 +1,6 @@
/*
* WPA Supplicant / wrapper functions for crypto libraries
* Copyright (c) 2004-2009, Jouni Malinen <j@w1.fi>
* Wrapper functions for crypto libraries
* Copyright (c) 2004-2013, Jouni Malinen <j@w1.fi>
*
* This software may be distributed under the terms of the BSD license.
* See README for more details.
@ -549,6 +549,13 @@ void crypto_ec_deinit(struct crypto_ec *e);
*/
size_t crypto_ec_prime_len(struct crypto_ec *e);
/**
* crypto_ec_get_prime - Get prime defining an EC group
* @e: EC context from crypto_ec_init()
* Returns: Prime (bignum) defining the group
*/
const struct crypto_bignum * crypto_ec_get_prime(struct crypto_ec *e);
/**
* crypto_ec_get_order - Get order of an EC group
* @e: EC context from crypto_ec_init()

16
src/crypto/crypto_openssl.c
View file

@ -1,6 +1,6 @@
/*
* WPA Supplicant / wrapper functions for libcrypto
* Copyright (c) 2004-2012, Jouni Malinen <j@w1.fi>
* Wrapper functions for OpenSSL libcrypto
* Copyright (c) 2004-2013, Jouni Malinen <j@w1.fi>
*
* This software may be distributed under the terms of the BSD license.
* See README for more details.
@ -901,6 +901,7 @@ struct crypto_ec {
EC_GROUP *group;
BN_CTX *bnctx;
size_t prime_len;
BIGNUM *prime;
BIGNUM *order;
};
@ -918,8 +919,11 @@ struct crypto_ec * crypto_ec_init(int group)
e->prime_len = 32;
e->bnctx = BN_CTX_new();
e->group = EC_GROUP_new_by_curve_name(NID_X9_62_prime256v1);
e->prime = BN_new();
e->order = BN_new();
if (e->group == NULL || e->bnctx == NULL || e->order == NULL ||
if (e->group == NULL || e->bnctx == NULL || e->prime == NULL ||
e->order == NULL ||
!EC_GROUP_get_curve_GFp(e->group, e->prime, NULL, NULL, e->bnctx) ||
!EC_GROUP_get_order(e->group, e->order, e->bnctx)) {
crypto_ec_deinit(e);
e = NULL;
@ -954,6 +958,12 @@ size_t crypto_ec_prime_len(struct crypto_ec *e)
}
const struct crypto_bignum * crypto_ec_get_prime(struct crypto_ec *e)
{
return (const struct crypto_bignum *) e->prime;
}
const struct crypto_bignum * crypto_ec_get_order(struct crypto_ec *e)
{
return (const struct crypto_bignum *) e->order;