From: Tobias Brunner <tobias@strongswan.org>
Date: Fri, 7 Feb 2020 08:45:56 +0000 (+0100)
Subject: proposal-substructure: Start numbering IKEv1 proposals with 1
X-Git-Tag: 5.8.3rc1~9^2~1
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fstrongswan.git;a=commitdiff_plain;h=1c6b43b8eae62c57ec5d4be3da1c2b428d6f607a

proposal-substructure: Start numbering IKEv1 proposals with 1
---

diff --git a/src/libcharon/encoding/payloads/proposal_substructure.c b/src/libcharon/encoding/payloads/proposal_substructure.c
index 802adac84b..d7e1d2814c 100644
--- a/src/libcharon/encoding/payloads/proposal_substructure.c
+++ b/src/libcharon/encoding/payloads/proposal_substructure.c
@@ -1530,7 +1530,9 @@ static void set_data(private_proposal_substructure_t *this, proposal_t *proposal
 		default:
 			break;
 	}
-	this->proposal_number = proposal->get_number(proposal);
+	/* default to 1 if no number is set (mainly for IKEv1, for IKEv2 the numbers
+	 * are explicitly set when proposals are added to the SA payload) */
+	this->proposal_number = proposal->get_number(proposal) ?: 1;
 	this->protocol_id = proposal->get_protocol(proposal);
 	compute_length(this);
 }