Ordinals adjustment

[openssl.git] / test / ct_test.c

diff --git a/test/ct_test.c b/test/ct_test.c
index d5eb5ecbe0cc53eb09830388c1039ed12a8b7956..16855df5afc9de36b30069e0587aee35592d8bf3 100644 (file)
--- a/test/ct_test.c
+++ b/test/ct_test.c
@@ -69,8 +69,8 @@
 /* Used when declaring buffers to read text files into */
 #define CT_TEST_MAX_FILE_SIZE 8096
 
-char *certs_dir = NULL;
-char *ct_dir = NULL;
+static char *certs_dir = NULL;
+static char *ct_dir = NULL;
 
 typedef struct ct_test_fixture {
     const char *test_case_name;
@@ -82,7 +82,7 @@ typedef struct ct_test_fixture {
     char *issuer_file;
     int expected_sct_count;
     /* Set the following to test handling of SCTs in TLS format */
-    const uint8_t *tls_sct;
+    const unsigned char *tls_sct;
     size_t tls_sct_len;
     SCT *sct;
     /*
@@ -202,7 +202,7 @@ static int compare_sct_printout(SCT *sct,
         goto end;
     }
 
-    SCT_print(sct, text_buffer, 0);
+    SCT_print(sct, text_buffer, 0, NULL);
 
     /* Append null terminator because we're about to use the buffer contents
     * as a string. */
@@ -340,12 +340,18 @@ static int execute_cert_test(CT_TEST_FIXTURE fixture)
 
             if (fixture.test_validity) {
                 int are_scts_validated = 0;
+                int i;
+
                 scts = X509V3_EXT_d2i(sct_extension);
-                if (SCT_LIST_set_source(scts, SCT_SOURCE_X509V3_EXTENSION) !=
-                    sk_SCT_num(scts)) {
-                    fprintf(stderr,
-                            "Error setting SCT source to X509v3 extension\n");
-                    test_failed = 1;
+                for (i = 0; i < sk_SCT_num(scts); ++i) {
+                    SCT *sct_i = sk_SCT_value(scts, i);
+
+                    if (!SCT_set_source(sct_i, SCT_SOURCE_X509V3_EXTENSION)) {
+                        fprintf(stderr,
+                                "Error setting SCT source to X509v3 extension\n");
+                        test_failed = 1;
+                        goto end;
+                    }
                 }
 
                 are_scts_validated = SCT_LIST_validate(scts, ct_policy_ctx);
@@ -355,7 +361,6 @@ static int execute_cert_test(CT_TEST_FIXTURE fixture)
                 } else if (!are_scts_validated) {
                     int invalid_sct_count = 0;
                     int valid_sct_count = 0;
-                    int i;
 
                     for (i = 0; i < sk_SCT_num(scts); ++i) {
                         SCT *sct_i = sk_SCT_value(scts, i);
@@ -507,9 +512,7 @@ static int test_verify_multiple_scts()
 
 static int test_decode_tls_sct()
 {
-    SETUP_CT_TEST_FIXTURE();
-    fixture.tls_sct = (unsigned char *)
-        "\x00" /* version */
+    const unsigned char tls_sct[] = "\x00" /* version */
         /* log ID */
         "\xDF\x1C\x2E\xC1\x15\x00\x94\x52\x47\xA9\x61\x68\x32\x5D\xDC\x5C\x79"
         "\x59\xE8\xF7\xC6\xD3\x88\xFC\x00\x2E\x0B\xBD\x3F\x74\xD7\x64"
@@ -518,11 +521,15 @@ static int test_decode_tls_sct()
         "" /* extensions */
         "\x04\x03" /* hash and signature algorithms */
         "\x00\x47" /* signature length */
+        /* signature */
         "\x30\x45\x02\x20\x48\x2F\x67\x51\xAF\x35\xDB\xA6\x54\x36\xBE\x1F\xD6"
         "\x64\x0F\x3D\xBF\x9A\x41\x42\x94\x95\x92\x45\x30\x28\x8F\xA3\xE5\xE2"
         "\x3E\x06\x02\x21\x00\xE4\xED\xC0\xDB\x3A\xC5\x72\xB1\xE2\xF5\xE8\xAB"
         "\x6A\x68\x06\x53\x98\x7D\xCF\x41\x02\x7D\xFE\xFF\xA1\x05\x51\x9D\x89"
-        "\xED\xBF\x08"; /* signature */
+        "\xED\xBF\x08";
+
+    SETUP_CT_TEST_FIXTURE();
+    fixture.tls_sct = tls_sct;
     fixture.tls_sct_len = 118;
     fixture.sct_dir = ct_dir;
     fixture.sct_text_file = "tls1.sct";
@@ -531,34 +538,33 @@ static int test_decode_tls_sct()
 
 static int test_encode_tls_sct()
 {
+    const unsigned char log_id[] = "\xDF\x1C\x2E\xC1\x15\x00\x94\x52\x47\xA9"
+            "\x61\x68\x32\x5D\xDC\x5C\x79\x59\xE8\xF7\xC6\xD3\x88\xFC\x00\x2E"
+            "\x0B\xBD\x3F\x74\xD7\x64";
+
+    const unsigned char signature[] = "\x45\x02\x20\x48\x2F\x67\x51\xAF\x35"
+            "\xDB\xA6\x54\x36\xBE\x1F\xD6\x64\x0F\x3D\xBF\x9A\x41\x42\x94\x95"
+            "\x92\x45\x30\x28\x8F\xA3\xE5\xE2\x3E\x06\x02\x21\x00\xE4\xED\xC0"
+            "\xDB\x3A\xC5\x72\xB1\xE2\xF5\xE8\xAB\x6A\x68\x06\x53\x98\x7D\xCF"
+            "\x41\x02\x7D\xFE\xFF\xA1\x05\x51\x9D\x89\xED\xBF\x08";
+
     SETUP_CT_TEST_FIXTURE();
 
     SCT *sct = SCT_new();
-    if (!SCT_set_version(sct, 0)) {
+    if (!SCT_set_version(sct, SCT_VERSION_V1)) {
         fprintf(stderr, "Failed to set SCT version\n");
         return 1;
     }
-    if (!SCT_set1_log_id(sct, (unsigned char *)
-        "\xDF\x1C\x2E\xC1\x15\x00\x94\x52\x47\xA9\x61\x68\x32\x5D\xDC\x5C\x79"
-        "\x59\xE8\xF7\xC6\xD3\x88\xFC\x00\x2E\x0B\xBD\x3F\x74\xD7\x64", 32)) {
+    if (!SCT_set1_log_id(sct, log_id, 32)) {
         fprintf(stderr, "Failed to set SCT log ID\n");
         return 1;
     }
     SCT_set_timestamp(sct, 1);
-    if (!SCT_set1_extensions(sct, (unsigned char *)"", 0)) {
-        fprintf(stderr, "Failed to set SCT extensions\n");
-        return 1;
-    }
     if (!SCT_set_signature_nid(sct, NID_ecdsa_with_SHA256)) {
         fprintf(stderr, "Failed to set SCT signature NID\n");
         return 1;
     }
-    if (!SCT_set1_signature(sct, (unsigned char *)
-        "\x45\x02\x20\x48\x2F\x67\x51\xAF\x35\xDB\xA6\x54\x36\xBE"
-        "\x1F\xD6\x64\x0F\x3D\xBF\x9A\x41\x42\x94\x95\x92\x45\x30\x28\x8F\xA3"
-        "\xE5\xE2\x3E\x06\x02\x21\x00\xE4\xED\xC0\xDB\x3A\xC5\x72\xB1\xE2\xF5"
-        "\xE8\xAB\x6A\x68\x06\x53\x98\x7D\xCF\x41\x02\x7D\xFE\xFF\xA1\x05\x51"
-        "\x9D\x89\xED\xBF\x08", 71)) {
+    if (!SCT_set1_signature(sct, signature, 71)) {
         fprintf(stderr, "Failed to set SCT signature\n");
         return 1;
     }