Remove SSLPrivateKey metadata hooks.

net/ssl/ssl_platform_key_android.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/ssl/ssl_platform_key_android.h"
 
 #include <strings.h>
 
 #include <memory>
 #include <utility>
 #include <vector>
 
 #include "base/android/build_info.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "net/android/keystore.h"
 #include "net/android/legacy_openssl.h"
 #include "net/base/net_errors.h"
 #include "net/ssl/openssl_client_key_store.h"
 #include "net/ssl/ssl_platform_key.h"
 #include "net/ssl/ssl_platform_key_util.h"
 #include "net/ssl/threaded_ssl_private_key.h"
 #include "third_party/boringssl/src/include/openssl/ecdsa.h"
+#include "third_party/boringssl/src/include/openssl/evp.h"
 #include "third_party/boringssl/src/include/openssl/mem.h"
 #include "third_party/boringssl/src/include/openssl/nid.h"
 #include "third_party/boringssl/src/include/openssl/rsa.h"
 
 using base::android::JavaRef;
 using base::android::ScopedJavaGlobalRef;
 using base::android::ScopedJavaLocalRef;
 
 namespace net {
 
@@ skipping 30 matching lines @@
 };
 
 void LeakEngine(const JavaRef<jobject>& private_key) {
   static base::LazyInstance<KeystoreEngineWorkaround>::Leaky s_instance =
       LAZY_INSTANCE_INITIALIZER;
   s_instance.Get().LeakEngine(private_key);
 }
 
 class SSLPlatformKeyAndroid : public ThreadedSSLPrivateKey::Delegate {
  public:
-  SSLPlatformKeyAndroid(SSLPrivateKey::Type type,
+  SSLPlatformKeyAndroid(int type,
                         const JavaRef<jobject>& key,
                         size_t max_length,
                         android::AndroidRSA* legacy_rsa)
       : type_(type), max_length_(max_length), legacy_rsa_(legacy_rsa) {
     key_.Reset(key);
   }
 
   ~SSLPlatformKeyAndroid() override {}
 
-  SSLPrivateKey::Type GetType() override { return type_; }
-
   std::vector<SSLPrivateKey::Hash> GetDigestPreferences() override {
     static const SSLPrivateKey::Hash kHashes[] = {
         SSLPrivateKey::Hash::SHA512, SSLPrivateKey::Hash::SHA384,
         SSLPrivateKey::Hash::SHA256, SSLPrivateKey::Hash::SHA1};
     return std::vector<SSLPrivateKey::Hash>(kHashes,
                                             kHashes + arraysize(kHashes));
   }
 
-  size_t GetMaxSignatureLengthInBytes() override { return max_length_; }
-
   Error SignDigest(SSLPrivateKey::Hash hash,
                    const base::StringPiece& input_in,
                    std::vector<uint8_t>* signature) override {
     base::StringPiece input = input_in;
 
     // Prepend the DigestInfo for RSA.
     bssl::UniquePtr<uint8_t> digest_info_storage;
-    if (type_ == SSLPrivateKey::Type::RSA) {
+    if (type_ == EVP_PKEY_RSA) {
       int hash_nid = NID_undef;
       switch (hash) {
         case SSLPrivateKey::Hash::MD5_SHA1:
           hash_nid = NID_md5_sha1;
           break;
         case SSLPrivateKey::Hash::SHA1:
           hash_nid = NID_sha1;
           break;
         case SSLPrivateKey::Hash::SHA256:
           hash_nid = NID_sha256;
@@ skipping 44 matching lines @@
     }
 
     if (!android::RawSignDigestWithPrivateKey(key_, input, signature)) {
       LOG(WARNING) << "Could not sign message with private key!";
       return ERR_SSL_CLIENT_AUTH_SIGNATURE_FAILED;
     }
     return OK;
   }
 
  private:
-  SSLPrivateKey::Type type_;
+  int type_;
   ScopedJavaGlobalRef<jobject> key_;
   size_t max_length_;
   android::AndroidRSA* legacy_rsa_;
 
   DISALLOW_COPY_AND_ASSIGN(SSLPlatformKeyAndroid);
 };
 
 }  // namespace
 
 scoped_refptr<SSLPrivateKey> WrapJavaPrivateKey(
     const X509Certificate* certificate,
     const JavaRef<jobject>& key) {
-  SSLPrivateKey::Type type;
+  int type;
   size_t max_length;
   if (!GetClientCertInfo(certificate, &type, &max_length))
     return nullptr;
 
   android::AndroidRSA* sys_rsa = nullptr;
-  if (type == SSLPrivateKey::Type::RSA) {
+  if (type == EVP_PKEY_RSA) {
     const int kAndroid42ApiLevel = 17;
     if (base::android::BuildInfo::GetInstance()->sdk_int() <
         kAndroid42ApiLevel) {
       // Route around platform limitations: if Android < 4.2, then
       // base::android::RawSignDigestWithPrivateKey() cannot work, so try to get
       // the system OpenSSL's EVP_PKEY backing this PrivateKey object.
       android::AndroidEVP_PKEY* sys_pkey =
           android::GetOpenSSLSystemHandleForPrivateKey(key);
       if (!sys_pkey)
         return nullptr;
@@ skipping 21 matching lines @@
       GetSSLPlatformKeyTaskRunner()));
 }
 
 scoped_refptr<SSLPrivateKey> FetchClientCertPrivateKey(
     const X509Certificate* certificate) {
   return OpenSSLClientKeyStore::GetInstance()->FetchClientCertPrivateKey(
       certificate);
 }
 
 }  // namespace net