commit 687937304b390a82ae47586da7cdaff2790aa7fd
author David Benjamin <davidben@chromium.org> Mon May 04 20:20:48 2015 -0400
committer David Benjamin <davidben@chromium.org> Mon May 04 20:21:32 2015 -0400
tree 04a76f929f486e4485e76405d031efbf8732f26a
parent e7b32c30e11d6266215438eff76bb50e430c567b

Revert "Temporarily break a handful of tests."

This reverts commit a921d550d03361353468f5d91d552d09ae92a60f.

ssl/ssl_test.cc

diff --git a/ssl/ssl_test.cc b/ssl/ssl_test.cc
index 6d23cbe..7886304 100644
--- a/ssl/ssl_test.cc
+++ b/ssl/ssl_test.cc
@@ -495,7 +495,7 @@
       !TestDefaultVersion(SSL3_VERSION, &SSLv3_method) ||
       !TestDefaultVersion(TLS1_VERSION, &TLSv1_method) ||
       !TestDefaultVersion(TLS1_1_VERSION, &TLSv1_1_method) ||
-      !TestDefaultVersion(TLS1_1_VERSION, &TLSv1_2_method) ||
+      !TestDefaultVersion(TLS1_2_VERSION, &TLSv1_2_method) ||
       !TestDefaultVersion(0, &DTLS_method) ||
       !TestDefaultVersion(DTLS1_VERSION, &DTLSv1_method) ||
       !TestDefaultVersion(DTLS1_2_VERSION, &DTLSv1_2_method) ||

ssl/test/runner/runner.go

diff --git a/ssl/test/runner/runner.go b/ssl/test/runner/runner.go
index f9884c0..0b631e2 100644
--- a/ssl/test/runner/runner.go
+++ b/ssl/test/runner/runner.go
@@ -1607,7 +1607,7 @@
 					MaxVersion:           ver.version,
 					CipherSuites:         []uint16{suite.id},
 					Certificates:         []Certificate{cert},
-					PreSharedKey:         []byte("WRONG PSK"),
+					PreSharedKey:         []byte(psk),
 					PreSharedKeyIdentity: pskIdentity,
 				},
 				flags:         flags,