summaryrefslogtreecommitdiff
path: root/src/lib/libtls/tls.c
diff options
context:
space:
mode:
authorjsing <>2016-08-02 07:47:11 +0000
committerjsing <>2016-08-02 07:47:11 +0000
commitcce7b68820089fd3e362dbb39f91e53db9de4978 (patch)
tree1d5b4f201a3bc844f8bc86fcc6d120b238b50589 /src/lib/libtls/tls.c
parentec3f08a327189e61af9974a68fb0cd07fec485a8 (diff)
downloadopenbsd-cce7b68820089fd3e362dbb39f91e53db9de4978.tar.gz
openbsd-cce7b68820089fd3e362dbb39f91e53db9de4978.tar.bz2
openbsd-cce7b68820089fd3e362dbb39f91e53db9de4978.zip
Revert previous since it adds new symbols.
Requested by deraadt@
Diffstat (limited to 'src/lib/libtls/tls.c')
-rw-r--r--src/lib/libtls/tls.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/lib/libtls/tls.c b/src/lib/libtls/tls.c
index 2584ceb88b..ddf847d390 100644
--- a/src/lib/libtls/tls.c
+++ b/src/lib/libtls/tls.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls.c,v 1.42 2016/08/01 17:32:19 jsing Exp $ */ 1/* $OpenBSD: tls.c,v 1.43 2016/08/02 07:47:11 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
4 * 4 *
@@ -310,14 +310,6 @@ tls_configure_ssl(struct tls *ctx)
310 if ((ctx->config->protocols & TLS_PROTOCOL_TLSv1_2) == 0) 310 if ((ctx->config->protocols & TLS_PROTOCOL_TLSv1_2) == 0)
311 SSL_CTX_set_options(ctx->ssl_ctx, SSL_OP_NO_TLSv1_2); 311 SSL_CTX_set_options(ctx->ssl_ctx, SSL_OP_NO_TLSv1_2);
312 312
313 if (ctx->config->alpn != NULL) {
314 if (SSL_CTX_set_alpn_protos(ctx->ssl_ctx, ctx->config->alpn,
315 ctx->config->alpn_len) != 0) {
316 tls_set_errorx(ctx, "failed to set alpn");
317 goto err;
318 }
319 }
320
321 if (ctx->config->ciphers != NULL) { 313 if (ctx->config->ciphers != NULL) {
322 if (SSL_CTX_set_cipher_list(ctx->ssl_ctx, 314 if (SSL_CTX_set_cipher_list(ctx->ssl_ctx,
323 ctx->config->ciphers) != 1) { 315 ctx->config->ciphers) != 1) {