From fd6b5d213678982bef290a75d1695b1e292e1d6e Mon Sep 17 00:00:00 2001 From: jsing Date: Sun, 13 Jul 2014 22:13:52 +0000 Subject: [PATCH] Use a single ressl.h header file. Discussed with beck@ and tedu@. --- lib/libressl/Makefile | 10 ++++------ lib/libressl/ressl.c | 3 +-- lib/libressl/ressl.h | 14 ++++++++++++-- lib/libressl/ressl_config.c | 3 +-- lib/libressl/ressl_config.h | 33 --------------------------------- 5 files changed, 18 insertions(+), 45 deletions(-) delete mode 100644 lib/libressl/ressl_config.h diff --git a/lib/libressl/Makefile b/lib/libressl/Makefile index c6f4328b797..167379edff9 100644 --- a/lib/libressl/Makefile +++ b/lib/libressl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1 2014/07/12 01:20:24 jsing Exp $ +# $OpenBSD: Makefile,v 1.2 2014/07/13 22:13:52 jsing Exp $ CFLAGS+= -Wall -Werror -Wimplicit CFLAGS+= -DLIBRESSL_INTERNAL @@ -7,7 +7,7 @@ LIB= ressl DPADD= ${LIBCRYPTO} ${LIBSSL} -HDRS= ressl.h ressl_config.h +HDRS= ressl.h SRCS= ressl.c \ ressl_config.c \ @@ -15,12 +15,10 @@ SRCS= ressl.c \ ressl_verify.c includes: - @test -d ${DESTDIR}/usr/include/ressl || \ - mkdir ${DESTDIR}/usr/include/ressl @cd ${.CURDIR}; for i in $(HDRS); do \ - j="cmp -s $$i ${DESTDIR}/usr/include/ressl/$$i || \ + j="cmp -s $$i ${DESTDIR}/usr/include/$$i || \ ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 $$i\ - ${DESTDIR}/usr/include/ressl"; \ + ${DESTDIR}/usr/include/"; \ echo $$j; \ eval "$$j"; \ done; diff --git a/lib/libressl/ressl.c b/lib/libressl/ressl.c index 21b7c0ead04..7295c520d26 100644 --- a/lib/libressl/ressl.c +++ b/lib/libressl/ressl.c @@ -26,8 +26,7 @@ #include -#include - +#include #include "ressl_internal.h" extern struct ressl_config ressl_config_default; diff --git a/lib/libressl/ressl.h b/lib/libressl/ressl.h index 5217a69c155..d044cd4fdc1 100644 --- a/lib/libressl/ressl.h +++ b/lib/libressl/ressl.h @@ -17,14 +17,24 @@ #ifndef HEADER_RESSL_H #define HEADER_RESSL_H -#include - struct ressl; +struct ressl_config; int ressl_init(void); const char *ressl_error(struct ressl *ctx); +struct ressl_config *ressl_config_new(void); +void ressl_config_free(struct ressl_config *config); + +void ressl_config_ca_file(struct ressl_config *config, char *ca_file); +void ressl_config_ca_path(struct ressl_config *config, char *ca_path); +void ressl_config_ciphers(struct ressl_config *config, char *ciphers); +void ressl_config_verify_depth(struct ressl_config *config, int verify_depth); + +void ressl_config_insecure(struct ressl_config *config); +void ressl_config_secure(struct ressl_config *config); + struct ressl *ressl_new(struct ressl_config *config); void ressl_reset(struct ressl *ctx); void ressl_free(struct ressl *ctx); diff --git a/lib/libressl/ressl_config.c b/lib/libressl/ressl_config.c index a84de591bc1..3932b96addd 100644 --- a/lib/libressl/ressl_config.c +++ b/lib/libressl/ressl_config.c @@ -17,8 +17,7 @@ #include #include -#include - +#include #include "ressl_internal.h" /* diff --git a/lib/libressl/ressl_config.h b/lib/libressl/ressl_config.h deleted file mode 100644 index da13d91efab..00000000000 --- a/lib/libressl/ressl_config.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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. - */ - -#ifndef HEADER_RESSL_CONFIG_H -#define HEADER_RESSL_CONFIG_H - -struct ressl_config; - -struct ressl_config *ressl_config_new(void); -void ressl_config_free(struct ressl_config *config); - -void ressl_config_ca_file(struct ressl_config *config, char *ca_file); -void ressl_config_ca_path(struct ressl_config *config, char *ca_path); -void ressl_config_ciphers(struct ressl_config *config, char *ciphers); -void ressl_config_verify_depth(struct ressl_config *config, int verify_depth); - -void ressl_config_insecure(struct ressl_config *config); -void ressl_config_secure(struct ressl_config *config); - -#endif /* HEADER_RESSL_H */ -- 2.20.1