summaryrefslogtreecommitdiffstats
path: root/crypto/third_party
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/third_party
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/third_party')
-rw-r--r--crypto/third_party/nss/secsign.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/third_party/nss/secsign.cc b/crypto/third_party/nss/secsign.cc
index a788def..c9816fb0 100644
--- a/crypto/third_party/nss/secsign.cc
+++ b/crypto/third_party/nss/secsign.cc
@@ -46,8 +46,8 @@
#include <pk11pub.h>
#include <secerr.h>
#include <sechash.h>
+#include <stdint.h>
-#include "base/basictypes.h"
#include "base/logging.h"
#include "build/build_config.h"
@@ -88,7 +88,7 @@ SECStatus DerSignData(PLArenaPool *arena,
}
// Hash the input.
- std::vector<uint8> hash_data(HASH_ResultLen(hash_type));
+ std::vector<uint8_t> hash_data(HASH_ResultLen(hash_type));
SECStatus rv = HASH_HashBuf(
hash_type, &hash_data[0], input->data, input->len);
if (rv != SECSuccess)
@@ -98,7 +98,7 @@ SECStatus DerSignData(PLArenaPool *arena,
// Compute signature of hash.
int signature_len = PK11_SignatureLen(key);
- std::vector<uint8> signature_data(signature_len);
+ std::vector<uint8_t> signature_data(signature_len);
SECItem sig = {siBuffer, &signature_data[0],
static_cast<unsigned int>(signature_len)};
rv = PK11_Sign(key, &sig, &hash);