From c1a3909887b5065be09ae8df083178b0d3995ae3 Mon Sep 17 00:00:00 2001
From: "kirke%netscape.com" <kirke%netscape.com>
Date: Thu, 1 Feb 2001 01:29:04 +0000
Subject: [PATCH] Resolved merge conflict with Ian.

---
 security/nss/cmd/pk12util/pk12util.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/security/nss/cmd/pk12util/pk12util.c b/security/nss/cmd/pk12util/pk12util.c
index a08cdbf8beb3..a0fa7d80b5a0 100644
--- a/security/nss/cmd/pk12util/pk12util.c
+++ b/security/nss/cmd/pk12util/pk12util.c
@@ -794,9 +794,6 @@ P12U_Init(char *dir)
         exit(-1);
     }
 
-    /* enable all ciphers */
-    p12u_EnableAllCiphers();
-
     /* setup unicode callback functions */
     PORT_SetUCS2_ASCIIConversionFunction(p12u_ucs2_ascii_conversion_function);
     PORT_SetUCS4_UTF8ConversionFunction(sec_port_ucs4_utf8_conversion_function);