Report curve types in ECDSA SSLPrivateKeys.

net/ssl/test_ssl_private_key.cc

 // Copyright 2016 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/test_ssl_private_key.h"
 
 #include <openssl/digest.h>
+#include <openssl/ec.h>
 #include <openssl/evp.h>
 #include <openssl/rsa.h>
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "net/base/net_errors.h"
-#include "net/ssl/ssl_platform_key_task_runner.h"
+#include "net/ssl/ssl_platform_key_util.h"
 #include "net/ssl/ssl_private_key.h"
 #include "net/ssl/threaded_ssl_private_key.h"
 
 namespace net {
 
 namespace {
 
 class TestSSLPlatformKey : public ThreadedSSLPrivateKey::Delegate {
  public:
   TestSSLPlatformKey(bssl::UniquePtr<EVP_PKEY> key, SSLPrivateKey::Type type)
@@ skipping 80 matching lines @@
 scoped_refptr<SSLPrivateKey> WrapOpenSSLPrivateKey(
     bssl::UniquePtr<EVP_PKEY> key) {
   if (!key)
     return nullptr;
 
   SSLPrivateKey::Type type;
   switch (EVP_PKEY_id(key.get())) {
     case EVP_PKEY_RSA:
       type = SSLPrivateKey::Type::RSA;
       break;
-    case EVP_PKEY_EC:
-      type = SSLPrivateKey::Type::ECDSA;
+    case EVP_PKEY_EC: {
+      EC_KEY* ec_key = EVP_PKEY_get0_EC_KEY(key.get());
+      int curve = EC_GROUP_get_curve_name(EC_KEY_get0_group(ec_key));
+      switch (curve) {
+        case NID_X9_62_prime256v1:
+          type = SSLPrivateKey::Type::ECDSA_P256;
+          break;
+        case NID_secp384r1:
+          type = SSLPrivateKey::Type::ECDSA_P384;
+          break;
+        case NID_secp521r1:
+          type = SSLPrivateKey::Type::ECDSA_P384;
+          break;
+        default:
+          LOG(ERROR) << "Unknown curve: " << curve;
+          return nullptr;
+      }
       break;
+    }
     default:
       LOG(ERROR) << "Unknown key type: " << EVP_PKEY_id(key.get());
       return nullptr;
   }
   return make_scoped_refptr(new ThreadedSSLPrivateKey(
       base::MakeUnique<TestSSLPlatformKey>(std::move(key), type),
       GetSSLPlatformKeyTaskRunner()));
 }
 
 }  // namespace net