Merge branch 'tkm-spi-label'
authorTobias Brunner <tobias@strongswan.org>
Wed, 11 Nov 2015 14:42:34 +0000 (15:42 +0100)
committerTobias Brunner <tobias@strongswan.org>
Wed, 11 Nov 2015 14:45:50 +0000 (15:45 +0100)
commit41feeddd48e1bc10d37980d1212509dbf27c74da
tree76949193c93ceaf1fa54e8ab0ed1a208a9c54dee
parent7b5dcc9f2778ab4b1e726fb95f1ff72b866343c0
parente63589a7dc567039a4f77b3a5096bc67955d3ade
Merge branch 'tkm-spi-label'

Adds the charon-tkm.spi_label and charon-tkm.spi_mask options to encode
a specific value/label in otherwise randomly generated IKE SPIs.