Merge pull request #1101 from jariq/master
authorAlex Rønne Petersen <alex@lycus.org>
Mon, 16 Jun 2014 12:54:30 +0000 (14:54 +0200)
committerAlex Rønne Petersen <alex@lycus.org>
Mon, 16 Jun 2014 12:54:30 +0000 (14:54 +0200)
commite0747e695229e7181bbcce603b738273d1e0b909
tree16b9a9957b2ab5cd5a689d9b3750b51d805781a8
parent8826a3bb456169b62c0f4c3a7b649cb32ff0ec47
parentd798c91b0112fd546f1be719bc75c796a17cc9fe
Merge pull request #1101 from jariq/master

Support both unencrypted PKCS#12 and PKCS#12 encrypted with an empty pas...