diff options
author | tb <> | 2021-02-20 14:16:56 +0000 |
---|---|---|
committer | tb <> | 2021-02-20 14:16:56 +0000 |
commit | 1da7041bc31ef34b77468a85d810549c4e4f0729 (patch) | |
tree | 885242ce53174984ba5eb630628454744c945a8b /src/lib | |
parent | efbd8fd6c910f8b87daab69d3aaa30c04dc61589 (diff) | |
download | openbsd-1da7041bc31ef34b77468a85d810549c4e4f0729.tar.gz openbsd-1da7041bc31ef34b77468a85d810549c4e4f0729.tar.bz2 openbsd-1da7041bc31ef34b77468a85d810549c4e4f0729.zip |
ugly whitespace
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/libssl/ssl_clnt.c | 16 | ||||
-rw-r--r-- | src/lib/libssl/ssl_srvr.c | 12 |
2 files changed, 14 insertions, 14 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 | |||
1646 | ssl3_get_certificate_request(SSL *s) | 1646 | ssl3_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) { |
diff --git a/src/lib/libssl/ssl_srvr.c b/src/lib/libssl/ssl_srvr.c index 15dda5108c..be9c27f73f 100644 --- a/src/lib/libssl/ssl_srvr.c +++ b/src/lib/libssl/ssl_srvr.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_srvr.c,v 1.94 2021/02/20 14:14:16 tb Exp $ */ | 1 | /* $OpenBSD: ssl_srvr.c,v 1.95 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 | * |
@@ -1126,8 +1126,8 @@ ssl3_get_client_hello(SSL *s) | |||
1126 | /* | 1126 | /* |
1127 | * We now have the following setup. | 1127 | * We now have the following setup. |
1128 | * client_random | 1128 | * client_random |
1129 | * cipher_list - our prefered list of ciphers | 1129 | * cipher_list - our prefered list of ciphers |
1130 | * ciphers - the clients prefered list of ciphers | 1130 | * ciphers - the clients prefered list of ciphers |
1131 | * compression - basically ignored right now | 1131 | * compression - basically ignored right now |
1132 | * ssl version is set - sslv3 | 1132 | * ssl version is set - sslv3 |
1133 | * s->session - The ssl session has been setup. | 1133 | * s->session - The ssl session has been setup. |
@@ -1786,7 +1786,7 @@ ssl3_get_client_kex_rsa(SSL *s, CBS *cbs) | |||
1786 | 1786 | ||
1787 | s->session->master_key_length = | 1787 | s->session->master_key_length = |
1788 | tls1_generate_master_secret(s, | 1788 | tls1_generate_master_secret(s, |
1789 | s->session->master_key, p, SSL_MAX_MASTER_KEY_LENGTH); | 1789 | s->session->master_key, p, SSL_MAX_MASTER_KEY_LENGTH); |
1790 | 1790 | ||
1791 | freezero(pms, pms_len); | 1791 | freezero(pms, pms_len); |
1792 | 1792 | ||
@@ -1968,7 +1968,7 @@ ssl3_get_client_kex_ecdhe_ecx(SSL *s, CBS *cbs) | |||
1968 | static int | 1968 | static int |
1969 | ssl3_get_client_kex_ecdhe(SSL *s, CBS *cbs) | 1969 | ssl3_get_client_kex_ecdhe(SSL *s, CBS *cbs) |
1970 | { | 1970 | { |
1971 | if (S3I(s)->tmp.x25519 != NULL) | 1971 | if (S3I(s)->tmp.x25519 != NULL) |
1972 | return ssl3_get_client_kex_ecdhe_ecx(s, cbs); | 1972 | return ssl3_get_client_kex_ecdhe_ecx(s, cbs); |
1973 | 1973 | ||
1974 | return ssl3_get_client_kex_ecdhe_ecp(s, cbs); | 1974 | return ssl3_get_client_kex_ecdhe_ecp(s, cbs); |
@@ -2356,7 +2356,7 @@ ssl3_get_client_certificate(SSL *s) | |||
2356 | if (S3I(s)->tmp.message_type == SSL3_MT_CLIENT_KEY_EXCHANGE) { | 2356 | if (S3I(s)->tmp.message_type == SSL3_MT_CLIENT_KEY_EXCHANGE) { |
2357 | if ((s->verify_mode & SSL_VERIFY_PEER) && | 2357 | if ((s->verify_mode & SSL_VERIFY_PEER) && |
2358 | (s->verify_mode & SSL_VERIFY_FAIL_IF_NO_PEER_CERT)) { | 2358 | (s->verify_mode & SSL_VERIFY_FAIL_IF_NO_PEER_CERT)) { |
2359 | SSLerror(s, SSL_R_PEER_DID_NOT_RETURN_A_CERTIFICATE); | 2359 | SSLerror(s, SSL_R_PEER_DID_NOT_RETURN_A_CERTIFICATE); |
2360 | al = SSL_AD_HANDSHAKE_FAILURE; | 2360 | al = SSL_AD_HANDSHAKE_FAILURE; |
2361 | goto fatal_err; | 2361 | goto fatal_err; |
2362 | } | 2362 | } |