wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tweaks for comments due to indent's inability to handle them

Browse source 
Reviewed-by: Tim Hudson <tjh@openssl.org>
This commit is contained in:
Matt Caswell 2015-01-21 21:22:49 +00:00
parent f3b6ee30f4
commit 335d4d06a7
6 changed files with 59 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
demos/tunala/tunala.h
View file

@ -144,7 +144,8 @@ void buffer_to_BIO(buffer_t *buf, BIO *bio);
/* Callbacks */
void cb_ssl_info(const SSL *s, int where, int ret);
void cb_ssl_info_set_output(FILE *fp); /* Called if output should be sent too */
/* Called if output should be sent too */
void cb_ssl_info_set_output(FILE *fp);
int cb_ssl_verify(int ok, X509_STORE_CTX *ctx);
void cb_ssl_verify_set_output(FILE *fp);
void cb_ssl_verify_set_depth(unsigned int verify_depth);

12
engines/e_padlock.c
View file

@ -459,10 +459,14 @@ static inline void *name(size_t cnt, \
}
/* Generate all functions with appropriate opcodes */
PADLOCK_XCRYPT_ASM(padlock_xcrypt_ecb, ".byte 0xf3,0x0f,0xa7,0xc8") /* rep xcryptecb */
PADLOCK_XCRYPT_ASM(padlock_xcrypt_cbc, ".byte 0xf3,0x0f,0xa7,0xd0") /* rep xcryptcbc */
PADLOCK_XCRYPT_ASM(padlock_xcrypt_cfb, ".byte 0xf3,0x0f,0xa7,0xe0") /* rep xcryptcfb */
PADLOCK_XCRYPT_ASM(padlock_xcrypt_ofb, ".byte 0xf3,0x0f,0xa7,0xe8") /* rep xcryptofb */
/* rep xcryptecb */
PADLOCK_XCRYPT_ASM(padlock_xcrypt_ecb, ".byte 0xf3,0x0f,0xa7,0xc8")
/* rep xcryptcbc */
PADLOCK_XCRYPT_ASM(padlock_xcrypt_cbc, ".byte 0xf3,0x0f,0xa7,0xd0")
/* rep xcryptcfb */
PADLOCK_XCRYPT_ASM(padlock_xcrypt_cfb, ".byte 0xf3,0x0f,0xa7,0xe0")
/* rep xcryptofb */
PADLOCK_XCRYPT_ASM(padlock_xcrypt_ofb, ".byte 0xf3,0x0f,0xa7,0xe8")
#endif
/* The RNG call itself */

28
ssl/s2_clnt.c
View file

@ -388,7 +388,10 @@ static int get_server_hello(SSL *s)
i = ssl2_read(s,(char *)&(buf[s->init_num]),j);
if (i != j) return(ssl2_part_read(s,SSL_F_GET_SERVER_HELLO,i));
if (s->msg_callback)
s->msg_callback(0, s->version, 0, buf, (size_t)len, s, s->msg_callback_arg); /* SERVER-HELLO */
{
/* SERVER-HELLO */
s->msg_callback(0, s->version, 0, buf, (size_t)len, s, s->msg_callback_arg);
}
/* things are looking good */
@ -766,7 +769,10 @@ static int client_certificate(SSL *s)
return(ssl2_part_read(s,SSL_F_CLIENT_CERTIFICATE,i));
s->init_num += i;
if (s->msg_callback)
s->msg_callback(0, s->version, 0, buf, (size_t)s->init_num, s, s->msg_callback_arg); /* REQUEST-CERTIFICATE */
{
/* REQUEST-CERTIFICATE */
s->msg_callback(0, s->version, 0, buf, (size_t)s->init_num, s, s->msg_callback_arg);
}
/* type=buf[0]; */
/* type eq x509 */
@ -935,7 +941,10 @@ static int get_server_verify(SSL *s)
if (i < n)
return(ssl2_part_read(s,SSL_F_GET_SERVER_VERIFY,i));
if (s->msg_callback)
s->msg_callback(0, s->version, 0, p, len, s, s->msg_callback_arg); /* SERVER-VERIFY */
{
/* SERVER-VERIFY */
s->msg_callback(0, s->version, 0, p, len, s, s->msg_callback_arg);
}
p += 1;
if (CRYPTO_memcmp(p,s->s2->challenge,s->s2->challenge_length) != 0)
@ -989,11 +998,20 @@ static int get_server_finished(SSL *s)
len = 1 + SSL2_SSL_SESSION_ID_LENGTH;
n = len - s->init_num;
i = ssl2_read(s,(char *)&(buf[s->init_num]), n);
if (i < n) /* XXX could be shorter than SSL2_SSL_SESSION_ID_LENGTH, that's the maximum */
if (i < n)
{
/*
* XXX could be shorter than SSL2_SSL_SESSION_ID_LENGTH,
* that's the maximum
*/
return(ssl2_part_read(s,SSL_F_GET_SERVER_FINISHED,i));
}
s->init_num += i;
if (s->msg_callback)
s->msg_callback(0, s->version, 0, buf, (size_t)s->init_num, s, s->msg_callback_arg); /* SERVER-FINISHED */
{
/* SERVER-FINISHED */
s->msg_callback(0, s->version, 0, buf, (size_t)s->init_num, s, s->msg_callback_arg);
}
if (!s->hit) /* new session */
{

5
ssl/s2_lib.c
View file

@ -537,7 +537,10 @@ void ssl2_write_error(SSL *s)
if (s->error == 0)
if (s->msg_callback)
s->msg_callback(1, s->version, 0, buf, 3, s, s->msg_callback_arg); /* ERROR */
{
/* ERROR */
s->msg_callback(1, s->version, 0, buf, 3, s, s->msg_callback_arg);
}
}
}

25
ssl/s2_srvr.c
View file

@ -442,7 +442,10 @@ static int get_client_master_key(SSL *s)
i = ssl2_read(s,(char *)&(p[s->init_num]),n);
if (i != n) return(ssl2_part_read(s,SSL_F_GET_CLIENT_MASTER_KEY,i));
if (s->msg_callback)
s->msg_callback(0, s->version, 0, p, (size_t)len, s, s->msg_callback_arg); /* CLIENT-MASTER-KEY */
{
/* CLIENT-MASTER-KEY */
s->msg_callback(0, s->version, 0, p, (size_t)len, s, s->msg_callback_arg);
}
p += 10;
memcpy(s->session->key_arg,&(p[s->s2->tmp.clear+s->s2->tmp.enc]),
@ -591,7 +594,10 @@ static int get_client_hello(SSL *s)
i = ssl2_read(s,(char *)&(p[s->init_num]),n);
if (i != n) return(ssl2_part_read(s,SSL_F_GET_CLIENT_HELLO,i));
if (s->msg_callback)
s->msg_callback(0, s->version, 0, p, (size_t)len, s, s->msg_callback_arg); /* CLIENT-HELLO */
{
/* CLIENT-HELLO */
s->msg_callback(0, s->version, 0, p, (size_t)len, s, s->msg_callback_arg);
}
p += 9;
/* get session-id before cipher stuff so we can get out session
@ -864,7 +870,10 @@ static int get_client_finished(SSL *s)
return(ssl2_part_read(s,SSL_F_GET_CLIENT_FINISHED,i));
}
if (s->msg_callback)
s->msg_callback(0, s->version, 0, p, len, s, s->msg_callback_arg); /* CLIENT-FINISHED */
{
/* CLIENT-FINISHED */
s->msg_callback(0, s->version, 0, p, len, s, s->msg_callback_arg);
}
p += 1;
if (memcmp(p,s->s2->conn_id,s->s2->conn_id_length) != 0)
{
@ -987,7 +996,10 @@ static int request_certificate(SSL *s)
}
if (s->msg_callback)
s->msg_callback(0, s->version, 0, p, 3, s, s->msg_callback_arg); /* ERROR */
{
/* ERROR */
s->msg_callback(0, s->version, 0, p, 3, s, s->msg_callback_arg);
}
/* this is the one place where we can recover from an SSL 2.0 error */
@ -1042,7 +1054,10 @@ static int request_certificate(SSL *s)
goto end;
}
if (s->msg_callback)
s->msg_callback(0, s->version, 0, p, len, s, s->msg_callback_arg); /* CLIENT-CERTIFICATE */
{
/* CLIENT-CERTIFICATE */
s->msg_callback(0, s->version, 0, p, len, s, s->msg_callback_arg);
}
p += 6;
cp = p;

3
ssl/s3_srvr.c
View file

@ -1299,7 +1299,8 @@ int ssl3_get_client_hello(SSL *s)
else if (s->hit)
comp = NULL;
else if (!(s->options & SSL_OP_NO_COMPRESSION) && s->ctx->comp_methods)
{ /* See if we have a match */
{
/* See if we have a match */
int m,nn,o,v,done=0;
nn=sk_SSL_COMP_num(s->ctx->comp_methods);