diff options
| author | Ben Laurie <ben@links.org> | 2013-08-01 12:33:15 +0100 |
|---|---|---|
| committer | Ben Laurie <ben@links.org> | 2013-09-05 13:40:35 +0100 |
| commit | 88006e0d39a7d69f3aedc60f0344b2b86d9aa425 (patch) | |
| tree | d8740f1fd271e5313f40bb1b3507b91e16aacb8f | |
| parent | 91b7684f717d277ca0a6c275d8c4babc58a11fa9 (diff) | |
| download | openssl-new-88006e0d39a7d69f3aedc60f0344b2b86d9aa425.tar.gz | |
More cleanup.
| -rw-r--r-- | apps/s_server.c | 22 | ||||
| -rw-r--r-- | ssl/s3_clnt.c | 2 | ||||
| -rw-r--r-- | ssl/s3_srvr.c | 2 |
3 files changed, 10 insertions, 16 deletions
diff --git a/apps/s_server.c b/apps/s_server.c index a953d97fd3..d33cd79505 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -1961,10 +1961,8 @@ bad: } #endif - if (c_no_resumption_on_reneg) - { - SSL_CTX_set_options(ctx, SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION); - } + if (c_no_resumption_on_reneg) + SSL_CTX_set_options(ctx, SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION); if (!set_cert_key_stuff(ctx, s_cert, s_key, s_chain, build_chain)) goto end; #ifndef OPENSSL_NO_TLSEXT @@ -3570,16 +3568,14 @@ static int authz_tlsext_cb(SSL *s, unsigned short ext_type, { if (TLSEXT_TYPE_server_authz == ext_type) { - client_provided_server_authz = (memchr(in, - TLSEXT_AUTHZDATAFORMAT_dtcp, - inlen) != NULL); + client_provided_server_authz + = memchr(in, TLSEXT_AUTHZDATAFORMAT_dtcp, inlen) != NULL; } if (TLSEXT_TYPE_client_authz == ext_type) { - client_provided_client_authz = (memchr(in, - TLSEXT_AUTHZDATAFORMAT_dtcp, - inlen) != NULL); + client_provided_client_authz + = memchr(in, TLSEXT_AUTHZDATAFORMAT_dtcp, inlen) != NULL; } return 1; @@ -3591,7 +3587,8 @@ static int authz_tlsext_generate_cb(SSL *s, unsigned short ext_type, { if (c_auth && client_provided_client_authz && client_provided_server_authz) { - if (!c_auth_require_reneg || (c_auth_require_reneg && SSL_num_renegotiations(s))) + if (!c_auth_require_reneg + || (c_auth_require_reneg && SSL_num_renegotiations(s))) { *out = auth_ext_data; *outlen = 1; @@ -3622,7 +3619,8 @@ static int auth_suppdata_generate_cb(SSL *s, unsigned short supp_data_type, unsigned char *result; if (c_auth && client_provided_client_authz && client_provided_server_authz) { - if (!c_auth_require_reneg || (c_auth_require_reneg && SSL_num_renegotiations(s))) + if (!c_auth_require_reneg + || (c_auth_require_reneg && SSL_num_renegotiations(s))) { result = OPENSSL_malloc(10); memcpy(result, "1234512345", 10); diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c index d6aadec4ce..cec2250270 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c @@ -3577,9 +3577,7 @@ int ssl3_check_finished(SSL *s) s->s3->tmp.reuse_message = 1; if (s->s3->tmp.message_type == SSL3_MT_SUPPLEMENTAL_DATA) - { return 3; - } /* If we have no ticket it cannot be a resumed session. */ if (!s->session->tlsext_tick) return 1; diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c index 0a8f206f9f..02653a4983 100644 --- a/ssl/s3_srvr.c +++ b/ssl/s3_srvr.c @@ -903,9 +903,7 @@ int ssl3_check_client_hello(SSL *s) s->s3->tmp.reuse_message = 1; #ifndef OPENSSL_NO_TLSEXT if (s->s3->tmp.message_type == SSL3_MT_SUPPLEMENTAL_DATA) - { return 3; - } #endif if (s->s3->tmp.message_type == SSL3_MT_CLIENT_HELLO) { |