mark all block comments that need format preserving so that
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:
15
ssl/d1_pkt.c
15
ssl/d1_pkt.c
@@ -525,7 +525,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
|
||||
@@ -544,7 +545,8 @@ err:
|
||||
}
|
||||
|
||||
|
||||
/* 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
|
||||
@@ -729,7 +731,8 @@ again:
|
||||
|
||||
}
|
||||
|
||||
/* 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)
|
||||
@@ -807,10 +810,12 @@ int dtls1_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);
|
||||
|
||||
/* We are not handshaking and have no data yet,
|
||||
|
Reference in New Issue
Block a user