Merge branch 'swanctl-pkcs12'
authorMartin Willi <martin@revosec.ch>
Wed, 18 Mar 2015 12:36:50 +0000 (13:36 +0100)
committerMartin Willi <martin@revosec.ch>
Wed, 18 Mar 2015 12:36:50 +0000 (13:36 +0100)
commitc7bb1dc3d97ac9b36036b050714a3c4567da3290
tree4653be70766be697f482fbf17627c2e09c22cea1
parent84738b1aed955662106b272169915928e1232086
parent1e366429fd57c3b47e9837042c7f15c4217685dd
Merge branch 'swanctl-pkcs12'

Add support for loading PKCS#12 containers from a swanctl/pkcs12 directory.

Fixes #815.