Revert "When generating private key allow usage of --pkcs-cipher flag."

This reverts commit e72dcf4095adad4811aa440ff44d272d633cdf9d.

1 files changed, 1 insertions, 30 deletions

diff --git a/src/certtool.c b/src/certtool.c
index a5890bfcc3..5693cf2bb2 100644
--- a/src/certtool.c
+++ b/src/certtool.c
@@ -195,35 +195,6 @@ generate_private_key_int (void)
   return key;
 }
 
-static int
-cipher_to_flags (const char *cipher)
-{
-  if (strcasecmp (cipher, "3des") == 0)
-    {
-      return GNUTLS_PKCS_USE_PBES2_3DES;
-    }
-  else if (strcasecmp (cipher, "aes-128") == 0)
-    {
-      return GNUTLS_PKCS_USE_PBES2_AES_128;
-    }
-  else if (strcasecmp (cipher, "aes-192") == 0)
-    {
-      return GNUTLS_PKCS_USE_PBES2_AES_192;
-    }
-  else if (strcasecmp (cipher, "aes-256") == 0)
-    {
-      return GNUTLS_PKCS_USE_PBES2_AES_256;
-    }
-  else if (strcasecmp (cipher, "rc2-40") == 0)
-    {
-      return GNUTLS_PKCS_USE_PKCS12_RC2_40;
-    }
-
-  error (EXIT_FAILURE, 0, "Unknown cipher %s\n", cipher);
-  return -1;
-}
-
-
 static void
 print_private_key (gnutls_x509_privkey_t key)
 {
@@ -249,7 +220,7 @@ print_private_key (gnutls_x509_privkey_t key)
       if (info.export)
 	flags = GNUTLS_PKCS_USE_PKCS12_RC2_40;
       else
-	flags = cipher_to_flags (info.pkcs_cipher);
+	flags = GNUTLS_PKCS_USE_PKCS12_3DES;
 
       if ((pass = get_confirmed_pass (true)) == NULL || *pass == '\0')
 	flags = GNUTLS_PKCS_PLAIN;