diff options
Diffstat (limited to '')
-rw-r--r-- | src/lib/libressl/ressl_config.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/lib/libressl/ressl_config.c b/src/lib/libressl/ressl_config.c index 106527c109..c92886330e 100644 --- a/src/lib/libressl/ressl_config.c +++ b/src/lib/libressl/ressl_config.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ressl_config.c,v 1.11 2014/09/29 09:30:31 jsing Exp $ */ | 1 | /* $OpenBSD: ressl_config.c,v 1.12 2014/09/29 15:11:29 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> |
4 | * | 4 | * |
@@ -71,11 +71,13 @@ ressl_config_new(void) | |||
71 | ressl_config_free(config); | 71 | ressl_config_free(config); |
72 | return (NULL); | 72 | return (NULL); |
73 | } | 73 | } |
74 | ressl_config_verify(config); | 74 | ressl_config_set_protocols(config, RESSL_PROTOCOLS_DEFAULT); |
75 | ressl_config_set_verify_depth(config, 6); | 75 | ressl_config_set_verify_depth(config, 6); |
76 | /* ? use function ? */ | 76 | /* ? use function ? */ |
77 | config->ecdhcurve = NID_X9_62_prime256v1; | 77 | config->ecdhcurve = NID_X9_62_prime256v1; |
78 | 78 | ||
79 | ressl_config_verify(config); | ||
80 | |||
79 | return (config); | 81 | return (config); |
80 | } | 82 | } |
81 | 83 | ||
@@ -164,6 +166,12 @@ ressl_config_set_key_mem(struct ressl_config *config, const uint8_t *key, | |||
164 | } | 166 | } |
165 | 167 | ||
166 | void | 168 | void |
169 | ressl_config_set_protocols(struct ressl_config *config, uint32_t protocols) | ||
170 | { | ||
171 | config->protocols = protocols; | ||
172 | } | ||
173 | |||
174 | void | ||
167 | ressl_config_set_verify_depth(struct ressl_config *config, int verify_depth) | 175 | ressl_config_set_verify_depth(struct ressl_config *config, int verify_depth) |
168 | { | 176 | { |
169 | config->verify_depth = verify_depth; | 177 | config->verify_depth = verify_depth; |