Index: net/quic/crypto/curve25519_key_exchange.cc |
diff --git a/net/quic/crypto/curve25519_key_exchange.cc b/net/quic/crypto/curve25519_key_exchange.cc |
index b5cc5bf0f52b776252b1279f4540531add5cc99f..cf97addb50a19c85638c79dcb5649d9b68781ac6 100644 |
--- a/net/quic/crypto/curve25519_key_exchange.cc |
+++ b/net/quic/crypto/curve25519_key_exchange.cc |
@@ -4,7 +4,6 @@ |
#include "net/quic/crypto/curve25519_key_exchange.h" |
-#include "base/basictypes.h" |
#include "base/logging.h" |
#include "crypto/curve25519.h" |
#include "net/quic/crypto/quic_random.h" |
@@ -43,7 +42,7 @@ Curve25519KeyExchange* Curve25519KeyExchange::New( |
// static |
string Curve25519KeyExchange::NewPrivateKey(QuicRandom* rand) { |
- uint8 private_key[crypto::curve25519::kScalarBytes]; |
+ uint8_t private_key[crypto::curve25519::kScalarBytes]; |
rand->RandBytes(private_key, sizeof(private_key)); |
// This makes |private_key| a valid scalar, as specified on |
@@ -66,10 +65,10 @@ bool Curve25519KeyExchange::CalculateSharedKey( |
return false; |
} |
- uint8 result[crypto::curve25519::kBytes]; |
+ uint8_t result[crypto::curve25519::kBytes]; |
if (!crypto::curve25519::ScalarMult( |
private_key_, |
- reinterpret_cast<const uint8*>(peer_public_value.data()), result)) { |
+ reinterpret_cast<const uint8_t*>(peer_public_value.data()), result)) { |
return false; |
} |
out_result->assign(reinterpret_cast<char*>(result), sizeof(result)); |