Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(951)

Unified Diff: net/quic/crypto/crypto_utils.cc

Issue 26471007: QUIC: don't ignore SetKey and SetNoncePrefix return values. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merging with tip Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/quic/crypto/crypto_utils.cc
diff --git a/net/quic/crypto/crypto_utils.cc b/net/quic/crypto/crypto_utils.cc
index 469e582268f6022829343ffca3c86ddbb72f0c6a..eec8a9d05a26451bf20aaffeacc8e41311de0b59 100644
--- a/net/quic/crypto/crypto_utils.cc
+++ b/net/quic/crypto/crypto_utils.cc
@@ -77,7 +77,7 @@ string CryptoUtils::NormalizeHostname(const char* hostname) {
}
// static
-void CryptoUtils::DeriveKeys(StringPiece premaster_secret,
+bool CryptoUtils::DeriveKeys(StringPiece premaster_secret,
QuicTag aead,
StringPiece client_nonce,
StringPiece server_nonce,
@@ -99,16 +99,22 @@ void CryptoUtils::DeriveKeys(StringPiece premaster_secret,
crypto::HKDF hkdf(premaster_secret, nonce, hkdf_input, key_bytes,
nonce_prefix_bytes);
if (perspective == SERVER) {
- out->encrypter->SetKey(hkdf.server_write_key());
- out->encrypter->SetNoncePrefix(hkdf.server_write_iv());
- out->decrypter->SetKey(hkdf.client_write_key());
- out->decrypter->SetNoncePrefix(hkdf.client_write_iv());
+ if (!out->encrypter->SetKey(hkdf.server_write_key()) ||
+ !out->encrypter->SetNoncePrefix(hkdf.server_write_iv()) ||
+ !out->decrypter->SetKey(hkdf.client_write_key()) ||
+ !out->decrypter->SetNoncePrefix(hkdf.client_write_iv())) {
+ return false;
+ }
} else {
- out->encrypter->SetKey(hkdf.client_write_key());
- out->encrypter->SetNoncePrefix(hkdf.client_write_iv());
- out->decrypter->SetKey(hkdf.server_write_key());
- out->decrypter->SetNoncePrefix(hkdf.server_write_iv());
+ if (!out->encrypter->SetKey(hkdf.client_write_key()) ||
+ !out->encrypter->SetNoncePrefix(hkdf.client_write_iv()) ||
+ !out->decrypter->SetKey(hkdf.server_write_key()) ||
+ !out->decrypter->SetNoncePrefix(hkdf.server_write_iv())) {
+ return false;
+ }
}
+
+ return true;
}
} // namespace net

Powered by Google App Engine
This is Rietveld 408576698