Backed out changeset d2edbb87f3d2 (bug 1495120) for bustages at /security/manager/ssl/nsNSSIOLayer.cpp on a CLOSED TREE
authorGurzau Raul <rgurzau@mozilla.com>
Sat, 29 Sep 2018 01:57:00 +0300
changeset 494469 669ffcf8bc71befad54737c97b242059a80e8143
parent 494468 ff322e379a4d0c7a837b89ecb5f12eca38538492
child 494579 13b0256be4492426f51005b65d3526f7ca89683e
child 494598 7e5bf501404a0e6d8f28e7255a1ee49b0d05bacb
push id9984
push userffxbld-merge
push dateMon, 15 Oct 2018 21:07:35 +0000
treeherdermozilla-beta@183d27ea8570 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1495120
milestone64.0a1
backs outd2edbb87f3d283ab2c2fb6f8ad3408f792a6bd27
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset d2edbb87f3d2 (bug 1495120) for bustages at /security/manager/ssl/nsNSSIOLayer.cpp on a CLOSED TREE
security/manager/ssl/nsNSSIOLayer.cpp
--- a/security/manager/ssl/nsNSSIOLayer.cpp
+++ b/security/manager/ssl/nsNSSIOLayer.cpp
@@ -10,17 +10,16 @@
 
 #include "NSSCertDBTrustDomain.h"
 #include "NSSErrorsService.h"
 #include "PSMRunnable.h"
 #include "SSLServerCertVerification.h"
 #include "ScopedNSSTypes.h"
 #include "SharedSSLState.h"
 #include "keyhi.h"
-#include "mozilla/Base64.h"
 #include "mozilla/Casting.h"
 #include "mozilla/DebugOnly.h"
 #include "mozilla/Logging.h"
 #include "mozilla/Move.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/Telemetry.h"
 #include "nsArray.h"
 #include "nsArrayUtils.h"
@@ -1016,32 +1015,26 @@ nsNSSSocketInfo::GetEsniTxt(nsACString &
 }
 
 NS_IMETHODIMP
 nsNSSSocketInfo::SetEsniTxt(const nsACString & aEsniTxt)
 {
   mEsniTxt = aEsniTxt;
 
   if (mEsniTxt.Length()) {
-    nsAutoCString esniBin;
-    if (NS_OK != Base64Decode(mEsniTxt, esniBin)) {
-      MOZ_LOG(gPIPNSSLog, LogLevel::Error,
-              ("[%p] Invalid ESNIKeys record. Couldn't base64 decode\n",
-               (void*) mFd));
-      return NS_OK;
+    fprintf(stderr,"\n\nTODO - SSL_EnableSNI() [%s] (%d bytes)\n",
+            mEsniTxt.get(), mEsniTxt.Length());
+
+#if 0
+    if (SECSuccess != SSL_EnableESNI(mFd,
+                                     reinterpret_cast<const PRUint8*>(mEsniTxt.get()),
+                                     mEsniTxt.Length(), "dummy.invalid")) {
+      return NS_ERROR_FAILURE;
     }
-
-    if (SECSuccess != SSL_EnableESNI(mFd,
-                                     reinterpret_cast<const PRUint8*>(esniBin.get()),
-                                     esniBin.Length(), nullptr)) {
-      MOZ_LOG(gPIPNSSLog, LogLevel::Error, ("[%p] Invalid ESNIKeys record %s\n",
-                                            (void*) mFd,
-                                            PR_ErrorToName(PR_GetError())));
-      return NS_OK;
-    }
+#endif
   }
 
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsNSSSocketInfo::GetServerRootCertIsBuiltInRoot(bool *aIsBuiltInRoot)
 {