From 59fdfb121f331e72ef72e6b2ef0a02e4f219b00b Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Tue, 12 Jan 2016 14:20:52 -0800 Subject: [PATCH] Track changes in libcore The OCSP update added some API changes necessary to interact with it. This change tracks the addition of the API. Change-Id: I04438fda92cbcde8bc9c66be4f0440066926b51a --- api/current.txt | 42 +++++++++++++++++++++++++++++++++++++++++- api/system-current.txt | 42 +++++++++++++++++++++++++++++++++++++++++- api/test-current.txt | 42 +++++++++++++++++++++++++++++++++++++++++- 3 files changed, 123 insertions(+), 3 deletions(-) diff --git a/api/current.txt b/api/current.txt index 47d32077861a5..e7c25e469adfb 100644 --- a/api/current.txt +++ b/api/current.txt @@ -49554,6 +49554,8 @@ package java.lang { public class InternalError extends java.lang.VirtualMachineError { ctor public InternalError(); ctor public InternalError(java.lang.String); + ctor public InternalError(java.lang.String, java.lang.Throwable); + ctor public InternalError(java.lang.Throwable); } public class InterruptedException extends java.lang.Exception { @@ -50326,6 +50328,8 @@ package java.lang { public abstract class VirtualMachineError extends java.lang.Error { ctor public VirtualMachineError(); ctor public VirtualMachineError(java.lang.String); + ctor public VirtualMachineError(java.lang.String, java.lang.Throwable); + ctor public VirtualMachineError(java.lang.Throwable); } public final class Void { @@ -54068,6 +54072,7 @@ package java.security.cert { method public static java.security.cert.CertPathBuilder getInstance(java.lang.String, java.lang.String) throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException; method public static java.security.cert.CertPathBuilder getInstance(java.lang.String, java.security.Provider) throws java.security.NoSuchAlgorithmException; method public final java.security.Provider getProvider(); + method public final java.security.cert.CertPathChecker getRevocationChecker(); } public class CertPathBuilderException extends java.security.GeneralSecurityException { @@ -54085,6 +54090,13 @@ package java.security.cert { public abstract class CertPathBuilderSpi { ctor public CertPathBuilderSpi(); method public abstract java.security.cert.CertPathBuilderResult engineBuild(java.security.cert.CertPathParameters) throws java.security.cert.CertPathBuilderException, java.security.InvalidAlgorithmParameterException; + method public java.security.cert.CertPathChecker engineGetRevocationChecker(); + } + + public abstract interface CertPathChecker { + method public abstract void check(java.security.cert.Certificate) throws java.security.cert.CertPathValidatorException; + method public abstract void init(boolean) throws java.security.cert.CertPathValidatorException; + method public abstract boolean isForwardCheckingSupported(); } public abstract interface CertPathParameters implements java.lang.Cloneable { @@ -54099,6 +54111,7 @@ package java.security.cert { method public static java.security.cert.CertPathValidator getInstance(java.lang.String, java.lang.String) throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException; method public static java.security.cert.CertPathValidator getInstance(java.lang.String, java.security.Provider) throws java.security.NoSuchAlgorithmException; method public final java.security.Provider getProvider(); + method public final java.security.cert.CertPathChecker getRevocationChecker(); method public final java.security.cert.CertPathValidatorResult validate(java.security.cert.CertPath, java.security.cert.CertPathParameters) throws java.security.cert.CertPathValidatorException, java.security.InvalidAlgorithmParameterException; } @@ -54135,6 +54148,7 @@ package java.security.cert { public abstract class CertPathValidatorSpi { ctor public CertPathValidatorSpi(); + method public java.security.cert.CertPathChecker engineGetRevocationChecker(); method public abstract java.security.cert.CertPathValidatorResult engineValidate(java.security.cert.CertPath, java.security.cert.CertPathParameters) throws java.security.cert.CertPathValidatorException, java.security.InvalidAlgorithmParameterException; } @@ -54293,9 +54307,10 @@ package java.security.cert { method public java.security.cert.CertPath getCertPath(); } - public abstract class PKIXCertPathChecker implements java.lang.Cloneable { + public abstract class PKIXCertPathChecker implements java.security.cert.CertPathChecker java.lang.Cloneable { ctor protected PKIXCertPathChecker(); method public abstract void check(java.security.cert.Certificate, java.util.Collection) throws java.security.cert.CertPathValidatorException; + method public void check(java.security.cert.Certificate) throws java.security.cert.CertPathValidatorException; method public java.lang.Object clone(); method public abstract java.util.Set getSupportedExtensions(); method public abstract void init(boolean) throws java.security.cert.CertPathValidatorException; @@ -54355,6 +54370,30 @@ package java.security.cert { enum_constant public static final java.security.cert.PKIXReason UNRECOGNIZED_CRIT_EXT; } + public abstract class PKIXRevocationChecker extends java.security.cert.PKIXCertPathChecker { + ctor protected PKIXRevocationChecker(); + method public java.util.List getOcspExtensions(); + method public java.net.URI getOcspResponder(); + method public java.security.cert.X509Certificate getOcspResponderCert(); + method public java.util.Map getOcspResponses(); + method public java.util.Set getOptions(); + method public abstract java.util.List getSoftFailExceptions(); + method public void setOcspExtensions(java.util.List); + method public void setOcspResponder(java.net.URI); + method public void setOcspResponderCert(java.security.cert.X509Certificate); + method public void setOcspResponses(java.util.Map); + method public void setOptions(java.util.Set); + } + + public static final class PKIXRevocationChecker.Option extends java.lang.Enum { + method public static java.security.cert.PKIXRevocationChecker.Option valueOf(java.lang.String); + method public static final java.security.cert.PKIXRevocationChecker.Option[] values(); + enum_constant public static final java.security.cert.PKIXRevocationChecker.Option NO_FALLBACK; + enum_constant public static final java.security.cert.PKIXRevocationChecker.Option ONLY_END_ENTITY; + enum_constant public static final java.security.cert.PKIXRevocationChecker.Option PREFER_CRLS; + enum_constant public static final java.security.cert.PKIXRevocationChecker.Option SOFT_FAIL; + } + public abstract interface PolicyNode { method public abstract java.util.Iterator getChildren(); method public abstract int getDepth(); @@ -54514,6 +54553,7 @@ package java.security.cert { method public javax.security.auth.x500.X500Principal getSubjectX500Principal(); method public abstract byte[] getTBSCertificate() throws java.security.cert.CertificateEncodingException; method public abstract int getVersion(); + method public void verify(java.security.PublicKey, java.security.Provider) throws java.security.cert.CertificateException, java.security.InvalidKeyException, java.security.NoSuchAlgorithmException, java.security.SignatureException; } public abstract interface X509Extension { diff --git a/api/system-current.txt b/api/system-current.txt index bf8e0e7eb7adb..8d4caefa3c742 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -52221,6 +52221,8 @@ package java.lang { public class InternalError extends java.lang.VirtualMachineError { ctor public InternalError(); ctor public InternalError(java.lang.String); + ctor public InternalError(java.lang.String, java.lang.Throwable); + ctor public InternalError(java.lang.Throwable); } public class InterruptedException extends java.lang.Exception { @@ -52993,6 +52995,8 @@ package java.lang { public abstract class VirtualMachineError extends java.lang.Error { ctor public VirtualMachineError(); ctor public VirtualMachineError(java.lang.String); + ctor public VirtualMachineError(java.lang.String, java.lang.Throwable); + ctor public VirtualMachineError(java.lang.Throwable); } public final class Void { @@ -56735,6 +56739,7 @@ package java.security.cert { method public static java.security.cert.CertPathBuilder getInstance(java.lang.String, java.lang.String) throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException; method public static java.security.cert.CertPathBuilder getInstance(java.lang.String, java.security.Provider) throws java.security.NoSuchAlgorithmException; method public final java.security.Provider getProvider(); + method public final java.security.cert.CertPathChecker getRevocationChecker(); } public class CertPathBuilderException extends java.security.GeneralSecurityException { @@ -56752,6 +56757,13 @@ package java.security.cert { public abstract class CertPathBuilderSpi { ctor public CertPathBuilderSpi(); method public abstract java.security.cert.CertPathBuilderResult engineBuild(java.security.cert.CertPathParameters) throws java.security.cert.CertPathBuilderException, java.security.InvalidAlgorithmParameterException; + method public java.security.cert.CertPathChecker engineGetRevocationChecker(); + } + + public abstract interface CertPathChecker { + method public abstract void check(java.security.cert.Certificate) throws java.security.cert.CertPathValidatorException; + method public abstract void init(boolean) throws java.security.cert.CertPathValidatorException; + method public abstract boolean isForwardCheckingSupported(); } public abstract interface CertPathParameters implements java.lang.Cloneable { @@ -56766,6 +56778,7 @@ package java.security.cert { method public static java.security.cert.CertPathValidator getInstance(java.lang.String, java.lang.String) throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException; method public static java.security.cert.CertPathValidator getInstance(java.lang.String, java.security.Provider) throws java.security.NoSuchAlgorithmException; method public final java.security.Provider getProvider(); + method public final java.security.cert.CertPathChecker getRevocationChecker(); method public final java.security.cert.CertPathValidatorResult validate(java.security.cert.CertPath, java.security.cert.CertPathParameters) throws java.security.cert.CertPathValidatorException, java.security.InvalidAlgorithmParameterException; } @@ -56802,6 +56815,7 @@ package java.security.cert { public abstract class CertPathValidatorSpi { ctor public CertPathValidatorSpi(); + method public java.security.cert.CertPathChecker engineGetRevocationChecker(); method public abstract java.security.cert.CertPathValidatorResult engineValidate(java.security.cert.CertPath, java.security.cert.CertPathParameters) throws java.security.cert.CertPathValidatorException, java.security.InvalidAlgorithmParameterException; } @@ -56960,9 +56974,10 @@ package java.security.cert { method public java.security.cert.CertPath getCertPath(); } - public abstract class PKIXCertPathChecker implements java.lang.Cloneable { + public abstract class PKIXCertPathChecker implements java.security.cert.CertPathChecker java.lang.Cloneable { ctor protected PKIXCertPathChecker(); method public abstract void check(java.security.cert.Certificate, java.util.Collection) throws java.security.cert.CertPathValidatorException; + method public void check(java.security.cert.Certificate) throws java.security.cert.CertPathValidatorException; method public java.lang.Object clone(); method public abstract java.util.Set getSupportedExtensions(); method public abstract void init(boolean) throws java.security.cert.CertPathValidatorException; @@ -57022,6 +57037,30 @@ package java.security.cert { enum_constant public static final java.security.cert.PKIXReason UNRECOGNIZED_CRIT_EXT; } + public abstract class PKIXRevocationChecker extends java.security.cert.PKIXCertPathChecker { + ctor protected PKIXRevocationChecker(); + method public java.util.List getOcspExtensions(); + method public java.net.URI getOcspResponder(); + method public java.security.cert.X509Certificate getOcspResponderCert(); + method public java.util.Map getOcspResponses(); + method public java.util.Set getOptions(); + method public abstract java.util.List getSoftFailExceptions(); + method public void setOcspExtensions(java.util.List); + method public void setOcspResponder(java.net.URI); + method public void setOcspResponderCert(java.security.cert.X509Certificate); + method public void setOcspResponses(java.util.Map); + method public void setOptions(java.util.Set); + } + + public static final class PKIXRevocationChecker.Option extends java.lang.Enum { + method public static java.security.cert.PKIXRevocationChecker.Option valueOf(java.lang.String); + method public static final java.security.cert.PKIXRevocationChecker.Option[] values(); + enum_constant public static final java.security.cert.PKIXRevocationChecker.Option NO_FALLBACK; + enum_constant public static final java.security.cert.PKIXRevocationChecker.Option ONLY_END_ENTITY; + enum_constant public static final java.security.cert.PKIXRevocationChecker.Option PREFER_CRLS; + enum_constant public static final java.security.cert.PKIXRevocationChecker.Option SOFT_FAIL; + } + public abstract interface PolicyNode { method public abstract java.util.Iterator getChildren(); method public abstract int getDepth(); @@ -57181,6 +57220,7 @@ package java.security.cert { method public javax.security.auth.x500.X500Principal getSubjectX500Principal(); method public abstract byte[] getTBSCertificate() throws java.security.cert.CertificateEncodingException; method public abstract int getVersion(); + method public void verify(java.security.PublicKey, java.security.Provider) throws java.security.cert.CertificateException, java.security.InvalidKeyException, java.security.NoSuchAlgorithmException, java.security.SignatureException; } public abstract interface X509Extension { diff --git a/api/test-current.txt b/api/test-current.txt index 6eba6bd7a2dff..5f1f63f37745c 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -49570,6 +49570,8 @@ package java.lang { public class InternalError extends java.lang.VirtualMachineError { ctor public InternalError(); ctor public InternalError(java.lang.String); + ctor public InternalError(java.lang.String, java.lang.Throwable); + ctor public InternalError(java.lang.Throwable); } public class InterruptedException extends java.lang.Exception { @@ -50342,6 +50344,8 @@ package java.lang { public abstract class VirtualMachineError extends java.lang.Error { ctor public VirtualMachineError(); ctor public VirtualMachineError(java.lang.String); + ctor public VirtualMachineError(java.lang.String, java.lang.Throwable); + ctor public VirtualMachineError(java.lang.Throwable); } public final class Void { @@ -54084,6 +54088,7 @@ package java.security.cert { method public static java.security.cert.CertPathBuilder getInstance(java.lang.String, java.lang.String) throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException; method public static java.security.cert.CertPathBuilder getInstance(java.lang.String, java.security.Provider) throws java.security.NoSuchAlgorithmException; method public final java.security.Provider getProvider(); + method public final java.security.cert.CertPathChecker getRevocationChecker(); } public class CertPathBuilderException extends java.security.GeneralSecurityException { @@ -54101,6 +54106,13 @@ package java.security.cert { public abstract class CertPathBuilderSpi { ctor public CertPathBuilderSpi(); method public abstract java.security.cert.CertPathBuilderResult engineBuild(java.security.cert.CertPathParameters) throws java.security.cert.CertPathBuilderException, java.security.InvalidAlgorithmParameterException; + method public java.security.cert.CertPathChecker engineGetRevocationChecker(); + } + + public abstract interface CertPathChecker { + method public abstract void check(java.security.cert.Certificate) throws java.security.cert.CertPathValidatorException; + method public abstract void init(boolean) throws java.security.cert.CertPathValidatorException; + method public abstract boolean isForwardCheckingSupported(); } public abstract interface CertPathParameters implements java.lang.Cloneable { @@ -54115,6 +54127,7 @@ package java.security.cert { method public static java.security.cert.CertPathValidator getInstance(java.lang.String, java.lang.String) throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException; method public static java.security.cert.CertPathValidator getInstance(java.lang.String, java.security.Provider) throws java.security.NoSuchAlgorithmException; method public final java.security.Provider getProvider(); + method public final java.security.cert.CertPathChecker getRevocationChecker(); method public final java.security.cert.CertPathValidatorResult validate(java.security.cert.CertPath, java.security.cert.CertPathParameters) throws java.security.cert.CertPathValidatorException, java.security.InvalidAlgorithmParameterException; } @@ -54151,6 +54164,7 @@ package java.security.cert { public abstract class CertPathValidatorSpi { ctor public CertPathValidatorSpi(); + method public java.security.cert.CertPathChecker engineGetRevocationChecker(); method public abstract java.security.cert.CertPathValidatorResult engineValidate(java.security.cert.CertPath, java.security.cert.CertPathParameters) throws java.security.cert.CertPathValidatorException, java.security.InvalidAlgorithmParameterException; } @@ -54309,9 +54323,10 @@ package java.security.cert { method public java.security.cert.CertPath getCertPath(); } - public abstract class PKIXCertPathChecker implements java.lang.Cloneable { + public abstract class PKIXCertPathChecker implements java.security.cert.CertPathChecker java.lang.Cloneable { ctor protected PKIXCertPathChecker(); method public abstract void check(java.security.cert.Certificate, java.util.Collection) throws java.security.cert.CertPathValidatorException; + method public void check(java.security.cert.Certificate) throws java.security.cert.CertPathValidatorException; method public java.lang.Object clone(); method public abstract java.util.Set getSupportedExtensions(); method public abstract void init(boolean) throws java.security.cert.CertPathValidatorException; @@ -54371,6 +54386,30 @@ package java.security.cert { enum_constant public static final java.security.cert.PKIXReason UNRECOGNIZED_CRIT_EXT; } + public abstract class PKIXRevocationChecker extends java.security.cert.PKIXCertPathChecker { + ctor protected PKIXRevocationChecker(); + method public java.util.List getOcspExtensions(); + method public java.net.URI getOcspResponder(); + method public java.security.cert.X509Certificate getOcspResponderCert(); + method public java.util.Map getOcspResponses(); + method public java.util.Set getOptions(); + method public abstract java.util.List getSoftFailExceptions(); + method public void setOcspExtensions(java.util.List); + method public void setOcspResponder(java.net.URI); + method public void setOcspResponderCert(java.security.cert.X509Certificate); + method public void setOcspResponses(java.util.Map); + method public void setOptions(java.util.Set); + } + + public static final class PKIXRevocationChecker.Option extends java.lang.Enum { + method public static java.security.cert.PKIXRevocationChecker.Option valueOf(java.lang.String); + method public static final java.security.cert.PKIXRevocationChecker.Option[] values(); + enum_constant public static final java.security.cert.PKIXRevocationChecker.Option NO_FALLBACK; + enum_constant public static final java.security.cert.PKIXRevocationChecker.Option ONLY_END_ENTITY; + enum_constant public static final java.security.cert.PKIXRevocationChecker.Option PREFER_CRLS; + enum_constant public static final java.security.cert.PKIXRevocationChecker.Option SOFT_FAIL; + } + public abstract interface PolicyNode { method public abstract java.util.Iterator getChildren(); method public abstract int getDepth(); @@ -54530,6 +54569,7 @@ package java.security.cert { method public javax.security.auth.x500.X500Principal getSubjectX500Principal(); method public abstract byte[] getTBSCertificate() throws java.security.cert.CertificateEncodingException; method public abstract int getVersion(); + method public void verify(java.security.PublicKey, java.security.Provider) throws java.security.cert.CertificateException, java.security.InvalidKeyException, java.security.NoSuchAlgorithmException, java.security.SignatureException; } public abstract interface X509Extension {