| Index: net/quic/test_tools/crypto_test_utils_nss.cc
|
| diff --git a/net/quic/test_tools/crypto_test_utils_nss.cc b/net/quic/test_tools/crypto_test_utils_nss.cc
|
| index 88c87679b936ca7ecea8cca747f6d844fbe64638..859ccd7229ff3daa0bf52ef6008c8d1f96f14e1d 100644
|
| --- a/net/quic/test_tools/crypto_test_utils_nss.cc
|
| +++ b/net/quic/test_tools/crypto_test_utils_nss.cc
|
| @@ -25,9 +25,7 @@ namespace test {
|
| // implement real ChannelIDSigner.
|
| class TestChannelIDSigner : public ChannelIDSigner {
|
| public:
|
| - virtual ~TestChannelIDSigner() {
|
| - STLDeleteValues(&hostname_to_key_);
|
| - }
|
| + virtual ~TestChannelIDSigner() { STLDeleteValues(&hostname_to_key_); }
|
|
|
| // ChannelIDSigner implementation.
|
|
|
| @@ -46,17 +44,17 @@ class TestChannelIDSigner : public ChannelIDSigner {
|
| }
|
|
|
| unsigned char hash_buf[SHA256_LENGTH];
|
| - SECItem hash_item = { siBuffer, hash_buf, sizeof(hash_buf) };
|
| + SECItem hash_item = {siBuffer, hash_buf, sizeof(hash_buf)};
|
|
|
| HASHContext* sha256 = HASH_Create(HASH_AlgSHA256);
|
| if (!sha256) {
|
| return false;
|
| }
|
| HASH_Begin(sha256);
|
| - HASH_Update(sha256,
|
| - reinterpret_cast<const unsigned char*>(
|
| - ChannelIDVerifier::kContextStr),
|
| - strlen(ChannelIDVerifier::kContextStr) + 1);
|
| + HASH_Update(
|
| + sha256,
|
| + reinterpret_cast<const unsigned char*>(ChannelIDVerifier::kContextStr),
|
| + strlen(ChannelIDVerifier::kContextStr) + 1);
|
| HASH_Update(sha256,
|
| reinterpret_cast<const unsigned char*>(
|
| ChannelIDVerifier::kClientToServerStr),
|
| @@ -70,12 +68,9 @@ class TestChannelIDSigner : public ChannelIDSigner {
|
| // The signature consists of a pair of 32-byte numbers.
|
| static const unsigned int kSignatureLength = 32 * 2;
|
| string signature;
|
| - SECItem sig_item = {
|
| - siBuffer,
|
| - reinterpret_cast<unsigned char*>(
|
| - WriteInto(&signature, kSignatureLength + 1)),
|
| - kSignatureLength
|
| - };
|
| + SECItem sig_item = {siBuffer, reinterpret_cast<unsigned char*>(WriteInto(
|
| + &signature, kSignatureLength + 1)),
|
| + kSignatureLength};
|
|
|
| if (PK11_Sign(ecdsa_keypair->key(), &sig_item, &hash_item) != SECSuccess) {
|
| return false;
|
|
|