Rename the context allocation from ressl_new to ressl_client, which makes

it completely obvious what the context is for. Ensure client functions are
used on client contexts.

1 files changed, 23 insertions, 0 deletions

diff --git a/src/lib/libressl/ressl_client.c b/src/lib/libressl/ressl_client.c
index 2e4f253856..1d1ad72b86 100644
--- a/src/lib/libressl/ressl_client.c
+++ b/src/lib/libressl/ressl_client.c
@@ -28,6 +28,19 @@
 #include <ressl.h>
 #include "ressl_internal.h"
 
+struct ressl *
+ressl_client(void)
+{
+        struct ressl *ctx;
+
+        if ((ctx = ressl_new()) == NULL)
+                return (NULL);
+
+        ctx->flags |= RESSL_CLIENT;
+
+        return (ctx);
+}
+
 int
 ressl_connect(struct ressl *ctx, const char *host, const char *port)
 {
@@ -36,6 +49,11 @@ ressl_connect(struct ressl *ctx, const char *host, const char *port)
         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");
+                goto err;
+        }
+
         if (host == NULL) {
                 ressl_set_error(ctx, "host not specified");
                 goto err;
@@ -108,6 +126,11 @@ ressl_connect_socket(struct ressl *ctx, int socket, const char *hostname)
         X509 *cert = NULL;
         int ret;
 
+        if ((ctx->flags & RESSL_CLIENT) == 0) {
+                ressl_set_error(ctx, "not a client context");
+                goto err;
+        }
+
         ctx->socket = socket;
 
         /* XXX - add a configuration option to control versions. */