denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

notify-payload: Add methods to simplify encoding and retrieving IKE SPIs

Browse Source 
The get_spi_data() method is currently not used, so that has been
simplified so it can be used for any protocol type and any SPI length.
Same for set_spi_data(), which is currently used for IKEv1 to encode
two SPIs.
This commit is contained in:
Tobias Brunner
2023-07-26 15:09:49 +02:00
parent e0e99c1dd3
commit 10a3c44a41
2 changed files with 57 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/encoding/payloads/notify_payload.h
+29 -12
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2006-2018 Tobias Brunner
* Copyright (C) 2006-2023 Tobias Brunner
* Copyright (C) 2006 Daniel Roethlisberger
* Copyright (C) 2005-2006 Martin Willi
* Copyright (C) 2005 Jan Hutter
@@ -231,43 +231,60 @@ struct notify_payload_t {
void (*set_notify_type) (notify_payload_t *this, notify_type_t type);
/**
* Returns the currently set spi of this payload.
* Returns the currently set 32-bit SPI of this payload.
*
* This is only valid for notifys with protocol AH|ESP
* This is only valid for notify payloads with protocol AH|ESP.
*
* @return SPI value
*/
uint32_t (*get_spi) (notify_payload_t *this);
/**
* Sets the spi of this payload.
* Sets the 32-bit SPI of this payload.
*
* This is only valid for notifys with protocol AH|ESP
* This is only valid for notify payloads with protocol AH|ESP.
*
* @param spi SPI value
*/
void (*set_spi) (notify_payload_t *this, uint32_t spi);
/**
* Returns the currently set spi of this payload.
* Returns the currently set 64-bit SPI of this payload.
*
* This is only valid for notifys with protocol ISAKMP
* This is only valid for notify payloads with protocol IKE.
*
* @return SPI value
*/
chunk_t (*get_spi_data) (notify_payload_t *this);
uint64_t (*get_ike_spi)(notify_payload_t *this);
/**
* Sets the spi of this payload.
* Sets the 64-bit SPI of this payload.
*
* This is only valid for notifys with protocol ISAKMP
* This is only valid for notify payloads with protocol IKE.
*
* @param spi SPI value
*/
void (*set_spi_data) (notify_payload_t *this, chunk_t spi);
void (*set_ike_spi)(notify_payload_t *this, uint64_t spi);
/**
* Returns the currently set notification data of payload.
* Returns the data encoded as SPI in this payload.
*
* @return encoded SPI value
*/
chunk_t (*get_spi_data)(notify_payload_t *this);
/**
* Sets the data encoded as SPI in this payload.
*
* This is allowed for any protocol type, but is primarily used for ISAKMP,
* where notify payloads contain both SPIs.
*
* @param spi SPI value (cloned)
*/
void (*set_spi_data)(notify_payload_t *this, chunk_t spi);
/**
* Returns the currently set notification data of this payload.
*
* Returned data are not copied.
*