generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More cleanup.

Browse Source
This commit is contained in:
Ben Laurie 2013-08-01 12:33:15 +01:00
parent a6a48e87bc
commit 5eda213ebe
8 changed files with 35 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/s_cb.c
View File

@ -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;
}
}
}

17
apps/s_client.c
View File

@ -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);

28
apps/s_server.c
View File

@ -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);

14
ssl/s3_clnt.c
View File

@ -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 (p<d+supp_data_len)
while (p < d+supp_data_len)
{
n2s(p, supp_data_entry_type);
n2s(p, supp_data_entry_len);
@ -3744,7 +3744,7 @@ int tls1_get_server_supplemental_data(SSL *s)
}
}
}
p+=supp_data_entry_len;
p += supp_data_entry_len;
}
return 1;
f_err:

2
ssl/s3_srvr.c
View File

@ -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)
{

10
ssl/ssl.h
View File

@ -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

4
ssl/ssl_lib.c
View File

@ -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;

2
ssl/ssltest.c
View File

@ -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