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: case 16:
str_details1 = ", ClientKeyExchange"; str_details1 = ", ClientKeyExchange";
break; break;
case 23:
str_details1 = ", SupplementalData";
break;
case 20: case 20:
str_details1 = ", Finished"; str_details1 = ", Finished";
break; 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) void *arg)
{ {
if (TLSEXT_TYPE_server_authz == ext_type) if (TLSEXT_TYPE_server_authz == ext_type)
{ server_provided_server_authz
server_provided_server_authz = (memchr(in, = (memchr(in, TLSEXT_AUTHZDATAFORMAT_dtcp, inlen) != NULL);
TLSEXT_AUTHZDATAFORMAT_dtcp,
inlen) != NULL);
}
if (TLSEXT_TYPE_client_authz == ext_type) if (TLSEXT_TYPE_client_authz == ext_type)
{ server_provided_client_authz
server_provided_client_authz = (memchr(in, = (memchr(in, TLSEXT_AUTHZDATAFORMAT_dtcp, inlen) != NULL);
TLSEXT_AUTHZDATAFORMAT_dtcp,
inlen) != NULL);
}
return 1; return 1;
} }
@ -2487,7 +2481,8 @@ static int auth_suppdata_generate_cb(SSL *s, unsigned short supp_data_type,
unsigned char *result; unsigned char *result;
if (c_auth && server_provided_client_authz && server_provided_server_authz) 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); result = OPENSSL_malloc(10);
memcpy(result, "5432154321", 10); memcpy(result, "5432154321", 10);

22
apps/s_server.c
View File

@ -1962,9 +1962,7 @@ bad:
#endif #endif
if (c_no_resumption_on_reneg) if (c_no_resumption_on_reneg)
{
SSL_CTX_set_options(ctx, SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION); 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)) if (!set_cert_key_stuff(ctx, s_cert, s_key, s_chain, build_chain))
goto end; goto end;
#ifndef OPENSSL_NO_TLSEXT #ifndef OPENSSL_NO_TLSEXT
@ -3569,18 +3567,12 @@ static int authz_tlsext_cb(SSL *s, unsigned short ext_type,
void *arg) void *arg)
{ {
if (TLSEXT_TYPE_server_authz == ext_type) if (TLSEXT_TYPE_server_authz == ext_type)
{ client_provided_server_authz
client_provided_server_authz = (memchr(in, = memchr(in, TLSEXT_AUTHZDATAFORMAT_dtcp, inlen) != NULL;
TLSEXT_AUTHZDATAFORMAT_dtcp,
inlen) != NULL);
}
if (TLSEXT_TYPE_client_authz == ext_type) if (TLSEXT_TYPE_client_authz == ext_type)
{ client_provided_client_authz
client_provided_client_authz = (memchr(in, = memchr(in, TLSEXT_AUTHZDATAFORMAT_dtcp, inlen) != NULL;
TLSEXT_AUTHZDATAFORMAT_dtcp,
inlen) != NULL);
}
return 1; 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 && 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; *out = auth_ext_data;
*outlen = 1; *outlen = 1;
@ -3622,7 +3615,8 @@ static int auth_suppdata_generate_cb(SSL *s, unsigned short supp_data_type,
unsigned char *result; unsigned char *result;
if (c_auth && client_provided_client_authz && client_provided_server_authz) 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); result = OPENSSL_malloc(10);
memcpy(result, "1234512345", 10); memcpy(result, "1234512345", 10);

14
ssl/s3_clnt.c
View File

@ -3564,9 +3564,11 @@ int ssl3_check_finished(SSL *s)
{ {
int ok; int ok;
long n; 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 /* Read the message to see if it is supplemental data,
message, so permit appropriate message length */ * 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, n=s->method->ssl_get_message(s,
SSL3_ST_CR_CERT_A, SSL3_ST_CR_CERT_A,
SSL3_ST_CR_CERT_B, SSL3_ST_CR_CERT_B,
@ -3577,9 +3579,7 @@ int ssl3_check_finished(SSL *s)
s->s3->tmp.reuse_message = 1; s->s3->tmp.reuse_message = 1;
if (s->s3->tmp.message_type == SSL3_MT_SUPPLEMENTAL_DATA) if (s->s3->tmp.message_type == SSL3_MT_SUPPLEMENTAL_DATA)
{
return 3; return 3;
}
/* If we have no ticket it cannot be a resumed session. */ /* If we have no ticket it cannot be a resumed session. */
if (!s->session->tlsext_tick) if (!s->session->tlsext_tick)
return 1; return 1;
@ -3727,7 +3727,7 @@ int tls1_get_server_supplemental_data(SSL *s)
goto f_err; goto f_err;
} }
n2l3(p, supp_data_len); 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_type);
n2s(p, supp_data_entry_len); 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; return 1;
f_err: 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; s->s3->tmp.reuse_message = 1;
#ifndef OPENSSL_NO_TLSEXT #ifndef OPENSSL_NO_TLSEXT
if (s->s3->tmp.message_type == SSL3_MT_SUPPLEMENTAL_DATA) if (s->s3->tmp.message_type == SSL3_MT_SUPPLEMENTAL_DATA)
{
return 3; return 3;
}
#endif #endif
if (s->s3->tmp.message_type == SSL3_MT_CLIENT_HELLO) if (s->s3->tmp.message_type == SSL3_MT_CLIENT_HELLO)
{ {

2
ssl/ssltest.c
View File

@ -521,7 +521,7 @@ int custom_ext = 0;
/* This set based on extension callbacks */ /* This set based on extension callbacks */
int custom_ext_error = 0; 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_0 100
#define CUSTOM_SUPP_DATA_TYPE_1 101 #define CUSTOM_SUPP_DATA_TYPE_1 101
#define CUSTOM_SUPP_DATA_TYPE_2 102 #define CUSTOM_SUPP_DATA_TYPE_2 102