switch to use EVP interface instead of old MDX_ style interface

This commit is contained in:
Love Hornquist Astrand
2009-08-17 10:16:13 +02:00
parent 13c3b9b1c6
commit ddb54ca483

View File

@@ -202,7 +202,7 @@ wrap_des
)
{
u_char *p;
MD5_CTX md5;
EVP_MD_CTX md5;
u_char hash[16];
DES_key_schedule schedule;
DES_cblock deskey;
@@ -262,10 +262,12 @@ wrap_des
memset (p + 8 + input_message_buffer->length, padlength, padlength);
/* checksum */
MD5_Init (&md5);
MD5_Update (&md5, p - 24, 8);
MD5_Update (&md5, p, datalen);
MD5_Final (hash, &md5);
EVP_MD_CTX_init(&md5);
EVP_DigestInit_ex(&md5, EVP_md5(), NULL);
EVP_DigestUpdate(&md5, p - 24, 8);
EVP_DigestUpdate(&md5, p, datalen);
EVP_DigestFinal_ex(&md5, hash, NULL);
EVP_MD_CTX_cleanup(&md5);
memset (&zero, 0, sizeof(zero));
memcpy (&deskey, key->keyvalue.data, sizeof(deskey));