ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

ikev1: Accept SPI size of any length <= 16 in ISAKMP proposal 

Fixes #533.
This commit is contained in:
Tobias Brunner 2014-03-03 14:03:46 +01:00
parent a213944d4a
commit a30e0001e4
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/libcharon/encoding/payloads/proposal_substructure.c
View File

@ -361,12 +361,20 @@ METHOD(payload_t, verify, status_t,
}
break;
case PROTO_IKE:
if (this->spi.len != 0 && this->spi.len != 8)
if (this->type == PROPOSAL_SUBSTRUCTURE_V1)
{
DBG1(DBG_ENC, "invalid SPI length in IKE proposal");
return FAILED;
if (this->spi.len <= 16)
{ /* according to RFC 2409, section 3.5 anything between
* 0 and 16 is fine */
break;
}
}
break;
else if (this->spi.len == 0 || this->spi.len == 8)
{
break;
}
DBG1(DBG_ENC, "invalid SPI length in IKE proposal");
return FAILED;
default:
break;
}