Revert of [webcrypto] JWK: Updated import(ext, key_ops) and added export of symmetric keys

content/child/webcrypto/webcrypto_util.h

 // 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.
 
 #ifndef CONTENT_CHILD_WEBCRYPTO_WEBCRYPTO_UTIL_H_
 #define CONTENT_CHILD_WEBCRYPTO_WEBCRYPTO_UTIL_H_
 
 #include <string>
 #include <vector>
 #include "base/basictypes.h"
-#include "base/strings/string_piece.h"
-#include "base/values.h"
 #include "content/common/content_export.h"
 #include "third_party/WebKit/public/platform/WebArrayBuffer.h"
 #include "third_party/WebKit/public/platform/WebCrypto.h"  // TODO(eroman): delete
 #include "third_party/WebKit/public/platform/WebCryptoAlgorithm.h"
 #include "third_party/WebKit/public/platform/WebCryptoKey.h"
 
 namespace content {
 
 namespace webcrypto {
 
@@ skipping 45 matching lines @@
   static Status ErrorJwkPropertyMissing(const std::string& property);
 
   // The property |property| was not of type |expected_type|.
   static Status ErrorJwkPropertyWrongType(const std::string& property,
                                           const std::string& expected_type);
 
   // The property |property| was a string, however could not be successfully
   // base64 decoded.
   static Status ErrorJwkBase64Decode(const std::string& property);
 
-  // The "ext" parameter was specified but was
+  // The "extractable" parameter was specified but was
   // incompatible with the value requested by the Web Crypto call.
-  static Status ErrorJwkExtInconsistent();
+  static Status ErrorJwkExtractableInconsistent();
 
   // The "alg" parameter could not be converted to an equivalent
   // WebCryptoAlgorithm. Either it was malformed or unrecognized.
   static Status ErrorJwkUnrecognizedAlgorithm();
 
   // The "alg" parameter is incompatible with the (optional) Algorithm
   // specified by the Web Crypto import operation.
   static Status ErrorJwkAlgorithmInconsistent();
 
   // The "alg" parameter was not provided, however neither was an algorithm
   // provided by the Web Crypto import operation.
   static Status ErrorJwkAlgorithmMissing();
 
   // The "use" parameter was specified, however it couldn't be converted to an
   // equivalent Web Crypto usage.
-  static Status ErrorJwkUnrecognizedUse();
-
-  // The "key_ops" parameter was specified, however one of the values in the
-  // array couldn't be converted to an equivalent Web Crypto usage.
-  static Status ErrorJwkUnrecognizedKeyop();
+  static Status ErrorJwkUnrecognizedUsage();
 
   // The "use" parameter was specified, however it is incompatible with that
   // specified by the Web Crypto import operation.
-  static Status ErrorJwkUseInconsistent();
-
-  // The "key_ops" parameter was specified, however it is incompatible with that
-  // specified by the Web Crypto import operation.
-  static Status ErrorJwkKeyopsInconsistent();
-
-  // Both the "key_ops" and the "use" parameters were specified, however they
-  // are incompatible with each other.
-  static Status ErrorJwkUseAndKeyopsInconsistent();
+  static Status ErrorJwkUsageInconsistent();
 
   // TODO(eroman): Private key import through JWK is not yet supported.
   static Status ErrorJwkRsaPrivateKeyUnsupported();
 
   // The "kty" parameter was given and was a string, however it was
   // unrecognized.
   static Status ErrorJwkUnrecognizedKty();
 
   // The amount of key data provided was incompatible with the selected
   // algorithm. For instance if the algorith name was A128CBC then EXACTLY
@@ skipping 102 matching lines @@
 void ShrinkBuffer(blink::WebArrayBuffer* buffer, unsigned int new_size);
 
 // Creates a WebArrayBuffer from a uint8 byte array
 blink::WebArrayBuffer CreateArrayBuffer(const uint8* data,
                                         unsigned int data_size);
 
 // TODO(eroman): Move this to JWK file.
 // This function decodes unpadded 'base64url' encoded data, as described in
 // RFC4648 (http://www.ietf.org/rfc/rfc4648.txt) Section 5.
 // In Web Crypto, this type of encoding is only used inside JWK.
-CONTENT_EXPORT bool Base64DecodeUrlSafe(const std::string& input,
-                                        std::string* output);
-
-// Returns an unpadded 'base64url' encoding of the input data, the opposite of
-// Base64DecodeUrlSafe() above.
-std::string Base64EncodeUrlSafe(const base::StringPiece& input);
-
-// Composes a Web Crypto usage mask from an array of JWK key_ops values.
-CONTENT_EXPORT Status GetWebCryptoUsagesFromJwkKeyOps(
-    const base::ListValue* jwk_key_ops_value,
-    blink::WebCryptoKeyUsageMask* jwk_key_ops_mask);
-
-// Composes a JWK key_ops array from a Web Crypto usage mask.
-base::ListValue* CreateJwkKeyOpsFromWebCryptoUsages(
-    blink::WebCryptoKeyUsageMask usage_mask);
+bool Base64DecodeUrlSafe(const std::string& input, std::string* output);
 
 CONTENT_EXPORT bool IsHashAlgorithm(blink::WebCryptoAlgorithmId alg_id);
 
 // Returns the "hash" param for an algorithm if it exists, otherwise returns
 // a null algorithm.
 blink::WebCryptoAlgorithm GetInnerHashAlgorithm(
     const blink::WebCryptoAlgorithm& algorithm);
 
 // Creates a WebCryptoAlgorithm without any parameters.
 CONTENT_EXPORT blink::WebCryptoAlgorithm CreateAlgorithm(
@@ skipping 21 matching lines @@
 
 bool CreateSecretKeyAlgorithm(const blink::WebCryptoAlgorithm& algorithm,
                               unsigned keylen_bytes,
                               blink::WebCryptoKeyAlgorithm* key_algorithm);
 
 }  // namespace webcrypto
 
 }  // namespace content
 
 #endif  // CONTENT_CHILD_WEBCRYPTO_WEBCRYPTO_UTIL_H_