diff options
| author | Daiki Ueno <dueno@redhat.com> | 2017-01-30 10:33:55 +0100 |
|---|---|---|
| committer | Daiki Ueno <dueno@redhat.com> | 2017-01-30 10:33:55 +0100 |
| commit | 1f59e2191bb6a0015e82133f75c2bd96a0754974 (patch) | |
| tree | 4814f316df0690324b2a79519e15f046b89c0347 /cmd/pk12util | |
| parent | d47cf6670121ccfc414c67614efd2bc99de7e117 (diff) | |
| download | nss-hg-1f59e2191bb6a0015e82133f75c2bd96a0754974.tar.gz | |
Bug 1268141 - pk12util can't import PKCS#12 files encrypted with AES-128-CBC, r=rrelyea
Diffstat (limited to 'cmd/pk12util')
| -rw-r--r-- | cmd/pk12util/pk12util.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cmd/pk12util/pk12util.c b/cmd/pk12util/pk12util.c index cca27cbf6..037afb723 100644 --- a/cmd/pk12util/pk12util.c +++ b/cmd/pk12util/pk12util.c @@ -861,6 +861,9 @@ p12u_EnableAllCiphers() SEC_PKCS12EnableCipher(PKCS12_RC2_CBC_128, 1); SEC_PKCS12EnableCipher(PKCS12_DES_56, 1); SEC_PKCS12EnableCipher(PKCS12_DES_EDE3_168, 1); + SEC_PKCS12EnableCipher(PKCS12_AES_CBC_128, 1); + SEC_PKCS12EnableCipher(PKCS12_AES_CBC_192, 1); + SEC_PKCS12EnableCipher(PKCS12_AES_CBC_256, 1); SEC_PKCS12SetPreferredCipher(PKCS12_DES_EDE3_168, 1); } |