8296612: CertAttrSet is useless

Reviewed-by: mullan

Author: wangweij

src/java.base/share/classes/com/sun/crypto/provider/OAEPParameters.java

@@ -180,7 +180,7 @@ protected byte[] engineGetEncoded() throws IOException {
                                   " impl not found");
         }
         tmp2 = new DerOutputStream();
-        mdAlgId.derEncode(tmp2);
+        mdAlgId.encode(tmp2);
         tmp.write(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0),
                       tmp2);
 

src/java.base/share/classes/sun/security/pkcs/PKCS7.java

@@ -782,9 +782,9 @@ public static byte[] generateNewSignedData(
             // CMSAlgorithmProtection (RFC6211)
             DerOutputStream derAp = new DerOutputStream();
             DerOutputStream derAlgs = new DerOutputStream();
-            digAlgID.derEncode(derAlgs);
+            digAlgID.encode(derAlgs);
             DerOutputStream derSigAlg = new DerOutputStream();
-            sigAlgID.derEncode(derSigAlg);
+            sigAlgID.encode(derSigAlg);
             derAlgs.writeImplicit((byte)0xA1, derSigAlg);
             derAp.write(DerValue.tag_Sequence, derAlgs);
             authAttrs = new PKCS9Attributes(new PKCS9Attribute[]{

src/java.base/share/classes/sun/security/pkcs/PKCS9Attribute.java

@@ -524,7 +524,7 @@ public PKCS9Attribute(DerValue derVal) throws IOException {
      * should be encoded as <code>T61String</code>s.
      */
     @Override
-    public void derEncode(DerOutputStream out) throws IOException {
+    public void encode(DerOutputStream out) throws IOException {
         DerOutputStream temp = new DerOutputStream();
         temp.putOID(oid);
         switch (index) {

src/java.base/share/classes/sun/security/pkcs/SignerInfo.java

@@ -208,11 +208,6 @@ private void checkCMSAlgorithmProtection() throws IOException {
         }
     }
 
-    public void encode(DerOutputStream out) throws IOException {
-
-        derEncode(out);
-    }
-
     /**
      * DER encode this object onto an output stream.
      * Implements the {@code DerEncoder} interface.
@@ -222,7 +217,8 @@ public void encode(DerOutputStream out) throws IOException {
      *
      * @exception IOException on encoding error.
      */
-    public void derEncode(DerOutputStream out) throws IOException {
+    @Override
+    public void encode(DerOutputStream out) throws IOException {
         DerOutputStream seq = new DerOutputStream();
         seq.putInteger(version);
         DerOutputStream issuerAndSerialNumber = new DerOutputStream();

src/java.base/share/classes/sun/security/pkcs10/PKCS10Attribute.java

@@ -107,9 +107,10 @@ public PKCS10Attribute(PKCS9Attribute attr) {
      *
      * @exception IOException on encoding errors.
      */
-    public void derEncode(DerOutputStream out) throws IOException {
+    @Override
+    public void encode(DerOutputStream out) throws IOException {
         PKCS9Attribute attr = new PKCS9Attribute(attributeId, attributeValue);
-        attr.derEncode(out);
+        attr.encode(out);
     }
 
     /**

src/java.base/share/classes/sun/security/pkcs10/PKCS10Attributes.java

@@ -87,24 +87,15 @@ public PKCS10Attributes(DerInputStream in) throws IOException {
         }
     }
 
-    /**
-     * Encode the attributes in DER form to the stream.
-     *
-     * @param out the OutputStream to marshal the contents to.
-     * @exception IOException on encoding errors.
-     */
-    public void encode(DerOutputStream out) throws IOException {
-        derEncode(out);
-    }
-
     /**
      * Encode the attributes in DER form to the stream.
      * Implements the {@code DerEncoder} interface.
      *
      * @param out the OutputStream to marshal the contents to.
      * @exception IOException on encoding errors.
      */
-    public void derEncode(DerOutputStream out) throws IOException {
+    @Override
+    public void encode(DerOutputStream out) throws IOException {
         // first copy the elements into an array
         Collection<PKCS10Attribute> allAttrs = map.values();
         PKCS10Attribute[] attribs =

src/java.base/share/classes/sun/security/rsa/PSSParameters.java

@@ -239,7 +239,7 @@ public static byte[] getEncoded(PSSParameterSpec spec) throws IOException {
         }
         if (!mdAlgId.getOID().equals(AlgorithmId.SHA_oid)) {
             tmp2 = new DerOutputStream();
-            mdAlgId.derEncode(tmp2);
+            mdAlgId.encode(tmp2);
             tmp.write(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte) 0),
                     tmp2);
         }

src/java.base/share/classes/sun/security/util/DerEncoder.java

@@ -40,7 +40,7 @@ public interface DerEncoder {
      *
      * @param out  the stream on which the DER encoding is written.
      */
-    void derEncode(DerOutputStream out)
+    void encode(DerOutputStream out)
         throws IOException;
 
 }

src/java.base/share/classes/sun/security/util/DerOutputStream.java

@@ -404,7 +404,7 @@ private DerOutputStream putOrderedSet(byte tag, DerEncoder[] set,
 
         for (int i = 0; i < set.length; i++) {
             streams[i] = new DerOutputStream();
-            set[i].derEncode(streams[i]);
+            set[i].encode(streams[i]);
         }
 
         // order the element encodings
@@ -582,7 +582,8 @@ public void putLength(int len) throws IOException {
      *
      *  @exception IOException on output error.
      */
-    public void derEncode(DerOutputStream out) throws IOException {
+    @Override
+    public void encode(DerOutputStream out) throws IOException {
         out.write(toByteArray());
     }
 
@@ -592,7 +593,7 @@ public void derEncode(DerOutputStream out) throws IOException {
      * @throws IOException on output error
      */
     public DerOutputStream write(DerEncoder encoder) throws IOException {
-        encoder.derEncode(this);
+        encoder.encode(this);
         return this;
     }
 

src/java.base/share/classes/sun/security/x509/AVA.java

@@ -616,13 +616,6 @@ public int hashCode() {
         return toRFC2253CanonicalString().hashCode();
     }
 
-    /*
-     * AVAs are encoded as a SEQUENCE of two elements.
-     */
-    public void encode(DerOutputStream out) throws IOException {
-        derEncode(out);
-    }
-
     /**
      * DER encode this object onto an output stream.
      * Implements the <code>DerEncoder</code> interface.
@@ -632,7 +625,8 @@ public void encode(DerOutputStream out) throws IOException {
      *
      * @exception IOException on encoding error.
      */
-    public void derEncode(DerOutputStream out) throws IOException {
+    @Override
+    public void encode(DerOutputStream out) throws IOException {
         DerOutputStream         tmp = new DerOutputStream();
 
         tmp.putOID(oid);