diff options
Diffstat (limited to 'src/lib/libtls/tls_config.c')
-rw-r--r-- | src/lib/libtls/tls_config.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/lib/libtls/tls_config.c b/src/lib/libtls/tls_config.c index 3ac674e597..5bc671fc99 100644 --- a/src/lib/libtls/tls_config.c +++ b/src/lib/libtls/tls_config.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: tls_config.c,v 1.32 2016/11/05 15:13:26 beck Exp $ */ | 1 | /* $OpenBSD: tls_config.c,v 1.33 2016/11/11 14:02:24 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> |
4 | * | 4 | * |
@@ -194,8 +194,10 @@ tls_config_new(void) | |||
194 | if (tls_config_set_ciphers(config, "secure") != 0) | 194 | if (tls_config_set_ciphers(config, "secure") != 0) |
195 | goto err; | 195 | goto err; |
196 | 196 | ||
197 | tls_config_set_protocols(config, TLS_PROTOCOLS_DEFAULT); | 197 | if (tls_config_set_protocols(config, TLS_PROTOCOLS_DEFAULT) != 0) |
198 | tls_config_set_verify_depth(config, 6); | 198 | goto err; |
199 | if (tls_config_set_verify_depth(config, 6) != 0) | ||
200 | goto err; | ||
199 | 201 | ||
200 | tls_config_prefer_ciphers_server(config); | 202 | tls_config_prefer_ciphers_server(config); |
201 | 203 | ||
@@ -575,16 +577,20 @@ tls_config_set_keypair_mem(struct tls_config *config, const uint8_t *cert, | |||
575 | return (0); | 577 | return (0); |
576 | } | 578 | } |
577 | 579 | ||
578 | void | 580 | int |
579 | tls_config_set_protocols(struct tls_config *config, uint32_t protocols) | 581 | tls_config_set_protocols(struct tls_config *config, uint32_t protocols) |
580 | { | 582 | { |
581 | config->protocols = protocols; | 583 | config->protocols = protocols; |
584 | |||
585 | return (0); | ||
582 | } | 586 | } |
583 | 587 | ||
584 | void | 588 | int |
585 | tls_config_set_verify_depth(struct tls_config *config, int verify_depth) | 589 | tls_config_set_verify_depth(struct tls_config *config, int verify_depth) |
586 | { | 590 | { |
587 | config->verify_depth = verify_depth; | 591 | config->verify_depth = verify_depth; |
592 | |||
593 | return (0); | ||
588 | } | 594 | } |
589 | 595 | ||
590 | void | 596 | void |