diff options
Diffstat (limited to '')
-rw-r--r-- | src/lib/libtls/tls_internal.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/libtls/tls_internal.h b/src/lib/libtls/tls_internal.h index 1ef95adb08..fa972bbadf 100644 --- a/src/lib/libtls/tls_internal.h +++ b/src/lib/libtls/tls_internal.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: tls_internal.h,v 1.35 2016/08/12 15:10:59 jsing Exp $ */ | 1 | /* $OpenBSD: tls_internal.h,v 1.36 2016/08/13 13:05:51 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2014 Jeremie Courreges-Anglas <jca@openbsd.org> | 3 | * Copyright (c) 2014 Jeremie Courreges-Anglas <jca@openbsd.org> |
4 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> | 4 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> |
@@ -44,10 +44,8 @@ struct tls_error { | |||
44 | struct tls_keypair { | 44 | struct tls_keypair { |
45 | struct tls_keypair *next; | 45 | struct tls_keypair *next; |
46 | 46 | ||
47 | const char *cert_file; | ||
48 | char *cert_mem; | 47 | char *cert_mem; |
49 | size_t cert_len; | 48 | size_t cert_len; |
50 | const char *key_file; | ||
51 | char *key_mem; | 49 | char *key_mem; |
52 | size_t key_len; | 50 | size_t key_len; |
53 | }; | 51 | }; |
@@ -57,7 +55,6 @@ struct tls_config { | |||
57 | 55 | ||
58 | char *alpn; | 56 | char *alpn; |
59 | size_t alpn_len; | 57 | size_t alpn_len; |
60 | const char *ca_file; | ||
61 | const char *ca_path; | 58 | const char *ca_path; |
62 | char *ca_mem; | 59 | char *ca_mem; |
63 | size_t ca_len; | 60 | size_t ca_len; |
@@ -120,8 +117,12 @@ int tls_configure_keypair(struct tls *ctx, SSL_CTX *ssl_ctx, | |||
120 | int tls_configure_server(struct tls *ctx); | 117 | int tls_configure_server(struct tls *ctx); |
121 | int tls_configure_ssl(struct tls *ctx); | 118 | int tls_configure_ssl(struct tls *ctx); |
122 | int tls_configure_ssl_verify(struct tls *ctx, int verify); | 119 | int tls_configure_ssl_verify(struct tls *ctx, int verify); |
120 | |||
123 | int tls_handshake_client(struct tls *ctx); | 121 | int tls_handshake_client(struct tls *ctx); |
124 | int tls_handshake_server(struct tls *ctx); | 122 | int tls_handshake_server(struct tls *ctx); |
123 | |||
124 | int tls_config_load_file(struct tls_error *error, const char *filetype, | ||
125 | const char *filename, char **buf, size_t *len); | ||
125 | int tls_host_port(const char *hostport, char **host, char **port); | 126 | int tls_host_port(const char *hostport, char **host, char **port); |
126 | 127 | ||
127 | int tls_error_set(struct tls_error *error, const char *fmt, ...) | 128 | int tls_error_set(struct tls_error *error, const char *fmt, ...) |