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

More cleanup.

Browse Source 
(cherry picked from commit 5eda213ebe)
Conflicts:
	apps/s_client.c
	apps/s_server.c
This commit is contained in:
Ben Laurie
2013-08-01 12:33:15 +01:00
committed by Scott Deboy
parent 8b41df41c2
commit 8acf1ff4b4
8 changed files with 29 additions and 45 deletions
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;
}
}
}

14
apps/s_client.c
View File

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

16
apps/s_server.c
View File

@@ -1962,9 +1962,7 @@ bad:
#endif
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;
}

14
ssl/s3_clnt.c
View File

@@ -3571,9 +3571,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,
@@ -3584,9 +3586,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;
@@ -3739,7 +3739,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);
@@ -3759,7 +3759,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)
{

2
ssl/ssltest.c
View File

@@ -446,7 +446,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