Jacek Caban : rsaenh: Use bcrypt for MD2 hashes.
Alexandre Julliard
julliard at winehq.org
Thu Dec 7 16:02:43 CST 2017
Module: wine
Branch: master
Commit: 8009091f111523dfc04c8acdb29787ce07ba5d13
URL: http://source.winehq.org/git/wine.git/?a=commit;h=8009091f111523dfc04c8acdb29787ce07ba5d13
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Dec 7 19:46:33 2017 +0100
rsaenh: Use bcrypt for MD2 hashes.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/rsaenh/Makefile.in | 1 -
dlls/rsaenh/implglue.c | 13 +----
dlls/rsaenh/implglue.h | 1 -
dlls/rsaenh/md2.c | 151 ------------------------------------------------
dlls/rsaenh/tomcrypt.h | 9 ---
5 files changed, 2 insertions(+), 173 deletions(-)
diff --git a/dlls/rsaenh/Makefile.in b/dlls/rsaenh/Makefile.in
index c9cb007..9997752 100644
--- a/dlls/rsaenh/Makefile.in
+++ b/dlls/rsaenh/Makefile.in
@@ -7,7 +7,6 @@ C_SRCS = \
des.c \
handle.c \
implglue.c \
- md2.c \
mpi.c \
rc2.c \
rc4.c \
diff --git a/dlls/rsaenh/implglue.c b/dlls/rsaenh/implglue.c
index 1dfc896..58fd727 100644
--- a/dlls/rsaenh/implglue.c
+++ b/dlls/rsaenh/implglue.c
@@ -56,8 +56,8 @@ BOOL init_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext)
switch (aiAlgid)
{
case CALG_MD2:
- md2_init(&pHashContext->md2);
- return TRUE;
+ status = BCryptOpenAlgorithmProvider(&provider, BCRYPT_MD2_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0);
+ break;
case CALG_MD4:
MD4Init(&pHashContext->md4);
@@ -99,10 +99,6 @@ BOOL update_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext, const BYTE *pb
{
switch (aiAlgid)
{
- case CALG_MD2:
- md2_process(&pHashContext->md2, pbData, dwDataLen);
- break;
-
case CALG_MD4:
MD4Update(&pHashContext->md4, pbData, dwDataLen);
break;
@@ -126,10 +122,6 @@ BOOL finalize_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext, BYTE *pbHash
{
switch (aiAlgid)
{
- case CALG_MD2:
- md2_done(&pHashContext->md2, pbHashValue);
- break;
-
case CALG_MD4:
MD4Final(&pHashContext->md4);
memcpy(pbHashValue, pHashContext->md4.digest, 16);
@@ -158,7 +150,6 @@ BOOL duplicate_hash_impl(ALG_ID aiAlgid, const HASH_CONTEXT *pSrcHashContext,
{
switch (aiAlgid)
{
- case CALG_MD2:
case CALG_MD4:
case CALG_MD5:
case CALG_SHA:
diff --git a/dlls/rsaenh/implglue.h b/dlls/rsaenh/implglue.h
index 5353810a..446f843 100644
--- a/dlls/rsaenh/implglue.h
+++ b/dlls/rsaenh/implglue.h
@@ -56,7 +56,6 @@ typedef struct tagSHA_CTX
} SHA_CTX, *PSHA_CTX;
typedef union tagHASH_CONTEXT {
- md2_state md2;
MD4_CTX md4;
MD5_CTX md5;
SHA_CTX sha;
diff --git a/dlls/rsaenh/md2.c b/dlls/rsaenh/md2.c
deleted file mode 100644
index 187d114..0000000
--- a/dlls/rsaenh/md2.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * dlls/rsaenh/md2.c
- * MD2 (RFC 1319) hash function implementation by Tom St Denis
- *
- * Copyright 2004 Michael Jung
- * Based on public domain code by Tom St Denis (tomstdenis at iahu.ca)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-/*
- * This file contains code from the LibTomCrypt cryptographic
- * library written by Tom St Denis (tomstdenis at iahu.ca). LibTomCrypt
- * is in the public domain. The code in this file is tailored to
- * special requirements. Take a look at http://libtomcrypt.org for the
- * original version.
- */
-
-#include "tomcrypt.h"
-
-static const unsigned char PI_SUBST[256] = {
- 41, 46, 67, 201, 162, 216, 124, 1, 61, 54, 84, 161, 236, 240, 6,
- 19, 98, 167, 5, 243, 192, 199, 115, 140, 152, 147, 43, 217, 188,
- 76, 130, 202, 30, 155, 87, 60, 253, 212, 224, 22, 103, 66, 111, 24,
- 138, 23, 229, 18, 190, 78, 196, 214, 218, 158, 222, 73, 160, 251,
- 245, 142, 187, 47, 238, 122, 169, 104, 121, 145, 21, 178, 7, 63,
- 148, 194, 16, 137, 11, 34, 95, 33, 128, 127, 93, 154, 90, 144, 50,
- 39, 53, 62, 204, 231, 191, 247, 151, 3, 255, 25, 48, 179, 72, 165,
- 181, 209, 215, 94, 146, 42, 172, 86, 170, 198, 79, 184, 56, 210,
- 150, 164, 125, 182, 118, 252, 107, 226, 156, 116, 4, 241, 69, 157,
- 112, 89, 100, 113, 135, 32, 134, 91, 207, 101, 230, 45, 168, 2, 27,
- 96, 37, 173, 174, 176, 185, 246, 28, 70, 97, 105, 52, 64, 126, 15,
- 85, 71, 163, 35, 221, 81, 175, 58, 195, 92, 249, 206, 186, 197,
- 234, 38, 44, 83, 13, 110, 133, 40, 132, 9, 211, 223, 205, 244, 65,
- 129, 77, 82, 106, 220, 55, 200, 108, 193, 171, 250, 36, 225, 123,
- 8, 12, 189, 177, 74, 120, 136, 149, 139, 227, 99, 232, 109, 233,
- 203, 213, 254, 59, 0, 29, 57, 242, 239, 183, 14, 102, 88, 208, 228,
- 166, 119, 114, 248, 235, 117, 75, 10, 49, 68, 80, 180, 143, 237,
- 31, 26, 219, 153, 141, 51, 159, 17, 131, 20
-};
-
-/* adds 16 bytes to the checksum */
-static void md2_update_chksum(md2_state *md2)
-{
- int j;
- unsigned char L;
- L = md2->chksum[15];
- for (j = 0; j < 16; j++) {
-
-/* caution, the RFC says its "C[j] = S[M[i*16+j] xor L]" but the reference source code [and test vectors] say
- otherwise.
-*/
- L = (md2->chksum[j] ^= PI_SUBST[(int)(md2->buf[j] ^ L)] & 255);
- }
-}
-
-static void md2_compress(md2_state *md2)
-{
- int j, k;
- unsigned char t;
-
- /* copy block */
- for (j = 0; j < 16; j++) {
- md2->X[16+j] = md2->buf[j];
- md2->X[32+j] = md2->X[j] ^ md2->X[16+j];
- }
-
- t = 0;
-
- /* do 18 rounds */
- for (j = 0; j < 18; j++) {
- for (k = 0; k < 48; k++) {
- t = (md2->X[k] ^= PI_SUBST[(int)(t & 255)]);
- }
- t = (t + (unsigned char)j) & 255;
- }
-}
-
-int md2_init(md2_state *md2)
-{
- /* MD2 uses a zero'ed state... */
- memset(md2->X, 0, sizeof(md2->X));
- memset(md2->chksum, 0, sizeof(md2->chksum));
- memset(md2->buf, 0, sizeof(md2->buf));
- md2->curlen = 0;
- return CRYPT_OK;
-}
-
-int md2_process(md2_state *md2, const unsigned char *buf, unsigned long len)
-{
- unsigned long n;
-
- if (md2->curlen > sizeof(md2->buf)) {
- return CRYPT_INVALID_ARG;
- }
- while (len > 0) {
- n = MIN(len, (16 - md2->curlen));
- memcpy(md2->buf + md2->curlen, buf, (size_t)n);
- md2->curlen += n;
- buf += n;
- len -= n;
-
- /* is 16 bytes full? */
- if (md2->curlen == 16) {
- md2_compress(md2);
- md2_update_chksum(md2);
- md2->curlen = 0;
- }
- }
- return CRYPT_OK;
-}
-
-int md2_done(md2_state * md2, unsigned char *hash)
-{
- unsigned long i, k;
-
- if (md2->curlen >= sizeof(md2->buf)) {
- return CRYPT_INVALID_ARG;
- }
-
- /* pad the message */
- k = 16 - md2->curlen;
- for (i = md2->curlen; i < 16; i++) {
- md2->buf[i] = (unsigned char)k;
- }
-
- /* hash and update */
- md2_compress(md2);
- md2_update_chksum(md2);
-
- /* hash checksum */
- memcpy(md2->buf, md2->chksum, 16);
- md2_compress(md2);
-
- /* output is lower 16 bytes of X */
- memcpy(hash, md2->X, 16);
-
- return CRYPT_OK;
-}
diff --git a/dlls/rsaenh/tomcrypt.h b/dlls/rsaenh/tomcrypt.h
index 49fb352..3e1db9a 100644
--- a/dlls/rsaenh/tomcrypt.h
+++ b/dlls/rsaenh/tomcrypt.h
@@ -150,15 +150,6 @@ int aes_setup(const unsigned char *key, int keylen, int rounds, aes_key *skey);
void aes_ecb_encrypt(const unsigned char *pt, unsigned char *ct, aes_key *skey);
void aes_ecb_decrypt(const unsigned char *ct, unsigned char *pt, aes_key *skey);
-typedef struct tag_md2_state {
- unsigned char chksum[16], X[48], buf[16];
- unsigned long curlen;
-} md2_state;
-
-int md2_init(md2_state * md);
-int md2_process(md2_state * md, const unsigned char *buf, unsigned long len);
-int md2_done(md2_state * md, unsigned char *hash);
-
struct rc4_prng {
int x, y;
unsigned char buf[256];
More information about the wine-cvs
mailing list