Chromium Code Reviews| Index: webrtc/base/messagedigest.cc |
| diff --git a/webrtc/base/messagedigest.cc b/webrtc/base/messagedigest.cc |
| index 8af60d9a966deecc95e5bd117cceffd3d6a24b56..d263def259262e2cbde9ad96e18083c6e78f33fb 100644 |
| --- a/webrtc/base/messagedigest.cc |
| +++ b/webrtc/base/messagedigest.cc |
| @@ -117,7 +117,7 @@ size_t ComputeHmac(MessageDigest* digest, |
| } |
| // Copy the key to a block-sized buffer to simplify padding. |
| // If the key is longer than a block, hash it and use the result instead. |
| - scoped_ptr<uint8[]> new_key(new uint8[block_len]); |
| + scoped_ptr<uint8_t[]> new_key(new uint8_t[block_len]); |
| if (key_len > block_len) { |
| ComputeDigest(digest, key, key_len, new_key.get(), block_len); |
| memset(new_key.get() + digest->Size(), 0, block_len - digest->Size()); |
| @@ -126,13 +126,14 @@ size_t ComputeHmac(MessageDigest* digest, |
| memset(new_key.get() + key_len, 0, block_len - key_len); |
| } |
| // Set up the padding from the key, salting appropriately for each padding. |
| - scoped_ptr<uint8[]> o_pad(new uint8[block_len]), i_pad(new uint8[block_len]); |
| + scoped_ptr<uint8_t[]> o_pad(new uint8_t[block_len]), |
| + i_pad(new uint8_t[block_len]); |
|
Henrik Grunell WebRTC
2015/10/05 12:00:19
Nit: I think it's more readable if
scoped_ptr<uint
pbos-webrtc
2015/10/05 12:23:23
Agreed, it's also more style compliant. Done.
|
| for (size_t i = 0; i < block_len; ++i) { |
| o_pad[i] = 0x5c ^ new_key[i]; |
| i_pad[i] = 0x36 ^ new_key[i]; |
| } |
| // Inner hash; hash the inner padding, and then the input buffer. |
| - scoped_ptr<uint8[]> inner(new uint8[digest->Size()]); |
| + scoped_ptr<uint8_t[]> inner(new uint8_t[digest->Size()]); |
| digest->Update(i_pad.get(), block_len); |
| digest->Update(input, in_len); |
| digest->Finish(inner.get(), digest->Size()); |