From: Matt Caswell <matt@openssl.org>
Date: Wed, 2 May 2018 15:08:07 +0000 (+0100)
Subject: Add some more SSL_pending() and SSL_has_pending() tests
X-Git-Tag: OpenSSL_1_1_1-pre7~67
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e825109236f6795fbe24c0c6a489ef89ca05a906;p=oweals%2Fopenssl.git

Add some more SSL_pending() and SSL_has_pending() tests

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6159)
---

diff --git a/test/sslapitest.c b/test/sslapitest.c
index bce15dbc6b..26ef435417 100644
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -4454,11 +4454,16 @@ static int test_ssl_pending(int tst)
                                                 SSL_ERROR_NONE)))
         goto end;
 
-    if (!TEST_true(SSL_write_ex(serverssl, msg, sizeof(msg), &written))
+    if (!TEST_int_eq(SSL_pending(clientssl), 0)
+            || !TEST_false(SSL_has_pending(clientssl))
+            || !TEST_int_eq(SSL_pending(serverssl), 0)
+            || !TEST_false(SSL_has_pending(serverssl))
+            || !TEST_true(SSL_write_ex(serverssl, msg, sizeof(msg), &written))
             || !TEST_size_t_eq(written, sizeof(msg))
             || !TEST_true(SSL_read_ex(clientssl, buf, sizeof(buf), &readbytes))
             || !TEST_size_t_eq(readbytes, sizeof(buf))
-            || !TEST_int_eq(SSL_pending(clientssl), (int)(written - readbytes)))
+            || !TEST_int_eq(SSL_pending(clientssl), (int)(written - readbytes))
+            || !TEST_true(SSL_has_pending(clientssl)))
         goto end;
 
     testresult = 1;