Extensive application of __owur to CT functions that return a boolean
[openssl.git] / test / ct_test.c
index f60be6022b01519f104a52de39ca24718ba01498..d5eb5ecbe0cc53eb09830388c1039ed12a8b7956 100644 (file)
@@ -341,7 +341,12 @@ static int execute_cert_test(CT_TEST_FIXTURE fixture)
             if (fixture.test_validity) {
                 int are_scts_validated = 0;
                 scts = X509V3_EXT_d2i(sct_extension);
             if (fixture.test_validity) {
                 int are_scts_validated = 0;
                 scts = X509V3_EXT_d2i(sct_extension);
-                SCT_LIST_set_source(scts, SCT_SOURCE_X509V3_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;
+                }
 
                 are_scts_validated = SCT_LIST_validate(scts, ct_policy_ctx);
                 if (are_scts_validated < 0) {
 
                 are_scts_validated = SCT_LIST_validate(scts, ct_policy_ctx);
                 if (are_scts_validated < 0) {
@@ -529,19 +534,34 @@ static int test_encode_tls_sct()
     SETUP_CT_TEST_FIXTURE();
 
     SCT *sct = SCT_new();
     SETUP_CT_TEST_FIXTURE();
 
     SCT *sct = SCT_new();
-    SCT_set_version(sct, 0);
-    SCT_set1_log_id(sct, (unsigned char *)
+    if (!SCT_set_version(sct, 0)) {
+        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"
         "\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);
+        "\x59\xE8\xF7\xC6\xD3\x88\xFC\x00\x2E\x0B\xBD\x3F\x74\xD7\x64", 32)) {
+        fprintf(stderr, "Failed to set SCT log ID\n");
+        return 1;
+    }
     SCT_set_timestamp(sct, 1);
     SCT_set_timestamp(sct, 1);
-    SCT_set1_extensions(sct, (unsigned char *)"", 0);
-    SCT_set_signature_nid(sct, NID_ecdsa_with_SHA256);
-    SCT_set1_signature(sct, (unsigned char *)
+    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"
         "\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);
+        "\x9D\x89\xED\xBF\x08", 71)) {
+        fprintf(stderr, "Failed to set SCT signature\n");
+        return 1;
+    }
     fixture.sct = sct;
     fixture.sct_dir = ct_dir;
     fixture.sct_text_file = "tls1.sct";
     fixture.sct = sct;
     fixture.sct_dir = ct_dir;
     fixture.sct_text_file = "tls1.sct";