ikev1: Accept more than one certificate payload in aggressive mode

Fixes #2085.

diff --git a/src/libcharon/encoding/message.c b/src/libcharon/encoding/message.c
index 1fd644203bffe0e01ded0dfb318df92701e348dd..50dab9e384a595fd23b2e798bc4d12c43bc4c76d 100644 (file)
--- a/src/libcharon/encoding/message.c
+++ b/src/libcharon/encoding/message.c
@@ -535,7 +535,7 @@ static payload_rule_t aggressive_i_rules[] = {
        {PLV1_NAT_D,                                    0,      MAX_NAT_D_PAYLOADS,             FALSE,  FALSE},
        {PLV1_NAT_D_DRAFT_00_03,                0,      MAX_NAT_D_PAYLOADS,             FALSE,  FALSE},
        {PLV1_ID,                                               0,      1,                                              FALSE,  FALSE},
-       {PLV1_CERTIFICATE,                              0,      1,                                              TRUE,   FALSE},
+       {PLV1_CERTIFICATE,                              0,      MAX_CERT_PAYLOADS,              TRUE,   FALSE},
        {PLV1_SIGNATURE,                                0,      1,                                              TRUE,   FALSE},
        {PLV1_HASH,                                             0,      1,                                              TRUE,   FALSE},
        {PLV1_FRAGMENT,                                 0,      1,                                              FALSE,  TRUE},
@@ -575,7 +575,7 @@ static payload_rule_t aggressive_r_rules[] = {
        {PLV1_NAT_D,                                    0,      MAX_NAT_D_PAYLOADS,             FALSE,  FALSE},
        {PLV1_NAT_D_DRAFT_00_03,                0,      MAX_NAT_D_PAYLOADS,             FALSE,  FALSE},
        {PLV1_ID,                                               0,      1,                                              FALSE,  FALSE},
-       {PLV1_CERTIFICATE,                              0,      1,                                              FALSE,  FALSE},
+       {PLV1_CERTIFICATE,                              0,      MAX_CERT_PAYLOADS,              FALSE,  FALSE},
        {PLV1_SIGNATURE,                                0,      1,                                              FALSE,  FALSE},
        {PLV1_HASH,                                             0,      1,                                              FALSE,  FALSE},
        {PLV1_FRAGMENT,                                 0,      1,                                              FALSE,  TRUE},