Changeset 6181

Timestamp:

05/22/10 10:00:53 (3 years ago)

Author:

Cyrus

Message:

ustream: Unify SSL handling

Location:

luci2/libustream

Files:

• protocol/http.c (modified) (2 diffs)
• tls.c (modified) (1 diff)

luci2/libustream/protocol/http.c

@@ -121 +121 @@
     ustream_uhtbl_set(&http->header, "Connection", "close", 5);
 
+    if (stream->handler == &handler_https
+    && !(http->ssl = ustream_tls_new())) {
+        return -errno;
+    }
+
     return 0;
 }
@@ -147 +152 @@
 
     if (stream->handler == &handler_https) {
-        if (!http->ssl) {
-            if (!(http->ssl = ustream_tls_new(http->socket))) {
-                close(http->socket);
-                goto error;
-            }
-        }
+        SSL_set_fd(http->ssl, http->socket);
         int stat;
         if ((stat = SSL_connect(http->ssl)) <= 0) {

luci2/libustream/tls.c

@@ -78 +78 @@
 }
 
-USTREAM_LOCAL SSL* ustream_tls_new(int fd) {
-    SSL *ssl = SSL_new(ctx);
-    if (ssl) {
-        SSL_set_fd(ssl, fd);
-    }
-    return ssl;
+USTREAM_LOCAL SSL* ustream_tls_new() {
+    return SSL_new(ctx);
 }