diff options
| author | Ben Laurie <ben@links.org> | 2013-08-01 12:33:15 +0100 |
|---|---|---|
| committer | Scott Deboy <sdeboy@secondstryke.com> | 2014-02-09 08:07:04 -0800 |
| commit | 8acf1ff4b421fada9e09fa51f479bdff204d0dea (patch) | |
| tree | d0279ad560cd9ee3ee2207fdf8edd229524468d9 /apps | |
| parent | 8b41df41c2bb51d6ad52d1ca54734776cf592022 (diff) | |
More cleanup.
(cherry picked from commit 5eda213ebe382009c2f37a8eade5cbcdae6017ed)
Conflicts:
apps/s_client.c
apps/s_server.c
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/s_cb.c | 6 | ||||
| -rw-r--r-- | apps/s_client.c | 14 | ||||
| -rw-r--r-- | apps/s_server.c | 22 |
3 files changed, 14 insertions, 28 deletions
diff --git a/apps/s_cb.c b/apps/s_cb.c index 040ffaf186..3af9b7ad9c 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 eece94f859..5c10ae51a7 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -2440,18 +2440,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; } diff --git a/apps/s_server.c b/apps/s_server.c index 7ac7df81e1..dbd4df9944 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -1053,7 +1053,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 @@ -3558,18 +3556,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; } |