From e620fdac652e1cbb6a22b5a2cb1ce8edd29bd3b8 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Fri, 27 May 2011 10:00:46 +0000 Subject: [PATCH] make built-in ngx_md5_update() interface consistent with other implemenations --- src/core/ngx_md5.c | 5 ++--- src/core/ngx_md5.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/core/ngx_md5.c b/src/core/ngx_md5.c index 30ab0a0f6..519b2d183 100644 --- a/src/core/ngx_md5.c +++ b/src/core/ngx_md5.c @@ -32,7 +32,7 @@ ngx_md5_init(ngx_md5_t *ctx) void -ngx_md5_update(ngx_md5_t *ctx, const u_char *data, size_t size) +ngx_md5_update(ngx_md5_t *ctx, const void *data, size_t size) { size_t used, free; @@ -47,8 +47,7 @@ ngx_md5_update(ngx_md5_t *ctx, const u_char *data, size_t size) return; } - ngx_memcpy(&ctx->buffer[used], data, free); - data = (u_char *)data + free; + data = ngx_cpymem(&ctx->buffer[used], data, free); size -= free; (void) ngx_md5_body(ctx, ctx->buffer, 64); } diff --git a/src/core/ngx_md5.h b/src/core/ngx_md5.h index 93fa25d1a..45a1011bb 100644 --- a/src/core/ngx_md5.h +++ b/src/core/ngx_md5.h @@ -50,7 +50,7 @@ typedef struct { void ngx_md5_init(ngx_md5_t *ctx); -void ngx_md5_update(ngx_md5_t *ctx, const u_char *data, size_t size); +void ngx_md5_update(ngx_md5_t *ctx, const void *data, size_t size); void ngx_md5_final(u_char result[16], ngx_md5_t *ctx);