crypto: Define MODP_CUSTOM outside of IKE DH range
Before this fix it was possible to crash charon with an IKE_SA_INIT message containing a KE payload with DH group MODP_CUSTOM(1025). Defining MODP_CUSTOM outside of the two byte IKE DH identifier range prevents it from getting negotiated. Fixes CVE-2014-9221.
This commit is contained in:
committed by
Andreas Steffen
parent
6683cf6a5a
commit
e13ef5c434
@@ -35,7 +35,7 @@ struct private_gcrypt_dh_t {
|
||||
/**
|
||||
* Diffie Hellman group number
|
||||
*/
|
||||
u_int16_t group;
|
||||
diffie_hellman_group_t group;
|
||||
|
||||
/*
|
||||
* Generator value
|
||||
|
||||
@@ -42,7 +42,7 @@ struct private_gmp_diffie_hellman_t {
|
||||
/**
|
||||
* Diffie Hellman group number.
|
||||
*/
|
||||
u_int16_t group;
|
||||
diffie_hellman_group_t group;
|
||||
|
||||
/*
|
||||
* Generator value.
|
||||
|
||||
@@ -56,7 +56,7 @@ struct private_ntru_ke_t {
|
||||
/**
|
||||
* Diffie Hellman group number.
|
||||
*/
|
||||
u_int16_t group;
|
||||
diffie_hellman_group_t group;
|
||||
|
||||
/**
|
||||
* NTRU Parameter Set
|
||||
|
||||
@@ -38,7 +38,7 @@ struct private_openssl_diffie_hellman_t {
|
||||
/**
|
||||
* Diffie Hellman group number.
|
||||
*/
|
||||
u_int16_t group;
|
||||
diffie_hellman_group_t group;
|
||||
|
||||
/**
|
||||
* Diffie Hellman object
|
||||
|
||||
@@ -40,7 +40,7 @@ struct private_openssl_ec_diffie_hellman_t {
|
||||
/**
|
||||
* Diffie Hellman group number.
|
||||
*/
|
||||
u_int16_t group;
|
||||
diffie_hellman_group_t group;
|
||||
|
||||
/**
|
||||
* EC private (public) key
|
||||
|
||||
@@ -47,7 +47,7 @@ struct private_pkcs11_dh_t {
|
||||
/**
|
||||
* Diffie Hellman group number.
|
||||
*/
|
||||
u_int16_t group;
|
||||
diffie_hellman_group_t group;
|
||||
|
||||
/**
|
||||
* Handle for own private value
|
||||
|
||||
Reference in New Issue
Block a user