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

Unified Diff: net/socket/ssl_server_socket_unittest.cc

Issue 9663043: Add a boolean |had_context| argument to the TLS ExportKeyingMaterial (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Make suggested changes, add patch file Created 8 years, 9 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/socket/ssl_server_socket_unittest.cc
===================================================================
--- net/socket/ssl_server_socket_unittest.cc (revision 126517)
+++ net/socket/ssl_server_socket_unittest.cc (working copy)
@@ -455,19 +455,22 @@
const char* kKeyingLabel = "EXPERIMENTAL-server-socket-test";
const char* kKeyingContext = "";
unsigned char server_out[kKeyingMaterialSize];
- int rv = server_socket_->ExportKeyingMaterial(kKeyingLabel, kKeyingContext,
+ int rv = server_socket_->ExportKeyingMaterial(kKeyingLabel,
+ false, kKeyingContext,
server_out, sizeof(server_out));
ASSERT_EQ(rv, net::OK);
unsigned char client_out[kKeyingMaterialSize];
- rv = client_socket_->ExportKeyingMaterial(kKeyingLabel, kKeyingContext,
+ rv = client_socket_->ExportKeyingMaterial(kKeyingLabel,
+ false, kKeyingContext,
client_out, sizeof(client_out));
ASSERT_EQ(rv, net::OK);
EXPECT_TRUE(memcmp(server_out, client_out, sizeof(server_out)) == 0);
const char* kKeyingLabelBad = "EXPERIMENTAL-server-socket-test-bad";
unsigned char client_bad[kKeyingMaterialSize];
- rv = client_socket_->ExportKeyingMaterial(kKeyingLabelBad, kKeyingContext,
+ rv = client_socket_->ExportKeyingMaterial(kKeyingLabelBad,
+ false, kKeyingContext,
client_bad, sizeof(client_bad));
ASSERT_EQ(rv, net::OK);
EXPECT_TRUE(memcmp(server_out, client_bad, sizeof(server_out)) != 0);

Powered by Google App Engine
This is Rietveld 408576698