diff options
author | jsing <> | 2014-09-29 15:11:29 +0000 |
---|---|---|
committer | jsing <> | 2014-09-29 15:11:29 +0000 |
commit | 0211c1396ff6d4dc401cabef56c2af3202f043f9 (patch) | |
tree | 50bbaa9e38aefb427b0f0162ccd9eefee6d46b85 /src/lib/libressl/ressl_internal.h | |
parent | c9beabec633f1cc45215bc550b7370c475785a2b (diff) | |
download | openbsd-0211c1396ff6d4dc401cabef56c2af3202f043f9.tar.gz openbsd-0211c1396ff6d4dc401cabef56c2af3202f043f9.tar.bz2 openbsd-0211c1396ff6d4dc401cabef56c2af3202f043f9.zip |
Add an option that allows the enabled SSL protocols to be explicitly
configured.
Discussed with several.
ok bcook@
Diffstat (limited to 'src/lib/libressl/ressl_internal.h')
-rw-r--r-- | src/lib/libressl/ressl_internal.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/libressl/ressl_internal.h b/src/lib/libressl/ressl_internal.h index 02dded3e7e..f37b5718d9 100644 --- a/src/lib/libressl/ressl_internal.h +++ b/src/lib/libressl/ressl_internal.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ressl_internal.h,v 1.10 2014/08/27 10:46:53 reyk Exp $ */ | 1 | /* $OpenBSD: ressl_internal.h,v 1.11 2014/09/29 15:11:29 jsing 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> |
@@ -36,6 +36,7 @@ struct ressl_config { | |||
36 | const char *key_file; | 36 | const char *key_file; |
37 | char *key_mem; | 37 | char *key_mem; |
38 | size_t key_len; | 38 | size_t key_len; |
39 | uint32_t protocols; | ||
39 | int verify; | 40 | int verify; |
40 | int verify_depth; | 41 | int verify_depth; |
41 | }; | 42 | }; |
@@ -63,6 +64,7 @@ struct ressl *ressl_server_conn(struct ressl *ctx); | |||
63 | int ressl_check_hostname(X509 *cert, const char *host); | 64 | int ressl_check_hostname(X509 *cert, const char *host); |
64 | int ressl_configure_keypair(struct ressl *ctx); | 65 | int ressl_configure_keypair(struct ressl *ctx); |
65 | int ressl_configure_server(struct ressl *ctx); | 66 | int ressl_configure_server(struct ressl *ctx); |
67 | int ressl_configure_ssl(struct ressl *ctx); | ||
66 | int ressl_host_port(const char *hostport, char **host, char **port); | 68 | int ressl_host_port(const char *hostport, char **host, char **port); |
67 | int ressl_set_error(struct ressl *ctx, char *fmt, ...); | 69 | int ressl_set_error(struct ressl *ctx, char *fmt, ...); |
68 | 70 | ||