diff options
Diffstat (limited to 'src/lib/libtls/tls_server.c')
-rw-r--r-- | src/lib/libtls/tls_server.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/libtls/tls_server.c b/src/lib/libtls/tls_server.c index 690af32eaf..bec9c0608f 100644 --- a/src/lib/libtls/tls_server.c +++ b/src/lib/libtls/tls_server.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: tls_server.c,v 1.22 2016/08/12 15:10:59 jsing Exp $ */ | 1 | /* $OpenBSD: tls_server.c,v 1.23 2016/08/15 14:04:23 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> |
4 | * | 4 | * |
@@ -73,15 +73,16 @@ tls_configure_server(struct tls *ctx) | |||
73 | goto err; | 73 | goto err; |
74 | } | 74 | } |
75 | 75 | ||
76 | if (tls_configure_ssl(ctx) != 0) | 76 | if (tls_configure_ssl(ctx, ctx->ssl_ctx) != 0) |
77 | goto err; | 77 | goto err; |
78 | if (tls_configure_keypair(ctx, ctx->ssl_ctx, ctx->config->keypair, 1) != 0) | 78 | if (tls_configure_ssl_keypair(ctx, ctx->ssl_ctx, |
79 | ctx->config->keypair, 1) != 0) | ||
79 | goto err; | 80 | goto err; |
80 | if (ctx->config->verify_client != 0) { | 81 | if (ctx->config->verify_client != 0) { |
81 | int verify = SSL_VERIFY_PEER; | 82 | int verify = SSL_VERIFY_PEER; |
82 | if (ctx->config->verify_client == 1) | 83 | if (ctx->config->verify_client == 1) |
83 | verify |= SSL_VERIFY_FAIL_IF_NO_PEER_CERT; | 84 | verify |= SSL_VERIFY_FAIL_IF_NO_PEER_CERT; |
84 | if (tls_configure_ssl_verify(ctx, verify) == -1) | 85 | if (tls_configure_ssl_verify(ctx, ctx->ssl_ctx, verify) == -1) |
85 | goto err; | 86 | goto err; |
86 | } | 87 | } |
87 | 88 | ||