diff options
Diffstat (limited to 'pki/base/migrate/60ToTxt')
| -rw-r--r-- | pki/base/migrate/60ToTxt/classes/CMS60LdifParser.class | bin | 7888 -> 9019 bytes | |||
| -rw-r--r-- | pki/base/migrate/60ToTxt/classes/Main.class | bin | 1518 -> 1518 bytes | |||
| -rwxr-xr-x | pki/base/migrate/60ToTxt/run.sh | 2 | ||||
| -rw-r--r-- | pki/base/migrate/60ToTxt/src/Main.java | 38 |
4 files changed, 39 insertions, 1 deletions
diff --git a/pki/base/migrate/60ToTxt/classes/CMS60LdifParser.class b/pki/base/migrate/60ToTxt/classes/CMS60LdifParser.class Binary files differindex 73da94b5..f3ff4304 100644 --- a/pki/base/migrate/60ToTxt/classes/CMS60LdifParser.class +++ b/pki/base/migrate/60ToTxt/classes/CMS60LdifParser.class diff --git a/pki/base/migrate/60ToTxt/classes/Main.class b/pki/base/migrate/60ToTxt/classes/Main.class Binary files differindex 2027e509..6d0d3dcd 100644 --- a/pki/base/migrate/60ToTxt/classes/Main.class +++ b/pki/base/migrate/60ToTxt/classes/Main.class diff --git a/pki/base/migrate/60ToTxt/run.sh b/pki/base/migrate/60ToTxt/run.sh index a29e6e1f..d41d6529 100755 --- a/pki/base/migrate/60ToTxt/run.sh +++ b/pki/base/migrate/60ToTxt/run.sh @@ -195,5 +195,5 @@ fi ### into a normalized ${CMS} ldif text file. ### -${SERVER_ROOT}/bin/cert/jre/bin/java -classpath ./classes:${SERVER_ROOT}/cert-${INSTANCE}/classes:${SERVER_ROOT}/bin/cert/classes:${SERVER_ROOT}/bin/cert/jars/certsrv.jar:${SERVER_ROOT}/bin/cert/jars/cmscore.jar:${SERVER_ROOT}/bin/cert/jars/nsutil.jar:${SERVER_ROOT}/bin/cert/jars/jss3.jar:${SERVER_ROOT}/bin/cert/jre/lib/rt.jar Main $1 $2 +${SERVER_ROOT}/bin/cert/jre/bin/java -classpath ./classes:${SERVER_ROOT}/cert-${INSTANCE}/classes:${SERVER_ROOT}/bin/cert/classes:${SERVER_ROOT}/bin/cert/jars/certsrv.jar:${SERVER_ROOT}/bin/cert/jars/cmscore.jar:${SERVER_ROOT}/bin/cert/jars/nsutil.jar:${SERVER_ROOT}/bin/cert/jars/jss3.jar:${SERVER_ROOT}/bin/cert/jre/lib/rt.jar:${SERVER_ROOT}/bin/cert/jre/lib/i18n.jar Main $1 $2 diff --git a/pki/base/migrate/60ToTxt/src/Main.java b/pki/base/migrate/60ToTxt/src/Main.java index a5c67f0e..380baab9 100644 --- a/pki/base/migrate/60ToTxt/src/Main.java +++ b/pki/base/migrate/60ToTxt/src/Main.java @@ -373,7 +373,23 @@ class CMS60LdifParser System.out.println(" " + key + ":" + o.getClass().getName() + "=" + k + ":" + ob.getClass().getName() + "=" + ((java.util.Date)ob).getTime()); + } else if (ob instanceof java.math.BigInteger[]) { + // Bugzilla Bug #225031 (a.k.a. - Raidzilla Bug #58356) + java.math.BigInteger in[] = (java.math.BigInteger[])ob; + String numbers = ""; + for (int i = 0; i < in.length; i++) { + if (numbers.equals("")) { + numbers = in[i].toString(); + } else { + numbers = numbers + "," + in[i].toString(); + } + } + System.out.println(" " + + key + ":" + "com.netscape.certsrv.authentication.AuthToken" + "=" + + k + ":java.lang.String=" + numbers); } else if (ob instanceof String[]) { + // Bugzilla Bug #224763 (a.k.a. - Raidzilla Bug #57949) + // Bugzilla Bug #252240 String str[] = (String[])ob; String v = ""; if (str != null) { @@ -403,10 +419,17 @@ class CMS60LdifParser System.out.println(" " + key + ":Integer[" + in.length + "," + i + "]="+ in[i]); } } else if (obj instanceof BigInteger[]) { + // Bugzilla Bug #238779 BigInteger in[] = (BigInteger[])obj; for (int i = 0; i < in.length; i++) { System.out.println(" " + key + ":java.math.BigInteger[" + in.length + "," + i + "]="+ in[i]); } + } else if (obj instanceof String[]) { + // Bugzilla Bug #223360 (a.k.a - Raidzilla Bug #58086) + String str[] = (String[])obj; + for (int i = 0; i < str.length; i++) { + System.out.println(" " + key + ":java.lang.String[" + str.length + "," + i + "]="+ str[i]); + } } else if (obj instanceof netscape.security.x509.CertificateAlgorithmId) { netscape.security.x509.CertificateAlgorithmId o = (netscape.security.x509.CertificateAlgorithmId)obj; @@ -427,6 +450,21 @@ class CMS60LdifParser System.out.println(" " + key + ":netscape.security.x509.CertificateValidity="+ encoder.encode(bos.toByteArray())); + } else if (obj instanceof java.util.Hashtable) { + // Bugzilla Bug #224800 (a.k.a - Raidzilla Bug #56953) + // + // Example: fingerprints:java.util.Hashtable= + // {SHA1=[B@52513a, MD5=[B@52c4d9, MD2=[B@799ff5} + // + java.util.Hashtable o = (java.util.Hashtable)obj; + BASE64Encoder encoder = new BASE64Encoder(); + Enumeration e = o.elements(); + while (e.hasMoreElements()) { + String k = (String)e.nextElement(); + System.out.println(" " + + key + ":" + o.getClass().getName() + "=" + + k + "=" + encoder.encode((byte[])o.get(k))); + } } else { System.out.println(" " + key + ":" + obj.getClass().getName() + "=" + |