From 908ece9d0a26ec1e776a66f6fa798c5a627effaf Mon Sep 17 00:00:00 2001 From: Zhi Guan Date: Wed, 13 Dec 2023 20:14:19 +0800 Subject: [PATCH] Remove MD5 --- CMakeLists.txt | 4 +- include/gmssl/digest.h | 3 - include/gmssl/md5.h | 48 ----------- src/digest.c | 51 ------------ src/md5.c | 181 ----------------------------------------- 5 files changed, 2 insertions(+), 285 deletions(-) delete mode 100644 include/gmssl/md5.h delete mode 100644 src/md5.c diff --git a/CMakeLists.txt b/CMakeLists.txt index c04053cc..1ecd2ebe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -249,8 +249,8 @@ endif() option(ENABLE_BROKEN_CRYPTO "Enable broken crypto algorithms" OFF) if (ENABLE_BROKEN_CRYPTO) message(STATUS "ENABLE_BROKEN_CRYPTO") - list(APPEND src src/des.c src/sha1.c src/md5.c src/rc4.c) - list(APPEND tests des sha1 md5 rc4) + list(APPEND src src/des.c src/sha1.c src/rc4.c) + list(APPEND tests des sha1 rc4) endif() diff --git a/include/gmssl/digest.h b/include/gmssl/digest.h index 18a9d697..ce5947be 100644 --- a/include/gmssl/digest.h +++ b/include/gmssl/digest.h @@ -17,7 +17,6 @@ #include #include #ifdef ENABLE_BROKEN_CRYPTO -#include #include #endif #include @@ -40,7 +39,6 @@ struct DIGEST_CTX { union { SM3_CTX sm3_ctx; #ifdef ENABLE_BROKEN_CRYPTO - MD5_CTX md5_ctx; SHA1_CTX sha1_ctx; #endif SHA224_CTX sha224_ctx; @@ -63,7 +61,6 @@ struct DIGEST { const DIGEST *DIGEST_sm3(void); #ifdef ENABLE_BROKEN_CRYPTO -const DIGEST *DIGEST_md5(void); const DIGEST *DIGEST_sha1(void); #endif const DIGEST *DIGEST_sha224(void); diff --git a/include/gmssl/md5.h b/include/gmssl/md5.h deleted file mode 100644 index dc4b91d7..00000000 --- a/include/gmssl/md5.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright 2014-2022 The GmSSL Project. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the License); you may - * not use this file except in compliance with the License. - * - * http://www.apache.org/licenses/LICENSE-2.0 - */ - - - -#ifndef GMSSL_MD5_H -#define GMSSL_MD5_H - - -#include -#include - - -#ifdef __cplusplus -extern "C" { -#endif - - -#define MD5_IS_BIG_ENDIAN 0 - -#define MD5_DIGEST_SIZE 16 -#define MD5_BLOCK_SIZE 64 -#define MD5_STATE_WORDS (MD5_BLOCK_SIZE/sizeof(uint32_t)) - -typedef struct { - uint32_t state[MD5_STATE_WORDS]; - uint64_t nblocks; - uint8_t block[MD5_BLOCK_SIZE]; - size_t num; -} MD5_CTX; - - -void md5_init(MD5_CTX *ctx); -void md5_update(MD5_CTX *ctx, const uint8_t *data, size_t datalen); -void md5_finish(MD5_CTX *ctx, uint8_t dgst[MD5_DIGEST_SIZE]); -void md5_digest(const uint8_t *data, size_t datalen, uint8_t dgst[MD5_DIGEST_SIZE]); - - -#ifdef __cplusplus -} -#endif -#endif diff --git a/src/digest.c b/src/digest.c index ba23d077..5b9710ca 100644 --- a/src/digest.c +++ b/src/digest.c @@ -25,7 +25,6 @@ typedef struct { DIGEST_TABLE digest_table[] = { { OID_sm3, "sm3", "SM3" }, #ifdef ENABLE_BROKEN_CRYPTO - { OID_md5, "md5", "MD5" }, { OID_sha1, "sha1", "SHA-1" }, #endif { OID_sha224, "sha224", "SHA-224" }, @@ -96,8 +95,6 @@ const DIGEST *digest_from_name(const char *name) if (!strcmp(name, "sm3") || !strcmp(name, "SM3")) { return DIGEST_sm3(); #ifdef ENABLE_BROKEN_CRYPTO - } else if (!strcmp(name, "md5") || !strcmp(name, "MD5")) { - return DIGEST_md5(); } else if (!strcmp(name, "sha1") || !strcmp(name, "SHA1")) { return DIGEST_sha1(); #endif @@ -164,54 +161,6 @@ const DIGEST *DIGEST_sm3(void) #ifdef ENABLE_BROKEN_CRYPTO -#include - -static int md5_digest_init(DIGEST_CTX *ctx) -{ - if (!ctx) { - error_print(); - return -1; - } - md5_init(&ctx->u.md5_ctx); - return 1; -} - -static int md5_digest_update(DIGEST_CTX *ctx, const uint8_t *in, size_t inlen) -{ - if (!ctx || (!in && inlen != 0)) { - error_print(); - return -1; - } - md5_update(&ctx->u.md5_ctx, in, inlen); - return 1; -} - -static int md5_digest_finish(DIGEST_CTX *ctx, uint8_t *dgst) -{ - if (!ctx || !dgst) { - error_print(); - return -1; - } - md5_finish(&ctx->u.md5_ctx, dgst); - return 1; -} - -static const DIGEST md5_digest_object = { - OID_md5, - MD5_DIGEST_SIZE, - MD5_BLOCK_SIZE, - sizeof(MD5_CTX), - md5_digest_init, - md5_digest_update, - md5_digest_finish, -}; - -const DIGEST *DIGEST_md5(void) -{ - return &md5_digest_object; -} - - #include static int sha1_digest_init(DIGEST_CTX *ctx) diff --git a/src/md5.c b/src/md5.c deleted file mode 100644 index f7b3a025..00000000 --- a/src/md5.c +++ /dev/null @@ -1,181 +0,0 @@ -/* - * Copyright 2014-2023 The GmSSL Project. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the License); you may - * not use this file except in compliance with the License. - * - * http://www.apache.org/licenses/LICENSE-2.0 - */ - - - -#include -#include -#include - - -#define F(B, C, D) (((B) & (C)) | ((~(B)) & (D))) -#define G(B, C, D) (((B) & (D)) | ((C) & (~(D)))) -#define H(B, C, D) ((B) ^ (C) ^ (D)) -#define I(B, C, D) ((C) ^ ((B) | (~(D)))) - -static const uint32_t K[] = { - 0xd76aa478, 0xe8c7b756, 0x242070db, 0xc1bdceee, - 0xf57c0faf, 0x4787c62a, 0xa8304613, 0xfd469501, - 0x698098d8, 0x8b44f7af, 0xffff5bb1, 0x895cd7be, - 0x6b901122, 0xfd987193, 0xa679438e, 0x49b40821, - 0xf61e2562, 0xc040b340, 0x265e5a51, 0xe9b6c7aa, - 0xd62f105d, 0x02441453, 0xd8a1e681, 0xe7d3fbc8, - 0x21e1cde6, 0xc33707d6, 0xf4d50d87, 0x455a14ed, - 0xa9e3e905, 0xfcefa3f8, 0x676f02d9, 0x8d2a4c8a, - 0xfffa3942, 0x8771f681, 0x6d9d6122, 0xfde5380c, - 0xa4beea44, 0x4bdecfa9, 0xf6bb4b60, 0xbebfbc70, - 0x289b7ec6, 0xeaa127fa, 0xd4ef3085, 0x04881d05, - 0xd9d4d039, 0xe6db99e5, 0x1fa27cf8, 0xc4ac5665, - 0xf4292244, 0x432aff97, 0xab9423a7, 0xfc93a039, - 0x655b59c3, 0x8f0ccc92, 0xffeff47d, 0x85845dd1, - 0x6fa87e4f, 0xfe2ce6e0, 0xa3014314, 0x4e0811a1, - 0xf7537e82, 0xbd3af235, 0x2ad7d2bb, 0xeb86d391, -}; - -static const int S[] = { - 7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, - 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, - 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, - 6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21, -}; - -static void md5_compress_blocks(uint32_t state[4], - const unsigned char *data, size_t blocks) -{ - uint32_t A; - uint32_t B; - uint32_t C; - uint32_t D; - uint32_t T; - uint32_t W[16]; - int g, i; - - while (blocks--) { - - A = state[0]; - B = state[1]; - C = state[2]; - D = state[3]; - - for (i = 0; i < 16; i++) { - W[i] = GETU32_LE(data); - data += sizeof(uint32_t); - } - - for (i = 0; i < 16; i++) { - T = ROL32(A + F(B, C, D) + W[i] + K[i], S[i]) + B; - A = D; - D = C; - C = B; - B = T; - } - for (; i < 32; i++) { - g = (5 * i + 1) % 16; - T = ROL32(A + G(B, C, D) + W[g] + K[i], S[i]) + B; - A = D; - D = C; - C = B; - B = T; - } - for (; i < 48; i++) { - g = (3 * i + 5) % 16; - T = ROL32(A + H(B, C, D) + W[g] + K[i], S[i]) + B; - A = D; - D = C; - C = B; - B = T; - } - for (; i < 64; i++) { - g = (7 * i) % 16; - T = ROL32(A + I(B, C, D) + W[g] + K[i], S[i]) + B; - A = D; - D = C; - C = B; - B = T; - } - - state[0] += A; - state[1] += B; - state[2] += C; - state[3] += D; - } -} - -void md5_init(MD5_CTX *ctx) -{ - memset(ctx, 0, sizeof(*ctx)); - ctx->state[0] = 0x67452301; - ctx->state[1] = 0xefcdab89; - ctx->state[2] = 0x98badcfe; - ctx->state[3] = 0x10325476; -} - -void md5_update(MD5_CTX *ctx, const unsigned char *data, size_t datalen) -{ - size_t blocks; - - ctx->num &= 0x3f; - if (ctx->num) { - size_t left = MD5_BLOCK_SIZE - ctx->num; - if (datalen < left) { - memcpy(ctx->block + ctx->num, data, datalen); - ctx->num += datalen; - return; - } else { - memcpy(ctx->block + ctx->num, data, left); - md5_compress_blocks(ctx->state, ctx->block, 1); - ctx->nblocks++; - data += left; - datalen -= left; - } - } - - blocks = datalen / MD5_BLOCK_SIZE; - md5_compress_blocks(ctx->state, data, blocks); - ctx->nblocks += blocks; - data += MD5_BLOCK_SIZE * blocks; - datalen -= MD5_BLOCK_SIZE * blocks; - - ctx->num = datalen; - if (datalen) { - memcpy(ctx->block, data, datalen); - } -} - -void md5_finish(MD5_CTX *ctx, unsigned char *dgst) -{ - int i; - - ctx->num &= 0x3f; - ctx->block[ctx->num] = 0x80; - - if (ctx->num <= MD5_BLOCK_SIZE - 9) { - memset(ctx->block + ctx->num + 1, 0, MD5_BLOCK_SIZE - ctx->num - 9); - } else { - memset(ctx->block + ctx->num + 1, 0, MD5_BLOCK_SIZE - ctx->num - 1); - md5_compress_blocks(ctx->state, ctx->block, 1); - memset(ctx->block, 0, MD5_BLOCK_SIZE - 8); - } - PUTU64_LE(ctx->block + 56, (ctx->nblocks << 9) + (ctx->num << 3)); - md5_compress_blocks(ctx->state, ctx->block, 1); - for (i = 0; i < 4; i++) { - PUTU32_LE(dgst, ctx->state[i]); - dgst += sizeof(uint32_t); - } -} - -void md5_digest(const unsigned char *data, size_t datalen, - unsigned char dgst[MD5_DIGEST_SIZE]) -{ - MD5_CTX ctx; - md5_init(&ctx); - md5_update(&ctx, data, datalen); - md5_finish(&ctx, dgst); - memset(&ctx, 0, sizeof(ctx)); -}