-/* $OpenBSD: ssl_clnt.c,v 1.82 2021/02/20 14:14:16 tb Exp $ */
+/* $OpenBSD: ssl_clnt.c,v 1.83 2021/02/20 14:16:56 tb Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
* 1.0.
*
* Possible scenario with previous logic:
- * 1. Client hello indicates TLS 1.2
- * 2. Server hello says TLS 1.0
+ * 1. Client hello indicates TLS 1.2
+ * 2. Server hello says TLS 1.0
* 3. RSA encrypted premaster secret uses 1.2.
- * 4. Handhaked proceeds using TLS 1.0.
+ * 4. Handhaked proceeds using TLS 1.0.
* 5. Server sends hello request to renegotiate.
* 6. Client hello indicates TLS v1.0 as we now
* know that is maximum server supports.
ssl3_get_certificate_request(SSL *s)
{
int ok, ret = 0;
- long n;
+ long n;
uint8_t ctype_num;
CBS cert_request, ctypes, rdn_list;
X509_NAME *xn = NULL;
if (!CBS_stow(&response, &s->internal->tlsext_ocsp_resp,
&s->internal->tlsext_ocsp_resp_len)) {
- al = SSL_AD_INTERNAL_ERROR;
- SSLerror(s, ERR_R_MALLOC_FAILURE);
- goto fatal_err;
+ al = SSL_AD_INTERNAL_ERROR;
+ SSLerror(s, ERR_R_MALLOC_FAILURE);
+ goto fatal_err;
}
if (s->ctx->internal->tlsext_status_cb) {
-/* $OpenBSD: ssl_srvr.c,v 1.94 2021/02/20 14:14:16 tb Exp $ */
+/* $OpenBSD: ssl_srvr.c,v 1.95 2021/02/20 14:16:56 tb Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
/*
* We now have the following setup.
* client_random
- * cipher_list - our prefered list of ciphers
- * ciphers - the clients prefered list of ciphers
+ * cipher_list - our prefered list of ciphers
+ * ciphers - the clients prefered list of ciphers
* compression - basically ignored right now
* ssl version is set - sslv3
* s->session - The ssl session has been setup.
s->session->master_key_length =
tls1_generate_master_secret(s,
- s->session->master_key, p, SSL_MAX_MASTER_KEY_LENGTH);
+ s->session->master_key, p, SSL_MAX_MASTER_KEY_LENGTH);
freezero(pms, pms_len);
static int
ssl3_get_client_kex_ecdhe(SSL *s, CBS *cbs)
{
- if (S3I(s)->tmp.x25519 != NULL)
+ if (S3I(s)->tmp.x25519 != NULL)
return ssl3_get_client_kex_ecdhe_ecx(s, cbs);
return ssl3_get_client_kex_ecdhe_ecp(s, cbs);
if (S3I(s)->tmp.message_type == SSL3_MT_CLIENT_KEY_EXCHANGE) {
if ((s->verify_mode & SSL_VERIFY_PEER) &&
(s->verify_mode & SSL_VERIFY_FAIL_IF_NO_PEER_CERT)) {
- SSLerror(s, SSL_R_PEER_DID_NOT_RETURN_A_CERTIFICATE);
+ SSLerror(s, SSL_R_PEER_DID_NOT_RETURN_A_CERTIFICATE);
al = SSL_AD_HANDSHAKE_FAILURE;
goto fatal_err;
}