Throw a DataError rather than OperationError in some cases when importing invalid EC key.

content/child/webcrypto/openssl/ec_algorithm_openssl.cc

 // Copyright 2014 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 "content/child/webcrypto/openssl/ec_algorithm_openssl.h"
 
 #include <openssl/ec.h>
 #include <openssl/ec_key.h>
 #include <openssl/evp.h>
 #include <openssl/pkcs12.h>
@@ skipping 105 matching lines @@
     return Status::ErrorUnexpected();
 
   // When importing an ECPrivateKey, the public key is optional. If it was
   // omitted then the public key will be calculated by BoringSSL and added into
   // the EC_KEY. However an encoding flag is set such that when exporting to
   // PKCS8 format the public key is once again omitted. Remove this flag.
   unsigned int enc_flags = EC_KEY_get_enc_flags(ec.get());
   enc_flags &= ~EC_PKEY_NO_PUBKEY;
   EC_KEY_set_enc_flags(ec.get(), enc_flags);
 
-  // TODO(eroman): Is this necessary? From my tests it seems that BoringSSL
-  // already does these checks when setting the public key's affine coordinates.
   if (!EC_KEY_check_key(ec.get()))
     return Status::ErrorEcKeyInvalid();
 
   // Make sure the curve matches the expected curve name.
   int curve_nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(ec.get()));
   blink::WebCryptoNamedCurve named_curve = blink::WebCryptoNamedCurveP256;
   Status status = NidToWebCryptoCurve(curve_nid, &named_curve);
   if (status.IsError())
     return status;
 
@@ skipping 262 matching lines @@
   crypto::ScopedBIGNUM x;
   status = ReadPaddedBIGNUM(jwk, "x", degree_bytes, &x);
   if (status.IsError())
     return status;
 
   crypto::ScopedBIGNUM y;
   status = ReadPaddedBIGNUM(jwk, "y", degree_bytes, &y);
   if (status.IsError())
     return status;
 
-  // TODO(eroman): This internally runs EC_KEY_check_key(). Can avoid calling it
-  // again by the JWK import code if private key were set before public key.
+  // TODO(eroman): Distinguish more accurately between a DataError and
+  // OperationError. In general if this fails it was due to the key being an
+  // invalid EC key.
   if (!EC_KEY_set_public_key_affine_coordinates(ec.get(), x.get(), y.get()))
-    return Status::OperationError();
+    return Status::DataError();
 
   // Extract the "d" parameters.
   if (is_private_key) {
     crypto::ScopedBIGNUM d;
     status = ReadPaddedBIGNUM(jwk, "d", degree_bytes, &d);
     if (status.IsError())
       return status;
 
     if (!EC_KEY_set_private_key(ec.get(), d.get()))
       return Status::OperationError();
@@ skipping 136 matching lines @@
       key->algorithm().ecParams()->namedCurve()) {
     return Status::ErrorUnexpected();
   }
 
   return Status::Success();
 }
 
 }  // namespace webcrypto
 
 }  // namespace content