diff options
| author |   Christian E. Hopps <chopps@gmail.com> | 2019-05-16 12:24:57 -0400 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2019-05-22 11:26:30 +0000 |
| commit | 04d26ee2a97364d84135101b13711d2ce02631a8 (patch) | |
| tree | 8b1d4d3b499e29525caaaa66ec879c4f75143ea4 /src/plugins/ikev2/ikev2_crypto.c | |
| parent | 233e4681830bc2a9cd40deb4b5909b4e310d1a2a (diff) | |
Fix Diffie-Hellman exchange with newer openssl API
Change-Id: Id42a597c130d0053d074446e552a81c7264549e7
Signed-off-by: Christian E. Hopps <chopps@chopps.org>
Diffstat (limited to 'src/plugins/ikev2/ikev2_crypto.c')
| -rw-r--r-- | src/plugins/ikev2/ikev2_crypto.c | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/src/plugins/ikev2/ikev2_crypto.c b/src/plugins/ikev2/ikev2_crypto.c index deb6d35113f..80638f17b13 100644 --- a/src/plugins/ikev2/ikev2_crypto.c +++ b/src/plugins/ikev2/ikev2_crypto.c @@ -457,21 +457,18 @@ void ikev2_generate_dh (ikev2_sa_t * sa, ikev2_sa_transform_t * t) { int r; -#if OPENSSL_VERSION_NUMBER >= 0x10100000L - BIGNUM *p = BN_new (); - BIGNUM *q = BN_new (); - BIGNUM *g = BN_new (); - BIGNUM *pub_key = BN_new (); - BIGNUM *priv_key = BN_new (); -#endif if (t->dh_group == IKEV2_DH_GROUP_MODP) { DH *dh = DH_new (); #if OPENSSL_VERSION_NUMBER >= 0x10100000L + BIGNUM *p = NULL; + BIGNUM *g = NULL; + const BIGNUM *pub_key, *priv_key; + BN_hex2bn (&p, t->dh_p); BN_hex2bn (&g, t->dh_g); - DH_set0_pqg (dh, p, q, g); + DH_set0_pqg (dh, p, NULL, g); #else BN_hex2bn (&dh->p, t->dh_p); BN_hex2bn (&dh->g, t->dh_g); @@ -483,28 +480,28 @@ ikev2_generate_dh (ikev2_sa_t * sa, ikev2_sa_transform_t * t) sa->i_dh_data = vec_new (u8, t->key_len); sa->dh_private_key = vec_new (u8, t->key_len); #if OPENSSL_VERSION_NUMBER >= 0x10100000L + DH_get0_key (dh, &pub_key, &priv_key); r = BN_bn2bin (pub_key, sa->i_dh_data); ASSERT (r == t->key_len); r = BN_bn2bin (priv_key, sa->dh_private_key); - DH_set0_key (dh, pub_key, priv_key); #else r = BN_bn2bin (dh->pub_key, sa->i_dh_data); ASSERT (r == t->key_len); r = BN_bn2bin (dh->priv_key, sa->dh_private_key); - ASSERT (r == t->key_len); #endif + ASSERT (r == t->key_len); } else { sa->r_dh_data = vec_new (u8, t->key_len); #if OPENSSL_VERSION_NUMBER >= 0x10100000L - r = BN_bn2bin (pub_key, sa->i_dh_data); - ASSERT (r == t->key_len); - DH_set0_key (dh, pub_key, NULL); + DH_get0_key (dh, &pub_key, &priv_key); + r = BN_bn2bin (pub_key, sa->r_dh_data); #else r = BN_bn2bin (dh->pub_key, sa->r_dh_data); - ASSERT (r == t->key_len); #endif + ASSERT (r == t->key_len); + BIGNUM *ex; sa->dh_shared_key = vec_new (u8, t->key_len); ex = BN_bin2bn (sa->i_dh_data, vec_len (sa->i_dh_data), NULL); @@ -601,20 +598,18 @@ void ikev2_complete_dh (ikev2_sa_t * sa, ikev2_sa_transform_t * t) { int r; -#if OPENSSL_VERSION_NUMBER >= 0x10100000L - BIGNUM *p = BN_new (); - BIGNUM *q = BN_new (); - BIGNUM *g = BN_new (); - BIGNUM *priv_key = BN_new (); -#endif if (t->dh_group == IKEV2_DH_GROUP_MODP) { DH *dh = DH_new (); #if OPENSSL_VERSION_NUMBER >= 0x10100000L + BIGNUM *p = NULL; + BIGNUM *g = NULL; + BIGNUM *priv_key; + BN_hex2bn (&p, t->dh_p); BN_hex2bn (&g, t->dh_g); - DH_set0_pqg (dh, p, q, g); + DH_set0_pqg (dh, p, NULL, g); priv_key = BN_bin2bn (sa->dh_private_key, vec_len (sa->dh_private_key), NULL); |