Skip to content

Commit 83af96e

Browse files
committed
bcrypt: Factor-out bcrypt_ctx_reset() function.
* subversion/libsvn_subr/checksum_bcrypt.c (bcrypt_ctx_reset): New method. (svn_checksum__md5_ctx_reset, svn_checksum__sha1_ctx_reset): Use bcrypt_ctx_reset() git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1931081 13f79535-47bb-0310-9956-ffa450edef68
1 parent ce3578b commit 83af96e

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

subversion/libsvn_subr/checksum_bcrypt.c

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,16 @@ bcrypt_ctx_final(algorithm_state_t *algorithm,
151151
return SVN_NO_ERROR;
152152
}
153153

154+
static svn_error_t *
155+
bcrypt_ctx_reset(algorithm_state_t *algorithm,
156+
bcrypt_ctx_t *ctx)
157+
{
158+
bcrypt_ctx_cleanup(ctx);
159+
SVN_ERR(bcrypt_ctx_init(ctx, algorithm));
160+
161+
return SVN_NO_ERROR;
162+
}
163+
154164
static svn_error_t *
155165
bcrypt_checksum(algorithm_state_t *algorithm,
156166
unsigned char *digest,
@@ -207,10 +217,7 @@ svn_checksum__md5_ctx_create(apr_pool_t *pool)
207217
svn_error_t *
208218
svn_checksum__md5_ctx_reset(svn_checksum__md5_ctx_t *ctx)
209219
{
210-
bcrypt_ctx_cleanup(&ctx->bcrypt_ctx);
211-
SVN_ERR(bcrypt_ctx_init(&ctx->bcrypt_ctx, &md5));
212-
213-
return SVN_NO_ERROR;
220+
return svn_error_trace(bcrypt_ctx_reset(&md5, &ctx->bcrypt_ctx));
214221
}
215222

216223
svn_error_t *
@@ -261,10 +268,7 @@ svn_checksum__sha1_ctx_create(apr_pool_t *pool)
261268
svn_error_t *
262269
svn_checksum__sha1_ctx_reset(svn_checksum__sha1_ctx_t *ctx)
263270
{
264-
bcrypt_ctx_cleanup(&ctx->bcrypt_ctx);
265-
SVN_ERR(bcrypt_ctx_init(&ctx->bcrypt_ctx, &sha1));
266-
267-
return SVN_NO_ERROR;
271+
return svn_error_trace(bcrypt_ctx_reset(&sha1, &ctx->bcrypt_ctx));
268272
}
269273

270274
svn_error_t *

0 commit comments

Comments
 (0)