diff options
| author | Matt Caswell <matt@openssl.org> | 2016-10-19 17:37:22 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-11-04 12:09:46 +0000 |
| commit | 699ae85915f83f91bf5d5af45dd4888217005461 (patch) | |
| tree | 6244c82812236765d9833c016e06ca7e2032a226 | |
| parent | 2688e7a0beb0f5e76a98749f25b978ddfb40ac7f (diff) | |
Remove a stray TODO that has already been fixed
Reviewed-by: Rich Salz <rsalz@openssl.org>
| -rw-r--r-- | ssl/bio_ssl.c | 7 | ||||
| -rw-r--r-- | ssl/record/ssl3_record.c | 1 |
2 files changed, 1 insertions, 7 deletions
diff --git a/ssl/bio_ssl.c b/ssl/bio_ssl.c index e2769e1d6a..596df240d3 100644 --- a/ssl/bio_ssl.c +++ b/ssl/bio_ssl.c @@ -103,12 +103,7 @@ static int ssl_read(BIO *b, char *buf, size_t size, size_t *readbytes) BIO_clear_retry_flags(b); - if (size > INT_MAX) - size = INT_MAX; - - ret = SSL_read(ssl, buf, size); - if (ret > 0) - *readbytes = ret; + ret = SSL_read_ex(ssl, buf, size, readbytes); switch (SSL_get_error(ssl, ret)) { case SSL_ERROR_NONE: diff --git a/ssl/record/ssl3_record.c b/ssl/record/ssl3_record.c index d58e5bcdb1..c7f0d987c3 100644 --- a/ssl/record/ssl3_record.c +++ b/ssl/record/ssl3_record.c @@ -1034,7 +1034,6 @@ int tls1_mac(SSL *ssl, SSL3_RECORD *rec, unsigned char *md, int send) * are hashing because that gives an attacker a timing-oracle. */ /* Final param == not SSLv3 */ - /* TODO(size_t): Convert this call */ if (ssl3_cbc_digest_record(mac_ctx, md, &md_size, header, rec->input, |