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

Added support for MODP_CUSTOM to openssl plugin

Browse Source
This commit is contained in:
Martin Willi
2010-09-03 09:33:15 +02:00
parent 6deeacd965
commit 42b1ac91c4
3 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/openssl/openssl_diffie_hellman.c
+14 -5
View File
@@ -138,7 +138,8 @@ METHOD(diffie_hellman_t, destroy, void,
/*
* Described in header.
*/
openssl_diffie_hellman_t *openssl_diffie_hellman_create(diffie_hellman_group_t group)
openssl_diffie_hellman_t *openssl_diffie_hellman_create(
diffie_hellman_group_t group, chunk_t g, chunk_t p)
{
private_openssl_diffie_hellman_t *this;
@@ -166,11 +167,19 @@ openssl_diffie_hellman_t *openssl_diffie_hellman_create(diffie_hellman_group_t g
this->pub_key = BN_new();
this->shared_secret = chunk_empty;
/* find a modulus according to group */
if (set_modulus(this) != SUCCESS)
if (group == MODP_CUSTOM)
{
destroy(this);
return NULL;
this->dh->p = BN_bin2bn(p.ptr, p.len, NULL);
this->dh->g = BN_bin2bn(g.ptr, g.len, NULL);
}
else
{
/* find a modulus according to group */
if (set_modulus(this) != SUCCESS)
{
destroy(this);
return NULL;
}
}
/* generate my public and private values */