diff --git a/auto/sources b/auto/sources index 730cca3..7ff0bb3 100644 --- a/auto/sources +++ b/auto/sources @@ -60,8 +60,6 @@ CORE_SRCS="src/core/nginx.c \ src/core/ngx_file.c \ src/core/ngx_crc32.c \ src/core/ngx_murmurhash.c \ - src/core/ngx_md5.c \ - src/core/ngx_sha1.c \ src/core/ngx_rbtree.c \ src/core/ngx_radix_tree.c \ src/core/ngx_slab.c \ diff --git a/src/core/ngx_md5.h b/src/core/ngx_md5.h index 713b614..b7e83ce 100644 --- a/src/core/ngx_md5.h +++ b/src/core/ngx_md5.h @@ -12,17 +12,13 @@ #include #include +#include -typedef struct { - uint64_t bytes; - uint32_t a, b, c, d; - u_char buffer[64]; -} ngx_md5_t; +typedef MD5_CTX ngx_md5_t; - -void ngx_md5_init(ngx_md5_t *ctx); -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); +#define ngx_md5_init MD5_Init +#define ngx_md5_update MD5_Update +#define ngx_md5_final MD5_Final #endif /* _NGX_MD5_H_INCLUDED_ */ diff --git a/src/core/ngx_sha1.h b/src/core/ngx_sha1.h index 4a98f71..e145d80 100644 --- a/src/core/ngx_sha1.h +++ b/src/core/ngx_sha1.h @@ -12,17 +12,13 @@ #include #include +#include -typedef struct { - uint64_t bytes; - uint32_t a, b, c, d, e, f; - u_char buffer[64]; -} ngx_sha1_t; +typedef SHA_CTX ngx_sha1_t; - -void ngx_sha1_init(ngx_sha1_t *ctx); -void ngx_sha1_update(ngx_sha1_t *ctx, const void *data, size_t size); -void ngx_sha1_final(u_char result[20], ngx_sha1_t *ctx); +#define ngx_sha1_init SHA1_Init +#define ngx_sha1_update SHA1_Update +#define ngx_sha1_final SHA1_Final #endif /* _NGX_SHA1_H_INCLUDED_ */