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 802adac84bb38d3f1235fe7fe426fe057262a5d1..d7e1d2814cc42c136cc91debdccecce99da4b09b 100644 (file)
--- 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);
 }