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

indent has problems with comments that are on the right hand side of a line.

Browse Source 
Sometimes it fails to format them very well, and sometimes it corrupts them!
This commit moves some particularly problematic ones.

Conflicts:
	crypto/bn/bn.h
	crypto/ec/ec_lcl.h
	crypto/rsa/rsa.h
	demos/engines/ibmca/hw_ibmca.c
	ssl/ssl.h
	ssl/ssl3.h

Reviewed-by: Tim Hudson <tjh@openssl.org>
This commit is contained in:
Matt Caswell
2015-01-21 11:09:58 +00:00
parent fbdbb28ac6
commit 65a6a1ff45
35 changed files with 531 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ssl/ssl_lib.c
View File

@@ -201,10 +201,15 @@ int SSL_clear(SSL *s)
s->hit=0;
s->shutdown=0;
#if 0 /* Disabled since version 1.10 of this file (early return not
* needed because SSL_clear is not called when doing renegotiation) */
/* This is set if we are doing dynamic renegotiation so keep
* the old cipher. It is sort of a SSL_clear_lite :-) */
#if 0
/*
* Disabled since version 1.10 of this file (early return not
* needed because SSL_clear is not called when doing renegotiation)
*/
/*
* This is set if we are doing dynamic renegotiation so keep
* the old cipher. It is sort of a SSL_clear_lite :-)
*/
if (s->renegotiate) return(1);
#else
if (s->renegotiate)