Remove a stray TODO that has already been fixed
authorMatt Caswell <matt@openssl.org>
Wed, 19 Oct 2016 16:37:22 +0000 (17:37 +0100)
committerMatt Caswell <matt@openssl.org>
Fri, 4 Nov 2016 12:09:46 +0000 (12:09 +0000)
Reviewed-by: Rich Salz <rsalz@openssl.org>
ssl/bio_ssl.c
ssl/record/ssl3_record.c

index e2769e1..596df24 100644 (file)
@@ -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:
index d58e5bc..c7f0d98 100644 (file)
@@ -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,