oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Start switch to EVP digest.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@23564 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2008-08-16 23:03:42 +00:00
parent 7e03e547fa
commit 0a0d731350
1 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/krb5/crypto.c
View File

@@ -1243,11 +1243,8 @@ RSA_MD4_checksum(krb5_context context,
unsigned usage, unsigned usage,
Checksum *C) Checksum *C)
{ {
MD4_CTX m; if (EVP_Digest(data, len, C->checksum.data, NULL, EVP_md4(), NULL) != 1)
krb5_abortx(context, "md4 checksum failed");
MD4_Init (&m);
MD4_Update (&m, data, len);
MD4_Final (C->checksum.data, &m);
} }
static void static void
@@ -1270,7 +1267,7 @@ RSA_MD4_DES_checksum(krb5_context context,
memset (&ivec, 0, sizeof(ivec)); memset (&ivec, 0, sizeof(ivec));
DES_cbc_encrypt(p, DES_cbc_encrypt(p,
p, p,
24, 24,
key->schedule->data, key->schedule->data,
&ivec, &ivec,
DES_ENCRYPT); DES_ENCRYPT);
@@ -1318,11 +1315,8 @@ RSA_MD5_checksum(krb5_context context,
unsigned usage, unsigned usage,
Checksum *C) Checksum *C)
{ {
MD5_CTX m; if (EVP_Digest(data, len, C->checksum.data, NULL, EVP_md5(), NULL) != 1)
krb5_abortx(context, "md5 checksum failed");
MD5_Init (&m);
MD5_Update(&m, data, len);
MD5_Final (C->checksum.data, &m);
} }
static void static void
@@ -1456,11 +1450,8 @@ SHA1_checksum(krb5_context context,
unsigned usage, unsigned usage,
Checksum *C) Checksum *C)
{ {
SHA_CTX m; if (EVP_Digest(data, len, C->checksum.data, NULL, EVP_sha1(), NULL) != 1)
krb5_abortx(context, "sha1 checksum failed");
SHA1_Init(&m);
SHA1_Update(&m, data, len);
SHA1_Final(C->checksum.data, &m);
} }
/* HMAC according to RFC2104 */ /* HMAC according to RFC2104 */