diff options
| author | marha <marha@users.sourceforge.net> | 2010-03-29 17:08:02 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-03-29 17:08:02 +0000 |
| commit | 15272ab4ed1e6250412fccd48200ed9eae59608f (patch) | |
| tree | a5996ea67966a778a16565f19dfc2e7c7f49b376 /openssl/crypto/mdc2 | |
| parent | 3827301b2ea5a45ac009c3bf9f08586ff40b8506 (diff) | |
| download | vcxsrv-15272ab4ed1e6250412fccd48200ed9eae59608f.tar.gz vcxsrv-15272ab4ed1e6250412fccd48200ed9eae59608f.tar.bz2 vcxsrv-15272ab4ed1e6250412fccd48200ed9eae59608f.zip | |
Updated to openssl 1.0.0
Diffstat (limited to 'openssl/crypto/mdc2')
| -rw-r--r-- | openssl/crypto/mdc2/Makefile | 2 | ||||
| -rw-r--r-- | openssl/crypto/mdc2/mdc2.h | 4 | ||||
| -rw-r--r-- | openssl/crypto/mdc2/mdc2dgst.c | 7 |
3 files changed, 3 insertions, 10 deletions
diff --git a/openssl/crypto/mdc2/Makefile b/openssl/crypto/mdc2/Makefile index ea25688d8..1d064f17a 100644 --- a/openssl/crypto/mdc2/Makefile +++ b/openssl/crypto/mdc2/Makefile @@ -33,7 +33,7 @@ top: all: lib lib: $(LIBOBJ) - $(ARX) $(LIB) $(LIBOBJ) + $(AR) $(LIB) $(LIBOBJ) $(RANLIB) $(LIB) || echo Never mind. @touch lib diff --git a/openssl/crypto/mdc2/mdc2.h b/openssl/crypto/mdc2/mdc2.h index 7e1354116..72778a521 100644 --- a/openssl/crypto/mdc2/mdc2.h +++ b/openssl/crypto/mdc2/mdc2.h @@ -80,9 +80,7 @@ typedef struct mdc2_ctx_st int pad_type; /* either 1 or 2, default 1 */ } 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/openssl/crypto/mdc2/mdc2dgst.c b/openssl/crypto/mdc2/mdc2dgst.c index a36b3f578..4aa406edc 100644 --- a/openssl/crypto/mdc2/mdc2dgst.c +++ b/openssl/crypto/mdc2/mdc2dgst.c @@ -61,11 +61,6 @@ #include <string.h> #include <openssl/des.h> #include <openssl/mdc2.h> -#include <openssl/err.h> -#ifdef OPENSSL_FIPS -#include <openssl/fips.h> -#endif - #undef c2l #define c2l(c,l) (l =((DES_LONG)(*((c)++))) , \ @@ -80,7 +75,7 @@ *((c)++)=(unsigned char)(((l)>>24L)&0xff)) static void mdc2_body(MDC2_CTX *c, const unsigned char *in, size_t len); -FIPS_NON_FIPS_MD_Init(MDC2) +int MDC2_Init(MDC2_CTX *c) { c->num=0; c->pad_type=1; |