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 /crypto/test | |
| 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 'crypto/test')
| -rw-r--r-- | crypto/test/scoped_types.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/test/scoped_types.h b/crypto/test/scoped_types.h index d9eaad27..e44c6ed9 100644 --- a/crypto/test/scoped_types.h +++ b/crypto/test/scoped_types.h @@ -113,6 +113,7 @@ using ScopedPKCS12 = ScopedOpenSSLType<PKCS12, PKCS12_free>; using ScopedRSA = ScopedOpenSSLType<RSA, RSA_free>; using ScopedX509 = ScopedOpenSSLType<X509, X509_free>; using ScopedX509_ALGOR = ScopedOpenSSLType<X509_ALGOR, X509_ALGOR_free>; +using ScopedX509_SIG = ScopedOpenSSLType<X509_SIG, X509_SIG_free>; using ScopedX509Stack = ScopedOpenSSLStack<STACK_OF(X509), X509, X509_free>; |