diff options
| author | Martin Willi <martin@revosec.ch> | 2013-10-29 10:09:39 +0100 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2014-06-04 15:53:03 +0200 |
| commit | 3ecfc83c6be2e96d01bf8ee805737e9e14262a01 (patch) | |
| tree | 30dc063d27f594158ae6b1773b24bb32f44374a8 /src/libcharon/sa/ikev1/keymat_v1.c | |
| parent | 396baeaea257608655f91a824ddfcbb3fa01e7a5 (diff) | |
| download | strongswan-3ecfc83c6be2e96d01bf8ee805737e9e14262a01.tar.bz2 strongswan-3ecfc83c6be2e96d01bf8ee805737e9e14262a01.tar.xz | |
payload: Use common prefixes for all payload type identifiers
The old identifiers did not use a proper namespace and often clashed with
other defines.
Diffstat (limited to 'src/libcharon/sa/ikev1/keymat_v1.c')
| -rw-r--r-- | src/libcharon/sa/ikev1/keymat_v1.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libcharon/sa/ikev1/keymat_v1.c b/src/libcharon/sa/ikev1/keymat_v1.c index bf1b0046c..619d197bd 100644 --- a/src/libcharon/sa/ikev1/keymat_v1.c +++ b/src/libcharon/sa/ikev1/keymat_v1.c @@ -791,7 +791,7 @@ METHOD(keymat_v1_t, get_hash, bool, static bool get_nonce(message_t *message, chunk_t *n) { nonce_payload_t *nonce; - nonce = (nonce_payload_t*)message->get_payload(message, NONCE_V1); + nonce = (nonce_payload_t*)message->get_payload(message, PLV1_NONCE); if (nonce) { *n = nonce->get_nonce(nonce); @@ -815,7 +815,7 @@ static chunk_t get_message_data(message_t *message, generator_t *generator) enumerator = message->create_payload_enumerator(message); while (enumerator->enumerate(enumerator, &payload)) { - if (payload->get_type(payload) == HASH_V1) + if (payload->get_type(payload) == PLV1_HASH) { continue; } @@ -835,7 +835,7 @@ static chunk_t get_message_data(message_t *message, generator_t *generator) generator->generate_payload(generator, payload); payload = next; } - payload->set_next_type(payload, NO_PAYLOAD); + payload->set_next_type(payload, PL_NONE); generator->generate_payload(generator, payload); } enumerator->destroy(enumerator); |