Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(239)

Unified Diff: content/child/webcrypto/openssl/sym_key_openssl.cc

Issue 401983002: Revert 284192 due to a failing test. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/child/webcrypto/openssl/sym_key_openssl.h ('k') | content/child/webcrypto/openssl/util_openssl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/webcrypto/openssl/sym_key_openssl.cc
diff --git a/content/child/webcrypto/openssl/sym_key_openssl.cc b/content/child/webcrypto/openssl/sym_key_openssl.cc
deleted file mode 100644
index e07db69ee7f3f6e96feb5cdcfe34913da8f0f908..0000000000000000000000000000000000000000
--- a/content/child/webcrypto/openssl/sym_key_openssl.cc
+++ /dev/null
@@ -1,58 +0,0 @@
-// 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/sym_key_openssl.h"
-
-#include <vector>
-#include <openssl/rand.h>
-
-#include "content/child/webcrypto/crypto_data.h"
-#include "content/child/webcrypto/openssl/key_openssl.h"
-#include "content/child/webcrypto/status.h"
-#include "crypto/openssl_util.h"
-#include "third_party/WebKit/public/platform/WebCryptoKeyAlgorithm.h"
-
-namespace content {
-
-namespace webcrypto {
-
-Status GenerateSecretKeyOpenSsl(const blink::WebCryptoKeyAlgorithm& algorithm,
- bool extractable,
- blink::WebCryptoKeyUsageMask usage_mask,
- unsigned keylen_bytes,
- blink::WebCryptoKey* key) {
- crypto::OpenSSLErrStackTracer err_tracer(FROM_HERE);
-
- std::vector<unsigned char> random_bytes(keylen_bytes, 0);
-
- if (keylen_bytes > 0) {
- if (!(RAND_bytes(&random_bytes[0], keylen_bytes)))
- return Status::OperationError();
- }
-
- *key =
- blink::WebCryptoKey::create(new SymKeyOpenSsl(CryptoData(random_bytes)),
- blink::WebCryptoKeyTypeSecret,
- extractable,
- algorithm,
- usage_mask);
- return Status::Success();
-}
-
-Status ImportKeyRawOpenSsl(const CryptoData& key_data,
- const blink::WebCryptoKeyAlgorithm& algorithm,
- bool extractable,
- blink::WebCryptoKeyUsageMask usage_mask,
- blink::WebCryptoKey* key) {
- *key = blink::WebCryptoKey::create(new SymKeyOpenSsl(key_data),
- blink::WebCryptoKeyTypeSecret,
- extractable,
- algorithm,
- usage_mask);
- return Status::Success();
-}
-
-} // namespace webcrypto
-
-} // namespace content
« no previous file with comments | « content/child/webcrypto/openssl/sym_key_openssl.h ('k') | content/child/webcrypto/openssl/util_openssl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698