diff options
Diffstat (limited to 'src/lib/libtls/tls.h')
-rw-r--r-- | src/lib/libtls/tls.h | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/lib/libtls/tls.h b/src/lib/libtls/tls.h index 5680c74182..d9b2972e92 100644 --- a/src/lib/libtls/tls.h +++ b/src/lib/libtls/tls.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: tls.h,v 1.46 2017/01/26 12:53:17 jsing Exp $ */ | 1 | /* $OpenBSD: tls.h,v 1.47 2017/01/31 16:18:57 beck Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> |
4 | * | 4 | * |
@@ -89,7 +89,12 @@ int tls_config_add_keypair_file(struct tls_config *_config, | |||
89 | const char *_cert_file, const char *_key_file); | 89 | const char *_cert_file, const char *_key_file); |
90 | int tls_config_add_keypair_mem(struct tls_config *_config, const uint8_t *_cert, | 90 | int tls_config_add_keypair_mem(struct tls_config *_config, const uint8_t *_cert, |
91 | size_t _cert_len, const uint8_t *_key, size_t _key_len); | 91 | size_t _cert_len, const uint8_t *_key, size_t _key_len); |
92 | 92 | int tls_config_add_keypair_ocsp_file(struct tls_config *_config, | |
93 | const char *_cert_file, const char *_key_file, | ||
94 | const char *_ocsp_staple_file); | ||
95 | int tls_config_add_keypair_ocsp_mem(struct tls_config *_config, const uint8_t *_cert, | ||
96 | size_t _cert_len, const uint8_t *_key, size_t _key_len, | ||
97 | const uint8_t *_staple, size_t _staple_len); | ||
93 | int tls_config_set_alpn(struct tls_config *_config, const char *_alpn); | 98 | int tls_config_set_alpn(struct tls_config *_config, const char *_alpn); |
94 | int tls_config_set_ca_file(struct tls_config *_config, const char *_ca_file); | 99 | int tls_config_set_ca_file(struct tls_config *_config, const char *_ca_file); |
95 | int tls_config_set_ca_path(struct tls_config *_config, const char *_ca_path); | 100 | int tls_config_set_ca_path(struct tls_config *_config, const char *_ca_path); |
@@ -109,8 +114,13 @@ int tls_config_set_keypair_file(struct tls_config *_config, | |||
109 | const char *_cert_file, const char *_key_file); | 114 | const char *_cert_file, const char *_key_file); |
110 | int tls_config_set_keypair_mem(struct tls_config *_config, const uint8_t *_cert, | 115 | int tls_config_set_keypair_mem(struct tls_config *_config, const uint8_t *_cert, |
111 | size_t _cert_len, const uint8_t *_key, size_t _key_len); | 116 | size_t _cert_len, const uint8_t *_key, size_t _key_len); |
112 | int tls_config_set_ocsp_staple_mem(struct tls_config *_config, char *_staple, | 117 | int tls_config_set_keypair_ocsp_file(struct tls_config *_config, |
113 | size_t _len); | 118 | const char *_cert_file, const char *_key_file, const char *_staple_file); |
119 | int tls_config_set_keypair_ocsp_mem(struct tls_config *_config, const uint8_t *_cert, | ||
120 | size_t _cert_len, const uint8_t *_key, size_t _key_len, | ||
121 | const uint8_t *_staple, size_t staple_len); | ||
122 | int tls_config_set_ocsp_staple_mem(struct tls_config *_config, | ||
123 | const uint8_t *_staple, size_t _len); | ||
114 | int tls_config_set_ocsp_staple_file(struct tls_config *_config, | 124 | int tls_config_set_ocsp_staple_file(struct tls_config *_config, |
115 | const char *_staple_file); | 125 | const char *_staple_file); |
116 | int tls_config_set_protocols(struct tls_config *_config, uint32_t _protocols); | 126 | int tls_config_set_protocols(struct tls_config *_config, uint32_t _protocols); |