libmongocrypt-helper 1.12.0.0.1001 → 1.14.0.0.1001

data/ext/libmongocrypt/libmongocrypt/kms-message/src/kms_kmip_reader_writer.c

@@ -279,7 +279,8 @@ kmip_reader_has_data (kmip_reader_t *reader)
 #define CHECK_REMAINING_BUFFER_AND_RET(read_size)   \
    if ((reader->pos + (read_size)) > reader->len) { \
       return false;                                 \
-   }
+   } else                                           \
+      ((void)0)
 
 bool
 kmip_reader_read_u8 (kmip_reader_t *reader, uint8_t *value)
@@ -346,7 +347,8 @@ kmip_reader_read_bytes (kmip_reader_t *reader, uint8_t **ptr, size_t length)
 #define CHECK_AND_RET(x) \
    if (!(x)) {           \
       return false;      \
-   }
+   } else                \
+      ((void)0)
 
 bool
 kmip_reader_read_tag (kmip_reader_t *reader, kmip_tag_type_t *tag)

data/ext/libmongocrypt/libmongocrypt/kms-message/src/kms_kmip_request.c

@@ -83,7 +83,7 @@ kms_kmip_request_register_secretdata_new (void *reserved,
 
    if (len != KMS_KMIP_REQUEST_SECRETDATA_LENGTH) {
       KMS_ERROR (req,
-                 "expected SecretData length of %d, got %" PRIu32,
+                 "expected SecretData length of %d, got %zu",
                  KMS_KMIP_REQUEST_SECRETDATA_LENGTH,
                  len);
       return req;
@@ -463,4 +463,3 @@ kms_kmip_request_decrypt_new (void *reserved, const char* unique_identifer, cons
    */
    return kmip_encrypt_decrypt(unique_identifer, ciphertext, len, iv_data, iv_len, false);
 }
-

data/ext/libmongocrypt/libmongocrypt/kms-message/src/kms_message.c

@@ -24,7 +24,7 @@
 #include <stdio.h>
 
 void
-set_error (char *error, size_t size, const char *fmt, ...)
+kms_set_error (char *error, size_t size, const char *fmt, ...)
 {
    va_list va;
 

data/ext/libmongocrypt/libmongocrypt/kms-message/src/kms_message_private.h

@@ -124,19 +124,23 @@ struct _kms_response_parser_t {
       }                      \
    } while (0)
 
+#ifdef __GNUC__
+__attribute__((format(__printf__, 3, 4)))
+#endif
 void
-set_error (char *error, size_t size, const char *fmt, ...);
+kms_set_error (char *error, size_t size, const char *fmt, ...);
 
 #define KMS_ERROR(obj, ...)                                     \
    do {                                                         \
       obj->failed = true;                                       \
-      set_error (obj->error, sizeof (obj->error), __VA_ARGS__); \
+      kms_set_error (obj->error, sizeof (obj->error), __VA_ARGS__); \
    } while (0)
 
 #define KMS_ASSERT(stmt)                      \
    if (!(stmt)) {                             \
       fprintf (stderr, "%s failed\n", #stmt); \
       abort ();                               \
-   }
+   } else                                     \
+       ((void)0)
 
 #endif /* KMS_MESSAGE_PRIVATE_H */

data/ext/libmongocrypt/libmongocrypt/kms-message/src/kms_request.c

@@ -744,7 +744,7 @@ done:
    return kms_request_str_detach (sig);
 }
 
-void
+static void
 kms_request_validate (kms_request_t *request)
 {
    if (!check_and_prohibit_kmip (request)) {
@@ -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) {

data/ext/libmongocrypt/libmongocrypt/kms-message/src/kms_request_opt.c

@@ -85,4 +85,4 @@ kms_request_opt_set_crypto_hook_sign_rsaes_pkcs1_v1_5 (
 {
    opt->crypto.sign_rsaes_pkcs1_v1_5 = sign_rsaes_pkcs1_v1_5;
    opt->crypto.sign_ctx = sign_ctx;
-}
+}

data/ext/libmongocrypt/libmongocrypt/kms-message/src/kms_request_str.c

@@ -27,8 +27,8 @@
 #include <stdlib.h>
 #include <limits.h> /* CHAR_BIT */
 
-bool rfc_3986_tab[256] = {0};
-bool kms_initialized = false;
+static bool rfc_3986_tab[256] = {0};
+static bool kms_initialized = false;
 
 static void
 tables_init (void)
@@ -126,12 +126,6 @@ kms_request_str_detach (kms_request_str_t *str)
    return r;
 }
 
-const char *
-kms_request_str_get (kms_request_str_t *str)
-{
-   return str->str;
-}
-
 bool
 kms_request_str_reserve (kms_request_str_t *str, size_t size)
 {

data/ext/libmongocrypt/libmongocrypt/kms-message/src/kms_request_str.h

@@ -64,10 +64,19 @@ kms_request_str_append_newline (kms_request_str_t *str);
 KMS_MSG_EXPORT (void)
 kms_request_str_append_lowercase (kms_request_str_t *str,
                                   kms_request_str_t *appended);
+
+#ifdef __GNUC__
+__attribute__((format(__printf__, 2, 3)))
+#endif
 KMS_MSG_EXPORT (void)
 kms_request_str_appendf (kms_request_str_t *str, const char *format, ...);
+
+#ifdef __GNUC__
+__attribute__((format(__printf__, 2, 3)))
+#endif
 KMS_MSG_EXPORT (void)
 kms_request_strdupf (kms_request_str_t *str, const char *format, ...);
+
 KMS_MSG_EXPORT (void)
 kms_request_str_append_escaped (kms_request_str_t *str,
                                 kms_request_str_t *appended,

data/ext/libmongocrypt/libmongocrypt/kms-message/src/kms_response_parser.c

@@ -81,7 +81,6 @@ kms_response_parser_wants_bytes (kms_response_parser_t *parser, int32_t max)
    default:
       KMS_ASSERT (false && "Invalid kms_response_parser HTTP state");
    }
-   return -1;
 }
 
 static bool

data/ext/libmongocrypt/libmongocrypt/kms-message/src/sort.c

@@ -37,6 +37,10 @@
  * https://github.com/freebsd/freebsd/blob/e7c6cef9514d3bb1f14a30a5ee871231523e43db/lib/libc/stdlib/merge.c
  */
 
+#include "sort.h"
+
+//
+
 #include <stddef.h>
 
 /*
@@ -44,10 +48,9 @@
  * last 4 elements.
  */
 
-typedef int (*cmp_t) (const void *, const void *);
 #define CMP(x, y) cmp (x, y)
 #define swap(a, b)   \
-   {                 \
+   if (1) {          \
       s = b;         \
       i = size;      \
       do {           \
@@ -56,7 +59,8 @@ typedef int (*cmp_t) (const void *, const void *);
          *s++ = tmp; \
       } while (--i); \
       a -= size;     \
-   }
+   } else            \
+      ((void)0)
 
 void
 insertionsort (unsigned char *a, size_t n, size_t size, cmp_t cmp)

data/ext/libmongocrypt/libmongocrypt/kms-message/src/sort.h

@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+#include <stddef.h>
+
 typedef int (*cmp_t) (const void *, const void *);
 
 void

data/ext/libmongocrypt/libmongocrypt/kms-message/test/test_kmip_reader_writer.c

@@ -6,7 +6,7 @@
  * You may obtain a copy of the License at
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
- *
+
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -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 ();
    }
 
@@ -54,6 +54,7 @@ kms_kmip_writer_test_evaluate (kmip_writer_t *writer,
    free (expected_hex);
 }
 
+void kms_kmip_writer_test (void); // -Wmissing-prototypes: for testing only.
 void
 kms_kmip_writer_test (void)
 {
@@ -140,6 +141,7 @@ kms_kmip_writer_test (void)
    kmip_writer_destroy (writer);
 }
 
+void kms_kmip_reader_test (void); // -Wmissing-prototypes: for testing only.
 void
 kms_kmip_reader_test (void)
 {
@@ -312,6 +314,7 @@ kms_kmip_reader_test (void)
    free (data);
 }
 
+void kms_kmip_reader_negative_int_test (void); // -Wmissing-prototypes: for testing only.
 void
 kms_kmip_reader_negative_int_test (void)
 {
@@ -356,6 +359,7 @@ kms_kmip_reader_negative_int_test (void)
    free (data);
 }
 
+void kms_kmip_reader_find_test (void); // -Wmissing-prototypes: for testing only.
 void
 kms_kmip_reader_find_test (void)
 {
@@ -404,6 +408,7 @@ kms_kmip_reader_find_test (void)
    free (data);
 }
 
+void kms_kmip_reader_find_and_recurse_test (void); // -Wmissing-prototypes: for testing only.
 void
 kms_kmip_reader_find_and_recurse_test (void)
 {
@@ -438,6 +443,7 @@ kms_kmip_reader_find_and_recurse_test (void)
    free (data);
 }
 
+void kms_kmip_reader_find_and_read_enum_test (void); // -Wmissing-prototypes: for testing only.
 void
 kms_kmip_reader_find_and_read_enum_test (void)
 {
@@ -470,6 +476,7 @@ kms_kmip_reader_find_and_read_enum_test (void)
    free (data);
 }
 
+void kms_kmip_reader_find_and_read_bytes_test (void); // -Wmissing-prototypes: for testing only.
 void
 kms_kmip_reader_find_and_read_bytes_test (void)
 {

data/ext/libmongocrypt/libmongocrypt/kms-message/test/test_kms_assert.h

@@ -23,20 +23,38 @@
 #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__, __func__); \
+      TEST_STDERR_PRINTF (__VA_ARGS__);                                \
+      TEST_STDERR_PRINTF ("\n");                                       \
+      abort ();                                                        \
    } while (0)
 
 #define ASSERT(stmt)                             \
    if (!(stmt)) {                                \
       TEST_ERROR ("statement failed %s", #stmt); \
-   }
+   } else                                        \
+      ((void)0)
 
 #define ASSERT_CMPSTR_WITH_LEN(_expect, _expect_len, _actual, _actual_len)     \
    do {                                                                        \
@@ -81,7 +99,7 @@
          TEST_ERROR (                                                   \
             "comparison failed: %d %s %d", _a_int, #_operator, _b_int); \
       }                                                                 \
-   } while (0);
+   } while (0)
 
 #define ASSERT_CMPBYTES(                                                \
    expected_bytes, expected_len, actual_bytes, actual_len)              \
@@ -144,4 +162,4 @@
       ASSERT_CONTAINS (_error_str, expect_substring);              \
    } while (0)
 
-#endif /* TEST_KMS_ASSERT_H */
+#endif /* TEST_KMS_ASSERT_H */

data/ext/libmongocrypt/libmongocrypt/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);
@@ -257,4 +257,4 @@ main (int argc, char **argv)
    kms_message_init ();
    test_azure_wrapkey ();
    return 0;
-}
+}

data/ext/libmongocrypt/libmongocrypt/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);
@@ -247,4 +247,4 @@ main (int argc, char **argv)
    kms_message_init ();
    test_gcp ();
    return 0;
-}
+}

data/ext/libmongocrypt/libmongocrypt/kms-message/test/test_kms_kmip_request.c

@@ -76,6 +76,7 @@ value="ffa8cc79e8c3763b0121fcd06bb3488c8bf42c0774604640279b16b264194030eeb083962
       0x36, 0xa9, 0x06, 0x6b, 0x4e, 0x10, 0xae, 0xb5, 0x6a, 0x5c, 0xcf, 0x6a, \
       0xa4, 0x69, 0x01, 0xe6, 0x25, 0xe3, 0x40, 0x0c, 0x78, 0x11, 0xd2, 0xec
 
+void kms_kmip_request_register_secretdata_test (void); // -Wmissing-prototypes: for testing only.
 void
 kms_kmip_request_register_secretdata_test (void)
 {
@@ -98,6 +99,7 @@ kms_kmip_request_register_secretdata_test (void)
    kms_request_destroy (req);
 }
 
+void kms_kmip_request_register_secretdata_invalid_test (void); // -Wmissing-prototypes: for testing only.
 void
 kms_kmip_request_register_secretdata_invalid_test (void)
 {
@@ -144,6 +146,7 @@ value="7FJYvnV6XkaUCWuY96bCSc6AuhvkPpqI"/>
       0x58, 0x6b, 0x61, 0x55, 0x43, 0x57, 0x75, 0x59, 0x39, 0x36, 0x62, 0x43, \
       0x53, 0x63, 0x36, 0x41, 0x75, 0x68, 0x76, 0x6b, 0x50, 0x70, 0x71, 0x49
 
+void kms_kmip_request_get_test (void); // -Wmissing-prototypes: for testing only.
 void
 kms_kmip_request_get_test (void)
 {
@@ -200,6 +203,7 @@ value="7FJYvnV6XkaUCWuY96bCSc6AuhvkPpqI"/>
       0x58, 0x6b, 0x61, 0x55, 0x43, 0x57, 0x75, 0x59, 0x39, 0x36, 0x62, 0x43, \
       0x53, 0x63, 0x36, 0x41, 0x75, 0x68, 0x76, 0x6b, 0x50, 0x70, 0x71, 0x49
 
+void kms_kmip_request_activate_test (void); // -Wmissing-prototypes: for testing only.
 void
 kms_kmip_request_activate_test (void)
 {

data/ext/libmongocrypt/libmongocrypt/kms-message/test/test_kms_kmip_response.c

@@ -56,6 +56,7 @@ static const uint8_t SUCCESS_REGISTER_RESPONSE[] = {
 
 static const char *const SUCCESS_REGISTER_RESPONSE_UNIQUE_IDENTIFIER = "39";
 
+void kms_kmip_response_get_unique_identifier_test (void); // -Wmissing-prototypes: for testing only.
 void
 kms_kmip_response_get_unique_identifier_test (void)
 {
@@ -141,6 +142,7 @@ static const uint8_t SUCCESS_GET_RESPONSE_SECRETDATA[] = {
    0x36, 0xa9, 0x06, 0x6b, 0x4e, 0x10, 0xae, 0xb5, 0x6a, 0x5c, 0xcf, 0x6a,
    0xa4, 0x69, 0x01, 0xe6, 0x25, 0xe3, 0x40, 0x0c, 0x78, 0x11, 0xd2, 0xec};
 
+void kms_kmip_response_get_secretdata_test (void); // -Wmissing-prototypes: for testing only.
 void
 kms_kmip_response_get_secretdata_test (void)
 {
@@ -197,6 +199,7 @@ static const uint8_t ERROR_GET_RESPOSE_NOTFOUND[] = {
    0x6c, 0x74, 0x52, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x49, 0x74, 0x65, 0x6d, 0x4e,
    0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64};
 
+void kms_kmip_response_get_secretdata_notfound_test (void); // -Wmissing-prototypes: for testing only.
 void
 kms_kmip_response_get_secretdata_notfound_test (void)
 {

data/ext/libmongocrypt/libmongocrypt/kms-message/test/test_kms_kmip_response_parser.c

@@ -36,6 +36,7 @@ static const int SAMPLE_KMIP_FIRST_LENGTH = 32;
 /* SAMPLE_KMIP_LARGE_LENGTH is a byte size larger than the message. */
 static const int SAMPLE_KMIP_LARGE_LENGTH = 1024;
 
+void kms_kmip_response_parser_test (void); // -Wmissing-prototypes: for testing only.
 void
 kms_kmip_response_parser_test (void)
 {
@@ -118,6 +119,7 @@ feed_full_response (kms_response_parser_t *parser, uint8_t *data)
    }
 }
 
+void kms_kmip_response_parser_reuse_test (void); // -Wmissing-prototypes: for testing only.
 void
 kms_kmip_response_parser_reuse_test (void)
 {
@@ -150,6 +152,7 @@ kms_kmip_response_parser_reuse_test (void)
    free (data);
 }
 
+void kms_kmip_response_parser_excess_test (void); // -Wmissing-prototypes: for testing only.
 void
 kms_kmip_response_parser_excess_test (void)
 {
@@ -171,6 +174,7 @@ kms_kmip_response_parser_excess_test (void)
    free (data);
 }
 
+void kms_kmip_response_parser_notenough_test (void); // -Wmissing-prototypes: for testing only.
 void
 kms_kmip_response_parser_notenough_test (void)
 {

data/ext/libmongocrypt/libmongocrypt/kms-message/test/test_kms_online_util.c

@@ -117,4 +117,4 @@ send_kms_request (kms_request_t *req, const char *host)
    kms_response_parser_destroy (response_parser);
    mongoc_stream_destroy (tls_stream);
    return response;
-}
+}

data/ext/libmongocrypt/libmongocrypt/kms-message/test/test_kms_online_util.h

@@ -32,4 +32,4 @@ connect_with_tls (const char *host,
 kms_response_t *
 send_kms_request (kms_request_t *req, const char *host);
 
-#endif /* TEST_KMS_ONLINE_UTIL_H */
+#endif /* TEST_KMS_ONLINE_UTIL_H */