From 5eda213ebe382009c2f37a8eade5cbcdae6017ed Mon Sep 17 00:00:00 2001 From: Ben Laurie Date: Thu, 1 Aug 2013 12:33:15 +0100 Subject: [PATCH] More cleanup. --- apps/s_cb.c | 6 +++--- apps/s_client.c | 17 ++++++----------- apps/s_server.c | 28 +++++++++++----------------- ssl/s3_clnt.c | 14 +++++++------- ssl/s3_srvr.c | 2 -- ssl/ssl.h | 10 +++++----- ssl/ssl_lib.c | 4 ++-- ssl/ssltest.c | 2 +- 8 files changed, 35 insertions(+), 48 deletions(-) diff --git a/apps/s_cb.c b/apps/s_cb.c index 927f9d91e1..8127e77143 100644 --- a/apps/s_cb.c +++ b/apps/s_cb.c @@ -876,12 +876,12 @@ void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void * case 16: str_details1 = ", ClientKeyExchange"; break; - case 23: - str_details1 = ", SupplementalData"; - break; case 20: str_details1 = ", Finished"; break; + case 23: + str_details1 = ", SupplementalData"; + break; } } } diff --git a/apps/s_client.c b/apps/s_client.c index 028018ad76..b4ea03ba77 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -2434,18 +2434,12 @@ static int authz_tlsext_cb(SSL *s, unsigned short ext_type, void *arg) { if (TLSEXT_TYPE_server_authz == ext_type) - { - server_provided_server_authz = (memchr(in, - TLSEXT_AUTHZDATAFORMAT_dtcp, - inlen) != NULL); - } + server_provided_server_authz + = (memchr(in, TLSEXT_AUTHZDATAFORMAT_dtcp, inlen) != NULL); if (TLSEXT_TYPE_client_authz == ext_type) - { - server_provided_client_authz = (memchr(in, - TLSEXT_AUTHZDATAFORMAT_dtcp, - inlen) != NULL); - } + server_provided_client_authz + = (memchr(in, TLSEXT_AUTHZDATAFORMAT_dtcp, inlen) != NULL); return 1; } @@ -2487,7 +2481,8 @@ static int auth_suppdata_generate_cb(SSL *s, unsigned short supp_data_type, unsigned char *result; if (c_auth && server_provided_client_authz && server_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, "5432154321", 10); diff --git a/apps/s_server.c b/apps/s_server.c index cf40da528d..29189fde29 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -1056,7 +1056,7 @@ int MAIN(int argc, char *argv[]) EVP_PKEY *s_key = NULL, *s_dkey = NULL; int no_cache = 0, ext_cache = 0; int rev = 0, naccept = -1; - int c_no_resumption_on_reneg = 0; + int c_no_resumption_on_reneg = 0; #ifndef OPENSSL_NO_TLSEXT EVP_PKEY *s_key2 = NULL; X509 *s_cert2 = NULL; @@ -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 @@ -3569,18 +3567,12 @@ static int authz_tlsext_cb(SSL *s, unsigned short ext_type, void *arg) { 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 +3583,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 +3615,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 87d738cdf9..5ceb62488c 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c @@ -3564,9 +3564,11 @@ int ssl3_check_finished(SSL *s) { int ok; long n; -/* Read the message to see if it is supplemental data, regardless if there is a session ticket - this function is called when we really expect a Certificate - message, so permit appropriate message length */ + + /* Read the message to see if it is supplemental data, + * regardless if there is a session ticket this function is + * called when we really expect a Certificate message, so + * permit appropriate message length */ n=s->method->ssl_get_message(s, SSL3_ST_CR_CERT_A, SSL3_ST_CR_CERT_B, @@ -3577,9 +3579,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; @@ -3727,7 +3727,7 @@ int tls1_get_server_supplemental_data(SSL *s) goto f_err; } n2l3(p, supp_data_len); - while (ps3->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) { diff --git a/ssl/ssl.h b/ssl/ssl.h index f4caef71bd..fdcacb972e 100644 --- a/ssl/ssl.h +++ b/ssl/ssl.h @@ -1189,11 +1189,11 @@ struct ssl_ctx_st custom_srv_ext_record *custom_srv_ext_records; size_t custom_srv_ext_records_count; - /* Arrays containing the callbacks for Supplemental Data. */ - cli_supp_data_record *cli_supp_data_records; - size_t cli_supp_data_records_count; - srv_supp_data_record *srv_supp_data_records; - size_t srv_supp_data_records_count; + /* Arrays containing the callbacks for Supplemental Data. */ + cli_supp_data_record *cli_supp_data_records; + size_t cli_supp_data_records_count; + srv_supp_data_record *srv_supp_data_records; + size_t srv_supp_data_records_count; }; #endif diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 0b2d5ffd95..54f02a67c4 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -1855,7 +1855,7 @@ int SSL_CTX_set_cli_supp_data(SSL_CTX *ctx, return 0; ctx->cli_supp_data_records = OPENSSL_realloc(ctx->cli_supp_data_records, - (ctx->cli_supp_data_records_count+1) * sizeof(cli_supp_data_record)); + (ctx->cli_supp_data_records_count+1) * sizeof(cli_supp_data_record)); if (!ctx->cli_supp_data_records) { ctx->cli_supp_data_records_count = 0; @@ -1884,7 +1884,7 @@ int SSL_CTX_set_srv_supp_data(SSL_CTX *ctx, return 0; ctx->srv_supp_data_records = OPENSSL_realloc(ctx->srv_supp_data_records, - (ctx->srv_supp_data_records_count+1) * sizeof(srv_supp_data_record)); + (ctx->srv_supp_data_records_count+1) * sizeof(srv_supp_data_record)); if (!ctx->srv_supp_data_records) { ctx->srv_supp_data_records_count = 0; diff --git a/ssl/ssltest.c b/ssl/ssltest.c index a461eb805c..3c232115f2 100644 --- a/ssl/ssltest.c +++ b/ssl/ssltest.c @@ -521,7 +521,7 @@ int custom_ext = 0; /* This set based on extension callbacks */ int custom_ext_error = 0; -/*Not IETF assigned supplemental data types*/ +/* Not IETF assigned supplemental data types */ #define CUSTOM_SUPP_DATA_TYPE_0 100 #define CUSTOM_SUPP_DATA_TYPE_1 101 #define CUSTOM_SUPP_DATA_TYPE_2 102 -- 2.25.1