Make MD functions take EVP_MD_CTX * instead of void *, add copy() function.

[openssl.git] / crypto / evp / m_md5.c

diff --git a/crypto/evp/m_md5.c b/crypto/evp/m_md5.c
index 18531b67a05485066fb57178dd1ae468827cb56e..69ec8aa027fa13d07577b0c9cc8dba7ef7eea550 100644 (file)
--- a/crypto/evp/m_md5.c
+++ b/crypto/evp/m_md5.c
@@ -56,26 +56,40 @@
  * [including the GNU Public Licence.]
  */
 
+#ifndef OPENSSL_NO_MD5
 #include <stdio.h>
 #include "cryptlib.h"
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include <openssl/x509.h>
+#include <openssl/md5.h>
 
-static EVP_MD md5_md=
+static int init(EVP_MD_CTX *ctx)
+       { return MD5_Init(ctx->md_data); }
+
+static int update(EVP_MD_CTX *ctx,const void *data,unsigned long count)
+       { return MD5_Update(ctx->md_data,data,count); }
+
+static int final(EVP_MD_CTX *ctx,unsigned char *md)
+       { return MD5_Final(md,ctx->md_data); }
+
+static const EVP_MD md5_md=
        {
        NID_md5,
        NID_md5WithRSAEncryption,
        MD5_DIGEST_LENGTH,
-       MD5_Init,
-       MD5_Update,
-       MD5_Final,
+       0,
+       init,
+       update,
+       final,
+       NULL,
        EVP_PKEY_RSA_method,
        MD5_CBLOCK,
        sizeof(EVP_MD *)+sizeof(MD5_CTX),
        };
 
-EVP_MD *EVP_md5(void)
+const EVP_MD *EVP_md5(void)
        {
        return(&md5_md);
        }
+#endif