diff options
| author | Matt Braithwaite <mab@google.com> | 2015-08-21 21:09:44 +0300 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2015-08-28 23:33:33 +0300 |
| commit | e0004721665f099b13ae035fe563fba6c013c6da (patch) | |
| tree | d749e34f65841d136638a85f80c7ee27e5328c60 /util | |
| parent | 73415b6aa0ebe5a6b8acc0bcd66483eca1481676 (diff) | |
pkcs8.c: Add PBES2 to list of password-based encryption methods.
This consists mostly of re-adding OpenSSL's implementation of PBKDF2
(very loosely based upon e0d26bb3). The meat of it, namely
|PKCS5_PBKDF2_HMAC|, was already present, but unused.
In addition, |PKCS8_encrypt| and |PKCS8_decrypt| must be changed to
not perform UCS-2 conversion in the PBES2 case.
Change-Id: Id170ecabc43c79491600051147d1d6d3c7273dbc
Reviewed-on: https://boringssl-review.googlesource.com/5745
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'util')
| -rw-r--r-- | util/all_tests.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/util/all_tests.json b/util/all_tests.json index 77ffa0a0..a6daa2f8 100644 --- a/util/all_tests.json +++ b/util/all_tests.json @@ -44,6 +44,7 @@ ["crypto/hmac/hmac_test", "crypto/hmac/hmac_tests.txt"], ["crypto/lhash/lhash_test"], ["crypto/modes/gcm_test"], + ["crypto/pkcs8/pkcs8_test"], ["crypto/pkcs8/pkcs12_test"], ["crypto/poly1305/poly1305_test", "crypto/poly1305/poly1305_test.txt"], ["crypto/refcount_test"], |