Attachment 314240 Details for Bug 458317 – patch v3 (really)

[patch] patch v3 (really)

patch.dogtag.458317.3 (text/plain), 5.35 KB, created by Ade Lee on 2008-08-13 19:22:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ade Lee

Created: 2008-08-13 19:22:27 UTC

Size: 5.35 KB

patch

obsolete

>Index: pki/base/util/src/netscape/security/util/ExtPrettyPrint.java
>===================================================================
>--- pki/base/util/src/netscape/security/util/ExtPrettyPrint.java        (revision 108)
>+++ pki/base/util/src/netscape/security/util/ExtPrettyPrint.java        (working copy)
>@@ -1534,15 +1534,51 @@
>             }
>             sb.append(pp.indent(mIndentSize + 4) + mResource.getString(
>                     PrettyPrintResources.TOKEN_CERT_POLICIES) + "\n");
>-           CertificatePoliciesExtension cp = (CertificatePoliciesExtension) mExt;
>-           Vector cpv = (Vector) cp.get("infos");
>+            CertificatePoliciesExtension cp = (CertificatePoliciesExtension) mExt;
>+            Vector cpv = (Vector) cp.get("infos");
>             Enumeration e = cpv.elements();
> 
>             if (e != null) {
>                 while (e.hasMoreElements()) {
>                     CertificatePolicyInfo cpi = (CertificatePolicyInfo) e.nextElement();
> 
>-                        sb.append(pp.indent(mIndentSize + 8) + cpi.getPolicyIdentifier().getIdentifier().toString() + "\n");
>+                    sb.append(pp.indent(mIndentSize + 8) + "Policy Identifier: " + cpi.getPolicyIdentifier().getIdentifier().toString() + "\n");
>+                    PolicyQualifiers cpq = cpi.getPolicyQualifiers();
>+                    if (cpq != null) {
>+                        for (int i=0; i < cpq.size(); i++) {
>+                            PolicyQualifierInfo pq = cpq.getInfoAt(i);
>+                            Qualifier q = pq.getQualifier();
>+                            if (q instanceof CPSuri) {
>+                                sb.append(pp.indent(mIndentSize + 12) + "Policy Qualifier Identifier: CPS Pointer Qualifier - " 
>+                                    + pq.getId() + "\n");
>+                                sb.append(pp.indent(mIndentSize + 12) + "Policy Qualifier Data: " + ((CPSuri) q).getURI() + "\n");
>+                            } 
>+                            else if (q instanceof UserNotice) {
>+                                sb.append(pp.indent(mIndentSize + 12) + "Policy Qualifier Identifier: CPS User Notice Qualifier - " 
>+                                    + pq.getId() + "\n");
>+                                NoticeReference nref = ((UserNotice) q).getNoticeReference();
>+                                DisplayText dt = ((UserNotice) q).getDisplayText();
>+                                sb.append(pp.indent(mIndentSize +12) + "Policy Qualifier Data: \n");
>+                                if (nref != null) { 
>+                                    sb.append(pp.indent(mIndentSize+16) + "Organization: " + nref.getOrganization().toString() + "\n" );
>+                                    sb.append(pp.indent(mIndentSize+16) + "Notice Numbers: " ); 
>+                                    int[] nums = nref.getNumbers();
>+                                    for (int k=0; k<nums.length; k++) {
>+                                        if (k != 0) {
>+                                            sb.append(",");
>+                                            sb.append(nums[k]);
>+                                        } else {
>+                                            sb.append(nums[k]);
>+                                        }
>+                                    }
>+                                    sb.append("\n");
>+                                }
>+                                if (dt != null) {
>+                                    sb.append(pp.indent(mIndentSize+16) + "Explicit Text: " + dt.toString() + "\n");
>+                                }
>+                            } 
>+                        }
>+                    }
>                 }
>             }
>             return sb.toString();
>
>Index: pki/linux/util/pki-util.spec
>===================================================================
>--- pki/linux/util/pki-util.spec        (revision 108)
>+++ pki/linux/util/pki-util.spec        (working copy)
>@@ -33,7 +33,7 @@
> ## Package Header Definitions
> %define base_name         %{base_prefix}-%{base_component}
> %define base_version      1.0.0
>-%define base_release      3
>+%define base_release      4
> %define base_group        System Environment/Base
> %define base_vendor       Red Hat, Inc.
> %define base_license      GPLv2 with exceptions
>@@ -278,6 +278,8 @@
> ###############################################################################
> 
> %changelog
>+* Wed Aug 13 2008 Ade Lee <alee@redhat.com> 1.0.0-4
>+- Fix for bug #458317: certitificate policy extensions not displayed in PrettyPrintCert
> * Wed Jun 25 2008 Andrew Wnuk <awnuk@redhat.com> 1.0.0-3
> - Fix for bug #443687.
> * Mon Jun 9 2008 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-2
>
>Index: base/util/src/netscape/security/x509/DisplayText.java
>===================================================================
>--- base/util/src/netscape/security/x509/DisplayText.java       (revision 108)
>+++ base/util/src/netscape/security/x509/DisplayText.java       (working copy)
>@@ -66,4 +66,19 @@
>     public String getText() {
>         return mS;
>     }
>+
>+    public String toString() {
>+        if (mTag == tag_IA5String) {
>+            return "IA5String: " + mS;
>+        }
>+       else if (mTag == tag_BMPString) {
>+            return "BMPString: " + mS;
>+        }
>+        else if (mTag == tag_VisibleString) {
>+            return "VisibleString: " + mS;
>+        }
>+        else {
>+            return "UTF8String: " + mS;
>+        }
>+    }
> }
>

Actions: View | Diff

Attachments on bug 458317: 313714 | 314219 | 314233 | 314240