#14465: Update openssl to tag android-4.0.4_r2.1
diff --git a/jni/openssl/crypto/mdc2/mdc2.h b/jni/openssl/crypto/mdc2/mdc2.h
index f3e8e57..72778a5 100644
--- a/jni/openssl/crypto/mdc2/mdc2.h
+++ b/jni/openssl/crypto/mdc2/mdc2.h
@@ -81,9 +81,6 @@
} MDC2_CTX;
-#ifdef OPENSSL_FIPS
-int private_MDC2_Init(MDC2_CTX *c);
-#endif
int MDC2_Init(MDC2_CTX *c);
int MDC2_Update(MDC2_CTX *c, const unsigned char *data, size_t len);
int MDC2_Final(unsigned char *md, MDC2_CTX *c);
diff --git a/jni/openssl/crypto/mdc2/mdc2dgst.c b/jni/openssl/crypto/mdc2/mdc2dgst.c
index b74bb1a..4aa406e 100644
--- a/jni/openssl/crypto/mdc2/mdc2dgst.c
+++ b/jni/openssl/crypto/mdc2/mdc2dgst.c
@@ -61,7 +61,6 @@
#include <string.h>
#include <openssl/des.h>
#include <openssl/mdc2.h>
-#include <openssl/crypto.h>
#undef c2l
#define c2l(c,l) (l =((DES_LONG)(*((c)++))) , \
@@ -76,7 +75,7 @@
*((c)++)=(unsigned char)(((l)>>24L)&0xff))
static void mdc2_body(MDC2_CTX *c, const unsigned char *in, size_t len);
-fips_md_init(MDC2)
+int MDC2_Init(MDC2_CTX *c)
{
c->num=0;
c->pad_type=1;