diff options
| author | beck <> | 2016-11-06 16:55:16 +0000 |
|---|---|---|
| committer | beck <> | 2016-11-06 16:55:16 +0000 |
| commit | 8040a7483ddcf8dccda1702c21839b3bd23089fc (patch) | |
| tree | fd6556296ac4083e4fa69b43e4ec7b184460b855 /src | |
| parent | 35ced4b0bd12f88ac45f881ec1269da5adaebc9c (diff) | |
| download | openbsd-8040a7483ddcf8dccda1702c21839b3bd23089fc.tar.gz openbsd-8040a7483ddcf8dccda1702c21839b3bd23089fc.tar.bz2 openbsd-8040a7483ddcf8dccda1702c21839b3bd23089fc.zip | |
Set the callback on the correct ssl_ctx for the SNI case, instead of
the master only.
ok jsing@
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libtls/tls_server.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libtls/tls_server.c b/src/lib/libtls/tls_server.c index a9a5902add..a3883315e7 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.30 2016/11/05 15:13:26 beck Exp $ */ | 1 | /* $OpenBSD: tls_server.c,v 1.31 2016/11/06 16:55:16 beck Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> |
| 4 | * | 4 | * |
| @@ -214,7 +214,7 @@ tls_configure_server_ssl(struct tls *ctx, SSL_CTX **ssl_ctx, | |||
| 214 | if (ctx->config->ciphers_server == 1) | 214 | if (ctx->config->ciphers_server == 1) |
| 215 | SSL_CTX_set_options(*ssl_ctx, SSL_OP_CIPHER_SERVER_PREFERENCE); | 215 | SSL_CTX_set_options(*ssl_ctx, SSL_OP_CIPHER_SERVER_PREFERENCE); |
| 216 | 216 | ||
| 217 | if (SSL_CTX_set_tlsext_status_cb(ctx->ssl_ctx, tls_ocsp_stapling_cb) != 1) { | 217 | if (SSL_CTX_set_tlsext_status_cb(*ssl_ctx, tls_ocsp_stapling_cb) != 1) { |
| 218 | tls_set_errorx(ctx, "failed to add OCSP stapling callback"); | 218 | tls_set_errorx(ctx, "failed to add OCSP stapling callback"); |
| 219 | goto err; | 219 | goto err; |
| 220 | } | 220 | } |