diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libressl/Makefile | 30 | ||||
| -rw-r--r-- | src/lib/libressl/ressl_init.3 | 17 |
2 files changed, 33 insertions, 14 deletions
diff --git a/src/lib/libressl/Makefile b/src/lib/libressl/Makefile index 0a481f0009..f21c0474ed 100644 --- a/src/lib/libressl/Makefile +++ b/src/lib/libressl/Makefile | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # $OpenBSD: Makefile,v 1.4 2014/07/13 23:36:24 jsing Exp $ | 1 | # $OpenBSD: Makefile,v 1.5 2014/10/08 19:01:40 tedu Exp $ |
| 2 | 2 | ||
| 3 | CFLAGS+= -Wall -Werror -Wimplicit | 3 | CFLAGS+= -Wall -Werror -Wimplicit |
| 4 | CFLAGS+= -DLIBRESSL_INTERNAL | 4 | CFLAGS+= -DLIBRESSL_INTERNAL |
| @@ -16,6 +16,34 @@ SRCS= ressl.c \ | |||
| 16 | ressl_util.c \ | 16 | ressl_util.c \ |
| 17 | ressl_verify.c | 17 | ressl_verify.c |
| 18 | 18 | ||
| 19 | MAN= ressl_init.3 | ||
| 20 | |||
| 21 | MLINKS+=ressl_init.3 ressl_error.3 | ||
| 22 | MLINKS+=ressl_init.3 ressl_config_new.3 | ||
| 23 | MLINKS+=ressl_init.3 ressl_config_free.3 | ||
| 24 | MLINKS+=ressl_init.3 ressl_set_ca_file.3 | ||
| 25 | MLINKS+=ressl_init.3 ressl_set_ca_path.3 | ||
| 26 | MLINKS+=ressl_init.3 ressl_set_cert_file.3 | ||
| 27 | MLINKS+=ressl_init.3 ressl_set_cert_mem.3 | ||
| 28 | MLINKS+=ressl_init.3 ressl_set_ciphers.3 | ||
| 29 | MLINKS+=ressl_init.3 ressl_set_ecdhcurve.3 | ||
| 30 | MLINKS+=ressl_init.3 ressl_set_key_file.3 | ||
| 31 | MLINKS+=ressl_init.3 ressl_set_key_mem.3 | ||
| 32 | MLINKS+=ressl_init.3 ressl_set_protocols.3 | ||
| 33 | MLINKS+=ressl_init.3 ressl_set_verify_depth.3 | ||
| 34 | MLINKS+=ressl_init.3 ressl_clear_keys.3 | ||
| 35 | MLINKS+=ressl_init.3 ressl_insecure_noverifyhost.3 | ||
| 36 | MLINKS+=ressl_init.3 ressl_insecure_noverifycert.3 | ||
| 37 | MLINKS+=ressl_init.3 ressl_verify.3 | ||
| 38 | MLINKS+=ressl_init.3 ressl_configure.3 | ||
| 39 | MLINKS+=ressl_init.3 ressl_reset.3 | ||
| 40 | MLINKS+=ressl_init.3 ressl_free.3 | ||
| 41 | MLINKS+=ressl_init.3 ressl_close.3 | ||
| 42 | MLINKS+=ressl_init.3 ressl_connect.3 | ||
| 43 | MLINKS+=ressl_init.3 ressl_connect_socket.3 | ||
| 44 | MLINKS+=ressl_init.3 ressl_read.3 | ||
| 45 | MLINKS+=ressl_init.3 ressl_write.3 | ||
| 46 | |||
| 19 | includes: | 47 | includes: |
| 20 | @cd ${.CURDIR}; for i in $(HDRS); do \ | 48 | @cd ${.CURDIR}; for i in $(HDRS); do \ |
| 21 | j="cmp -s $$i ${DESTDIR}/usr/include/$$i || \ | 49 | j="cmp -s $$i ${DESTDIR}/usr/include/$$i || \ |
diff --git a/src/lib/libressl/ressl_init.3 b/src/lib/libressl/ressl_init.3 index 82bedd573f..fdc5801940 100644 --- a/src/lib/libressl/ressl_init.3 +++ b/src/lib/libressl/ressl_init.3 | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | .\" $OpenBSD: ressl_init.3,v 1.2 2014/10/08 16:17:01 tedu Exp $ | 1 | .\" $OpenBSD: ressl_init.3,v 1.3 2014/10/08 19:01:40 tedu Exp $ |
| 2 | .\" | 2 | .\" |
| 3 | .\" Copyright (c) 2014 Ted Unangst <tedu@openbsd.org> | 3 | .\" Copyright (c) 2014 Ted Unangst <tedu@openbsd.org> |
| 4 | .\" All rights reserved. | 4 | .\" All rights reserved. |
| @@ -49,15 +49,12 @@ | |||
| 49 | .Nm ressl_server , | 49 | .Nm ressl_server , |
| 50 | .Nm ressl_configure , | 50 | .Nm ressl_configure , |
| 51 | .Nm ressl_reset , | 51 | .Nm ressl_reset , |
| 52 | .Nm ressl_close , | ||
| 52 | .Nm ressl_free , | 53 | .Nm ressl_free , |
| 53 | .Nm ressl_accept , | ||
| 54 | .Nm ressl_accept_socket , | ||
| 55 | .Nm ressl_connect , | 54 | .Nm ressl_connect , |
| 56 | .Nm ressl_connect_socket , | 55 | .Nm ressl_connect_socket , |
| 57 | .Nm ressl_listen , | ||
| 58 | .Nm ressl_read , | 56 | .Nm ressl_read , |
| 59 | .Nm ressl_write , | 57 | .Nm ressl_write , |
| 60 | .Nm ressl_close | ||
| 61 | .Nd ressl TLS client and server API | 58 | .Nd ressl TLS client and server API |
| 62 | .Sh SYNOPSIS | 59 | .Sh SYNOPSIS |
| 63 | .In ressl.h | 60 | .In ressl.h |
| @@ -105,24 +102,18 @@ | |||
| 105 | .Fn ressl_configure "struct ressl *ctx" "struct ressl_config *config" | 102 | .Fn ressl_configure "struct ressl *ctx" "struct ressl_config *config" |
| 106 | .Ft "void" | 103 | .Ft "void" |
| 107 | .Fn ressl_reset "struct ressl *ctx" | 104 | .Fn ressl_reset "struct ressl *ctx" |
| 105 | .Ft "int" | ||
| 106 | .Fn ressl_close "struct ressl *ctx" | ||
| 108 | .Ft "void" | 107 | .Ft "void" |
| 109 | .Fn ressl_free "struct ressl *ctx" | 108 | .Fn ressl_free "struct ressl *ctx" |
| 110 | .Ft "int" | 109 | .Ft "int" |
| 111 | .Fn ressl_accept "struct ressl *ctx" "struct ressl **cctx" | ||
| 112 | .Ft "int" | ||
| 113 | .Fn ressl_accept_socket "struct ressl *ctx" "struct ressl **cctx" "int socket" | ||
| 114 | .Ft "int" | ||
| 115 | .Fn ressl_connect "struct ressl *ctx" "const char *host" "const char *port" | 110 | .Fn ressl_connect "struct ressl *ctx" "const char *host" "const char *port" |
| 116 | .Ft "int" | 111 | .Ft "int" |
| 117 | .Fn ressl_connect_socket "struct ressl *ctx" "int s" "const char *hostname" | 112 | .Fn ressl_connect_socket "struct ressl *ctx" "int s" "const char *hostname" |
| 118 | .Ft "int" | 113 | .Ft "int" |
| 119 | .Fn ressl_listen "struct ressl *ctx" "const char *host" "const char *port" "int af" | ||
| 120 | .Ft "int" | ||
| 121 | .Fn ressl_read "struct ressl *ctx" "void *buf" "size_t buflen" "size_t *outlen" | 114 | .Fn ressl_read "struct ressl *ctx" "void *buf" "size_t buflen" "size_t *outlen" |
| 122 | .Ft "int" | 115 | .Ft "int" |
| 123 | .Fn ressl_write "struct ressl *ctx" "const void *buf" "size_t buflen" | 116 | .Fn ressl_write "struct ressl *ctx" "const void *buf" "size_t buflen" |
| 124 | .Ft "int" | ||
| 125 | .Fn ressl_close "struct ressl *ctx" | ||
| 126 | .Sh DESCRIPTION | 117 | .Sh DESCRIPTION |
| 127 | The | 118 | The |
| 128 | .Lb ressl | 119 | .Lb ressl |
