From b0b2802cb1782e0db78a7f4e797272644e48cd16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Sun, 17 Aug 2008 14:06:10 +0000
Subject: [PATCH] More EVP.

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@23572 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/krb5/crypto.c | 37 +++++++++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/lib/krb5/crypto.c b/lib/krb5/crypto.c
index 888e03bac..0508b0d74 100644
--- a/lib/krb5/crypto.c
+++ b/lib/krb5/crypto.c
@@ -569,20 +569,36 @@ ARCFOUR_string_to_key(krb5_context context,
 		  krb5_keyblock *key)
 {
     krb5_error_code ret;
-    uint16_t *s;
+    uint16_t *s = NULL;
     size_t len, i;
-    MD4_CTX m;
+    EVP_MD_CTX *m;
+
+    m = EVP_MD_CTX_create();
+    if (m == NULL) {
+	ret = ENOMEM;
+	krb5_set_error_message(context, ret, "Malloc: out of memory");
+	goto out;
+    }
+
+    if (EVP_DigestInit_ex(m, EVP_md4(), NULL) != 1) {
+	krb5_set_error_message(context, KRB5_CRYPTO_INTERNAL,
+			       "MD5 init failed");
+	ret = KRB5_CRYPTO_INTERNAL;
+	goto out;
+    }
+	
 
     ret = wind_utf8ucs2_length(password.data, &len);
     if (ret) {
 	krb5_set_error_message (context, ret, "Password not an UCS2 string");
-	return ret;
+	goto out;
     }
 	
     s = malloc (len * sizeof(s[0]));
     if (len != 0 && s == NULL) {
 	krb5_set_error_message (context, ENOMEM, "malloc: out of memory");
-	return ENOMEM;
+	ret = ENOMEM;
+	goto out;
     }
 
     ret = wind_utf8ucs2(password.data, s, &len);
@@ -592,13 +608,12 @@ ARCFOUR_string_to_key(krb5_context context,
     }
 
     /* LE encoding */
-    MD4_Init (&m);
     for (i = 0; i < len; i++) {
 	unsigned char p;
 	p = (s[i] & 0xff);
-	MD4_Update (&m, &p, 1);
+	EVP_DigestUpdate (m, &p, 1);
 	p = (s[i] >> 8) & 0xff;
-	MD4_Update (&m, &p, 1);
+	EVP_DigestUpdate (m, &p, 1);
     }
 
     key->keytype = enctype;
@@ -607,10 +622,12 @@ ARCFOUR_string_to_key(krb5_context context,
 	krb5_set_error_message (context, ENOMEM, "malloc: out of memory");
 	goto out;
     }
-    MD4_Final (key->keyvalue.data, &m);
-    ret = 0;
+    EVP_DigestFinal_ex (m, key->keyvalue.data, NULL);
+
 out:
-    memset (s, 0, len);
+    EVP_MD_CTX_destroy(m);
+    if (s)
+	memset (s, 0, len);
     free (s);
     return ret;
 }