diff options
| author | Matt Caswell <matt@openssl.org> | 2015-02-04 15:52:15 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-03-26 15:02:01 +0000 |
| commit | 9e7ba3b2a2ffc049b4b5c664cf33473b475ce323 (patch) | |
| tree | 500e8c893f6d250898456877888fb2ad2012d2b8 /ssl/record/s23_pkt.c | |
| parent | c99c4c11a202ed71d4c232075668a876f352d71a (diff) | |
| download | openssl-9e7ba3b2a2ffc049b4b5c664cf33473b475ce323.tar.gz | |
Remove some unneccessary macros
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'ssl/record/s23_pkt.c')
| -rw-r--r-- | ssl/record/s23_pkt.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ssl/record/s23_pkt.c b/ssl/record/s23_pkt.c index 88acf9f735..76267c5936 100644 --- a/ssl/record/s23_pkt.c +++ b/ssl/record/s23_pkt.c @@ -94,20 +94,20 @@ int ssl23_read_bytes(SSL *s, int n) unsigned char *p; int j; - if (RECORD_LAYER_get_packet_length(&s->rlayer) < (unsigned int)n) { - p = RECORD_LAYER_get_packet(&s->rlayer); + if (s->rlayer.packet_length < (unsigned int)n) { + p = s->rlayer.packet; for (;;) { s->rwstate = SSL_READING; j = BIO_read(s->rbio, - (char *)&(p[RECORD_LAYER_get_packet_length(&s->rlayer)]), - n - RECORD_LAYER_get_packet_length(&s->rlayer)); + (char *)&(p[s->rlayer.packet_length]), + n - s->rlayer.packet_length); if (j <= 0) return (j); s->rwstate = SSL_NOTHING; - RECORD_LAYER_add_packet_length(&s->rlayer, j); - if (RECORD_LAYER_get_packet_length(&s->rlayer) >= (unsigned int)n) - return (RECORD_LAYER_get_packet_length(&s->rlayer)); + s->rlayer.packet_length += j; + if (s->rlayer.packet_length >= (unsigned int)n) + return (s->rlayer.packet_length); } } return (n); |