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

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

Issue 404733005: Replace uses of uint8 with uint8_t. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase onto master 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/aes_kw_openssl.cc ('k') | content/child/webcrypto/openssl/key_openssl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/webcrypto/openssl/hmac_openssl.cc
diff --git a/content/child/webcrypto/openssl/hmac_openssl.cc b/content/child/webcrypto/openssl/hmac_openssl.cc
index a40bfd930b45ad567c8f2e1aa86b4c5408a5ebf5..fe4c29c27e0ea39c5ef40ce4cd943ef34fc1824b 100644
--- a/content/child/webcrypto/openssl/hmac_openssl.cc
+++ b/content/child/webcrypto/openssl/hmac_openssl.cc
@@ -5,6 +5,7 @@
#include <openssl/hmac.h>
#include "base/logging.h"
+#include "content/child/webcrypto/algorithm_implementation.h"
#include "content/child/webcrypto/crypto_data.h"
#include "content/child/webcrypto/jwk.h"
#include "content/child/webcrypto/openssl/key_openssl.h"
@@ -26,10 +27,10 @@ namespace {
const blink::WebCryptoKeyUsageMask kAllKeyUsages =
blink::WebCryptoKeyUsageSign | blink::WebCryptoKeyUsageVerify;
-Status SignHmac(const std::vector<uint8>& raw_key,
+Status SignHmac(const std::vector<uint8_t>& raw_key,
const blink::WebCryptoAlgorithm& hash,
const CryptoData& data,
- std::vector<uint8>* buffer) {
+ std::vector<uint8_t>* buffer) {
crypto::OpenSSLErrStackTracer err_tracer(FROM_HERE);
const EVP_MD* digest_algorithm = GetDigest(hash.id());
@@ -133,7 +134,7 @@ class HmacImplementation : public AlgorithmImplementation {
if (!algorithm_name)
return Status::ErrorUnexpected();
- std::vector<uint8> raw_data;
+ std::vector<uint8_t> raw_data;
Status status = ReadSecretKeyJwk(
key_data, algorithm_name, extractable, usage_mask, &raw_data);
if (status.IsError())
@@ -144,15 +145,15 @@ class HmacImplementation : public AlgorithmImplementation {
}
virtual Status ExportKeyRaw(const blink::WebCryptoKey& key,
- std::vector<uint8>* buffer) const OVERRIDE {
+ std::vector<uint8_t>* buffer) const OVERRIDE {
*buffer = SymKeyOpenSsl::Cast(key)->raw_key_data();
return Status::Success();
}
virtual Status ExportKeyJwk(const blink::WebCryptoKey& key,
- std::vector<uint8>* buffer) const OVERRIDE {
+ std::vector<uint8_t>* buffer) const OVERRIDE {
SymKeyOpenSsl* sym_key = SymKeyOpenSsl::Cast(key);
- const std::vector<uint8>& raw_data = sym_key->raw_key_data();
+ const std::vector<uint8_t>& raw_data = sym_key->raw_key_data();
const char* algorithm_name =
GetJwkHmacAlgorithmName(key.algorithm().hmacParams()->hash().id());
@@ -171,7 +172,7 @@ class HmacImplementation : public AlgorithmImplementation {
virtual Status Sign(const blink::WebCryptoAlgorithm& algorithm,
const blink::WebCryptoKey& key,
const CryptoData& data,
- std::vector<uint8>* buffer) const OVERRIDE {
+ std::vector<uint8_t>* buffer) const OVERRIDE {
const blink::WebCryptoAlgorithm& hash =
key.algorithm().hmacParams()->hash();
@@ -184,7 +185,7 @@ class HmacImplementation : public AlgorithmImplementation {
const CryptoData& signature,
const CryptoData& data,
bool* signature_match) const OVERRIDE {
- std::vector<uint8> result;
+ std::vector<uint8_t> result;
Status status = Sign(algorithm, key, data, &result);
if (status.IsError())
« no previous file with comments | « content/child/webcrypto/openssl/aes_kw_openssl.cc ('k') | content/child/webcrypto/openssl/key_openssl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698