Report curve types in ECDSA SSLPrivateKeys.

net/socket/ssl_client_socket_impl.cc

 // Copyright (c) 2012 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/socket/ssl_client_socket_impl.h"
 
 #include <errno.h>
 #include <openssl/bio.h>
 #include <openssl/bytestring.h>
 #include <openssl/err.h>
@@ skipping 94 matching lines @@
 
 std::unique_ptr<base::Value> NetLogPrivateKeyOperationCallback(
     SSLPrivateKey::Type type,
     SSLPrivateKey::Hash hash,
     NetLogCaptureMode mode) {
   std::string type_str;
   switch (type) {
     case SSLPrivateKey::Type::RSA:
       type_str = "RSA";
       break;
-    case SSLPrivateKey::Type::ECDSA:
-      type_str = "ECDSA";
+    case SSLPrivateKey::Type::ECDSA_P256:
+      type_str = "ECDSA_P256";
+      break;
+    case SSLPrivateKey::Type::ECDSA_P384:
+      type_str = "ECDSA_P384";
+      break;
+    case SSLPrivateKey::Type::ECDSA_P521:
+      type_str = "ECDSA_P521";
       break;
   }
 
   std::string hash_str;
   switch (hash) {
     case SSLPrivateKey::Hash::MD5_SHA1:
       hash_str = "MD5_SHA1";
       break;
     case SSLPrivateKey::Hash::SHA1:
       hash_str = "SHA1";
@@ skipping 1916 matching lines @@
   for (NextProto allowed : ssl_config_.renego_allowed_for_protos) {
     if (negotiated_protocol_ == allowed)
       return true;
   }
   return false;
 }
 
 int SSLClientSocketImpl::PrivateKeyTypeCallback() {
   switch (ssl_config_.client_private_key->GetType()) {
     case SSLPrivateKey::Type::RSA:
-      return EVP_PKEY_RSA;
-    case SSLPrivateKey::Type::ECDSA:
-      return EVP_PKEY_EC;
+      return NID_rsaEncryption;
+    case SSLPrivateKey::Type::ECDSA_P256:
+      return NID_X9_62_prime256v1;
+    case SSLPrivateKey::Type::ECDSA_P384:
+      return NID_secp384r1;
+    case SSLPrivateKey::Type::ECDSA_P521:
+      return NID_secp521r1;
   }
   NOTREACHED();
-  return EVP_PKEY_NONE;
+  return NID_undef;
 }
 
 size_t SSLClientSocketImpl::PrivateKeyMaxSignatureLenCallback() {
   return ssl_config_.client_private_key->GetMaxSignatureLengthInBytes();
 }
 
 ssl_private_key_result_t SSLClientSocketImpl::PrivateKeySignDigestCallback(
     uint8_t* out,
     size_t* out_len,
     size_t max_out,
@@ skipping 217 matching lines @@
     if (ERR_GET_REASON(info->error_code) == SSL_R_TLSV1_ALERT_ACCESS_DENIED &&
         !certificate_requested_) {
       net_error = ERR_SSL_PROTOCOL_ERROR;
     }
   }
 
   return net_error;
 }
 
 }  // namespace net