From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Tue, 6 Mar 2012 08:39:06 +0000 (+0100)
Subject: The default cipher when encrypting with PKCS12 is AES.
X-Git-Tag: gnutls_3_0_16~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=addee7cdf78578a0717725157a62dec948bf76a9;p=thirdparty%2Fgnutls.git

The default cipher when encrypting with PKCS12 is AES.
---

diff --git a/src/certtool.c b/src/certtool.c
index 0bf160950b..036aef5b81 100644
--- a/src/certtool.c
+++ b/src/certtool.c
@@ -223,7 +223,11 @@ generate_private_key_int (common_info_st * cinfo)
 static int
 cipher_to_flags (const char *cipher)
 {
-  if (strcasecmp (cipher, "3des") == 0)
+  if (cipher == NULL)
+    {
+      return GNUTLS_PKCS_USE_PBES2_AES_128;
+    }
+  else if (strcasecmp (cipher, "3des") == 0)
     {
       return GNUTLS_PKCS_USE_PBES2_3DES;
     }