summaryrefslogtreecommitdiff
path: root/src/lib/libtls/tls.h
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/lib/libtls/tls.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/libtls/tls.h b/src/lib/libtls/tls.h
index 1497319611..13df43f046 100644
--- a/src/lib/libtls/tls.h
+++ b/src/lib/libtls/tls.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls.h,v 1.32 2016/08/02 07:47:11 jsing Exp $ */ 1/* $OpenBSD: tls.h,v 1.33 2016/08/12 15:10:59 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
4 * 4 *
@@ -27,7 +27,7 @@ extern "C" {
27#include <stddef.h> 27#include <stddef.h>
28#include <stdint.h> 28#include <stdint.h>
29 29
30#define TLS_API 20160801 30#define TLS_API 20160812
31 31
32#define TLS_PROTOCOL_TLSv1_0 (1 << 1) 32#define TLS_PROTOCOL_TLSv1_0 (1 << 1)
33#define TLS_PROTOCOL_TLSv1_1 (1 << 2) 33#define TLS_PROTOCOL_TLSv1_1 (1 << 2)
@@ -52,6 +52,7 @@ const char *tls_error(struct tls *_ctx);
52struct tls_config *tls_config_new(void); 52struct tls_config *tls_config_new(void);
53void tls_config_free(struct tls_config *_config); 53void tls_config_free(struct tls_config *_config);
54 54
55int tls_config_set_alpn(struct tls_config *_config, const char *_alpn);
55int tls_config_set_ca_file(struct tls_config *_config, const char *_ca_file); 56int tls_config_set_ca_file(struct tls_config *_config, const char *_ca_file);
56int tls_config_set_ca_path(struct tls_config *_config, const char *_ca_path); 57int tls_config_set_ca_path(struct tls_config *_config, const char *_ca_path);
57int tls_config_set_ca_mem(struct tls_config *_config, const uint8_t *_ca, 58int tls_config_set_ca_mem(struct tls_config *_config, const uint8_t *_ca,
@@ -116,8 +117,9 @@ const char *tls_peer_cert_subject(struct tls *_ctx);
116time_t tls_peer_cert_notbefore(struct tls *_ctx); 117time_t tls_peer_cert_notbefore(struct tls *_ctx);
117time_t tls_peer_cert_notafter(struct tls *_ctx); 118time_t tls_peer_cert_notafter(struct tls *_ctx);
118 119
119const char *tls_conn_version(struct tls *_ctx); 120const char *tls_conn_alpn_selected(struct tls *_ctx);
120const char *tls_conn_cipher(struct tls *_ctx); 121const char *tls_conn_cipher(struct tls *_ctx);
122const char *tls_conn_version(struct tls *_ctx);
121 123
122uint8_t *tls_load_file(const char *_file, size_t *_len, char *_password); 124uint8_t *tls_load_file(const char *_file, size_t *_len, char *_password);
123 125