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

[rinrab]

Author: rinrab
Date: Sun Jan  4 11:49:54 2026
New Revision: 1931090

Log:
bcrypt: Rearrange parameters of bcrypt_ctx_t related methods so they always
start with the algorithm state following with the context.

* subversion/libsvn_subr/checksum_bcrypt.c
  (bcrypt_ctx_init,
   bcrypt_ctx_final): Update declarations.
  (bcrypt_ctx_update,
   bcrypt_checksum,
   svn_checksum__md5_ctx_final,
   svn_checksum__sha1_ctx_final): Update usages.

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 
10:28:45 2026        (r1931089)
+++ subversion/trunk/subversion/libsvn_subr/checksum_bcrypt.c   Sun Jan  4 
11:49:54 2026        (r1931090)
@@ -109,8 +109,8 @@ bcrypt_ctx_cleanup(void *data)
 }
 
 static svn_error_t *
-bcrypt_ctx_init(bcrypt_ctx_t *ctx,
-                algorithm_state_t *algorithm)
+bcrypt_ctx_init(algorithm_state_t *algorithm,
+                bcrypt_ctx_t *ctx)
 {
   BCRYPT_HASH_HANDLE handle;
 
@@ -137,7 +137,7 @@ bcrypt_ctx_update(algorithm_state_t *alg
   SVN_ERR_ASSERT(len <= ULONG_MAX);
 
   if (! ctx->handle)
-    SVN_ERR(bcrypt_ctx_init(ctx, algorithm));
+    SVN_ERR(bcrypt_ctx_init(algorithm, ctx));
 
   SVN_ERR(handle_error(BCryptHashData(ctx->handle,
                                       (PUCHAR) data,
@@ -149,11 +149,11 @@ bcrypt_ctx_update(algorithm_state_t *alg
 
 static svn_error_t *
 bcrypt_ctx_final(algorithm_state_t *algorithm,
-                 unsigned char *digest,
-                 bcrypt_ctx_t *ctx)
+                 bcrypt_ctx_t *ctx,
+                 unsigned char *digest)
 {
   if (! ctx->handle)
-    SVN_ERR(bcrypt_ctx_init(ctx, algorithm));
+    SVN_ERR(bcrypt_ctx_init(algorithm, ctx));
 
   SVN_ERR(handle_error(BCryptFinishHash(ctx->handle,
                                         (PUCHAR) digest,
@@ -179,7 +179,7 @@ bcrypt_checksum(algorithm_state_t *algor
   bcrypt_ctx_t bcrypt_ctx;
   svn_error_t *err = SVN_NO_ERROR;
 
-  SVN_ERR(bcrypt_ctx_init(&bcrypt_ctx, algorithm));
+  SVN_ERR(bcrypt_ctx_init(algorithm, &bcrypt_ctx));
 
   err = bcrypt_ctx_update(algorithm, &bcrypt_ctx, data, len);
   if (err)
@@ -188,7 +188,7 @@ bcrypt_checksum(algorithm_state_t *algor
       return err;
     }
 
-  SVN_ERR(bcrypt_ctx_final(algorithm, digest, &bcrypt_ctx));
+  SVN_ERR(bcrypt_ctx_final(algorithm, &bcrypt_ctx, digest));
 
   bcrypt_ctx_cleanup(&bcrypt_ctx);
   return err;
@@ -238,7 +238,8 @@ svn_error_t *
 svn_checksum__md5_ctx_final(unsigned char *digest,
                             svn_checksum__md5_ctx_t *ctx)
 {
-  return svn_error_trace(bcrypt_ctx_final(&md5, digest, &ctx->bcrypt_ctx));
+  return svn_error_trace(bcrypt_ctx_final(&md5, &ctx->bcrypt_ctx,
+                                          digest));
 }
 
 
@@ -285,7 +286,8 @@ svn_error_t *
 svn_checksum__sha1_ctx_final(unsigned char *digest,
                              svn_checksum__sha1_ctx_t *ctx)
 {
-  return svn_error_trace(bcrypt_ctx_final(&sha1, digest, &ctx->bcrypt_ctx));
+  return svn_error_trace(bcrypt_ctx_final(&sha1, &ctx->bcrypt_ctx,
+                                          digest));
 }
 
 #endif /* SVN_CHECKSUM_BACKEND_APR */