Remove SSLPrivateKey metadata hooks.

net/ssl/ssl_platform_key_mac.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_mac.h"
 
 #include <dlfcn.h>
 #include <CoreFoundation/CoreFoundation.h>
 #include <Security/cssm.h>
 #include <Security/SecBase.h>
@@ skipping 18 matching lines @@
 #include "crypto/mac_security_services_lock.h"
 #include "crypto/openssl_util.h"
 #include "net/base/net_errors.h"
 #include "net/cert/x509_certificate.h"
 #include "net/cert/x509_util_mac.h"
 #include "net/ssl/ssl_platform_key.h"
 #include "net/ssl/ssl_platform_key_util.h"
 #include "net/ssl/ssl_private_key.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"
 
 #if !defined(MAC_OS_X_VERSION_10_12) || \
     MAC_OS_X_VERSION_MIN_ALLOWED < MAC_OS_X_VERSION_10_12
 // Redeclare typedefs that only exist in 10.12+ to suppress
 // -Wpartial-availability warnings.
 typedef CFStringRef SecKeyAlgorithm;
 #endif
@@ skipping 117 matching lines @@
   SecKeyAlgorithm kSecKeyAlgorithmECDSASignatureDigestX962SHA256 = nullptr;
   SecKeyAlgorithm kSecKeyAlgorithmECDSASignatureDigestX962SHA384 = nullptr;
   SecKeyAlgorithm kSecKeyAlgorithmECDSASignatureDigestX962SHA512 = nullptr;
 };
 
 base::LazyInstance<SecKeyAPIs>::Leaky g_sec_key_apis =
     LAZY_INSTANCE_INITIALIZER;
 
 class SSLPlatformKeyCSSM : public ThreadedSSLPrivateKey::Delegate {
  public:
-  SSLPlatformKeyCSSM(SSLPrivateKey::Type type,
+  SSLPlatformKeyCSSM(int type,
                      size_t max_length,
                      SecKeyRef key,
                      const CSSM_KEY* cssm_key)
-      : type_(type),
-        max_length_(max_length),
+      : max_length_(max_length),
         key_(key, base::scoped_policy::RETAIN),
         cssm_key_(cssm_key) {}
 
   ~SSLPlatformKeyCSSM() override {}
 
-  SSLPrivateKey::Type GetType() override { return type_; }
-
   std::vector<SSLPrivateKey::Hash> GetDigestPreferences() override {
     return std::vector<SSLPrivateKey::Hash>{
         SSLPrivateKey::Hash::SHA512, SSLPrivateKey::Hash::SHA384,
         SSLPrivateKey::Hash::SHA256, SSLPrivateKey::Hash::SHA1};
   }
 
-  size_t GetMaxSignatureLengthInBytes() override { return max_length_; }
-
   Error SignDigest(SSLPrivateKey::Hash hash,
                    const base::StringPiece& input,
                    std::vector<uint8_t>* signature) override {
     crypto::OpenSSLErrStackTracer tracer(FROM_HERE);
 
     CSSM_CSP_HANDLE csp_handle;
     OSStatus status = SecKeyGetCSPHandle(key_.get(), &csp_handle);
     if (status != noErr) {
       OSSTATUS_LOG(WARNING, status);
       return ERR_SSL_CLIENT_AUTH_SIGNATURE_FAILED;
@@ skipping 68 matching lines @@
 
     if (CSSM_SignData(cssm_signature.get(), &hash_data, 1, CSSM_ALGID_NONE,
                       &signature_data) != CSSM_OK) {
       return ERR_SSL_CLIENT_AUTH_SIGNATURE_FAILED;
     }
     signature->resize(signature_data.Length);
     return OK;
   }
 
  private:
-  SSLPrivateKey::Type type_;
   size_t max_length_;
   base::ScopedCFTypeRef<SecKeyRef> key_;
   const CSSM_KEY* cssm_key_;
 
   DISALLOW_COPY_AND_ASSIGN(SSLPlatformKeyCSSM);
 };
 
 class SSLPlatformKeySecKey : public ThreadedSSLPrivateKey::Delegate {
  public:
-  SSLPlatformKeySecKey(SSLPrivateKey::Type type,
-                       size_t max_length,
-                       SecKeyRef key)
-      : type_(type),
-        max_length_(max_length),
-        key_(key, base::scoped_policy::RETAIN) {}
+  SSLPlatformKeySecKey(int type, size_t max_length, SecKeyRef key)
+      : type_(type), key_(key, base::scoped_policy::RETAIN) {}
 
   ~SSLPlatformKeySecKey() override {}
 
-  SSLPrivateKey::Type GetType() override { return type_; }
-
   std::vector<SSLPrivateKey::Hash> GetDigestPreferences() override {
     return std::vector<SSLPrivateKey::Hash>{
         SSLPrivateKey::Hash::SHA512, SSLPrivateKey::Hash::SHA384,
         SSLPrivateKey::Hash::SHA256, SSLPrivateKey::Hash::SHA1};
   }
 
-  size_t GetMaxSignatureLengthInBytes() override { return max_length_; }
-
   Error SignDigest(SSLPrivateKey::Hash hash,
                    const base::StringPiece& input,
                    std::vector<uint8_t>* signature) override {
     const SecKeyAPIs& apis = g_sec_key_apis.Get();
     if (!apis.valid) {
       LOG(ERROR) << "SecKey APIs not found";
       return ERR_SSL_CLIENT_AUTH_SIGNATURE_FAILED;
     }
 
     SecKeyAlgorithm algorithm = nullptr;
-    if (type_ == SSLPrivateKey::Type::RSA) {
+    if (type_ == EVP_PKEY_RSA) {
       switch (hash) {
         case SSLPrivateKey::Hash::SHA512:
           algorithm = apis.kSecKeyAlgorithmRSASignatureDigestPKCS1v15SHA512;
           break;
         case SSLPrivateKey::Hash::SHA384:
           algorithm = apis.kSecKeyAlgorithmRSASignatureDigestPKCS1v15SHA384;
           break;
         case SSLPrivateKey::Hash::SHA256:
           algorithm = apis.kSecKeyAlgorithmRSASignatureDigestPKCS1v15SHA256;
           break;
         case SSLPrivateKey::Hash::SHA1:
           algorithm = apis.kSecKeyAlgorithmRSASignatureDigestPKCS1v15SHA1;
           break;
         case SSLPrivateKey::Hash::MD5_SHA1:
           algorithm = apis.kSecKeyAlgorithmRSASignatureDigestPKCS1v15Raw;
           break;
       }
-    } else if (SSLPrivateKey::IsECDSAType(type_)) {
+    } else if (type_ == EVP_PKEY_EC) {
       switch (hash) {
         case SSLPrivateKey::Hash::SHA512:
           algorithm = apis.kSecKeyAlgorithmECDSASignatureDigestX962SHA512;
           break;
         case SSLPrivateKey::Hash::SHA384:
           algorithm = apis.kSecKeyAlgorithmECDSASignatureDigestX962SHA384;
           break;
         case SSLPrivateKey::Hash::SHA256:
           algorithm = apis.kSecKeyAlgorithmECDSASignatureDigestX962SHA256;
           break;
@@ skipping 23 matching lines @@
       return ERR_SSL_CLIENT_AUTH_SIGNATURE_FAILED;
     }
 
     signature->assign(
         CFDataGetBytePtr(signature_ref),
         CFDataGetBytePtr(signature_ref) + CFDataGetLength(signature_ref));
     return OK;
   }
 
  private:
-  SSLPrivateKey::Type type_;
-  size_t max_length_;
+  int type_;
   base::ScopedCFTypeRef<SecKeyRef> key_;
 
   DISALLOW_COPY_AND_ASSIGN(SSLPlatformKeySecKey);
 };
 
 }  // namespace
 
 scoped_refptr<SSLPrivateKey> FetchClientCertPrivateKeyFromKeychain(
     const X509Certificate* certificate,
     SecKeychainRef keychain) {
   // Look up the private key.
   base::ScopedCFTypeRef<SecKeyRef> private_key(
       FetchSecKeyRefForCertificate(certificate, keychain));
   if (!private_key)
     return nullptr;
 
-  SSLPrivateKey::Type key_type;
+  int key_type;
   size_t max_length;
   if (!GetClientCertInfo(certificate, &key_type, &max_length))
     return nullptr;
 
   if (base::mac::IsAtLeastOS10_12()) {
     return make_scoped_refptr(
         new ThreadedSSLPrivateKey(base::MakeUnique<SSLPlatformKeySecKey>(
                                       key_type, max_length, private_key.get()),
                                   GetSSLPlatformKeyTaskRunner()));
   }
@@ skipping 12 matching lines @@
 }
 
 scoped_refptr<SSLPrivateKey> FetchClientCertPrivateKey(
     const X509Certificate* certificate) {
   return FetchClientCertPrivateKeyFromKeychain(certificate, nullptr);
 }
 
 #pragma clang diagnostic pop  // "-Wdeprecated-declarations"
 
 }  // namespace net