Report curve types in ECDSA SSLPrivateKeys.

net/android/keystore.h

Index: net/android/keystore.h
diff --git a/net/android/keystore.h b/net/android/keystore.h
index 7691c2629325e82c8c9ac68432d15efe92fbc5a7..0fca8e6c3cca84ca60461dd3f9489d6578440f57 100644
--- a/net/android/keystore.h
+++ b/net/android/keystore.h
@@ -27,9 +27,6 @@ struct AndroidEVP_PKEY;
 // values are shared with Java through org.chromium.net.PrivateKeyType.
 // Example: PRIVATE_KEY_TYPE_RSA.
 //
-// This enum is used as part of an RPC interface, so new values must be
-// appended and not reused.
-//
 // A Java counterpart will be generated for this enum.
 // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.net
 enum PrivateKeyType {
@@ -39,28 +36,6 @@ enum PrivateKeyType {
   PRIVATE_KEY_TYPE_INVALID = 255,
 };
 
-// Returns the modulus of a given RSAPrivateKey platform object,
-// as a series of bytes, in big-endian representation. This can be
-// used with BN_bin2bn() to convert to an OpenSSL BIGNUM.
-//
-// |private_key| is a JNI reference for the private key.
-// |modulus| will receive the modulus bytes on success.
-// Returns true on success, or false on failure (e.g. if the key
-// is not RSA).
-NET_EXPORT bool GetRSAKeyModulus(
-    const base::android::JavaRef<jobject>& private_key,
-    std::vector<uint8_t>* modulus);
-
-// Returns the order parameter of a given ECPrivateKey platform object,
-// as a series of bytes, in big-endian representation. This can be used
-// with BN_bin2bn() to convert to an OpenSSL BIGNUM.
-// |private_key| is a JNI reference for the private key.
-// |order| will receive the result bytes on success.
-// Returns true on success, or false on failure (e.g. if the key is
-// not EC).
-bool GetECKeyOrder(const base::android::JavaRef<jobject>& private_key,
-                   std::vector<uint8_t>* order);
-
 // Compute the signature of a given message, which is actually a hash,
 // using a private key. For more details, please read the comments for the
 // rawSignDigestWithPrivateKey method in AndroidKeyStore.java.
@@ -75,13 +50,6 @@ NET_EXPORT bool RawSignDigestWithPrivateKey(
     const base::StringPiece& digest,
     std::vector<uint8_t>* signature);
 
-// Return the PrivateKeyType of a given private key.
-// |private_key| is a JNI reference for the private key.
-// Returns a PrivateKeyType, while will be CLIENT_CERT_INVALID_TYPE
-// on error.
-NET_EXPORT PrivateKeyType
-GetPrivateKeyType(const base::android::JavaRef<jobject>& private_key);
-
 // Returns a handle to the system AndroidEVP_PKEY object used to back a given
 // private_key object. This must *only* be used for RSA private keys on Android
 // < 4.2. Technically, this is only guaranteed to work if the system image