diff options
author | Matt Caswell <matt@openssl.org> | 2015-01-22 03:41:31 +0000 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2015-01-22 09:20:10 +0000 |
commit | 739a5eee619fc8c03736140828891b369f8690f4 (patch) | |
tree | 055d593c853598e031351cfb4d0ccf350fad877c /ssl | |
parent | 0f113f3ee4d629ef9a4a30911b22b224772085e5 (diff) | |
download | openssl-739a5eee619fc8c03736140828891b369f8690f4.tar.gz |
Rerun util/openssl-format-source -v -c .master-post-auto-reformat
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'ssl')
-rw-r--r-- | ssl/d1_srvr.c | 3 | ||||
-rw-r--r-- | ssl/s3_pkt.c | 6 | ||||
-rw-r--r-- | ssl/s3_srvr.c | 3 | ||||
-rw-r--r-- | ssl/ssl_sess.c | 6 |
4 files changed, 6 insertions, 12 deletions
diff --git a/ssl/d1_srvr.c b/ssl/d1_srvr.c index 0eabf41d26..1ccdc35e4d 100644 --- a/ssl/d1_srvr.c +++ b/ssl/d1_srvr.c @@ -491,8 +491,7 @@ int dtls1_accept(SSL *s) || ((alg_k & SSL_kRSA) && (s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey == NULL || (SSL_C_IS_EXPORT(s->s3->tmp.new_cipher) - && EVP_PKEY_size(s->cert-> - pkeys + && EVP_PKEY_size(s->cert->pkeys [SSL_PKEY_RSA_ENC].privatekey) * 8 > SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher) ) diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c index 737dabbce0..c1421b1d67 100644 --- a/ssl/s3_pkt.c +++ b/ssl/s3_pkt.c @@ -710,8 +710,7 @@ int ssl3_write_bytes(SSL *s, int type, const void *buf_, int len) u_len >= 4 * (max_send_fragment = s->max_send_fragment) && s->compress == NULL && s->msg_callback == NULL && !SSL_USE_ETM(s) && SSL_USE_EXPLICIT_IV(s) && - EVP_CIPHER_flags(s-> - enc_write_ctx->cipher) & + EVP_CIPHER_flags(s->enc_write_ctx->cipher) & EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK) { unsigned char aad[13]; EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM mb_param; @@ -921,8 +920,7 @@ static int do_ssl3_write(SSL *s, int type, const unsigned char *buf, #if 0 && !defined(OPENSSL_NO_MULTIBLOCK) && EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK if (type == SSL3_RT_APPLICATION_DATA && s->compress == NULL && !SSL_USE_ETM(s) && SSL_USE_EXPLICIT_IV(s) && - EVP_CIPHER_flags(s-> - enc_write_ctx->cipher) & + EVP_CIPHER_flags(s->enc_write_ctx->cipher) & EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK) do { unsigned char aad[13]; diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c index f77c4c6c07..0191790880 100644 --- a/ssl/s3_srvr.c +++ b/ssl/s3_srvr.c @@ -480,8 +480,7 @@ int ssl3_accept(SSL *s) || ((alg_k & SSL_kRSA) && (s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey == NULL || (SSL_C_IS_EXPORT(s->s3->tmp.new_cipher) - && EVP_PKEY_size(s->cert-> - pkeys + && EVP_PKEY_size(s->cert->pkeys [SSL_PKEY_RSA_ENC].privatekey) * 8 > SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher) ) diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c index 9ee1366d72..ed17429b07 100644 --- a/ssl/ssl_sess.c +++ b/ssl/ssl_sess.c @@ -468,8 +468,7 @@ int ssl_get_prev_session(SSL *s, unsigned char *session_id, int len, if (try_session_cache && ret == NULL && - !(s-> - session_ctx->session_cache_mode & + !(s->session_ctx->session_cache_mode & SSL_SESS_CACHE_NO_INTERNAL_LOOKUP)) { SSL_SESSION data; data.ssl_version = s->version; @@ -510,8 +509,7 @@ int ssl_get_prev_session(SSL *s, unsigned char *session_id, int len, * well if and only if we are supposed to. */ if (! - (s-> - session_ctx->session_cache_mode & + (s->session_ctx->session_cache_mode & SSL_SESS_CACHE_NO_INTERNAL_STORE)) /* * The following should not return 1, otherwise, things are |