diff options
| author | Pauli <pauli@openssl.org> | 2021-06-18 17:44:57 +1000 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2021-06-19 15:51:12 +1000 |
| commit | 5ea4d7648cb2cd23d42850865686390896c6e607 (patch) | |
| tree | 476dca50fd9a7ae78a792fbef911b08e8f5a5f99 | |
| parent | e69bde88e44c431412d7cf9f9361b84c95fe549d (diff) | |
ssl: replace tabs with spaces
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15824)
| -rw-r--r-- | ssl/ktls.c | 2 | ||||
| -rw-r--r-- | ssl/record/rec_layer_s3.c | 14 | ||||
| -rw-r--r-- | ssl/statem/extensions.c | 2 | ||||
| -rw-r--r-- | ssl/t1_lib.c | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/ssl/ktls.c b/ssl/ktls.c index a5de8bd720..97aa7c3317 100644 --- a/ssl/ktls.c +++ b/ssl/ktls.c @@ -225,7 +225,7 @@ int ktls_configure_crypto(const SSL *s, const EVP_CIPHER *c, EVP_CIPHER_CTX *dd, crypto_info->chacha20poly1305.info.version = s->version; crypto_info->tls_crypto_info_len = sizeof(crypto_info->chacha20poly1305); memcpy(crypto_info->chacha20poly1305.iv, iiv, - TLS_CIPHER_CHACHA20_POLY1305_IV_SIZE); + TLS_CIPHER_CHACHA20_POLY1305_IV_SIZE); memcpy(crypto_info->chacha20poly1305.key, key, EVP_CIPHER_get_key_length(c)); memcpy(crypto_info->chacha20poly1305.rec_seq, rl_sequence, diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c index aacd5694fc..28e02e642c 100644 --- a/ssl/record/rec_layer_s3.c +++ b/ssl/record/rec_layer_s3.c @@ -1203,13 +1203,13 @@ int ssl3_write_pending(SSL *s, int type, const unsigned char *buf, size_t len, i = -1; } - /* - * When an empty fragment is sent on a connection using KTLS, - * it is sent as a write of zero bytes. If this zero byte - * write succeeds, i will be 0 rather than a non-zero value. - * Treat i == 0 as success rather than an error for zero byte - * writes to permit this case. - */ + /* + * When an empty fragment is sent on a connection using KTLS, + * it is sent as a write of zero bytes. If this zero byte + * write succeeds, i will be 0 rather than a non-zero value. + * Treat i == 0 as success rather than an error for zero byte + * writes to permit this case. + */ if (i >= 0 && tmpwrit == SSL3_BUFFER_get_left(&wb[currbuf])) { SSL3_BUFFER_set_left(&wb[currbuf], 0); SSL3_BUFFER_add_offset(&wb[currbuf], tmpwrit); diff --git a/ssl/statem/extensions.c b/ssl/statem/extensions.c index f58111c95c..457028869b 100644 --- a/ssl/statem/extensions.c +++ b/ssl/statem/extensions.c @@ -953,7 +953,7 @@ static int final_server_name(SSL *s, unsigned int context, int sent) * exceed sess_accept (zero) for the new context. */ if (SSL_IS_FIRST_HANDSHAKE(s) && s->ctx != s->session_ctx - && s->hello_retry_request == SSL_HRR_NONE) { + && s->hello_retry_request == SSL_HRR_NONE) { tsan_counter(&s->ctx->stats.sess_accept); tsan_decr(&s->session_ctx->stats.sess_accept); } diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c index 2ee97c2ae6..3579202c22 100644 --- a/ssl/t1_lib.c +++ b/ssl/t1_lib.c @@ -1431,7 +1431,7 @@ static int sigalg_security_bits(SSL_CTX *ctx, const SIGALG_LOOKUP *lu) * SHA1 at 2^63.4 and MD5+SHA1 at 2^67.2 * https://documents.epfl.ch/users/l/le/lenstra/public/papers/lat.pdf * puts a chosen-prefix attack for MD5 at 2^39. - */ + */ if (md_type == NID_sha1) secbits = 64; else if (md_type == NID_md5_sha1) |