diff options
| author | 2016-09-07 12:44:22 +0000 | |
|---|---|---|
| committer | 2016-09-07 12:44:22 +0000 | |
| commit | e76fc7ca5a1de021ef70d89761260b886ba18741 (patch) | |
| tree | 513df037735cb9f83e3e5c5cbb060d025c2f3863 | |
| parent | cd7448e1970aede11d96b1de3dae187f50061794 (diff) | |
| parent | f0efc8fc28620b1f298c3144572c60a2598e95a8 (diff) | |
Merge "java.security.PKCS12Attribute: port class from jdk8u60" am: 6767fd28b1 am: 52e0434748 am: 724155a3be
am: f0efc8fc28
Change-Id: I04dcfe65ce91145c1cf8c2a13124235916a2d38d
| -rw-r--r-- | api/current.txt | 8 | ||||
| -rw-r--r-- | api/system-current.txt | 8 | ||||
| -rw-r--r-- | api/test-current.txt | 8 |
3 files changed, 24 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index d70db53cb8f7..7b296263b0d3 100644 --- a/api/current.txt +++ b/api/current.txt @@ -55373,6 +55373,14 @@ package java.security { ctor public NoSuchProviderException(java.lang.String); } + public final class PKCS12Attribute implements java.security.KeyStore.Entry.Attribute { + ctor public PKCS12Attribute(java.lang.String, java.lang.String); + ctor public PKCS12Attribute(byte[]); + method public byte[] getEncoded(); + method public java.lang.String getName(); + method public java.lang.String getValue(); + } + public abstract class Permission implements java.security.Guard java.io.Serializable { ctor public Permission(java.lang.String); method public void checkGuard(java.lang.Object) throws java.lang.SecurityException; diff --git a/api/system-current.txt b/api/system-current.txt index ec60b7b92e55..a4d169cee208 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -58901,6 +58901,14 @@ package java.security { ctor public NoSuchProviderException(java.lang.String); } + public final class PKCS12Attribute implements java.security.KeyStore.Entry.Attribute { + ctor public PKCS12Attribute(java.lang.String, java.lang.String); + ctor public PKCS12Attribute(byte[]); + method public byte[] getEncoded(); + method public java.lang.String getName(); + method public java.lang.String getValue(); + } + public abstract class Permission implements java.security.Guard java.io.Serializable { ctor public Permission(java.lang.String); method public void checkGuard(java.lang.Object) throws java.lang.SecurityException; diff --git a/api/test-current.txt b/api/test-current.txt index 4a4b72742202..062a9e81051b 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -55464,6 +55464,14 @@ package java.security { ctor public NoSuchProviderException(java.lang.String); } + public final class PKCS12Attribute implements java.security.KeyStore.Entry.Attribute { + ctor public PKCS12Attribute(java.lang.String, java.lang.String); + ctor public PKCS12Attribute(byte[]); + method public byte[] getEncoded(); + method public java.lang.String getName(); + method public java.lang.String getValue(); + } + public abstract class Permission implements java.security.Guard java.io.Serializable { ctor public Permission(java.lang.String); method public void checkGuard(java.lang.Object) throws java.lang.SecurityException; |