diff options
author | jsing <> | 2016-08-02 07:47:11 +0000 |
---|---|---|
committer | jsing <> | 2016-08-02 07:47:11 +0000 |
commit | cce7b68820089fd3e362dbb39f91e53db9de4978 (patch) | |
tree | 1d5b4f201a3bc844f8bc86fcc6d120b238b50589 /src/lib/libtls/tls.h | |
parent | ec3f08a327189e61af9974a68fb0cd07fec485a8 (diff) | |
download | openbsd-cce7b68820089fd3e362dbb39f91e53db9de4978.tar.gz openbsd-cce7b68820089fd3e362dbb39f91e53db9de4978.tar.bz2 openbsd-cce7b68820089fd3e362dbb39f91e53db9de4978.zip |
Revert previous since it adds new symbols.
Requested by deraadt@
Diffstat (limited to 'src/lib/libtls/tls.h')
-rw-r--r-- | src/lib/libtls/tls.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/lib/libtls/tls.h b/src/lib/libtls/tls.h index e518623a71..1497319611 100644 --- a/src/lib/libtls/tls.h +++ b/src/lib/libtls/tls.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: tls.h,v 1.31 2016/08/01 17:40:23 jsing Exp $ */ | 1 | /* $OpenBSD: tls.h,v 1.32 2016/08/02 07:47:11 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,7 +52,6 @@ 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); | ||
56 | int tls_config_set_ca_file(struct tls_config *_config, const char *_ca_file); | 55 | int tls_config_set_ca_file(struct tls_config *_config, const char *_ca_file); |
57 | int tls_config_set_ca_path(struct tls_config *_config, const char *_ca_path); | 56 | int tls_config_set_ca_path(struct tls_config *_config, const char *_ca_path); |
58 | int tls_config_set_ca_mem(struct tls_config *_config, const uint8_t *_ca, | 57 | int tls_config_set_ca_mem(struct tls_config *_config, const uint8_t *_ca, |
@@ -117,9 +116,8 @@ const char *tls_peer_cert_subject(struct tls *_ctx); | |||
117 | time_t tls_peer_cert_notbefore(struct tls *_ctx); | 116 | time_t tls_peer_cert_notbefore(struct tls *_ctx); |
118 | time_t tls_peer_cert_notafter(struct tls *_ctx); | 117 | time_t tls_peer_cert_notafter(struct tls *_ctx); |
119 | 118 | ||
120 | const char *tls_conn_alpn_selected(struct tls *_ctx); | ||
121 | const char *tls_conn_cipher(struct tls *_ctx); | ||
122 | const char *tls_conn_version(struct tls *_ctx); | 119 | const char *tls_conn_version(struct tls *_ctx); |
120 | const char *tls_conn_cipher(struct tls *_ctx); | ||
123 | 121 | ||
124 | uint8_t *tls_load_file(const char *_file, size_t *_len, char *_password); | 122 | uint8_t *tls_load_file(const char *_file, size_t *_len, char *_password); |
125 | 123 | ||