samples/shutdown/client.lua

@@ -1,85 +0,0 @@
---
--- Test the conn:shutdown() function
---
--- Public domain
---
-local socket = require("socket")
-local ssl    = require("ssl")
-
-local params = {
-   mode = "client",
-   protocol = "tlsv1_2",
-   key = "../certs/clientAkey.pem",
-   certificate = "../certs/clientA.pem",
-   cafile = "../certs/rootA.pem",
-   verify = {"peer", "fail_if_no_peer_cert"},
-   options = "all",
-}
-
--- Wait until socket is ready (for reading or writing)
-local function wait(peer)
-   -- What event blocked us?
-   local err = peer:want()
-   print("Want? ", err)
-
-   if err == "read" then
-      socket.select({peer}, nil)
-   elseif err == "write" then
-      socket.select(nil, {peer})
-   elseif err == "nothing" then
-      return
-   else
-      peer:close()
-      os.exit(1)
-   end
-end
-
--- Send data
-local function send(peer, data)
-   local offset = 1
-   while true do
-      local succ, msg, part = peer:send(data, offset)
-      if succ then break end
-      if part then
-         offset = offset + part
-         wait(peer)
-      end
-  end
-end
-
--- Start the TCP connection
-local peer = socket.tcp()
-peer:setoption('tcp-nodelay', true)
-
-assert(peer:connect("127.0.0.1", 8888))
-
-peer = assert(ssl.wrap(peer, params))
-local ctx = assert(ssl.newcontext(params))
-
-peer:settimeout(0.3)
-
-print("*** Handshake")
-
-while true do
-   local succ, msg = peer:dohandshake()
-   if succ then break end
-   wait(peer)
-end
-
-print("*** Send data")
-for i = 1, 10 do
-  send(peer, string.rep('1', 8192))
-end
-
-print("*** Shutdown")
-while true do
-   local succ, msg = peer:shutdown()
-   if succ then break end
-   print(succ, msg)
-   if msg ~= "inprogress" then
-      wait(peer)
-   end
-end
-
-print("*** Done")
-peer:close()

samples/shutdown/server.lua

@@ -1,47 +0,0 @@
---
--- Public domain
---
-local socket = require("socket")
-local ssl    = require("ssl")
-
-local params = {
-   mode = "server",
-   protocol = "any",
-   key = "../certs/serverAkey.pem",
-   certificate = "../certs/serverA.pem",
-   cafile = "../certs/rootA.pem",
-   verify = {"peer", "fail_if_no_peer_cert"},
-   options = "all",
-}
-
-local ctx = assert(ssl.newcontext(params))
-
-local server = socket.tcp()
-server:setoption('reuseaddr', true)
-
-assert(server:bind("127.0.0.1", 8888))
-server:listen()
-
-while true do
-  local peer = server:accept()
-  peer:setoption('tcp-nodelay', true)
-
-  print("*** New connection")
-
-  peer = assert( ssl.wrap(peer, ctx) )
-
-  print("*** Handshake")
-  assert( peer:dohandshake() )
-
-  print("*** Receive")
-  while true do
-    local str = peer:receive(1024)
-    if not str then break end
-    socket.sleep(0.1)
-  end
-
-  print("*** Done")
-  peer:close()
-end
-
-server:close()

src/ssl.c

@@ -11,9 +11,6 @@
 
 #if defined(WIN32)
 #include <winsock2.h>
-#define LSEC_ERR_INPROGRESS WSAEINPROGRESS
-#else
-#define LSEC_ERR_INPROGRESS EINPROGRESS
 #endif
 
 #include <openssl/ssl.h>
@@ -89,7 +86,8 @@ static int meth_destroy(lua_State *L)
 {
   p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection");
   if (ssl->state == LSEC_STATE_CONNECTED) {
-    socket_setblocking(&ssl->sock);
+    if (!ssl->shutdown)
+      socket_setblocking(&ssl->sock);
     SSL_shutdown(ssl->ssl);
   }
   if (ssl->sock != SOCKET_INVALID) {
@@ -155,46 +153,6 @@ static int handshake(p_ssl ssl)
   return IO_UNKNOWN;
 }
 
-/**
- * Perform the TLS/SSL shutdown
- */
-static int low_shutdown(p_ssl ssl)
-{
-  int err;
-  p_timeout tm = timeout_markstart(&ssl->tm);
-  if (ssl->state == LSEC_STATE_CLOSED)
-    return IO_CLOSED;
-  for ( ; ; ) {
-    ERR_clear_error();
-    err = SSL_shutdown(ssl->ssl);
-    if (err == 0) return LSEC_ERR_INPROGRESS;
-    if (err == 1) return IO_DONE;
-    ssl->error = SSL_get_error(ssl->ssl, err);
-    switch (ssl->error) {
-    case SSL_ERROR_WANT_READ:
-      err = socket_waitfd(&ssl->sock, WAITFD_R, tm);
-      if (err == IO_TIMEOUT) return LSEC_IO_SSL;
-      if (err != IO_DONE)    return err;
-      break;
-    case SSL_ERROR_WANT_WRITE:
-      err = socket_waitfd(&ssl->sock, WAITFD_W, tm);
-      if (err == IO_TIMEOUT) return LSEC_IO_SSL;
-      if (err != IO_DONE)    return err;
-      break;
-    case SSL_ERROR_SYSCALL:
-      if (ERR_peek_error())  {
-        ssl->error = SSL_ERROR_SSL;
-        return LSEC_IO_SSL;
-      }
-      if (err == 0) return IO_CLOSED;
-      return lsec_socket_error();
-    default:
-      return LSEC_IO_SSL;
-    }
-  }
-  return IO_UNKNOWN;
-}
-
 /**
  * Send data
  */
@@ -347,6 +305,7 @@ static int meth_create(lua_State *L)
     return luaL_argerror(L, 1, "invalid context");
   }
   ssl->state = LSEC_STATE_NEW;
+  ssl->shutdown = 0;
   SSL_set_fd(ssl->ssl, (int)SOCKET_INVALID);
   SSL_set_mode(ssl->ssl, SSL_MODE_ENABLE_PARTIAL_WRITE | 
     SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER);
@@ -382,6 +341,58 @@ static int meth_receive(lua_State *L) {
   return buffer_meth_receive(L, &ssl->buf);
 }
 
+/**
+ * SSL shutdown function
+ */
+static int meth_shutdown(lua_State *L) {
+  p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection");
+  int err;
+  p_timeout tm = timeout_markstart(&ssl->tm);
+
+  ssl->shutdown = 1;
+  if (ssl->state == LSEC_STATE_CLOSED) {
+    lua_pushboolean(L, 1);
+    return 1;
+  }
+
+  err = SSL_shutdown(ssl->ssl);
+  switch (err) {
+  case 0:
+    lua_pushboolean(L, 0);
+    lua_pushnil(L);
+    return 2;
+  case 1:
+    lua_pushboolean(L, 1);
+    lua_pushnil(L);
+    ssl->state = LSEC_STATE_CLOSED;
+    return 2;
+  default:
+    lua_pushboolean(L, 0);
+    ssl->error = SSL_get_error(ssl->ssl, err);
+    switch (ssl->error) {
+    case SSL_ERROR_WANT_READ:
+      err = socket_waitfd(&ssl->sock, WAITFD_R, tm);
+      lua_pushstring(L, ssl_ioerror((void *)ssl, err == IO_TIMEOUT ? LSEC_IO_SSL : err));
+      break;
+    case SSL_ERROR_WANT_WRITE:
+      err = socket_waitfd(&ssl->sock, WAITFD_W, tm);
+      lua_pushstring(L, ssl_ioerror((void *)ssl, err == IO_TIMEOUT ? LSEC_IO_SSL : err));
+      break;
+    case SSL_ERROR_SYSCALL:
+      if (ERR_peek_error())
+        ssl->error = SSL_ERROR_SSL;
+      lua_pushstring(L, ssl_ioerror((void *)ssl, LSEC_IO_SSL));
+      break;
+    default:
+      lua_pushstring(L, ssl_ioerror((void *)ssl, LSEC_IO_SSL));
+      break;
+    }
+    return 2;
+  }
+  // unreachable
+  return 0;
+}
+
 /**
  * Get the buffer's statistics.
  */
@@ -450,21 +461,6 @@ static int meth_handshake(lua_State *L)
   return 2;
 }
 
-/**
- * Lua shutdown function.
- */
-static int meth_shutdown(lua_State *L) {
-  p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection");
-  int err = low_shutdown(ssl);
-  if (err == IO_DONE) {
-    lua_pushboolean(L, 1);
-    return 1;
-  }
-  lua_pushboolean(L, 0);
-  lua_pushstring(L, (err == LSEC_ERR_INPROGRESS) ? "inprogress" : ssl_ioerror((void*)ssl, err));
-  return 2;
-}
-
 /**
  * Close the connection.
  */

src/ssl.h

@@ -32,6 +32,7 @@ typedef struct t_ssl_ {
   t_timeout tm;
   SSL *ssl;
   int state;
+  int shutdown;
   int error;
 } t_ssl;
 typedef t_ssl* p_ssl;