Merge branch 'pbkdf2-sha2'
authorTobias Brunner <tobias@strongswan.org>
Wed, 7 Mar 2018 14:24:56 +0000 (15:24 +0100)
committerTobias Brunner <tobias@strongswan.org>
Wed, 7 Mar 2018 14:24:56 +0000 (15:24 +0100)
commitf71cccec6f379497e3ed9c571f37525ded62e0b0
tree348ecb5432b71e3270a42c9c89d94db409ec5803
parentb53eb857bfe196d313c8e6e7dc2573b968efd9e7
parent954f73ea6e7e444012b61d2fbd24807f8bf6aa1f
Merge branch 'pbkdf2-sha2'

Adds support for common SHA-2 based PRFs in PKCS#5/PBKDF2 as used by
OpenSSL 1.1 when generating PKCS#8-encoded private keys.

Fixes #2574.