libmongocrypt-helper 1.7.4.0.1002 → 1.8.0.0.1001

data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-crypto-std-hooks.c

@@ -18,160 +18,127 @@
 
 #include "test-mongocrypt.h"
 
-bool
-_std_hook_native_crypto_aes_256_cbc_encrypt (void *ctx,
-                                             mongocrypt_binary_t *key,
-                                             mongocrypt_binary_t *iv,
-                                             mongocrypt_binary_t *in,
-                                             mongocrypt_binary_t *out,
-                                             uint32_t *bytes_written,
-                                             mongocrypt_status_t *status)
-{
-   _mongocrypt_buffer_t keybuf, ivbuf, inbuf, outbuf;
-   _mongocrypt_buffer_from_binary (&keybuf, key);
-   _mongocrypt_buffer_from_binary (&ivbuf, iv);
-   _mongocrypt_buffer_from_binary (&inbuf, in);
-   _mongocrypt_buffer_from_binary (&outbuf, out);
-
-   aes_256_args_t args = {.key = &keybuf,
-                          .iv = &ivbuf,
-                          .in = &inbuf,
-                          .out = &outbuf,
-                          .bytes_written = bytes_written,
-                          .status = status};
-   return _native_crypto_aes_256_cbc_encrypt (args);
+bool _std_hook_native_crypto_aes_256_cbc_encrypt(void *ctx,
+                                                 mongocrypt_binary_t *key,
+                                                 mongocrypt_binary_t *iv,
+                                                 mongocrypt_binary_t *in,
+                                                 mongocrypt_binary_t *out,
+                                                 uint32_t *bytes_written,
+                                                 mongocrypt_status_t *status) {
+    _mongocrypt_buffer_t keybuf, ivbuf, inbuf, outbuf;
+    _mongocrypt_buffer_from_binary(&keybuf, key);
+    _mongocrypt_buffer_from_binary(&ivbuf, iv);
+    _mongocrypt_buffer_from_binary(&inbuf, in);
+    _mongocrypt_buffer_from_binary(&outbuf, out);
+
+    aes_256_args_t args =
+        {.key = &keybuf, .iv = &ivbuf, .in = &inbuf, .out = &outbuf, .bytes_written = bytes_written, .status = status};
+    return _native_crypto_aes_256_cbc_encrypt(args);
 }
 
-bool
-_std_hook_native_crypto_aes_256_cbc_decrypt (void *ctx,
-                                             mongocrypt_binary_t *key,
-                                             mongocrypt_binary_t *iv,
-                                             mongocrypt_binary_t *in,
-                                             mongocrypt_binary_t *out,
-                                             uint32_t *bytes_written,
-                                             mongocrypt_status_t *status)
-{
-   _mongocrypt_buffer_t keybuf, ivbuf, inbuf, outbuf;
-   _mongocrypt_buffer_from_binary (&keybuf, key);
-   _mongocrypt_buffer_from_binary (&ivbuf, iv);
-   _mongocrypt_buffer_from_binary (&inbuf, in);
-   _mongocrypt_buffer_from_binary (&outbuf, out);
-
-   aes_256_args_t args = {.key = &keybuf,
-                          .iv = &ivbuf,
-                          .in = &inbuf,
-                          .out = &outbuf,
-                          .bytes_written = bytes_written,
-                          .status = status};
-   return _native_crypto_aes_256_cbc_decrypt (args);
+bool _std_hook_native_crypto_aes_256_cbc_decrypt(void *ctx,
+                                                 mongocrypt_binary_t *key,
+                                                 mongocrypt_binary_t *iv,
+                                                 mongocrypt_binary_t *in,
+                                                 mongocrypt_binary_t *out,
+                                                 uint32_t *bytes_written,
+                                                 mongocrypt_status_t *status) {
+    _mongocrypt_buffer_t keybuf, ivbuf, inbuf, outbuf;
+    _mongocrypt_buffer_from_binary(&keybuf, key);
+    _mongocrypt_buffer_from_binary(&ivbuf, iv);
+    _mongocrypt_buffer_from_binary(&inbuf, in);
+    _mongocrypt_buffer_from_binary(&outbuf, out);
+
+    aes_256_args_t args =
+        {.key = &keybuf, .iv = &ivbuf, .in = &inbuf, .out = &outbuf, .bytes_written = bytes_written, .status = status};
+    return _native_crypto_aes_256_cbc_decrypt(args);
 }
 
-bool
-_std_hook_native_crypto_random (void *ctx,
-                                mongocrypt_binary_t *out,
-                                uint32_t count,
-                                mongocrypt_status_t *status)
-{
-   _mongocrypt_buffer_t outbuf;
-   _mongocrypt_buffer_from_binary (&outbuf, out);
+bool _std_hook_native_crypto_random(void *ctx, mongocrypt_binary_t *out, uint32_t count, mongocrypt_status_t *status) {
+    _mongocrypt_buffer_t outbuf;
+    _mongocrypt_buffer_from_binary(&outbuf, out);
 
-   return _native_crypto_random (&outbuf, count, status);
+    return _native_crypto_random(&outbuf, count, status);
 }
 
-bool
-_std_hook_native_hmac_sha512 (void *ctx,
-                              mongocrypt_binary_t *key,
-                              mongocrypt_binary_t *in,
-                              mongocrypt_binary_t *out,
-                              mongocrypt_status_t *status)
-{
-   _mongocrypt_buffer_t keybuf, inbuf, outbuf;
-   _mongocrypt_buffer_from_binary (&keybuf, key);
-   _mongocrypt_buffer_from_binary (&inbuf, in);
-   _mongocrypt_buffer_from_binary (&outbuf, out);
-
-   return _native_crypto_hmac_sha_512 (&keybuf, &inbuf, &outbuf, status);
+bool _std_hook_native_hmac_sha512(void *ctx,
+                                  mongocrypt_binary_t *key,
+                                  mongocrypt_binary_t *in,
+                                  mongocrypt_binary_t *out,
+                                  mongocrypt_status_t *status) {
+    _mongocrypt_buffer_t keybuf, inbuf, outbuf;
+    _mongocrypt_buffer_from_binary(&keybuf, key);
+    _mongocrypt_buffer_from_binary(&inbuf, in);
+    _mongocrypt_buffer_from_binary(&outbuf, out);
+
+    return _native_crypto_hmac_sha_512(&keybuf, &inbuf, &outbuf, status);
 }
 
-bool
-_std_hook_native_hmac_sha256 (void *ctx,
-                              mongocrypt_binary_t *key,
-                              mongocrypt_binary_t *in,
-                              mongocrypt_binary_t *out,
-                              mongocrypt_status_t *status)
-{
-   _mongocrypt_buffer_t keybuf, inbuf, outbuf;
-   _mongocrypt_buffer_from_binary (&keybuf, key);
-   _mongocrypt_buffer_from_binary (&inbuf, in);
-   _mongocrypt_buffer_from_binary (&outbuf, out);
-
-   return _native_crypto_hmac_sha_256 (&keybuf, &inbuf, &outbuf, status);
+bool _std_hook_native_hmac_sha256(void *ctx,
+                                  mongocrypt_binary_t *key,
+                                  mongocrypt_binary_t *in,
+                                  mongocrypt_binary_t *out,
+                                  mongocrypt_status_t *status) {
+    _mongocrypt_buffer_t keybuf, inbuf, outbuf;
+    _mongocrypt_buffer_from_binary(&keybuf, key);
+    _mongocrypt_buffer_from_binary(&inbuf, in);
+    _mongocrypt_buffer_from_binary(&outbuf, out);
+
+    return _native_crypto_hmac_sha_256(&keybuf, &inbuf, &outbuf, status);
 }
 
-bool
-_error_hook_native_crypto_aes_256_cbc_encrypt (void *ctx,
-                                               mongocrypt_binary_t *key,
-                                               mongocrypt_binary_t *iv,
-                                               mongocrypt_binary_t *in,
-                                               mongocrypt_binary_t *out,
-                                               uint32_t *bytes_written,
-                                               mongocrypt_status_t *status)
-{
-   CLIENT_ERR ("aes_256_cbc_encrypt not expected to have been called");
-   return false;
+bool _error_hook_native_crypto_aes_256_cbc_encrypt(void *ctx,
+                                                   mongocrypt_binary_t *key,
+                                                   mongocrypt_binary_t *iv,
+                                                   mongocrypt_binary_t *in,
+                                                   mongocrypt_binary_t *out,
+                                                   uint32_t *bytes_written,
+                                                   mongocrypt_status_t *status) {
+    CLIENT_ERR("aes_256_cbc_encrypt not expected to have been called");
+    return false;
 }
 
-bool
-_error_hook_native_crypto_aes_256_cbc_decrypt (void *ctx,
-                                               mongocrypt_binary_t *key,
-                                               mongocrypt_binary_t *iv,
-                                               mongocrypt_binary_t *in,
-                                               mongocrypt_binary_t *out,
-                                               uint32_t *bytes_written,
-                                               mongocrypt_status_t *status)
-{
-   CLIENT_ERR ("aes_256_cbc_decrypt not expected to have been called");
-   return false;
+bool _error_hook_native_crypto_aes_256_cbc_decrypt(void *ctx,
+                                                   mongocrypt_binary_t *key,
+                                                   mongocrypt_binary_t *iv,
+                                                   mongocrypt_binary_t *in,
+                                                   mongocrypt_binary_t *out,
+                                                   uint32_t *bytes_written,
+                                                   mongocrypt_status_t *status) {
+    CLIENT_ERR("aes_256_cbc_decrypt not expected to have been called");
+    return false;
 }
 
-bool
-_error_hook_native_crypto_random (void *ctx,
-                                  mongocrypt_binary_t *out,
-                                  uint32_t count,
-                                  mongocrypt_status_t *status)
-{
-   CLIENT_ERR ("crypto_random not expected to have been called");
-   return false;
+bool _error_hook_native_crypto_random(void *ctx,
+                                      mongocrypt_binary_t *out,
+                                      uint32_t count,
+                                      mongocrypt_status_t *status) {
+    CLIENT_ERR("crypto_random not expected to have been called");
+    return false;
 }
 
-bool
-_error_hook_native_hmac_sha512 (void *ctx,
-                                mongocrypt_binary_t *key,
-                                mongocrypt_binary_t *in,
-                                mongocrypt_binary_t *out,
-                                mongocrypt_status_t *status)
-{
-   CLIENT_ERR ("hmac_sha512 not expected to have been called");
-   return false;
+bool _error_hook_native_hmac_sha512(void *ctx,
+                                    mongocrypt_binary_t *key,
+                                    mongocrypt_binary_t *in,
+                                    mongocrypt_binary_t *out,
+                                    mongocrypt_status_t *status) {
+    CLIENT_ERR("hmac_sha512 not expected to have been called");
+    return false;
 }
 
-bool
-_error_hook_native_hmac_sha256 (void *ctx,
-                                mongocrypt_binary_t *key,
-                                mongocrypt_binary_t *in,
-                                mongocrypt_binary_t *out,
-                                mongocrypt_status_t *status)
-{
-   CLIENT_ERR ("hmac_sha256 not expected to have been called");
-   return false;
+bool _error_hook_native_hmac_sha256(void *ctx,
+                                    mongocrypt_binary_t *key,
+                                    mongocrypt_binary_t *in,
+                                    mongocrypt_binary_t *out,
+                                    mongocrypt_status_t *status) {
+    CLIENT_ERR("hmac_sha256 not expected to have been called");
+    return false;
 }
 
-bool
-_error_hook_native_sha256 (void *ctx,
-                           mongocrypt_binary_t *in,
-                           mongocrypt_binary_t *out,
-                           mongocrypt_status_t *status)
-{
-   CLIENT_ERR ("sha256 not expected to have been called");
-   return false;
+bool _error_hook_native_sha256(void *ctx,
+                               mongocrypt_binary_t *in,
+                               mongocrypt_binary_t *out,
+                               mongocrypt_status_t *status) {
+    CLIENT_ERR("sha256 not expected to have been called");
+    return false;
 }

data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-crypto-std-hooks.h

@@ -24,87 +24,70 @@
  *
  * ctx is ignored.
  */
-bool
-_std_hook_native_crypto_aes_256_cbc_encrypt (void *ctx,
-                                             mongocrypt_binary_t *key,
-                                             mongocrypt_binary_t *iv,
-                                             mongocrypt_binary_t *in,
-                                             mongocrypt_binary_t *out,
-                                             uint32_t *bytes_written,
-                                             mongocrypt_status_t *status);
+bool _std_hook_native_crypto_aes_256_cbc_encrypt(void *ctx,
+                                                 mongocrypt_binary_t *key,
+                                                 mongocrypt_binary_t *iv,
+                                                 mongocrypt_binary_t *in,
+                                                 mongocrypt_binary_t *out,
+                                                 uint32_t *bytes_written,
+                                                 mongocrypt_status_t *status);
 
-bool
-_std_hook_native_crypto_aes_256_cbc_decrypt (void *ctx,
-                                             mongocrypt_binary_t *key,
-                                             mongocrypt_binary_t *iv,
-                                             mongocrypt_binary_t *in,
-                                             mongocrypt_binary_t *out,
-                                             uint32_t *bytes_written,
-                                             mongocrypt_status_t *status);
+bool _std_hook_native_crypto_aes_256_cbc_decrypt(void *ctx,
+                                                 mongocrypt_binary_t *key,
+                                                 mongocrypt_binary_t *iv,
+                                                 mongocrypt_binary_t *in,
+                                                 mongocrypt_binary_t *out,
+                                                 uint32_t *bytes_written,
+                                                 mongocrypt_status_t *status);
 
-bool
-_std_hook_native_crypto_random (void *ctx,
-                                mongocrypt_binary_t *out,
-                                uint32_t count,
-                                mongocrypt_status_t *status);
+bool _std_hook_native_crypto_random(void *ctx, mongocrypt_binary_t *out, uint32_t count, mongocrypt_status_t *status);
 
-bool
-_std_hook_native_hmac_sha512 (void *ctx,
-                              mongocrypt_binary_t *key,
-                              mongocrypt_binary_t *in,
-                              mongocrypt_binary_t *out,
-                              mongocrypt_status_t *status);
+bool _std_hook_native_hmac_sha512(void *ctx,
+                                  mongocrypt_binary_t *key,
+                                  mongocrypt_binary_t *in,
+                                  mongocrypt_binary_t *out,
+                                  mongocrypt_status_t *status);
 
-bool
-_std_hook_native_hmac_sha256 (void *ctx,
-                              mongocrypt_binary_t *key,
-                              mongocrypt_binary_t *in,
-                              mongocrypt_binary_t *out,
-                              mongocrypt_status_t *status);
+bool _std_hook_native_hmac_sha256(void *ctx,
+                                  mongocrypt_binary_t *key,
+                                  mongocrypt_binary_t *in,
+                                  mongocrypt_binary_t *out,
+                                  mongocrypt_status_t *status);
 
 /* Hooks which fail and set an error indicating that the named
  * function was not expected to have been called.
  */
-bool
-_error_hook_native_crypto_aes_256_cbc_encrypt (void *ctx,
-                                               mongocrypt_binary_t *key,
-                                               mongocrypt_binary_t *iv,
-                                               mongocrypt_binary_t *in,
-                                               mongocrypt_binary_t *out,
-                                               uint32_t *bytes_written,
-                                               mongocrypt_status_t *status);
+bool _error_hook_native_crypto_aes_256_cbc_encrypt(void *ctx,
+                                                   mongocrypt_binary_t *key,
+                                                   mongocrypt_binary_t *iv,
+                                                   mongocrypt_binary_t *in,
+                                                   mongocrypt_binary_t *out,
+                                                   uint32_t *bytes_written,
+                                                   mongocrypt_status_t *status);
 
-bool
-_error_hook_native_crypto_aes_256_cbc_decrypt (void *ctx,
-                                               mongocrypt_binary_t *key,
-                                               mongocrypt_binary_t *iv,
-                                               mongocrypt_binary_t *in,
-                                               mongocrypt_binary_t *out,
-                                               uint32_t *bytes_written,
-                                               mongocrypt_status_t *status);
+bool _error_hook_native_crypto_aes_256_cbc_decrypt(void *ctx,
+                                                   mongocrypt_binary_t *key,
+                                                   mongocrypt_binary_t *iv,
+                                                   mongocrypt_binary_t *in,
+                                                   mongocrypt_binary_t *out,
+                                                   uint32_t *bytes_written,
+                                                   mongocrypt_status_t *status);
 
-bool
-_error_hook_native_crypto_random (void *ctx,
-                                  mongocrypt_binary_t *out,
-                                  uint32_t count,
-                                  mongocrypt_status_t *status);
+bool _error_hook_native_crypto_random(void *ctx, mongocrypt_binary_t *out, uint32_t count, mongocrypt_status_t *status);
 
-bool
-_error_hook_native_hmac_sha512 (void *ctx,
-                                mongocrypt_binary_t *key,
-                                mongocrypt_binary_t *in,
-                                mongocrypt_binary_t *out,
-                                mongocrypt_status_t *status);
+bool _error_hook_native_hmac_sha512(void *ctx,
+                                    mongocrypt_binary_t *key,
+                                    mongocrypt_binary_t *in,
+                                    mongocrypt_binary_t *out,
+                                    mongocrypt_status_t *status);
 
-bool
-_error_hook_native_hmac_sha256 (void *ctx,
-                                mongocrypt_binary_t *key,
-                                mongocrypt_binary_t *in,
-                                mongocrypt_binary_t *out,
-                                mongocrypt_status_t *status);
+bool _error_hook_native_hmac_sha256(void *ctx,
+                                    mongocrypt_binary_t *key,
+                                    mongocrypt_binary_t *in,
+                                    mongocrypt_binary_t *out,
+                                    mongocrypt_status_t *status);
 
-bool
-_error_hook_native_sha256 (void *ctx,
-                           mongocrypt_binary_t *in,
-                           mongocrypt_binary_t *out,
-                           mongocrypt_status_t *status);
+bool _error_hook_native_sha256(void *ctx,
+                               mongocrypt_binary_t *in,
+                               mongocrypt_binary_t *out,
+                               mongocrypt_status_t *status);