svn commit: r1931094 - subversion/trunk/subversion/libsvn_subr

[rinrab]

Author: rinrab
Date: Sun Jan  4 12:48:14 2026
New Revision: 1931094

Log:
bcrypt: Allocate buffer for checksum context object in a pool.

* subversion/libsvn_subr/checksum_bcrypt.c
  (bcrypt_ctx_t): Store a pointer to the object buffer to reuse later and
   the pool where it can be allocated in delayed initialization.
  (bcrypt_ctx_cleanup): Remove, because we no longer need to cleanup the buffer
   manually -- it is allocated in a pool.
  (bcrypt_ctx_init): Create the object buffer if it's NULL and supply it to
   BCryptCreateHash().
  (bcrypt_ctx_reset): memset object_buf with all-zeros instead of cleaning it
   up via BCryptDestroyHash(). It's not mandatory to reset the memory but a
   it's just a security consideration.
  (svn_checksum__md5_ctx_create,
   svn_checksum__sha1_ctx_create): Don't setup pool cleanup handler. Initialize
   bcrypt_ctx.pool field.

Modified:
   subversion/trunk/subversion/libsvn_subr/checksum_bcrypt.c

Modified: subversion/trunk/subversion/libsvn_subr/checksum_bcrypt.c
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/checksum_bcrypt.c   Sun Jan  4 
12:24:35 2026        (r1931093)
+++ subversion/trunk/subversion/libsvn_subr/checksum_bcrypt.c   Sun Jan  4 
12:48:14 2026        (r1931094)
@@ -89,25 +89,10 @@ algorithm_init(void *baton, apr_pool_t *
 typedef struct bcrypt_ctx_t
 {
   BCRYPT_HASH_HANDLE handle;
+  void *object_buf;
+  apr_pool_t *pool;
 } bcrypt_ctx_t;
 
-/* A cleanup handler. */
-static apr_status_t
-bcrypt_ctx_cleanup(void *data)
-{
-  bcrypt_ctx_t *ctx = (bcrypt_ctx_t *)data;
-
-  if (ctx->handle)
-    {
-      NTSTATUS status = BCryptDestroyHash(ctx->handle);
-
-      if (! BCRYPT_SUCCESS(status))
-        SVN_ERR_MALFUNCTION_NO_RETURN();
-    }
-
-  return APR_SUCCESS;
-}
-
 static svn_error_t *
 bcrypt_ctx_init(algorithm_state_t *algorithm,
                 bcrypt_ctx_t *ctx)
@@ -117,9 +102,12 @@ bcrypt_ctx_init(algorithm_state_t *algor
   SVN_ERR(svn_atomic__init_once(&algorithm->initialized, algorithm_init,
                                 algorithm, NULL));
 
+  if (! ctx->object_buf)
+    ctx->object_buf = apr_pcalloc(ctx->pool, algorithm->object_length);
+
   SVN_ERR(handle_error(BCryptCreateHash(algorithm->alg_handle,
                                         &handle,
-                                        NULL, 0,
+                                        ctx->object_buf, 
algorithm->object_length,
                                         /* pbSecret */ NULL,
                                         /* cbSecret */ 0,
                                         /* dwFlags */ 0)));
@@ -166,7 +154,7 @@ bcrypt_ctx_final(algorithm_state_t *algo
 static svn_error_t *
 bcrypt_ctx_reset(algorithm_state_t *algorithm, bcrypt_ctx_t *ctx)
 {
-  bcrypt_ctx_cleanup(ctx);
+  memset(ctx->object_buf, 0, algorithm->object_length);
   ctx->handle = NULL;
   return SVN_NO_ERROR;
 }
@@ -221,9 +209,7 @@ svn_checksum__md5_ctx_t *
 svn_checksum__md5_ctx_create(apr_pool_t *pool)
 {
   svn_checksum__md5_ctx_t *ctx = apr_pcalloc(pool, sizeof(*ctx));
-
-  apr_pool_cleanup_register(pool, &ctx->bcrypt_ctx, bcrypt_ctx_cleanup, NULL);
-
+  ctx->bcrypt_ctx.pool = pool;
   return ctx;
 }
 
@@ -269,9 +255,7 @@ svn_checksum__sha1_ctx_t *
 svn_checksum__sha1_ctx_create(apr_pool_t *pool)
 {
   svn_checksum__sha1_ctx_t *ctx = apr_pcalloc(pool, sizeof(*ctx));
-
-  apr_pool_cleanup_register(pool, &ctx->bcrypt_ctx, bcrypt_ctx_cleanup, NULL);
-
+  ctx->bcrypt_ctx.pool = pool;
   return ctx;
 }