commit a52a3d389f89a3900b17cca09ec4351303309a9a
author Nikita Iashchenko <nikitai@google.com> Wed Aug 03 20:17:06 2022 +0100
committer Nikita Iashchenko <nikitai@google.com> Wed Aug 03 20:17:06 2022 +0100
tree 84b5641ab5a0f05371993c5ef929d6c4398cb85e
parent 5dcd530e43dce9aea0050940b0c338c0f415a544

OpenJDK 17: sun.security.pkcs.PKCS9Attributes

This is part of merging upstream changes from OpenJDK 17.0.3-ga. This CL
updates sun.security.pkcs.PKCS9Attributes class.

Bug: 241258364
Test: m
Change-Id: I12d1b2b6d2f2f8d97f456d6e637a1fd0969be52f

ojluni/src/main/java/sun/security/pkcs/PKCS9Attributes.java

diff --git a/ojluni/src/main/java/sun/security/pkcs/PKCS9Attributes.java b/ojluni/src/main/java/sun/security/pkcs/PKCS9Attributes.java
index 7f72a4e..4016ea8 100644
--- a/ojluni/src/main/java/sun/security/pkcs/PKCS9Attributes.java
+++ b/ojluni/src/main/java/sun/security/pkcs/PKCS9Attributes.java
@@ -85,8 +85,7 @@
                            DerInputStream in) throws IOException {
         if (permittedAttributes != null) {
             this.permittedAttributes =
-                new Hashtable<ObjectIdentifier, ObjectIdentifier>(
-                                                permittedAttributes.length);
+                new Hashtable<>(permittedAttributes.length);
 
             for (int i = 0; i < permittedAttributes.length; i++)
                 this.permittedAttributes.put(permittedAttributes[i],
@@ -278,11 +277,13 @@
      */
     public PKCS9Attribute[] getAttributes() {
         PKCS9Attribute[] attribs = new PKCS9Attribute[attributes.size()];
-        ObjectIdentifier oid;
 
         int j = 0;
         for (int i=1; i < PKCS9Attribute.PKCS9_OIDS.length &&
                       j < attribs.length; i++) {
+            if (PKCS9Attribute.PKCS9_OIDS[i] == null) {
+                continue;
+            }
             attribs[j] = getAttribute(PKCS9Attribute.PKCS9_OIDS[i]);
 
             if (attribs[j] != null)
@@ -323,14 +324,16 @@
      * Returns the PKCS9 block in a printable string form.
      */
     public String toString() {
-        StringBuffer buf = new StringBuffer(200);
-        buf.append("PKCS9 Attributes: [\n\t");
+        StringBuilder sb = new StringBuilder(200);
+        sb.append("PKCS9 Attributes: [\n\t");
 
-        ObjectIdentifier oid;
         PKCS9Attribute value;
 
         boolean first = true;
         for (int i = 1; i < PKCS9Attribute.PKCS9_OIDS.length; i++) {
+            if (PKCS9Attribute.PKCS9_OIDS[i] == null) {
+                continue;
+            }
             value = getAttribute(PKCS9Attribute.PKCS9_OIDS[i]);
 
             if (value == null) continue;
@@ -339,14 +342,14 @@
             if (first)
                 first = false;
             else
-                buf.append(";\n\t");
+                sb.append(";\n\t");
 
-            buf.append(value.toString());
+            sb.append(value);
         }
 
-        buf.append("\n\t] (end PKCS9 Attributes)");
+        sb.append("\n\t] (end PKCS9 Attributes)");
 
-        return buf.toString();
+        return sb.toString();
     }
 
     /**