denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename diffie_hellman_t to key_exchange_t and change the interface etc.

Browse Source 
This makes it more generic so we can use it for QSKE methods.
This commit is contained in:
Tobias Brunner
2022-06-29 10:28:50 +02:00
parent ec95fd9b93
commit 3af7c6db87
130 changed files with 1379 additions and 1384 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/dh_speed.c
+13 -13
View File
@@ -19,7 +19,7 @@
#include <assert.h> #include <assert.h>
#include <library.h> #include <library.h>
#include <utils/debug.h> #include <utils/debug.h>
#include <crypto/diffie_hellman.h> #include <crypto/key_exchange.h>
static void usage() static void usage()
{ {
@@ -29,7 +29,7 @@ static void usage()
struct { struct {
char *name; char *name;
diffie_hellman_group_t group; key_exchange_method_t group;
} groups[] = { } groups[] = {
{"modp768", MODP_768_BIT}, {"modp768", MODP_768_BIT},
{"modp1024", MODP_1024_BIT}, {"modp1024", MODP_1024_BIT},
@@ -65,43 +65,43 @@ static double end_timing(struct timespec *start)
(end.tv_sec - start->tv_sec) * 1.0; (end.tv_sec - start->tv_sec) * 1.0;
} }
static void run_test(diffie_hellman_group_t group, int rounds) static void run_test(key_exchange_method_t group, int rounds)
{ {
diffie_hellman_t *l[rounds], *r; key_exchange_t *l[rounds], *r;
chunk_t chunk, chunks[rounds], lsecrets[rounds], rsecrets[rounds]; chunk_t chunk, chunks[rounds], lsecrets[rounds], rsecrets[rounds];
struct timespec timing; struct timespec timing;
int round; int round;
r = lib->crypto->create_dh(lib->crypto, group); r = lib->crypto->create_ke(lib->crypto, group);
if (!r) if (!r)
{ {
printf("skipping %N, not supported\n", printf("skipping %N, not supported\n", key_exchange_method_names,
diffie_hellman_group_names, group); group);
return; return;
} }
printf("%N:\t", diffie_hellman_group_names, group); printf("%N:\t", key_exchange_method_names, group);
start_timing(&timing); start_timing(&timing);
for (round = 0; round < rounds; round++) for (round = 0; round < rounds; round++)
{ {
l[round] = lib->crypto->create_dh(lib->crypto, group); l[round] = lib->crypto->create_ke(lib->crypto, group);
assert(l[round]->get_my_public_value(l[round], &chunks[round])); assert(l[round]->get_public_key(l[round], &chunks[round]));
} }
printf("A = g^a/s: %8.1f", rounds / end_timing(&timing)); printf("A = g^a/s: %8.1f", rounds / end_timing(&timing));
for (round = 0; round < rounds; round++) for (round = 0; round < rounds; round++)
{ {
assert(r->set_other_public_value(r, chunks[round])); assert(r->set_public_key(r, chunks[round]));
assert(r->get_shared_secret(r, &rsecrets[round])); assert(r->get_shared_secret(r, &rsecrets[round]));
chunk_free(&chunks[round]); chunk_free(&chunks[round]);
} }
assert(r->get_my_public_value(r, &chunk)); assert(r->get_public_key(r, &chunk));
start_timing(&timing); start_timing(&timing);
for (round = 0; round < rounds; round++) for (round = 0; round < rounds; round++)
{ {
assert(l[round]->set_other_public_value(l[round], chunk)); assert(l[round]->set_public_key(l[round], chunk));
assert(l[round]->get_shared_secret(l[round], &lsecrets[round])); assert(l[round]->get_shared_secret(l[round], &lsecrets[round]));
} }
printf(" | S = B^a/s: %8.1f\n", rounds / end_timing(&timing)); printf(" | S = B^a/s: %8.1f\n", rounds / end_timing(&timing));
src/charon-tkm/src/tkm/tkm_diffie_hellman.c
+19 -19
View File
@@ -40,12 +40,12 @@ struct private_tkm_diffie_hellman_t {
tkm_diffie_hellman_t public; tkm_diffie_hellman_t public;
/** /**
* Diffie Hellman group number. * Diffie-Hellman group number.
*/ */
diffie_hellman_group_t group; key_exchange_method_t group;
/** /**
* Diffie Hellman public value. * Diffie-Hellman public value.
*/ */
dh_pubvalue_type pubvalue; dh_pubvalue_type pubvalue;
@@ -56,14 +56,14 @@ struct private_tkm_diffie_hellman_t {
}; };
METHOD(diffie_hellman_t, get_my_public_value, bool, METHOD(key_exchange_t, get_public_key, bool,
private_tkm_diffie_hellman_t *this, chunk_t *value) private_tkm_diffie_hellman_t *this, chunk_t *value)
{ {
sequence_to_chunk(this->pubvalue.data, this->pubvalue.size, value); sequence_to_chunk(this->pubvalue.data, this->pubvalue.size, value);
return TRUE; return TRUE;
} }
METHOD(diffie_hellman_t, get_shared_secret, bool, METHOD(key_exchange_t, get_shared_secret, bool,
private_tkm_diffie_hellman_t *this, chunk_t *secret) private_tkm_diffie_hellman_t *this, chunk_t *secret)
{ {
*secret = chunk_empty; *secret = chunk_empty;
@@ -71,7 +71,7 @@ METHOD(diffie_hellman_t, get_shared_secret, bool,
} }
METHOD(diffie_hellman_t, set_other_public_value, bool, METHOD(key_exchange_t, set_public_key, bool,
private_tkm_diffie_hellman_t *this, chunk_t value) private_tkm_diffie_hellman_t *this, chunk_t value)
{ {
dh_pubvalue_type othervalue; dh_pubvalue_type othervalue;
@@ -81,13 +81,13 @@ METHOD(diffie_hellman_t, set_other_public_value, bool,
return ike_dh_generate_key(this->context_id, othervalue) == TKM_OK; return ike_dh_generate_key(this->context_id, othervalue) == TKM_OK;
} }
METHOD(diffie_hellman_t, get_dh_group, diffie_hellman_group_t, METHOD(key_exchange_t, get_method, key_exchange_method_t,
private_tkm_diffie_hellman_t *this) private_tkm_diffie_hellman_t *this)
{ {
return this->group; return this->group;
} }
METHOD(diffie_hellman_t, destroy, void, METHOD(key_exchange_t, destroy, void,
private_tkm_diffie_hellman_t *this) private_tkm_diffie_hellman_t *this)
{ {
if (ike_dh_reset(this->context_id) != TKM_OK) if (ike_dh_reset(this->context_id) != TKM_OK)
@@ -107,13 +107,13 @@ METHOD(tkm_diffie_hellman_t, get_id, dh_id_type,
static u_int hash(void *key) static u_int hash(void *key)
{ {
diffie_hellman_group_t k = *(diffie_hellman_group_t*)key; key_exchange_method_t k = *(key_exchange_method_t*)key;
return chunk_hash(chunk_from_thing(k)); return chunk_hash(chunk_from_thing(k));
} }
static bool equals(void *key, void *other_key) static bool equals(void *key, void *other_key)
{ {
return *(diffie_hellman_group_t*)key == *(diffie_hellman_group_t*)other_key; return *(key_exchange_method_t*)key == *(key_exchange_method_t*)other_key;
} }
/* /*
@@ -123,7 +123,7 @@ int register_dh_mapping()
{ {
int count, i; int count, i;
char *iana_id_str, *tkm_id_str; char *iana_id_str, *tkm_id_str;
diffie_hellman_group_t *iana_id; key_exchange_method_t *iana_id;
uint64_t *tkm_id; uint64_t *tkm_id;
hashtable_t *map; hashtable_t *map;
enumerator_t *enumerator; enumerator_t *enumerator;
@@ -137,7 +137,7 @@ int register_dh_mapping()
while (enumerator->enumerate(enumerator, &iana_id_str, &tkm_id_str)) while (enumerator->enumerate(enumerator, &iana_id_str, &tkm_id_str))
{ {
iana_id = malloc_thing(diffie_hellman_group_t); iana_id = malloc_thing(key_exchange_method_t);
*iana_id = settings_value_as_int(iana_id_str, 0); *iana_id = settings_value_as_int(iana_id_str, 0);
tkm_id = malloc_thing(uint64_t); tkm_id = malloc_thing(uint64_t);
*tkm_id = settings_value_as_int(tkm_id_str, 0); *tkm_id = settings_value_as_int(tkm_id_str, 0);
@@ -148,13 +148,13 @@ int register_dh_mapping()
count = map->get_count(map); count = map->get_count(map);
plugin_feature_t f[count + 1]; plugin_feature_t f[count + 1];
f[0] = PLUGIN_REGISTER(DH, tkm_diffie_hellman_create); f[0] = PLUGIN_REGISTER(KE, tkm_diffie_hellman_create);
i = 1; i = 1;
enumerator = map->create_enumerator(map); enumerator = map->create_enumerator(map);
while (enumerator->enumerate(enumerator, &iana_id, &tkm_id)) while (enumerator->enumerate(enumerator, &iana_id, &tkm_id))
{ {
f[i] = PLUGIN_PROVIDE(DH, *iana_id); f[i] = PLUGIN_PROVIDE(KE, *iana_id);
i++; i++;
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
@@ -198,7 +198,7 @@ void destroy_dh_mapping()
/* /*
* Described in header. * Described in header.
*/ */
tkm_diffie_hellman_t *tkm_diffie_hellman_create(diffie_hellman_group_t group) tkm_diffie_hellman_t *tkm_diffie_hellman_create(key_exchange_method_t group)
{ {
private_tkm_diffie_hellman_t *this; private_tkm_diffie_hellman_t *this;
@@ -209,11 +209,11 @@ tkm_diffie_hellman_t *tkm_diffie_hellman_create(diffie_hellman_group_t group)
INIT(this, INIT(this,
.public = { .public = {
.dh = { .ke = {
.get_shared_secret = _get_shared_secret, .get_shared_secret = _get_shared_secret,
.set_other_public_value = _set_other_public_value, .set_public_key = _set_public_key,
.get_my_public_value = _get_my_public_value, .get_public_key = _get_public_key,
.get_dh_group = _get_dh_group, .get_method = _get_method,
.destroy = _destroy, .destroy = _destroy,
}, },
.get_id = _get_id, .get_id = _get_id,
src/charon-tkm/src/tkm/tkm_diffie_hellman.h
+4 -4
View File
@@ -29,14 +29,14 @@ typedef struct tkm_diffie_hellman_t tkm_diffie_hellman_t;
#include <tkm/types.h> #include <tkm/types.h>
/** /**
* diffie_hellman_t implementation using the trusted key manager. * key_exchange_t implementation using the trusted key manager.
*/ */
struct tkm_diffie_hellman_t { struct tkm_diffie_hellman_t {
/** /**
* Implements diffie_hellman_t interface. * Implements key_exchange_t interface.
*/ */
diffie_hellman_t dh; key_exchange_t ke;
/** /**
* Get Diffie-Hellman context id. * Get Diffie-Hellman context id.
@@ -66,6 +66,6 @@ void destroy_dh_mapping();
* @param group Diffie Hellman group number to use * @param group Diffie Hellman group number to use
* @return tkm_diffie_hellman_t object, NULL if not supported * @return tkm_diffie_hellman_t object, NULL if not supported
*/ */
tkm_diffie_hellman_t *tkm_diffie_hellman_create(diffie_hellman_group_t group); tkm_diffie_hellman_t *tkm_diffie_hellman_create(key_exchange_method_t group);
#endif /** TKM_DIFFIE_HELLMAN_H_ @}*/ #endif /** TKM_DIFFIE_HELLMAN_H_ @}*/
src/charon-tkm/src/tkm/tkm_keymat.c
+9 -9
View File
@@ -82,10 +82,10 @@ METHOD(keymat_t, get_version, ike_version_t,
return IKEV2; return IKEV2;
} }
METHOD(keymat_t, create_dh, diffie_hellman_t*, METHOD(keymat_t, create_ke, key_exchange_t*,
private_tkm_keymat_t *this, diffie_hellman_group_t group) private_tkm_keymat_t *this, key_exchange_method_t ke)
{ {
return lib->crypto->create_dh(lib->crypto, group); return lib->crypto->create_ke(lib->crypto, ke);
} }
METHOD(keymat_t, create_nonce_gen, nonce_gen_t*, METHOD(keymat_t, create_nonce_gen, nonce_gen_t*,
@@ -95,7 +95,7 @@ METHOD(keymat_t, create_nonce_gen, nonce_gen_t*,
} }
METHOD(keymat_v2_t, derive_ike_keys, bool, METHOD(keymat_v2_t, derive_ike_keys, bool,
private_tkm_keymat_t *this, proposal_t *proposal, diffie_hellman_t *dh, private_tkm_keymat_t *this, proposal_t *proposal, key_exchange_t *ke,
chunk_t nonce_i, chunk_t nonce_r, ike_sa_id_t *id, chunk_t nonce_i, chunk_t nonce_r, ike_sa_id_t *id,
pseudo_random_function_t rekey_function, chunk_t rekey_skd) pseudo_random_function_t rekey_function, chunk_t rekey_skd)
{ {
@@ -119,7 +119,7 @@ METHOD(keymat_v2_t, derive_ike_keys, bool,
} }
/* Get DH context id */ /* Get DH context id */
tkm_dh = (tkm_diffie_hellman_t *)dh; tkm_dh = (tkm_diffie_hellman_t *)ke;
dh_id = tkm_dh->get_id(tkm_dh); dh_id = tkm_dh->get_id(tkm_dh);
if (this->initiator) if (this->initiator)
@@ -198,16 +198,16 @@ METHOD(keymat_v2_t, derive_ike_keys, bool,
} }
METHOD(keymat_v2_t, derive_child_keys, bool, METHOD(keymat_v2_t, derive_child_keys, bool,
private_tkm_keymat_t *this, proposal_t *proposal, diffie_hellman_t *dh, private_tkm_keymat_t *this, proposal_t *proposal, key_exchange_t *ke,
chunk_t nonce_i, chunk_t nonce_r, chunk_t *encr_i, chunk_t *integ_i, chunk_t nonce_i, chunk_t nonce_r, chunk_t *encr_i, chunk_t *integ_i,
chunk_t *encr_r, chunk_t *integ_r) chunk_t *encr_r, chunk_t *integ_r)
{ {
esa_info_t *esa_info_i, *esa_info_r; esa_info_t *esa_info_i, *esa_info_r;
dh_id_type dh_id = 0; dh_id_type dh_id = 0;
if (dh) if (ke)
{ {
dh_id = ((tkm_diffie_hellman_t *)dh)->get_id((tkm_diffie_hellman_t *)dh); dh_id = ((tkm_diffie_hellman_t *)ke)->get_id((tkm_diffie_hellman_t *)ke);
} }
INIT(esa_info_i, INIT(esa_info_i,
@@ -379,7 +379,7 @@ tkm_keymat_t *tkm_keymat_create(bool initiator)
.keymat_v2 = { .keymat_v2 = {
.keymat = { .keymat = {
.get_version = _get_version, .get_version = _get_version,
.create_dh = _create_dh, .create_ke = _create_ke,
.create_nonce_gen = _create_nonce_gen, .create_nonce_gen = _create_nonce_gen,
.get_aead = _get_aead, .get_aead = _get_aead,
.destroy = _destroy, .destroy = _destroy,
src/charon-tkm/tests/diffie_hellman_tests.c
+3 -3
View File
@@ -31,7 +31,7 @@ START_TEST(test_dh_creation)
fail_if(!dh, "MODP_4096 not created"); fail_if(!dh, "MODP_4096 not created");
fail_if(!dh->get_id(dh), "Invalid context id (0)"); fail_if(!dh->get_id(dh), "Invalid context id (0)");
dh->dh.destroy(&dh->dh); dh->ke.destroy(&dh->ke);
} }
END_TEST END_TEST
@@ -41,8 +41,8 @@ START_TEST(test_dh_get_my_pubvalue)
fail_if(!dh, "Unable to create DH"); fail_if(!dh, "Unable to create DH");
chunk_t value; chunk_t value;
ck_assert(dh->dh.get_my_public_value(&dh->dh, &value)); ck_assert(dh->ke.get_public_key(&dh->ke, &value));
dh->dh.destroy(&dh->dh); dh->ke.destroy(&dh->ke);
fail_if(value.ptr == NULL, "Pubvalue is NULL"); fail_if(value.ptr == NULL, "Pubvalue is NULL");
fail_if(value.len != 512, "Pubvalue size mismatch"); fail_if(value.len != 512, "Pubvalue size mismatch");
src/charon-tkm/tests/keymat_tests.c
+6 -6
View File
@@ -52,11 +52,11 @@ START_TEST(test_derive_ike_keys)
/* Use the same pubvalue for both sides */ /* Use the same pubvalue for both sides */
chunk_t pubvalue; chunk_t pubvalue;
ck_assert(dh->dh.get_my_public_value(&dh->dh, &pubvalue)); ck_assert(dh->ke.get_public_key(&dh->ke, &pubvalue));
ck_assert(dh->dh.set_other_public_value(&dh->dh, pubvalue)); ck_assert(dh->ke.set_public_key(&dh->ke, pubvalue));
fail_unless(keymat->keymat_v2.derive_ike_keys(&keymat->keymat_v2, proposal, fail_unless(keymat->keymat_v2.derive_ike_keys(&keymat->keymat_v2, proposal,
&dh->dh, nonce, nonce, ike_sa_id, PRF_UNDEFINED, chunk_empty), &dh->ke, nonce, nonce, ike_sa_id, PRF_UNDEFINED, chunk_empty),
"Key derivation failed"); "Key derivation failed");
chunk_free(&nonce); chunk_free(&nonce);
@@ -70,7 +70,7 @@ START_TEST(test_derive_ike_keys)
ng->nonce_gen.destroy(&ng->nonce_gen); ng->nonce_gen.destroy(&ng->nonce_gen);
proposal->destroy(proposal); proposal->destroy(proposal);
dh->dh.destroy(&dh->dh); dh->ke.destroy(&dh->ke);
ike_sa_id->destroy(ike_sa_id); ike_sa_id->destroy(ike_sa_id);
keymat->keymat_v2.keymat.destroy(&keymat->keymat_v2.keymat); keymat->keymat_v2.keymat.destroy(&keymat->keymat_v2.keymat);
chunk_free(&pubvalue); chunk_free(&pubvalue);
@@ -93,7 +93,7 @@ START_TEST(test_derive_child_keys)
chunk_t nonce = chunk_from_chars("test chunk"); chunk_t nonce = chunk_from_chars("test chunk");
fail_unless(keymat->keymat_v2.derive_child_keys(&keymat->keymat_v2, proposal, fail_unless(keymat->keymat_v2.derive_child_keys(&keymat->keymat_v2, proposal,
(diffie_hellman_t *)dh, &dh->ke,
nonce, nonce, &encr_i, nonce, nonce, &encr_i,
&integ_i, &encr_r, &integ_r), &integ_i, &encr_r, &integ_r),
"Child key derivation failed"); "Child key derivation failed");
@@ -133,7 +133,7 @@ START_TEST(test_derive_child_keys)
chunk_free(&info->nonce_r); chunk_free(&info->nonce_r);
proposal->destroy(proposal); proposal->destroy(proposal);
dh->dh.destroy(&dh->dh); dh->ke.destroy(&dh->ke);
keymat->keymat_v2.keymat.destroy(&keymat->keymat_v2.keymat); keymat->keymat_v2.keymat.destroy(&keymat->keymat_v2.keymat);
chunk_free(&encr_i); chunk_free(&encr_i);
chunk_free(&encr_r); chunk_free(&encr_r);
src/conftest/hooks/log_ke.c
+1 -1
View File
@@ -48,7 +48,7 @@ METHOD(listener_t, message, bool,
{ {
ke = (ke_payload_t*)payload; ke = (ke_payload_t*)payload;
DBG1(DBG_CFG, "received DH group %N", DBG1(DBG_CFG, "received DH group %N",
diffie_hellman_group_names, ke->get_dh_group_number(ke)); key_exchange_method_names, ke->get_key_exchange_method(ke));
} }
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
src/conftest/hooks/set_proposal_number.c
+1 -1
View File
@@ -110,7 +110,7 @@ METHOD(listener_t, message, bool,
copy_proposal_algs(proposal, new, ENCRYPTION_ALGORITHM); copy_proposal_algs(proposal, new, ENCRYPTION_ALGORITHM);
copy_proposal_algs(proposal, new, INTEGRITY_ALGORITHM); copy_proposal_algs(proposal, new, INTEGRITY_ALGORITHM);
copy_proposal_algs(proposal, new, PSEUDO_RANDOM_FUNCTION); copy_proposal_algs(proposal, new, PSEUDO_RANDOM_FUNCTION);
copy_proposal_algs(proposal, new, DIFFIE_HELLMAN_GROUP); copy_proposal_algs(proposal, new, KEY_EXCHANGE_METHOD);
copy_proposal_algs(proposal, new, EXTENDED_SEQUENCE_NUMBERS); copy_proposal_algs(proposal, new, EXTENDED_SEQUENCE_NUMBERS);
updated->insert_last(updated, new); updated->insert_last(updated, new);
} }
src/libcharon/bus/bus.c
+2 -2
View File
@@ -574,7 +574,7 @@ METHOD(bus_t, message, void,
} }
METHOD(bus_t, ike_keys, void, METHOD(bus_t, ike_keys, void,
private_bus_t *this, ike_sa_t *ike_sa, diffie_hellman_t *dh, private_bus_t *this, ike_sa_t *ike_sa, key_exchange_t *dh,
chunk_t dh_other, chunk_t nonce_i, chunk_t nonce_r, chunk_t dh_other, chunk_t nonce_i, chunk_t nonce_r,
ike_sa_t *rekey, shared_key_t *shared, auth_method_t method) ike_sa_t *rekey, shared_key_t *shared, auth_method_t method)
{ {
@@ -639,7 +639,7 @@ METHOD(bus_t, ike_derived_keys, void,
METHOD(bus_t, child_keys, void, METHOD(bus_t, child_keys, void,
private_bus_t *this, child_sa_t *child_sa, bool initiator, private_bus_t *this, child_sa_t *child_sa, bool initiator,
diffie_hellman_t *dh, chunk_t nonce_i, chunk_t nonce_r) key_exchange_t *dh, chunk_t nonce_i, chunk_t nonce_r)
{ {
enumerator_t *enumerator; enumerator_t *enumerator;
ike_sa_t *ike_sa; ike_sa_t *ike_sa;
src/libcharon/bus/bus.h
+2 -2
View File
@@ -356,7 +356,7 @@ struct bus_t {
* @param shared shared key used for key derivation (IKEv1-PSK only) * @param shared shared key used for key derivation (IKEv1-PSK only)
* @param method auth method for key derivation (IKEv1-non-PSK only) * @param method auth method for key derivation (IKEv1-non-PSK only)
*/ */
void (*ike_keys)(bus_t *this, ike_sa_t *ike_sa, diffie_hellman_t *dh, void (*ike_keys)(bus_t *this, ike_sa_t *ike_sa, key_exchange_t *dh,
chunk_t dh_other, chunk_t nonce_i, chunk_t nonce_r, chunk_t dh_other, chunk_t nonce_i, chunk_t nonce_r,
ike_sa_t *rekey, shared_key_t *shared, ike_sa_t *rekey, shared_key_t *shared,
auth_method_t method); auth_method_t method);
@@ -386,7 +386,7 @@ struct bus_t {
* @param nonce_r responder's nonce * @param nonce_r responder's nonce
*/ */
void (*child_keys)(bus_t *this, child_sa_t *child_sa, bool initiator, void (*child_keys)(bus_t *this, child_sa_t *child_sa, bool initiator,
diffie_hellman_t *dh, chunk_t nonce_i, chunk_t nonce_r); key_exchange_t *dh, chunk_t nonce_i, chunk_t nonce_r);
/** /**
* CHILD_SA derived keys hook. * CHILD_SA derived keys hook.
src/libcharon/bus/listeners/listener.h
+2 -2
View File
@@ -92,7 +92,7 @@ struct listener_t {
* @param method auth method for key derivation (IKEv1-non-PSK only) * @param method auth method for key derivation (IKEv1-non-PSK only)
* @return TRUE to stay registered, FALSE to unregister * @return TRUE to stay registered, FALSE to unregister
*/ */
bool (*ike_keys)(listener_t *this, ike_sa_t *ike_sa, diffie_hellman_t *dh, bool (*ike_keys)(listener_t *this, ike_sa_t *ike_sa, key_exchange_t *dh,
chunk_t dh_other, chunk_t nonce_i, chunk_t nonce_r, chunk_t dh_other, chunk_t nonce_i, chunk_t nonce_r,
ike_sa_t *rekey, shared_key_t *shared, ike_sa_t *rekey, shared_key_t *shared,
auth_method_t method); auth_method_t method);
@@ -125,7 +125,7 @@ struct listener_t {
* @return TRUE to stay registered, FALSE to unregister * @return TRUE to stay registered, FALSE to unregister
*/ */
bool (*child_keys)(listener_t *this, ike_sa_t *ike_sa, child_sa_t *child_sa, bool (*child_keys)(listener_t *this, ike_sa_t *ike_sa, child_sa_t *child_sa,
bool initiator, diffie_hellman_t *dh, bool initiator, key_exchange_t *dh,
chunk_t nonce_i, chunk_t nonce_r); chunk_t nonce_i, chunk_t nonce_r);
/** /**
src/libcharon/config/child_cfg.c
+9 -8
View File
@@ -216,16 +216,16 @@ CALLBACK(match_proposal, bool,
} }
METHOD(child_cfg_t, get_proposals, linked_list_t*, METHOD(child_cfg_t, get_proposals, linked_list_t*,
private_child_cfg_t *this, bool strip_dh) private_child_cfg_t *this, bool strip_ke)
{ {
enumerator_t *enumerator; enumerator_t *enumerator;
proposal_t *current; proposal_t *current;
proposal_selection_flag_t flags = 0; proposal_selection_flag_t flags = 0;
linked_list_t *proposals = linked_list_create(); linked_list_t *proposals = linked_list_create();
if (strip_dh) if (strip_ke)
{ {
flags |= PROPOSAL_SKIP_DH; flags |= PROPOSAL_SKIP_KE;
} }
enumerator = this->proposals->create_enumerator(this->proposals); enumerator = this->proposals->create_enumerator(this->proposals);
@@ -484,23 +484,24 @@ METHOD(child_cfg_t, get_close_action, action_t,
return this->close_action; return this->close_action;
} }
METHOD(child_cfg_t, get_dh_group, diffie_hellman_group_t, METHOD(child_cfg_t, get_ke_method, key_exchange_method_t,
private_child_cfg_t *this) private_child_cfg_t *this)
{ {
enumerator_t *enumerator; enumerator_t *enumerator;
proposal_t *proposal; proposal_t *proposal;
uint16_t dh_group = MODP_NONE; uint16_t method = MODP_NONE;
enumerator = this->proposals->create_enumerator(this->proposals); enumerator = this->proposals->create_enumerator(this->proposals);
while (enumerator->enumerate(enumerator, &proposal)) while (enumerator->enumerate(enumerator, &proposal))
{ {
if (proposal->get_algorithm(proposal, DIFFIE_HELLMAN_GROUP, &dh_group, NULL)) if (proposal->get_algorithm(proposal, KEY_EXCHANGE_METHOD, &method,
NULL))
{ {
break; break;
} }
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
return dh_group; return method;
} }
METHOD(child_cfg_t, get_inactivity, uint32_t, METHOD(child_cfg_t, get_inactivity, uint32_t,
@@ -758,7 +759,7 @@ child_cfg_t *child_cfg_create(char *name, child_cfg_create_t *data)
.get_dpd_action = _get_dpd_action, .get_dpd_action = _get_dpd_action,
.get_close_action = _get_close_action, .get_close_action = _get_close_action,
.get_lifetime = _get_lifetime, .get_lifetime = _get_lifetime,
.get_dh_group = _get_dh_group, .get_ke_method = _get_ke_method,
.get_inactivity = _get_inactivity, .get_inactivity = _get_inactivity,
.get_reqid = _get_reqid, .get_reqid = _get_reqid,
.get_if_id = _get_if_id, .get_if_id = _get_if_id,
src/libcharon/config/child_cfg.h
+5 -5
View File
@@ -89,10 +89,10 @@ struct child_cfg_t {
* *
* Resulting list and all of its proposals must be freed after use. * Resulting list and all of its proposals must be freed after use.
* *
* @param strip_dh TRUE strip out diffie hellman groups * @param strip_ke TRUE strip out key exchange methods
* @return list of proposals * @return list of proposals
*/ */
linked_list_t* (*get_proposals)(child_cfg_t *this, bool strip_dh); linked_list_t* (*get_proposals)(child_cfg_t *this, bool strip_ke);
/** /**
* Select a proposal from a supplied list. * Select a proposal from a supplied list.
@@ -204,11 +204,11 @@ struct child_cfg_t {
action_t (*get_close_action) (child_cfg_t *this); action_t (*get_close_action) (child_cfg_t *this);
/** /**
* Get the DH group to use for CHILD_SA setup. * Get the key exchange method to use for CHILD_SA setup.
* *
* @return dh group to use * @return key exchange method to use
*/ */
diffie_hellman_group_t (*get_dh_group)(child_cfg_t *this); key_exchange_method_t (*get_ke_method)(child_cfg_t *this);
/** /**
* Get the inactivity timeout value. * Get the inactivity timeout value.
src/libcharon/config/ike_cfg.c
+6 -5
View File
@@ -348,23 +348,24 @@ METHOD(ike_cfg_t, select_proposal, proposal_t*,
return proposal_select(this->proposals, proposals, flags); return proposal_select(this->proposals, proposals, flags);
} }
METHOD(ike_cfg_t, get_dh_group, diffie_hellman_group_t, METHOD(ike_cfg_t, get_ke_method, key_exchange_method_t,
private_ike_cfg_t *this) private_ike_cfg_t *this)
{ {
enumerator_t *enumerator; enumerator_t *enumerator;
proposal_t *proposal; proposal_t *proposal;
uint16_t dh_group = MODP_NONE; uint16_t method = MODP_NONE;
enumerator = this->proposals->create_enumerator(this->proposals); enumerator = this->proposals->create_enumerator(this->proposals);
while (enumerator->enumerate(enumerator, &proposal)) while (enumerator->enumerate(enumerator, &proposal))
{ {
if (proposal->get_algorithm(proposal, DIFFIE_HELLMAN_GROUP, &dh_group, NULL)) if (proposal->get_algorithm(proposal, KEY_EXCHANGE_METHOD, &method,
NULL))
{ {
break; break;
} }
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
return dh_group; return method;
} }
METHOD(ike_cfg_t, equals, bool, METHOD(ike_cfg_t, equals, bool,
@@ -603,7 +604,7 @@ ike_cfg_t *ike_cfg_create(ike_cfg_create_t *data)
.get_proposals = _get_proposals, .get_proposals = _get_proposals,
.select_proposal = _select_proposal, .select_proposal = _select_proposal,
.has_proposal = _has_proposal, .has_proposal = _has_proposal,
.get_dh_group = _get_dh_group, .get_ke_method = _get_ke_method,
.equals = _equals, .equals = _equals,
.get_ref = _get_ref, .get_ref = _get_ref,
.destroy = _destroy, .destroy = _destroy,
src/libcharon/config/ike_cfg.h
+4 -4
View File
@@ -35,7 +35,7 @@ typedef struct ike_cfg_create_t ike_cfg_create_t;
#include <collections/linked_list.h> #include <collections/linked_list.h>
#include <utils/identification.h> #include <utils/identification.h>
#include <crypto/proposal/proposal.h> #include <crypto/proposal/proposal.h>
#include <crypto/diffie_hellman.h> #include <crypto/key_exchange.h>
/** /**
* IKE version. * IKE version.
@@ -231,11 +231,11 @@ struct ike_cfg_t {
childless_t (*childless)(ike_cfg_t *this); childless_t (*childless)(ike_cfg_t *this);
/** /**
* Get the DH group to use for IKE_SA setup. * Get the key exchange method to use for IKE_SA setup.
* *
* @return dh group to use for initialization * @return key exchange method to use for initialization
*/ */
diffie_hellman_group_t (*get_dh_group)(ike_cfg_t *this); key_exchange_method_t (*get_ke_method)(ike_cfg_t *this);
/** /**
* Check if two IKE configs are equal. * Check if two IKE configs are equal.
src/libcharon/encoding/payloads/ke_payload.c
+13 -13
View File
@@ -59,9 +59,9 @@ struct private_ke_payload_t {
uint16_t payload_length; uint16_t payload_length;
/** /**
* DH Group Number. * Key exchange method number.
*/ */
uint16_t dh_group_number; uint16_t ke_method;
/** /**
* Key Exchange Data of this KE payload. * Key Exchange Data of this KE payload.
@@ -92,8 +92,8 @@ static encoding_rule_t encodings_v2[] = {
{ RESERVED_BIT, offsetof(private_ke_payload_t, reserved_bit[6]) }, { RESERVED_BIT, offsetof(private_ke_payload_t, reserved_bit[6]) },
/* Length of the whole payload*/ /* Length of the whole payload*/
{ PAYLOAD_LENGTH, offsetof(private_ke_payload_t, payload_length) }, { PAYLOAD_LENGTH, offsetof(private_ke_payload_t, payload_length) },
/* DH Group number as 16 bit field*/ /* Key exchange method number as 16 bit field*/
{ U_INT_16, offsetof(private_ke_payload_t, dh_group_number) }, { U_INT_16, offsetof(private_ke_payload_t, ke_method) },
/* 2 reserved bytes */ /* 2 reserved bytes */
{ RESERVED_BYTE, offsetof(private_ke_payload_t, reserved_byte[0])}, { RESERVED_BYTE, offsetof(private_ke_payload_t, reserved_byte[0])},
{ RESERVED_BYTE, offsetof(private_ke_payload_t, reserved_byte[1])}, { RESERVED_BYTE, offsetof(private_ke_payload_t, reserved_byte[1])},
@@ -107,7 +107,7 @@ static encoding_rule_t encodings_v2[] = {
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
! Next Payload !C! RESERVED ! Payload Length ! ! Next Payload !C! RESERVED ! Payload Length !
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
! DH Group # ! RESERVED ! ! KE method # ! RESERVED !
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
! ! ! !
~ Key Exchange Data ~ ~ Key Exchange Data ~
@@ -197,10 +197,10 @@ METHOD(ke_payload_t, get_key_exchange_data, chunk_t,
return this->key_exchange_data; return this->key_exchange_data;
} }
METHOD(ke_payload_t, get_dh_group_number, diffie_hellman_group_t, METHOD(ke_payload_t, get_key_exchange_method, key_exchange_method_t,
private_ke_payload_t *this) private_ke_payload_t *this)
{ {
return this->dh_group_number; return this->ke_method;
} }
METHOD2(payload_t, ke_payload_t, destroy, void, METHOD2(payload_t, ke_payload_t, destroy, void,
@@ -230,11 +230,11 @@ ke_payload_t *ke_payload_create(payload_type_t type)
.destroy = _destroy, .destroy = _destroy,
}, },
.get_key_exchange_data = _get_key_exchange_data, .get_key_exchange_data = _get_key_exchange_data,
.get_dh_group_number = _get_dh_group_number, .get_key_exchange_method = _get_key_exchange_method,
.destroy = _destroy, .destroy = _destroy,
}, },
.next_payload = PL_NONE, .next_payload = PL_NONE,
.dh_group_number = MODP_NONE, .ke_method = MODP_NONE,
.type = type, .type = type,
); );
this->payload_length = get_header_length(this); this->payload_length = get_header_length(this);
@@ -244,19 +244,19 @@ ke_payload_t *ke_payload_create(payload_type_t type)
/* /*
* Described in header * Described in header
*/ */
ke_payload_t *ke_payload_create_from_diffie_hellman(payload_type_t type, ke_payload_t *ke_payload_create_from_key_exchange(payload_type_t type,
diffie_hellman_t *dh) key_exchange_t *ke)
{ {
private_ke_payload_t *this; private_ke_payload_t *this;
chunk_t value; chunk_t value;
if (!dh->get_my_public_value(dh, &value)) if (!ke->get_public_key(ke, &value))
{ {
return NULL; return NULL;
} }
this = (private_ke_payload_t*)ke_payload_create(type); this = (private_ke_payload_t*)ke_payload_create(type);
this->key_exchange_data = value; this->key_exchange_data = value;
this->dh_group_number = dh->get_dh_group(dh); this->ke_method = ke->get_method(ke);
this->payload_length += this->key_exchange_data.len; this->payload_length += this->key_exchange_data.len;
return &this->public; return &this->public;
src/libcharon/encoding/payloads/ke_payload.h
+8 -8
View File
@@ -29,7 +29,7 @@ typedef struct ke_payload_t ke_payload_t;
#include <encoding/payloads/payload.h> #include <encoding/payloads/payload.h>
#include <encoding/payloads/transform_substructure.h> #include <encoding/payloads/transform_substructure.h>
#include <collections/linked_list.h> #include <collections/linked_list.h>
#include <crypto/diffie_hellman.h> #include <crypto/key_exchange.h>
/** /**
* Class representing an IKEv1 or IKEv2 key exchange payload. * Class representing an IKEv1 or IKEv2 key exchange payload.
@@ -49,11 +49,11 @@ struct ke_payload_t {
chunk_t (*get_key_exchange_data) (ke_payload_t *this); chunk_t (*get_key_exchange_data) (ke_payload_t *this);
/** /**
* Gets the Diffie-Hellman Group Number of this KE payload (IKEv2 only). * Gets the key exchange method of this KE payload (IKEv2 only).
* *
* @return DH Group Number of this payload * @return key exchange method of this payload
*/ */
diffie_hellman_group_t (*get_dh_group_number) (ke_payload_t *this); key_exchange_method_t (*get_key_exchange_method)(ke_payload_t *this);
/** /**
* Destroys a ke_payload_t object. * Destroys a ke_payload_t object.
@@ -70,13 +70,13 @@ struct ke_payload_t {
ke_payload_t *ke_payload_create(payload_type_t type); ke_payload_t *ke_payload_create(payload_type_t type);
/** /**
* Creates a ke_payload_t from a diffie_hellman_t. * Creates a ke_payload_t from a key_exchange_t.
* *
* @param type PLV2_KEY_EXCHANGE or PLV1_KEY_EXCHANGE * @param type PLV2_KEY_EXCHANGE or PLV1_KEY_EXCHANGE
* @param dh diffie hellman object containing group and key * @param ke key exchange object containing method and public key
* @return ke_payload_t object, NULL on error * @return ke_payload_t object, NULL on error
*/ */
ke_payload_t *ke_payload_create_from_diffie_hellman(payload_type_t type, ke_payload_t *ke_payload_create_from_key_exchange(payload_type_t type,
diffie_hellman_t *dh); key_exchange_t *ke);
#endif /** KE_PAYLOAD_H_ @}*/ #endif /** KE_PAYLOAD_H_ @}*/
src/libcharon/encoding/payloads/proposal_substructure.c
+6 -6
View File
@@ -904,7 +904,7 @@ static void add_to_proposal_v1_ike(proposal_t *proposal,
get_alg_from_ikev1(PSEUDO_RANDOM_FUNCTION, value), 0); get_alg_from_ikev1(PSEUDO_RANDOM_FUNCTION, value), 0);
break; break;
case TATTR_PH1_GROUP: case TATTR_PH1_GROUP:
proposal->add_algorithm(proposal, DIFFIE_HELLMAN_GROUP, proposal->add_algorithm(proposal, KEY_EXCHANGE_METHOD,
value, 0); value, 0);
break; break;
default: default:
@@ -951,7 +951,7 @@ static void add_to_proposal_v1(proposal_t *proposal,
get_alg_from_ikev1_auth(value), 0); get_alg_from_ikev1_auth(value), 0);
break; break;
case TATTR_PH2_GROUP: case TATTR_PH2_GROUP:
proposal->add_algorithm(proposal, DIFFIE_HELLMAN_GROUP, proposal->add_algorithm(proposal, KEY_EXCHANGE_METHOD,
value, 0); value, 0);
break; break;
case TATTR_PH2_EXT_SEQ_NUMBER: case TATTR_PH2_EXT_SEQ_NUMBER:
@@ -1318,7 +1318,7 @@ static void set_from_proposal_v1_ike(private_proposal_substructure_t *this,
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
enumerator = proposal->create_enumerator(proposal, DIFFIE_HELLMAN_GROUP); enumerator = proposal->create_enumerator(proposal, KEY_EXCHANGE_METHOD);
if (enumerator->enumerate(enumerator, &alg, &key_size)) if (enumerator->enumerate(enumerator, &alg, &key_size))
{ {
transform->add_transform_attribute(transform, transform->add_transform_attribute(transform,
@@ -1396,7 +1396,7 @@ static void set_from_proposal_v1(private_proposal_substructure_t *this,
return; return;
} }
enumerator = proposal->create_enumerator(proposal, DIFFIE_HELLMAN_GROUP); enumerator = proposal->create_enumerator(proposal, KEY_EXCHANGE_METHOD);
if (enumerator->enumerate(enumerator, &alg, &key_size)) if (enumerator->enumerate(enumerator, &alg, &key_size))
{ {
transform->add_transform_attribute(transform, transform->add_transform_attribute(transform,
@@ -1489,11 +1489,11 @@ static void set_from_proposal_v2(private_proposal_substructure_t *this,
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
/* dh groups */ /* dh groups */
enumerator = proposal->create_enumerator(proposal, DIFFIE_HELLMAN_GROUP); enumerator = proposal->create_enumerator(proposal, KEY_EXCHANGE_METHOD);
while (enumerator->enumerate(enumerator, &alg, NULL)) while (enumerator->enumerate(enumerator, &alg, NULL))
{ {
transform = transform_substructure_create_type(PLV2_TRANSFORM_SUBSTRUCTURE, transform = transform_substructure_create_type(PLV2_TRANSFORM_SUBSTRUCTURE,
DIFFIE_HELLMAN_GROUP, alg); KEY_EXCHANGE_METHOD, alg);
add_transform_substructure(this, transform); add_transform_substructure(this, transform);
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
src/libcharon/encoding/payloads/transform_substructure.h
+1 -1
View File
@@ -29,7 +29,7 @@ typedef struct transform_substructure_t transform_substructure_t;
#include <encoding/payloads/payload.h> #include <encoding/payloads/payload.h>
#include <encoding/payloads/transform_attribute.h> #include <encoding/payloads/transform_attribute.h>
#include <collections/linked_list.h> #include <collections/linked_list.h>
#include <crypto/diffie_hellman.h> #include <crypto/key_exchange.h>
#include <crypto/signers/signer.h> #include <crypto/signers/signer.h>
#include <crypto/prfs/prf.h> #include <crypto/prfs/prf.h>
#include <crypto/crypters/crypter.h> #include <crypto/crypters/crypter.h>
src/libcharon/plugins/ha/ha_child.c
+2 -2
View File
@@ -51,7 +51,7 @@ struct private_ha_child_t {
METHOD(listener_t, child_keys, bool, METHOD(listener_t, child_keys, bool,
private_ha_child_t *this, ike_sa_t *ike_sa, child_sa_t *child_sa, private_ha_child_t *this, ike_sa_t *ike_sa, child_sa_t *child_sa,
bool initiator, diffie_hellman_t *dh, chunk_t nonce_i, chunk_t nonce_r) bool initiator, key_exchange_t *dh, chunk_t nonce_i, chunk_t nonce_r)
{ {
ha_message_t *m; ha_message_t *m;
chunk_t secret; chunk_t secret;
@@ -92,7 +92,7 @@ METHOD(listener_t, child_keys, bool,
{ {
m->add_attribute(m, HA_ALG_INTEG, alg); m->add_attribute(m, HA_ALG_INTEG, alg);
} }
if (proposal->get_algorithm(proposal, DIFFIE_HELLMAN_GROUP, &alg, NULL)) if (proposal->get_algorithm(proposal, KEY_EXCHANGE_METHOD, &alg, NULL))
{ {
m->add_attribute(m, HA_ALG_DH, alg); m->add_attribute(m, HA_ALG_DH, alg);
} }
src/libcharon/plugins/ha/ha_dispatcher.c
+11 -11
View File
@@ -67,9 +67,9 @@ struct private_ha_dispatcher_t {
struct ha_diffie_hellman_t { struct ha_diffie_hellman_t {
/** /**
* Implements diffie_hellman_t * Implements key_exchange_t
*/ */
diffie_hellman_t dh; key_exchange_t dh;
/** /**
* Shared secret * Shared secret
@@ -82,21 +82,21 @@ struct ha_diffie_hellman_t {
chunk_t pub; chunk_t pub;
}; };
METHOD(diffie_hellman_t, dh_get_shared_secret, bool, METHOD(key_exchange_t, dh_get_shared_secret, bool,
ha_diffie_hellman_t *this, chunk_t *secret) ha_diffie_hellman_t *this, chunk_t *secret)
{ {
*secret = chunk_clone(this->secret); *secret = chunk_clone(this->secret);
return TRUE; return TRUE;
} }
METHOD(diffie_hellman_t, dh_get_my_public_value, bool, METHOD(key_exchange_t, dh_get_public_key, bool,
ha_diffie_hellman_t *this, chunk_t *value) ha_diffie_hellman_t *this, chunk_t *value)
{ {
*value = chunk_clone(this->pub); *value = chunk_clone(this->pub);
return TRUE; return TRUE;
} }
METHOD(diffie_hellman_t, dh_destroy, void, METHOD(key_exchange_t, dh_destroy, void,
ha_diffie_hellman_t *this) ha_diffie_hellman_t *this)
{ {
free(this); free(this);
@@ -105,14 +105,14 @@ METHOD(diffie_hellman_t, dh_destroy, void,
/** /**
* Create a HA synced DH implementation * Create a HA synced DH implementation
*/ */
static diffie_hellman_t *ha_diffie_hellman_create(chunk_t secret, chunk_t pub) static key_exchange_t *ha_diffie_hellman_create(chunk_t secret, chunk_t pub)
{ {
ha_diffie_hellman_t *this; ha_diffie_hellman_t *this;
INIT(this, INIT(this,
.dh = { .dh = {
.get_shared_secret = _dh_get_shared_secret, .get_shared_secret = _dh_get_shared_secret,
.get_my_public_value = _dh_get_my_public_value, .get_public_key = _dh_get_public_key,
.destroy = _dh_destroy, .destroy = _dh_destroy,
}, },
.secret = secret, .secret = secret,
@@ -210,7 +210,7 @@ static void process_ike_add(private_ha_dispatcher_t *this, ha_message_t *message
if (ike_sa) if (ike_sa)
{ {
proposal_t *proposal; proposal_t *proposal;
diffie_hellman_t *dh; key_exchange_t *dh;
proposal = proposal_create(PROTO_IKE, 0); proposal = proposal_create(PROTO_IKE, 0);
if (integ) if (integ)
@@ -227,7 +227,7 @@ static void process_ike_add(private_ha_dispatcher_t *this, ha_message_t *message
} }
if (dh_grp) if (dh_grp)
{ {
proposal->add_algorithm(proposal, DIFFIE_HELLMAN_GROUP, dh_grp, 0); proposal->add_algorithm(proposal, KEY_EXCHANGE_METHOD, dh_grp, 0);
} }
charon->bus->set_sa(charon->bus, ike_sa); charon->bus->set_sa(charon->bus, ike_sa);
dh = ha_diffie_hellman_create(secret, dh_local); dh = ha_diffie_hellman_create(secret, dh_local);
@@ -662,7 +662,7 @@ static void process_child_add(private_ha_dispatcher_t *this,
chunk_t nonce_i = chunk_empty, nonce_r = chunk_empty, secret = chunk_empty; chunk_t nonce_i = chunk_empty, nonce_r = chunk_empty, secret = chunk_empty;
chunk_t encr_i, integ_i, encr_r, integ_r; chunk_t encr_i, integ_i, encr_r, integ_r;
linked_list_t *local_ts, *remote_ts; linked_list_t *local_ts, *remote_ts;
diffie_hellman_t *dh = NULL; key_exchange_t *dh = NULL;
enumerator = message->create_attribute_enumerator(message); enumerator = message->create_attribute_enumerator(message);
while (enumerator->enumerate(enumerator, &attribute, &value)) while (enumerator->enumerate(enumerator, &attribute, &value))
@@ -762,7 +762,7 @@ static void process_child_add(private_ha_dispatcher_t *this,
} }
if (dh_grp) if (dh_grp)
{ {
proposal->add_algorithm(proposal, DIFFIE_HELLMAN_GROUP, dh_grp, 0); proposal->add_algorithm(proposal, KEY_EXCHANGE_METHOD, dh_grp, 0);
} }
proposal->add_algorithm(proposal, EXTENDED_SEQUENCE_NUMBERS, esn, 0); proposal->add_algorithm(proposal, EXTENDED_SEQUENCE_NUMBERS, esn, 0);
if (secret.len) if (secret.len)
src/libcharon/plugins/ha/ha_ike.c
+3 -3
View File
@@ -82,7 +82,7 @@ static void copy_extensions(ha_message_t *m, ike_sa_t *ike_sa)
} }
METHOD(listener_t, ike_keys, bool, METHOD(listener_t, ike_keys, bool,
private_ha_ike_t *this, ike_sa_t *ike_sa, diffie_hellman_t *dh, private_ha_ike_t *this, ike_sa_t *ike_sa, key_exchange_t *dh,
chunk_t dh_other, chunk_t nonce_i, chunk_t nonce_r, ike_sa_t *rekey, chunk_t dh_other, chunk_t nonce_i, chunk_t nonce_r, ike_sa_t *rekey,
shared_key_t *shared, auth_method_t method) shared_key_t *shared, auth_method_t method)
{ {
@@ -132,7 +132,7 @@ METHOD(listener_t, ike_keys, bool,
{ {
m->add_attribute(m, HA_ALG_PRF, alg); m->add_attribute(m, HA_ALG_PRF, alg);
} }
if (proposal->get_algorithm(proposal, DIFFIE_HELLMAN_GROUP, &alg, NULL)) if (proposal->get_algorithm(proposal, KEY_EXCHANGE_METHOD, &alg, NULL))
{ {
m->add_attribute(m, HA_ALG_DH, alg); m->add_attribute(m, HA_ALG_DH, alg);
} }
@@ -142,7 +142,7 @@ METHOD(listener_t, ike_keys, bool,
chunk_clear(&secret); chunk_clear(&secret);
if (ike_sa->get_version(ike_sa) == IKEV1) if (ike_sa->get_version(ike_sa) == IKEV1)
{ {
if (dh->get_my_public_value(dh, &secret)) if (dh->get_public_key(dh, &secret))
{ {
m->add_attribute(m, HA_LOCAL_DH, secret); m->add_attribute(m, HA_LOCAL_DH, secret);
chunk_free(&secret); chunk_free(&secret);
src/libcharon/plugins/load_tester/load_tester_diffie_hellman.c
+10 -10
View File
@@ -16,33 +16,33 @@
#include "load_tester_diffie_hellman.h" #include "load_tester_diffie_hellman.h"
METHOD(diffie_hellman_t, get_my_public_value, bool, METHOD(key_exchange_t, get_public_key, bool,
load_tester_diffie_hellman_t *this, chunk_t *value) load_tester_diffie_hellman_t *this, chunk_t *value)
{ {
*value = chunk_empty; *value = chunk_empty;
return TRUE; return TRUE;
} }
METHOD(diffie_hellman_t, set_other_public_value, bool, METHOD(key_exchange_t, set_public_key, bool,
load_tester_diffie_hellman_t *this, chunk_t value) load_tester_diffie_hellman_t *this, chunk_t value)
{ {
return TRUE; return TRUE;
} }
METHOD(diffie_hellman_t, get_shared_secret, bool, METHOD(key_exchange_t, get_shared_secret, bool,
load_tester_diffie_hellman_t *this, chunk_t *secret) load_tester_diffie_hellman_t *this, chunk_t *secret)
{ {
*secret = chunk_empty; *secret = chunk_empty;
return TRUE; return TRUE;
} }
METHOD(diffie_hellman_t, get_dh_group, diffie_hellman_group_t, METHOD(key_exchange_t, get_method, key_exchange_method_t,
load_tester_diffie_hellman_t *this) load_tester_diffie_hellman_t *this)
{ {
return MODP_NULL; return MODP_NULL;
} }
METHOD(diffie_hellman_t, destroy, void, METHOD(key_exchange_t, destroy, void,
load_tester_diffie_hellman_t *this) load_tester_diffie_hellman_t *this)
{ {
free(this); free(this);
@@ -52,7 +52,7 @@ METHOD(diffie_hellman_t, destroy, void,
* See header * See header
*/ */
load_tester_diffie_hellman_t *load_tester_diffie_hellman_create( load_tester_diffie_hellman_t *load_tester_diffie_hellman_create(
diffie_hellman_group_t group) key_exchange_method_t group)
{ {
load_tester_diffie_hellman_t *this; load_tester_diffie_hellman_t *this;
@@ -62,11 +62,11 @@ load_tester_diffie_hellman_t *load_tester_diffie_hellman_create(
} }
INIT(this, INIT(this,
.dh = { .ke = {
.get_shared_secret = _get_shared_secret, .get_shared_secret = _get_shared_secret,
.set_other_public_value = _set_other_public_value, .set_public_key = _set_public_key,
.get_my_public_value = _get_my_public_value, .get_public_key = _get_public_key,
.get_dh_group = _get_dh_group, .get_method = _get_method,
.destroy = _destroy, .destroy = _destroy,
} }
); );
src/libcharon/plugins/load_tester/load_tester_diffie_hellman.h
+6 -6
View File
@@ -22,7 +22,7 @@
#ifndef LOAD_TESTER_DIFFIE_HELLMAN_H_ #ifndef LOAD_TESTER_DIFFIE_HELLMAN_H_
#define LOAD_TESTER_DIFFIE_HELLMAN_H_ #define LOAD_TESTER_DIFFIE_HELLMAN_H_
#include <crypto/diffie_hellman.h> #include <crypto/key_exchange.h>
typedef struct load_tester_diffie_hellman_t load_tester_diffie_hellman_t; typedef struct load_tester_diffie_hellman_t load_tester_diffie_hellman_t;
@@ -32,18 +32,18 @@ typedef struct load_tester_diffie_hellman_t load_tester_diffie_hellman_t;
struct load_tester_diffie_hellman_t { struct load_tester_diffie_hellman_t {
/** /**
* Implements diffie_hellman_t interface. * Implements key_exchange_t interface.
*/ */
diffie_hellman_t dh; key_exchange_t ke;
}; };
/** /**
* Creates a new gmp_diffie_hellman_t object. * Creates a new load_tester_diffie_hellman_t object.
* *
* @param group Diffie Hellman group, supports MODP_NULL only * @param group Diffie Hellman group, supports MODP_NULL only
* @return gmp_diffie_hellman_t object * @return load_tester_diffie_hellman_t object
*/ */
load_tester_diffie_hellman_t *load_tester_diffie_hellman_create( load_tester_diffie_hellman_t *load_tester_diffie_hellman_create(
diffie_hellman_group_t group); key_exchange_method_t group);
#endif /** LOAD_TESTER_DIFFIE_HELLMAN_H_ @}*/ #endif /** LOAD_TESTER_DIFFIE_HELLMAN_H_ @}*/
src/libcharon/plugins/load_tester/load_tester_plugin.c
+2 -2
View File
@@ -231,8 +231,8 @@ METHOD(plugin_t, get_features, int,
private_load_tester_plugin_t *this, plugin_feature_t *features[]) private_load_tester_plugin_t *this, plugin_feature_t *features[])
{ {
static plugin_feature_t f[] = { static plugin_feature_t f[] = {
PLUGIN_REGISTER(DH, load_tester_diffie_hellman_create), PLUGIN_REGISTER(KE, load_tester_diffie_hellman_create),
PLUGIN_PROVIDE(DH, MODP_NULL), PLUGIN_PROVIDE(KE, MODP_NULL),
PLUGIN_DEPENDS(CUSTOM, "load-tester"), PLUGIN_DEPENDS(CUSTOM, "load-tester"),
PLUGIN_CALLBACK((plugin_feature_callback_t)register_load_tester, NULL), PLUGIN_CALLBACK((plugin_feature_callback_t)register_load_tester, NULL),
PLUGIN_PROVIDE(CUSTOM, "load-tester"), PLUGIN_PROVIDE(CUSTOM, "load-tester"),
src/libcharon/plugins/stroke/stroke_list.c
+5 -5
View File
@@ -266,10 +266,10 @@ static void log_child_sa(FILE *out, child_sa_t *child_sa, bool all)
fprintf(out, "_%u", ks); fprintf(out, "_%u", ks);
} }
} }
if (proposal->get_algorithm(proposal, DIFFIE_HELLMAN_GROUP, if (proposal->get_algorithm(proposal, KEY_EXCHANGE_METHOD,
&alg, NULL)) &alg, NULL))
{ {
fprintf(out, "/%N", diffie_hellman_group_names, alg); fprintf(out, "/%N", key_exchange_method_names, alg);
} }
if (proposal->get_algorithm(proposal, EXTENDED_SEQUENCE_NUMBERS, if (proposal->get_algorithm(proposal, EXTENDED_SEQUENCE_NUMBERS,
&alg, NULL) && alg == EXT_SEQ_NUMBERS) &alg, NULL) && alg == EXT_SEQ_NUMBERS)
@@ -855,7 +855,7 @@ static void list_algs(FILE *out)
ext_out_function_t xof; ext_out_function_t xof;
key_derivation_function_t kdf; key_derivation_function_t kdf;
drbg_type_t drbg; drbg_type_t drbg;
diffie_hellman_group_t group; key_exchange_method_t group;
rng_quality_t quality; rng_quality_t quality;
const char *plugin_name; const char *plugin_name;
int len; int len;
@@ -928,10 +928,10 @@ static void list_algs(FILE *out)
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
fprintf(out, "\n dh-group: "); fprintf(out, "\n dh-group: ");
len = 13; len = 13;
enumerator = lib->crypto->create_dh_enumerator(lib->crypto); enumerator = lib->crypto->create_ke_enumerator(lib->crypto);
while (enumerator->enumerate(enumerator, &group, &plugin_name)) while (enumerator->enumerate(enumerator, &group, &plugin_name))
{ {
print_alg(out, &len, diffie_hellman_group_names, group, plugin_name); print_alg(out, &len, key_exchange_method_names, group, plugin_name);
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
fprintf(out, "\n random-gen:"); fprintf(out, "\n random-gen:");
src/libcharon/plugins/vici/vici_query.c
+7 -7
View File
@@ -230,10 +230,10 @@ static void list_child_ipsec(vici_builder_t *b, child_sa_t *child)
b->add_kv(b, "integ-keysize", "%u", ks); b->add_kv(b, "integ-keysize", "%u", ks);
} }
} }
if (proposal->get_algorithm(proposal, DIFFIE_HELLMAN_GROUP, if (proposal->get_algorithm(proposal, KEY_EXCHANGE_METHOD,
&alg, NULL)) &alg, NULL))
{ {
b->add_kv(b, "dh-group", "%N", diffie_hellman_group_names, alg); b->add_kv(b, "dh-group", "%N", key_exchange_method_names, alg);
} }
if (proposal->get_algorithm(proposal, EXTENDED_SEQUENCE_NUMBERS, if (proposal->get_algorithm(proposal, EXTENDED_SEQUENCE_NUMBERS,
&alg, NULL) && alg == EXT_SEQ_NUMBERS) &alg, NULL) && alg == EXT_SEQ_NUMBERS)
@@ -489,9 +489,9 @@ static void list_ike(private_vici_query_t *this, vici_builder_t *b,
{ {
b->add_kv(b, "prf-alg", "%N", pseudo_random_function_names, alg); b->add_kv(b, "prf-alg", "%N", pseudo_random_function_names, alg);
} }
if (proposal->get_algorithm(proposal, DIFFIE_HELLMAN_GROUP, &alg, NULL)) if (proposal->get_algorithm(proposal, KEY_EXCHANGE_METHOD, &alg, NULL))
{ {
b->add_kv(b, "dh-group", "%N", diffie_hellman_group_names, alg); b->add_kv(b, "dh-group", "%N", key_exchange_method_names, alg);
} }
} }
add_condition(b, ike_sa, "ppk", COND_PPK); add_condition(b, ike_sa, "ppk", COND_PPK);
@@ -1304,7 +1304,7 @@ CALLBACK(get_algorithms, vici_message_t*,
ext_out_function_t xof; ext_out_function_t xof;
key_derivation_function_t kdf; key_derivation_function_t kdf;
drbg_type_t drbg; drbg_type_t drbg;
diffie_hellman_group_t group; key_exchange_method_t group;
rng_quality_t quality; rng_quality_t quality;
const char *plugin_name; const char *plugin_name;
@@ -1383,10 +1383,10 @@ CALLBACK(get_algorithms, vici_message_t*,
b->end_section(b); b->end_section(b);
b->begin_section(b, "dh"); b->begin_section(b, "dh");
enumerator = lib->crypto->create_dh_enumerator(lib->crypto); enumerator = lib->crypto->create_ke_enumerator(lib->crypto);
while (enumerator->enumerate(enumerator, &group, &plugin_name)) while (enumerator->enumerate(enumerator, &group, &plugin_name))
{ {
add_algorithm(b, diffie_hellman_group_names, group, plugin_name); add_algorithm(b, key_exchange_method_names, group, plugin_name);
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
b->end_section(b); b->end_section(b);
src/libcharon/sa/authenticator.c
+1 -1
View File
@@ -121,7 +121,7 @@ authenticator_t *authenticator_create_verifier(
* Described in header. * Described in header.
*/ */
authenticator_t *authenticator_create_v1(ike_sa_t *ike_sa, bool initiator, authenticator_t *authenticator_create_v1(ike_sa_t *ike_sa, bool initiator,
auth_method_t auth_method, diffie_hellman_t *dh, auth_method_t auth_method, key_exchange_t *dh,
chunk_t dh_value, chunk_t sa_payload, chunk_t dh_value, chunk_t sa_payload,
chunk_t id_payload) chunk_t id_payload)
{ {
src/libcharon/sa/authenticator.h
+1 -1
View File
@@ -238,7 +238,7 @@ authenticator_t *authenticator_create_verifier(
* @return authenticator, NULL if not supported * @return authenticator, NULL if not supported
*/ */
authenticator_t *authenticator_create_v1(ike_sa_t *ike_sa, bool initiator, authenticator_t *authenticator_create_v1(ike_sa_t *ike_sa, bool initiator,
auth_method_t auth_method, diffie_hellman_t *dh, auth_method_t auth_method, key_exchange_t *dh,
chunk_t dh_value, chunk_t sa_payload, chunk_t dh_value, chunk_t sa_payload,
chunk_t id_payload); chunk_t id_payload);
src/libcharon/sa/ikev1/authenticators/hybrid_authenticator.c
+1 -1
View File
@@ -78,7 +78,7 @@ METHOD(authenticator_t, destroy, void,
* Described in header. * Described in header.
*/ */
hybrid_authenticator_t *hybrid_authenticator_create(ike_sa_t *ike_sa, hybrid_authenticator_t *hybrid_authenticator_create(ike_sa_t *ike_sa,
bool initiator, diffie_hellman_t *dh, bool initiator, key_exchange_t *dh,
chunk_t dh_value, chunk_t sa_payload, chunk_t dh_value, chunk_t sa_payload,
chunk_t id_payload) chunk_t id_payload)
{ {
src/libcharon/sa/ikev1/authenticators/hybrid_authenticator.h
+1 -1
View File
@@ -50,7 +50,7 @@ struct hybrid_authenticator_t {
* @return hybrid authenticator * @return hybrid authenticator
*/ */
hybrid_authenticator_t *hybrid_authenticator_create(ike_sa_t *ike_sa, hybrid_authenticator_t *hybrid_authenticator_create(ike_sa_t *ike_sa,
bool initiator, diffie_hellman_t *dh, bool initiator, key_exchange_t *dh,
chunk_t dh_value, chunk_t sa_payload, chunk_t dh_value, chunk_t sa_payload,
chunk_t id_payload); chunk_t id_payload);
src/libcharon/sa/ikev1/authenticators/psk_v1_authenticator.c
+4 -4
View File
@@ -45,7 +45,7 @@ struct private_psk_v1_authenticator_t {
/** /**
* DH key exchange * DH key exchange
*/ */
diffie_hellman_t *dh; key_exchange_t *dh;
/** /**
* Others DH public value * Others DH public value
@@ -75,7 +75,7 @@ METHOD(authenticator_t, build, status_t,
keymat_v1_t *keymat; keymat_v1_t *keymat;
chunk_t hash, dh; chunk_t hash, dh;
if (!this->dh->get_my_public_value(this->dh, &dh)) if (!this->dh->get_public_key(this->dh, &dh))
{ {
return FAILED; return FAILED;
} }
@@ -112,7 +112,7 @@ METHOD(authenticator_t, process, status_t,
return FAILED; return FAILED;
} }
if (!this->dh->get_my_public_value(this->dh, &dh)) if (!this->dh->get_public_key(this->dh, &dh))
{ {
return FAILED; return FAILED;
} }
@@ -151,7 +151,7 @@ METHOD(authenticator_t, destroy, void,
* Described in header. * Described in header.
*/ */
psk_v1_authenticator_t *psk_v1_authenticator_create(ike_sa_t *ike_sa, psk_v1_authenticator_t *psk_v1_authenticator_create(ike_sa_t *ike_sa,
bool initiator, diffie_hellman_t *dh, bool initiator, key_exchange_t *dh,
chunk_t dh_value, chunk_t sa_payload, chunk_t dh_value, chunk_t sa_payload,
chunk_t id_payload, bool hybrid) chunk_t id_payload, bool hybrid)
{ {
src/libcharon/sa/ikev1/authenticators/psk_v1_authenticator.h
+1 -1
View File
@@ -51,7 +51,7 @@ struct psk_v1_authenticator_t {
* @return PSK authenticator * @return PSK authenticator
*/ */
psk_v1_authenticator_t *psk_v1_authenticator_create(ike_sa_t *ike_sa, psk_v1_authenticator_t *psk_v1_authenticator_create(ike_sa_t *ike_sa,
bool initiator, diffie_hellman_t *dh, bool initiator, key_exchange_t *dh,
chunk_t dh_value, chunk_t sa_payload, chunk_t dh_value, chunk_t sa_payload,
chunk_t id_payload, bool hybrid); chunk_t id_payload, bool hybrid);
src/libcharon/sa/ikev1/authenticators/pubkey_v1_authenticator.c
+4 -4
View File
@@ -46,7 +46,7 @@ struct private_pubkey_v1_authenticator_t {
/** /**
* DH key exchange * DH key exchange
*/ */
diffie_hellman_t *dh; key_exchange_t *dh;
/** /**
* Others DH public value * Others DH public value
@@ -96,7 +96,7 @@ METHOD(authenticator_t, build, status_t,
return NOT_FOUND; return NOT_FOUND;
} }
if (!this->dh->get_my_public_value(this->dh, &dh)) if (!this->dh->get_public_key(this->dh, &dh))
{ {
private->destroy(private); private->destroy(private);
return FAILED; return FAILED;
@@ -181,7 +181,7 @@ METHOD(authenticator_t, process, status_t,
} }
id = this->ike_sa->get_other_id(this->ike_sa); id = this->ike_sa->get_other_id(this->ike_sa);
if (!this->dh->get_my_public_value(this->dh, &dh)) if (!this->dh->get_public_key(this->dh, &dh))
{ {
return FAILED; return FAILED;
} }
@@ -238,7 +238,7 @@ METHOD(authenticator_t, destroy, void,
* Described in header. * Described in header.
*/ */
pubkey_v1_authenticator_t *pubkey_v1_authenticator_create(ike_sa_t *ike_sa, pubkey_v1_authenticator_t *pubkey_v1_authenticator_create(ike_sa_t *ike_sa,
bool initiator, diffie_hellman_t *dh, bool initiator, key_exchange_t *dh,
chunk_t dh_value, chunk_t sa_payload, chunk_t dh_value, chunk_t sa_payload,
chunk_t id_payload, key_type_t type) chunk_t id_payload, key_type_t type)
{ {
src/libcharon/sa/ikev1/authenticators/pubkey_v1_authenticator.h
+1 -1
View File
@@ -51,7 +51,7 @@ struct pubkey_v1_authenticator_t {
* @return pubkey authenticator * @return pubkey authenticator
*/ */
pubkey_v1_authenticator_t *pubkey_v1_authenticator_create(ike_sa_t *ike_sa, pubkey_v1_authenticator_t *pubkey_v1_authenticator_create(ike_sa_t *ike_sa,
bool initiator, diffie_hellman_t *dh, bool initiator, key_exchange_t *dh,
chunk_t dh_value, chunk_t sa_payload, chunk_t dh_value, chunk_t sa_payload,
chunk_t id_payload, key_type_t type); chunk_t id_payload, key_type_t type);
src/libcharon/sa/ikev1/keymat_v1.c
+7 -7
View File
@@ -314,7 +314,7 @@ static void adjust_keylen(uint16_t alg, chunk_t *key)
} }
METHOD(keymat_v1_t, derive_ike_keys, bool, METHOD(keymat_v1_t, derive_ike_keys, bool,
private_keymat_v1_t *this, proposal_t *proposal, diffie_hellman_t *dh, private_keymat_v1_t *this, proposal_t *proposal, key_exchange_t *dh,
chunk_t dh_other, chunk_t nonce_i, chunk_t nonce_r, ike_sa_id_t *id, chunk_t dh_other, chunk_t nonce_i, chunk_t nonce_r, ike_sa_id_t *id,
auth_method_t auth, shared_key_t *shared_key) auth_method_t auth, shared_key_t *shared_key)
{ {
@@ -494,7 +494,7 @@ METHOD(keymat_v1_t, derive_ike_keys, bool,
return FALSE; return FALSE;
} }
if (!dh->get_my_public_value(dh, &dh_me)) if (!dh->get_public_key(dh, &dh_me))
{ {
return FALSE; return FALSE;
} }
@@ -539,7 +539,7 @@ static bool derive_child_keymat(private_keymat_v1_t *this, chunk_t seed,
} }
METHOD(keymat_v1_t, derive_child_keys, bool, METHOD(keymat_v1_t, derive_child_keys, bool,
private_keymat_v1_t *this, proposal_t *proposal, diffie_hellman_t *dh, private_keymat_v1_t *this, proposal_t *proposal, key_exchange_t *dh,
uint32_t spi_i, uint32_t spi_r, chunk_t nonce_i, chunk_t nonce_r, uint32_t spi_i, uint32_t spi_r, chunk_t nonce_i, chunk_t nonce_r,
chunk_t *encr_i, chunk_t *integ_i, chunk_t *encr_r, chunk_t *integ_r) chunk_t *encr_i, chunk_t *integ_i, chunk_t *encr_r, chunk_t *integ_r)
{ {
@@ -914,10 +914,10 @@ METHOD(keymat_t, get_version, ike_version_t,
return IKEV1; return IKEV1;
} }
METHOD(keymat_t, create_dh, diffie_hellman_t*, METHOD(keymat_t, create_ke, key_exchange_t*,
private_keymat_v1_t *this, diffie_hellman_group_t group) private_keymat_v1_t *this, key_exchange_method_t method)
{ {
return lib->crypto->create_dh(lib->crypto, group); return lib->crypto->create_ke(lib->crypto, method);
} }
METHOD(keymat_t, create_nonce_gen, nonce_gen_t*, METHOD(keymat_t, create_nonce_gen, nonce_gen_t*,
@@ -956,7 +956,7 @@ keymat_v1_t *keymat_v1_create(bool initiator)
.public = { .public = {
.keymat = { .keymat = {
.get_version = _get_version, .get_version = _get_version,
.create_dh = _create_dh, .create_ke = _create_ke,
.create_nonce_gen = _create_nonce_gen, .create_nonce_gen = _create_nonce_gen,
.get_aead = _get_aead, .get_aead = _get_aead,
.destroy = _destroy, .destroy = _destroy,
src/libcharon/sa/ikev1/keymat_v1.h
+3 -3
View File
@@ -44,7 +44,7 @@ struct keymat_v1_t {
* crypters and authentication functions. * crypters and authentication functions.
* *
* @param proposal selected algorithms * @param proposal selected algorithms
* @param dh diffie hellman key allocated by create_dh() * @param dh diffie hellman key allocated by create_ke()
* @param dh_other public DH value from other peer * @param dh_other public DH value from other peer
* @param nonce_i initiators nonce value * @param nonce_i initiators nonce value
* @param nonce_r responders nonce value * @param nonce_r responders nonce value
@@ -54,7 +54,7 @@ struct keymat_v1_t {
* @return TRUE on success * @return TRUE on success
*/ */
bool (*derive_ike_keys)(keymat_v1_t *this, proposal_t *proposal, bool (*derive_ike_keys)(keymat_v1_t *this, proposal_t *proposal,
diffie_hellman_t *dh, chunk_t dh_other, key_exchange_t *dh, chunk_t dh_other,
chunk_t nonce_i, chunk_t nonce_r, ike_sa_id_t *id, chunk_t nonce_i, chunk_t nonce_r, ike_sa_id_t *id,
auth_method_t auth, shared_key_t *shared_key); auth_method_t auth, shared_key_t *shared_key);
@@ -73,7 +73,7 @@ struct keymat_v1_t {
* @param integ_r allocated responders integrity key * @param integ_r allocated responders integrity key
*/ */
bool (*derive_child_keys)(keymat_v1_t *this, proposal_t *proposal, bool (*derive_child_keys)(keymat_v1_t *this, proposal_t *proposal,
diffie_hellman_t *dh, uint32_t spi_i, uint32_t spi_r, key_exchange_t *dh, uint32_t spi_i, uint32_t spi_r,
chunk_t nonce_i, chunk_t nonce_r, chunk_t nonce_i, chunk_t nonce_r,
chunk_t *encr_i, chunk_t *integ_i, chunk_t *encr_i, chunk_t *integ_i,
chunk_t *encr_r, chunk_t *integ_r); chunk_t *encr_r, chunk_t *integ_r);
src/libcharon/sa/ikev1/phase1.c
+6 -6
View File
@@ -63,7 +63,7 @@ struct private_phase1_t {
/** /**
* DH exchange * DH exchange
*/ */
diffie_hellman_t *dh; key_exchange_t *dh;
/** /**
* Keymat derivation (from SA) * Keymat derivation (from SA)
@@ -210,9 +210,9 @@ METHOD(phase1_t, create_hasher, bool,
} }
METHOD(phase1_t, create_dh, bool, METHOD(phase1_t, create_dh, bool,
private_phase1_t *this, diffie_hellman_group_t group) private_phase1_t *this, key_exchange_method_t group)
{ {
this->dh = this->keymat->keymat.create_dh(&this->keymat->keymat, group); this->dh = this->keymat->keymat.create_ke(&this->keymat->keymat, group);
return this->dh != NULL; return this->dh != NULL;
} }
@@ -705,8 +705,8 @@ METHOD(phase1_t, add_nonce_ke, bool,
nonce_gen_t *nonceg; nonce_gen_t *nonceg;
chunk_t nonce; chunk_t nonce;
ke_payload = ke_payload_create_from_diffie_hellman(PLV1_KEY_EXCHANGE, ke_payload = ke_payload_create_from_key_exchange(PLV1_KEY_EXCHANGE,
this->dh); this->dh);
if (!ke_payload) if (!ke_payload)
{ {
DBG1(DBG_IKE, "creating KE payload failed"); DBG1(DBG_IKE, "creating KE payload failed");
@@ -756,7 +756,7 @@ METHOD(phase1_t, get_nonce_ke, bool,
return FALSE; return FALSE;
} }
this->dh_value = chunk_clone(ke_payload->get_key_exchange_data(ke_payload)); this->dh_value = chunk_clone(ke_payload->get_key_exchange_data(ke_payload));
if (!this->dh->set_other_public_value(this->dh, this->dh_value)) if (!this->dh->set_public_key(this->dh, this->dh_value))
{ {
DBG1(DBG_IKE, "unable to apply received KE value"); DBG1(DBG_IKE, "unable to apply received KE value");
return FALSE; return FALSE;
src/libcharon/sa/ikev1/phase1.h
+2 -2
View File
@@ -25,7 +25,7 @@
typedef struct phase1_t phase1_t; typedef struct phase1_t phase1_t;
#include <sa/ike_sa.h> #include <sa/ike_sa.h>
#include <crypto/diffie_hellman.h> #include <crypto/key_exchange.h>
/** /**
* Common phase 1 helper for main and aggressive mode. * Common phase 1 helper for main and aggressive mode.
@@ -45,7 +45,7 @@ struct phase1_t {
* @param group negotiated DH group * @param group negotiated DH group
* @return TRUE if group supported * @return TRUE if group supported
*/ */
bool (*create_dh)(phase1_t *this, diffie_hellman_group_t group); bool (*create_dh)(phase1_t *this, key_exchange_method_t group);
/** /**
* Derive key material. * Derive key material.
src/libcharon/sa/ikev1/tasks/aggressive_mode.c
+3 -3
View File
@@ -252,7 +252,7 @@ METHOD(task_t, build_i, status_t,
message->add_payload(message, &sa_payload->payload_interface); message->add_payload(message, &sa_payload->payload_interface);
group = this->ike_cfg->get_dh_group(this->ike_cfg); group = this->ike_cfg->get_ke_method(this->ike_cfg);
if (group == MODP_NONE) if (group == MODP_NONE)
{ {
DBG1(DBG_IKE, "DH group selection failed"); DBG1(DBG_IKE, "DH group selection failed");
@@ -261,7 +261,7 @@ METHOD(task_t, build_i, status_t,
if (!this->ph1->create_dh(this->ph1, group)) if (!this->ph1->create_dh(this->ph1, group))
{ {
DBG1(DBG_IKE, "DH group %N not supported", DBG1(DBG_IKE, "DH group %N not supported",
diffie_hellman_group_names, group); key_exchange_method_names, group);
return FAILED; return FAILED;
} }
if (!this->ph1->add_nonce_ke(this->ph1, message)) if (!this->ph1->add_nonce_ke(this->ph1, message))
@@ -438,7 +438,7 @@ METHOD(task_t, process_r, status_t,
} }
if (!this->proposal->get_algorithm(this->proposal, if (!this->proposal->get_algorithm(this->proposal,
DIFFIE_HELLMAN_GROUP, &group, NULL)) KEY_EXCHANGE_METHOD, &group, NULL))
{ {
DBG1(DBG_IKE, "DH group selection failed"); DBG1(DBG_IKE, "DH group selection failed");
return send_notify(this, INVALID_KEY_INFORMATION); return send_notify(this, INVALID_KEY_INFORMATION);
src/libcharon/sa/ikev1/tasks/main_mode.c
+2 -2
View File
@@ -314,7 +314,7 @@ METHOD(task_t, build_i, status_t,
return send_notify(this, NO_PROPOSAL_CHOSEN); return send_notify(this, NO_PROPOSAL_CHOSEN);
} }
if (!this->proposal->get_algorithm(this->proposal, if (!this->proposal->get_algorithm(this->proposal,
DIFFIE_HELLMAN_GROUP, &group, NULL)) KEY_EXCHANGE_METHOD, &group, NULL))
{ {
DBG1(DBG_IKE, "DH group selection failed"); DBG1(DBG_IKE, "DH group selection failed");
return send_notify(this, NO_PROPOSAL_CHOSEN); return send_notify(this, NO_PROPOSAL_CHOSEN);
@@ -428,7 +428,7 @@ METHOD(task_t, process_r, status_t,
return send_notify(this, INVALID_KEY_INFORMATION); return send_notify(this, INVALID_KEY_INFORMATION);
} }
if (!this->proposal->get_algorithm(this->proposal, if (!this->proposal->get_algorithm(this->proposal,
DIFFIE_HELLMAN_GROUP, &group, NULL)) KEY_EXCHANGE_METHOD, &group, NULL))
{ {
DBG1(DBG_IKE, "DH group selection failed"); DBG1(DBG_IKE, "DH group selection failed");
return send_notify(this, INVALID_KEY_INFORMATION); return send_notify(this, INVALID_KEY_INFORMATION);
src/libcharon/sa/ikev1/tasks/quick_mode.c
+15 -15
View File
@@ -137,7 +137,7 @@ struct private_quick_mode_t {
/** /**
* DH exchange, when PFS is in use * DH exchange, when PFS is in use
*/ */
diffie_hellman_t *dh; key_exchange_t *dh;
/** /**
* Negotiated lifetime of new SA * Negotiated lifetime of new SA
@@ -486,8 +486,8 @@ static bool add_ke(private_quick_mode_t *this, message_t *message)
{ {
ke_payload_t *ke_payload; ke_payload_t *ke_payload;
ke_payload = ke_payload_create_from_diffie_hellman(PLV1_KEY_EXCHANGE, ke_payload = ke_payload_create_from_key_exchange(PLV1_KEY_EXCHANGE,
this->dh); this->dh);
if (!ke_payload) if (!ke_payload)
{ {
DBG1(DBG_IKE, "creating KE payload failed"); DBG1(DBG_IKE, "creating KE payload failed");
@@ -510,7 +510,7 @@ static bool get_ke(private_quick_mode_t *this, message_t *message)
DBG1(DBG_IKE, "KE payload missing"); DBG1(DBG_IKE, "KE payload missing");
return FALSE; return FALSE;
} }
if (!this->dh->set_other_public_value(this->dh, if (!this->dh->set_public_key(this->dh,
ke_payload->get_key_exchange_data(ke_payload))) ke_payload->get_key_exchange_data(ke_payload)))
{ {
DBG1(DBG_IKE, "unable to apply received KE value"); DBG1(DBG_IKE, "unable to apply received KE value");
@@ -785,7 +785,7 @@ static status_t send_notify(private_quick_mode_t *this, notify_type_t type)
* DH group, unless it is set to MODP_NONE. * DH group, unless it is set to MODP_NONE.
*/ */
static linked_list_t *get_proposals(private_quick_mode_t *this, static linked_list_t *get_proposals(private_quick_mode_t *this,
diffie_hellman_group_t group) key_exchange_method_t group)
{ {
linked_list_t *list; linked_list_t *list;
proposal_t *proposal; proposal_t *proposal;
@@ -797,13 +797,13 @@ static linked_list_t *get_proposals(private_quick_mode_t *this,
{ {
if (group != MODP_NONE) if (group != MODP_NONE)
{ {
if (!proposal->has_dh_group(proposal, group)) if (!proposal->has_ke_method(proposal, group))
{ {
list->remove_at(list, enumerator); list->remove_at(list, enumerator);
proposal->destroy(proposal); proposal->destroy(proposal);
continue; continue;
} }
proposal->promote_dh_group(proposal, group); proposal->promote_ke_method(proposal, group);
} }
proposal->set_spi(proposal, this->spi_i); proposal->set_spi(proposal, this->spi_i);
} }
@@ -822,7 +822,7 @@ METHOD(task_t, build_i, status_t,
sa_payload_t *sa_payload; sa_payload_t *sa_payload;
linked_list_t *list, *tsi, *tsr; linked_list_t *list, *tsi, *tsr;
proposal_t *proposal; proposal_t *proposal;
diffie_hellman_group_t group; key_exchange_method_t group;
encap_t encap; encap_t encap;
this->mode = this->config->get_mode(this->config); this->mode = this->config->get_mode(this->config);
@@ -866,14 +866,14 @@ METHOD(task_t, build_i, status_t,
return FAILED; return FAILED;
} }
group = this->config->get_dh_group(this->config); group = this->config->get_ke_method(this->config);
if (group != MODP_NONE) if (group != MODP_NONE)
{ {
proposal_t *proposal; proposal_t *proposal;
uint16_t preferred_group; uint16_t preferred_group;
proposal = this->ike_sa->get_proposal(this->ike_sa); proposal = this->ike_sa->get_proposal(this->ike_sa);
proposal->get_algorithm(proposal, DIFFIE_HELLMAN_GROUP, proposal->get_algorithm(proposal, KEY_EXCHANGE_METHOD,
&preferred_group, NULL); &preferred_group, NULL);
/* try the negotiated DH group from IKE_SA */ /* try the negotiated DH group from IKE_SA */
list = get_proposals(this, preferred_group); list = get_proposals(this, preferred_group);
@@ -888,12 +888,12 @@ METHOD(task_t, build_i, status_t,
list = get_proposals(this, group); list = get_proposals(this, group);
} }
this->dh = this->keymat->keymat.create_dh(&this->keymat->keymat, this->dh = this->keymat->keymat.create_ke(&this->keymat->keymat,
group); group);
if (!this->dh) if (!this->dh)
{ {
DBG1(DBG_IKE, "configured DH group %N not supported", DBG1(DBG_IKE, "configured DH group %N not supported",
diffie_hellman_group_names, group); key_exchange_method_names, group);
list->destroy_offset(list, offsetof(proposal_t, destroy)); list->destroy_offset(list, offsetof(proposal_t, destroy));
return FAILED; return FAILED;
} }
@@ -1165,14 +1165,14 @@ METHOD(task_t, process_r, status_t,
} }
if (this->proposal->get_algorithm(this->proposal, if (this->proposal->get_algorithm(this->proposal,
DIFFIE_HELLMAN_GROUP, &group, NULL)) KEY_EXCHANGE_METHOD, &group, NULL))
{ {
this->dh = this->keymat->keymat.create_dh(&this->keymat->keymat, this->dh = this->keymat->keymat.create_ke(&this->keymat->keymat,
group); group);
if (!this->dh) if (!this->dh)
{ {
DBG1(DBG_IKE, "negotiated DH group %N not supported", DBG1(DBG_IKE, "negotiated DH group %N not supported",
diffie_hellman_group_names, group); key_exchange_method_names, group);
return send_notify(this, INVALID_KEY_INFORMATION); return send_notify(this, INVALID_KEY_INFORMATION);
} }
if (!get_ke(this, message)) if (!get_ke(this, message))
src/libcharon/sa/ikev2/keymat_v2.c
+6 -6
View File
@@ -84,10 +84,10 @@ METHOD(keymat_t, get_version, ike_version_t,
return IKEV2; return IKEV2;
} }
METHOD(keymat_t, create_dh, diffie_hellman_t*, METHOD(keymat_t, create_ke, key_exchange_t*,
private_keymat_v2_t *this, diffie_hellman_group_t group) private_keymat_v2_t *this, key_exchange_method_t method)
{ {
return lib->crypto->create_dh(lib->crypto, group); return lib->crypto->create_ke(lib->crypto, method);
} }
METHOD(keymat_t, create_nonce_gen, nonce_gen_t*, METHOD(keymat_t, create_nonce_gen, nonce_gen_t*,
@@ -237,7 +237,7 @@ static bool set_aead_keys(private_keymat_v2_t *this, uint16_t enc_alg,
} }
METHOD(keymat_v2_t, derive_ike_keys, bool, METHOD(keymat_v2_t, derive_ike_keys, bool,
private_keymat_v2_t *this, proposal_t *proposal, diffie_hellman_t *dh, private_keymat_v2_t *this, proposal_t *proposal, key_exchange_t *dh,
chunk_t nonce_i, chunk_t nonce_r, ike_sa_id_t *id, chunk_t nonce_i, chunk_t nonce_r, ike_sa_id_t *id,
pseudo_random_function_t rekey_function, chunk_t rekey_skd) pseudo_random_function_t rekey_function, chunk_t rekey_skd)
{ {
@@ -523,7 +523,7 @@ METHOD(keymat_v2_t, derive_ike_keys_ppk, bool,
} }
METHOD(keymat_v2_t, derive_child_keys, bool, METHOD(keymat_v2_t, derive_child_keys, bool,
private_keymat_v2_t *this, proposal_t *proposal, diffie_hellman_t *dh, private_keymat_v2_t *this, proposal_t *proposal, key_exchange_t *dh,
chunk_t nonce_i, chunk_t nonce_r, chunk_t *encr_i, chunk_t *integ_i, chunk_t nonce_i, chunk_t nonce_r, chunk_t *encr_i, chunk_t *integ_i,
chunk_t *encr_r, chunk_t *integ_r) chunk_t *encr_r, chunk_t *integ_r)
{ {
@@ -796,7 +796,7 @@ keymat_v2_t *keymat_v2_create(bool initiator)
.public = { .public = {
.keymat = { .keymat = {
.get_version = _get_version, .get_version = _get_version,
.create_dh = _create_dh, .create_ke = _create_ke,
.create_nonce_gen = _create_nonce_gen, .create_nonce_gen = _create_nonce_gen,
.get_aead = _get_aead, .get_aead = _get_aead,
.destroy = _destroy, .destroy = _destroy,
src/libcharon/sa/ikev2/keymat_v2.h
+4 -4
View File
@@ -44,7 +44,7 @@ struct keymat_v2_t {
* crypters and authentication functions. * crypters and authentication functions.
* *
* @param proposal selected algorithms * @param proposal selected algorithms
* @param dh diffie hellman key allocated by create_dh() * @param dh diffie hellman key allocated by create_ke()
* @param nonce_i initiators nonce value * @param nonce_i initiators nonce value
* @param nonce_r responders nonce value * @param nonce_r responders nonce value
* @param id IKE_SA identifier * @param id IKE_SA identifier
@@ -53,7 +53,7 @@ struct keymat_v2_t {
* @return TRUE on success * @return TRUE on success
*/ */
bool (*derive_ike_keys)(keymat_v2_t *this, proposal_t *proposal, bool (*derive_ike_keys)(keymat_v2_t *this, proposal_t *proposal,
diffie_hellman_t *dh, chunk_t nonce_i, key_exchange_t *dh, chunk_t nonce_i,
chunk_t nonce_r, ike_sa_id_t *id, chunk_t nonce_r, ike_sa_id_t *id,
pseudo_random_function_t rekey_function, pseudo_random_function_t rekey_function,
chunk_t rekey_skd); chunk_t rekey_skd);
@@ -77,7 +77,7 @@ struct keymat_v2_t {
* If no PFS is used for the CHILD_SA, dh can be NULL. * If no PFS is used for the CHILD_SA, dh can be NULL.
* *
* @param proposal selected algorithms * @param proposal selected algorithms
* @param dh diffie hellman key allocated by create_dh(), or NULL * @param dh diffie hellman key allocated by create_ke(), or NULL
* @param nonce_i initiators nonce value * @param nonce_i initiators nonce value
* @param nonce_r responders nonce value * @param nonce_r responders nonce value
* @param encr_i chunk to write initiators encryption key to * @param encr_i chunk to write initiators encryption key to
@@ -87,7 +87,7 @@ struct keymat_v2_t {
* @return TRUE on success * @return TRUE on success
*/ */
bool (*derive_child_keys)(keymat_v2_t *this, bool (*derive_child_keys)(keymat_v2_t *this,
proposal_t *proposal, diffie_hellman_t *dh, proposal_t *proposal, key_exchange_t *dh,
chunk_t nonce_i, chunk_t nonce_r, chunk_t nonce_i, chunk_t nonce_r,
chunk_t *encr_i, chunk_t *integ_i, chunk_t *encr_i, chunk_t *integ_i,
chunk_t *encr_r, chunk_t *integ_r); chunk_t *encr_r, chunk_t *integ_r);
src/libcharon/sa/ikev2/tasks/child_create.c
+25 -24
View File
@@ -20,7 +20,7 @@
#include <daemon.h> #include <daemon.h>
#include <sa/ikev2/keymat_v2.h> #include <sa/ikev2/keymat_v2.h>
#include <crypto/diffie_hellman.h> #include <crypto/key_exchange.h>
#include <credentials/certificates/x509.h> #include <credentials/certificates/x509.h>
#include <encoding/payloads/sa_payload.h> #include <encoding/payloads/sa_payload.h>
#include <encoding/payloads/ke_payload.h> #include <encoding/payloads/ke_payload.h>
@@ -117,7 +117,7 @@ struct private_child_create_t {
/** /**
* optional diffie hellman exchange * optional diffie hellman exchange
*/ */
diffie_hellman_t *dh; key_exchange_t *dh;
/** /**
* Applying DH public value failed? * Applying DH public value failed?
@@ -127,7 +127,7 @@ struct private_child_create_t {
/** /**
* group used for DH exchange * group used for DH exchange
*/ */
diffie_hellman_group_t dh_group; key_exchange_method_t dh_group;
/** /**
* IKE_SAs keymat * IKE_SAs keymat
@@ -328,7 +328,7 @@ static bool update_and_check_proposals(private_child_create_t *this)
if (this->dh_group != MODP_NONE) if (this->dh_group != MODP_NONE)
{ /* proposals that don't contain the selected group are { /* proposals that don't contain the selected group are
* moved to the back */ * moved to the back */
if (!proposal->promote_dh_group(proposal, this->dh_group)) if (!proposal->promote_ke_method(proposal, this->dh_group))
{ {
this->proposals->remove_at(this->proposals, enumerator); this->proposals->remove_at(this->proposals, enumerator);
other_dh_groups->insert_last(other_dh_groups, proposal); other_dh_groups->insert_last(other_dh_groups, proposal);
@@ -518,7 +518,7 @@ static status_t select_and_install(private_child_create_t *this,
if (no_dh) if (no_dh)
{ {
flags |= PROPOSAL_SKIP_DH; flags |= PROPOSAL_SKIP_KE;
} }
if (!this->ike_sa->supports_extension(this->ike_sa, EXT_STRONGSWAN) && if (!this->ike_sa->supports_extension(this->ike_sa, EXT_STRONGSWAN) &&
!lib->settings->get_bool(lib->settings, "%s.accept_private_algs", !lib->settings->get_bool(lib->settings, "%s.accept_private_algs",
@@ -554,16 +554,16 @@ static status_t select_and_install(private_child_create_t *this,
} }
this->child_sa->set_proposal(this->child_sa, this->proposal); this->child_sa->set_proposal(this->child_sa, this->proposal);
if (!this->proposal->has_dh_group(this->proposal, this->dh_group)) if (!this->proposal->has_ke_method(this->proposal, this->dh_group))
{ {
uint16_t group; uint16_t group;
if (this->proposal->get_algorithm(this->proposal, DIFFIE_HELLMAN_GROUP, if (this->proposal->get_algorithm(this->proposal, KEY_EXCHANGE_METHOD,
&group, NULL)) &group, NULL))
{ {
DBG1(DBG_IKE, "DH group %N unacceptable, requesting %N", DBG1(DBG_IKE, "DH group %N unacceptable, requesting %N",
diffie_hellman_group_names, this->dh_group, key_exchange_method_names, this->dh_group,
diffie_hellman_group_names, group); key_exchange_method_names, group);
this->dh_group = group; this->dh_group = group;
return INVALID_ARG; return INVALID_ARG;
} }
@@ -836,8 +836,8 @@ static bool build_payloads(private_child_create_t *this, message_t *message)
/* diffie hellman exchange, if PFS enabled */ /* diffie hellman exchange, if PFS enabled */
if (this->dh) if (this->dh)
{ {
ke_payload = ke_payload_create_from_diffie_hellman(PLV2_KEY_EXCHANGE, ke_payload = ke_payload_create_from_key_exchange(PLV2_KEY_EXCHANGE,
this->dh); this->dh);
if (!ke_payload) if (!ke_payload)
{ {
DBG1(DBG_IKE, "creating KE payload failed"); DBG1(DBG_IKE, "creating KE payload failed");
@@ -979,18 +979,19 @@ static void process_payloads(private_child_create_t *this, message_t *message)
ke_payload = (ke_payload_t*)payload; ke_payload = (ke_payload_t*)payload;
if (!this->initiator) if (!this->initiator)
{ {
this->dh_group = ke_payload->get_dh_group_number(ke_payload); this->dh_group = ke_payload->get_key_exchange_method(
this->dh = this->keymat->keymat.create_dh( ke_payload);
this->dh = this->keymat->keymat.create_ke(
&this->keymat->keymat, this->dh_group); &this->keymat->keymat, this->dh_group);
} }
else if (this->dh) else if (this->dh)
{ {
this->dh_failed = this->dh->get_dh_group(this->dh) != this->dh_failed = this->dh->get_method(this->dh) !=
ke_payload->get_dh_group_number(ke_payload); ke_payload->get_key_exchange_method(ke_payload);
} }
if (this->dh && !this->dh_failed) if (this->dh && !this->dh_failed)
{ {
this->dh_failed = !this->dh->set_other_public_value(this->dh, this->dh_failed = !this->dh->set_public_key(this->dh,
ke_payload->get_key_exchange_data(ke_payload)); ke_payload->get_key_exchange_data(ke_payload));
} }
break; break;
@@ -1157,7 +1158,7 @@ METHOD(task_t, build_i, status_t,
} }
if (!this->retry && this->dh_group == MODP_NONE) if (!this->retry && this->dh_group == MODP_NONE)
{ /* during a rekeying the group might already be set */ { /* during a rekeying the group might already be set */
this->dh_group = this->config->get_dh_group(this->config); this->dh_group = this->config->get_ke_method(this->config);
} }
break; break;
case IKE_AUTH: case IKE_AUTH:
@@ -1287,13 +1288,13 @@ METHOD(task_t, build_i, status_t,
{ {
DBG1(DBG_IKE, "requested DH group %N not contained in any of our " DBG1(DBG_IKE, "requested DH group %N not contained in any of our "
"proposals", "proposals",
diffie_hellman_group_names, this->dh_group); key_exchange_method_names, this->dh_group);
return FAILED; return FAILED;
} }
if (this->dh_group != MODP_NONE) if (this->dh_group != MODP_NONE)
{ {
this->dh = this->keymat->keymat.create_dh(&this->keymat->keymat, this->dh = this->keymat->keymat.create_ke(&this->keymat->keymat,
this->dh_group); this->dh_group);
} }
@@ -1829,15 +1830,15 @@ METHOD(task_t, process_i, status_t,
if (this->retry) if (this->retry)
{ {
DBG1(DBG_IKE, "already retried with DH group %N, " DBG1(DBG_IKE, "already retried with DH group %N, "
"ignore requested %N", diffie_hellman_group_names, "ignore requested %N", key_exchange_method_names,
this->dh_group, diffie_hellman_group_names, group); this->dh_group, key_exchange_method_names, group);
handle_child_sa_failure(this, message); handle_child_sa_failure(this, message);
/* an error in CHILD_SA creation is not critical */ /* an error in CHILD_SA creation is not critical */
return SUCCESS; return SUCCESS;
} }
DBG1(DBG_IKE, "peer didn't accept DH group %N, " DBG1(DBG_IKE, "peer didn't accept DH group %N, "
"it requested %N", diffie_hellman_group_names, "it requested %N", key_exchange_method_names,
this->dh_group, diffie_hellman_group_names, group); this->dh_group, key_exchange_method_names, group);
this->retry = TRUE; this->retry = TRUE;
this->dh_group = group; this->dh_group = group;
this->child_sa->set_state(this->child_sa, CHILD_RETRYING); this->child_sa->set_state(this->child_sa, CHILD_RETRYING);
@@ -1945,7 +1946,7 @@ METHOD(child_create_t, use_label, void,
} }
METHOD(child_create_t, use_dh_group, void, METHOD(child_create_t, use_dh_group, void,
private_child_create_t *this, diffie_hellman_group_t dh_group) private_child_create_t *this, key_exchange_method_t dh_group)
{ {
this->dh_group = dh_group; this->dh_group = dh_group;
} }
src/libcharon/sa/ikev2/tasks/child_create.h
+1 -1
View File
@@ -83,7 +83,7 @@ struct child_create_t {
* *
* @param dh_group DH group to use * @param dh_group DH group to use
*/ */
void (*use_dh_group)(child_create_t *this, diffie_hellman_group_t dh_group); void (*use_dh_group)(child_create_t *this, key_exchange_method_t dh_group);
/** /**
* Get the lower of the two nonces, used for rekey collisions. * Get the lower of the two nonces, used for rekey collisions.
src/libcharon/sa/ikev2/tasks/child_rekey.c
+1 -1
View File
@@ -197,7 +197,7 @@ METHOD(task_t, build_i, status_t,
config->get_ref(config), TRUE, NULL, NULL); config->get_ref(config), TRUE, NULL, NULL);
proposal = this->child_sa->get_proposal(this->child_sa); proposal = this->child_sa->get_proposal(this->child_sa);
if (proposal->get_algorithm(proposal, DIFFIE_HELLMAN_GROUP, if (proposal->get_algorithm(proposal, KEY_EXCHANGE_METHOD,
&dh_group, NULL)) &dh_group, NULL))
{ /* reuse the DH group negotiated previously */ { /* reuse the DH group negotiated previously */
this->child_create->use_dh_group(this->child_create, dh_group); this->child_create->use_dh_group(this->child_create, dh_group);
src/libcharon/sa/ikev2/tasks/ike_init.c
+27 -27
View File
@@ -24,7 +24,7 @@
#include <bio/bio_reader.h> #include <bio/bio_reader.h>
#include <bio/bio_writer.h> #include <bio/bio_writer.h>
#include <sa/ikev2/keymat_v2.h> #include <sa/ikev2/keymat_v2.h>
#include <crypto/diffie_hellman.h> #include <crypto/key_exchange.h>
#include <crypto/hashers/hash_algorithm_set.h> #include <crypto/hashers/hash_algorithm_set.h>
#include <encoding/payloads/sa_payload.h> #include <encoding/payloads/sa_payload.h>
#include <encoding/payloads/ke_payload.h> #include <encoding/payloads/ke_payload.h>
@@ -58,12 +58,12 @@ struct private_ike_init_t {
/** /**
* diffie hellman group to use * diffie hellman group to use
*/ */
diffie_hellman_group_t dh_group; key_exchange_method_t dh_group;
/** /**
* diffie hellman key exchange * diffie hellman key exchange
*/ */
diffie_hellman_t *dh; key_exchange_t *dh;
/** /**
* Applying DH public value failed? * Applying DH public value failed?
@@ -333,7 +333,7 @@ static bool build_payloads(private_ike_init_t *this, message_t *message)
proposal->set_spi(proposal, id->get_initiator_spi(id)); proposal->set_spi(proposal, id->get_initiator_spi(id));
} }
/* move the selected DH group to the front of the proposal */ /* move the selected DH group to the front of the proposal */
if (!proposal->promote_dh_group(proposal, this->dh_group)) if (!proposal->promote_ke_method(proposal, this->dh_group))
{ /* the proposal does not include the group, move to the back */ { /* the proposal does not include the group, move to the back */
proposal_list->remove_at(proposal_list, enumerator); proposal_list->remove_at(proposal_list, enumerator);
other_dh_groups->insert_last(other_dh_groups, proposal); other_dh_groups->insert_last(other_dh_groups, proposal);
@@ -363,8 +363,8 @@ static bool build_payloads(private_ike_init_t *this, message_t *message)
} }
message->add_payload(message, (payload_t*)sa_payload); message->add_payload(message, (payload_t*)sa_payload);
ke_payload = ke_payload_create_from_diffie_hellman(PLV2_KEY_EXCHANGE, ke_payload = ke_payload_create_from_key_exchange(PLV2_KEY_EXCHANGE,
this->dh); this->dh);
if (!ke_payload) if (!ke_payload)
{ {
DBG1(DBG_IKE, "creating KE payload failed"); DBG1(DBG_IKE, "creating KE payload failed");
@@ -535,7 +535,7 @@ static void process_payloads(private_ike_init_t *this, message_t *message)
{ {
ke_payload = (ke_payload_t*)payload; ke_payload = (ke_payload_t*)payload;
this->dh_group = ke_payload->get_dh_group_number(ke_payload); this->dh_group = ke_payload->get_key_exchange_method(ke_payload);
break; break;
} }
case PLV2_NONCE: case PLV2_NONCE:
@@ -617,20 +617,20 @@ static void process_payloads(private_ike_init_t *this, message_t *message)
} }
if (ke_payload && this->proposal && if (ke_payload && this->proposal &&
this->proposal->has_dh_group(this->proposal, this->dh_group)) this->proposal->has_ke_method(this->proposal, this->dh_group))
{ {
if (!this->initiator) if (!this->initiator)
{ {
this->dh = this->keymat->keymat.create_dh( this->dh = this->keymat->keymat.create_ke(
&this->keymat->keymat, this->dh_group); &this->keymat->keymat, this->dh_group);
} }
else if (this->dh) else if (this->dh)
{ {
this->dh_failed = this->dh->get_dh_group(this->dh) != this->dh_group; this->dh_failed = this->dh->get_method(this->dh) != this->dh_group;
} }
if (this->dh && !this->dh_failed) if (this->dh && !this->dh_failed)
{ {
this->dh_failed = !this->dh->set_other_public_value(this->dh, this->dh_failed = !this->dh->set_public_key(this->dh,
ke_payload->get_key_exchange_data(ke_payload)); ke_payload->get_key_exchange_data(ke_payload));
} }
} }
@@ -665,38 +665,38 @@ METHOD(task_t, build_i, status_t,
uint16_t dh_group; uint16_t dh_group;
proposal = this->old_sa->get_proposal(this->old_sa); proposal = this->old_sa->get_proposal(this->old_sa);
if (proposal->get_algorithm(proposal, DIFFIE_HELLMAN_GROUP, if (proposal->get_algorithm(proposal, KEY_EXCHANGE_METHOD,
&dh_group, NULL)) &dh_group, NULL))
{ {
this->dh_group = dh_group; this->dh_group = dh_group;
} }
else else
{ /* this shouldn't happen, but let's be safe */ { /* this shouldn't happen, but let's be safe */
this->dh_group = ike_cfg->get_dh_group(ike_cfg); this->dh_group = ike_cfg->get_ke_method(ike_cfg);
} }
} }
else else
{ {
this->dh_group = ike_cfg->get_dh_group(ike_cfg); this->dh_group = ike_cfg->get_ke_method(ike_cfg);
} }
this->dh = this->keymat->keymat.create_dh(&this->keymat->keymat, this->dh = this->keymat->keymat.create_ke(&this->keymat->keymat,
this->dh_group); this->dh_group);
if (!this->dh) if (!this->dh)
{ {
DBG1(DBG_IKE, "configured DH group %N not supported", DBG1(DBG_IKE, "configured DH group %N not supported",
diffie_hellman_group_names, this->dh_group); key_exchange_method_names, this->dh_group);
return FAILED; return FAILED;
} }
} }
else if (this->dh->get_dh_group(this->dh) != this->dh_group) else if (this->dh->get_method(this->dh) != this->dh_group)
{ /* reset DH instance if group changed (INVALID_KE_PAYLOAD) */ { /* reset DH instance if group changed (INVALID_KE_PAYLOAD) */
this->dh->destroy(this->dh); this->dh->destroy(this->dh);
this->dh = this->keymat->keymat.create_dh(&this->keymat->keymat, this->dh = this->keymat->keymat.create_ke(&this->keymat->keymat,
this->dh_group); this->dh_group);
if (!this->dh) if (!this->dh)
{ {
DBG1(DBG_IKE, "requested DH group %N not supported", DBG1(DBG_IKE, "requested DH group %N not supported",
diffie_hellman_group_names, this->dh_group); key_exchange_method_names, this->dh_group);
return FAILED; return FAILED;
} }
} }
@@ -829,16 +829,16 @@ METHOD(task_t, build_r, status_t,
} }
if (this->dh == NULL || if (this->dh == NULL ||
!this->proposal->has_dh_group(this->proposal, this->dh_group)) !this->proposal->has_ke_method(this->proposal, this->dh_group))
{ {
uint16_t group; uint16_t group;
if (this->proposal->get_algorithm(this->proposal, DIFFIE_HELLMAN_GROUP, if (this->proposal->get_algorithm(this->proposal, KEY_EXCHANGE_METHOD,
&group, NULL)) &group, NULL))
{ {
DBG1(DBG_IKE, "DH group %N unacceptable, requesting %N", DBG1(DBG_IKE, "DH group %N unacceptable, requesting %N",
diffie_hellman_group_names, this->dh_group, key_exchange_method_names, this->dh_group,
diffie_hellman_group_names, group); key_exchange_method_names, group);
this->dh_group = group; this->dh_group = group;
group = htons(group); group = htons(group);
message->add_notify(message, FALSE, INVALID_KE_PAYLOAD, message->add_notify(message, FALSE, INVALID_KE_PAYLOAD,
@@ -976,14 +976,14 @@ METHOD(task_t, process_i, status_t,
case INVALID_KE_PAYLOAD: case INVALID_KE_PAYLOAD:
{ {
chunk_t data; chunk_t data;
diffie_hellman_group_t bad_group; key_exchange_method_t bad_group;
bad_group = this->dh_group; bad_group = this->dh_group;
data = notify->get_notification_data(notify); data = notify->get_notification_data(notify);
this->dh_group = ntohs(*((uint16_t*)data.ptr)); this->dh_group = ntohs(*((uint16_t*)data.ptr));
DBG1(DBG_IKE, "peer didn't accept DH group %N, " DBG1(DBG_IKE, "peer didn't accept DH group %N, "
"it requested %N", diffie_hellman_group_names, "it requested %N", key_exchange_method_names,
bad_group, diffie_hellman_group_names, this->dh_group); bad_group, key_exchange_method_names, this->dh_group);
if (this->old_sa == NULL) if (this->old_sa == NULL)
{ /* reset the IKE_SA if we are not rekeying */ { /* reset the IKE_SA if we are not rekeying */
@@ -1064,7 +1064,7 @@ METHOD(task_t, process_i, status_t,
} }
if (this->dh == NULL || if (this->dh == NULL ||
!this->proposal->has_dh_group(this->proposal, this->dh_group)) !this->proposal->has_ke_method(this->proposal, this->dh_group))
{ {
DBG1(DBG_IKE, "peer DH group selection invalid"); DBG1(DBG_IKE, "peer DH group selection invalid");
return FAILED; return FAILED;
src/libcharon/sa/keymat.h
+10 -11
View File
@@ -53,22 +53,21 @@ struct keymat_t {
ike_version_t (*get_version)(keymat_t *this); ike_version_t (*get_version)(keymat_t *this);
/** /**
* Create a diffie hellman object for key agreement. * Create a key exchange object for key agreement.
* *
* The diffie hellman is either for IKE negotiation/rekeying or * The key exchange is either for IKE negotiation/rekeying or
* CHILD_SA rekeying (using PFS). The resulting DH object must be passed * CHILD_SA rekeying (using PFS). The resulting object must be passed
* to derive_keys or to derive_child_keys and destroyed after use. * to derive_ike_keys() or to derive_child_keys() and destroyed after use.
* *
* Only DH objects allocated through this method are passed to other * Only objects allocated through this method are passed to other
* keymat_t methods, allowing private DH implementations. In some cases * keymat_t methods, allowing private KE implementations. In some cases
* (such as retrying with a COOKIE), a DH object allocated from a different * (such as retrying with a COOKIE), a KE object allocated from a different
* keymat_t instance may be passed to other methods. * keymat_t instance may be passed to other methods.
* *
* @param group diffie hellman group * @param method key exchange method
* @return DH object, NULL if group not supported * @return key exchange object, NULL if method not supported
*/ */
diffie_hellman_t* (*create_dh)(keymat_t *this, key_exchange_t* (*create_ke)(keymat_t *this, key_exchange_method_t method);
diffie_hellman_group_t group);
/** /**
* Create a nonce generator object. * Create a nonce generator object.
src/libcharon/tests/suites/test_message_chapoly.c
+1 -1
View File
@@ -74,7 +74,7 @@ START_TEST(test_chacha20poly1305)
chunk_t chunk, exp; chunk_t chunk, exp;
keymat_t keymat = { keymat_t keymat = {
.get_version = _get_version, .get_version = _get_version,
.create_dh = (void*)return_null, .create_ke = (void*)return_null,
.create_nonce_gen = (void*)return_null, .create_nonce_gen = (void*)return_null,
.get_aead = _get_aead, .get_aead = _get_aead,
}; };
src/libcharon/tests/utils/exchange_test_helper.c
+4 -4
View File
@@ -332,11 +332,11 @@ void exchange_test_helper_init(char *plugins)
private_exchange_test_helper_t *this; private_exchange_test_helper_t *this;
private_backend_t *backend; private_backend_t *backend;
plugin_feature_t features[] = { plugin_feature_t features[] = {
PLUGIN_REGISTER(DH, mock_dh_create), PLUGIN_REGISTER(KE, mock_dh_create),
/* we only need to support a limited number of DH groups */ /* we only need to support a limited number of DH groups */
PLUGIN_PROVIDE(DH, MODP_2048_BIT), PLUGIN_PROVIDE(KE, MODP_2048_BIT),
PLUGIN_PROVIDE(DH, MODP_3072_BIT), PLUGIN_PROVIDE(KE, MODP_3072_BIT),
PLUGIN_PROVIDE(DH, ECP_256_BIT), PLUGIN_PROVIDE(KE, ECP_256_BIT),
PLUGIN_REGISTER(NONCE_GEN, create_nonce_gen), PLUGIN_REGISTER(NONCE_GEN, create_nonce_gen),
PLUGIN_PROVIDE(NONCE_GEN), PLUGIN_PROVIDE(NONCE_GEN),
PLUGIN_DEPENDS(RNG, RNG_WEAK), PLUGIN_DEPENDS(RNG, RNG_WEAK),
src/libcharon/tests/utils/mock_dh.c
+14 -14
View File
@@ -34,41 +34,41 @@ struct private_diffie_hellman_t {
/** /**
* Public interface * Public interface
*/ */
diffie_hellman_t public; key_exchange_t public;
/** /**
* Instantiated DH group * Instantiated key exchagne method
*/ */
diffie_hellman_group_t group; key_exchange_method_t method;
}; };
METHOD(diffie_hellman_t, get_my_public_value, bool, METHOD(key_exchange_t, get_public_key, bool,
private_diffie_hellman_t *this, chunk_t *value) private_diffie_hellman_t *this, chunk_t *value)
{ {
*value = chunk_clone(mock_key); *value = chunk_clone(mock_key);
return TRUE; return TRUE;
} }
METHOD(diffie_hellman_t, set_other_public_value, bool, METHOD(key_exchange_t, set_public_key, bool,
private_diffie_hellman_t *this, chunk_t value) private_diffie_hellman_t *this, chunk_t value)
{ {
return TRUE; return TRUE;
} }
METHOD(diffie_hellman_t, get_shared_secret, bool, METHOD(key_exchange_t, get_shared_secret, bool,
private_diffie_hellman_t *this, chunk_t *secret) private_diffie_hellman_t *this, chunk_t *secret)
{ {
*secret = chunk_clone(mock_key); *secret = chunk_clone(mock_key);
return TRUE; return TRUE;
} }
METHOD(diffie_hellman_t, get_dh_group, diffie_hellman_group_t, METHOD(key_exchange_t, get_method, key_exchange_method_t,
private_diffie_hellman_t *this) private_diffie_hellman_t *this)
{ {
return this->group; return this->method;
} }
METHOD(diffie_hellman_t, destroy, void, METHOD(key_exchange_t, destroy, void,
private_diffie_hellman_t *this) private_diffie_hellman_t *this)
{ {
free(this); free(this);
@@ -77,19 +77,19 @@ METHOD(diffie_hellman_t, destroy, void,
/** /**
* See header * See header
*/ */
diffie_hellman_t *mock_dh_create(diffie_hellman_group_t group) key_exchange_t *mock_dh_create(key_exchange_method_t method)
{ {
private_diffie_hellman_t *this; private_diffie_hellman_t *this;
INIT(this, INIT(this,
.public = { .public = {
.get_shared_secret = _get_shared_secret, .get_shared_secret = _get_shared_secret,
.set_other_public_value = _set_other_public_value, .set_public_key = _set_public_key,
.get_my_public_value = _get_my_public_value, .get_public_key = _get_public_key,
.get_dh_group = _get_dh_group, .get_method = _get_method,
.destroy = _destroy, .destroy = _destroy,
}, },
.group = group, .method = method,
); );
return &this->public; return &this->public;
} }
src/libcharon/tests/utils/mock_dh.h
+4 -4
View File
@@ -25,14 +25,14 @@
#ifndef MOCK_DH_H_ #ifndef MOCK_DH_H_
#define MOCK_DH_H_ #define MOCK_DH_H_
#include <crypto/diffie_hellman.h> #include <crypto/key_exchange.h>
/** /**
* Creates a diffie_hellman_t object. * Creates a key_exchange_t object.
* *
* @param group Diffie Hellman group, supports MODP_NULL only * @param method key_exchange method, supports MODP_NULL only
* @return created object * @return created object
*/ */
diffie_hellman_t *mock_dh_create(diffie_hellman_group_t group); key_exchange_t *mock_dh_create(key_exchange_method_t method);
#endif /** MOCK_DH_H_ @}*/ #endif /** MOCK_DH_H_ @}*/
src/libimcv/pts/pts.c
+6 -6
View File
@@ -70,7 +70,7 @@ struct private_pts_t {
/** /**
* PTS Diffie-Hellman Secret * PTS Diffie-Hellman Secret
*/ */
diffie_hellman_t *dh; key_exchange_t *dh;
/** /**
* PTS Diffie-Hellman Initiator Nonce * PTS Diffie-Hellman Initiator Nonce
@@ -200,15 +200,15 @@ METHOD(pts_t, set_dh_hash_algorithm, void,
METHOD(pts_t, create_dh_nonce, bool, METHOD(pts_t, create_dh_nonce, bool,
private_pts_t *this, pts_dh_group_t group, int nonce_len) private_pts_t *this, pts_dh_group_t group, int nonce_len)
{ {
diffie_hellman_group_t dh_group; key_exchange_method_t dh_group;
chunk_t *nonce; chunk_t *nonce;
rng_t *rng; rng_t *rng;
dh_group = pts_dh_group_to_ike(group); dh_group = pts_dh_group_to_ike(group);
DBG2(DBG_PTS, "selected PTS DH group is %N", DBG2(DBG_PTS, "selected PTS DH group is %N",
diffie_hellman_group_names, dh_group); key_exchange_method_names, dh_group);
DESTROY_IF(this->dh); DESTROY_IF(this->dh);
this->dh = lib->crypto->create_dh(lib->crypto, dh_group); this->dh = lib->crypto->create_ke(lib->crypto, dh_group);
rng = lib->crypto->create_rng(lib->crypto, RNG_STRONG); rng = lib->crypto->create_rng(lib->crypto, RNG_STRONG);
if (!rng) if (!rng)
@@ -232,7 +232,7 @@ METHOD(pts_t, create_dh_nonce, bool,
METHOD(pts_t, get_my_public_value, bool, METHOD(pts_t, get_my_public_value, bool,
private_pts_t *this, chunk_t *value, chunk_t *nonce) private_pts_t *this, chunk_t *value, chunk_t *nonce)
{ {
if (!this->dh->get_my_public_value(this->dh, value)) if (!this->dh->get_public_key(this->dh, value))
{ {
return FALSE; return FALSE;
} }
@@ -243,7 +243,7 @@ METHOD(pts_t, get_my_public_value, bool,
METHOD(pts_t, set_peer_public_value, bool, METHOD(pts_t, set_peer_public_value, bool,
private_pts_t *this, chunk_t value, chunk_t nonce) private_pts_t *this, chunk_t value, chunk_t nonce)
{ {
if (!this->dh->set_other_public_value(this->dh, value)) if (!this->dh->set_public_key(this->dh, value))
{ {
return FALSE; return FALSE;
} }
src/libimcv/pts/pts_dh_group.c
+9 -9
View File
@@ -24,44 +24,44 @@
bool pts_dh_group_probe(pts_dh_group_t *dh_groups, bool mandatory_dh_groups) bool pts_dh_group_probe(pts_dh_group_t *dh_groups, bool mandatory_dh_groups)
{ {
enumerator_t *enumerator; enumerator_t *enumerator;
diffie_hellman_group_t dh_group; key_exchange_method_t dh_group;
const char *plugin_name; const char *plugin_name;
char format1[] = " %s PTS DH group %N[%s] available"; char format1[] = " %s PTS DH group %N[%s] available";
char format2[] = " %s PTS DH group %N not available"; char format2[] = " %s PTS DH group %N not available";
*dh_groups = PTS_DH_GROUP_NONE; *dh_groups = PTS_DH_GROUP_NONE;
enumerator = lib->crypto->create_dh_enumerator(lib->crypto); enumerator = lib->crypto->create_ke_enumerator(lib->crypto);
while (enumerator->enumerate(enumerator, &dh_group, &plugin_name)) while (enumerator->enumerate(enumerator, &dh_group, &plugin_name))
{ {
if (dh_group == MODP_1024_BIT) if (dh_group == MODP_1024_BIT)
{ {
*dh_groups |= PTS_DH_GROUP_IKE2; *dh_groups |= PTS_DH_GROUP_IKE2;
DBG2(DBG_PTS, format1, "optional ", diffie_hellman_group_names, DBG2(DBG_PTS, format1, "optional ", key_exchange_method_names,
dh_group, plugin_name); dh_group, plugin_name);
} }
else if (dh_group == MODP_1536_BIT) else if (dh_group == MODP_1536_BIT)
{ {
*dh_groups |= PTS_DH_GROUP_IKE5; *dh_groups |= PTS_DH_GROUP_IKE5;
DBG2(DBG_PTS, format1, "optional ", diffie_hellman_group_names, DBG2(DBG_PTS, format1, "optional ", key_exchange_method_names,
dh_group, plugin_name); dh_group, plugin_name);
} }
else if (dh_group == MODP_2048_BIT) else if (dh_group == MODP_2048_BIT)
{ {
*dh_groups |= PTS_DH_GROUP_IKE14; *dh_groups |= PTS_DH_GROUP_IKE14;
DBG2(DBG_PTS, format1, "optional ", diffie_hellman_group_names, DBG2(DBG_PTS, format1, "optional ", key_exchange_method_names,
dh_group, plugin_name); dh_group, plugin_name);
} }
else if (dh_group == ECP_256_BIT) else if (dh_group == ECP_256_BIT)
{ {
*dh_groups |= PTS_DH_GROUP_IKE19; *dh_groups |= PTS_DH_GROUP_IKE19;
DBG2(DBG_PTS, format1, "mandatory", diffie_hellman_group_names, DBG2(DBG_PTS, format1, "mandatory", key_exchange_method_names,
dh_group, plugin_name); dh_group, plugin_name);
} }
else if (dh_group == ECP_384_BIT) else if (dh_group == ECP_384_BIT)
{ {
*dh_groups |= PTS_DH_GROUP_IKE20; *dh_groups |= PTS_DH_GROUP_IKE20;
DBG2(DBG_PTS, format1, "optional ", diffie_hellman_group_names, DBG2(DBG_PTS, format1, "optional ", key_exchange_method_names,
dh_group, plugin_name); dh_group, plugin_name);
} }
} }
@@ -79,7 +79,7 @@ bool pts_dh_group_probe(pts_dh_group_t *dh_groups, bool mandatory_dh_groups)
} }
if (mandatory_dh_groups) if (mandatory_dh_groups)
{ {
DBG1(DBG_PTS, format2, "mandatory", diffie_hellman_group_names, DBG1(DBG_PTS, format2, "mandatory", key_exchange_method_names,
ECP_256_BIT); ECP_256_BIT);
return FALSE; return FALSE;
} }
@@ -165,7 +165,7 @@ pts_dh_group_t pts_dh_group_select(pts_dh_group_t supported_dh_groups,
/** /**
* Described in header. * Described in header.
*/ */
diffie_hellman_group_t pts_dh_group_to_ike(pts_dh_group_t dh_group) key_exchange_method_t pts_dh_group_to_ike(pts_dh_group_t dh_group)
{ {
switch (dh_group) switch (dh_group)
{ {
src/libimcv/pts/pts_dh_group.h
+3 -3
View File
@@ -23,7 +23,7 @@
#define PTS_DH_GROUP_H_ #define PTS_DH_GROUP_H_
#include <library.h> #include <library.h>
#include <crypto/diffie_hellman.h> #include <crypto/key_exchange.h>
typedef enum pts_dh_group_t pts_dh_group_t; typedef enum pts_dh_group_t pts_dh_group_t;
@@ -98,11 +98,11 @@ pts_dh_group_t pts_dh_group_select(pts_dh_group_t supported_groups,
pts_dh_group_t offered_groups); pts_dh_group_t offered_groups);
/** /**
* Convert pts_dh_group_t to diffie_hellman_group_t * Convert pts_dh_group_t to key_exchange_method_t
* *
* @param dh_group PTS DH group type * @param dh_group PTS DH group type
* @return IKE DH group type * @return IKE DH group type
*/ */
diffie_hellman_group_t pts_dh_group_to_ike(pts_dh_group_t dh_group); key_exchange_method_t pts_dh_group_to_ike(pts_dh_group_t dh_group);
#endif /** PTS_DH_GROUP_H_ @}*/ #endif /** PTS_DH_GROUP_H_ @}*/
src/libstrongswan/Android.mk
+1 -1
View File
@@ -15,7 +15,7 @@ crypto/prfs/prf.c crypto/prfs/mac_prf.c crypto/pkcs5.c \
crypto/rngs/rng.c crypto/rngs/rng_tester.c \ crypto/rngs/rng.c crypto/rngs/rng_tester.c \
crypto/signers/signer.c \ crypto/signers/signer.c \
crypto/signers/mac_signer.c crypto/crypto_factory.c crypto/crypto_tester.c \ crypto/signers/mac_signer.c crypto/crypto_factory.c crypto/crypto_tester.c \
crypto/diffie_hellman.c crypto/aead.c crypto/transform.c \ crypto/key_exchange.c crypto/aead.c crypto/transform.c \
crypto/iv/iv_gen.c crypto/iv/iv_gen_rand.c crypto/iv/iv_gen_seq.c \ crypto/iv/iv_gen.c crypto/iv/iv_gen_rand.c crypto/iv/iv_gen_seq.c \
crypto/iv/iv_gen_null.c crypto/kdfs/kdf.c \ crypto/iv/iv_gen_null.c crypto/kdfs/kdf.c \
crypto/xofs/xof.c crypto/xofs/xof_bitspender.c \ crypto/xofs/xof.c crypto/xofs/xof_bitspender.c \
src/libstrongswan/Makefile.am
+2 -2
View File
@@ -13,7 +13,7 @@ crypto/prfs/prf.c crypto/prfs/mac_prf.c crypto/pkcs5.c \
crypto/rngs/rng.c crypto/rngs/rng_tester.c \ crypto/rngs/rng.c crypto/rngs/rng_tester.c \
crypto/signers/signer.c \ crypto/signers/signer.c \
crypto/signers/mac_signer.c crypto/crypto_factory.c crypto/crypto_tester.c \ crypto/signers/mac_signer.c crypto/crypto_factory.c crypto/crypto_tester.c \
crypto/diffie_hellman.c crypto/aead.c crypto/transform.c \ crypto/key_exchange.c crypto/aead.c crypto/transform.c \
crypto/iv/iv_gen.c crypto/iv/iv_gen_rand.c crypto/iv/iv_gen_seq.c \ crypto/iv/iv_gen.c crypto/iv/iv_gen_rand.c crypto/iv/iv_gen_seq.c \
crypto/iv/iv_gen_null.c crypto/kdfs/kdf.c \ crypto/iv/iv_gen_null.c crypto/kdfs/kdf.c \
crypto/xofs/xof.c crypto/xofs/xof_bitspender.c \ crypto/xofs/xof.c crypto/xofs/xof_bitspender.c \
@@ -79,7 +79,7 @@ crypto/proposal/proposal_keywords.h crypto/proposal/proposal_keywords_static.h \
crypto/rngs/rng.h crypto/rngs/rng_tester.h \ crypto/rngs/rng.h crypto/rngs/rng_tester.h \
crypto/prfs/prf.h crypto/prfs/mac_prf.h crypto/nonce_gen.h \ crypto/prfs/prf.h crypto/prfs/mac_prf.h crypto/nonce_gen.h \
crypto/signers/signer.h crypto/signers/mac_signer.h \ crypto/signers/signer.h crypto/signers/mac_signer.h \
crypto/crypto_factory.h crypto/crypto_tester.h crypto/diffie_hellman.h \ crypto/crypto_factory.h crypto/crypto_tester.h crypto/key_exchange.h \
crypto/aead.h crypto/transform.h crypto/pkcs5.h crypto/iv/iv_gen.h \ crypto/aead.h crypto/transform.h crypto/pkcs5.h crypto/iv/iv_gen.h \
crypto/iv/iv_gen_rand.h crypto/iv/iv_gen_seq.h crypto/iv/iv_gen_null.h \ crypto/iv/iv_gen_rand.h crypto/iv/iv_gen_seq.h crypto/iv/iv_gen_null.h \
crypto/xofs/xof.h crypto/xofs/xof_bitspender.h crypto/xofs/mgf1.h \ crypto/xofs/xof.h crypto/xofs/xof_bitspender.h crypto/xofs/mgf1.h \
src/libstrongswan/crypto/crypto_factory.c
+43 -47
View File
@@ -56,7 +56,7 @@ struct entry_t {
drbg_constructor_t create_drbg; drbg_constructor_t create_drbg;
rng_constructor_t create_rng; rng_constructor_t create_rng;
nonce_gen_constructor_t create_nonce_gen; nonce_gen_constructor_t create_nonce_gen;
dh_constructor_t create_dh; ke_constructor_t create_ke;
void *create; void *create;
}; };
}; };
@@ -124,9 +124,9 @@ struct private_crypto_factory_t {
linked_list_t *nonce_gens; linked_list_t *nonce_gens;
/** /**
* registered diffie hellman, as entry_t * registered key exchange methods, as entry_t
*/ */
linked_list_t *dhs; linked_list_t *kes;
/** /**
* test manager to test crypto algorithms * test manager to test crypto algorithms
@@ -484,37 +484,33 @@ METHOD(crypto_factory_t, create_nonce_gen, nonce_gen_t*,
return nonce_gen; return nonce_gen;
} }
METHOD(crypto_factory_t, create_dh, diffie_hellman_t*, METHOD(crypto_factory_t, create_ke, key_exchange_t*,
private_crypto_factory_t *this, diffie_hellman_group_t group, ...) private_crypto_factory_t *this, key_exchange_method_t method, ...)
{ {
enumerator_t *enumerator; enumerator_t *enumerator;
entry_t *entry; entry_t *entry;
va_list args;
chunk_t g = chunk_empty, p = chunk_empty; chunk_t g = chunk_empty, p = chunk_empty;
diffie_hellman_t *diffie_hellman = NULL; key_exchange_t *ke = NULL;
if (group == MODP_CUSTOM) if (method == MODP_CUSTOM)
{ {
va_start(args, group); VA_ARGS_GET(method, g, p);
g = va_arg(args, chunk_t);
p = va_arg(args, chunk_t);
va_end(args);
} }
this->lock->read_lock(this->lock); this->lock->read_lock(this->lock);
enumerator = this->dhs->create_enumerator(this->dhs); enumerator = this->kes->create_enumerator(this->kes);
while (enumerator->enumerate(enumerator, &entry)) while (enumerator->enumerate(enumerator, &entry))
{ {
if (entry->algo == group) if (entry->algo == method)
{ {
if (this->test_on_create && group != MODP_CUSTOM && if (this->test_on_create && method != MODP_CUSTOM &&
!this->tester->test_dh(this->tester, group, !this->tester->test_ke(this->tester, method,
entry->create_dh, NULL, entry->plugin_name)) entry->create_ke, NULL, entry->plugin_name))
{ {
continue; continue;
} }
diffie_hellman = entry->create_dh(group, g, p); ke = entry->create_ke(method, g, p);
if (diffie_hellman) if (ke)
{ {
break; break;
} }
@@ -522,7 +518,7 @@ METHOD(crypto_factory_t, create_dh, diffie_hellman_t*,
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
this->lock->unlock(this->lock); this->lock->unlock(this->lock);
return diffie_hellman; return ke;
} }
/** /**
@@ -935,36 +931,36 @@ METHOD(crypto_factory_t, remove_nonce_gen, void,
this->lock->unlock(this->lock); this->lock->unlock(this->lock);
} }
METHOD(crypto_factory_t, add_dh, bool, METHOD(crypto_factory_t, add_ke, bool,
private_crypto_factory_t *this, diffie_hellman_group_t group, private_crypto_factory_t *this, key_exchange_method_t group,
const char *plugin_name, dh_constructor_t create) const char *plugin_name, ke_constructor_t create)
{ {
u_int speed = 0; u_int speed = 0;
if (!this->test_on_add || if (!this->test_on_add ||
this->tester->test_dh(this->tester, group, create, this->tester->test_ke(this->tester, group, create,
this->bench ? &speed : NULL, plugin_name)) this->bench ? &speed : NULL, plugin_name))
{ {
add_entry(this, this->dhs, group, plugin_name, 0, create); add_entry(this, this->kes, group, plugin_name, 0, create);
return TRUE; return TRUE;
} }
this->test_failures++; this->test_failures++;
return FALSE; return FALSE;
} }
METHOD(crypto_factory_t, remove_dh, void, METHOD(crypto_factory_t, remove_ke, void,
private_crypto_factory_t *this, dh_constructor_t create) private_crypto_factory_t *this, ke_constructor_t create)
{ {
entry_t *entry; entry_t *entry;
enumerator_t *enumerator; enumerator_t *enumerator;
this->lock->write_lock(this->lock); this->lock->write_lock(this->lock);
enumerator = this->dhs->create_enumerator(this->dhs); enumerator = this->kes->create_enumerator(this->kes);
while (enumerator->enumerate(enumerator, &entry)) while (enumerator->enumerate(enumerator, &entry))
{ {
if (entry->create_dh == create) if (entry->create_ke == create)
{ {
this->dhs->remove_at(this->dhs, enumerator); this->kes->remove_at(this->kes, enumerator);
free(entry); free(entry);
} }
} }
@@ -1190,11 +1186,11 @@ METHOD(crypto_factory_t, create_drbg_enumerator, enumerator_t*,
return create_enumerator(this, this->drbgs, drbg_filter); return create_enumerator(this, this->drbgs, drbg_filter);
} }
CALLBACK(dh_filter, bool, CALLBACK(ke_filter, bool,
void *n, enumerator_t *orig, va_list args) void *n, enumerator_t *orig, va_list args)
{ {
entry_t *entry; entry_t *entry;
diffie_hellman_group_t *algo; key_exchange_method_t *algo;
const char **plugin_name; const char **plugin_name;
VA_ARGS_VGET(args, algo, plugin_name); VA_ARGS_VGET(args, algo, plugin_name);
@@ -1208,10 +1204,10 @@ CALLBACK(dh_filter, bool,
return FALSE; return FALSE;
} }
METHOD(crypto_factory_t, create_dh_enumerator, enumerator_t*, METHOD(crypto_factory_t, create_ke_enumerator, enumerator_t*,
private_crypto_factory_t *this) private_crypto_factory_t *this)
{ {
return create_enumerator(this, this->dhs, dh_filter); return create_enumerator(this, this->kes, ke_filter);
} }
CALLBACK(rng_filter, bool, CALLBACK(rng_filter, bool,
@@ -1283,8 +1279,8 @@ METHOD(crypto_factory_t, add_test_vector, void,
return this->tester->add_drbg_vector(this->tester, vector); return this->tester->add_drbg_vector(this->tester, vector);
case RANDOM_NUMBER_GENERATOR: case RANDOM_NUMBER_GENERATOR:
return this->tester->add_rng_vector(this->tester, vector); return this->tester->add_rng_vector(this->tester, vector);
case DIFFIE_HELLMAN_GROUP: case KEY_EXCHANGE_METHOD:
return this->tester->add_dh_vector(this->tester, vector); return this->tester->add_ke_vector(this->tester, vector);
default: default:
DBG1(DBG_LIB, "%N test vectors not supported, ignored", DBG1(DBG_LIB, "%N test vectors not supported, ignored",
transform_type_names, type); transform_type_names, type);
@@ -1354,9 +1350,9 @@ METHOD(enumerator_t, verify_enumerate, bool,
*valid = this->tester->test_rng(this->tester, entry->algo, *valid = this->tester->test_rng(this->tester, entry->algo,
entry->create_rng, NULL, entry->plugin_name); entry->create_rng, NULL, entry->plugin_name);
break; break;
case DIFFIE_HELLMAN_GROUP: case KEY_EXCHANGE_METHOD:
*valid = this->tester->test_dh(this->tester, entry->algo, *valid = this->tester->test_ke(this->tester, entry->algo,
entry->create_dh, NULL, entry->plugin_name); entry->create_ke, NULL, entry->plugin_name);
break; break;
default: default:
return FALSE; return FALSE;
@@ -1410,8 +1406,8 @@ METHOD(crypto_factory_t, create_verify_enumerator, enumerator_t*,
case RANDOM_NUMBER_GENERATOR: case RANDOM_NUMBER_GENERATOR:
inner = this->rngs->create_enumerator(this->rngs); inner = this->rngs->create_enumerator(this->rngs);
break; break;
case DIFFIE_HELLMAN_GROUP: case KEY_EXCHANGE_METHOD:
inner = this->dhs->create_enumerator(this->dhs); inner = this->kes->create_enumerator(this->kes);
break; break;
default: default:
this->lock->unlock(this->lock); this->lock->unlock(this->lock);
@@ -1444,7 +1440,7 @@ METHOD(crypto_factory_t, destroy, void,
this->drbgs->destroy(this->drbgs); this->drbgs->destroy(this->drbgs);
this->rngs->destroy(this->rngs); this->rngs->destroy(this->rngs);
this->nonce_gens->destroy(this->nonce_gens); this->nonce_gens->destroy(this->nonce_gens);
this->dhs->destroy(this->dhs); this->kes->destroy(this->kes);
this->tester->destroy(this->tester); this->tester->destroy(this->tester);
this->lock->destroy(this->lock); this->lock->destroy(this->lock);
free(this); free(this);
@@ -1469,7 +1465,7 @@ crypto_factory_t *crypto_factory_create()
.create_drbg = _create_drbg, .create_drbg = _create_drbg,
.create_rng = _create_rng, .create_rng = _create_rng,
.create_nonce_gen = _create_nonce_gen, .create_nonce_gen = _create_nonce_gen,
.create_dh = _create_dh, .create_ke = _create_ke,
.add_crypter = _add_crypter, .add_crypter = _add_crypter,
.remove_crypter = _remove_crypter, .remove_crypter = _remove_crypter,
.add_aead = _add_aead, .add_aead = _add_aead,
@@ -1490,8 +1486,8 @@ crypto_factory_t *crypto_factory_create()
.remove_rng = _remove_rng, .remove_rng = _remove_rng,
.add_nonce_gen = _add_nonce_gen, .add_nonce_gen = _add_nonce_gen,
.remove_nonce_gen = _remove_nonce_gen, .remove_nonce_gen = _remove_nonce_gen,
.add_dh = _add_dh, .add_ke = _add_ke,
.remove_dh = _remove_dh, .remove_ke = _remove_ke,
.create_crypter_enumerator = _create_crypter_enumerator, .create_crypter_enumerator = _create_crypter_enumerator,
.create_aead_enumerator = _create_aead_enumerator, .create_aead_enumerator = _create_aead_enumerator,
.create_signer_enumerator = _create_signer_enumerator, .create_signer_enumerator = _create_signer_enumerator,
@@ -1500,7 +1496,7 @@ crypto_factory_t *crypto_factory_create()
.create_xof_enumerator = _create_xof_enumerator, .create_xof_enumerator = _create_xof_enumerator,
.create_kdf_enumerator = _create_kdf_enumerator, .create_kdf_enumerator = _create_kdf_enumerator,
.create_drbg_enumerator = _create_drbg_enumerator, .create_drbg_enumerator = _create_drbg_enumerator,
.create_dh_enumerator = _create_dh_enumerator, .create_ke_enumerator = _create_ke_enumerator,
.create_rng_enumerator = _create_rng_enumerator, .create_rng_enumerator = _create_rng_enumerator,
.create_nonce_gen_enumerator = _create_nonce_gen_enumerator, .create_nonce_gen_enumerator = _create_nonce_gen_enumerator,
.add_test_vector = _add_test_vector, .add_test_vector = _add_test_vector,
@@ -1517,7 +1513,7 @@ crypto_factory_t *crypto_factory_create()
.drbgs = linked_list_create(), .drbgs = linked_list_create(),
.rngs = linked_list_create(), .rngs = linked_list_create(),
.nonce_gens = linked_list_create(), .nonce_gens = linked_list_create(),
.dhs = linked_list_create(), .kes = linked_list_create(),
.lock = rwlock_create(RWLOCK_TYPE_DEFAULT), .lock = rwlock_create(RWLOCK_TYPE_DEFAULT),
.tester = crypto_tester_create(), .tester = crypto_tester_create(),
.test_on_add = lib->settings->get_bool(lib->settings, .test_on_add = lib->settings->get_bool(lib->settings,
src/libstrongswan/crypto/crypto_factory.h
+19 -19
View File
@@ -37,7 +37,7 @@ typedef struct crypto_factory_t crypto_factory_t;
#include <crypto/kdfs/kdf.h> #include <crypto/kdfs/kdf.h>
#include <crypto/drbgs/drbg.h> #include <crypto/drbgs/drbg.h>
#include <crypto/nonce_gen.h> #include <crypto/nonce_gen.h>
#include <crypto/diffie_hellman.h> #include <crypto/key_exchange.h>
#include <crypto/transform.h> #include <crypto/transform.h>
#define CRYPTO_MAX_ALG_LINE 120 /* characters */ #define CRYPTO_MAX_ALG_LINE 120 /* characters */
@@ -97,12 +97,12 @@ typedef rng_t* (*rng_constructor_t)(rng_quality_t quality);
typedef nonce_gen_t* (*nonce_gen_constructor_t)(); typedef nonce_gen_t* (*nonce_gen_constructor_t)();
/** /**
* Constructor function for diffie hellman * Constructor function for key exchange methods
* *
* The DH constructor accepts additional arguments for: * The key exchange method constructor accepts additional arguments for:
* - MODP_CUSTOM: chunk_t generator, chunk_t prime * - MODP_CUSTOM: chunk_t generator, chunk_t prime
*/ */
typedef diffie_hellman_t* (*dh_constructor_t)(diffie_hellman_group_t group, ...); typedef key_exchange_t* (*ke_constructor_t)(key_exchange_method_t method, ...);
/** /**
* Handles crypto modules and creates instances. * Handles crypto modules and creates instances.
@@ -207,15 +207,15 @@ struct crypto_factory_t {
nonce_gen_t* (*create_nonce_gen)(crypto_factory_t *this); nonce_gen_t* (*create_nonce_gen)(crypto_factory_t *this);
/** /**
* Create a diffie hellman instance. * Create a key exchange method instance.
* *
* Additional arguments are passed to the DH constructor. * Additional arguments are passed to the key exchange method constructor.
* *
* @param group diffie hellman group * @param method key exchange method
* @return diffie_hellman_t instance, NULL if not supported * @return key_exchange_t instance, NULL if not supported
*/ */
diffie_hellman_t* (*create_dh)(crypto_factory_t *this, key_exchange_t* (*create_ke)(crypto_factory_t *this,
diffie_hellman_group_t group, ...); key_exchange_method_t method, ...);
/** /**
* Register a crypter constructor. * Register a crypter constructor.
@@ -402,22 +402,22 @@ struct crypto_factory_t {
nonce_gen_constructor_t create); nonce_gen_constructor_t create);
/** /**
* Register a diffie hellman constructor. * Register a key exchange method constructor.
* *
* @param group dh group to constructor * @param method key exchange method to constructor
* @param plugin_name plugin that registered this algorithm * @param plugin_name plugin that registered this algorithm
* @param create constructor function for that algorithm * @param create constructor function for that algorithm
* @return TRUE if registered, FALSE if test vector failed * @return TRUE if registered, FALSE if test vector failed
*/ */
bool (*add_dh)(crypto_factory_t *this, diffie_hellman_group_t group, bool (*add_ke)(crypto_factory_t *this, key_exchange_method_t method,
const char *plugin_name, dh_constructor_t create); const char *plugin_name, ke_constructor_t create);
/** /**
* Unregister a diffie hellman constructor. * Unregister a key exchange method constructor.
* *
* @param create constructor function to unregister * @param create constructor function to unregister
*/ */
void (*remove_dh)(crypto_factory_t *this, dh_constructor_t create); void (*remove_ke)(crypto_factory_t *this, ke_constructor_t create);
/** /**
* Create an enumerator over all registered crypter algorithms. * Create an enumerator over all registered crypter algorithms.
@@ -476,11 +476,11 @@ struct crypto_factory_t {
enumerator_t* (*create_drbg_enumerator)(crypto_factory_t *this); enumerator_t* (*create_drbg_enumerator)(crypto_factory_t *this);
/** /**
* Create an enumerator over all registered diffie hellman groups. * Create an enumerator over all registered key exchange method.
* *
* @return enumerator over diffie_hellman_group_t, plugin * @return enumerator over key_exchange_method_t, plugin
*/ */
enumerator_t* (*create_dh_enumerator)(crypto_factory_t *this); enumerator_t* (*create_ke_enumerator)(crypto_factory_t *this);
/** /**
* Create an enumerator over all registered random generators. * Create an enumerator over all registered random generators.
src/libstrongswan/crypto/crypto_tester.c
+41 -41
View File
@@ -85,9 +85,9 @@ struct private_crypto_tester_t {
linked_list_t *rng; linked_list_t *rng;
/** /**
* List of Diffie-Hellman test vectors * List of key exchange method test vectors
*/ */
linked_list_t *dh; linked_list_t *ke;
/** /**
* Is a test vector required to pass a test? * Is a test vector required to pass a test?
@@ -1649,13 +1649,13 @@ failure:
} }
/** /**
* Benchmark a DH backend * Benchmark a key exchange backend
*/ */
static u_int bench_dh(private_crypto_tester_t *this, static u_int bench_ke(private_crypto_tester_t *this,
diffie_hellman_group_t group, dh_constructor_t create) key_exchange_method_t method, ke_constructor_t create)
{ {
chunk_t pub = chunk_empty, shared = chunk_empty; chunk_t pub = chunk_empty, shared = chunk_empty;
diffie_hellman_t *dh; key_exchange_t *ke;
struct timespec start; struct timespec start;
u_int runs; u_int runs;
@@ -1663,46 +1663,46 @@ static u_int bench_dh(private_crypto_tester_t *this,
start_timing(&start); start_timing(&start);
while (end_timing(&start) < this->bench_time) while (end_timing(&start) < this->bench_time)
{ {
dh = create(group); ke = create(method);
if (!dh) if (!ke)
{ {
return 0; return 0;
} }
if (dh->get_my_public_value(dh, &pub) && if (ke->get_public_key(ke, &pub) &&
dh->set_other_public_value(dh, pub) && ke->set_public_key(ke, pub) &&
dh->get_shared_secret(dh, &shared)) ke->get_shared_secret(ke, &shared))
{ {
runs++; runs++;
} }
chunk_free(&pub); chunk_free(&pub);
chunk_free(&shared); chunk_free(&shared);
dh->destroy(dh); ke->destroy(ke);
} }
return runs; return runs;
} }
METHOD(crypto_tester_t, test_dh, bool, METHOD(crypto_tester_t, test_ke, bool,
private_crypto_tester_t *this, diffie_hellman_group_t group, private_crypto_tester_t *this, key_exchange_method_t method,
dh_constructor_t create, u_int *speed, const char *plugin_name) ke_constructor_t create, u_int *speed, const char *plugin_name)
{ {
enumerator_t *enumerator; enumerator_t *enumerator;
dh_test_vector_t *v; ke_test_vector_t *v;
bool failed = FALSE; bool failed = FALSE;
u_int tested = 0; u_int tested = 0;
enumerator = this->dh->create_enumerator(this->dh); enumerator = this->ke->create_enumerator(this->ke);
while (enumerator->enumerate(enumerator, &v)) while (enumerator->enumerate(enumerator, &v))
{ {
diffie_hellman_t *a, *b; key_exchange_t *a, *b;
chunk_t apub, bpub, asec, bsec; chunk_t apub, bpub, asec, bsec;
if (v->group != group) if (v->method != method)
{ {
continue; continue;
} }
a = create(group); a = create(method);
b = create(group); b = create(method);
if (!a || !b) if (!a || !b)
{ {
DESTROY_IF(a); DESTROY_IF(a);
@@ -1710,11 +1710,11 @@ METHOD(crypto_tester_t, test_dh, bool,
failed = TRUE; failed = TRUE;
tested++; tested++;
DBG1(DBG_LIB, "disabled %N[%s]: creating instance failed", DBG1(DBG_LIB, "disabled %N[%s]: creating instance failed",
diffie_hellman_group_names, group, plugin_name); key_exchange_method_names, method, plugin_name);
break; break;
} }
if (!a->set_private_value || !b->set_private_value) if (!a->set_private_key || !b->set_private_key)
{ /* does not support testing */ { /* does not support testing */
a->destroy(a); a->destroy(a);
b->destroy(b); b->destroy(b);
@@ -1725,23 +1725,23 @@ METHOD(crypto_tester_t, test_dh, bool,
apub = bpub = asec = bsec = chunk_empty; apub = bpub = asec = bsec = chunk_empty;
if (!a->set_private_value(a, chunk_create(v->priv_a, v->priv_len)) || if (!a->set_private_key(a, chunk_create(v->priv_a, v->priv_len)) ||
!b->set_private_value(b, chunk_create(v->priv_b, v->priv_len))) !b->set_private_key(b, chunk_create(v->priv_b, v->priv_len)))
{ {
goto failure; goto failure;
} }
if (!a->get_my_public_value(a, &apub) || if (!a->get_public_key(a, &apub) ||
!chunk_equals(apub, chunk_create(v->pub_a, v->pub_len))) !chunk_equals(apub, chunk_create(v->pub_a, v->pub_len)))
{ {
goto failure; goto failure;
} }
if (!b->get_my_public_value(b, &bpub) || if (!b->get_public_key(b, &bpub) ||
!chunk_equals(bpub, chunk_create(v->pub_b, v->pub_len))) !chunk_equals(bpub, chunk_create(v->pub_b, v->pub_len)))
{ {
goto failure; goto failure;
} }
if (!a->set_other_public_value(a, bpub) || if (!a->set_public_key(a, bpub) ||
!b->set_other_public_value(b, apub)) !b->set_public_key(b, apub))
{ {
goto failure; goto failure;
} }
@@ -1767,7 +1767,7 @@ failure:
if (failed) if (failed)
{ {
DBG1(DBG_LIB, "disabled %N[%s]: %s test vector failed", DBG1(DBG_LIB, "disabled %N[%s]: %s test vector failed",
diffie_hellman_group_names, group, plugin_name, get_name(v)); key_exchange_method_names, method, plugin_name, get_name(v));
break; break;
} }
} }
@@ -1776,21 +1776,21 @@ failure:
{ {
DBG1(DBG_LIB, "%s %N[%s]: no test vectors found / untestable", DBG1(DBG_LIB, "%s %N[%s]: no test vectors found / untestable",
this->required ? "disabled" : "enabled ", this->required ? "disabled" : "enabled ",
diffie_hellman_group_names, group, plugin_name); key_exchange_method_names, method, plugin_name);
return !this->required; return !this->required;
} }
if (!failed) if (!failed)
{ {
if (speed) if (speed)
{ {
*speed = bench_dh(this, group, create); *speed = bench_ke(this, method, create);
DBG1(DBG_LIB, "enabled %N[%s]: passed %u test vectors, %d points", DBG1(DBG_LIB, "enabled %N[%s]: passed %u test vectors, %d points",
diffie_hellman_group_names, group, plugin_name, tested, *speed); key_exchange_method_names, method, plugin_name, tested, *speed);
} }
else else
{ {
DBG1(DBG_LIB, "enabled %N[%s]: passed %u test vectors", DBG1(DBG_LIB, "enabled %N[%s]: passed %u test vectors",
diffie_hellman_group_names, group, plugin_name, tested); key_exchange_method_names, method, plugin_name, tested);
} }
} }
return !failed; return !failed;
@@ -1850,10 +1850,10 @@ METHOD(crypto_tester_t, add_rng_vector, void,
this->rng->insert_last(this->rng, vector); this->rng->insert_last(this->rng, vector);
} }
METHOD(crypto_tester_t, add_dh_vector, void, METHOD(crypto_tester_t, add_ke_vector, void,
private_crypto_tester_t *this, dh_test_vector_t *vector) private_crypto_tester_t *this, ke_test_vector_t *vector)
{ {
this->dh->insert_last(this->dh, vector); this->ke->insert_last(this->ke, vector);
} }
METHOD(crypto_tester_t, destroy, void, METHOD(crypto_tester_t, destroy, void,
@@ -1868,7 +1868,7 @@ METHOD(crypto_tester_t, destroy, void,
this->kdf->destroy(this->kdf); this->kdf->destroy(this->kdf);
this->drbg->destroy(this->drbg); this->drbg->destroy(this->drbg);
this->rng->destroy(this->rng); this->rng->destroy(this->rng);
this->dh->destroy(this->dh); this->ke->destroy(this->ke);
free(this); free(this);
} }
@@ -1890,7 +1890,7 @@ crypto_tester_t *crypto_tester_create()
.test_kdf = _test_kdf, .test_kdf = _test_kdf,
.test_drbg = _test_drbg, .test_drbg = _test_drbg,
.test_rng = _test_rng, .test_rng = _test_rng,
.test_dh = _test_dh, .test_ke = _test_ke,
.add_crypter_vector = _add_crypter_vector, .add_crypter_vector = _add_crypter_vector,
.add_aead_vector = _add_aead_vector, .add_aead_vector = _add_aead_vector,
.add_signer_vector = _add_signer_vector, .add_signer_vector = _add_signer_vector,
@@ -1900,7 +1900,7 @@ crypto_tester_t *crypto_tester_create()
.add_kdf_vector = _add_kdf_vector, .add_kdf_vector = _add_kdf_vector,
.add_drbg_vector = _add_drbg_vector, .add_drbg_vector = _add_drbg_vector,
.add_rng_vector = _add_rng_vector, .add_rng_vector = _add_rng_vector,
.add_dh_vector = _add_dh_vector, .add_ke_vector = _add_ke_vector,
.destroy = _destroy, .destroy = _destroy,
}, },
.crypter = linked_list_create(), .crypter = linked_list_create(),
@@ -1912,7 +1912,7 @@ crypto_tester_t *crypto_tester_create()
.kdf = linked_list_create(), .kdf = linked_list_create(),
.drbg = linked_list_create(), .drbg = linked_list_create(),
.rng = linked_list_create(), .rng = linked_list_create(),
.dh = linked_list_create(), .ke = linked_list_create(),
.required = lib->settings->get_bool(lib->settings, .required = lib->settings->get_bool(lib->settings,
"%s.crypto_test.required", FALSE, lib->ns), "%s.crypto_test.required", FALSE, lib->ns),
src/libstrongswan/crypto/crypto_tester.h
+17 -17
View File
@@ -37,7 +37,7 @@ typedef struct kdf_test_vector_t kdf_test_vector_t;
typedef struct kdf_test_args_t kdf_test_args_t; typedef struct kdf_test_args_t kdf_test_args_t;
typedef struct drbg_test_vector_t drbg_test_vector_t; typedef struct drbg_test_vector_t drbg_test_vector_t;
typedef struct rng_test_vector_t rng_test_vector_t; typedef struct rng_test_vector_t rng_test_vector_t;
typedef struct dh_test_vector_t dh_test_vector_t; typedef struct ke_test_vector_t ke_test_vector_t;
struct crypter_test_vector_t { struct crypter_test_vector_t {
/** encryption algorithm this vector tests */ /** encryption algorithm this vector tests */
@@ -182,20 +182,20 @@ struct rng_test_vector_t {
void *user; void *user;
}; };
struct dh_test_vector_t { struct ke_test_vector_t {
/** diffie hellman group to test */ /** key exchange method to test */
diffie_hellman_group_t group; key_exchange_method_t method;
/** private value of alice */ /** private key of alice */
u_char *priv_a; u_char *priv_a;
/** private value of bob */ /** private key of bob */
u_char *priv_b; u_char *priv_b;
/** length of private values */ /** length of private keys */
size_t priv_len; size_t priv_len;
/** expected public value of alice */ /** expected public key of alice */
u_char *pub_a; u_char *pub_a;
/** expected public value of bob */ /** expected public key of bob */
u_char *pub_b; u_char *pub_b;
/** size of public values */ /** size of public keys */
size_t pub_len; size_t pub_len;
/** expected shared secret */ /** expected shared secret */
u_char *shared; u_char *shared;
@@ -318,15 +318,15 @@ struct crypto_tester_t {
rng_constructor_t create, rng_constructor_t create,
u_int *speed, const char *plugin_name); u_int *speed, const char *plugin_name);
/** /**
* Test a Diffie-Hellman implementation. * Test a key exchange implementation.
* *
* @param group group to test * @param ke key exchange method to test
* @param create constructor function for the DH backend * @param create constructor function for the key exchange method
* @param speed speed test result, NULL to omit * @param speed speeed test result, NULL to omit
* @return TRUE if test passed * @return TRUE if test passed
*/ */
bool (*test_dh)(crypto_tester_t *this, diffie_hellman_group_t group, bool (*test_ke)(crypto_tester_t *this, key_exchange_method_t ke,
dh_constructor_t create, ke_constructor_t create,
u_int *speed, const char *plugin_name); u_int *speed, const char *plugin_name);
/** /**
@@ -397,7 +397,7 @@ struct crypto_tester_t {
* *
* @param vector pointer to test vector * @param vector pointer to test vector
*/ */
void (*add_dh_vector)(crypto_tester_t *this, dh_test_vector_t *vector); void (*add_ke_vector)(crypto_tester_t *this, ke_test_vector_t *vector);
/** /**
* Destroy a crypto_tester_t. * Destroy a crypto_tester_t.
src/libstrongswan/crypto/diffie_hellman.c → src/libstrongswan/crypto/key_exchange.c
+39 -39
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2010 Tobias Brunner * Copyright (C) 2010-2019 Tobias Brunner
* Copyright (C) 2005-2010 Martin Willi * Copyright (C) 2005-2010 Martin Willi
* Copyright (C) 2005 Jan Hutter * Copyright (C) 2005 Jan Hutter
* *
@@ -16,15 +16,15 @@
* for more details. * for more details.
*/ */
#include "diffie_hellman.h" #include "key_exchange.h"
ENUM_BEGIN(diffie_hellman_group_names, MODP_NONE, MODP_1024_BIT, ENUM_BEGIN(key_exchange_method_names, MODP_NONE, MODP_1024_BIT,
"MODP_NONE", "MODP_NONE",
"MODP_768", "MODP_768",
"MODP_1024"); "MODP_1024");
ENUM_NEXT(diffie_hellman_group_names, MODP_1536_BIT, MODP_1536_BIT, MODP_1024_BIT, ENUM_NEXT(key_exchange_method_names, MODP_1536_BIT, MODP_1536_BIT, MODP_1024_BIT,
"MODP_1536"); "MODP_1536");
ENUM_NEXT(diffie_hellman_group_names, MODP_2048_BIT, ECP_521_BIT, MODP_1536_BIT, ENUM_NEXT(key_exchange_method_names, MODP_2048_BIT, ECP_521_BIT, MODP_1536_BIT,
"MODP_2048", "MODP_2048",
"MODP_3072", "MODP_3072",
"MODP_4096", "MODP_4096",
@@ -33,7 +33,7 @@ ENUM_NEXT(diffie_hellman_group_names, MODP_2048_BIT, ECP_521_BIT, MODP_1536_BIT,
"ECP_256", "ECP_256",
"ECP_384", "ECP_384",
"ECP_521"); "ECP_521");
ENUM_NEXT(diffie_hellman_group_names, MODP_1024_160, CURVE_448, ECP_521_BIT, ENUM_NEXT(key_exchange_method_names, MODP_1024_160, CURVE_448, ECP_521_BIT,
"MODP_1024_160", "MODP_1024_160",
"MODP_2048_224", "MODP_2048_224",
"MODP_2048_256", "MODP_2048_256",
@@ -45,26 +45,26 @@ ENUM_NEXT(diffie_hellman_group_names, MODP_1024_160, CURVE_448, ECP_521_BIT,
"ECP_512_BP", "ECP_512_BP",
"CURVE_25519", "CURVE_25519",
"CURVE_448"); "CURVE_448");
ENUM_NEXT(diffie_hellman_group_names, MODP_NULL, MODP_NULL, CURVE_448, ENUM_NEXT(key_exchange_method_names, MODP_NULL, MODP_NULL, CURVE_448,
"MODP_NULL"); "MODP_NULL");
ENUM_NEXT(diffie_hellman_group_names, NTRU_112_BIT, NTRU_256_BIT, MODP_NULL, ENUM_NEXT(key_exchange_method_names, NTRU_112_BIT, NTRU_256_BIT, MODP_NULL,
"NTRU_112", "NTRU_112",
"NTRU_128", "NTRU_128",
"NTRU_192", "NTRU_192",
"NTRU_256"); "NTRU_256");
ENUM_NEXT(diffie_hellman_group_names, NH_128_BIT, NH_128_BIT, NTRU_256_BIT, ENUM_NEXT(key_exchange_method_names, NH_128_BIT, NH_128_BIT, NTRU_256_BIT,
"NEWHOPE_128"); "NEWHOPE_128");
ENUM_NEXT(diffie_hellman_group_names, MODP_CUSTOM, MODP_CUSTOM, NH_128_BIT, ENUM_NEXT(key_exchange_method_names, MODP_CUSTOM, MODP_CUSTOM, NH_128_BIT,
"MODP_CUSTOM"); "MODP_CUSTOM");
ENUM_END(diffie_hellman_group_names, MODP_CUSTOM); ENUM_END(key_exchange_method_names, MODP_CUSTOM);
ENUM_BEGIN(diffie_hellman_group_names_short, MODP_NONE, MODP_1024_BIT, ENUM_BEGIN(key_exchange_method_names_short, MODP_NONE, MODP_1024_BIT,
"modpnone", "modpnone",
"modp768", "modp768",
"modp1024"); "modp1024");
ENUM_NEXT(diffie_hellman_group_names_short, MODP_1536_BIT, MODP_1536_BIT, MODP_1024_BIT, ENUM_NEXT(key_exchange_method_names_short, MODP_1536_BIT, MODP_1536_BIT, MODP_1024_BIT,
"modp1536"); "modp1536");
ENUM_NEXT(diffie_hellman_group_names_short, MODP_2048_BIT, ECP_521_BIT, MODP_1536_BIT, ENUM_NEXT(key_exchange_method_names_short, MODP_2048_BIT, ECP_521_BIT, MODP_1536_BIT,
"modp2048", "modp2048",
"modp3072", "modp3072",
"modp4096", "modp4096",
@@ -73,7 +73,7 @@ ENUM_NEXT(diffie_hellman_group_names_short, MODP_2048_BIT, ECP_521_BIT, MODP_153
"ecp256", "ecp256",
"ecp384", "ecp384",
"ecp521"); "ecp521");
ENUM_NEXT(diffie_hellman_group_names_short, MODP_1024_160, CURVE_448, ECP_521_BIT, ENUM_NEXT(key_exchange_method_names_short, MODP_1024_160, CURVE_448, ECP_521_BIT,
"modp1024s160", "modp1024s160",
"modp2048s224", "modp2048s224",
"modp2048s256", "modp2048s256",
@@ -85,27 +85,27 @@ ENUM_NEXT(diffie_hellman_group_names_short, MODP_1024_160, CURVE_448, ECP_521_BI
"ecp512bp", "ecp512bp",
"curve25519", "curve25519",
"curve448"); "curve448");
ENUM_NEXT(diffie_hellman_group_names_short, MODP_NULL, MODP_NULL, CURVE_448, ENUM_NEXT(key_exchange_method_names_short, MODP_NULL, MODP_NULL, CURVE_448,
"modpnull"); "modpnull");
ENUM_NEXT(diffie_hellman_group_names_short, NTRU_112_BIT, NTRU_256_BIT, MODP_NULL, ENUM_NEXT(key_exchange_method_names_short, NTRU_112_BIT, NTRU_256_BIT, MODP_NULL,
"ntru112", "ntru112",
"ntru128", "ntru128",
"ntru192", "ntru192",
"ntru256"); "ntru256");
ENUM_NEXT(diffie_hellman_group_names_short, NH_128_BIT, NH_128_BIT, NTRU_256_BIT, ENUM_NEXT(key_exchange_method_names_short, NH_128_BIT, NH_128_BIT, NTRU_256_BIT,
"newhope128"); "newhope128");
ENUM_NEXT(diffie_hellman_group_names_short, MODP_CUSTOM, MODP_CUSTOM, NH_128_BIT, ENUM_NEXT(key_exchange_method_names_short, MODP_CUSTOM, MODP_CUSTOM, NH_128_BIT,
"modpcustom"); "modpcustom");
ENUM_END(diffie_hellman_group_names_short, MODP_CUSTOM); ENUM_END(key_exchange_method_names_short, MODP_CUSTOM);
/** /**
* List of known diffie hellman group parameters. * List of known Diffie-Hellman group parameters.
*/ */
static struct { static struct {
/* Public part of the struct */ /* Public part of the struct */
diffie_hellman_params_t public; diffie_hellman_params_t public;
/* The group identifier as specified in IKEv2 */ /* The group identifier as specified in IKEv2 */
diffie_hellman_group_t group; key_exchange_method_t group;
} dh_params[] = { } dh_params[] = {
{ {
.group = MODP_768_BIT, .public = { .group = MODP_768_BIT, .public = {
@@ -475,8 +475,8 @@ static struct {
}, },
}; };
/** /*
* See header. * Described in header
*/ */
void diffie_hellman_init() void diffie_hellman_init()
{ {
@@ -500,16 +500,16 @@ void diffie_hellman_init()
} }
} }
/** /*
* Described in header. * Described in header
*/ */
diffie_hellman_params_t *diffie_hellman_get_params(diffie_hellman_group_t group) diffie_hellman_params_t *diffie_hellman_get_params(key_exchange_method_t ke)
{ {
int i; int i;
for (i = 0; i < countof(dh_params); i++) for (i = 0; i < countof(dh_params); i++)
{ {
if (dh_params[i].group == group) if (dh_params[i].group == ke)
{ {
return &dh_params[i].public; return &dh_params[i].public;
} }
@@ -517,12 +517,12 @@ diffie_hellman_params_t *diffie_hellman_get_params(diffie_hellman_group_t group)
return NULL; return NULL;
} }
/** /*
* See header. * Described in header
*/ */
bool diffie_hellman_group_is_ec(diffie_hellman_group_t group) bool key_exchange_is_ecdh(key_exchange_method_t ke)
{ {
switch (group) switch (ke)
{ {
case ECP_256_BIT: case ECP_256_BIT:
case ECP_384_BIT: case ECP_384_BIT:
@@ -541,15 +541,15 @@ bool diffie_hellman_group_is_ec(diffie_hellman_group_t group)
} }
} }
/** /*
* See header. * Described in header
*/ */
bool diffie_hellman_verify_value(diffie_hellman_group_t group, chunk_t value) bool key_exchange_verify_pubkey(key_exchange_method_t ke, chunk_t value)
{ {
diffie_hellman_params_t *params; diffie_hellman_params_t *params;
bool valid = FALSE; bool valid = FALSE;
switch (group) switch (ke)
{ {
case MODP_768_BIT: case MODP_768_BIT:
case MODP_1024_BIT: case MODP_1024_BIT:
@@ -562,7 +562,7 @@ bool diffie_hellman_verify_value(diffie_hellman_group_t group, chunk_t value)
case MODP_1024_160: case MODP_1024_160:
case MODP_2048_224: case MODP_2048_224:
case MODP_2048_256: case MODP_2048_256:
params = diffie_hellman_get_params(group); params = diffie_hellman_get_params(ke);
if (params) if (params)
{ {
valid = value.len == params->prime.len; valid = value.len == params->prime.len;
@@ -610,12 +610,12 @@ bool diffie_hellman_verify_value(diffie_hellman_group_t group, chunk_t value)
case MODP_NONE: case MODP_NONE:
/* fail */ /* fail */
break; break;
/* compile-warn unhandled groups, fail verification */ /* compile-warn unhandled methods, fail verification */
} }
if (!valid) if (!valid)
{ {
DBG1(DBG_ENC, "invalid DH public value size (%zu bytes) for %N", DBG1(DBG_ENC, "invalid DH public value size (%zu bytes) for %N",
value.len, diffie_hellman_group_names, group); value.len, key_exchange_method_names, ke);
} }
return valid; return valid;
} }
src/libstrongswan/crypto/diffie_hellman.h → src/libstrongswan/crypto/key_exchange.h
+49 -54
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2010 Tobias Brunner * Copyright (C) 2010-2019 Tobias Brunner
* Copyright (C) 2005-2007 Martin Willi * Copyright (C) 2005-2007 Martin Willi
* Copyright (C) 2005 Jan Hutter * Copyright (C) 2005 Jan Hutter
* *
@@ -17,21 +17,21 @@
*/ */
/** /**
* @defgroup diffie_hellman diffie_hellman * @defgroup key_exchange key_exchange
* @{ @ingroup crypto * @{ @ingroup crypto
*/ */
#ifndef DIFFIE_HELLMAN_H_ #ifndef KEY_EXCHANGE_H_
#define DIFFIE_HELLMAN_H_ #define KEY_EXCHANGE_H_
typedef enum diffie_hellman_group_t diffie_hellman_group_t; typedef enum key_exchange_method_t key_exchange_method_t;
typedef struct diffie_hellman_t diffie_hellman_t; typedef struct key_exchange_t key_exchange_t;
typedef struct diffie_hellman_params_t diffie_hellman_params_t; typedef struct diffie_hellman_params_t diffie_hellman_params_t;
#include <library.h> #include <library.h>
/** /**
* Diffie-Hellman group. * Key exchange method.
* *
* The modulus (or group) to use for a Diffie-Hellman calculation. * The modulus (or group) to use for a Diffie-Hellman calculation.
* See IKEv2 RFC 3.3.2 and RFC 3526. * See IKEv2 RFC 3.3.2 and RFC 3526.
@@ -40,7 +40,7 @@ typedef struct diffie_hellman_params_t diffie_hellman_params_t;
* ECC Brainpool groups are defined in RFC 6954. * ECC Brainpool groups are defined in RFC 6954.
* Curve25519 and Curve448 groups are defined in RFC 8031. * Curve25519 and Curve448 groups are defined in RFC 8031.
*/ */
enum diffie_hellman_group_t { enum key_exchange_method_t {
MODP_NONE = 0, MODP_NONE = 0,
MODP_768_BIT = 1, MODP_768_BIT = 1,
MODP_1024_BIT = 2, MODP_1024_BIT = 2,
@@ -79,80 +79,75 @@ enum diffie_hellman_group_t {
}; };
/** /**
* enum name for diffie_hellman_group_t. * enum name for key_exchange_method_t.
*/ */
extern enum_name_t *diffie_hellman_group_names; extern enum_name_t *key_exchange_method_names;
/** /**
* enum names for diffie_hellman_group_t (matching proposal keywords). * enum names for key_exchange_method_t (matching proposal keywords).
*/ */
extern enum_name_t *diffie_hellman_group_names_short; extern enum_name_t *key_exchange_method_names_short;
/** /**
* Implementation of the Diffie-Hellman algorithm, as in RFC2631. * Implementation of a key exchange algorithms (e.g. Diffie-Hellman).
*/ */
struct diffie_hellman_t { struct key_exchange_t {
/** /**
* Returns the shared secret of this diffie hellman exchange. * Returns the shared secret of this key exchange method.
* *
* Space for returned secret is allocated and must be freed by the caller. * @param secret shared secret (allocated)
*
* @param secret shared secret will be written into this chunk
* @return TRUE if shared secret computed successfully * @return TRUE if shared secret computed successfully
*/ */
bool (*get_shared_secret)(diffie_hellman_t *this, chunk_t *secret) bool (*get_shared_secret)(key_exchange_t *this, chunk_t *secret)
__attribute__((warn_unused_result)); __attribute__((warn_unused_result));
/** /**
* Sets the public value of partner. * Sets the public key from the peer.
* *
* Chunk gets cloned and can be destroyed afterwards. * @param value public key of peer
* * @return TRUE if other public key verified and set
* @param value public value of partner
* @return TRUE if other public value verified and set
*/ */
bool (*set_other_public_value)(diffie_hellman_t *this, chunk_t value) bool (*set_public_key)(key_exchange_t *this, chunk_t value)
__attribute__((warn_unused_result)); __attribute__((warn_unused_result));
/** /**
* Gets the own public value to transmit. * Gets the own public key to transmit.
* *
* Space for returned chunk is allocated and must be freed by the caller. * @param value public key (allocated)
* * @return TRUE if public key retrieved
* @param value public value of caller is stored at this location
* @return TRUE if public value retrieved
*/ */
bool (*get_my_public_value) (diffie_hellman_t *this, chunk_t *value) bool (*get_public_key)(key_exchange_t *this, chunk_t *value)
__attribute__((warn_unused_result)); __attribute__((warn_unused_result));
/** /**
* Set an explicit own private value to use. * Set an explicit own private key to use.
* *
* Calling this method is usually not required, as the DH backend generates * Calling this method is usually not required, as the DH backend generates
* an appropriate private value itself. It is optional to implement, and * an appropriate private value itself. It is optional to implement, and
* used mostly for testing purposes. * used mostly for testing purposes. The private key may be the actual key
* or a seed for a DRBG.
* *
* @param value private value to set * @param value private key value to set
*/ */
bool (*set_private_value)(diffie_hellman_t *this, chunk_t value) bool (*set_private_key)(key_exchange_t *this, chunk_t value)
__attribute__((warn_unused_result)); __attribute__((warn_unused_result));
/** /**
* Get the DH group used. * Get the key exchange method used.
* *
* @return DH group set in construction * @return key exchange method set in construction
*/ */
diffie_hellman_group_t (*get_dh_group) (diffie_hellman_t *this); key_exchange_method_t (*get_method)(key_exchange_t *this);
/** /**
* Destroys a diffie_hellman_t object. * Destroys a key_exchange_t object.
*/ */
void (*destroy) (diffie_hellman_t *this); void (*destroy)(key_exchange_t *this);
}; };
/** /**
* Parameters for a specific diffie hellman group. * Parameters for a specific Diffie-Hellman group.
*/ */
struct diffie_hellman_params_t { struct diffie_hellman_params_t {
@@ -183,31 +178,31 @@ struct diffie_hellman_params_t {
void diffie_hellman_init(); void diffie_hellman_init();
/** /**
* Get the parameters associated with the specified diffie hellman group. * Get the parameters associated with the specified Diffie-Hellman group.
* *
* Before calling this method, use diffie_hellman_init() to initialize the * Before calling this method, use diffie_hellman_init() to initialize the
* DH group table. This is usually done by library_init(). * DH group table. This is usually done by library_init().
* *
* @param group DH group * @param ke key exchange method (DH group)
* @return The parameters or NULL, if the group is not supported * @return The parameters or NULL, if the group is not supported
*/ */
diffie_hellman_params_t *diffie_hellman_get_params(diffie_hellman_group_t group); diffie_hellman_params_t *diffie_hellman_get_params(key_exchange_method_t ke);
/** /**
* Check if a given DH group is an ECDH group * Check if a given key exchange method is an ECDH group.
* *
* @param group group to check * @param ke key exchange method to check
* @return TRUE if group is an ECP group * @return TRUE if key exchange method is an ECP group
*/ */
bool diffie_hellman_group_is_ec(diffie_hellman_group_t group); bool key_exchange_is_ecdh(key_exchange_method_t ke);
/** /**
* Check if a diffie hellman public value is valid for given group. * Check if a public key is valid for given key exchange method.
* *
* @param group group the value is used in * @param ke key exchange method
* @param value public DH value to check * @param value public key to check
* @return TRUE if value looks valid for group * @return TRUE if value looks valid
*/ */
bool diffie_hellman_verify_value(diffie_hellman_group_t group, chunk_t value); bool key_exchange_verify_pubkey(key_exchange_method_t ke, chunk_t value);
#endif /** DIFFIE_HELLMAN_H_ @}*/ #endif /** KEY_EXCHANGE_H_ @}*/
src/libstrongswan/crypto/proposal/proposal.c
+25 -25
View File
@@ -252,18 +252,18 @@ METHOD(proposal_t, get_algorithm, bool,
return found; return found;
} }
METHOD(proposal_t, has_dh_group, bool, METHOD(proposal_t, has_ke_method, bool,
private_proposal_t *this, diffie_hellman_group_t group) private_proposal_t *this, key_exchange_method_t ke)
{ {
bool found = FALSE, any = FALSE; bool found = FALSE, any = FALSE;
enumerator_t *enumerator; enumerator_t *enumerator;
uint16_t current; uint16_t current;
enumerator = create_enumerator(this, DIFFIE_HELLMAN_GROUP); enumerator = create_enumerator(this, KEY_EXCHANGE_METHOD);
while (enumerator->enumerate(enumerator, &current, NULL)) while (enumerator->enumerate(enumerator, &current, NULL))
{ {
any = TRUE; any = TRUE;
if (current == group) if (current == ke)
{ {
found = TRUE; found = TRUE;
break; break;
@@ -271,15 +271,15 @@ METHOD(proposal_t, has_dh_group, bool,
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
if (!any && group == MODP_NONE) if (!any && ke == MODP_NONE)
{ {
found = TRUE; found = TRUE;
} }
return found; return found;
} }
METHOD(proposal_t, promote_dh_group, bool, METHOD(proposal_t, promote_ke_method, bool,
private_proposal_t *this, diffie_hellman_group_t group) private_proposal_t *this, key_exchange_method_t method)
{ {
enumerator_t *enumerator; enumerator_t *enumerator;
entry_t *entry; entry_t *entry;
@@ -288,8 +288,8 @@ METHOD(proposal_t, promote_dh_group, bool,
enumerator = array_create_enumerator(this->transforms); enumerator = array_create_enumerator(this->transforms);
while (enumerator->enumerate(enumerator, &entry)) while (enumerator->enumerate(enumerator, &entry))
{ {
if (entry->type == DIFFIE_HELLMAN_GROUP && if (entry->type == KEY_EXCHANGE_METHOD &&
entry->alg == group) entry->alg == method)
{ {
array_remove_at(this->transforms, enumerator); array_remove_at(this->transforms, enumerator);
found = TRUE; found = TRUE;
@@ -300,8 +300,8 @@ METHOD(proposal_t, promote_dh_group, bool,
if (found) if (found)
{ {
entry_t entry = { entry_t entry = {
.type = DIFFIE_HELLMAN_GROUP, .type = KEY_EXCHANGE_METHOD,
.alg = group, .alg = method,
}; };
array_insert(this->transforms, ARRAY_HEAD, &entry); array_insert(this->transforms, ARRAY_HEAD, &entry);
} }
@@ -319,7 +319,7 @@ static bool select_algo(private_proposal_t *this, proposal_t *other,
uint16_t alg1, alg2, ks1, ks2; uint16_t alg1, alg2, ks1, ks2;
bool found = FALSE, optional = FALSE; bool found = FALSE, optional = FALSE;
if (type == DIFFIE_HELLMAN_GROUP) if (type == KEY_EXCHANGE_METHOD)
{ {
optional = this->protocol == PROTO_ESP || this->protocol == PROTO_AH; optional = this->protocol == PROTO_ESP || this->protocol == PROTO_AH;
} }
@@ -408,7 +408,7 @@ static bool select_algos(private_proposal_t *this, proposal_t *other,
{ {
continue; continue;
} }
if (type == DIFFIE_HELLMAN_GROUP && (flags & PROPOSAL_SKIP_DH)) if (type == KEY_EXCHANGE_METHOD && (flags & PROPOSAL_SKIP_KE))
{ {
continue; continue;
} }
@@ -601,7 +601,7 @@ METHOD(proposal_t, clone_, proposal_t*,
{ {
continue; continue;
} }
if (entry->type == DIFFIE_HELLMAN_GROUP && (flags & PROPOSAL_SKIP_DH)) if (entry->type == KEY_EXCHANGE_METHOD && (flags & PROPOSAL_SKIP_KE))
{ {
continue; continue;
} }
@@ -696,13 +696,13 @@ static bool check_proposal(private_proposal_t *this)
e = array_create_enumerator(this->transforms); e = array_create_enumerator(this->transforms);
while (e->enumerate(e, &entry)) while (e->enumerate(e, &entry))
{ {
if (entry->type == DIFFIE_HELLMAN_GROUP && !entry->alg) if (entry->type == KEY_EXCHANGE_METHOD && !entry->alg)
{ {
array_remove_at(this->transforms, e); array_remove_at(this->transforms, e);
} }
} }
e->destroy(e); e->destroy(e);
if (!get_algorithm(this, DIFFIE_HELLMAN_GROUP, NULL, NULL)) if (!get_algorithm(this, KEY_EXCHANGE_METHOD, NULL, NULL))
{ {
DBG1(DBG_CFG, "a DH group is mandatory in IKE proposals"); DBG1(DBG_CFG, "a DH group is mandatory in IKE proposals");
return FALSE; return FALSE;
@@ -943,8 +943,8 @@ proposal_t *proposal_create_v1(protocol_id_t protocol, uint8_t number,
.add_algorithm = _add_algorithm, .add_algorithm = _add_algorithm,
.create_enumerator = _create_enumerator, .create_enumerator = _create_enumerator,
.get_algorithm = _get_algorithm, .get_algorithm = _get_algorithm,
.has_dh_group = _has_dh_group, .has_ke_method = _has_ke_method,
.promote_dh_group = _promote_dh_group, .promote_ke_method = _promote_ke_method,
.select = _select_proposal, .select = _select_proposal,
.matches = _matches, .matches = _matches,
.get_protocol = _get_protocol, .get_protocol = _get_protocol,
@@ -983,7 +983,7 @@ static bool proposal_add_supported_ike(private_proposal_t *this, bool aead)
encryption_algorithm_t encryption; encryption_algorithm_t encryption;
integrity_algorithm_t integrity; integrity_algorithm_t integrity;
pseudo_random_function_t prf; pseudo_random_function_t prf;
diffie_hellman_group_t group; key_exchange_method_t group;
const char *plugin_name; const char *plugin_name;
if (aead) if (aead)
@@ -1175,7 +1175,7 @@ static bool proposal_add_supported_ike(private_proposal_t *this, bool aead)
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
/* Round 1 adds ECC and NTRU algorithms with at least 128 bit security strength */ /* Round 1 adds ECC and NTRU algorithms with at least 128 bit security strength */
enumerator = lib->crypto->create_dh_enumerator(lib->crypto); enumerator = lib->crypto->create_ke_enumerator(lib->crypto);
while (enumerator->enumerate(enumerator, &group, &plugin_name)) while (enumerator->enumerate(enumerator, &group, &plugin_name))
{ {
switch (group) switch (group)
@@ -1192,7 +1192,7 @@ static bool proposal_add_supported_ike(private_proposal_t *this, bool aead)
case NTRU_192_BIT: case NTRU_192_BIT:
case NTRU_256_BIT: case NTRU_256_BIT:
case NH_128_BIT: case NH_128_BIT:
add_algorithm(this, DIFFIE_HELLMAN_GROUP, group, 0); add_algorithm(this, KEY_EXCHANGE_METHOD, group, 0);
break; break;
default: default:
break; break;
@@ -1201,7 +1201,7 @@ static bool proposal_add_supported_ike(private_proposal_t *this, bool aead)
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
/* Round 2 adds other algorithms with at least 128 bit security strength */ /* Round 2 adds other algorithms with at least 128 bit security strength */
enumerator = lib->crypto->create_dh_enumerator(lib->crypto); enumerator = lib->crypto->create_ke_enumerator(lib->crypto);
while (enumerator->enumerate(enumerator, &group, &plugin_name)) while (enumerator->enumerate(enumerator, &group, &plugin_name))
{ {
switch (group) switch (group)
@@ -1210,7 +1210,7 @@ static bool proposal_add_supported_ike(private_proposal_t *this, bool aead)
case MODP_4096_BIT: case MODP_4096_BIT:
case MODP_6144_BIT: case MODP_6144_BIT:
case MODP_8192_BIT: case MODP_8192_BIT:
add_algorithm(this, DIFFIE_HELLMAN_GROUP, group, 0); add_algorithm(this, KEY_EXCHANGE_METHOD, group, 0);
break; break;
default: default:
break; break;
@@ -1219,7 +1219,7 @@ static bool proposal_add_supported_ike(private_proposal_t *this, bool aead)
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
/* Round 3 adds algorithms with less than 128 bit security strength */ /* Round 3 adds algorithms with less than 128 bit security strength */
enumerator = lib->crypto->create_dh_enumerator(lib->crypto); enumerator = lib->crypto->create_ke_enumerator(lib->crypto);
while (enumerator->enumerate(enumerator, &group, &plugin_name)) while (enumerator->enumerate(enumerator, &group, &plugin_name))
{ {
switch (group) switch (group)
@@ -1244,7 +1244,7 @@ static bool proposal_add_supported_ike(private_proposal_t *this, bool aead)
/* rarely used */ /* rarely used */
break; break;
case MODP_2048_BIT: case MODP_2048_BIT:
add_algorithm(this, DIFFIE_HELLMAN_GROUP, group, 0); add_algorithm(this, KEY_EXCHANGE_METHOD, group, 0);
break; break;
default: default:
break; break;
src/libstrongswan/crypto/proposal/proposal.h
+10 -10
View File
@@ -35,7 +35,7 @@ typedef struct proposal_t proposal_t;
#include <crypto/transform.h> #include <crypto/transform.h>
#include <crypto/crypters/crypter.h> #include <crypto/crypters/crypter.h>
#include <crypto/signers/signer.h> #include <crypto/signers/signer.h>
#include <crypto/diffie_hellman.h> #include <crypto/key_exchange.h>
/** /**
* Protocol ID of a proposal. * Protocol ID of a proposal.
@@ -61,8 +61,8 @@ enum proposal_selection_flag_t {
PROPOSAL_PREFER_SUPPLIED = (1<<0), PROPOSAL_PREFER_SUPPLIED = (1<<0),
/** Whether to skip and ignore algorithms from a private range. */ /** Whether to skip and ignore algorithms from a private range. */
PROPOSAL_SKIP_PRIVATE = (1<<1), PROPOSAL_SKIP_PRIVATE = (1<<1),
/** Whether to skip and ignore diffie hellman groups. */ /** Whether to skip and ignore key exchange methods. */
PROPOSAL_SKIP_DH = (1<<2), PROPOSAL_SKIP_KE = (1<<2),
}; };
/** /**
@@ -110,21 +110,21 @@ struct proposal_t {
uint16_t *alg, uint16_t *key_size); uint16_t *alg, uint16_t *key_size);
/** /**
* Check if the proposal has a specific DH group. * Check if the proposal has a specific key exchange method.
* *
* @param group group to check for * @param method key exchange method to check for
* @return TRUE if algorithm included * @return TRUE if algorithm included
*/ */
bool (*has_dh_group)(proposal_t *this, diffie_hellman_group_t group); bool (*has_ke_method)(proposal_t *this, key_exchange_method_t method);
/** /**
* Move the given DH group to the front of the list if it was contained in * Move the given key exchange method to the front of the list if it was
* the proposal. * contained in the proposal.
* *
* @param group group to promote * @param method key exchange method to promote
* @return TRUE if algorithm included * @return TRUE if algorithm included
*/ */
bool (*promote_dh_group)(proposal_t *this, diffie_hellman_group_t group); bool (*promote_ke_method)(proposal_t *this, key_exchange_method_t method);
/** /**
* Compare two proposals and select a matching subset. * Compare two proposals and select a matching subset.
src/libstrongswan/crypto/proposal/proposal_keywords_static.txt
+32 -32
View File
@@ -20,7 +20,7 @@
#include <crypto/transform.h> #include <crypto/transform.h>
#include <crypto/crypters/crypter.h> #include <crypto/crypters/crypter.h>
#include <crypto/signers/signer.h> #include <crypto/signers/signer.h>
#include <crypto/diffie_hellman.h> #include <crypto/key_exchange.h>
%} %}
struct proposal_token { struct proposal_token {
@@ -149,36 +149,36 @@ prfmd5, PSEUDO_RANDOM_FUNCTION, PRF_HMAC_MD5, 0
prfaesxcbc, PSEUDO_RANDOM_FUNCTION, PRF_AES128_XCBC, 0 prfaesxcbc, PSEUDO_RANDOM_FUNCTION, PRF_AES128_XCBC, 0
prfcamelliaxcbc, PSEUDO_RANDOM_FUNCTION, PRF_CAMELLIA128_XCBC, 0 prfcamelliaxcbc, PSEUDO_RANDOM_FUNCTION, PRF_CAMELLIA128_XCBC, 0
prfaescmac, PSEUDO_RANDOM_FUNCTION, PRF_AES128_CMAC, 0 prfaescmac, PSEUDO_RANDOM_FUNCTION, PRF_AES128_CMAC, 0
modpnone, DIFFIE_HELLMAN_GROUP, MODP_NONE, 0 modpnone, KEY_EXCHANGE_METHOD, MODP_NONE, 0
modpnull, DIFFIE_HELLMAN_GROUP, MODP_NULL, 0 modpnull, KEY_EXCHANGE_METHOD, MODP_NULL, 0
modp768, DIFFIE_HELLMAN_GROUP, MODP_768_BIT, 0 modp768, KEY_EXCHANGE_METHOD, MODP_768_BIT, 0
modp1024, DIFFIE_HELLMAN_GROUP, MODP_1024_BIT, 0 modp1024, KEY_EXCHANGE_METHOD, MODP_1024_BIT, 0
modp1536, DIFFIE_HELLMAN_GROUP, MODP_1536_BIT, 0 modp1536, KEY_EXCHANGE_METHOD, MODP_1536_BIT, 0
modp2048, DIFFIE_HELLMAN_GROUP, MODP_2048_BIT, 0 modp2048, KEY_EXCHANGE_METHOD, MODP_2048_BIT, 0
modp3072, DIFFIE_HELLMAN_GROUP, MODP_3072_BIT, 0 modp3072, KEY_EXCHANGE_METHOD, MODP_3072_BIT, 0
modp4096, DIFFIE_HELLMAN_GROUP, MODP_4096_BIT, 0 modp4096, KEY_EXCHANGE_METHOD, MODP_4096_BIT, 0
modp6144, DIFFIE_HELLMAN_GROUP, MODP_6144_BIT, 0 modp6144, KEY_EXCHANGE_METHOD, MODP_6144_BIT, 0
modp8192, DIFFIE_HELLMAN_GROUP, MODP_8192_BIT, 0 modp8192, KEY_EXCHANGE_METHOD, MODP_8192_BIT, 0
ecp192, DIFFIE_HELLMAN_GROUP, ECP_192_BIT, 0 ecp192, KEY_EXCHANGE_METHOD, ECP_192_BIT, 0
ecp224, DIFFIE_HELLMAN_GROUP, ECP_224_BIT, 0 ecp224, KEY_EXCHANGE_METHOD, ECP_224_BIT, 0
ecp256, DIFFIE_HELLMAN_GROUP, ECP_256_BIT, 0 ecp256, KEY_EXCHANGE_METHOD, ECP_256_BIT, 0
ecp384, DIFFIE_HELLMAN_GROUP, ECP_384_BIT, 0 ecp384, KEY_EXCHANGE_METHOD, ECP_384_BIT, 0
ecp521, DIFFIE_HELLMAN_GROUP, ECP_521_BIT, 0 ecp521, KEY_EXCHANGE_METHOD, ECP_521_BIT, 0
modp1024s160, DIFFIE_HELLMAN_GROUP, MODP_1024_160, 0 modp1024s160, KEY_EXCHANGE_METHOD, MODP_1024_160, 0
modp2048s224, DIFFIE_HELLMAN_GROUP, MODP_2048_224, 0 modp2048s224, KEY_EXCHANGE_METHOD, MODP_2048_224, 0
modp2048s256, DIFFIE_HELLMAN_GROUP, MODP_2048_256, 0 modp2048s256, KEY_EXCHANGE_METHOD, MODP_2048_256, 0
ecp224bp, DIFFIE_HELLMAN_GROUP, ECP_224_BP, 0 ecp224bp, KEY_EXCHANGE_METHOD, ECP_224_BP, 0
ecp256bp, DIFFIE_HELLMAN_GROUP, ECP_256_BP, 0 ecp256bp, KEY_EXCHANGE_METHOD, ECP_256_BP, 0
ecp384bp, DIFFIE_HELLMAN_GROUP, ECP_384_BP, 0 ecp384bp, KEY_EXCHANGE_METHOD, ECP_384_BP, 0
ecp512bp, DIFFIE_HELLMAN_GROUP, ECP_512_BP, 0 ecp512bp, KEY_EXCHANGE_METHOD, ECP_512_BP, 0
curve25519, DIFFIE_HELLMAN_GROUP, CURVE_25519, 0 curve25519, KEY_EXCHANGE_METHOD, CURVE_25519, 0
x25519, DIFFIE_HELLMAN_GROUP, CURVE_25519, 0 x25519, KEY_EXCHANGE_METHOD, CURVE_25519, 0
curve448, DIFFIE_HELLMAN_GROUP, CURVE_448, 0 curve448, KEY_EXCHANGE_METHOD, CURVE_448, 0
x448, DIFFIE_HELLMAN_GROUP, CURVE_448, 0 x448, KEY_EXCHANGE_METHOD, CURVE_448, 0
ntru112, DIFFIE_HELLMAN_GROUP, NTRU_112_BIT, 0 ntru112, KEY_EXCHANGE_METHOD, NTRU_112_BIT, 0
ntru128, DIFFIE_HELLMAN_GROUP, NTRU_128_BIT, 0 ntru128, KEY_EXCHANGE_METHOD, NTRU_128_BIT, 0
ntru192, DIFFIE_HELLMAN_GROUP, NTRU_192_BIT, 0 ntru192, KEY_EXCHANGE_METHOD, NTRU_192_BIT, 0
ntru256, DIFFIE_HELLMAN_GROUP, NTRU_256_BIT, 0 ntru256, KEY_EXCHANGE_METHOD, NTRU_256_BIT, 0
newhope128, DIFFIE_HELLMAN_GROUP, NH_128_BIT, 0 newhope128, KEY_EXCHANGE_METHOD, NH_128_BIT, 0
noesn, EXTENDED_SEQUENCE_NUMBERS, NO_EXT_SEQ_NUMBERS, 0 noesn, EXTENDED_SEQUENCE_NUMBERS, NO_EXT_SEQ_NUMBERS, 0
esn, EXTENDED_SEQUENCE_NUMBERS, EXT_SEQ_NUMBERS, 0 esn, EXTENDED_SEQUENCE_NUMBERS, EXT_SEQ_NUMBERS, 0
src/libstrongswan/crypto/transform.c
+3 -3
View File
@@ -23,7 +23,7 @@ ENUM_BEGIN(transform_type_names, ENCRYPTION_ALGORITHM, EXTENDED_SEQUENCE_NUMBERS
"ENCRYPTION_ALGORITHM", "ENCRYPTION_ALGORITHM",
"PSEUDO_RANDOM_FUNCTION", "PSEUDO_RANDOM_FUNCTION",
"INTEGRITY_ALGORITHM", "INTEGRITY_ALGORITHM",
"DIFFIE_HELLMAN_GROUP", "KEY_EXCHANGE_METHOD",
"EXTENDED_SEQUENCE_NUMBERS"); "EXTENDED_SEQUENCE_NUMBERS");
ENUM_NEXT(transform_type_names, HASH_ALGORITHM, KEY_DERIVATION_FUNCTION, ENUM_NEXT(transform_type_names, HASH_ALGORITHM, KEY_DERIVATION_FUNCTION,
EXTENDED_SEQUENCE_NUMBERS, EXTENDED_SEQUENCE_NUMBERS,
@@ -59,8 +59,8 @@ enum_name_t* transform_get_enum_names(transform_type_t type)
return pseudo_random_function_names; return pseudo_random_function_names;
case INTEGRITY_ALGORITHM: case INTEGRITY_ALGORITHM:
return integrity_algorithm_names; return integrity_algorithm_names;
case DIFFIE_HELLMAN_GROUP: case KEY_EXCHANGE_METHOD:
return diffie_hellman_group_names; return key_exchange_method_names;
case EXTENDED_SEQUENCE_NUMBERS: case EXTENDED_SEQUENCE_NUMBERS:
return extended_sequence_numbers_names; return extended_sequence_numbers_names;
case EXTENDED_OUTPUT_FUNCTION: case EXTENDED_OUTPUT_FUNCTION:
src/libstrongswan/crypto/transform.h
+1 -1
View File
@@ -33,7 +33,7 @@ enum transform_type_t {
ENCRYPTION_ALGORITHM = 1, ENCRYPTION_ALGORITHM = 1,
PSEUDO_RANDOM_FUNCTION = 2, PSEUDO_RANDOM_FUNCTION = 2,
INTEGRITY_ALGORITHM = 3, INTEGRITY_ALGORITHM = 3,
DIFFIE_HELLMAN_GROUP = 4, KEY_EXCHANGE_METHOD = 4,
EXTENDED_SEQUENCE_NUMBERS = 5, EXTENDED_SEQUENCE_NUMBERS = 5,
HASH_ALGORITHM = 256, HASH_ALGORITHM = 256,
RANDOM_NUMBER_GENERATOR = 257, RANDOM_NUMBER_GENERATOR = 257,
src/libstrongswan/plugins/botan/botan_diffie_hellman.c
+15 -15
View File
@@ -49,7 +49,7 @@ struct private_botan_diffie_hellman_t {
/** /**
* Diffie Hellman group number * Diffie Hellman group number
*/ */
diffie_hellman_group_t group; key_exchange_method_t group;
/** /**
* Private key * Private key
@@ -94,10 +94,10 @@ bool load_private_key(private_botan_diffie_hellman_t *this, chunk_t value)
return TRUE; return TRUE;
} }
METHOD(diffie_hellman_t, set_other_public_value, bool, METHOD(key_exchange_t, set_public_key, bool,
private_botan_diffie_hellman_t *this, chunk_t value) private_botan_diffie_hellman_t *this, chunk_t value)
{ {
if (!diffie_hellman_verify_value(this->group, value)) if (!key_exchange_verify_pubkey(this->group, value))
{ {
return FALSE; return FALSE;
} }
@@ -107,7 +107,7 @@ METHOD(diffie_hellman_t, set_other_public_value, bool,
return botan_dh_key_derivation(this->dh_key, value, &this->shared_secret); return botan_dh_key_derivation(this->dh_key, value, &this->shared_secret);
} }
METHOD(diffie_hellman_t, get_my_public_value, bool, METHOD(key_exchange_t, get_public_key, bool,
private_botan_diffie_hellman_t *this, chunk_t *value) private_botan_diffie_hellman_t *this, chunk_t *value)
{ {
*value = chunk_empty; *value = chunk_empty;
@@ -129,14 +129,14 @@ METHOD(diffie_hellman_t, get_my_public_value, bool,
return TRUE; return TRUE;
} }
METHOD(diffie_hellman_t, set_private_value, bool, METHOD(key_exchange_t, set_private_key, bool,
private_botan_diffie_hellman_t *this, chunk_t value) private_botan_diffie_hellman_t *this, chunk_t value)
{ {
chunk_clear(&this->shared_secret); chunk_clear(&this->shared_secret);
return load_private_key(this, value); return load_private_key(this, value);
} }
METHOD(diffie_hellman_t, get_shared_secret, bool, METHOD(key_exchange_t, get_shared_secret, bool,
private_botan_diffie_hellman_t *this, chunk_t *secret) private_botan_diffie_hellman_t *this, chunk_t *secret)
{ {
if (!this->shared_secret.len) if (!this->shared_secret.len)
@@ -147,13 +147,13 @@ METHOD(diffie_hellman_t, get_shared_secret, bool,
return TRUE; return TRUE;
} }
METHOD(diffie_hellman_t, get_dh_group, diffie_hellman_group_t, METHOD(key_exchange_t, get_method, key_exchange_method_t,
private_botan_diffie_hellman_t *this) private_botan_diffie_hellman_t *this)
{ {
return this->group; return this->group;
} }
METHOD(diffie_hellman_t, destroy, void, METHOD(key_exchange_t, destroy, void,
private_botan_diffie_hellman_t *this) private_botan_diffie_hellman_t *this)
{ {
botan_mp_destroy(this->p); botan_mp_destroy(this->p);
@@ -166,7 +166,7 @@ METHOD(diffie_hellman_t, destroy, void,
/* /*
* Generic internal constructor * Generic internal constructor
*/ */
static botan_diffie_hellman_t *create_generic(diffie_hellman_group_t group, static botan_diffie_hellman_t *create_generic(key_exchange_method_t group,
chunk_t g, chunk_t p, size_t exp_len) chunk_t g, chunk_t p, size_t exp_len)
{ {
private_botan_diffie_hellman_t *this; private_botan_diffie_hellman_t *this;
@@ -175,12 +175,12 @@ static botan_diffie_hellman_t *create_generic(diffie_hellman_group_t group,
INIT(this, INIT(this,
.public = { .public = {
.dh = { .ke = {
.get_shared_secret = _get_shared_secret, .get_shared_secret = _get_shared_secret,
.set_other_public_value = _set_other_public_value, .set_public_key = _set_public_key,
.get_my_public_value = _get_my_public_value, .get_public_key = _get_public_key,
.set_private_value = _set_private_value, .set_private_key = _set_private_key,
.get_dh_group = _get_dh_group, .get_method = _get_method,
.destroy = _destroy, .destroy = _destroy,
}, },
}, },
@@ -222,7 +222,7 @@ static botan_diffie_hellman_t *create_generic(diffie_hellman_group_t group,
* Described in header. * Described in header.
*/ */
botan_diffie_hellman_t *botan_diffie_hellman_create( botan_diffie_hellman_t *botan_diffie_hellman_create(
diffie_hellman_group_t group, ...) key_exchange_method_t group, ...)
{ {
diffie_hellman_params_t *params; diffie_hellman_params_t *params;
chunk_t g, p; chunk_t g, p;
src/libstrongswan/plugins/botan/botan_diffie_hellman.h
+5 -5
View File
@@ -32,7 +32,7 @@
typedef struct botan_diffie_hellman_t botan_diffie_hellman_t; typedef struct botan_diffie_hellman_t botan_diffie_hellman_t;
#include <crypto/diffie_hellman.h> #include <crypto/key_exchange.h>
/** /**
* Implementation of the Diffie-Hellman algorithm using Botan. * Implementation of the Diffie-Hellman algorithm using Botan.
@@ -40,20 +40,20 @@ typedef struct botan_diffie_hellman_t botan_diffie_hellman_t;
struct botan_diffie_hellman_t { struct botan_diffie_hellman_t {
/** /**
* Implements diffie_hellman_t interface. * Implements key_exchange_t interface.
*/ */
diffie_hellman_t dh; key_exchange_t ke;
}; };
/** /**
* Creates a new botan_diffie_hellman_t object. * Creates a new botan_diffie_hellman_t object.
* *
* @param group Diffie Hellman group number to use * @param group Diffie-Hellman group number to use
* @param ... expects generator and prime as chunk_t if MODP_CUSTOM * @param ... expects generator and prime as chunk_t if MODP_CUSTOM
* @return botan_diffie_hellman_t object, * @return botan_diffie_hellman_t object,
* NULL if not supported * NULL if not supported
*/ */
botan_diffie_hellman_t *botan_diffie_hellman_create( botan_diffie_hellman_t *botan_diffie_hellman_create(
diffie_hellman_group_t group, ...); key_exchange_method_t group, ...);
#endif /** BOTAN_DIFFIE_HELLMAN_H_ @}*/ #endif /** BOTAN_DIFFIE_HELLMAN_H_ @}*/
src/libstrongswan/plugins/botan/botan_ec_diffie_hellman.c
+14 -14
View File
@@ -48,7 +48,7 @@ struct private_botan_ec_diffie_hellman_t {
/** /**
* Diffie Hellman group * Diffie Hellman group
*/ */
diffie_hellman_group_t group; key_exchange_method_t group;
/** /**
* EC curve name * EC curve name
@@ -66,10 +66,10 @@ struct private_botan_ec_diffie_hellman_t {
chunk_t shared_secret; chunk_t shared_secret;
}; };
METHOD(diffie_hellman_t, set_other_public_value, bool, METHOD(key_exchange_t, set_public_key, bool,
private_botan_ec_diffie_hellman_t *this, chunk_t value) private_botan_ec_diffie_hellman_t *this, chunk_t value)
{ {
if (!diffie_hellman_verify_value(this->group, value)) if (!key_exchange_verify_pubkey(this->group, value))
{ {
return FALSE; return FALSE;
} }
@@ -82,7 +82,7 @@ METHOD(diffie_hellman_t, set_other_public_value, bool,
return botan_dh_key_derivation(this->key, value, &this->shared_secret); return botan_dh_key_derivation(this->key, value, &this->shared_secret);
} }
METHOD(diffie_hellman_t, get_my_public_value, bool, METHOD(key_exchange_t, get_public_key, bool,
private_botan_ec_diffie_hellman_t *this, chunk_t *value) private_botan_ec_diffie_hellman_t *this, chunk_t *value)
{ {
chunk_t pkey = chunk_empty; chunk_t pkey = chunk_empty;
@@ -104,7 +104,7 @@ METHOD(diffie_hellman_t, get_my_public_value, bool,
return TRUE; return TRUE;
} }
METHOD(diffie_hellman_t, set_private_value, bool, METHOD(key_exchange_t, set_private_key, bool,
private_botan_ec_diffie_hellman_t *this, chunk_t value) private_botan_ec_diffie_hellman_t *this, chunk_t value)
{ {
botan_mp_t scalar; botan_mp_t scalar;
@@ -132,7 +132,7 @@ METHOD(diffie_hellman_t, set_private_value, bool,
return TRUE; return TRUE;
} }
METHOD(diffie_hellman_t, get_shared_secret, bool, METHOD(key_exchange_t, get_shared_secret, bool,
private_botan_ec_diffie_hellman_t *this, chunk_t *secret) private_botan_ec_diffie_hellman_t *this, chunk_t *secret)
{ {
if (!this->shared_secret.len) if (!this->shared_secret.len)
@@ -143,13 +143,13 @@ METHOD(diffie_hellman_t, get_shared_secret, bool,
return TRUE; return TRUE;
} }
METHOD(diffie_hellman_t, get_dh_group, diffie_hellman_group_t, METHOD(key_exchange_t, get_method, key_exchange_method_t,
private_botan_ec_diffie_hellman_t *this) private_botan_ec_diffie_hellman_t *this)
{ {
return this->group; return this->group;
} }
METHOD(diffie_hellman_t, destroy, void, METHOD(key_exchange_t, destroy, void,
private_botan_ec_diffie_hellman_t *this) private_botan_ec_diffie_hellman_t *this)
{ {
botan_privkey_destroy(this->key); botan_privkey_destroy(this->key);
@@ -161,19 +161,19 @@ METHOD(diffie_hellman_t, destroy, void,
* Described in header. * Described in header.
*/ */
botan_ec_diffie_hellman_t *botan_ec_diffie_hellman_create( botan_ec_diffie_hellman_t *botan_ec_diffie_hellman_create(
diffie_hellman_group_t group) key_exchange_method_t group)
{ {
private_botan_ec_diffie_hellman_t *this; private_botan_ec_diffie_hellman_t *this;
botan_rng_t rng; botan_rng_t rng;
INIT(this, INIT(this,
.public = { .public = {
.dh = { .ke = {
.get_shared_secret = _get_shared_secret, .get_shared_secret = _get_shared_secret,
.set_other_public_value = _set_other_public_value, .set_public_key = _set_public_key,
.get_my_public_value = _get_my_public_value, .get_public_key = _get_public_key,
.set_private_value = _set_private_value, .set_private_key = _set_private_key,
.get_dh_group = _get_dh_group, .get_method = _get_method,
.destroy = _destroy, .destroy = _destroy,
}, },
}, },
src/libstrongswan/plugins/botan/botan_ec_diffie_hellman.h
+4 -4
View File
@@ -39,18 +39,18 @@ typedef struct botan_ec_diffie_hellman_t botan_ec_diffie_hellman_t;
struct botan_ec_diffie_hellman_t { struct botan_ec_diffie_hellman_t {
/** /**
* Implements diffie_hellman_t interface. * Implements key_exchange_t interface.
*/ */
diffie_hellman_t dh; key_exchange_t ke;
}; };
/** /**
* Creates a new botan_ec_diffie_hellman_t object. * Creates a new botan_ec_diffie_hellman_t object.
* *
* @param group EC Diffie Hellman group number to use * @param group EC Diffie-Hellman group number to use
* @return botan_ec_diffie_hellman_t object, NULL if not supported * @return botan_ec_diffie_hellman_t object, NULL if not supported
*/ */
botan_ec_diffie_hellman_t *botan_ec_diffie_hellman_create( botan_ec_diffie_hellman_t *botan_ec_diffie_hellman_create(
diffie_hellman_group_t group); key_exchange_method_t group);
#endif /** BOTAN_EC_DIFFIE_HELLMAN_H_ @}*/ #endif /** BOTAN_EC_DIFFIE_HELLMAN_H_ @}*/
src/libstrongswan/plugins/botan/botan_plugin.c
+22 -22
View File
@@ -74,33 +74,33 @@ METHOD(plugin_t, get_features, int,
#ifdef BOTAN_HAS_DIFFIE_HELLMAN #ifdef BOTAN_HAS_DIFFIE_HELLMAN
/* MODP DH groups */ /* MODP DH groups */
PLUGIN_REGISTER(DH, botan_diffie_hellman_create), PLUGIN_REGISTER(KE, botan_diffie_hellman_create),
PLUGIN_PROVIDE(DH, MODP_3072_BIT), PLUGIN_PROVIDE(KE, MODP_3072_BIT),
PLUGIN_PROVIDE(DH, MODP_4096_BIT), PLUGIN_PROVIDE(KE, MODP_4096_BIT),
PLUGIN_PROVIDE(DH, MODP_6144_BIT), PLUGIN_PROVIDE(KE, MODP_6144_BIT),
PLUGIN_PROVIDE(DH, MODP_8192_BIT), PLUGIN_PROVIDE(KE, MODP_8192_BIT),
PLUGIN_PROVIDE(DH, MODP_2048_BIT), PLUGIN_PROVIDE(KE, MODP_2048_BIT),
PLUGIN_PROVIDE(DH, MODP_2048_224), PLUGIN_PROVIDE(KE, MODP_2048_224),
PLUGIN_PROVIDE(DH, MODP_2048_256), PLUGIN_PROVIDE(KE, MODP_2048_256),
PLUGIN_PROVIDE(DH, MODP_1536_BIT), PLUGIN_PROVIDE(KE, MODP_1536_BIT),
PLUGIN_PROVIDE(DH, MODP_1024_BIT), PLUGIN_PROVIDE(KE, MODP_1024_BIT),
PLUGIN_PROVIDE(DH, MODP_1024_160), PLUGIN_PROVIDE(KE, MODP_1024_160),
PLUGIN_PROVIDE(DH, MODP_768_BIT), PLUGIN_PROVIDE(KE, MODP_768_BIT),
PLUGIN_PROVIDE(DH, MODP_CUSTOM), PLUGIN_PROVIDE(KE, MODP_CUSTOM),
#endif #endif
#ifdef BOTAN_HAS_ECDH #ifdef BOTAN_HAS_ECDH
/* EC DH groups */ /* EC DH groups */
PLUGIN_REGISTER(DH, botan_ec_diffie_hellman_create), PLUGIN_REGISTER(KE, botan_ec_diffie_hellman_create),
PLUGIN_PROVIDE(DH, ECP_256_BIT), PLUGIN_PROVIDE(KE, ECP_256_BIT),
PLUGIN_PROVIDE(DH, ECP_384_BIT), PLUGIN_PROVIDE(KE, ECP_384_BIT),
PLUGIN_PROVIDE(DH, ECP_521_BIT), PLUGIN_PROVIDE(KE, ECP_521_BIT),
PLUGIN_PROVIDE(DH, ECP_256_BP), PLUGIN_PROVIDE(KE, ECP_256_BP),
PLUGIN_PROVIDE(DH, ECP_384_BP), PLUGIN_PROVIDE(KE, ECP_384_BP),
PLUGIN_PROVIDE(DH, ECP_512_BP), PLUGIN_PROVIDE(KE, ECP_512_BP),
#endif #endif
#ifdef BOTAN_HAS_X25519 #ifdef BOTAN_HAS_X25519
PLUGIN_REGISTER(DH, botan_x25519_create), PLUGIN_REGISTER(KE, botan_x25519_create),
PLUGIN_PROVIDE(DH, CURVE_25519), PLUGIN_PROVIDE(KE, CURVE_25519),
#endif #endif
/* crypters */ /* crypters */
src/libstrongswan/plugins/botan/botan_x25519.c
+13 -13
View File
@@ -42,7 +42,7 @@ struct private_diffie_hellman_t {
/** /**
* Public interface * Public interface
*/ */
diffie_hellman_t public; key_exchange_t public;
/** /**
* Private key * Private key
@@ -55,10 +55,10 @@ struct private_diffie_hellman_t {
chunk_t shared_secret; chunk_t shared_secret;
}; };
METHOD(diffie_hellman_t, set_other_public_value, bool, METHOD(key_exchange_t, set_public_key, bool,
private_diffie_hellman_t *this, chunk_t value) private_diffie_hellman_t *this, chunk_t value)
{ {
if (!diffie_hellman_verify_value(CURVE_25519, value)) if (!key_exchange_verify_pubkey(CURVE_25519, value))
{ {
return FALSE; return FALSE;
} }
@@ -68,7 +68,7 @@ METHOD(diffie_hellman_t, set_other_public_value, bool,
return botan_dh_key_derivation(this->key, value, &this->shared_secret); return botan_dh_key_derivation(this->key, value, &this->shared_secret);
} }
METHOD(diffie_hellman_t, get_my_public_value, bool, METHOD(key_exchange_t, get_public_key, bool,
private_diffie_hellman_t *this, chunk_t *value) private_diffie_hellman_t *this, chunk_t *value)
{ {
value->len = 0; value->len = 0;
@@ -88,7 +88,7 @@ METHOD(diffie_hellman_t, get_my_public_value, bool,
return TRUE; return TRUE;
} }
METHOD(diffie_hellman_t, set_private_value, bool, METHOD(key_exchange_t, set_private_key, bool,
private_diffie_hellman_t *this, chunk_t value) private_diffie_hellman_t *this, chunk_t value)
{ {
if (value.len != 32) if (value.len != 32)
@@ -110,7 +110,7 @@ METHOD(diffie_hellman_t, set_private_value, bool,
return TRUE; return TRUE;
} }
METHOD(diffie_hellman_t, get_shared_secret, bool, METHOD(key_exchange_t, get_shared_secret, bool,
private_diffie_hellman_t *this, chunk_t *secret) private_diffie_hellman_t *this, chunk_t *secret)
{ {
if (!this->shared_secret.len) if (!this->shared_secret.len)
@@ -121,13 +121,13 @@ METHOD(diffie_hellman_t, get_shared_secret, bool,
return TRUE; return TRUE;
} }
METHOD(diffie_hellman_t, get_dh_group, diffie_hellman_group_t, METHOD(key_exchange_t, get_method, key_exchange_method_t,
private_diffie_hellman_t *this) private_diffie_hellman_t *this)
{ {
return CURVE_25519; return CURVE_25519;
} }
METHOD(diffie_hellman_t, destroy, void, METHOD(key_exchange_t, destroy, void,
private_diffie_hellman_t *this) private_diffie_hellman_t *this)
{ {
botan_privkey_destroy(this->key); botan_privkey_destroy(this->key);
@@ -138,7 +138,7 @@ METHOD(diffie_hellman_t, destroy, void,
/* /*
* Described in header * Described in header
*/ */
diffie_hellman_t *botan_x25519_create(diffie_hellman_group_t group) key_exchange_t *botan_x25519_create(key_exchange_method_t ke)
{ {
private_diffie_hellman_t *this; private_diffie_hellman_t *this;
botan_rng_t rng; botan_rng_t rng;
@@ -146,10 +146,10 @@ diffie_hellman_t *botan_x25519_create(diffie_hellman_group_t group)
INIT(this, INIT(this,
.public = { .public = {
.get_shared_secret = _get_shared_secret, .get_shared_secret = _get_shared_secret,
.set_other_public_value = _set_other_public_value, .set_public_key = _set_public_key,
.get_my_public_value = _get_my_public_value, .get_public_key = _get_public_key,
.set_private_value = _set_private_value, .set_private_key = _set_private_key,
.get_dh_group = _get_dh_group, .get_method = _get_method,
.destroy = _destroy, .destroy = _destroy,
}, },
); );
src/libstrongswan/plugins/botan/botan_x25519.h
+2 -2
View File
@@ -33,9 +33,9 @@
/** /**
* Creates a new X25519 implementation using Botan. * Creates a new X25519 implementation using Botan.
* *
* @param group DH group, must be CURVE_25519 * @param ke key exchange method, must be CURVE_25519
* @return object, NULL if not supported * @return object, NULL if not supported
*/ */
diffie_hellman_t *botan_x25519_create(diffie_hellman_group_t group); key_exchange_t *botan_x25519_create(key_exchange_method_t ke);
#endif /** BOTAN_X25519_H_ @}*/ #endif /** BOTAN_X25519_H_ @}*/
src/libstrongswan/plugins/curve25519/curve25519_dh.c
+12 -12
View File
@@ -73,7 +73,7 @@ static bool generate_key(private_curve25519_dh_t *this)
return this->drv->set_key(this->drv, key); return this->drv->set_key(this->drv, key);
} }
METHOD(diffie_hellman_t, set_other_public_value, bool, METHOD(key_exchange_t, set_public_key, bool,
private_curve25519_dh_t *this, chunk_t value) private_curve25519_dh_t *this, chunk_t value)
{ {
if (value.len == CURVE25519_KEY_SIZE) if (value.len == CURVE25519_KEY_SIZE)
@@ -87,7 +87,7 @@ METHOD(diffie_hellman_t, set_other_public_value, bool,
return FALSE; return FALSE;
} }
METHOD(diffie_hellman_t, get_my_public_value, bool, METHOD(key_exchange_t, get_public_key, bool,
private_curve25519_dh_t *this, chunk_t *value) private_curve25519_dh_t *this, chunk_t *value)
{ {
u_char basepoint[CURVE25519_KEY_SIZE] = { 9 }; u_char basepoint[CURVE25519_KEY_SIZE] = { 9 };
@@ -101,7 +101,7 @@ METHOD(diffie_hellman_t, get_my_public_value, bool,
return FALSE; return FALSE;
} }
METHOD(diffie_hellman_t, set_private_value, bool, METHOD(key_exchange_t, set_private_key, bool,
private_curve25519_dh_t *this, chunk_t value) private_curve25519_dh_t *this, chunk_t value)
{ {
if (value.len != CURVE25519_KEY_SIZE) if (value.len != CURVE25519_KEY_SIZE)
@@ -111,7 +111,7 @@ METHOD(diffie_hellman_t, set_private_value, bool,
return this->drv->set_key(this->drv, value.ptr); return this->drv->set_key(this->drv, value.ptr);
} }
METHOD(diffie_hellman_t, get_shared_secret, bool, METHOD(key_exchange_t, get_shared_secret, bool,
private_curve25519_dh_t *this, chunk_t *secret) private_curve25519_dh_t *this, chunk_t *secret)
{ {
if (!this->computed) if (!this->computed)
@@ -122,13 +122,13 @@ METHOD(diffie_hellman_t, get_shared_secret, bool,
return TRUE; return TRUE;
} }
METHOD(diffie_hellman_t, get_dh_group, diffie_hellman_group_t, METHOD(key_exchange_t, get_method, key_exchange_method_t,
private_curve25519_dh_t *this) private_curve25519_dh_t *this)
{ {
return CURVE_25519; return CURVE_25519;
} }
METHOD(diffie_hellman_t, destroy, void, METHOD(key_exchange_t, destroy, void,
private_curve25519_dh_t *this) private_curve25519_dh_t *this)
{ {
this->drv->destroy(this->drv); this->drv->destroy(this->drv);
@@ -138,7 +138,7 @@ METHOD(diffie_hellman_t, destroy, void,
/* /*
* Described in header. * Described in header.
*/ */
curve25519_dh_t *curve25519_dh_create(diffie_hellman_group_t group) curve25519_dh_t *curve25519_dh_create(key_exchange_method_t group)
{ {
private_curve25519_dh_t *this; private_curve25519_dh_t *this;
@@ -149,12 +149,12 @@ curve25519_dh_t *curve25519_dh_create(diffie_hellman_group_t group)
INIT(this, INIT(this,
.public = { .public = {
.dh = { .ke = {
.get_shared_secret = _get_shared_secret, .get_shared_secret = _get_shared_secret,
.set_other_public_value = _set_other_public_value, .set_public_key = _set_public_key,
.get_my_public_value = _get_my_public_value, .get_public_key = _get_public_key,
.set_private_value = _set_private_value, .set_private_key = _set_private_key,
.get_dh_group = _get_dh_group, .get_method = _get_method,
.destroy = _destroy, .destroy = _destroy,
}, },
}, },
src/libstrongswan/plugins/curve25519/curve25519_dh.h
+3 -3
View File
@@ -32,9 +32,9 @@ typedef struct curve25519_dh_t curve25519_dh_t;
struct curve25519_dh_t { struct curve25519_dh_t {
/** /**
* Implements diffie_hellman_t interface. * Implements key_exchange_t interface.
*/ */
diffie_hellman_t dh; key_exchange_t ke;
}; };
/** /**
@@ -43,6 +43,6 @@ struct curve25519_dh_t {
* @param group DH group, CURVE_25519 * @param group DH group, CURVE_25519
* @return curve25519_dh_t object, NULL on error * @return curve25519_dh_t object, NULL on error
*/ */
curve25519_dh_t *curve25519_dh_create(diffie_hellman_group_t group); curve25519_dh_t *curve25519_dh_create(key_exchange_method_t group);
#endif /** CURVE25519_DH_H_ @}*/ #endif /** CURVE25519_DH_H_ @}*/
src/libstrongswan/plugins/curve25519/curve25519_plugin.c
+2 -2
View File
@@ -47,8 +47,8 @@ METHOD(plugin_t, get_features, int,
{ {
static plugin_feature_t f[] = { static plugin_feature_t f[] = {
/* X25519 DH group */ /* X25519 DH group */
PLUGIN_REGISTER(DH, curve25519_dh_create), PLUGIN_REGISTER(KE, curve25519_dh_create),
PLUGIN_PROVIDE(DH, CURVE_25519), PLUGIN_PROVIDE(KE, CURVE_25519),
PLUGIN_DEPENDS(RNG, RNG_STRONG), PLUGIN_DEPENDS(RNG, RNG_STRONG),
/* Ed25519 private/public keys */ /* Ed25519 private/public keys */
PLUGIN_REGISTER(PRIVKEY, curve25519_private_key_load, TRUE), PLUGIN_REGISTER(PRIVKEY, curve25519_private_key_load, TRUE),
src/libstrongswan/plugins/gcrypt/gcrypt_dh.c
+16 -16
View File
@@ -36,7 +36,7 @@ struct private_gcrypt_dh_t {
/** /**
* Diffie Hellman group number * Diffie Hellman group number
*/ */
diffie_hellman_group_t group; key_exchange_method_t group;
/* /*
* Generator value * Generator value
@@ -74,13 +74,13 @@ struct private_gcrypt_dh_t {
size_t p_len; size_t p_len;
}; };
METHOD(diffie_hellman_t, set_other_public_value, bool, METHOD(key_exchange_t, set_public_key, bool,
private_gcrypt_dh_t *this, chunk_t value) private_gcrypt_dh_t *this, chunk_t value)
{ {
gcry_mpi_t p_min_1; gcry_mpi_t p_min_1;
gcry_error_t err; gcry_error_t err;
if (!diffie_hellman_verify_value(this->group, value)) if (!key_exchange_verify_pubkey(this->group, value))
{ {
return FALSE; return FALSE;
} }
@@ -139,14 +139,14 @@ static chunk_t export_mpi(gcry_mpi_t value, size_t len)
return chunk; return chunk;
} }
METHOD(diffie_hellman_t, get_my_public_value, bool, METHOD(key_exchange_t, get_public_key, bool,
private_gcrypt_dh_t *this, chunk_t *value) private_gcrypt_dh_t *this, chunk_t *value)
{ {
*value = export_mpi(this->ya, this->p_len); *value = export_mpi(this->ya, this->p_len);
return TRUE; return TRUE;
} }
METHOD(diffie_hellman_t, set_private_value, bool, METHOD(key_exchange_t, set_private_key, bool,
private_gcrypt_dh_t *this, chunk_t value) private_gcrypt_dh_t *this, chunk_t value)
{ {
gcry_error_t err; gcry_error_t err;
@@ -164,7 +164,7 @@ METHOD(diffie_hellman_t, set_private_value, bool,
return !err; return !err;
} }
METHOD(diffie_hellman_t, get_shared_secret, bool, METHOD(key_exchange_t, get_shared_secret, bool,
private_gcrypt_dh_t *this, chunk_t *secret) private_gcrypt_dh_t *this, chunk_t *secret)
{ {
if (!this->zz) if (!this->zz)
@@ -175,13 +175,13 @@ METHOD(diffie_hellman_t, get_shared_secret, bool,
return TRUE; return TRUE;
} }
METHOD(diffie_hellman_t, get_dh_group, diffie_hellman_group_t, METHOD(key_exchange_t, get_method, key_exchange_method_t,
private_gcrypt_dh_t *this) private_gcrypt_dh_t *this)
{ {
return this->group; return this->group;
} }
METHOD(diffie_hellman_t, destroy, void, METHOD(key_exchange_t, destroy, void,
private_gcrypt_dh_t *this) private_gcrypt_dh_t *this)
{ {
gcry_mpi_release(this->p); gcry_mpi_release(this->p);
@@ -196,7 +196,7 @@ METHOD(diffie_hellman_t, destroy, void,
/* /*
* Generic internal constructor * Generic internal constructor
*/ */
static gcrypt_dh_t *create_generic(diffie_hellman_group_t group, size_t exp_len, static gcrypt_dh_t *create_generic(key_exchange_method_t group, size_t exp_len,
chunk_t g, chunk_t p) chunk_t g, chunk_t p)
{ {
private_gcrypt_dh_t *this; private_gcrypt_dh_t *this;
@@ -206,12 +206,12 @@ static gcrypt_dh_t *create_generic(diffie_hellman_group_t group, size_t exp_len,
INIT(this, INIT(this,
.public = { .public = {
.dh = { .ke = {
.get_shared_secret = _get_shared_secret, .get_shared_secret = _get_shared_secret,
.set_other_public_value = _set_other_public_value, .set_public_key = _set_public_key,
.get_my_public_value = _get_my_public_value, .get_public_key = _get_public_key,
.set_private_value = _set_private_value, .set_private_key = _set_private_key,
.get_dh_group = _get_dh_group, .get_method = _get_method,
.destroy = _destroy, .destroy = _destroy,
}, },
}, },
@@ -273,7 +273,7 @@ static gcrypt_dh_t *create_generic(diffie_hellman_group_t group, size_t exp_len,
/* /*
* Described in header. * Described in header.
*/ */
gcrypt_dh_t *gcrypt_dh_create(diffie_hellman_group_t group) gcrypt_dh_t *gcrypt_dh_create(key_exchange_method_t group)
{ {
diffie_hellman_params_t *params; diffie_hellman_params_t *params;
@@ -290,7 +290,7 @@ gcrypt_dh_t *gcrypt_dh_create(diffie_hellman_group_t group)
/* /*
* Described in header. * Described in header.
*/ */
gcrypt_dh_t *gcrypt_dh_create_custom(diffie_hellman_group_t group, ...) gcrypt_dh_t *gcrypt_dh_create_custom(key_exchange_method_t group, ...)
{ {
if (group == MODP_CUSTOM) if (group == MODP_CUSTOM)
{ {
src/libstrongswan/plugins/gcrypt/gcrypt_dh.h
+4 -4
View File
@@ -32,9 +32,9 @@ typedef struct gcrypt_dh_t gcrypt_dh_t;
struct gcrypt_dh_t { struct gcrypt_dh_t {
/** /**
* Implements diffie_hellman_t interface. * Implements key_exchange_t interface.
*/ */
diffie_hellman_t dh; key_exchange_t ke;
}; };
/** /**
@@ -43,7 +43,7 @@ struct gcrypt_dh_t {
* @param group Diffie Hellman group number to use * @param group Diffie Hellman group number to use
* @return gcrypt_dh_t object, NULL if not supported * @return gcrypt_dh_t object, NULL if not supported
*/ */
gcrypt_dh_t *gcrypt_dh_create(diffie_hellman_group_t group); gcrypt_dh_t *gcrypt_dh_create(key_exchange_method_t group);
/** /**
* Creates a new gcrypt_dh_t object for MODP_CUSTOM. * Creates a new gcrypt_dh_t object for MODP_CUSTOM.
@@ -52,7 +52,7 @@ gcrypt_dh_t *gcrypt_dh_create(diffie_hellman_group_t group);
* @param ... expects generator and prime as chunk_t * @param ... expects generator and prime as chunk_t
* @return gcrypt_dh_t object, NULL if not supported * @return gcrypt_dh_t object, NULL if not supported
*/ */
gcrypt_dh_t *gcrypt_dh_create_custom(diffie_hellman_group_t group, ...); gcrypt_dh_t *gcrypt_dh_create_custom(key_exchange_method_t group, ...);
#endif /** GCRYPT_DH_H_ @}*/ #endif /** GCRYPT_DH_H_ @}*/
src/libstrongswan/plugins/gcrypt/gcrypt_plugin.c
+14 -14
View File
@@ -106,20 +106,20 @@ METHOD(plugin_t, get_features, int,
PLUGIN_PROVIDE(HASHER, HASH_SHA384), PLUGIN_PROVIDE(HASHER, HASH_SHA384),
PLUGIN_PROVIDE(HASHER, HASH_SHA512), PLUGIN_PROVIDE(HASHER, HASH_SHA512),
/* MODP DH groups */ /* MODP DH groups */
PLUGIN_REGISTER(DH, gcrypt_dh_create), PLUGIN_REGISTER(KE, gcrypt_dh_create),
PLUGIN_PROVIDE(DH, MODP_3072_BIT), PLUGIN_PROVIDE(KE, MODP_3072_BIT),
PLUGIN_PROVIDE(DH, MODP_4096_BIT), PLUGIN_PROVIDE(KE, MODP_4096_BIT),
PLUGIN_PROVIDE(DH, MODP_6144_BIT), PLUGIN_PROVIDE(KE, MODP_6144_BIT),
PLUGIN_PROVIDE(DH, MODP_8192_BIT), PLUGIN_PROVIDE(KE, MODP_8192_BIT),
PLUGIN_PROVIDE(DH, MODP_2048_BIT), PLUGIN_PROVIDE(KE, MODP_2048_BIT),
PLUGIN_PROVIDE(DH, MODP_2048_224), PLUGIN_PROVIDE(KE, MODP_2048_224),
PLUGIN_PROVIDE(DH, MODP_2048_256), PLUGIN_PROVIDE(KE, MODP_2048_256),
PLUGIN_PROVIDE(DH, MODP_1536_BIT), PLUGIN_PROVIDE(KE, MODP_1536_BIT),
PLUGIN_PROVIDE(DH, MODP_1024_BIT), PLUGIN_PROVIDE(KE, MODP_1024_BIT),
PLUGIN_PROVIDE(DH, MODP_1024_160), PLUGIN_PROVIDE(KE, MODP_1024_160),
PLUGIN_PROVIDE(DH, MODP_768_BIT), PLUGIN_PROVIDE(KE, MODP_768_BIT),
PLUGIN_REGISTER(DH, gcrypt_dh_create_custom), PLUGIN_REGISTER(KE, gcrypt_dh_create_custom),
PLUGIN_PROVIDE(DH, MODP_CUSTOM), PLUGIN_PROVIDE(KE, MODP_CUSTOM),
/* RSA private/public key loading */ /* RSA private/public key loading */
PLUGIN_REGISTER(PUBKEY, gcrypt_rsa_public_key_load, TRUE), PLUGIN_REGISTER(PUBKEY, gcrypt_rsa_public_key_load, TRUE),
PLUGIN_PROVIDE(PUBKEY, KEY_RSA), PLUGIN_PROVIDE(PUBKEY, KEY_RSA),
src/libstrongswan/plugins/gmp/gmp_diffie_hellman.c
+16 -16
View File
@@ -41,7 +41,7 @@ struct private_gmp_diffie_hellman_t {
/** /**
* Diffie Hellman group number. * Diffie Hellman group number.
*/ */
diffie_hellman_group_t group; key_exchange_method_t group;
/* /*
* Generator value. * Generator value.
@@ -84,12 +84,12 @@ struct private_gmp_diffie_hellman_t {
bool computed; bool computed;
}; };
METHOD(diffie_hellman_t, set_other_public_value, bool, METHOD(key_exchange_t, set_public_key, bool,
private_gmp_diffie_hellman_t *this, chunk_t value) private_gmp_diffie_hellman_t *this, chunk_t value)
{ {
mpz_t p_min_1; mpz_t p_min_1;
if (!diffie_hellman_verify_value(this->group, value)) if (!key_exchange_verify_pubkey(this->group, value))
{ {
return FALSE; return FALSE;
} }
@@ -149,7 +149,7 @@ METHOD(diffie_hellman_t, set_other_public_value, bool,
return this->computed; return this->computed;
} }
METHOD(diffie_hellman_t, get_my_public_value, bool, METHOD(key_exchange_t, get_public_key, bool,
private_gmp_diffie_hellman_t *this,chunk_t *value) private_gmp_diffie_hellman_t *this,chunk_t *value)
{ {
value->len = this->p_len; value->len = this->p_len;
@@ -161,7 +161,7 @@ METHOD(diffie_hellman_t, get_my_public_value, bool,
return TRUE; return TRUE;
} }
METHOD(diffie_hellman_t, set_private_value, bool, METHOD(key_exchange_t, set_private_key, bool,
private_gmp_diffie_hellman_t *this, chunk_t value) private_gmp_diffie_hellman_t *this, chunk_t value)
{ {
mpz_import(this->xa, value.len, 1, 1, 1, 0, value.ptr); mpz_import(this->xa, value.len, 1, 1, 1, 0, value.ptr);
@@ -170,7 +170,7 @@ METHOD(diffie_hellman_t, set_private_value, bool,
return TRUE; return TRUE;
} }
METHOD(diffie_hellman_t, get_shared_secret, bool, METHOD(key_exchange_t, get_shared_secret, bool,
private_gmp_diffie_hellman_t *this, chunk_t *secret) private_gmp_diffie_hellman_t *this, chunk_t *secret)
{ {
if (!this->computed) if (!this->computed)
@@ -186,13 +186,13 @@ METHOD(diffie_hellman_t, get_shared_secret, bool,
return TRUE; return TRUE;
} }
METHOD(diffie_hellman_t, get_dh_group, diffie_hellman_group_t, METHOD(key_exchange_t, get_method, key_exchange_method_t,
private_gmp_diffie_hellman_t *this) private_gmp_diffie_hellman_t *this)
{ {
return this->group; return this->group;
} }
METHOD(diffie_hellman_t, destroy, void, METHOD(key_exchange_t, destroy, void,
private_gmp_diffie_hellman_t *this) private_gmp_diffie_hellman_t *this)
{ {
mpz_clear(this->p); mpz_clear(this->p);
@@ -207,7 +207,7 @@ METHOD(diffie_hellman_t, destroy, void,
/** /**
* Generic internal constructor * Generic internal constructor
*/ */
static gmp_diffie_hellman_t *create_generic(diffie_hellman_group_t group, static gmp_diffie_hellman_t *create_generic(key_exchange_method_t group,
size_t exp_len, chunk_t g, chunk_t p) size_t exp_len, chunk_t g, chunk_t p)
{ {
private_gmp_diffie_hellman_t *this; private_gmp_diffie_hellman_t *this;
@@ -216,12 +216,12 @@ static gmp_diffie_hellman_t *create_generic(diffie_hellman_group_t group,
INIT(this, INIT(this,
.public = { .public = {
.dh = { .ke = {
.get_shared_secret = _get_shared_secret, .get_shared_secret = _get_shared_secret,
.set_other_public_value = _set_other_public_value, .set_public_key = _set_public_key,
.get_my_public_value = _get_my_public_value, .get_public_key = _get_public_key,
.set_private_value = _set_private_value, .set_private_key = _set_private_key,
.get_dh_group = _get_dh_group, .get_method = _get_method,
.destroy = _destroy, .destroy = _destroy,
}, },
}, },
@@ -273,7 +273,7 @@ static gmp_diffie_hellman_t *create_generic(diffie_hellman_group_t group,
/* /*
* Described in header * Described in header
*/ */
gmp_diffie_hellman_t *gmp_diffie_hellman_create(diffie_hellman_group_t group) gmp_diffie_hellman_t *gmp_diffie_hellman_create(key_exchange_method_t group)
{ {
diffie_hellman_params_t *params; diffie_hellman_params_t *params;
@@ -290,7 +290,7 @@ gmp_diffie_hellman_t *gmp_diffie_hellman_create(diffie_hellman_group_t group)
* Described in header * Described in header
*/ */
gmp_diffie_hellman_t *gmp_diffie_hellman_create_custom( gmp_diffie_hellman_t *gmp_diffie_hellman_create_custom(
diffie_hellman_group_t group, ...) key_exchange_method_t group, ...)
{ {
if (group == MODP_CUSTOM) if (group == MODP_CUSTOM)
{ {
src/libstrongswan/plugins/gmp/gmp_diffie_hellman.h
+4 -4
View File
@@ -31,9 +31,9 @@ typedef struct gmp_diffie_hellman_t gmp_diffie_hellman_t;
struct gmp_diffie_hellman_t { struct gmp_diffie_hellman_t {
/** /**
* Implements diffie_hellman_t interface. * Implements key_exchange_t interface.
*/ */
diffie_hellman_t dh; key_exchange_t ke;
}; };
/** /**
@@ -42,7 +42,7 @@ struct gmp_diffie_hellman_t {
* @param group Diffie Hellman group number to use * @param group Diffie Hellman group number to use
* @return gmp_diffie_hellman_t object, NULL if not supported * @return gmp_diffie_hellman_t object, NULL if not supported
*/ */
gmp_diffie_hellman_t *gmp_diffie_hellman_create(diffie_hellman_group_t group); gmp_diffie_hellman_t *gmp_diffie_hellman_create(key_exchange_method_t group);
/** /**
* Creates a new gmp_diffie_hellman_t object for MODP_CUSTOM. * Creates a new gmp_diffie_hellman_t object for MODP_CUSTOM.
@@ -52,7 +52,7 @@ gmp_diffie_hellman_t *gmp_diffie_hellman_create(diffie_hellman_group_t group);
* @return gmp_diffie_hellman_t object, NULL if not supported * @return gmp_diffie_hellman_t object, NULL if not supported
*/ */
gmp_diffie_hellman_t *gmp_diffie_hellman_create_custom( gmp_diffie_hellman_t *gmp_diffie_hellman_create_custom(
diffie_hellman_group_t group, ...); key_exchange_method_t group, ...);
#endif /** GMP_DIFFIE_HELLMAN_H_ @}*/ #endif /** GMP_DIFFIE_HELLMAN_H_ @}*/
src/libstrongswan/plugins/gmp/gmp_plugin.c
+14 -14
View File
@@ -43,31 +43,31 @@ METHOD(plugin_t, get_features, int,
{ {
static plugin_feature_t f[] = { static plugin_feature_t f[] = {
/* DH groups */ /* DH groups */
PLUGIN_REGISTER(DH, gmp_diffie_hellman_create), PLUGIN_REGISTER(KE, gmp_diffie_hellman_create),
PLUGIN_PROVIDE(DH, MODP_3072_BIT), PLUGIN_PROVIDE(KE, MODP_3072_BIT),
PLUGIN_DEPENDS(RNG, RNG_STRONG), PLUGIN_DEPENDS(RNG, RNG_STRONG),
PLUGIN_PROVIDE(DH, MODP_4096_BIT), PLUGIN_PROVIDE(KE, MODP_4096_BIT),
PLUGIN_DEPENDS(RNG, RNG_STRONG), PLUGIN_DEPENDS(RNG, RNG_STRONG),
PLUGIN_PROVIDE(DH, MODP_6144_BIT), PLUGIN_PROVIDE(KE, MODP_6144_BIT),
PLUGIN_DEPENDS(RNG, RNG_STRONG), PLUGIN_DEPENDS(RNG, RNG_STRONG),
PLUGIN_PROVIDE(DH, MODP_8192_BIT), PLUGIN_PROVIDE(KE, MODP_8192_BIT),
PLUGIN_DEPENDS(RNG, RNG_STRONG), PLUGIN_DEPENDS(RNG, RNG_STRONG),
PLUGIN_PROVIDE(DH, MODP_2048_BIT), PLUGIN_PROVIDE(KE, MODP_2048_BIT),
PLUGIN_DEPENDS(RNG, RNG_STRONG), PLUGIN_DEPENDS(RNG, RNG_STRONG),
PLUGIN_PROVIDE(DH, MODP_2048_224), PLUGIN_PROVIDE(KE, MODP_2048_224),
PLUGIN_DEPENDS(RNG, RNG_STRONG), PLUGIN_DEPENDS(RNG, RNG_STRONG),
PLUGIN_PROVIDE(DH, MODP_2048_256), PLUGIN_PROVIDE(KE, MODP_2048_256),
PLUGIN_DEPENDS(RNG, RNG_STRONG), PLUGIN_DEPENDS(RNG, RNG_STRONG),
PLUGIN_PROVIDE(DH, MODP_1536_BIT), PLUGIN_PROVIDE(KE, MODP_1536_BIT),
PLUGIN_DEPENDS(RNG, RNG_STRONG), PLUGIN_DEPENDS(RNG, RNG_STRONG),
PLUGIN_PROVIDE(DH, MODP_1024_BIT), PLUGIN_PROVIDE(KE, MODP_1024_BIT),
PLUGIN_DEPENDS(RNG, RNG_STRONG), PLUGIN_DEPENDS(RNG, RNG_STRONG),
PLUGIN_PROVIDE(DH, MODP_1024_160), PLUGIN_PROVIDE(KE, MODP_1024_160),
PLUGIN_DEPENDS(RNG, RNG_STRONG), PLUGIN_DEPENDS(RNG, RNG_STRONG),
PLUGIN_PROVIDE(DH, MODP_768_BIT), PLUGIN_PROVIDE(KE, MODP_768_BIT),
PLUGIN_DEPENDS(RNG, RNG_STRONG), PLUGIN_DEPENDS(RNG, RNG_STRONG),
PLUGIN_REGISTER(DH, gmp_diffie_hellman_create_custom), PLUGIN_REGISTER(KE, gmp_diffie_hellman_create_custom),
PLUGIN_PROVIDE(DH, MODP_CUSTOM), PLUGIN_PROVIDE(KE, MODP_CUSTOM),
PLUGIN_DEPENDS(RNG, RNG_STRONG), PLUGIN_DEPENDS(RNG, RNG_STRONG),
/* private/public keys */ /* private/public keys */
PLUGIN_REGISTER(PRIVKEY, gmp_rsa_private_key_load, TRUE), PLUGIN_REGISTER(PRIVKEY, gmp_rsa_private_key_load, TRUE),
src/libstrongswan/plugins/newhope/newhope_ke.c
+13 -13
View File
@@ -23,7 +23,7 @@
#include <ntt_fft.h> #include <ntt_fft.h>
#include <ntt_fft_reduce.h> #include <ntt_fft_reduce.h>
#include <crypto/diffie_hellman.h> #include <crypto/key_exchange.h>
#include <utils/debug.h> #include <utils/debug.h>
static const int seed_len = 32; /* 256 bits */ static const int seed_len = 32; /* 256 bits */
@@ -278,7 +278,7 @@ static uint8_t* unpack_rec(private_newhope_ke_t *this, uint8_t *x)
return r; return r;
} }
METHOD(diffie_hellman_t, get_my_public_value, bool, METHOD(key_exchange_t, get_public_key, bool,
private_newhope_ke_t *this, chunk_t *value) private_newhope_ke_t *this, chunk_t *value)
{ {
uint16_t n, q; uint16_t n, q;
@@ -397,7 +397,7 @@ METHOD(diffie_hellman_t, get_my_public_value, bool,
} }
} }
METHOD(diffie_hellman_t, get_shared_secret, bool, METHOD(key_exchange_t, get_shared_secret, bool,
private_newhope_ke_t *this, chunk_t *secret) private_newhope_ke_t *this, chunk_t *secret)
{ {
if (this->shared_secret.len == 0) if (this->shared_secret.len == 0)
@@ -410,7 +410,7 @@ METHOD(diffie_hellman_t, get_shared_secret, bool,
return TRUE; return TRUE;
} }
METHOD(diffie_hellman_t, set_other_public_value, bool, METHOD(key_exchange_t, set_public_key, bool,
private_newhope_ke_t *this, chunk_t value) private_newhope_ke_t *this, chunk_t value)
{ {
newhope_reconciliation_t * rec; newhope_reconciliation_t * rec;
@@ -436,7 +436,7 @@ METHOD(diffie_hellman_t, set_other_public_value, bool,
if (value.len != poly_len + seed_len) if (value.len != poly_len + seed_len)
{ {
DBG1(DBG_LIB, "received %N KE payload of incorrect size", DBG1(DBG_LIB, "received %N KE payload of incorrect size",
diffie_hellman_group_names, NH_128_BIT); key_exchange_method_names, NH_128_BIT);
return FALSE; return FALSE;
} }
a_seed = chunk_create(value.ptr + poly_len, seed_len); a_seed = chunk_create(value.ptr + poly_len, seed_len);
@@ -545,7 +545,7 @@ METHOD(diffie_hellman_t, set_other_public_value, bool,
if (value.len != poly_len + rec_len) if (value.len != poly_len + rec_len)
{ {
DBG1(DBG_LIB, "received %N KE payload of incorrect size", DBG1(DBG_LIB, "received %N KE payload of incorrect size",
diffie_hellman_group_names, NH_128_BIT); key_exchange_method_names, NH_128_BIT);
return FALSE; return FALSE;
} }
@@ -581,13 +581,13 @@ METHOD(diffie_hellman_t, set_other_public_value, bool,
} }
} }
METHOD(diffie_hellman_t, get_dh_group, diffie_hellman_group_t, METHOD(key_exchange_t, get_method, key_exchange_method_t,
private_newhope_ke_t *this) private_newhope_ke_t *this)
{ {
return NH_128_BIT; return NH_128_BIT;
} }
METHOD(diffie_hellman_t, destroy, void, METHOD(key_exchange_t, destroy, void,
private_newhope_ke_t *this) private_newhope_ke_t *this)
{ {
chunk_clear(&this->shared_secret); chunk_clear(&this->shared_secret);
@@ -601,17 +601,17 @@ METHOD(diffie_hellman_t, destroy, void,
/* /*
* Described in header. * Described in header.
*/ */
newhope_ke_t *newhope_ke_create(diffie_hellman_group_t group, chunk_t g, chunk_t p) newhope_ke_t *newhope_ke_create(key_exchange_method_t ke, chunk_t g, chunk_t p)
{ {
private_newhope_ke_t *this; private_newhope_ke_t *this;
INIT(this, INIT(this,
.public = { .public = {
.dh = { .ke = {
.get_shared_secret = _get_shared_secret, .get_shared_secret = _get_shared_secret,
.set_other_public_value = _set_other_public_value, .set_public_key = _set_public_key,
.get_my_public_value = _get_my_public_value, .get_public_key = _get_public_key,
.get_dh_group = _get_dh_group, .get_method = _get_method,
.destroy = _destroy, .destroy = _destroy,
}, },
}, },
src/libstrongswan/plugins/newhope/newhope_ke.h
+4 -4
View File
@@ -32,20 +32,20 @@ typedef struct newhope_ke_t newhope_ke_t;
struct newhope_ke_t { struct newhope_ke_t {
/** /**
* Implements diffie_hellman_t interface. * Implements key_exchange_t interface.
*/ */
diffie_hellman_t dh; key_exchange_t ke;
}; };
/** /**
* Creates a new newhope_ke_t object. * Creates a new newhope_ke_t object.
* *
* @param group New Hope DH group number * @param ke New Hope key exchange number
* @param g not used * @param g not used
* @param p not used * @param p not used
* @return newhope_ke_t object, NULL if not supported * @return newhope_ke_t object, NULL if not supported
*/ */
newhope_ke_t *newhope_ke_create(diffie_hellman_group_t group, chunk_t g, chunk_t p); newhope_ke_t *newhope_ke_create(key_exchange_method_t ke, chunk_t g, chunk_t p);
#endif /** NEWHOPE_KE_H_ @}*/ #endif /** NEWHOPE_KE_H_ @}*/
src/libstrongswan/plugins/newhope/newhope_plugin.c
+2 -2
View File
@@ -42,8 +42,8 @@ METHOD(plugin_t, get_features, int,
private_newhope_plugin_t *this, plugin_feature_t *features[]) private_newhope_plugin_t *this, plugin_feature_t *features[])
{ {
static plugin_feature_t f[] = { static plugin_feature_t f[] = {
PLUGIN_REGISTER(DH, newhope_ke_create), PLUGIN_REGISTER(KE, newhope_ke_create),
PLUGIN_PROVIDE(DH, NH_128_BIT), PLUGIN_PROVIDE(KE, NH_128_BIT),
PLUGIN_DEPENDS(XOF, XOF_SHAKE_128), PLUGIN_DEPENDS(XOF, XOF_SHAKE_128),
PLUGIN_DEPENDS(XOF, XOF_CHACHA20), PLUGIN_DEPENDS(XOF, XOF_CHACHA20),
}; };
src/libstrongswan/plugins/newhope/tests/suites/test_newhope_ke.c
+24 -24
View File
@@ -27,7 +27,7 @@ const int count = 1000;
START_TEST(test_newhope_ke_good) START_TEST(test_newhope_ke_good)
{ {
chunk_t i_msg, r_msg, i_shared_secret, r_shared_secret; chunk_t i_msg, r_msg, i_shared_secret, r_shared_secret;
diffie_hellman_t *i_nh, *r_nh; key_exchange_t *i_nh, *r_nh;
struct timespec start, stop; struct timespec start, stop;
int i; int i;
@@ -35,24 +35,24 @@ START_TEST(test_newhope_ke_good)
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
{ {
i_nh = lib->crypto->create_dh(lib->crypto, NH_128_BIT); i_nh = lib->crypto->create_ke(lib->crypto, NH_128_BIT);
ck_assert(i_nh != NULL); ck_assert(i_nh != NULL);
ck_assert(i_nh->get_dh_group(i_nh) == NH_128_BIT); ck_assert(i_nh->get_method(i_nh) == NH_128_BIT);
ck_assert(i_nh->get_my_public_value(i_nh, &i_msg)); ck_assert(i_nh->get_public_key(i_nh, &i_msg));
ck_assert(i_msg.len = 1824); ck_assert(i_msg.len = 1824);
r_nh = lib->crypto->create_dh(lib->crypto, NH_128_BIT); r_nh = lib->crypto->create_ke(lib->crypto, NH_128_BIT);
ck_assert(r_nh != NULL); ck_assert(r_nh != NULL);
ck_assert(r_nh->set_other_public_value(r_nh, i_msg)); ck_assert(r_nh->set_public_key(r_nh, i_msg));
ck_assert(r_nh->get_my_public_value(r_nh, &r_msg)); ck_assert(r_nh->get_public_key(r_nh, &r_msg));
ck_assert(r_msg.len == 2048); ck_assert(r_msg.len == 2048);
ck_assert(r_nh->get_shared_secret(r_nh, &r_shared_secret)); ck_assert(r_nh->get_shared_secret(r_nh, &r_shared_secret));
ck_assert(r_shared_secret.len == 32); ck_assert(r_shared_secret.len == 32);
ck_assert(i_nh->set_other_public_value(i_nh, r_msg)); ck_assert(i_nh->set_public_key(i_nh, r_msg));
ck_assert(i_nh->get_shared_secret(i_nh, &i_shared_secret)); ck_assert(i_nh->get_shared_secret(i_nh, &i_shared_secret));
ck_assert(i_shared_secret.len == 32); ck_assert(i_shared_secret.len == 32);
ck_assert(chunk_equals(i_shared_secret, r_shared_secret)); ck_assert(chunk_equals(i_shared_secret, r_shared_secret));
@@ -77,26 +77,26 @@ END_TEST
START_TEST(test_newhope_ke_wrong) START_TEST(test_newhope_ke_wrong)
{ {
chunk_t i_msg, r_msg, i_shared_secret, r_shared_secret; chunk_t i_msg, r_msg, i_shared_secret, r_shared_secret;
diffie_hellman_t *i_nh, *r_nh; key_exchange_t *i_nh, *r_nh;
i_nh = lib->crypto->create_dh(lib->crypto, NH_128_BIT); i_nh = lib->crypto->create_ke(lib->crypto, NH_128_BIT);
ck_assert(i_nh != NULL); ck_assert(i_nh != NULL);
ck_assert(i_nh->get_my_public_value(i_nh, &i_msg)); ck_assert(i_nh->get_public_key(i_nh, &i_msg));
r_nh = lib->crypto->create_dh(lib->crypto, NH_128_BIT); r_nh = lib->crypto->create_ke(lib->crypto, NH_128_BIT);
ck_assert(r_nh != NULL); ck_assert(r_nh != NULL);
ck_assert(r_nh->set_other_public_value(r_nh, i_msg)); ck_assert(r_nh->set_public_key(r_nh, i_msg));
ck_assert(r_nh->get_my_public_value(r_nh, &r_msg)); ck_assert(r_nh->get_public_key(r_nh, &r_msg));
/* destroy 1st instance of i_nh */ /* destroy 1st instance of i_nh */
i_nh->destroy(i_nh); i_nh->destroy(i_nh);
chunk_free(&i_msg); chunk_free(&i_msg);
/* create 2nd instance of i_nh */ /* create 2nd instance of i_nh */
i_nh = lib->crypto->create_dh(lib->crypto, NH_128_BIT); i_nh = lib->crypto->create_ke(lib->crypto, NH_128_BIT);
ck_assert(i_nh != NULL); ck_assert(i_nh != NULL);
ck_assert(i_nh->get_my_public_value(i_nh, &i_msg)); ck_assert(i_nh->get_public_key(i_nh, &i_msg));
ck_assert(i_nh->set_other_public_value(i_nh, r_msg)); ck_assert(i_nh->set_public_key(i_nh, r_msg));
ck_assert(r_nh->get_shared_secret(r_nh, &r_shared_secret)); ck_assert(r_nh->get_shared_secret(r_nh, &r_shared_secret));
ck_assert(i_nh->get_shared_secret(i_nh, &i_shared_secret)); ck_assert(i_nh->get_shared_secret(i_nh, &i_shared_secret));
@@ -114,7 +114,7 @@ END_TEST
START_TEST(test_newhope_ke_fail_i) START_TEST(test_newhope_ke_fail_i)
{ {
diffie_hellman_t *i_nh; key_exchange_t *i_nh;
char buf_ff[2048]; char buf_ff[2048];
int i; int i;
@@ -131,10 +131,10 @@ START_TEST(test_newhope_ke_fail_i)
for (i = 0; i < countof(r_msg); i++) for (i = 0; i < countof(r_msg); i++)
{ {
i_nh = lib->crypto->create_dh(lib->crypto, NH_128_BIT); i_nh = lib->crypto->create_ke(lib->crypto, NH_128_BIT);
ck_assert(i_nh != NULL); ck_assert(i_nh != NULL);
ck_assert(i_nh->get_my_public_value(i_nh, &i_msg)); ck_assert(i_nh->get_public_key(i_nh, &i_msg));
ck_assert(!i_nh->set_other_public_value(i_nh, r_msg[i])); ck_assert(!i_nh->set_public_key(i_nh, r_msg[i]));
chunk_free(&i_msg); chunk_free(&i_msg);
i_nh->destroy(i_nh); i_nh->destroy(i_nh);
} }
@@ -143,7 +143,7 @@ END_TEST
START_TEST(test_newhope_ke_fail_r) START_TEST(test_newhope_ke_fail_r)
{ {
diffie_hellman_t *r_nh; key_exchange_t *r_nh;
char buf_ff[1824]; char buf_ff[1824];
int i; int i;
@@ -158,9 +158,9 @@ START_TEST(test_newhope_ke_fail_r)
for (i = 0; i < countof(i_msg); i++) for (i = 0; i < countof(i_msg); i++)
{ {
r_nh = lib->crypto->create_dh(lib->crypto, NH_128_BIT); r_nh = lib->crypto->create_ke(lib->crypto, NH_128_BIT);
ck_assert(r_nh != NULL); ck_assert(r_nh != NULL);
ck_assert(!r_nh->set_other_public_value(r_nh, i_msg[i])); ck_assert(!r_nh->set_public_key(r_nh, i_msg[i]));
r_nh->destroy(r_nh); r_nh->destroy(r_nh);
} }
} }
src/libstrongswan/plugins/ntru/ntru_ke.c
+12 -12
View File
@@ -17,7 +17,7 @@
#include "ntru_private_key.h" #include "ntru_private_key.h"
#include "ntru_public_key.h" #include "ntru_public_key.h"
#include <crypto/diffie_hellman.h> #include <crypto/key_exchange.h>
#include <crypto/drbgs/drbg.h> #include <crypto/drbgs/drbg.h>
#include <utils/debug.h> #include <utils/debug.h>
@@ -55,7 +55,7 @@ struct private_ntru_ke_t {
/** /**
* Diffie Hellman group number. * Diffie Hellman group number.
*/ */
diffie_hellman_group_t group; key_exchange_method_t group;
/** /**
* NTRU Parameter Set * NTRU Parameter Set
@@ -108,7 +108,7 @@ struct private_ntru_ke_t {
drbg_t *drbg; drbg_t *drbg;
}; };
METHOD(diffie_hellman_t, get_my_public_value, bool, METHOD(key_exchange_t, get_public_key, bool,
private_ntru_ke_t *this, chunk_t *value) private_ntru_ke_t *this, chunk_t *value)
{ {
*value = chunk_empty; *value = chunk_empty;
@@ -139,7 +139,7 @@ METHOD(diffie_hellman_t, get_my_public_value, bool,
return TRUE; return TRUE;
} }
METHOD(diffie_hellman_t, get_shared_secret, bool, METHOD(key_exchange_t, get_shared_secret, bool,
private_ntru_ke_t *this, chunk_t *secret) private_ntru_ke_t *this, chunk_t *secret)
{ {
if (!this->computed || !this->shared_secret.len) if (!this->computed || !this->shared_secret.len)
@@ -152,7 +152,7 @@ METHOD(diffie_hellman_t, get_shared_secret, bool,
return TRUE; return TRUE;
} }
METHOD(diffie_hellman_t, set_other_public_value, bool, METHOD(key_exchange_t, set_public_key, bool,
private_ntru_ke_t *this, chunk_t value) private_ntru_ke_t *this, chunk_t value)
{ {
if (this->privkey) if (this->privkey)
@@ -218,13 +218,13 @@ METHOD(diffie_hellman_t, set_other_public_value, bool,
return this->computed; return this->computed;
} }
METHOD(diffie_hellman_t, get_dh_group, diffie_hellman_group_t, METHOD(key_exchange_t, get_method, key_exchange_method_t,
private_ntru_ke_t *this) private_ntru_ke_t *this)
{ {
return this->group; return this->group;
} }
METHOD(diffie_hellman_t, destroy, void, METHOD(key_exchange_t, destroy, void,
private_ntru_ke_t *this) private_ntru_ke_t *this)
{ {
DESTROY_IF(this->privkey); DESTROY_IF(this->privkey);
@@ -238,7 +238,7 @@ METHOD(diffie_hellman_t, destroy, void,
/* /*
* Described in header. * Described in header.
*/ */
ntru_ke_t *ntru_ke_create(diffie_hellman_group_t group, chunk_t g, chunk_t p) ntru_ke_t *ntru_ke_create(key_exchange_method_t group, chunk_t g, chunk_t p)
{ {
private_ntru_ke_t *this; private_ntru_ke_t *this;
const ntru_param_set_id_t *param_sets; const ntru_param_set_id_t *param_sets;
@@ -311,11 +311,11 @@ ntru_ke_t *ntru_ke_create(diffie_hellman_group_t group, chunk_t g, chunk_t p)
INIT(this, INIT(this,
.public = { .public = {
.dh = { .ke = {
.get_shared_secret = _get_shared_secret, .get_shared_secret = _get_shared_secret,
.set_other_public_value = _set_other_public_value, .set_public_key = _set_public_key,
.get_my_public_value = _get_my_public_value, .get_public_key = _get_public_key,
.get_dh_group = _get_dh_group, .get_method = _get_method,
.destroy = _destroy, .destroy = _destroy,
}, },
}, },
src/libstrongswan/plugins/ntru/ntru_ke.h
+3 -3
View File
@@ -30,9 +30,9 @@ typedef struct ntru_ke_t ntru_ke_t;
struct ntru_ke_t { struct ntru_ke_t {
/** /**
* Implements diffie_hellman_t interface. * Implements key_exchange_t interface.
*/ */
diffie_hellman_t dh; key_exchange_t ke;
}; };
/** /**
@@ -43,7 +43,7 @@ struct ntru_ke_t {
* @param p not used * @param p not used
* @return ntru_ke_t object, NULL if not supported * @return ntru_ke_t object, NULL if not supported
*/ */
ntru_ke_t *ntru_ke_create(diffie_hellman_group_t group, chunk_t g, chunk_t p); ntru_ke_t *ntru_ke_create(key_exchange_method_t group, chunk_t g, chunk_t p);
#endif /** NTRU_KE_H_ @}*/ #endif /** NTRU_KE_H_ @}*/
src/libstrongswan/plugins/ntru/ntru_plugin.c
+5 -5
View File
@@ -40,20 +40,20 @@ METHOD(plugin_t, get_features, int,
private_ntru_plugin_t *this, plugin_feature_t *features[]) private_ntru_plugin_t *this, plugin_feature_t *features[])
{ {
static plugin_feature_t f[] = { static plugin_feature_t f[] = {
PLUGIN_REGISTER(DH, ntru_ke_create), PLUGIN_REGISTER(KE, ntru_ke_create),
PLUGIN_PROVIDE(DH, NTRU_112_BIT), PLUGIN_PROVIDE(KE, NTRU_112_BIT),
PLUGIN_DEPENDS(RNG, RNG_TRUE), PLUGIN_DEPENDS(RNG, RNG_TRUE),
PLUGIN_DEPENDS(SIGNER, AUTH_HMAC_SHA2_256_256), PLUGIN_DEPENDS(SIGNER, AUTH_HMAC_SHA2_256_256),
PLUGIN_DEPENDS(XOF, XOF_MGF1_SHA1), PLUGIN_DEPENDS(XOF, XOF_MGF1_SHA1),
PLUGIN_PROVIDE(DH, NTRU_128_BIT), PLUGIN_PROVIDE(KE, NTRU_128_BIT),
PLUGIN_DEPENDS(RNG, RNG_TRUE), PLUGIN_DEPENDS(RNG, RNG_TRUE),
PLUGIN_DEPENDS(SIGNER, AUTH_HMAC_SHA2_256_256), PLUGIN_DEPENDS(SIGNER, AUTH_HMAC_SHA2_256_256),
PLUGIN_DEPENDS(XOF, XOF_MGF1_SHA1), PLUGIN_DEPENDS(XOF, XOF_MGF1_SHA1),
PLUGIN_PROVIDE(DH, NTRU_192_BIT), PLUGIN_PROVIDE(KE, NTRU_192_BIT),
PLUGIN_DEPENDS(RNG, RNG_TRUE), PLUGIN_DEPENDS(RNG, RNG_TRUE),
PLUGIN_DEPENDS(SIGNER, AUTH_HMAC_SHA2_256_256), PLUGIN_DEPENDS(SIGNER, AUTH_HMAC_SHA2_256_256),
PLUGIN_DEPENDS(XOF, XOF_MGF1_SHA256), PLUGIN_DEPENDS(XOF, XOF_MGF1_SHA256),
PLUGIN_PROVIDE(DH, NTRU_256_BIT), PLUGIN_PROVIDE(KE, NTRU_256_BIT),
PLUGIN_DEPENDS(RNG, RNG_TRUE), PLUGIN_DEPENDS(RNG, RNG_TRUE),
PLUGIN_DEPENDS(SIGNER, AUTH_HMAC_SHA2_256_256), PLUGIN_DEPENDS(SIGNER, AUTH_HMAC_SHA2_256_256),
PLUGIN_DEPENDS(XOF, XOF_MGF1_SHA256), PLUGIN_DEPENDS(XOF, XOF_MGF1_SHA256),
src/libstrongswan/plugins/openssl/openssl_diffie_hellman.c
+15 -15
View File
@@ -54,7 +54,7 @@ struct private_openssl_diffie_hellman_t {
/** /**
* Diffie Hellman group number. * Diffie Hellman group number.
*/ */
diffie_hellman_group_t group; key_exchange_method_t group;
#if OPENSSL_VERSION_NUMBER >= 0x30000000L #if OPENSSL_VERSION_NUMBER >= 0x30000000L
/** /**
@@ -84,13 +84,13 @@ struct private_openssl_diffie_hellman_t {
chunk_t shared_secret; chunk_t shared_secret;
}; };
METHOD(diffie_hellman_t, get_dh_group, diffie_hellman_group_t, METHOD(key_exchange_t, get_method, key_exchange_method_t,
private_openssl_diffie_hellman_t *this) private_openssl_diffie_hellman_t *this)
{ {
return this->group; return this->group;
} }
METHOD(diffie_hellman_t, get_my_public_value, bool, METHOD(key_exchange_t, get_public_key, bool,
private_openssl_diffie_hellman_t *this, chunk_t *value) private_openssl_diffie_hellman_t *this, chunk_t *value)
{ {
#if OPENSSL_VERSION_NUMBER >= 0x30000000L #if OPENSSL_VERSION_NUMBER >= 0x30000000L
@@ -115,7 +115,7 @@ METHOD(diffie_hellman_t, get_my_public_value, bool,
#endif #endif
} }
METHOD(diffie_hellman_t, get_shared_secret, bool, METHOD(key_exchange_t, get_shared_secret, bool,
private_openssl_diffie_hellman_t *this, chunk_t *secret) private_openssl_diffie_hellman_t *this, chunk_t *secret)
{ {
#if OPENSSL_VERSION_NUMBER >= 0x30000000L #if OPENSSL_VERSION_NUMBER >= 0x30000000L
@@ -151,10 +151,10 @@ METHOD(diffie_hellman_t, get_shared_secret, bool,
} }
METHOD(diffie_hellman_t, set_other_public_value, bool, METHOD(key_exchange_t, set_public_key, bool,
private_openssl_diffie_hellman_t *this, chunk_t value) private_openssl_diffie_hellman_t *this, chunk_t value)
{ {
if (!diffie_hellman_verify_value(this->group, value)) if (!key_exchange_verify_pubkey(this->group, value))
{ {
return FALSE; return FALSE;
} }
@@ -204,7 +204,7 @@ static BIGNUM *calculate_public_key(BIGNUM *priv, const BIGNUM *g,
return pub; return pub;
} }
METHOD(diffie_hellman_t, set_private_value, bool, METHOD(key_exchange_t, set_private_key, bool,
private_openssl_diffie_hellman_t *this, chunk_t value) private_openssl_diffie_hellman_t *this, chunk_t value)
{ {
BIGNUM *priv, *g = NULL, *p = NULL, *pub = NULL; BIGNUM *priv, *g = NULL, *p = NULL, *pub = NULL;
@@ -254,7 +254,7 @@ error:
#else /* OPENSSL_VERSION_NUMBER */ #else /* OPENSSL_VERSION_NUMBER */
METHOD(diffie_hellman_t, set_private_value, bool, METHOD(key_exchange_t, set_private_key, bool,
private_openssl_diffie_hellman_t *this, chunk_t value) private_openssl_diffie_hellman_t *this, chunk_t value)
{ {
BIGNUM *privkey; BIGNUM *privkey;
@@ -274,7 +274,7 @@ METHOD(diffie_hellman_t, set_private_value, bool,
#endif /* OPENSSL_VERSION_NUMBER */ #endif /* OPENSSL_VERSION_NUMBER */
METHOD(diffie_hellman_t, destroy, void, METHOD(key_exchange_t, destroy, void,
private_openssl_diffie_hellman_t *this) private_openssl_diffie_hellman_t *this)
{ {
#if OPENSSL_VERSION_NUMBER >= 0x30000000L #if OPENSSL_VERSION_NUMBER >= 0x30000000L
@@ -292,7 +292,7 @@ METHOD(diffie_hellman_t, destroy, void,
* Described in header. * Described in header.
*/ */
openssl_diffie_hellman_t *openssl_diffie_hellman_create( openssl_diffie_hellman_t *openssl_diffie_hellman_create(
diffie_hellman_group_t group, ...) key_exchange_method_t group, ...)
{ {
private_openssl_diffie_hellman_t *this; private_openssl_diffie_hellman_t *this;
BIGNUM *g, *p; BIGNUM *g, *p;
@@ -300,12 +300,12 @@ openssl_diffie_hellman_t *openssl_diffie_hellman_create(
INIT(this, INIT(this,
.public = { .public = {
.dh = { .ke = {
.get_shared_secret = _get_shared_secret, .get_shared_secret = _get_shared_secret,
.set_other_public_value = _set_other_public_value, .set_public_key = _set_public_key,
.get_my_public_value = _get_my_public_value, .get_public_key = _get_public_key,
.set_private_value = _set_private_value, .set_private_key = _set_private_key,
.get_dh_group = _get_dh_group, .get_method = _get_method,
.destroy = _destroy, .destroy = _destroy,
}, },
}, },
src/libstrongswan/plugins/openssl/openssl_diffie_hellman.h
+4 -4
View File
@@ -32,20 +32,20 @@ typedef struct openssl_diffie_hellman_t openssl_diffie_hellman_t;
struct openssl_diffie_hellman_t { struct openssl_diffie_hellman_t {
/** /**
* Implements diffie_hellman_t interface. * Implements key_exchange_t interface.
*/ */
diffie_hellman_t dh; key_exchange_t ke;
}; };
/** /**
* Creates a new openssl_diffie_hellman_t object. * Creates a new openssl_diffie_hellman_t object.
* *
* @param group Diffie Hellman group number to use * @param group Diffie-Hellman group number to use
* @param ... expects generator and prime as chunk_t if MODP_CUSTOM * @param ... expects generator and prime as chunk_t if MODP_CUSTOM
* @return openssl_diffie_hellman_t object, NULL if not supported * @return openssl_diffie_hellman_t object, NULL if not supported
*/ */
openssl_diffie_hellman_t *openssl_diffie_hellman_create( openssl_diffie_hellman_t *openssl_diffie_hellman_create(
diffie_hellman_group_t group, ...); key_exchange_method_t group, ...);
#endif /** OPENSSL_DIFFIE_HELLMAN_H_ @}*/ #endif /** OPENSSL_DIFFIE_HELLMAN_H_ @}*/
src/libstrongswan/plugins/openssl/openssl_ec_diffie_hellman.c
+16 -16
View File
@@ -54,7 +54,7 @@ struct private_openssl_ec_diffie_hellman_t {
/** /**
* Diffie Hellman group number. * Diffie Hellman group number.
*/ */
diffie_hellman_group_t group; key_exchange_method_t group;
/** /**
* EC private (public) key * EC private (public) key
@@ -198,10 +198,10 @@ error:
} }
#endif /* OPENSSL_VERSION_NUMBER < ... */ #endif /* OPENSSL_VERSION_NUMBER < ... */
METHOD(diffie_hellman_t, set_other_public_value, bool, METHOD(key_exchange_t, set_public_key, bool,
private_openssl_ec_diffie_hellman_t *this, chunk_t value) private_openssl_ec_diffie_hellman_t *this, chunk_t value)
{ {
if (!diffie_hellman_verify_value(this->group, value)) if (!key_exchange_verify_pubkey(this->group, value))
{ {
return FALSE; return FALSE;
} }
@@ -232,7 +232,7 @@ METHOD(diffie_hellman_t, set_other_public_value, bool,
return TRUE; return TRUE;
} }
METHOD(diffie_hellman_t, get_my_public_value, bool, METHOD(key_exchange_t, get_public_key, bool,
private_openssl_ec_diffie_hellman_t *this, chunk_t *value) private_openssl_ec_diffie_hellman_t *this, chunk_t *value)
{ {
#if OPENSSL_VERSION_NUMBER < 0x1010000fL #if OPENSSL_VERSION_NUMBER < 0x1010000fL
@@ -253,7 +253,7 @@ METHOD(diffie_hellman_t, get_my_public_value, bool,
#endif #endif
} }
METHOD(diffie_hellman_t, get_shared_secret, bool, METHOD(key_exchange_t, get_shared_secret, bool,
private_openssl_ec_diffie_hellman_t *this, chunk_t *secret) private_openssl_ec_diffie_hellman_t *this, chunk_t *secret)
{ {
if (!this->shared_secret.len && if (!this->shared_secret.len &&
@@ -266,7 +266,7 @@ METHOD(diffie_hellman_t, get_shared_secret, bool,
return TRUE; return TRUE;
} }
METHOD(diffie_hellman_t, get_dh_group, diffie_hellman_group_t, METHOD(key_exchange_t, get_method, key_exchange_method_t,
private_openssl_ec_diffie_hellman_t *this) private_openssl_ec_diffie_hellman_t *this)
{ {
return this->group; return this->group;
@@ -275,7 +275,7 @@ METHOD(diffie_hellman_t, get_dh_group, diffie_hellman_group_t,
/* /*
* Described in header * Described in header
*/ */
int openssl_ecdh_group_to_nid(diffie_hellman_group_t group) int openssl_ecdh_group_to_nid(key_exchange_method_t group)
{ {
switch (group) switch (group)
{ {
@@ -337,7 +337,7 @@ static bool ecp2chunk(EC_GROUP *group, EC_POINT *point, chunk_t *chunk)
return chunk->len; return chunk->len;
} }
METHOD(diffie_hellman_t, set_private_value, bool, METHOD(key_exchange_t, set_private_key, bool,
private_openssl_ec_diffie_hellman_t *this, chunk_t value) private_openssl_ec_diffie_hellman_t *this, chunk_t value)
{ {
BIGNUM *priv = NULL; BIGNUM *priv = NULL;
@@ -390,7 +390,7 @@ METHOD(diffie_hellman_t, set_private_value, bool,
#else /* OPENSSL_VERSION_NUMBER */ #else /* OPENSSL_VERSION_NUMBER */
METHOD(diffie_hellman_t, set_private_value, bool, METHOD(key_exchange_t, set_private_key, bool,
private_openssl_ec_diffie_hellman_t *this, chunk_t value) private_openssl_ec_diffie_hellman_t *this, chunk_t value)
{ {
EC_KEY *key = NULL; EC_KEY *key = NULL;
@@ -430,7 +430,7 @@ error:
#endif /* OPENSSL_VERSION_NUMBER */ #endif /* OPENSSL_VERSION_NUMBER */
METHOD(diffie_hellman_t, destroy, void, METHOD(key_exchange_t, destroy, void,
private_openssl_ec_diffie_hellman_t *this) private_openssl_ec_diffie_hellman_t *this)
{ {
EC_GROUP_free(this->ec_group); EC_GROUP_free(this->ec_group);
@@ -443,7 +443,7 @@ METHOD(diffie_hellman_t, destroy, void,
/* /*
* Described in header * Described in header
*/ */
openssl_ec_diffie_hellman_t *openssl_ec_diffie_hellman_create(diffie_hellman_group_t group) openssl_ec_diffie_hellman_t *openssl_ec_diffie_hellman_create(key_exchange_method_t group)
{ {
private_openssl_ec_diffie_hellman_t *this; private_openssl_ec_diffie_hellman_t *this;
int curve; int curve;
@@ -456,12 +456,12 @@ openssl_ec_diffie_hellman_t *openssl_ec_diffie_hellman_create(diffie_hellman_gro
INIT(this, INIT(this,
.public = { .public = {
.dh = { .ke = {
.get_shared_secret = _get_shared_secret, .get_shared_secret = _get_shared_secret,
.set_other_public_value = _set_other_public_value, .set_public_key = _set_public_key,
.get_my_public_value = _get_my_public_value, .get_public_key = _get_public_key,
.set_private_value = _set_private_value, .set_private_key = _set_private_key,
.get_dh_group = _get_dh_group, .get_method = _get_method,
.destroy = _destroy, .destroy = _destroy,
}, },
}, },
src/libstrongswan/plugins/openssl/openssl_ec_diffie_hellman.h
+7 -6
View File
@@ -32,18 +32,19 @@ typedef struct openssl_ec_diffie_hellman_t openssl_ec_diffie_hellman_t;
struct openssl_ec_diffie_hellman_t { struct openssl_ec_diffie_hellman_t {
/** /**
* Implements diffie_hellman_t interface. * Implements key_exchange_t interface.
*/ */
diffie_hellman_t dh; key_exchange_t ke;
}; };
/** /**
* Creates a new openssl_ec_diffie_hellman_t object. * Creates a new openssl_ec_diffie_hellman_t object.
* *
* @param group EC Diffie Hellman group number to use * @param group EC Diffie-Hellman group number to use
* @return openssl_ec_diffie_hellman_t object, NULL if not supported * @return openssl_ec_diffie_hellman_t object, NULL if unsupported
*/ */
openssl_ec_diffie_hellman_t *openssl_ec_diffie_hellman_create(diffie_hellman_group_t group); openssl_ec_diffie_hellman_t *openssl_ec_diffie_hellman_create(
key_exchange_method_t group);
/** /**
* Map ECDH groups to OpenSSL NIDs for the ECC curve. * Map ECDH groups to OpenSSL NIDs for the ECC curve.
@@ -51,6 +52,6 @@ openssl_ec_diffie_hellman_t *openssl_ec_diffie_hellman_create(diffie_hellman_gro
* @param group ECDH group * @param group ECDH group
* @return NID for the curve * @return NID for the curve
*/ */
int openssl_ecdh_group_to_nid(diffie_hellman_group_t group); int openssl_ecdh_group_to_nid(key_exchange_method_t group);
#endif /** OPENSSL_EC_DIFFIE_HELLMAN_H_ @}*/ #endif /** OPENSSL_EC_DIFFIE_HELLMAN_H_ @}*/
src/libstrongswan/plugins/openssl/openssl_plugin.c
+28 -28
View File
@@ -326,7 +326,7 @@ METHOD(plugin_t, get_name, char*,
* Check if the given DH group is in the list of supported curves. * Check if the given DH group is in the list of supported curves.
*/ */
static bool ecdh_group_supported(EC_builtin_curve *curves, size_t num_curves, static bool ecdh_group_supported(EC_builtin_curve *curves, size_t num_curves,
diffie_hellman_group_t group) key_exchange_method_t group)
{ {
int j; int j;
@@ -360,7 +360,7 @@ static void add_ecdh_features(plugin_feature_t *features,
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
{ {
if (to_add[i].kind != FEATURE_PROVIDE || if (to_add[i].kind != FEATURE_PROVIDE ||
ecdh_group_supported(curves, num_curves, to_add[i].arg.dh_group)) ecdh_group_supported(curves, num_curves, to_add[i].arg.ke))
{ {
features[(*pos)++] = to_add[i]; features[(*pos)++] = to_add[i];
} }
@@ -528,19 +528,19 @@ METHOD(plugin_t, get_features, int,
#endif /* OPENSSL_VERSION_NUMBER */ #endif /* OPENSSL_VERSION_NUMBER */
#ifndef OPENSSL_NO_DH #ifndef OPENSSL_NO_DH
/* MODP DH groups */ /* MODP DH groups */
PLUGIN_REGISTER(DH, openssl_diffie_hellman_create), PLUGIN_REGISTER(KE, openssl_diffie_hellman_create),
PLUGIN_PROVIDE(DH, MODP_3072_BIT), PLUGIN_PROVIDE(KE, MODP_3072_BIT),
PLUGIN_PROVIDE(DH, MODP_4096_BIT), PLUGIN_PROVIDE(KE, MODP_4096_BIT),
PLUGIN_PROVIDE(DH, MODP_6144_BIT), PLUGIN_PROVIDE(KE, MODP_6144_BIT),
PLUGIN_PROVIDE(DH, MODP_8192_BIT), PLUGIN_PROVIDE(KE, MODP_8192_BIT),
PLUGIN_PROVIDE(DH, MODP_2048_BIT), PLUGIN_PROVIDE(KE, MODP_2048_BIT),
PLUGIN_PROVIDE(DH, MODP_2048_224), PLUGIN_PROVIDE(KE, MODP_2048_224),
PLUGIN_PROVIDE(DH, MODP_2048_256), PLUGIN_PROVIDE(KE, MODP_2048_256),
PLUGIN_PROVIDE(DH, MODP_1536_BIT), PLUGIN_PROVIDE(KE, MODP_1536_BIT),
PLUGIN_PROVIDE(DH, MODP_1024_BIT), PLUGIN_PROVIDE(KE, MODP_1024_BIT),
PLUGIN_PROVIDE(DH, MODP_1024_160), PLUGIN_PROVIDE(KE, MODP_1024_160),
PLUGIN_PROVIDE(DH, MODP_768_BIT), PLUGIN_PROVIDE(KE, MODP_768_BIT),
PLUGIN_PROVIDE(DH, MODP_CUSTOM), PLUGIN_PROVIDE(KE, MODP_CUSTOM),
#endif #endif
#ifndef OPENSSL_NO_RSA #ifndef OPENSSL_NO_RSA
/* RSA private/public key loading */ /* RSA private/public key loading */
@@ -649,11 +649,11 @@ METHOD(plugin_t, get_features, int,
#endif #endif
#endif /* OPENSSL_NO_ECDSA */ #endif /* OPENSSL_NO_ECDSA */
#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_ECDH) #if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_ECDH)
PLUGIN_REGISTER(DH, openssl_x_diffie_hellman_create), PLUGIN_REGISTER(KE, openssl_x_diffie_hellman_create),
/* available since 1.1.0a, but we require 1.1.1 features */ /* available since 1.1.0a, but we require 1.1.1 features */
PLUGIN_PROVIDE(DH, CURVE_25519), PLUGIN_PROVIDE(KE, CURVE_25519),
/* available since 1.1.1 */ /* available since 1.1.1 */
PLUGIN_PROVIDE(DH, CURVE_448), PLUGIN_PROVIDE(KE, CURVE_448),
#endif /* OPENSSL_VERSION_NUMBER && !OPENSSL_NO_ECDH */ #endif /* OPENSSL_VERSION_NUMBER && !OPENSSL_NO_ECDH */
#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_EC) #if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_EC)
/* EdDSA private/public key loading */ /* EdDSA private/public key loading */
@@ -686,17 +686,17 @@ METHOD(plugin_t, get_features, int,
static plugin_feature_t f_ecdh[] = { static plugin_feature_t f_ecdh[] = {
#ifndef OPENSSL_NO_ECDH #ifndef OPENSSL_NO_ECDH
/* EC DH groups */ /* EC DH groups */
PLUGIN_REGISTER(DH, openssl_ec_diffie_hellman_create), PLUGIN_REGISTER(KE, openssl_ec_diffie_hellman_create),
PLUGIN_PROVIDE(DH, ECP_256_BIT), PLUGIN_PROVIDE(KE, ECP_256_BIT),
PLUGIN_PROVIDE(DH, ECP_384_BIT), PLUGIN_PROVIDE(KE, ECP_384_BIT),
PLUGIN_PROVIDE(DH, ECP_521_BIT), PLUGIN_PROVIDE(KE, ECP_521_BIT),
PLUGIN_PROVIDE(DH, ECP_224_BIT), PLUGIN_PROVIDE(KE, ECP_224_BIT),
PLUGIN_PROVIDE(DH, ECP_192_BIT), PLUGIN_PROVIDE(KE, ECP_192_BIT),
#if OPENSSL_VERSION_NUMBER >= 0x10002000L #if OPENSSL_VERSION_NUMBER >= 0x10002000L
PLUGIN_PROVIDE(DH, ECP_256_BP), PLUGIN_PROVIDE(KE, ECP_256_BP),
PLUGIN_PROVIDE(DH, ECP_384_BP), PLUGIN_PROVIDE(KE, ECP_384_BP),
PLUGIN_PROVIDE(DH, ECP_512_BP), PLUGIN_PROVIDE(KE, ECP_512_BP),
PLUGIN_PROVIDE(DH, ECP_224_BP), PLUGIN_PROVIDE(KE, ECP_224_BP),
#endif /* OPENSSL_VERSION_NUMBER */ #endif /* OPENSSL_VERSION_NUMBER */
#endif /* OPENSSL_NO_ECDH */ #endif /* OPENSSL_NO_ECDH */
}; };
src/libstrongswan/plugins/openssl/openssl_x_diffie_hellman.c
+35 -35
View File
@@ -25,21 +25,21 @@
#include <utils/debug.h> #include <utils/debug.h>
typedef struct private_diffie_hellman_t private_diffie_hellman_t; typedef struct private_key_exchange_t private_key_exchange_t;
/** /**
* Private data * Private data
*/ */
struct private_diffie_hellman_t { struct private_key_exchange_t {
/** /**
* Public interface. * Public interface.
*/ */
diffie_hellman_t public; key_exchange_t public;
/** /**
* Diffie Hellman group number. * Key exchange method.
*/ */
diffie_hellman_group_t group; key_exchange_method_t ke;
/** /**
* Private (public) key * Private (public) key
@@ -58,11 +58,11 @@ struct private_diffie_hellman_t {
}; };
/** /**
* Map a DH group to a key type * Map a key exchange method to a key type
*/ */
static int map_key_type(diffie_hellman_group_t group) static int map_key_type(key_exchange_method_t ke)
{ {
switch (group) switch (ke)
{ {
case CURVE_25519: case CURVE_25519:
return EVP_PKEY_X25519; return EVP_PKEY_X25519;
@@ -73,29 +73,29 @@ static int map_key_type(diffie_hellman_group_t group)
} }
} }
METHOD(diffie_hellman_t, set_other_public_value, bool, METHOD(key_exchange_t, set_public_key, bool,
private_diffie_hellman_t *this, chunk_t value) private_key_exchange_t *this, chunk_t value)
{ {
if (!diffie_hellman_verify_value(this->group, value)) if (!key_exchange_verify_pubkey(this->ke, value))
{ {
return FALSE; return FALSE;
} }
EVP_PKEY_free(this->pub); EVP_PKEY_free(this->pub);
this->pub = EVP_PKEY_new_raw_public_key(map_key_type(this->group), NULL, this->pub = EVP_PKEY_new_raw_public_key(map_key_type(this->ke), NULL,
value.ptr, value.len); value.ptr, value.len);
if (!this->pub) if (!this->pub)
{ {
DBG1(DBG_LIB, "%N public value is malformed", DBG1(DBG_LIB, "%N public value is malformed",
diffie_hellman_group_names, this->group); key_exchange_method_names, this->ke);
return FALSE; return FALSE;
} }
chunk_clear(&this->shared_secret); chunk_clear(&this->shared_secret);
return TRUE; return TRUE;
} }
METHOD(diffie_hellman_t, get_my_public_value, bool, METHOD(key_exchange_t, get_public_key, bool,
private_diffie_hellman_t *this, chunk_t *value) private_key_exchange_t *this, chunk_t *value)
{ {
size_t len; size_t len;
@@ -114,11 +114,11 @@ METHOD(diffie_hellman_t, get_my_public_value, bool,
return TRUE; return TRUE;
} }
METHOD(diffie_hellman_t, set_private_value, bool, METHOD(key_exchange_t, set_private_key, bool,
private_diffie_hellman_t *this, chunk_t value) private_key_exchange_t *this, chunk_t value)
{ {
EVP_PKEY_free(this->key); EVP_PKEY_free(this->key);
this->key = EVP_PKEY_new_raw_private_key(map_key_type(this->group), NULL, this->key = EVP_PKEY_new_raw_private_key(map_key_type(this->ke), NULL,
value.ptr, value.len); value.ptr, value.len);
if (!this->key) if (!this->key)
{ {
@@ -127,28 +127,28 @@ METHOD(diffie_hellman_t, set_private_value, bool,
return TRUE; return TRUE;
} }
METHOD(diffie_hellman_t, get_shared_secret, bool, METHOD(key_exchange_t, get_shared_secret, bool,
private_diffie_hellman_t *this, chunk_t *secret) private_key_exchange_t *this, chunk_t *secret)
{ {
if (!this->shared_secret.len && if (!this->shared_secret.len &&
!openssl_compute_shared_key(this->key, this->pub, &this->shared_secret)) !openssl_compute_shared_key(this->key, this->pub, &this->shared_secret))
{ {
DBG1(DBG_LIB, "%N shared secret computation failed", DBG1(DBG_LIB, "%N shared secret computation failed",
diffie_hellman_group_names, this->group); key_exchange_method_names, this->ke);
return FALSE; return FALSE;
} }
*secret = chunk_clone(this->shared_secret); *secret = chunk_clone(this->shared_secret);
return TRUE; return TRUE;
} }
METHOD(diffie_hellman_t, get_dh_group, diffie_hellman_group_t, METHOD(key_exchange_t, get_method, key_exchange_method_t,
private_diffie_hellman_t *this) private_key_exchange_t *this)
{ {
return this->group; return this->ke;
} }
METHOD(diffie_hellman_t, destroy, void, METHOD(key_exchange_t, destroy, void,
private_diffie_hellman_t *this) private_key_exchange_t *this)
{ {
EVP_PKEY_free(this->key); EVP_PKEY_free(this->key);
EVP_PKEY_free(this->pub); EVP_PKEY_free(this->pub);
@@ -159,13 +159,13 @@ METHOD(diffie_hellman_t, destroy, void,
/* /*
* Described in header * Described in header
*/ */
diffie_hellman_t *openssl_x_diffie_hellman_create(diffie_hellman_group_t group) key_exchange_t *openssl_x_diffie_hellman_create(key_exchange_method_t ke)
{ {
private_diffie_hellman_t *this; private_key_exchange_t *this;
EVP_PKEY_CTX *ctx = NULL; EVP_PKEY_CTX *ctx = NULL;
EVP_PKEY *key = NULL; EVP_PKEY *key = NULL;
switch (group) switch (ke)
{ {
case CURVE_25519: case CURVE_25519:
ctx = EVP_PKEY_CTX_new_id(NID_X25519, NULL); ctx = EVP_PKEY_CTX_new_id(NID_X25519, NULL);
@@ -182,7 +182,7 @@ diffie_hellman_t *openssl_x_diffie_hellman_create(diffie_hellman_group_t group)
EVP_PKEY_keygen(ctx, &key) <= 0) EVP_PKEY_keygen(ctx, &key) <= 0)
{ {
DBG1(DBG_LIB, "generating key for %N failed", DBG1(DBG_LIB, "generating key for %N failed",
diffie_hellman_group_names, group); key_exchange_method_names, ke);
EVP_PKEY_CTX_free(ctx); EVP_PKEY_CTX_free(ctx);
return NULL; return NULL;
} }
@@ -191,13 +191,13 @@ diffie_hellman_t *openssl_x_diffie_hellman_create(diffie_hellman_group_t group)
INIT(this, INIT(this,
.public = { .public = {
.get_shared_secret = _get_shared_secret, .get_shared_secret = _get_shared_secret,
.set_other_public_value = _set_other_public_value, .set_public_key = _set_public_key,
.get_my_public_value = _get_my_public_value, .get_public_key = _get_public_key,
.set_private_value = _set_private_value, .set_private_key = _set_private_key,
.get_dh_group = _get_dh_group, .get_method = _get_method,
.destroy = _destroy, .destroy = _destroy,
}, },
.group = group, .ke = ke,
.key = key, .key = key,
); );
return &this->public; return &this->public;
src/libstrongswan/plugins/openssl/openssl_x_diffie_hellman.h
+3 -3
View File
@@ -27,12 +27,12 @@
#include <library.h> #include <library.h>
/** /**
* Creates a new diffie_hellman_t object. * Creates a new key_exchange_t object.
* *
* @param group Diffie Hellman group number to use * @param ke key exchange method to use
* @return object, NULL if not supported * @return object, NULL if not supported
*/ */
diffie_hellman_t *openssl_x_diffie_hellman_create(diffie_hellman_group_t group); key_exchange_t *openssl_x_diffie_hellman_create(key_exchange_method_t ke);
#endif /** OPENSSL_X_DIFFIE_HELLMAN_H_ @}*/ #endif /** OPENSSL_X_DIFFIE_HELLMAN_H_ @}*/
src/libstrongswan/plugins/pkcs11/pkcs11_dh.c
+17 -17
View File
@@ -46,9 +46,9 @@ struct private_pkcs11_dh_t {
CK_SESSION_HANDLE session; CK_SESSION_HANDLE session;
/** /**
* Diffie Hellman group number. * Diffie-Hellman group number.
*/ */
diffie_hellman_group_t group; key_exchange_method_t group;
/** /**
* Handle for own private value * Handle for own private value
@@ -114,10 +114,10 @@ static bool derive_secret(private_pkcs11_dh_t *this, chunk_t other)
return TRUE; return TRUE;
} }
METHOD(diffie_hellman_t, set_other_public_value, bool, METHOD(key_exchange_t, set_public_key, bool,
private_pkcs11_dh_t *this, chunk_t value) private_pkcs11_dh_t *this, chunk_t value)
{ {
if (!diffie_hellman_verify_value(this->group, value)) if (!key_exchange_verify_pubkey(this->group, value))
{ {
return FALSE; return FALSE;
} }
@@ -149,14 +149,14 @@ METHOD(diffie_hellman_t, set_other_public_value, bool,
return derive_secret(this, value); return derive_secret(this, value);
} }
METHOD(diffie_hellman_t, get_my_public_value, bool, METHOD(key_exchange_t, get_public_key, bool,
private_pkcs11_dh_t *this, chunk_t *value) private_pkcs11_dh_t *this, chunk_t *value)
{ {
*value = chunk_clone(this->pub_key); *value = chunk_clone(this->pub_key);
return TRUE; return TRUE;
} }
METHOD(diffie_hellman_t, get_shared_secret, bool, METHOD(key_exchange_t, get_shared_secret, bool,
private_pkcs11_dh_t *this, chunk_t *secret) private_pkcs11_dh_t *this, chunk_t *secret)
{ {
if (!this->secret.ptr) if (!this->secret.ptr)
@@ -167,13 +167,13 @@ METHOD(diffie_hellman_t, get_shared_secret, bool,
return TRUE; return TRUE;
} }
METHOD(diffie_hellman_t, get_dh_group, diffie_hellman_group_t, METHOD(key_exchange_t, get_method, key_exchange_method_t,
private_pkcs11_dh_t *this) private_pkcs11_dh_t *this)
{ {
return this->group; return this->group;
} }
METHOD(diffie_hellman_t, destroy, void, METHOD(key_exchange_t, destroy, void,
private_pkcs11_dh_t *this) private_pkcs11_dh_t *this)
{ {
this->lib->f->C_CloseSession(this->session); this->lib->f->C_CloseSession(this->session);
@@ -316,7 +316,7 @@ static pkcs11_library_t *find_token(private_pkcs11_dh_t *this,
/** /**
* Generic internal constructor * Generic internal constructor
*/ */
static private_pkcs11_dh_t *create_generic(diffie_hellman_group_t group, static private_pkcs11_dh_t *create_generic(key_exchange_method_t group,
CK_MECHANISM_TYPE key, CK_MECHANISM_TYPE key,
CK_MECHANISM_TYPE derive) CK_MECHANISM_TYPE derive)
{ {
@@ -324,11 +324,11 @@ static private_pkcs11_dh_t *create_generic(diffie_hellman_group_t group,
INIT(this, INIT(this,
.public = { .public = {
.dh = { .ke = {
.get_shared_secret = _get_shared_secret, .get_shared_secret = _get_shared_secret,
.set_other_public_value = _set_other_public_value, .set_public_key = _set_public_key,
.get_my_public_value = _get_my_public_value, .get_public_key = _get_public_key,
.get_dh_group = _get_dh_group, .get_method = _get_method,
.destroy = _destroy, .destroy = _destroy,
}, },
}, },
@@ -346,7 +346,7 @@ static private_pkcs11_dh_t *create_generic(diffie_hellman_group_t group,
return this; return this;
} }
static pkcs11_dh_t *create_ecp(diffie_hellman_group_t group, chunk_t ecparam) static pkcs11_dh_t *create_ecp(key_exchange_method_t group, chunk_t ecparam)
{ {
private_pkcs11_dh_t *this = create_generic(group, CKM_EC_KEY_PAIR_GEN, private_pkcs11_dh_t *this = create_generic(group, CKM_EC_KEY_PAIR_GEN,
CKM_ECDH1_DERIVE); CKM_ECDH1_DERIVE);
@@ -367,7 +367,7 @@ static pkcs11_dh_t *create_ecp(diffie_hellman_group_t group, chunk_t ecparam)
/** /**
* Constructor for MODP DH * Constructor for MODP DH
*/ */
static pkcs11_dh_t *create_modp(diffie_hellman_group_t group, size_t exp_len, static pkcs11_dh_t *create_modp(key_exchange_method_t group, size_t exp_len,
chunk_t g, chunk_t p) chunk_t g, chunk_t p)
{ {
private_pkcs11_dh_t *this = create_generic(group, CKM_DH_PKCS_KEY_PAIR_GEN, private_pkcs11_dh_t *this = create_generic(group, CKM_DH_PKCS_KEY_PAIR_GEN,
@@ -387,7 +387,7 @@ static pkcs11_dh_t *create_modp(diffie_hellman_group_t group, size_t exp_len,
/** /**
* Lookup the EC params for the given group. * Lookup the EC params for the given group.
*/ */
static chunk_t ecparams_lookup(diffie_hellman_group_t group) static chunk_t ecparams_lookup(key_exchange_method_t group)
{ {
switch (group) switch (group)
{ {
@@ -410,7 +410,7 @@ static chunk_t ecparams_lookup(diffie_hellman_group_t group)
/** /**
* Described in header. * Described in header.
*/ */
pkcs11_dh_t *pkcs11_dh_create(diffie_hellman_group_t group, ...) pkcs11_dh_t *pkcs11_dh_create(key_exchange_method_t group, ...)
{ {
switch (group) switch (group)
{ {

Some files were not shown because too many files have changed in this diff Show More