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)
Adds the charon-tkm.spi_label and charon-tkm.spi_mask options to encode
a specific value/label in otherwise randomly generated IKE SPIs.


Trivial merge