PR: 1422

[oweals/openssl.git] / crypto / md2 / md2_dgst.c

diff --git a/crypto/md2/md2_dgst.c b/crypto/md2/md2_dgst.c
index f98009acad25efcd64f3c419b486c56b6b98cef3..cc4eeaf7a7ad5c759fcec3a6c516c6ee65b5cc91 100644 (file)
--- a/crypto/md2/md2_dgst.c
+++ b/crypto/md2/md2_dgst.c
@@ -61,8 +61,14 @@
 #include <string.h>
 #include <openssl/md2.h>
 #include <openssl/opensslv.h>
+#include <openssl/crypto.h>
+#ifdef OPENSSL_FIPS
+#include <openssl/fips.h>
+#endif
 
-const char *MD2_version="MD2" OPENSSL_VERSION_PTEXT;
+#include <openssl/err.h>
+
+const char MD2_version[]="MD2" OPENSSL_VERSION_PTEXT;
 
 /* Implemented from RFC1319 The MD2 Message-Digest Algorithm
  */
@@ -115,7 +121,7 @@ const char *MD2_options(void)
                return("md2(int)");
        }
 
-int MD2_Init(MD2_CTX *c)
+FIPS_NON_FIPS_MD_Init(MD2)
        {
        c->num=0;
        memset(c->state,0,sizeof c->state);
@@ -124,7 +130,7 @@ int MD2_Init(MD2_CTX *c)
        return 1;
        }
 
-int MD2_Update(MD2_CTX *c, const unsigned char *data, unsigned long len)
+int MD2_Update(MD2_CTX *c, const unsigned char *data, size_t len)
        {
        register UCHAR *p;
 
@@ -144,7 +150,7 @@ int MD2_Update(MD2_CTX *c, const unsigned char *data, unsigned long len)
                        }
                else
                        {
-                       memcpy(&(p[c->num]),data,(int)len);
+                       memcpy(&(p[c->num]),data,len);
                        /* data+=len; */
                        c->num+=(int)len;
                        return 1;
@@ -158,7 +164,7 @@ int MD2_Update(MD2_CTX *c, const unsigned char *data, unsigned long len)
                data+=MD2_BLOCK;
                len-=MD2_BLOCK;
                }
-       memcpy(p,data,(int)len);
+       memcpy(p,data,len);
        c->num=(int)len;
        return 1;
        }
@@ -196,7 +202,7 @@ static void md2_block(MD2_CTX *c, const unsigned char *d)
                t=(t+i)&0xff;
                }
        memcpy(sp1,state,16*sizeof(MD2_INT));
-       memset(state,0,48*sizeof(MD2_INT));
+       OPENSSL_cleanse(state,48*sizeof(MD2_INT));
        }
 
 int MD2_Final(unsigned char *md, MD2_CTX *c)