diff options
author | jsing <> | 2016-08-01 17:32:19 +0000 |
---|---|---|
committer | jsing <> | 2016-08-01 17:32:19 +0000 |
commit | b75dcc327d73d0f5f00f1367a7d98e3979ddbd9f (patch) | |
tree | e03f60ab444ada6f737a380e17e8eba68f90a817 /src/lib/libtls/tls.h | |
parent | a37dd8e8e7691f9cc5b065e47b95a2c75eb96512 (diff) | |
download | openbsd-b75dcc327d73d0f5f00f1367a7d98e3979ddbd9f.tar.gz openbsd-b75dcc327d73d0f5f00f1367a7d98e3979ddbd9f.tar.bz2 openbsd-b75dcc327d73d0f5f00f1367a7d98e3979ddbd9f.zip |
Add ALPN support to libtls.
ok beck@ doug@
Diffstat (limited to 'src/lib/libtls/tls.h')
-rw-r--r-- | src/lib/libtls/tls.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/libtls/tls.h b/src/lib/libtls/tls.h index 75c46c1a1a..a29030d8d9 100644 --- a/src/lib/libtls/tls.h +++ b/src/lib/libtls/tls.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: tls.h,v 1.29 2016/05/27 14:21:24 jsing Exp $ */ | 1 | /* $OpenBSD: tls.h,v 1.30 2016/08/01 17:32:19 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> |
4 | * | 4 | * |
@@ -52,6 +52,7 @@ const char *tls_error(struct tls *_ctx); | |||
52 | struct tls_config *tls_config_new(void); | 52 | struct tls_config *tls_config_new(void); |
53 | void tls_config_free(struct tls_config *_config); | 53 | void tls_config_free(struct tls_config *_config); |
54 | 54 | ||
55 | int tls_config_set_alpn(struct tls_config *_config, const char *_alpn); | ||
55 | int tls_config_set_ca_file(struct tls_config *_config, const char *_ca_file); | 56 | int tls_config_set_ca_file(struct tls_config *_config, const char *_ca_file); |
56 | int tls_config_set_ca_path(struct tls_config *_config, const char *_ca_path); | 57 | int tls_config_set_ca_path(struct tls_config *_config, const char *_ca_path); |
57 | int tls_config_set_ca_mem(struct tls_config *_config, const uint8_t *_ca, | 58 | int 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); | |||
116 | time_t tls_peer_cert_notbefore(struct tls *_ctx); | 117 | time_t tls_peer_cert_notbefore(struct tls *_ctx); |
117 | time_t tls_peer_cert_notafter(struct tls *_ctx); | 118 | time_t tls_peer_cert_notafter(struct tls *_ctx); |
118 | 119 | ||
119 | const char *tls_conn_version(struct tls *_ctx); | 120 | const char *tls_conn_alpn_selected(struct tls *_ctx); |
120 | const char *tls_conn_cipher(struct tls *_ctx); | 121 | const char *tls_conn_cipher(struct tls *_ctx); |
122 | const char *tls_conn_version(struct tls *_ctx); | ||
121 | 123 | ||
122 | uint8_t *tls_load_file(const char *_file, size_t *_len, char *_password); | 124 | uint8_t *tls_load_file(const char *_file, size_t *_len, char *_password); |
123 | 125 | ||