From: tb Date: Sat, 20 Feb 2021 14:16:56 +0000 (+0000) Subject: ugly whitespace X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=3586f9d4d89a8481a4b05d91d6ae7046abda9468;p=openbsd ugly whitespace --- diff --git a/lib/libssl/ssl_clnt.c b/lib/libssl/ssl_clnt.c index 8ef3648f6c4..bfff652ff10 100644 --- a/lib/libssl/ssl_clnt.c +++ b/lib/libssl/ssl_clnt.c @@ -1,4 +1,4 @@ -/* $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. * @@ -694,10 +694,10 @@ ssl3_send_client_hello(SSL *s) * 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. @@ -1646,7 +1646,7 @@ int 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; @@ -1918,9 +1918,9 @@ ssl3_get_cert_status(SSL *s) 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) { diff --git a/lib/libssl/ssl_srvr.c b/lib/libssl/ssl_srvr.c index 15dda5108ce..be9c27f73f8 100644 --- a/lib/libssl/ssl_srvr.c +++ b/lib/libssl/ssl_srvr.c @@ -1,4 +1,4 @@ -/* $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. * @@ -1126,8 +1126,8 @@ ssl3_get_client_hello(SSL *s) /* * 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. @@ -1786,7 +1786,7 @@ ssl3_get_client_kex_rsa(SSL *s, CBS *cbs) 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); @@ -1968,7 +1968,7 @@ ssl3_get_client_kex_ecdhe_ecx(SSL *s, CBS *cbs) 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); @@ -2356,7 +2356,7 @@ ssl3_get_client_certificate(SSL *s) 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; }