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

mark all block comments that need format preserving so that

Browse Source 
indent will not alter them when reformatting comments

(cherry picked from commit 1d97c84351)

Conflicts:
	crypto/bn/bn_lcl.h
	crypto/bn/bn_prime.c
	crypto/engine/eng_all.c
	crypto/rc4/rc4_utl.c
	crypto/sha/sha.h
	ssl/kssl.c
	ssl/t1_lib.c

Conflicts:
	crypto/rc4/rc4_enc.c
	crypto/x509v3/v3_scts.c
	crypto/x509v3/v3nametest.c
	ssl/d1_both.c
	ssl/s3_srvr.c
	ssl/ssl.h
	ssl/ssl_locl.h
	ssl/ssltest.c
	ssl/t1_lib.c

Reviewed-by: Tim Hudson <tjh@openssl.org>
This commit is contained in:
Tim Hudson
2014-12-28 12:48:40 +10:00
committed by Matt Caswell
parent 3a9a032163
commit 3e9a08ecb1
174 changed files with 1046 additions and 744 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ssl/ssl_sess.c
View File

@@ -335,7 +335,7 @@ int ssl_get_new_session(SSL *s, int session)
return(0);
}
#ifndef OPENSSL_NO_TLSEXT
/*
/*-
* If RFC5077 ticket, use empty session ID (as server).
* Note that:
* (a) ssl_get_prev_session() does lookahead into the
@@ -455,7 +455,8 @@ int ssl_get_new_session(SSL *s, int session)
return(1);
}
/* ssl_get_prev attempts to find an SSL_SESSION to be used to resume this
/*-
* ssl_get_prev attempts to find an SSL_SESSION to be used to resume this
* connection. It is only called by servers.
*
* session_id: points at the session ID in the ClientHello. This code will