diff options
Diffstat (limited to 'src/lib/libtls/tls_internal.h')
-rw-r--r-- | src/lib/libtls/tls_internal.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/libtls/tls_internal.h b/src/lib/libtls/tls_internal.h index fbb139c84a..b1d53c8fa3 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.53 2017/01/29 17:52:11 beck Exp $ */ | 1 | /* $OpenBSD: tls_internal.h,v 1.54 2017/04/05 03:13:53 beck 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> |
@@ -53,6 +53,7 @@ struct tls_keypair { | |||
53 | size_t key_len; | 53 | size_t key_len; |
54 | char *ocsp_staple; | 54 | char *ocsp_staple; |
55 | size_t ocsp_staple_len; | 55 | size_t ocsp_staple_len; |
56 | char *cert_hash; | ||
56 | }; | 57 | }; |
57 | 58 | ||
58 | #define TLS_MIN_SESSION_TIMEOUT (4) | 59 | #define TLS_MIN_SESSION_TIMEOUT (4) |
@@ -96,6 +97,7 @@ struct tls_config { | |||
96 | int verify_depth; | 97 | int verify_depth; |
97 | int verify_name; | 98 | int verify_name; |
98 | int verify_time; | 99 | int verify_time; |
100 | int skip_private_key_check; | ||
99 | }; | 101 | }; |
100 | 102 | ||
101 | struct tls_conninfo { | 103 | struct tls_conninfo { |
@@ -232,6 +234,9 @@ int tls_ocsp_verify_cb(SSL *ssl, void *arg); | |||
232 | int tls_ocsp_stapling_cb(SSL *ssl, void *arg); | 234 | int tls_ocsp_stapling_cb(SSL *ssl, void *arg); |
233 | void tls_ocsp_free(struct tls_ocsp *ctx); | 235 | void tls_ocsp_free(struct tls_ocsp *ctx); |
234 | struct tls_ocsp *tls_ocsp_setup_from_peer(struct tls *ctx); | 236 | struct tls_ocsp *tls_ocsp_setup_from_peer(struct tls *ctx); |
237 | int tls_hex_string(const unsigned char *_in, size_t _inlen, char **_out, | ||
238 | size_t *_outlen); | ||
239 | int tls_cert_hash(X509 *_cert, char **_hash); | ||
235 | 240 | ||
236 | __END_HIDDEN_DECLS | 241 | __END_HIDDEN_DECLS |
237 | 242 | ||