diff options
| author | avi <avi@chromium.org> | 2015-12-21 13:34:43 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-21 21:35:49 +0000 |
| commit | dd373b8b7d7501cf7f3bbfe861f58dce67578a69 (patch) | |
| tree | 037d2922a3dc5079e1eff59e9a3eb5fe3c605fa0 /crypto/p224_spake.cc | |
| parent | 64114156487081d877b793d3a501a8658743141d (diff) | |
| download | chromium_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/p224_spake.cc')
| -rw-r--r-- | crypto/p224_spake.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/p224_spake.cc b/crypto/p224_spake.cc index a6dec40..1574105 100644 --- a/crypto/p224_spake.cc +++ b/crypto/p224_spake.cc @@ -203,14 +203,14 @@ P224EncryptedKeyExchange::Result P224EncryptedKeyExchange::ProcessMessage( // Now we calculate the hashes that each side will use to prove to the other // that they derived the correct value for K. - uint8 client_hash[kSHA256Length], server_hash[kSHA256Length]; + uint8_t client_hash[kSHA256Length], server_hash[kSHA256Length]; CalculateHash(kPeerTypeClient, client_masked_dh, server_masked_dh, key_, client_hash); CalculateHash(kPeerTypeServer, client_masked_dh, server_masked_dh, key_, server_hash); - const uint8* my_hash = is_server_ ? server_hash : client_hash; - const uint8* their_hash = is_server_ ? client_hash : server_hash; + const uint8_t* my_hash = is_server_ ? server_hash : client_hash; + const uint8_t* their_hash = is_server_ ? client_hash : server_hash; next_message_ = std::string(reinterpret_cast<const char*>(my_hash), kSHA256Length); @@ -224,7 +224,7 @@ void P224EncryptedKeyExchange::CalculateHash( const std::string& client_masked_dh, const std::string& server_masked_dh, const std::string& k, - uint8* out_digest) { + uint8_t* out_digest) { std::string hash_contents; if (peer_type == kPeerTypeServer) { |