From a15c3361737a98d1132a6c219f6d65fff4d27bea Mon Sep 17 00:00:00 2001 From: jsing Date: Sun, 13 Jul 2014 23:36:24 +0000 Subject: [PATCH] Add stubs for the proposed server API. --- lib/libressl/Makefile | 3 +- lib/libressl/ressl.h | 4 +++ lib/libressl/ressl_server.c | 66 +++++++++++++++++++++++++++++++++++++ 3 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 lib/libressl/ressl_server.c diff --git a/lib/libressl/Makefile b/lib/libressl/Makefile index 397fefdf694..0a481f00092 100644 --- a/lib/libressl/Makefile +++ b/lib/libressl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2014/07/13 22:42:01 jsing Exp $ +# $OpenBSD: Makefile,v 1.4 2014/07/13 23:36:24 jsing Exp $ CFLAGS+= -Wall -Werror -Wimplicit CFLAGS+= -DLIBRESSL_INTERNAL @@ -12,6 +12,7 @@ HDRS= ressl.h SRCS= ressl.c \ ressl_client.c \ ressl_config.c \ + ressl_server.c \ ressl_util.c \ ressl_verify.c diff --git a/lib/libressl/ressl.h b/lib/libressl/ressl.h index e7e0a9c51b0..dc99368fe67 100644 --- a/lib/libressl/ressl.h +++ b/lib/libressl/ressl.h @@ -37,12 +37,16 @@ void ressl_config_insecure_no_verify(struct ressl_config *config); void ressl_config_verify(struct ressl_config *config); struct ressl *ressl_client(void); +struct ressl *ressl_server(void); int ressl_configure(struct ressl *ctx, struct ressl_config *config); void ressl_reset(struct ressl *ctx); void ressl_free(struct ressl *ctx); +int ressl_accept(struct ressl *ctx); +int ressl_accept_socket(struct ressl *ctx, int socket); int ressl_connect(struct ressl *ctx, const char *host, const char *port); int ressl_connect_socket(struct ressl *ctx, int s, const char *hostname); +int ressl_listen(struct ressl *ctx, const char *host, const char *port, int af); int ressl_read(struct ressl *ctx, char *buf, size_t buflen, size_t *outlen); int ressl_write(struct ressl *ctx, const char *buf, size_t buflen, size_t *outlen); diff --git a/lib/libressl/ressl_server.c b/lib/libressl/ressl_server.c new file mode 100644 index 00000000000..243b4bfb09a --- /dev/null +++ b/lib/libressl/ressl_server.c @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2014 Joel Sing + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include "ressl_internal.h" + +struct ressl * +ressl_server(void) +{ + struct ressl *ctx; + + if ((ctx = ressl_new()) == NULL) + return (NULL); + + ctx->flags |= RESSL_SERVER; + + return (ctx); +} + +int +ressl_listen(struct ressl *ctx, const char *host, const char *port, int af) +{ + if ((ctx->flags & RESSL_SERVER) == 0) { + ressl_set_error(ctx, "not a server context"); + goto err; + } + +err: + return (1); +} + +int +ressl_accept(struct ressl *ctx) +{ + if ((ctx->flags & RESSL_SERVER) == 0) { + ressl_set_error(ctx, "not a server context"); + goto err; + } + +err: + return (1); +} + +int +ressl_accept_socket(struct ressl *ctx, int socket) +{ + if ((ctx->flags & RESSL_SERVER) == 0) { + ressl_set_error(ctx, "not a server context"); + goto err; + } + +err: + return (1); +} -- 2.20.1