diff options
| author | Nagendra Modadugu <ngm@google.com> | 2009-09-30 11:36:48 -0700 |
|---|---|---|
| committer | Nagendra Modadugu <ngm@google.com> | 2009-09-30 12:06:07 -0700 |
| commit | e45f106cb6b47af1f21efe76e933bdea2f5dd1ca (patch) | |
| tree | 9abf212990e6e7631ac6b0a07816dfe069912724 /crypto/md4 | |
| parent | 5fe11ead41a8b9709f910786101e818603de6690 (diff) | |
| download | replicant_openssl-e45f106cb6b47af1f21efe76e933bdea2f5dd1ca.zip replicant_openssl-e45f106cb6b47af1f21efe76e933bdea2f5dd1ca.tar.gz replicant_openssl-e45f106cb6b47af1f21efe76e933bdea2f5dd1ca.tar.bz2 | |
Upgrade to openssl-0.9.8k.
The source tree (and the size of the compiled library)
can be reduced further. This will be done in a future
commit.
Diffstat (limited to 'crypto/md4')
| -rw-r--r-- | crypto/md4/Makefile | 12 | ||||
| -rw-r--r-- | crypto/md4/md4.h | 3 | ||||
| -rw-r--r-- | crypto/md4/md4_dgst.c | 7 |
3 files changed, 17 insertions, 5 deletions
diff --git a/crypto/md4/Makefile b/crypto/md4/Makefile index ef97bb0..0bc4896 100644 --- a/crypto/md4/Makefile +++ b/crypto/md4/Makefile @@ -34,7 +34,7 @@ top: all: lib lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) + $(ARX) $(LIB) $(LIBOBJ) $(RANLIB) $(LIB) || echo Never mind. @touch lib @@ -75,9 +75,13 @@ clean: # DO NOT DELETE THIS LINE -- make depend depends on it. -md4_dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/md4.h -md4_dgst.o: ../../include/openssl/opensslconf.h -md4_dgst.o: ../../include/openssl/opensslv.h ../md32_common.h md4_dgst.c +md4_dgst.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h +md4_dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h +md4_dgst.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h +md4_dgst.o: ../../include/openssl/md4.h ../../include/openssl/opensslconf.h +md4_dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +md4_dgst.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h +md4_dgst.o: ../../include/openssl/symhacks.h ../md32_common.h md4_dgst.c md4_dgst.o: md4_locl.h md4_one.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h md4_one.o: ../../include/openssl/md4.h ../../include/openssl/opensslconf.h diff --git a/crypto/md4/md4.h b/crypto/md4/md4.h index 5598c93..ba1fe4a 100644 --- a/crypto/md4/md4.h +++ b/crypto/md4/md4.h @@ -105,6 +105,9 @@ typedef struct MD4state_st unsigned int num; } MD4_CTX; +#ifdef OPENSSL_FIPS +int private_MD4_Init(MD4_CTX *c); +#endif int MD4_Init(MD4_CTX *c); int MD4_Update(MD4_CTX *c, const void *data, size_t len); int MD4_Final(unsigned char *md, MD4_CTX *c); diff --git a/crypto/md4/md4_dgst.c b/crypto/md4/md4_dgst.c index cfef94a..0f54486 100644 --- a/crypto/md4/md4_dgst.c +++ b/crypto/md4/md4_dgst.c @@ -59,6 +59,11 @@ #include <stdio.h> #include "md4_locl.h" #include <openssl/opensslv.h> +#include <openssl/err.h> +#ifdef OPENSSL_FIPS +#include <openssl/fips.h> +#endif + const char MD4_version[]="MD4" OPENSSL_VERSION_PTEXT; @@ -70,7 +75,7 @@ const char MD4_version[]="MD4" OPENSSL_VERSION_PTEXT; #define INIT_DATA_C (unsigned long)0x98badcfeL #define INIT_DATA_D (unsigned long)0x10325476L -int MD4_Init(MD4_CTX *c) +FIPS_NON_FIPS_MD_Init(MD4) { c->A=INIT_DATA_A; c->B=INIT_DATA_B; |