summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbeck <>2020-05-19 02:16:16 +0000
committerbeck <>2020-05-19 02:16:16 +0000
commit703cde656ae315f4314348b60e9b2fc02a42f0dc (patch)
tree596ec9607ba98d0f64b4dab9692386a8e542708f
parent0286c965db48149ae18c03e50dcc7965dfa5887e (diff)
downloadopenbsd-703cde656ae315f4314348b60e9b2fc02a42f0dc.tar.gz
openbsd-703cde656ae315f4314348b60e9b2fc02a42f0dc.tar.bz2
openbsd-703cde656ae315f4314348b60e9b2fc02a42f0dc.zip
Only send ocsp staples if the client asked for ocsp certificate status.
noticed by dlg@ on www.openbsd.org with curl. ok dlg@
-rw-r--r--src/lib/libssl/ssl_tlsext.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/libssl/ssl_tlsext.c b/src/lib/libssl/ssl_tlsext.c
index 1ec8ac00ef..8949dc3a26 100644
--- a/src/lib/libssl/ssl_tlsext.c
+++ b/src/lib/libssl/ssl_tlsext.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_tlsext.c,v 1.69 2020/05/19 01:30:34 beck Exp $ */ 1/* $OpenBSD: ssl_tlsext.c,v 1.70 2020/05/19 02:16:16 beck Exp $ */
2/* 2/*
3 * Copyright (c) 2016, 2017, 2019 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2016, 2017, 2019 Joel Sing <jsing@openbsd.org>
4 * Copyright (c) 2017 Doug Hogan <doug@openbsd.org> 4 * Copyright (c) 2017 Doug Hogan <doug@openbsd.org>
@@ -910,6 +910,7 @@ int
910tlsext_ocsp_server_needs(SSL *s) 910tlsext_ocsp_server_needs(SSL *s)
911{ 911{
912 if (s->version >= TLS1_3_VERSION && 912 if (s->version >= TLS1_3_VERSION &&
913 s->tlsext_status_type == TLSEXT_STATUSTYPE_ocsp &&
913 s->ctx->internal->tlsext_status_cb != NULL) { 914 s->ctx->internal->tlsext_status_cb != NULL) {
914 s->internal->tlsext_status_expected = 0; 915 s->internal->tlsext_status_expected = 0;
915 if (s->ctx->internal->tlsext_status_cb(s, 916 if (s->ctx->internal->tlsext_status_cb(s,