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

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

Issue 1077273002: html_viewer: Move webcrypto to a place where html_viewer can use it. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase to ToT Created 5 years, 8 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/ecdsa_openssl.cc ('k') | content/child/webcrypto/openssl/hmac_openssl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/webcrypto/openssl/hkdf_openssl.cc
diff --git a/content/child/webcrypto/openssl/hkdf_openssl.cc b/content/child/webcrypto/openssl/hkdf_openssl.cc
deleted file mode 100644
index 13005baabfb0a2f55b52882e35250d8fc426a0c1..0000000000000000000000000000000000000000
--- a/content/child/webcrypto/openssl/hkdf_openssl.cc
+++ /dev/null
@@ -1,124 +0,0 @@
-// Copyright 2015 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 <openssl/err.h>
-#include <openssl/hkdf.h>
-
-#include "base/logging.h"
-#include "base/stl_util.h"
-#include "content/child/webcrypto/algorithm_implementation.h"
-#include "content/child/webcrypto/crypto_data.h"
-#include "content/child/webcrypto/openssl/key_openssl.h"
-#include "content/child/webcrypto/openssl/util_openssl.h"
-#include "content/child/webcrypto/status.h"
-#include "content/child/webcrypto/webcrypto_util.h"
-#include "crypto/openssl_util.h"
-#include "third_party/WebKit/public/platform/WebCryptoAlgorithmParams.h"
-#include "third_party/WebKit/public/platform/WebCryptoKeyAlgorithm.h"
-
-namespace content {
-
-namespace webcrypto {
-
-namespace {
-
-const blink::WebCryptoKeyUsageMask kValidUsages =
- blink::WebCryptoKeyUsageDeriveKey | blink::WebCryptoKeyUsageDeriveBits;
-
-class HkdfImplementation : public AlgorithmImplementation {
- public:
- HkdfImplementation() {}
-
- Status VerifyKeyUsagesBeforeImportKey(
- blink::WebCryptoKeyFormat format,
- blink::WebCryptoKeyUsageMask usages) const override {
- if (format != blink::WebCryptoKeyFormatRaw)
- return Status::ErrorUnsupportedImportKeyFormat();
- return CheckKeyCreationUsages(kValidUsages, usages, false);
- }
-
- Status ImportKeyRaw(const CryptoData& key_data,
- const blink::WebCryptoAlgorithm& algorithm,
- bool extractable,
- blink::WebCryptoKeyUsageMask usages,
- blink::WebCryptoKey* key) const override {
- return CreateWebCryptoSecretKey(
- key_data, blink::WebCryptoKeyAlgorithm::createWithoutParams(
- blink::WebCryptoAlgorithmIdHkdf),
- extractable, usages, key);
- }
-
- Status DeriveBits(const blink::WebCryptoAlgorithm& algorithm,
- const blink::WebCryptoKey& base_key,
- bool has_optional_length_bits,
- unsigned int optional_length_bits,
- std::vector<uint8_t>* derived_bytes) const override {
- crypto::OpenSSLErrStackTracer err_tracer(FROM_HERE);
- if (!has_optional_length_bits)
- return Status::ErrorHkdfDeriveBitsLengthNotSpecified();
-
- const blink::WebCryptoHkdfParams* params = algorithm.hkdfParams();
-
- const EVP_MD* digest_algorithm = GetDigest(params->hash().id());
- if (!digest_algorithm)
- return Status::ErrorUnsupported();
-
- // Size output to fit length
- unsigned int derived_bytes_len = NumBitsToBytes(optional_length_bits);
- derived_bytes->resize(derived_bytes_len);
-
- // Algorithm dispatch checks that the algorithm in |base_key| matches
- // |algorithm|.
- const std::vector<uint8_t>& raw_key =
- SymKeyOpenSsl::Cast(base_key)->raw_key_data();
- if (!HKDF(vector_as_array(derived_bytes), derived_bytes_len,
- digest_algorithm, vector_as_array(&raw_key), raw_key.size(),
- params->salt().data(), params->salt().size(),
- params->info().data(), params->info().size())) {
- uint32_t error = ERR_get_error();
- if (ERR_GET_LIB(error) == ERR_LIB_HKDF &&
- ERR_GET_REASON(error) == HKDF_R_OUTPUT_TOO_LARGE) {
- return Status::ErrorHkdfLengthTooLong();
- }
- return Status::OperationError();
- }
-
- TruncateToBitLength(optional_length_bits, derived_bytes);
- return Status::Success();
- }
-
- Status SerializeKeyForClone(
- const blink::WebCryptoKey& key,
- blink::WebVector<uint8_t>* key_data) const override {
- key_data->assign(SymKeyOpenSsl::Cast(key)->serialized_key_data());
- return Status::Success();
- }
-
- Status DeserializeKeyForClone(const blink::WebCryptoKeyAlgorithm& algorithm,
- blink::WebCryptoKeyType type,
- bool extractable,
- blink::WebCryptoKeyUsageMask usages,
- const CryptoData& key_data,
- blink::WebCryptoKey* key) const override {
- return CreateWebCryptoSecretKey(key_data, algorithm, extractable, usages,
- key);
- }
-
- Status GetKeyLength(const blink::WebCryptoAlgorithm& key_length_algorithm,
- bool* has_length_bits,
- unsigned int* length_bits) const override {
- *has_length_bits = false;
- return Status::Success();
- }
-};
-
-} // namespace
-
-AlgorithmImplementation* CreatePlatformHkdfImplementation() {
- return new HkdfImplementation;
-}
-
-} // namespace webcrypto
-
-} // namespace content
« no previous file with comments | « content/child/webcrypto/openssl/ecdsa_openssl.cc ('k') | content/child/webcrypto/openssl/hmac_openssl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698