When processing ClientHello.cipher_suites, don't ignore cipher suites

[openssl.git] / ssl / heartbeat_test.c

diff --git a/ssl/heartbeat_test.c b/ssl/heartbeat_test.c
index a0a3690096d504e74881c062852f3a6cdfa065c6..fc19259b437952360ce497e47ebe0785bdb617c0 100644 (file)
--- a/ssl/heartbeat_test.c
+++ b/ssl/heartbeat_test.c
@@ -38,14 +38,17 @@
  * http://mike-bland.com/tags/heartbleed.html
  */
 
-#include "../test/testutil.h"
+#define OPENSSL_UNIT_TEST
+
 #include "../ssl/ssl_locl.h"
+
+#include "testutil.h"
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#if !defined(OPENSSL_NO_HEARTBEATS) && !defined(OPENSSL_SYS_WINDOWS)
+#if !defined(OPENSSL_NO_HEARTBEATS) && !defined(OPENSSL_NO_UNIT_TEST)
 
 /* As per https://tools.ietf.org/html/rfc6520#section-4 */
 #define MIN_PADDING_SIZE       16
@@ -273,7 +276,8 @@ static int test_dtls1_not_bleeding()
        {
        SETUP_HEARTBEAT_TEST_FIXTURE(dtls);
        /* Three-byte pad at the beginning for type and payload length */
-       unsigned char payload_buf[] = "   Not bleeding, sixteen spaces of padding"
+       unsigned char payload_buf[MAX_PRINTABLE_CHARACTERS+4] =
+               "   Not bleeding, sixteen spaces of padding"
                "                ";
        const int payload_buf_len = honest_payload_size(payload_buf);
 
@@ -292,9 +296,9 @@ static int test_dtls1_not_bleeding_empty_payload()
        SETUP_HEARTBEAT_TEST_FIXTURE(dtls);
        /* Three-byte pad at the beginning for type and payload length, plus a NUL
         * at the end */
-       unsigned char payload_buf[4 + MIN_PADDING_SIZE];
-       memset(payload_buf, ' ', sizeof(payload_buf));
-       payload_buf[sizeof(payload_buf) - 1] = '\0';
+       unsigned char payload_buf[4 + MAX_PRINTABLE_CHARACTERS];
+       memset(payload_buf, ' ', MIN_PADDING_SIZE+3);
+       payload_buf[MIN_PADDING_SIZE+3] = '\0';
        payload_buf_len = honest_payload_size(payload_buf);
 
        fixture.payload = &payload_buf[0];
@@ -309,7 +313,8 @@ static int test_dtls1_heartbleed()
        {
        SETUP_HEARTBEAT_TEST_FIXTURE(dtls);
        /* Three-byte pad at the beginning for type and payload length */
-       unsigned char payload_buf[] = "   HEARTBLEED                ";
+       unsigned char payload_buf[4+MAX_PRINTABLE_CHARACTERS] =
+               "   HEARTBLEED                ";
 
        fixture.payload = &payload_buf[0];
        fixture.sent_payload_len = MAX_PRINTABLE_CHARACTERS;
@@ -324,9 +329,9 @@ static int test_dtls1_heartbleed_empty_payload()
        SETUP_HEARTBEAT_TEST_FIXTURE(dtls);
        /* Excluding the NUL at the end, one byte short of type + payload length +
         * minimum padding */
-       unsigned char payload_buf[MIN_PADDING_SIZE + 3];
-       memset(payload_buf, ' ', sizeof(payload_buf));
-       payload_buf[sizeof(payload_buf) - 1] = '\0';
+       unsigned char payload_buf[MAX_PRINTABLE_CHARACTERS + 4];
+       memset(payload_buf, ' ', MIN_PADDING_SIZE+2);
+       payload_buf[MIN_PADDING_SIZE+2] = '\0';
 
        fixture.payload = &payload_buf[0];
        fixture.sent_payload_len = MAX_PRINTABLE_CHARACTERS;
@@ -357,8 +362,9 @@ static int test_tls1_not_bleeding()
        {
        SETUP_HEARTBEAT_TEST_FIXTURE(tls);
        /* Three-byte pad at the beginning for type and payload length */
-       unsigned char payload_buf[] = "   Not bleeding, sixteen spaces of padding"
-                                       "                ";
+       unsigned char payload_buf[MAX_PRINTABLE_CHARACTERS+4] =
+                       "   Not bleeding, sixteen spaces of padding"
+                       "                ";
        const int payload_buf_len = honest_payload_size(payload_buf);
 
        fixture.payload = &payload_buf[0];
@@ -376,9 +382,9 @@ static int test_tls1_not_bleeding_empty_payload()
        SETUP_HEARTBEAT_TEST_FIXTURE(tls);
        /* Three-byte pad at the beginning for type and payload length, plus a NUL
         * at the end */
-       unsigned char payload_buf[4 + MIN_PADDING_SIZE];
-       memset(payload_buf, ' ', sizeof(payload_buf));
-       payload_buf[sizeof(payload_buf) - 1] = '\0';
+       unsigned char payload_buf[4 + MAX_PRINTABLE_CHARACTERS];
+       memset(payload_buf, ' ', MIN_PADDING_SIZE+3);
+       payload_buf[MIN_PADDING_SIZE+3] = '\0';
        payload_buf_len = honest_payload_size(payload_buf);
 
        fixture.payload = &payload_buf[0];
@@ -393,7 +399,8 @@ static int test_tls1_heartbleed()
        {
        SETUP_HEARTBEAT_TEST_FIXTURE(tls);
        /* Three-byte pad at the beginning for type and payload length */
-       unsigned char payload_buf[] = "   HEARTBLEED                ";
+       unsigned char payload_buf[MAX_PRINTABLE_CHARACTERS+4] =
+                       "   HEARTBLEED                ";
 
        fixture.payload = &payload_buf[0];
        fixture.sent_payload_len = MAX_PRINTABLE_CHARACTERS;
@@ -408,9 +415,9 @@ static int test_tls1_heartbleed_empty_payload()
        SETUP_HEARTBEAT_TEST_FIXTURE(tls);
        /* Excluding the NUL at the end, one byte short of type + payload length +
         * minimum padding */
-       unsigned char payload_buf[MIN_PADDING_SIZE + 3];
-       memset(payload_buf, ' ', sizeof(payload_buf));
-       payload_buf[sizeof(payload_buf) - 1] = '\0';
+       unsigned char payload_buf[MAX_PRINTABLE_CHARACTERS + 4];
+       memset(payload_buf, ' ', MIN_PADDING_SIZE+2);
+       payload_buf[MIN_PADDING_SIZE+2] = '\0';
 
        fixture.payload = &payload_buf[0];
        fixture.sent_payload_len = MAX_PRINTABLE_CHARACTERS;
@@ -425,33 +432,24 @@ static int test_tls1_heartbleed_empty_payload()
 
 int main(int argc, char *argv[])
        {
-       int num_failed;
+       int result = 0;
 
        SSL_library_init();
        SSL_load_error_strings();
 
-       num_failed = test_dtls1_not_bleeding() +
-           test_dtls1_not_bleeding_empty_payload() +
-           test_dtls1_heartbleed() +
-           test_dtls1_heartbleed_empty_payload() +
-           /* The following test causes an assertion failure at
-            * ssl/d1_pkt.c:dtls1_write_bytes() in versions prior to 1.0.1g: */
-           (OPENSSL_VERSION_NUMBER >= 0x1000107fL ?
-            test_dtls1_heartbleed_excessive_plaintext_length() : 0) +
-           test_tls1_not_bleeding() +
-           test_tls1_not_bleeding_empty_payload() +
-           test_tls1_heartbleed() +
-           test_tls1_heartbleed_empty_payload() +
-           0;
-
+       ADD_TEST(test_dtls1_not_bleeding);
+       ADD_TEST(test_dtls1_not_bleeding_empty_payload);
+       ADD_TEST(test_dtls1_heartbleed);
+       ADD_TEST(test_dtls1_heartbleed_empty_payload);
+       ADD_TEST(test_dtls1_heartbleed_excessive_plaintext_length);
+       ADD_TEST(test_tls1_not_bleeding);
+       ADD_TEST(test_tls1_not_bleeding_empty_payload);
+       ADD_TEST(test_tls1_heartbleed);
+       ADD_TEST(test_tls1_heartbleed_empty_payload);
+
+       result = run_tests(argv[0]);
        ERR_print_errors_fp(stderr);
-
-       if (num_failed != 0)
-               {
-               printf("%d test%s failed\n", num_failed, num_failed != 1 ? "s" : "");
-               return EXIT_FAILURE;
-               }
-       return EXIT_SUCCESS;
+       return result;
        }
 
 #else /* OPENSSL_NO_HEARTBEATS*/