1 files changed, 32 insertions, 32 deletions

diff --git a/src/lib/libressl/ressl_client.c b/src/lib/libtls/tls_client.c
index 013963f3a1..853766f87b 100644
--- a/src/lib/libressl/ressl_client.c
+++ b/src/lib/libtls/tls_client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ressl_client.c,v 1.5 2014/10/03 14:14:40 tedu Exp $ */
+/* $OpenBSD: tls_client.c,v 1.1 2014/10/31 13:46:17 jsing Exp $ */
 /*
  * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
  *
@@ -26,37 +26,37 @@
 
 #include <openssl/x509.h>
 
-#include <ressl.h>
-#include "ressl_internal.h"
+#include <tls.h>
+#include "tls_internal.h"
 
-struct ressl *
-ressl_client(void)
+struct tls *
+tls_client(void)
 {
-        struct ressl *ctx;
+        struct tls *ctx;
 
-        if ((ctx = ressl_new()) == NULL)
+        if ((ctx = tls_new()) == NULL)
                 return (NULL);
 
-        ctx->flags |= RESSL_CLIENT;
+        ctx->flags |= TLS_CLIENT;
 
         return (ctx);
 }
 
 int
-ressl_connect(struct ressl *ctx, const char *host, const char *port)
+tls_connect(struct tls *ctx, const char *host, const char *port)
 {
         struct addrinfo hints, *res, *res0;
         const char *h = NULL, *p = NULL;
         char *hs = NULL, *ps = NULL;
         int rv = -1, s = -1, ret;
 
-        if ((ctx->flags & RESSL_CLIENT) == 0) {
-                ressl_set_error(ctx, "not a client context");
+        if ((ctx->flags & TLS_CLIENT) == 0) {
+                tls_set_error(ctx, "not a client context");
                 goto err;
         }
 
         if (host == NULL) {
-                ressl_set_error(ctx, "host not specified");
+                tls_set_error(ctx, "host not specified");
                 goto err;
         }
 
@@ -65,9 +65,9 @@ ressl_connect(struct ressl *ctx, const char *host, const char *port)
          * otherwise use the default.
          */
         if ((p = (char *)port) == NULL) {
-                ret = ressl_host_port(host, &hs, &ps);
+                ret = tls_host_port(host, &hs, &ps);
                 if (ret == -1) {
-                        ressl_set_error(ctx, "memory allocation failure");
+                        tls_set_error(ctx, "memory allocation failure");
                         goto err;
                 }
                 if (ret != 0)
@@ -82,17 +82,17 @@ ressl_connect(struct ressl *ctx, const char *host, const char *port)
         hints.ai_socktype = SOCK_STREAM;
 
         if ((ret = getaddrinfo(h, p, &hints, &res0)) != 0) {
-                ressl_set_error(ctx, "%s", gai_strerror(ret));
+                tls_set_error(ctx, "%s", gai_strerror(ret));
                 goto err;
         }
         for (res = res0; res; res = res->ai_next) {
                 s = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
                 if (s == -1) {
-                        ressl_set_error(ctx, "socket");
+                        tls_set_error(ctx, "socket");
                         continue;
                 }
                 if (connect(s, res->ai_addr, res->ai_addrlen) == -1) {
-                        ressl_set_error(ctx, "connect");
+                        tls_set_error(ctx, "connect");
                         close(s);
                         s = -1;
                         continue;
@@ -105,7 +105,7 @@ ressl_connect(struct ressl *ctx, const char *host, const char *port)
         if (s == -1)
                 goto err;
 
-        if (ressl_connect_socket(ctx, s, h) != 0) {
+        if (tls_connect_socket(ctx, s, h) != 0) {
                 close(s);
                 goto err;
         }
@@ -121,30 +121,30 @@ err:
 }
 
 int
-ressl_connect_socket(struct ressl *ctx, int socket, const char *hostname)
+tls_connect_socket(struct tls *ctx, int socket, const char *hostname)
 {
         union { struct in_addr ip4; struct in6_addr ip6; } addrbuf;
         X509 *cert = NULL;
         int ret;
 
-        if ((ctx->flags & RESSL_CLIENT) == 0) {
-                ressl_set_error(ctx, "not a client context");
+        if ((ctx->flags & TLS_CLIENT) == 0) {
+                tls_set_error(ctx, "not a client context");
                 goto err;
         }
 
         ctx->socket = socket;
 
         if ((ctx->ssl_ctx = SSL_CTX_new(SSLv23_client_method())) == NULL) {
-                ressl_set_error(ctx, "ssl context failure");
+                tls_set_error(ctx, "ssl context failure");
                 goto err;
         }
 
-        if (ressl_configure_ssl(ctx) != 0)
+        if (tls_configure_ssl(ctx) != 0)
                 goto err;
 
         if (ctx->config->verify_host) {
                 if (hostname == NULL) {
-                        ressl_set_error(ctx, "server name not specified");
+                        tls_set_error(ctx, "server name not specified");
                         goto err;
                 }
         }
@@ -154,7 +154,7 @@ ressl_connect_socket(struct ressl *ctx, int socket, const char *hostname)
 
                 if (SSL_CTX_load_verify_locations(ctx->ssl_ctx,
                     ctx->config->ca_file, ctx->config->ca_path) != 1) {
-                        ressl_set_error(ctx, "ssl verify setup failure");
+                        tls_set_error(ctx, "ssl verify setup failure");
                         goto err;
                 }
                 if (ctx->config->verify_depth >= 0)
@@ -163,11 +163,11 @@ ressl_connect_socket(struct ressl *ctx, int socket, const char *hostname)
         }
 
         if ((ctx->ssl_conn = SSL_new(ctx->ssl_ctx)) == NULL) {
-                ressl_set_error(ctx, "ssl connection failure");
+                tls_set_error(ctx, "ssl connection failure");
                 goto err;
         }
         if (SSL_set_fd(ctx->ssl_conn, ctx->socket) != 1) {
-                ressl_set_error(ctx, "ssl file descriptor failure");
+                tls_set_error(ctx, "ssl file descriptor failure");
                 goto err;
         }
 
@@ -179,13 +179,13 @@ ressl_connect_socket(struct ressl *ctx, int socket, const char *hostname)
             inet_pton(AF_INET, hostname, &addrbuf) != 1 &&
             inet_pton(AF_INET6, hostname, &addrbuf) != 1) {
                 if (SSL_set_tlsext_host_name(ctx->ssl_conn, hostname) == 0) {
-                        ressl_set_error(ctx, "SNI host name failed");
+                        tls_set_error(ctx, "SNI host name failed");
                         goto err;
                 }
         }
 
         if ((ret = SSL_connect(ctx->ssl_conn)) != 1) {
-                ressl_set_error(ctx, "SSL connect failed: %i",
+                tls_set_error(ctx, "SSL connect failed: %i",
                     SSL_get_error(ctx->ssl_conn, ret));
                 goto err;
         }
@@ -193,11 +193,11 @@ ressl_connect_socket(struct ressl *ctx, int socket, const char *hostname)
         if (ctx->config->verify_host) {
                 cert = SSL_get_peer_certificate(ctx->ssl_conn);
                 if (cert == NULL) {
-                        ressl_set_error(ctx, "no server certificate");
+                        tls_set_error(ctx, "no server certificate");
                         goto err;
                 }
-                if (ressl_check_hostname(cert, hostname) != 0) {
-                        ressl_set_error(ctx, "host `%s' not present in"
+                if (tls_check_hostname(cert, hostname) != 0) {
+                        tls_set_error(ctx, "host `%s' not present in"
                             " server certificate", hostname);
                         goto err;
                 }