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

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 43257b9f51
commit 6977c7e2ba
150 changed files with 965 additions and 700 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ssl/s3_pkt.c
View File

@@ -295,7 +295,8 @@ int ssl3_read_n(SSL *s, int n, int max, int extend)
* ssl3_get_record to loop forever. */
#define MAX_EMPTY_RECORDS 32
/* Call this to get a new input record.
/*-
* Call this to get a new input record.
* It will return <= 0 if more data is needed, normally due to an error
* or non-blocking IO.
* When it finishes, one packet has been decoded and can be found in
@@ -426,10 +427,12 @@ fprintf(stderr, "Record type=%d, Length=%d\n", rr->type, rr->length);
rr->data=rr->input;
enc_err = s->method->ssl3_enc->enc(s,0);
/* enc_err is:
/*-
* enc_err is:
* 0: (in non-constant time) if the record is publically invalid.
* 1: if the padding is valid
* -1: if the padding is invalid */
* -1: if the padding is invalid
*/
if (enc_err == 0)
{
al=SSL_AD_DECRYPTION_FAILED;
@@ -536,7 +539,8 @@ printf("\n");
}
rr->off=0;
/* So at this point the following is true
/*-
* So at this point the following is true
* ssl->s3->rrec.type is the type of record
* ssl->s3->rrec.length == number of bytes in record
* ssl->s3->rrec.off == offset to first valid byte
@@ -1132,7 +1136,8 @@ int ssl3_write_pending(SSL *s, int type, const unsigned char *buf,
}
}
/* Return up to 'len' payload bytes received in 'type' records.
/*-
* Return up to 'len' payload bytes received in 'type' records.
* 'type' is one of the following:
*
* - SSL3_RT_HANDSHAKE (when ssl3_get_message calls us)
@@ -1214,10 +1219,12 @@ int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
start:
s->rwstate=SSL_NOTHING;
/* s->s3->rrec.type - is the type of record
/*-
* s->s3->rrec.type - is the type of record
* s->s3->rrec.data, - data
* s->s3->rrec.off, - offset into 'data' for next read
* s->s3->rrec.length, - number of bytes. */
* s->s3->rrec.length, - number of bytes.
*/
rr = &(s->s3->rrec);
/* get new packet if necessary */
@@ -1339,9 +1346,11 @@ start:
}
}
/* s->s3->handshake_fragment_len == 4 iff rr->type == SSL3_RT_HANDSHAKE;
/*-
* s->s3->handshake_fragment_len == 4 iff rr->type == SSL3_RT_HANDSHAKE;
* s->s3->alert_fragment_len == 2 iff rr->type == SSL3_RT_ALERT.
* (Possibly rr is 'empty' now, i.e. rr->length may be 0.) */
* (Possibly rr is 'empty' now, i.e. rr->length may be 0.)
*/
/* If we are a client, check for an incoming 'Hello Request': */
if ((!s->server) &&