From 797182a92e7b135102581f1ad5c9f28c4b30973c Mon Sep 17 00:00:00 2001 From: Christian Schmitz Date: Thu, 12 Dec 2024 17:47:39 +0100 Subject: [PATCH 1/3] Renamed set_error to kms_set_error --- src/kms-message/src/kms_message.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kms-message/src/kms_message.c b/src/kms-message/src/kms_message.c index 3998eabd61..84dc1962f6 100644 --- a/src/kms-message/src/kms_message.c +++ b/src/kms-message/src/kms_message.c @@ -24,7 +24,7 @@ #include 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; From dabfe949fe0845e034cf98d5380d0c54ccfe458c Mon Sep 17 00:00:00 2001 From: Christian Schmitz Date: Thu, 12 Dec 2024 17:49:24 +0100 Subject: [PATCH 2/3] Update kms_message_private.h --- src/kms-message/src/kms_message_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kms-message/src/kms_message_private.h b/src/kms-message/src/kms_message_private.h index d3fb46b4e6..b0effba265 100644 --- a/src/kms-message/src/kms_message_private.h +++ b/src/kms-message/src/kms_message_private.h @@ -125,12 +125,12 @@ struct _kms_response_parser_t { } while (0) 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) \ From a677516b57ee5fcced324ee1fd350e42322389d0 Mon Sep 17 00:00:00 2001 From: Kevin Albertson Date: Mon, 16 Dec 2024 12:00:47 -0500 Subject: [PATCH 3/3] update divergence check --- .evergreen/scripts/kms-divergence-check.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.evergreen/scripts/kms-divergence-check.sh b/.evergreen/scripts/kms-divergence-check.sh index 646fa528ee..a1ce1adcd9 100755 --- 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="a650d171ed3b552446095817ae2c5c4f7cec43a2" +LIBMONGOCRYPT_GITREF="ea8af831bf067cc7eed7417ff4aef3c14cf1e67a" cleanup() { if [ -d "$LIBMONGOCRYPT_DIR" ]; then