switch to use EVP interface instead of old MDX_ style interface

This commit is contained in:
Love Hornquist Astrand
2009-08-17 10:14:24 +02:00
parent 3ef05891ee
commit 639e93d436

View File

@@ -46,7 +46,7 @@ unwrap_des
{ {
u_char *p, *seq; u_char *p, *seq;
size_t len; size_t len;
MD5_CTX md5; EVP_MD_CTX md5;
u_char hash[16]; u_char hash[16];
DES_key_schedule schedule; DES_key_schedule schedule;
DES_cblock deskey; DES_cblock deskey;
@@ -122,10 +122,12 @@ unwrap_des
return ret; return ret;
} }
MD5_Init (&md5); EVP_MD_CTX_init(&md5);
MD5_Update (&md5, p - 24, 8); EVP_DigestInit_ex(&md5, EVP_md5(), NULL);
MD5_Update (&md5, p, input_message_buffer->length - len); EVP_DigestUpdate(&md5, p - 24, 8);
MD5_Final (hash, &md5); EVP_DigestUpdate(&md5, p, input_message_buffer->length - len);
EVP_DigestFinal_ex(&md5, hash, NULL);
EVP_MD_CTX_cleanup(&md5);
memset (&zero, 0, sizeof(zero)); memset (&zero, 0, sizeof(zero));
memcpy (&deskey, key->keyvalue.data, sizeof(deskey)); memcpy (&deskey, key->keyvalue.data, sizeof(deskey));