summaryrefslogtreecommitdiffstats
path: root/crypto/hkdf.h
diff options
context:
space:
mode:
authoravi <avi@chromium.org>2015-12-21 13:34:43 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-21 21:35:49 +0000
commitdd373b8b7d7501cf7f3bbfe861f58dce67578a69 (patch)
tree037d2922a3dc5079e1eff59e9a3eb5fe3c605fa0 /crypto/hkdf.h
parent64114156487081d877b793d3a501a8658743141d (diff)
downloadchromium_src-dd373b8b7d7501cf7f3bbfe861f58dce67578a69.zip
chromium_src-dd373b8b7d7501cf7f3bbfe861f58dce67578a69.tar.gz
chromium_src-dd373b8b7d7501cf7f3bbfe861f58dce67578a69.tar.bz2
Switch to standard integer types in crypto/.
BUG=138542 TBR=rsleevi@chromium.org NOPRESUBMIT=true Review URL: https://codereview.chromium.org/1539353003 Cr-Commit-Position: refs/heads/master@{#366460}
Diffstat (limited to 'crypto/hkdf.h')
-rw-r--r--crypto/hkdf.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/crypto/hkdf.h b/crypto/hkdf.h
index e91bccf..6b7d00d 100644
--- a/crypto/hkdf.h
+++ b/crypto/hkdf.h
@@ -5,9 +5,11 @@
#ifndef CRYPTO_HKDF_H_
#define CRYPTO_HKDF_H_
+#include <stddef.h>
+#include <stdint.h>
+
#include <vector>
-#include "base/basictypes.h"
#include "base/strings/string_piece.h"
#include "crypto/crypto_export.h"
@@ -57,7 +59,7 @@ class CRYPTO_EXPORT HKDF {
}
private:
- std::vector<uint8> output_;
+ std::vector<uint8_t> output_;
base::StringPiece client_write_key_;
base::StringPiece server_write_key_;