Expose new MGF1 message digests

Bug: 260847206
Test: tests.security.spec.MGF1ParameterSpecTest
Change-Id: Ibec4a40ce19c6cb5cb712042edf9b27e5ffcca5b

3 files changed, 83 insertions, 6 deletions

diff --git a/api/current.txt b/api/current.txt
index cd3c02d7b0d..4395481e39d 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -9476,7 +9476,13 @@ package java.security.spec {
     field public static final java.security.spec.MGF1ParameterSpec SHA224;
     field public static final java.security.spec.MGF1ParameterSpec SHA256;
     field public static final java.security.spec.MGF1ParameterSpec SHA384;
+    field @FlaggedApi("com.android.libcore.v_apis") public static final java.security.spec.MGF1ParameterSpec SHA3_224;
+    field @FlaggedApi("com.android.libcore.v_apis") public static final java.security.spec.MGF1ParameterSpec SHA3_256;
+    field @FlaggedApi("com.android.libcore.v_apis") public static final java.security.spec.MGF1ParameterSpec SHA3_384;
+    field @FlaggedApi("com.android.libcore.v_apis") public static final java.security.spec.MGF1ParameterSpec SHA3_512;
     field public static final java.security.spec.MGF1ParameterSpec SHA512;
+    field @FlaggedApi("com.android.libcore.v_apis") public static final java.security.spec.MGF1ParameterSpec SHA512_224;
+    field @FlaggedApi("com.android.libcore.v_apis") public static final java.security.spec.MGF1ParameterSpec SHA512_256;
   }
 
   public class NamedParameterSpec implements java.security.spec.AlgorithmParameterSpec {
diff --git a/ojluni/annotations/flagged_api/java/security/spec/MGF1ParameterSpec.annotated.java b/ojluni/annotations/flagged_api/java/security/spec/MGF1ParameterSpec.annotated.java
new file mode 100644
index 00000000000..0a2627836a7
--- /dev/null
+++ b/ojluni/annotations/flagged_api/java/security/spec/MGF1ParameterSpec.annotated.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+package java.security.spec;
+
+@SuppressWarnings({"unchecked", "deprecation", "all"})
+public class MGF1ParameterSpec implements java.security.spec.AlgorithmParameterSpec {
+
+public MGF1ParameterSpec(java.lang.String mdName) { throw new RuntimeException("Stub!"); }
+
+public java.lang.String getDigestAlgorithm() { throw new RuntimeException("Stub!"); }
+
+public java.lang.String toString() { throw new RuntimeException("Stub!"); }
+
+public static final java.security.spec.MGF1ParameterSpec SHA1;
+static { SHA1 = null; }
+
+public static final java.security.spec.MGF1ParameterSpec SHA224;
+static { SHA224 = null; }
+
+public static final java.security.spec.MGF1ParameterSpec SHA256;
+static { SHA256 = null; }
+
+public static final java.security.spec.MGF1ParameterSpec SHA384;
+static { SHA384 = null; }
+
+@android.annotation.FlaggedApi(com.android.libcore.Flags.FLAG_V_APIS)
+public static final java.security.spec.MGF1ParameterSpec SHA3_224;
+static { SHA3_224 = null; }
+
+@android.annotation.FlaggedApi(com.android.libcore.Flags.FLAG_V_APIS)
+public static final java.security.spec.MGF1ParameterSpec SHA3_256;
+static { SHA3_256 = null; }
+
+@android.annotation.FlaggedApi(com.android.libcore.Flags.FLAG_V_APIS)
+public static final java.security.spec.MGF1ParameterSpec SHA3_384;
+static { SHA3_384 = null; }
+
+@android.annotation.FlaggedApi(com.android.libcore.Flags.FLAG_V_APIS)
+public static final java.security.spec.MGF1ParameterSpec SHA3_512;
+static { SHA3_512 = null; }
+
+public static final java.security.spec.MGF1ParameterSpec SHA512;
+static { SHA512 = null; }
+
+@android.annotation.FlaggedApi(com.android.libcore.Flags.FLAG_V_APIS)
+public static final java.security.spec.MGF1ParameterSpec SHA512_224;
+static { SHA512_224 = null; }
+
+@android.annotation.FlaggedApi(com.android.libcore.Flags.FLAG_V_APIS)
+public static final java.security.spec.MGF1ParameterSpec SHA512_256;
+static { SHA512_256 = null; }
+}
+
diff --git a/ojluni/src/main/java/java/security/spec/MGF1ParameterSpec.java b/ojluni/src/main/java/java/security/spec/MGF1ParameterSpec.java
index 37f00e2cabe..be6ce30f57f 100644
--- a/ojluni/src/main/java/java/security/spec/MGF1ParameterSpec.java
+++ b/ojluni/src/main/java/java/security/spec/MGF1ParameterSpec.java
@@ -96,14 +96,12 @@ public class MGF1ParameterSpec implements AlgorithmParameterSpec {
 
     /**
      * The MGF1ParameterSpec which uses SHA-512/224 message digest
-     * @hide
      */
     public static final MGF1ParameterSpec SHA512_224 =
         new MGF1ParameterSpec("SHA-512/224");
 
     /**
      * The MGF1ParameterSpec which uses SHA-512/256 message digest
-     * @hide
      */
     public static final MGF1ParameterSpec SHA512_256 =
         new MGF1ParameterSpec("SHA-512/256");
@@ -111,7 +109,6 @@ public class MGF1ParameterSpec implements AlgorithmParameterSpec {
     /**
      * The MGF1ParameterSpec which uses SHA3-224 message digest
      * @since 16
-     * @hide
      */
     public static final MGF1ParameterSpec SHA3_224 =
         new MGF1ParameterSpec("SHA3-224");
@@ -119,7 +116,6 @@ public class MGF1ParameterSpec implements AlgorithmParameterSpec {
     /**
      * The MGF1ParameterSpec which uses SHA3-256 message digest
      * @since 16
-     * @hide
      */
     public static final MGF1ParameterSpec SHA3_256 =
         new MGF1ParameterSpec("SHA3-256");
@@ -127,7 +123,6 @@ public class MGF1ParameterSpec implements AlgorithmParameterSpec {
     /**
      * The MGF1ParameterSpec which uses SHA3-384 message digest
      * @since 16
-     * @hide
      */
     public static final MGF1ParameterSpec SHA3_384 =
         new MGF1ParameterSpec("SHA3-384");
@@ -135,7 +130,6 @@ public class MGF1ParameterSpec implements AlgorithmParameterSpec {
     /**
      * The MGF1ParameterSpec which uses SHA3-512 message digest
      * @since 16
-     * @hide
      */
     public static final MGF1ParameterSpec SHA3_512 =
         new MGF1ParameterSpec("SHA3-512");