Fixed PKCS12Export output.

The PKCS12Export has been modified such that if an error occurs
in normal mode it will display the error message and in debug
mode it will display the full stack trace.

The code has also been refactored such that it can be reused as a
library in addition to command-line tool. The code will now throw
exceptions instead of exiting to the system.

https://fedorahosted.org/pki/ticket/1224

1 files changed, 3 insertions, 1 deletions

diff --git a/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java
index 7e6c2a3c1..5566e91e9 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java
@@ -865,6 +865,8 @@ public class ConfigurationUtils {
             BadPaddingException, NotInitializedException, NicknameConflictException, UserCertConflictException,
             NoSuchItemOnTokenException, InvalidBERException, IOException {
 
+        // TODO: refactor into a PKCS #12 utility class
+
         byte b[] = new byte[1000000];
         FileInputStream fis = new FileInputStream(p12File);
         while (fis.available() > 0)
@@ -886,7 +888,7 @@ public class ConfigurationUtils {
         Vector<Vector<Object>> pkeyinfo_collection = new Vector<Vector<Object>>();
         Vector<Vector<Object>> cert_collection = new Vector<Vector<Object>>();
 
-        CMS.debug("PKCS #12:");
+        CMS.debug("Importing PKCS #12 data");
 
         for (int i = 0; i < safes.getSize(); i++) {