Rip out the old TLS implementation

diff --git a/doc/api/http.markdown b/doc/api/http.markdown
index 8eb958c..95a581f 100644 (file)
--- a/doc/api/http.markdown
+++ b/doc/api/http.markdown
@@ -121,17 +121,6 @@ This function is asynchronous. The last parameter `callback` will be called
 when the server has been bound.
 
 
-### server.setSecure(credentials)
-
-Enables HTTPS support for the server, with the crypto module credentials
-specifying the private key and certificate of the server, and optionally
-the CA certificates for use in client authentication.
-
-If the credentials hold one or more CA certificates, then the server will request
-for the client to submit a client certificate as part of the HTTPS connection handshake.
-The validity and content of this can be accessed via `verifyPeer()`
-and `getPeerCertificate()` from the server's `request.connection`.
-
 ### server.close()
 
 Stops the server from accepting new connections.

diff --git a/doc/api/net.markdown b/doc/api/net.markdown
index 4e6bbef..c37a2dc 100644 (file)
--- a/doc/api/net.markdown
+++ b/doc/api/net.markdown
@@ -257,14 +257,6 @@ Either `'closed'`, `'open'`, `'opening'`, `'readOnly'`, or `'writeOnly'`.
 Emitted when a stream connection successfully is established.
 See `connect()`.
 
-
-#### Event: 'secure'
-
-`function () { }`
-
-Emitted when a stream connection successfully establishes an SSL handshake with its peer.
-
-
 #### Event: 'data'
 
 `function (data) { }`

diff --git a/lib/http.js b/lib/http.js
index d561058..b0e86f2 100644 (file)
--- a/lib/http.js
+++ b/lib/http.js
@@ -753,11 +753,6 @@ function Server (requestListener) {
 }
 util.inherits(Server, net.Server);
 
-Server.prototype.setSecure = function (credentials) {
-  this.secure = true;
-  this.credentials = credentials;
-};
-
 exports.Server = Server;
 
 exports.createServer = function (requestListener) {
@@ -780,10 +775,6 @@ function connectionListener (socket) {
   parser.reinitialize('request');
   parser.socket = socket;
 
-  if (self.secure) {
-    socket.setSecure(self.credentials);
-  }
-
   socket.addListener('error', function (e) {
     self.emit('clientError', e);
   });
@@ -912,16 +903,6 @@ function Client ( ) {
     self.ondata = onData;
     self.onend = onEnd;
 
-    if (this.https) {
-      this.setSecure(this.credentials);
-    } else {
-      self._initParser();
-      debug('requests: ' + util.inspect(self._outgoing));
-      outgoingFlush(self);
-    }
-  });
-
-  self.addListener("secure", function () {
     self._initParser();
     debug('requests: ' + util.inspect(self._outgoing));
     outgoingFlush(self);

diff --git a/lib/net.js b/lib/net.js
index 90c37cb..6373b40 100644 (file)
--- a/lib/net.js
+++ b/lib/net.js
@@ -48,7 +48,6 @@ var ENOENT      = constants.ENOENT;
 var EMFILE      = constants.EMFILE;
 
 var END_OF_FILE = 42;
-var SecureContext, SecureStream; // lazy loaded
 
 
 var ioWatchers = new FreeList("iowatcher", 100, function () {
@@ -78,11 +77,6 @@ function allocNewPool () {
   pool.used = 0;
 }
 
-var securePool = null;
-function allocNewSecurePool () {
-  securePool = new Buffer(40*1024);
-}
-
 var emptyBuffer = null;
 function allocEmptyBuffer () {
     emptyBuffer = new Buffer(1);
@@ -108,7 +102,7 @@ function setImplmentationMethods (self) {
       return sendMsg(self.fd, buf, off, len, fd, flags);
     };
 
-    self._readImpl = function (buf, off, len, calledByIOWatcher) {
+    self._readImpl = function (buf, off, len) {
       var bytesRead = recvMsg(self.fd, buf, off, len);
 
       // Do not emit this in the same stack, otherwise we risk corrupting our
@@ -139,7 +133,7 @@ function setImplmentationMethods (self) {
       return write(self.fd, buf, off, len);
     };
 
-    self._readImpl = function (buf, off, len, calledByIOWatcher) {
+    self._readImpl = function (buf, off, len) {
       return read(self.fd, buf, off, len);
     };
   }
@@ -148,132 +142,13 @@ function setImplmentationMethods (self) {
     shutdown(self.fd, 'write');
   };
 
-  if (self.secure) {
-    var oldWrite = self._writeImpl;
-    self._writeImpl = function (buf, off, len, fd, flags) {
-      assert(buf);
-      assert(self.secure);
-
-      var bytesWritten = self.secureStream.clearIn(buf, off, len);
-
-      if (!securePool) {
-        allocNewSecurePool();
-      }
-
-      var secureLen = self.secureStream.encOut(securePool,
-                                               0,
-                                               securePool.length);
-
-      if (secureLen == -1) {
-        // Check our read again for secure handshake
-        self._onReadable();
-      } else {
-        oldWrite(securePool, 0, secureLen, fd, flags);
-      }
-
-      if (!self.secureEstablished && self.secureStream.isInitFinished()) {
-        self.secureEstablished = true;
-
-        if (self._events && self._events['secure']) {
-          self.emit('secure');
-        }
-      }
-
-      return bytesWritten;
-    };
-
-    var oldRead = self._readImpl;
-    self._readImpl = function (buf, off, len, calledByIOWatcher) {
-      assert(self.secure);
-
-      var bytesRead = 0;
-      var secureBytesRead = null;
-
-      if (!securePool) {
-        allocNewSecurePool();
-      }
-
-      if (calledByIOWatcher) {
-        secureBytesRead = oldRead(securePool, 0, securePool.length);
-        self.secureStream.encIn(securePool, 0, secureBytesRead);
-      }
-
-      var chunkBytes;
-      do {
-        chunkBytes =
-          self.secureStream.clearOut(pool,
-                                     pool.used + bytesRead,
-                                     pool.length - pool.used - bytesRead);
-        bytesRead += chunkBytes;
-      } while ((chunkBytes > 0) && (pool.used + bytesRead < pool.length));
-
-      if (bytesRead == 0 && !calledByIOWatcher) {
-        return -1;
-      }
-
-      if (self.secureStream.clearPending()) {
-        process.nextTick(function () {
-          if (self.readable) self._onReadable();
-        });
-      }
-
-      if (!self.secureEstablished) {
-        if (self.secureStream.isInitFinished()) {
-          self.secureEstablished = true;
-          if (self._events && self._events['secure']) {
-            self.emit('secure');
-          }
-        }
-      }
-
-      if (calledByIOWatcher && secureBytesRead === null && !self.server) {
-        // Client needs to write as part of handshake
-        self._writeWatcher.start();
-        return -1;
-      }
-
-      if (bytesRead == 0 && secureBytesRead > 0) {
-        // Deal with SSL handshake
-        if (self.server) {
-          self._checkForSecureHandshake();
-        } else {
-          if (self.secureEstablised) {
-            self.flush();
-          } else {
-            self._checkForSecureHandshake();
-          }
-        }
-
-        return -1;
-      }
-
-      return bytesRead;
-    };
-
-    var oldShutdown = self._shutdownImpl;
-    self._shutdownImpl = function () {
-      self.secureStream.shutdown();
-
-      if (!securePool) {
-        allocNewSecurePool();
-      }
-
-      var len = self.secureStream.encOut(securePool, 0, securePool.length);
-
-      try {
-        oldWrite(securePool, 0, len);
-      } catch (e) { }
-
-      oldShutdown();
-    };
-  }
 };
 
 
 function onReadable (readable, writeable) {
   assert(this.socket);
   var socket = this.socket;
-  socket._onReadable(true);
+  socket._onReadable();
 }
 
 
@@ -312,13 +187,11 @@ function Stream (options) {
 
   this.fd = null;
   this.type = null;
-  this.secure = false;
   this.allowHalfOpen = false;
 
   if (typeof options == "object") {
     this.fd = options.fd !== undefined ? parseInt(options.fd, 10) : null;
     this.type = options.type || null;
-    this.secure = options.secure ||  false;
     this.allowHalfOpen = options.allowHalfOpen || false;
   } else if (typeof options  == "number") {
     this.fd = arguments[0];
@@ -340,76 +213,6 @@ Stream.prototype._onTimeout = function () {
 };
 
 
-Stream.prototype.setSecure = function (credentials) {
-  // Do we have openssl crypto?
-  try {
-    SecureContext = process.binding('crypto').SecureContext;
-    SecureStream = process.binding('crypto').SecureStream;
-  } catch (e) {
-    throw new Error('node.js not compiled with openssl crypto support.');
-  }
-
-  var crypto = require("crypto");
-  this.secure = true;
-  this.secureEstablished = false;
-  // If no credentials given, create a new one for just this Stream
-  if (!credentials) {
-    this.credentials = crypto.createCredentials();
-  } else {
-    this.credentials = credentials;
-  }
-  if (!this.server) {
-    // For clients, we will always have either a given ca list or the default on
-    this.credentials.shouldVerify = true;
-  }
-  this.secureStream = new SecureStream(this.credentials.context,
-                                       this.server ? true : false,
-                                       this.credentials.shouldVerify);
-
-  setImplmentationMethods(this);
-
-  if (!this.server) {
-    // If client, trigger handshake
-    this._checkForSecureHandshake();
-  }
-};
-
-
-Stream.prototype.verifyPeer = function () {
-  if (!this.secure) {
-    throw new Error('Stream is not a secure stream.');
-  }
-  return this.secureStream.verifyPeer(this.credentials.context);
-};
-
-
-Stream.prototype._checkForSecureHandshake = function () {
-  if (!this.writable) {
-    return;
-  }
-
-  // Do an empty write to see if we need to write out as part of handshake
-  if (!emptyBuffer) allocEmptyBuffer();
-  this.write(emptyBuffer);
-};
-
-
-Stream.prototype.getPeerCertificate = function (credentials) {
-  if (!this.secure) {
-    throw new Error('Stream is not a secure stream.');
-  }
-  return this.secureStream.getPeerCertificate();
-};
-
-
-Stream.prototype.getCipher = function () {
-  if (!this.secure) {
-      throw new Error('Stream is not a secure stream.');
-  }
-  return this.secureStream.getCurrentCipher();
-};
-
-
 Stream.prototype.open = function (fd, type) {
   initStream(this);
 
@@ -699,7 +502,7 @@ Stream.prototype._onWritable = function () {
 };
 
 
-Stream.prototype._onReadable = function (calledByIOWatcher) {
+Stream.prototype._onReadable = function () {
   var self = this;
 
   // If this is the first recv (pool doesn't exist) or we've used up
@@ -717,8 +520,7 @@ Stream.prototype._onReadable = function (calledByIOWatcher) {
   try {
     bytesRead = self._readImpl(pool,
                                pool.used,
-                               pool.length - pool.used,
-                               calledByIOWatcher);
+                               pool.length - pool.used);
   } catch (e) {
     self.destroy(e);
     return;
@@ -760,11 +562,6 @@ Stream.prototype._onReadable = function (calledByIOWatcher) {
 
     // Optimization: emit the original buffer with end points
     if (self.ondata) self.ondata(pool, start, end);
-  } else if (bytesRead == -2) {
-    // Temporary fix - need SSL refactor.
-    // -2 originates from SecureStream::ReadExtract
-    self.destroy(new Error('openssl read error'));
-    return false;
   }
 };
 
@@ -873,10 +670,6 @@ Stream.prototype.destroy = function (exception) {
 
   require('timers').unenroll(this);
 
-  if (this.secure) {
-    this.secureStream.close();
-  }
-
   if (this.server) {
     this.server.connections--;
   }

diff --git a/test/simple/test-http-tls.js b/test/disabled/test-http-tls.js
similarity index 100%
rename from test/simple/test-http-tls.js
rename to test/disabled/test-http-tls.js

diff --git a/test/pummel/test-net-tls.js b/test/disabled/test-net-tls-pummel.js
similarity index 100%
rename from test/pummel/test-net-tls.js
rename to test/disabled/test-net-tls-pummel.js

diff --git a/test/simple/test-net-tls.js b/test/disabled/test-net-tls.js
similarity index 100%
rename from test/simple/test-net-tls.js
rename to test/disabled/test-net-tls.js