Add support for GCM cipher suites from RFC 7714.
GCM cipher suites are optional (disabled by default) and can be enabled
through "PeerConnectionFactoryInterface::Options".
If compiled with Chromium (i.e. "ENABLE_EXTERNAL_AUTH" is defined), no
GCM ciphers can be used yet (see https://crbug.com/628400).
BUG=webrtc:5222, 628400
Review-Url: https://codereview.webrtc.org/1528843005
Cr-Commit-Position: refs/heads/master@{#13635}
diff --git a/webrtc/base/helpers_unittest.cc b/webrtc/base/helpers_unittest.cc
index 83cc685..e4903f5 100644
--- a/webrtc/base/helpers_unittest.cc
+++ b/webrtc/base/helpers_unittest.cc
@@ -10,6 +10,7 @@
#include <string>
+#include "webrtc/base/buffer.h"
#include "webrtc/base/gunit.h"
#include "webrtc/base/helpers.h"
#include "webrtc/base/ssladapter.h"
@@ -43,6 +44,17 @@
EXPECT_EQ(256U, random2.size());
}
+TEST_F(RandomTest, TestCreateRandomData) {
+ static size_t kRandomDataLength = 32;
+ std::string random1;
+ std::string random2;
+ EXPECT_TRUE(CreateRandomData(kRandomDataLength, &random1));
+ EXPECT_EQ(kRandomDataLength, random1.size());
+ EXPECT_TRUE(CreateRandomData(kRandomDataLength, &random2));
+ EXPECT_EQ(kRandomDataLength, random2.size());
+ EXPECT_NE(0, memcmp(random1.data(), random2.data(), kRandomDataLength));
+}
+
TEST_F(RandomTest, TestCreateRandomUuid) {
std::string random = CreateRandomUuid();
EXPECT_EQ(36U, random.size());
@@ -54,12 +66,24 @@
EXPECT_EQ(2154761789U, CreateRandomId());
EXPECT_EQ("h0ISP4S5SJKH/9EY", CreateRandomString(16));
EXPECT_EQ("41706e92-cdd3-46d9-a22d-8ff1737ffb11", CreateRandomUuid());
+ static size_t kRandomDataLength = 32;
+ std::string random;
+ EXPECT_TRUE(CreateRandomData(kRandomDataLength, &random));
+ EXPECT_EQ(kRandomDataLength, random.size());
+ Buffer expected("\xbd\x52\x2a\x4b\x97\x93\x2f\x1c"
+ "\xc4\x72\xab\xa2\x88\x68\x3e\xcc"
+ "\xa3\x8d\xaf\x13\x3b\xbc\x83\xbb"
+ "\x16\xf1\xcf\x56\x0c\xf5\x4a\x8b", kRandomDataLength);
+ EXPECT_EQ(0, memcmp(expected.data(), random.data(), kRandomDataLength));
// Reset and make sure we get the same output.
SetRandomTestMode(true);
EXPECT_EQ(2154761789U, CreateRandomId());
EXPECT_EQ("h0ISP4S5SJKH/9EY", CreateRandomString(16));
EXPECT_EQ("41706e92-cdd3-46d9-a22d-8ff1737ffb11", CreateRandomUuid());
+ EXPECT_TRUE(CreateRandomData(kRandomDataLength, &random));
+ EXPECT_EQ(kRandomDataLength, random.size());
+ EXPECT_EQ(0, memcmp(expected.data(), random.data(), kRandomDataLength));
// Test different character sets.
SetRandomTestMode(true);