Re-enable mistakenly disabled PEM tests. Misc cleanup and alignment fixes.

webrtc/base/sslstreamadapter_unittest.cc

Index: webrtc/base/sslstreamadapter_unittest.cc
diff --git a/webrtc/base/sslstreamadapter_unittest.cc b/webrtc/base/sslstreamadapter_unittest.cc
index b14a88707aec9d4066e4cdac9561d0f3bb101cdf..a36e4a578b55824535e8205612a36e05a567d250 100644
--- a/webrtc/base/sslstreamadapter_unittest.cc
+++ b/webrtc/base/sslstreamadapter_unittest.cc
@@ -253,7 +253,7 @@ class SSLStreamAdapterTestBase : public testing::Test,
     rtc::SetRandomTestMode(false);
   }
 
-  virtual void SetUp() override {
+  void SetUp() override {
     CreateStreams();
 
     client_ssl_.reset(rtc::SSLStreamAdapter::Create(client_stream_));
@@ -275,7 +275,7 @@ class SSLStreamAdapterTestBase : public testing::Test,
     server_ssl_->SetIdentity(server_identity_);
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     client_ssl_.reset(nullptr);
     server_ssl_.reset(nullptr);
   }
@@ -546,7 +546,7 @@ class SSLStreamAdapterTestTLS
         server_buffer_(kFifoBufferSize) {
   }
 
-  virtual void CreateStreams() override {
+  void CreateStreams() override {
     client_stream_ =
         new SSLDummyStreamTLS(this, "c2s", &client_buffer_, &server_buffer_);
     server_stream_ =
@@ -630,7 +630,7 @@ class SSLStreamAdapterTestTLS
 
       if (r == rtc::SR_ERROR || r == rtc::SR_EOS) {
         // Unfortunately, errors are the way that the stream adapter
-        // signals close in OpenSSL
+        // signals close in OpenSSL.
         stream->Close();
         return;
       }
@@ -676,7 +676,7 @@ class SSLStreamAdapterTestDTLS
       packet_size_(1000), count_(0), sent_(0) {
   }
 
-  virtual void CreateStreams() override {
+  void CreateStreams() override {
     client_stream_ =
         new SSLDummyStreamDTLS(this, "c2s", &client_buffer_, &server_buffer_);
     server_stream_ =
@@ -687,11 +687,15 @@ class SSLStreamAdapterTestDTLS
     unsigned char *packet = new unsigned char[1600];
 
     while (sent_ < count_) {
-      memset(packet, sent_ & 0xff, packet_size_);
-      *(reinterpret_cast<uint32_t *>(packet)) = sent_;
+      unsigned int randstate = sent_;

[tommi, 2015/11/19 15:02:29]

int rand_state
(same type as sent_)

[torbjorng (webrtc), 2015/11/19 15:20:02]

Fixing name.

I made this 'unsigned' as it relies on well-defined overflow semantics.

+      packet[0] = sent_;
+      for (size_t i = 1; i < packet_size_; i++) {
+        randstate = (randstate * 251 + 19937) >> 7;

[tommi, 2015/11/19 15:02:29]

can you add some explanation for these constants?

[torbjorng (webrtc), 2015/11/19 15:20:02]

Not really. :-)  It's a simple LC generator without any claim of great
properties except that it won't have a short cycle.  It's an improvement over
the unaligned write+read and repeated sequence number pattern.

+        packet[i] = randstate & 0xff;
+      }
 
       size_t sent;
-      int rv = client_ssl_->Write(packet, packet_size_, &sent, 0);
+      rtc::StreamResult rv = client_ssl_->Write(packet, packet_size_, &sent, 0);
       if (rv == rtc::SR_SUCCESS) {
         LOG(LS_VERBOSE) << "Sent: " << sent_;
         sent_++;
@@ -731,11 +735,12 @@ class SSLStreamAdapterTestDTLS
 
       // Now parse the datagram
       ASSERT_EQ(packet_size_, bread);
-      unsigned char* ptr_to_buffer = buffer;
-      uint32_t packet_num = *(reinterpret_cast<uint32_t *>(ptr_to_buffer));
+      unsigned char packet_num = buffer[0];
 
-      for (size_t i = 4; i < packet_size_; i++) {
-        ASSERT_EQ((packet_num & 0xff), buffer[i]);
+      unsigned int randstate = packet_num;

[tommi, 2015/11/19 15:02:29]

rand_state

[torbjorng (webrtc), 2015/11/19 15:20:02]

Done.

+      for (size_t i = 1; i < packet_size_; i++) {
+        randstate = (randstate * 251 + 19937) >> 7;
+        ASSERT_EQ(randstate & 0xff, buffer[i]);
       }
       received_.insert(packet_num);
     }
@@ -772,14 +777,13 @@ class SSLStreamAdapterTestDTLS
 
 rtc::StreamResult SSLDummyStreamBase::Write(const void* data, size_t data_len,
                                               size_t* written, int* error) {
-  *written = data_len;
-
   LOG(LS_INFO) << "Writing to loopback " << data_len;
 
   if (first_packet_) {
     first_packet_ = false;
     if (test_base_->GetLoseFirstPacket()) {
       LOG(LS_INFO) << "Losing initial packet of length " << data_len;
+      *written = data_len;  // Fake successful writing also to writer.
       return rtc::SR_SUCCESS;
     }
   }
@@ -1012,14 +1016,14 @@ TEST_P(SSLStreamAdapterTestDTLS, TestCertExpired) {
 }
 
 // Test data transfer using certs created from strings.
-TEST_P(SSLStreamAdapterTestDTLSFromPEMStrings, TestTransfer) {
+TEST_F(SSLStreamAdapterTestDTLSFromPEMStrings, TestTransfer) {
   MAYBE_SKIP_TEST(HaveDtls);
   TestHandshake();
   TestTransfer(100);
 }
 
 // Test getting the remote certificate.
-TEST_P(SSLStreamAdapterTestDTLSFromPEMStrings, TestDTLSGetPeerCertificate) {
+TEST_F(SSLStreamAdapterTestDTLSFromPEMStrings, TestDTLSGetPeerCertificate) {
   MAYBE_SKIP_TEST(HaveDtls);
 
   // Peer certificates haven't been received yet.