Remove some unneccessary macros

Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Matt Caswell 2015-02-04 15:52:15 +00:00
parent c99c4c11a2
commit 9e7ba3b2a2

View File

@ -94,20 +94,20 @@ int ssl23_read_bytes(SSL *s, int n)
unsigned char *p; unsigned char *p;
int j; int j;
if (RECORD_LAYER_get_packet_length(&s->rlayer) < (unsigned int)n) { if (s->rlayer.packet_length < (unsigned int)n) {
p = RECORD_LAYER_get_packet(&s->rlayer); p = s->rlayer.packet;
for (;;) { for (;;) {
s->rwstate = SSL_READING; s->rwstate = SSL_READING;
j = BIO_read(s->rbio, j = BIO_read(s->rbio,
(char *)&(p[RECORD_LAYER_get_packet_length(&s->rlayer)]), (char *)&(p[s->rlayer.packet_length]),
n - RECORD_LAYER_get_packet_length(&s->rlayer)); n - s->rlayer.packet_length);
if (j <= 0) if (j <= 0)
return (j); return (j);
s->rwstate = SSL_NOTHING; s->rwstate = SSL_NOTHING;
RECORD_LAYER_add_packet_length(&s->rlayer, j); s->rlayer.packet_length += j;
if (RECORD_LAYER_get_packet_length(&s->rlayer) >= (unsigned int)n) if (s->rlayer.packet_length >= (unsigned int)n)
return (RECORD_LAYER_get_packet_length(&s->rlayer)); return (s->rlayer.packet_length);
} }
} }
return (n); return (n);