summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_clnt.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/ssl_clnt.c')
-rw-r--r--src/lib/libssl/ssl_clnt.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/libssl/ssl_clnt.c b/src/lib/libssl/ssl_clnt.c
index 8ef3648f6c..bfff652ff1 100644
--- a/src/lib/libssl/ssl_clnt.c
+++ b/src/lib/libssl/ssl_clnt.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_clnt.c,v 1.82 2021/02/20 14:14:16 tb Exp $ */ 1/* $OpenBSD: ssl_clnt.c,v 1.83 2021/02/20 14:16:56 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -694,10 +694,10 @@ ssl3_send_client_hello(SSL *s)
694 * 1.0. 694 * 1.0.
695 * 695 *
696 * Possible scenario with previous logic: 696 * Possible scenario with previous logic:
697 * 1. Client hello indicates TLS 1.2 697 * 1. Client hello indicates TLS 1.2
698 * 2. Server hello says TLS 1.0 698 * 2. Server hello says TLS 1.0
699 * 3. RSA encrypted premaster secret uses 1.2. 699 * 3. RSA encrypted premaster secret uses 1.2.
700 * 4. Handhaked proceeds using TLS 1.0. 700 * 4. Handhaked proceeds using TLS 1.0.
701 * 5. Server sends hello request to renegotiate. 701 * 5. Server sends hello request to renegotiate.
702 * 6. Client hello indicates TLS v1.0 as we now 702 * 6. Client hello indicates TLS v1.0 as we now
703 * know that is maximum server supports. 703 * know that is maximum server supports.
@@ -1646,7 +1646,7 @@ int
1646ssl3_get_certificate_request(SSL *s) 1646ssl3_get_certificate_request(SSL *s)
1647{ 1647{
1648 int ok, ret = 0; 1648 int ok, ret = 0;
1649 long n; 1649 long n;
1650 uint8_t ctype_num; 1650 uint8_t ctype_num;
1651 CBS cert_request, ctypes, rdn_list; 1651 CBS cert_request, ctypes, rdn_list;
1652 X509_NAME *xn = NULL; 1652 X509_NAME *xn = NULL;
@@ -1918,9 +1918,9 @@ ssl3_get_cert_status(SSL *s)
1918 1918
1919 if (!CBS_stow(&response, &s->internal->tlsext_ocsp_resp, 1919 if (!CBS_stow(&response, &s->internal->tlsext_ocsp_resp,
1920 &s->internal->tlsext_ocsp_resp_len)) { 1920 &s->internal->tlsext_ocsp_resp_len)) {
1921 al = SSL_AD_INTERNAL_ERROR; 1921 al = SSL_AD_INTERNAL_ERROR;
1922 SSLerror(s, ERR_R_MALLOC_FAILURE); 1922 SSLerror(s, ERR_R_MALLOC_FAILURE);
1923 goto fatal_err; 1923 goto fatal_err;
1924 } 1924 }
1925 1925
1926 if (s->ctx->internal->tlsext_status_cb) { 1926 if (s->ctx->internal->tlsext_status_cb) {