CDRIVER-5872 update kms-message to commit 34a9572 (#1838)

kevinAlbs · web-flow · commit 3e3717d13036 · 2025-01-28T15:41:19.000-05:00
* update kms-divergence-check

* copy kms-message at commit 34a9572c416e0827a1fa988baf88411c4b5f2c7b
diff --git a/.evergreen/scripts/kms-divergence-check.sh b/.evergreen/scripts/kms-divergence-check.sh
@@ -13,7 +13,7 @@ LIBMONGOCRYPT_DIR="$MONGOC_DIR/libmongocrypt-for-kms-divergence-check"
 
 # LIBMONGOCRYPT_GITREF is expected to refer to the version of libmongocrypt
 # where kms-message was last copied.
-LIBMONGOCRYPT_GITREF="ea8af831bf067cc7eed7417ff4aef3c14cf1e67a"
+LIBMONGOCRYPT_GITREF="34a9572c416e0827a1fa988baf88411c4b5f2c7b"
 
 cleanup() {
     if [ -d "$LIBMONGOCRYPT_DIR" ]; then
diff --git a/src/kms-message/src/kms_crypto_windows.c b/src/kms-message/src/kms_crypto_windows.c
@@ -168,7 +168,7 @@ kms_sign_rsaes_pkcs1_v1_5 (void *unused_ctx,
 
    success = CryptDecodeObjectEx (X509_ASN_ENCODING,
                                   PKCS_PRIVATE_KEY_INFO,
-                                  private_key,
+                                  (BYTE*) private_key,
                                   (DWORD) private_key_len,
                                   0,
                                   NULL,
@@ -182,7 +182,7 @@ kms_sign_rsaes_pkcs1_v1_5 (void *unused_ctx,
 
    success = CryptDecodeObjectEx (X509_ASN_ENCODING,
                                   PKCS_PRIVATE_KEY_INFO,
-                                  private_key,
+                                  (BYTE*) private_key,
                                   (DWORD) private_key_len,
                                   0,
                                   NULL,
diff --git a/src/kms-message/src/kms_request.c b/src/kms-message/src/kms_request.c
@@ -789,7 +789,7 @@ kms_request_get_signed (kms_request_t *request)
    }
 
    if (!check_and_prohibit_kmip (request)) {
-      return false;
+      return NULL;
    }
 
    if (!finalize (request)) {
@@ -857,11 +857,11 @@ kms_request_to_string (kms_request_t *request)
    size_t i;
 
    if (!finalize (request)) {
-      return false;
+      return NULL;
    }
 
    if (!check_and_prohibit_kmip (request)) {
-      return false;
+      return NULL;
    }
 
    if (request->to_string) {
diff --git a/src/kms-message/test/test_kmip_reader_writer.c b/src/kms-message/test/test_kmip_reader_writer.c
@@ -42,11 +42,11 @@ kms_kmip_writer_test_evaluate (kmip_writer_t *writer,
    actual_hex = data_to_hex (actual_buf, actual_len);
 
    if (0 != strcmp (expected_hex, actual_hex)) {
-      fprintf (stderr,
-               "expected '%s' but got '%s' for test description: %s\n",
-               expected_hex,
-               actual_hex,
-               desc);
+      TEST_STDERR_PRINTF (
+         "expected '%s' but got '%s' for test description: %s\n",
+         expected_hex,
+         actual_hex,
+         desc);
       abort ();
    }
 
diff --git a/src/kms-message/test/test_kms_assert.h b/src/kms-message/test/test_kms_assert.h
@@ -23,14 +23,31 @@
 #include <stdio.h>
 #include <string.h>
 
-#define TEST_ERROR(...)                                                        \
-   do {                                                                        \
-      fprintf (                                                                \
-         stderr, "test error %s:%d %s(): ", __FILE__, __LINE__, __FUNCTION__); \
-      fprintf (stderr, __VA_ARGS__);                                           \
-      fprintf (stderr, "\n");                                                  \
-      fflush (stderr);                                                         \
-      abort ();                                                                \
+// TEST_PRINTF ensures stdout and stderr are flushed.
+#define TEST_PRINTF(...)             \
+   if (1) {                          \
+      fflush (stderr);               \
+      fprintf (stdout, __VA_ARGS__); \
+      fflush (stdout);               \
+   } else                            \
+      ((void) 0)
+
+// TEST_STDERR_PRINTF ensures stdout and stderr are flushed.
+#define TEST_STDERR_PRINTF(...)      \
+   if (1) {                          \
+      fflush (stdout);               \
+      fprintf (stderr, __VA_ARGS__); \
+      fflush (stderr);               \
+   } else                            \
+      ((void) 0)
+
+#define TEST_ERROR(...)                                                \
+   do {                                                                \
+      TEST_STDERR_PRINTF (                                             \
+         "test error %s:%d %s(): ", __FILE__, __LINE__, __FUNCTION__); \
+      TEST_STDERR_PRINTF (__VA_ARGS__);                                \
+      TEST_STDERR_PRINTF ("\n");                                       \
+      abort ();                                                        \
    } while (0)
 
 #define ASSERT(stmt)                             \
diff --git a/src/kms-message/test/test_kms_azure_online.c b/src/kms-message/test/test_kms_azure_online.c
@@ -56,8 +56,8 @@ test_getenv (const char *key)
 {
    char *value = getenv (key);
    if (!value) {
-      fprintf (
-         stderr, "Environment variable: %s not set (@@ctest-skip@@)", key);
+      TEST_STDERR_PRINTF ("Environment variable: %s not set (@@ctest-skip@@)\n",
+                          key);
       exit (2);
    }
    TEST_TRACE ("Env: %s = %s", key, value);
diff --git a/src/kms-message/test/test_kms_gcp_online.c b/src/kms-message/test/test_kms_gcp_online.c
@@ -56,8 +56,8 @@ test_getenv (const char *key)
 {
    char *value = getenv (key);
    if (!value) {
-      fprintf (
-         stderr, "Environment variable: %s not set (@@ctest-skip@@)", key);
+      TEST_STDERR_PRINTF ("Environment variable: %s not set (@@ctest-skip@@)\n",
+                          key);
       exit (2);
    }
    TEST_TRACE ("Env: %s = %s", key, value);
@@ -185,7 +185,7 @@ test_gcp (void)
                                       opt);
    ASSERT (req);
    if (kms_request_get_error (req)) {
-      printf ("error: %s\n", kms_request_get_error (req));
+      TEST_STDERR_PRINTF ("error: %s\n", kms_request_get_error (req));
       ASSERT (false);
    }
    req_str = kms_request_to_string (req);
diff --git a/src/kms-message/test/test_kms_request.c b/src/kms-message/test/test_kms_request.c
@@ -383,7 +383,7 @@ all_aws_sig_v4_tests (const char *path, const char *selected)
    }
 
    if (skip_aws_test (test_name) && !selected) {
-      printf ("SKIP: %s\n", test_name);
+      TEST_PRINTF ("SKIP: %s\n", test_name);
       goto done;
    }
 
@@ -407,7 +407,7 @@ all_aws_sig_v4_tests (const char *path, const char *selected)
          continue;
       }
 
-      printf ("%s\n", path);
+      TEST_PRINTF ("%s\n", path);
       aws_sig_v4_test (path);
       ran_tests = true;
    }
@@ -903,7 +903,7 @@ parser_testcase_run (parser_testcase_t *testcase)
       size_t ret = fread (buf, 1, (size_t) bytes_to_read, response_file);
 
       if (!kms_response_parser_feed (parser, buf, (int) ret)) {
-         printf ("feed error: %s\n", parser->error);
+         TEST_PRINTF ("feed error: %s\n", parser->error);
          ASSERT (false);
       }
    }
@@ -945,7 +945,7 @@ kms_response_parser_files (void)
    size_t i;
 
    for (i = 0; i < sizeof (tests) / sizeof (tests[0]); i++) {
-      printf (" parser testcase: %d\n", (int) i);
+      TEST_PRINTF (" parser testcase: %d\n", (int) i);
       parser_testcase_run (tests + i);
    }
 }
@@ -1081,8 +1081,8 @@ kms_signature_test (void)
    signature_b64 = kms_message_raw_to_b64 (signature_raw, 256);
 
    if (0 != strcmp (signature_b64, expected_signature)) {
-      printf ("generated signature: %s\n", signature_b64);
-      printf ("but expected signature: %s\n", expected_signature);
+      TEST_PRINTF ("generated signature: %s\n", signature_b64);
+      TEST_PRINTF ("but expected signature: %s\n", expected_signature);
       abort ();
    }
 
@@ -1197,7 +1197,7 @@ test_request_newlines (void)
 #define RUN_TEST(_func)                                          \
    do {                                                          \
       if (!selector || 0 == kms_strcasecmp (#_func, selector)) { \
-         printf ("%s\n", #_func);                                \
+         TEST_PRINTF ("%s\n", #_func);                           \
          _func ();                                               \
          ran_tests = true;                                       \
       }                                                          \
@@ -1232,15 +1232,15 @@ main (int argc, char *argv[])
    help = "Usage: test_kms_request [TEST_NAME]";
 
    if (argc > 2) {
-      fprintf (stderr, "%s\n", help);
+      TEST_STDERR_PRINTF ("%s\n", help);
       abort ();
    } else if (argc == 2) {
       selector = argv[1];
    }
 
    int ret = kms_message_init ();
    if (ret != 0) {
-      printf ("kms_message_init failed: 0x%x\n", ret);
+      TEST_PRINTF ("kms_message_init failed: 0x%x\n", ret);
       abort ();
    }
 
@@ -1292,7 +1292,7 @@ main (int argc, char *argv[])
 
    if (!ran_tests) {
       KMS_ASSERT (argc == 2);
-      fprintf (stderr, "No such test: \"%s\"\n", argv[1]);
+      TEST_STDERR_PRINTF ("No such test: \"%s\"\n", argv[1]);
       abort ();
    }
 

Original file line number	Diff line number	Diff line change
`@@ -789,7 +789,7 @@ kms_request_get_signed (kms_request_t *request)`
`789`	`789`	`}`
`790`	`790`
`791`	`791`	`if (!check_and_prohibit_kmip (request)) {`
`792`		`- return false;`
	`792`	`+ return NULL;`
`793`	`793`	`}`
`794`	`794`
`795`	`795`	`if (!finalize (request)) {`
`@@ -857,11 +857,11 @@ kms_request_to_string (kms_request_t *request)`
`857`	`857`	`size_t i;`
`858`	`858`
`859`	`859`	`if (!finalize (request)) {`
`860`		`- return false;`
	`860`	`+ return NULL;`
`861`	`861`	`}`
`862`	`862`
`863`	`863`	`if (!check_and_prohibit_kmip (request)) {`
`864`		`- return false;`
	`864`	`+ return NULL;`
`865`	`865`	`}`
`866`	`866`
`867`	`867`	`if (request->to_string) {`
Original file line number	Diff line number	Diff line change
`@@ -56,8 +56,8 @@ test_getenv (const char *key)`
`56`	`56`	`{`
`57`	`57`	`char *value = getenv (key);`
`58`	`58`	`if (!value) {`
`59`		`- fprintf (`
`60`		`- stderr, "Environment variable: %s not set (@@ctest-skip@@)", key);`
	`59`	`+ TEST_STDERR_PRINTF ("Environment variable: %s not set (@@ctest-skip@@)\n",`
	`60`	`+ key);`
`61`	`61`	`exit (2);`
`62`	`62`	`}`
`63`	`63`	`TEST_TRACE ("Env: %s = %s", key, value);`
Original file line number	Diff line number	Diff line change
`@@ -383,7 +383,7 @@ all_aws_sig_v4_tests (const char path, const char selected)`
`383`	`383`	`}`
`384`	`384`
`385`	`385`	`if (skip_aws_test (test_name) && !selected) {`
`386`		`- printf ("SKIP: %s\n", test_name);`
	`386`	`+ TEST_PRINTF ("SKIP: %s\n", test_name);`
`387`	`387`	`goto done;`
`388`	`388`	`}`
`389`	`389`
`@@ -407,7 +407,7 @@ all_aws_sig_v4_tests (const char path, const char selected)`
`407`	`407`	`continue;`
`408`	`408`	`}`
`409`	`409`
`410`		`- printf ("%s\n", path);`
	`410`	`+ TEST_PRINTF ("%s\n", path);`
`411`	`411`	`aws_sig_v4_test (path);`
`412`	`412`	`ran_tests = true;`
`413`	`413`	`}`
`@@ -903,7 +903,7 @@ parser_testcase_run (parser_testcase_t *testcase)`
`903`	`903`	`size_t ret = fread (buf, 1, (size_t) bytes_to_read, response_file);`
`904`	`904`
`905`	`905`	`if (!kms_response_parser_feed (parser, buf, (int) ret)) {`
`906`		`- printf ("feed error: %s\n", parser->error);`
	`906`	`+ TEST_PRINTF ("feed error: %s\n", parser->error);`
`907`	`907`	`ASSERT (false);`
`908`	`908`	`}`
`909`	`909`	`}`
`@@ -945,7 +945,7 @@ kms_response_parser_files (void)`
`945`	`945`	`size_t i;`
`946`	`946`
`947`	`947`	`for (i = 0; i < sizeof (tests) / sizeof (tests[0]); i++) {`
`948`		`- printf (" parser testcase: %d\n", (int) i);`
	`948`	`+ TEST_PRINTF (" parser testcase: %d\n", (int) i);`
`949`	`949`	`parser_testcase_run (tests + i);`
`950`	`950`	`}`
`951`	`951`	`}`
`@@ -1081,8 +1081,8 @@ kms_signature_test (void)`
`1081`	`1081`	`signature_b64 = kms_message_raw_to_b64 (signature_raw, 256);`
`1082`	`1082`
`1083`	`1083`	`if (0 != strcmp (signature_b64, expected_signature)) {`
`1084`		`- printf ("generated signature: %s\n", signature_b64);`
`1085`		`- printf ("but expected signature: %s\n", expected_signature);`
	`1084`	`+ TEST_PRINTF ("generated signature: %s\n", signature_b64);`
	`1085`	`+ TEST_PRINTF ("but expected signature: %s\n", expected_signature);`
`1086`	`1086`	`abort ();`
`1087`	`1087`	`}`
`1088`	`1088`
`@@ -1197,7 +1197,7 @@ test_request_newlines (void)`
`1197`	`1197`	`#define RUN_TEST(_func) \`
`1198`	`1198`	`do { \`
`1199`	`1199`	`if (!selector \|\| 0 == kms_strcasecmp (#_func, selector)) { \`
`1200`		`- printf ("%s\n", #_func); \`
	`1200`	`+ TEST_PRINTF ("%s\n", #_func); \`
`1201`	`1201`	`_func (); \`
`1202`	`1202`	`ran_tests = true; \`
`1203`	`1203`	`} \`
`@@ -1232,15 +1232,15 @@ main (int argc, char *argv[])`
`1232`	`1232`	`help = "Usage: test_kms_request [TEST_NAME]";`
`1233`	`1233`
`1234`	`1234`	`if (argc > 2) {`
`1235`		`- fprintf (stderr, "%s\n", help);`
	`1235`	`+ TEST_STDERR_PRINTF ("%s\n", help);`
`1236`	`1236`	`abort ();`
`1237`	`1237`	`} else if (argc == 2) {`
`1238`	`1238`	`selector = argv[1];`
`1239`	`1239`	`}`
`1240`	`1240`
`1241`	`1241`	`int ret = kms_message_init ();`
`1242`	`1242`	`if (ret != 0) {`
`1243`		`- printf ("kms_message_init failed: 0x%x\n", ret);`
	`1243`	`+ TEST_PRINTF ("kms_message_init failed: 0x%x\n", ret);`
`1244`	`1244`	`abort ();`
`1245`	`1245`	`}`
`1246`	`1246`
`@@ -1292,7 +1292,7 @@ main (int argc, char *argv[])`
`1292`	`1292`
`1293`	`1293`	`if (!ran_tests) {`
`1294`	`1294`	`KMS_ASSERT (argc == 2);`
`1295`		`- fprintf (stderr, "No such test: \"%s\"\n", argv[1]);`
	`1295`	`+ TEST_STDERR_PRINTF ("No such test: \"%s\"\n", argv[1]);`
`1296`	`1296`	`abort ();`
`1297`	`1297`	`}`
`1298`	`1298`