summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Sergio Giro <sgiro@google.com> 2016-08-24 14:53:41 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2016-08-24 14:53:42 +0000
commit5b24bccbc80e76bc2eeeaaa97ef2d937e0385b5c (patch)
tree3b3527c64f5d1d48ad7ab832eb2624fcbcd1aee4
parentd0a0ae349c6bbfe4c9cae5d5d2e06085ad9b56e1 (diff)
parent86aa7c6157a64cb206f71cdf0e9311344059b1fd (diff)
Merge "java.security.spec: add public field in MGF1ParameterSpec"
-rw-r--r--api/current.txt1
-rw-r--r--api/system-current.txt1
2 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 3cee0f5f6597..3c9e09f1e2f2 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -53813,6 +53813,7 @@ package java.security.spec {
ctor public MGF1ParameterSpec(java.lang.String);
method public java.lang.String getDigestAlgorithm();
field public static final java.security.spec.MGF1ParameterSpec SHA1;
+ 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 public static final java.security.spec.MGF1ParameterSpec SHA512;
diff --git a/api/system-current.txt b/api/system-current.txt
index 4a3f042e2ce9..db95da6f9c1c 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -56433,6 +56433,7 @@ package java.security.spec {
ctor public MGF1ParameterSpec(java.lang.String);
method public java.lang.String getDigestAlgorithm();
field public static final java.security.spec.MGF1ParameterSpec SHA1;
+ 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 public static final java.security.spec.MGF1ParameterSpec SHA512;