| Index: chrome/android/java/src/org/chromium/chrome/browser/PKCS11AuthenticationManager.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/PKCS11AuthenticationManager.java b/chrome/android/java/src/org/chromium/chrome/browser/PKCS11AuthenticationManager.java
|
| index 43643e8f8ed1510b76d7caeb581ca716c019b433..1e4cb1f7a44885521cdd00d3666cb8a7b86aac62 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/PKCS11AuthenticationManager.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/PKCS11AuthenticationManager.java
|
| @@ -4,43 +4,12 @@
|
|
|
| package org.chromium.chrome.browser;
|
|
|
| -import android.content.Context;
|
| -
|
| -import org.chromium.net.AndroidPrivateKey;
|
| -
|
| -import java.security.cert.X509Certificate;
|
| +import org.chromium.base.annotations.SuppressFBWarnings;
|
|
|
| /**
|
| * Defines API for managing interaction with SmartCard-based certificate storage using PKCS11.
|
| */
|
| -public interface PKCS11AuthenticationManager {
|
| -
|
| - /**
|
| - * @return true iff SmartCard-based authentication is available.
|
| - */
|
| - public boolean isPKCS11AuthEnabled();
|
| -
|
| - /**
|
| - * Retrieves the preferred client certificate alias for the given host, port pair, or null if
|
| - * none can be retrieved.
|
| - *
|
| - * @param hostName The host for which to retrieve client certificate.
|
| - * @param port The port to use in conjunction with host to retrieve client certificate.
|
| - */
|
| - public String getClientCertificateAlias(String hostName, int port);
|
| -
|
| - /**
|
| - * Returns the X509Certificate chain for the requested alias, or null if no there is no result.
|
| - */
|
| - public X509Certificate[] getCertificateChain(String alias);
|
| -
|
| - /**
|
| - * Performs necessary initializing for using a PKCS11-based KeysStore.
|
| - */
|
| - public void initialize(Context context);
|
| -
|
| - /**
|
| - * Returns the AndroidPrivateKey for the requested alias, or null if there is no result.
|
| - */
|
| - public AndroidPrivateKey getPrivateKey(String alias);
|
| -}
|
| +// TODO(changwan): remove this after downstream change is merged.
|
| +@SuppressFBWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE")
|
| +public interface PKCS11AuthenticationManager
|
| + extends org.chromium.chrome.browser.smartcard.PKCS11AuthenticationManager {}
|
|
|