diff options
| author | Daiki Ueno <ueno@gnu.org> | 2020-11-02 10:51:12 +0000 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2020-11-02 10:51:12 +0000 |
| commit | a1583a12e7f4728c315a2ef99ded8200e25b4884 (patch) | |
| tree | 1a3d1e0006a8cfd3899f01514f4c62b1e878efda | |
| parent | cc89b3c82a13fc88a6fbfb1e4d47278bebcf913a (diff) | |
| parent | 633216485b0013c4b992bad4b9d21949b8301b35 (diff) | |
| download | gnutls-a1583a12e7f4728c315a2ef99ded8200e25b4884.tar.gz | |
Merge branch 'remove_3des' into 'master'
PKCS #12: switch default encryption to AES-256-CBC
Closes #799
See merge request gnutls/gnutls!1348
| -rw-r--r-- | lib/x509/pkcs7-crypt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/x509/pkcs7-crypt.c b/lib/x509/pkcs7-crypt.c index d64862df43..edd0bcb77b 100644 --- a/lib/x509/pkcs7-crypt.c +++ b/lib/x509/pkcs7-crypt.c @@ -225,9 +225,9 @@ int _gnutls_pkcs_flags_to_schema(unsigned int flags) gnutls_assert(); _gnutls_debug_log - ("Selecting default encryption PKCS12_3DES_SHA1 (flags: %u).\n", + ("Selecting default encryption PBES2_AES_256 (flags: %u).\n", flags); - return PKCS12_3DES_SHA1; + return PBES2_AES_256; } /** |