diff options
Diffstat (limited to 'src/lib/libcrypto/md4')
-rw-r--r-- | src/lib/libcrypto/md4/Makefile | 86 | ||||
-rw-r--r-- | src/lib/libcrypto/md4/Makefile.ssl | 91 | ||||
-rw-r--r-- | src/lib/libcrypto/md4/md4.c | 127 | ||||
-rw-r--r-- | src/lib/libcrypto/md4/md4.h | 10 | ||||
-rw-r--r-- | src/lib/libcrypto/md4/md4_dgst.c | 95 | ||||
-rw-r--r-- | src/lib/libcrypto/md4/md4_locl.h | 44 | ||||
-rw-r--r-- | src/lib/libcrypto/md4/md4_one.c | 2 | ||||
-rw-r--r-- | src/lib/libcrypto/md4/md4s.cpp | 78 | ||||
-rw-r--r-- | src/lib/libcrypto/md4/md4test.c | 136 |
9 files changed, 660 insertions, 9 deletions
diff --git a/src/lib/libcrypto/md4/Makefile b/src/lib/libcrypto/md4/Makefile new file mode 100644 index 0000000000..ef97bb0cbe --- /dev/null +++ b/src/lib/libcrypto/md4/Makefile | |||
@@ -0,0 +1,86 @@ | |||
1 | # | ||
2 | # OpenSSL/crypto/md4/Makefile | ||
3 | # | ||
4 | |||
5 | DIR= md4 | ||
6 | TOP= ../.. | ||
7 | CC= cc | ||
8 | CPP= $(CC) -E | ||
9 | INCLUDES= | ||
10 | CFLAG=-g | ||
11 | MAKEFILE= Makefile | ||
12 | AR= ar r | ||
13 | |||
14 | CFLAGS= $(INCLUDES) $(CFLAG) | ||
15 | |||
16 | GENERAL=Makefile | ||
17 | TEST=md4test.c | ||
18 | APPS=md4.c | ||
19 | |||
20 | LIB=$(TOP)/libcrypto.a | ||
21 | LIBSRC=md4_dgst.c md4_one.c | ||
22 | LIBOBJ=md4_dgst.o md4_one.o | ||
23 | |||
24 | SRC= $(LIBSRC) | ||
25 | |||
26 | EXHEADER= md4.h | ||
27 | HEADER= md4_locl.h $(EXHEADER) | ||
28 | |||
29 | ALL= $(GENERAL) $(SRC) $(HEADER) | ||
30 | |||
31 | top: | ||
32 | (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) | ||
33 | |||
34 | all: lib | ||
35 | |||
36 | lib: $(LIBOBJ) | ||
37 | $(AR) $(LIB) $(LIBOBJ) | ||
38 | $(RANLIB) $(LIB) || echo Never mind. | ||
39 | @touch lib | ||
40 | |||
41 | files: | ||
42 | $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO | ||
43 | |||
44 | links: | ||
45 | @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) | ||
46 | @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) | ||
47 | @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) | ||
48 | |||
49 | install: | ||
50 | @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... | ||
51 | @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ | ||
52 | do \ | ||
53 | (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ | ||
54 | chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ | ||
55 | done; | ||
56 | |||
57 | tags: | ||
58 | ctags $(SRC) | ||
59 | |||
60 | tests: | ||
61 | |||
62 | lint: | ||
63 | lint -DLINT $(INCLUDES) $(SRC)>fluff | ||
64 | |||
65 | depend: | ||
66 | @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... | ||
67 | $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) | ||
68 | |||
69 | dclean: | ||
70 | $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new | ||
71 | mv -f Makefile.new $(MAKEFILE) | ||
72 | |||
73 | clean: | ||
74 | rm -f asm/mx86unix.cpp *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff | ||
75 | |||
76 | # DO NOT DELETE THIS LINE -- make depend depends on it. | ||
77 | |||
78 | md4_dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/md4.h | ||
79 | md4_dgst.o: ../../include/openssl/opensslconf.h | ||
80 | md4_dgst.o: ../../include/openssl/opensslv.h ../md32_common.h md4_dgst.c | ||
81 | md4_dgst.o: md4_locl.h | ||
82 | md4_one.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h | ||
83 | md4_one.o: ../../include/openssl/md4.h ../../include/openssl/opensslconf.h | ||
84 | md4_one.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | ||
85 | md4_one.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | ||
86 | md4_one.o: ../../include/openssl/symhacks.h md4_one.c | ||
diff --git a/src/lib/libcrypto/md4/Makefile.ssl b/src/lib/libcrypto/md4/Makefile.ssl new file mode 100644 index 0000000000..7d2e8d8d3b --- /dev/null +++ b/src/lib/libcrypto/md4/Makefile.ssl | |||
@@ -0,0 +1,91 @@ | |||
1 | # | ||
2 | # SSLeay/crypto/md4/Makefile | ||
3 | # | ||
4 | |||
5 | DIR= md4 | ||
6 | TOP= ../.. | ||
7 | CC= cc | ||
8 | CPP= $(CC) -E | ||
9 | INCLUDES= | ||
10 | CFLAG=-g | ||
11 | INSTALL_PREFIX= | ||
12 | OPENSSLDIR= /usr/local/ssl | ||
13 | INSTALLTOP=/usr/local/ssl | ||
14 | MAKE= make -f Makefile.ssl | ||
15 | MAKEDEPPROG= makedepend | ||
16 | MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) | ||
17 | MAKEFILE= Makefile.ssl | ||
18 | AR= ar r | ||
19 | |||
20 | CFLAGS= $(INCLUDES) $(CFLAG) | ||
21 | |||
22 | GENERAL=Makefile | ||
23 | TEST=md4test.c | ||
24 | APPS=md4.c | ||
25 | |||
26 | LIB=$(TOP)/libcrypto.a | ||
27 | LIBSRC=md4_dgst.c md4_one.c | ||
28 | LIBOBJ=md4_dgst.o md4_one.o | ||
29 | |||
30 | SRC= $(LIBSRC) | ||
31 | |||
32 | EXHEADER= md4.h | ||
33 | HEADER= md4_locl.h $(EXHEADER) | ||
34 | |||
35 | ALL= $(GENERAL) $(SRC) $(HEADER) | ||
36 | |||
37 | top: | ||
38 | (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) | ||
39 | |||
40 | all: lib | ||
41 | |||
42 | lib: $(LIBOBJ) | ||
43 | $(AR) $(LIB) $(LIBOBJ) | ||
44 | $(RANLIB) $(LIB) || echo Never mind. | ||
45 | @touch lib | ||
46 | |||
47 | files: | ||
48 | $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO | ||
49 | |||
50 | links: | ||
51 | @sh $(TOP)/util/point.sh Makefile.ssl Makefile | ||
52 | @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) | ||
53 | @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) | ||
54 | @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) | ||
55 | |||
56 | install: | ||
57 | @for i in $(EXHEADER) ; \ | ||
58 | do \ | ||
59 | (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ | ||
60 | chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ | ||
61 | done; | ||
62 | |||
63 | tags: | ||
64 | ctags $(SRC) | ||
65 | |||
66 | tests: | ||
67 | |||
68 | lint: | ||
69 | lint -DLINT $(INCLUDES) $(SRC)>fluff | ||
70 | |||
71 | depend: | ||
72 | $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) | ||
73 | |||
74 | dclean: | ||
75 | $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new | ||
76 | mv -f Makefile.new $(MAKEFILE) | ||
77 | |||
78 | clean: | ||
79 | rm -f asm/mx86unix.cpp *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff | ||
80 | |||
81 | # DO NOT DELETE THIS LINE -- make depend depends on it. | ||
82 | |||
83 | md4_dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/md4.h | ||
84 | md4_dgst.o: ../../include/openssl/opensslconf.h | ||
85 | md4_dgst.o: ../../include/openssl/opensslv.h ../md32_common.h md4_dgst.c | ||
86 | md4_dgst.o: md4_locl.h | ||
87 | md4_one.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h | ||
88 | md4_one.o: ../../include/openssl/md4.h ../../include/openssl/opensslconf.h | ||
89 | md4_one.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h | ||
90 | md4_one.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | ||
91 | md4_one.o: md4_one.c | ||
diff --git a/src/lib/libcrypto/md4/md4.c b/src/lib/libcrypto/md4/md4.c new file mode 100644 index 0000000000..141415ad4d --- /dev/null +++ b/src/lib/libcrypto/md4/md4.c | |||
@@ -0,0 +1,127 @@ | |||
1 | /* crypto/md4/md4.c */ | ||
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
3 | * All rights reserved. | ||
4 | * | ||
5 | * This package is an SSL implementation written | ||
6 | * by Eric Young (eay@cryptsoft.com). | ||
7 | * The implementation was written so as to conform with Netscapes SSL. | ||
8 | * | ||
9 | * This library is free for commercial and non-commercial use as long as | ||
10 | * the following conditions are aheared to. The following conditions | ||
11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
13 | * included with this distribution is covered by the same copyright terms | ||
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
15 | * | ||
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
17 | * the code are not to be removed. | ||
18 | * If this package is used in a product, Eric Young should be given attribution | ||
19 | * as the author of the parts of the library used. | ||
20 | * This can be in the form of a textual message at program startup or | ||
21 | * in documentation (online or textual) provided with the package. | ||
22 | * | ||
23 | * Redistribution and use in source and binary forms, with or without | ||
24 | * modification, are permitted provided that the following conditions | ||
25 | * are met: | ||
26 | * 1. Redistributions of source code must retain the copyright | ||
27 | * notice, this list of conditions and the following disclaimer. | ||
28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
29 | * notice, this list of conditions and the following disclaimer in the | ||
30 | * documentation and/or other materials provided with the distribution. | ||
31 | * 3. All advertising materials mentioning features or use of this software | ||
32 | * must display the following acknowledgement: | ||
33 | * "This product includes cryptographic software written by | ||
34 | * Eric Young (eay@cryptsoft.com)" | ||
35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
36 | * being used are not cryptographic related :-). | ||
37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
38 | * the apps directory (application code) you must include an acknowledgement: | ||
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
40 | * | ||
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
51 | * SUCH DAMAGE. | ||
52 | * | ||
53 | * The licence and distribution terms for any publically available version or | ||
54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
55 | * copied and put under another distribution licence | ||
56 | * [including the GNU Public Licence.] | ||
57 | */ | ||
58 | |||
59 | #include <stdio.h> | ||
60 | #include <stdlib.h> | ||
61 | #include <openssl/md4.h> | ||
62 | |||
63 | #define BUFSIZE 1024*16 | ||
64 | |||
65 | void do_fp(FILE *f); | ||
66 | void pt(unsigned char *md); | ||
67 | #if !defined(_OSD_POSIX) && !defined(__DJGPP__) | ||
68 | int read(int, void *, unsigned int); | ||
69 | #endif | ||
70 | |||
71 | int main(int argc, char **argv) | ||
72 | { | ||
73 | int i,err=0; | ||
74 | FILE *IN; | ||
75 | |||
76 | if (argc == 1) | ||
77 | { | ||
78 | do_fp(stdin); | ||
79 | } | ||
80 | else | ||
81 | { | ||
82 | for (i=1; i<argc; i++) | ||
83 | { | ||
84 | IN=fopen(argv[i],"r"); | ||
85 | if (IN == NULL) | ||
86 | { | ||
87 | perror(argv[i]); | ||
88 | err++; | ||
89 | continue; | ||
90 | } | ||
91 | printf("MD4(%s)= ",argv[i]); | ||
92 | do_fp(IN); | ||
93 | fclose(IN); | ||
94 | } | ||
95 | } | ||
96 | exit(err); | ||
97 | } | ||
98 | |||
99 | void do_fp(FILE *f) | ||
100 | { | ||
101 | MD4_CTX c; | ||
102 | unsigned char md[MD4_DIGEST_LENGTH]; | ||
103 | int fd; | ||
104 | int i; | ||
105 | static unsigned char buf[BUFSIZE]; | ||
106 | |||
107 | fd=fileno(f); | ||
108 | MD4_Init(&c); | ||
109 | for (;;) | ||
110 | { | ||
111 | i=read(fd,buf,sizeof buf); | ||
112 | if (i <= 0) break; | ||
113 | MD4_Update(&c,buf,(unsigned long)i); | ||
114 | } | ||
115 | MD4_Final(&(md[0]),&c); | ||
116 | pt(md); | ||
117 | } | ||
118 | |||
119 | void pt(unsigned char *md) | ||
120 | { | ||
121 | int i; | ||
122 | |||
123 | for (i=0; i<MD4_DIGEST_LENGTH; i++) | ||
124 | printf("%02x",md[i]); | ||
125 | printf("\n"); | ||
126 | } | ||
127 | |||
diff --git a/src/lib/libcrypto/md4/md4.h b/src/lib/libcrypto/md4/md4.h index 5598c93a4f..7e761efb62 100644 --- a/src/lib/libcrypto/md4/md4.h +++ b/src/lib/libcrypto/md4/md4.h | |||
@@ -60,7 +60,6 @@ | |||
60 | #define HEADER_MD4_H | 60 | #define HEADER_MD4_H |
61 | 61 | ||
62 | #include <openssl/e_os2.h> | 62 | #include <openssl/e_os2.h> |
63 | #include <stddef.h> | ||
64 | 63 | ||
65 | #ifdef __cplusplus | 64 | #ifdef __cplusplus |
66 | extern "C" { | 65 | extern "C" { |
@@ -102,13 +101,16 @@ typedef struct MD4state_st | |||
102 | MD4_LONG A,B,C,D; | 101 | MD4_LONG A,B,C,D; |
103 | MD4_LONG Nl,Nh; | 102 | MD4_LONG Nl,Nh; |
104 | MD4_LONG data[MD4_LBLOCK]; | 103 | MD4_LONG data[MD4_LBLOCK]; |
105 | unsigned int num; | 104 | int num; |
106 | } MD4_CTX; | 105 | } MD4_CTX; |
107 | 106 | ||
107 | #ifdef OPENSSL_FIPS | ||
108 | int private_MD4_Init(MD4_CTX *c); | ||
109 | #endif | ||
108 | int MD4_Init(MD4_CTX *c); | 110 | int MD4_Init(MD4_CTX *c); |
109 | int MD4_Update(MD4_CTX *c, const void *data, size_t len); | 111 | int MD4_Update(MD4_CTX *c, const void *data, unsigned long len); |
110 | int MD4_Final(unsigned char *md, MD4_CTX *c); | 112 | int MD4_Final(unsigned char *md, MD4_CTX *c); |
111 | unsigned char *MD4(const unsigned char *d, size_t n, unsigned char *md); | 113 | unsigned char *MD4(const unsigned char *d, unsigned long n, unsigned char *md); |
112 | void MD4_Transform(MD4_CTX *c, const unsigned char *b); | 114 | void MD4_Transform(MD4_CTX *c, const unsigned char *b); |
113 | #ifdef __cplusplus | 115 | #ifdef __cplusplus |
114 | } | 116 | } |
diff --git a/src/lib/libcrypto/md4/md4_dgst.c b/src/lib/libcrypto/md4/md4_dgst.c index cfef94af39..ee7cc72262 100644 --- a/src/lib/libcrypto/md4/md4_dgst.c +++ b/src/lib/libcrypto/md4/md4_dgst.c | |||
@@ -60,7 +60,7 @@ | |||
60 | #include "md4_locl.h" | 60 | #include "md4_locl.h" |
61 | #include <openssl/opensslv.h> | 61 | #include <openssl/opensslv.h> |
62 | 62 | ||
63 | const char MD4_version[]="MD4" OPENSSL_VERSION_PTEXT; | 63 | const char *MD4_version="MD4" OPENSSL_VERSION_PTEXT; |
64 | 64 | ||
65 | /* Implemented from RFC1186 The MD4 Message-Digest Algorithm | 65 | /* Implemented from RFC1186 The MD4 Message-Digest Algorithm |
66 | */ | 66 | */ |
@@ -70,7 +70,7 @@ const char MD4_version[]="MD4" OPENSSL_VERSION_PTEXT; | |||
70 | #define INIT_DATA_C (unsigned long)0x98badcfeL | 70 | #define INIT_DATA_C (unsigned long)0x98badcfeL |
71 | #define INIT_DATA_D (unsigned long)0x10325476L | 71 | #define INIT_DATA_D (unsigned long)0x10325476L |
72 | 72 | ||
73 | int MD4_Init(MD4_CTX *c) | 73 | FIPS_NON_FIPS_MD_Init(MD4) |
74 | { | 74 | { |
75 | c->A=INIT_DATA_A; | 75 | c->A=INIT_DATA_A; |
76 | c->B=INIT_DATA_B; | 76 | c->B=INIT_DATA_B; |
@@ -82,11 +82,84 @@ int MD4_Init(MD4_CTX *c) | |||
82 | return 1; | 82 | return 1; |
83 | } | 83 | } |
84 | 84 | ||
85 | #ifndef md4_block_host_order | ||
86 | void md4_block_host_order (MD4_CTX *c, const void *data, int num) | ||
87 | { | ||
88 | const MD4_LONG *X=data; | ||
89 | register unsigned MD32_REG_T A,B,C,D; | ||
90 | |||
91 | A=c->A; | ||
92 | B=c->B; | ||
93 | C=c->C; | ||
94 | D=c->D; | ||
95 | |||
96 | for (;num--;X+=HASH_LBLOCK) | ||
97 | { | ||
98 | /* Round 0 */ | ||
99 | R0(A,B,C,D,X[ 0], 3,0); | ||
100 | R0(D,A,B,C,X[ 1], 7,0); | ||
101 | R0(C,D,A,B,X[ 2],11,0); | ||
102 | R0(B,C,D,A,X[ 3],19,0); | ||
103 | R0(A,B,C,D,X[ 4], 3,0); | ||
104 | R0(D,A,B,C,X[ 5], 7,0); | ||
105 | R0(C,D,A,B,X[ 6],11,0); | ||
106 | R0(B,C,D,A,X[ 7],19,0); | ||
107 | R0(A,B,C,D,X[ 8], 3,0); | ||
108 | R0(D,A,B,C,X[ 9], 7,0); | ||
109 | R0(C,D,A,B,X[10],11,0); | ||
110 | R0(B,C,D,A,X[11],19,0); | ||
111 | R0(A,B,C,D,X[12], 3,0); | ||
112 | R0(D,A,B,C,X[13], 7,0); | ||
113 | R0(C,D,A,B,X[14],11,0); | ||
114 | R0(B,C,D,A,X[15],19,0); | ||
115 | /* Round 1 */ | ||
116 | R1(A,B,C,D,X[ 0], 3,0x5A827999L); | ||
117 | R1(D,A,B,C,X[ 4], 5,0x5A827999L); | ||
118 | R1(C,D,A,B,X[ 8], 9,0x5A827999L); | ||
119 | R1(B,C,D,A,X[12],13,0x5A827999L); | ||
120 | R1(A,B,C,D,X[ 1], 3,0x5A827999L); | ||
121 | R1(D,A,B,C,X[ 5], 5,0x5A827999L); | ||
122 | R1(C,D,A,B,X[ 9], 9,0x5A827999L); | ||
123 | R1(B,C,D,A,X[13],13,0x5A827999L); | ||
124 | R1(A,B,C,D,X[ 2], 3,0x5A827999L); | ||
125 | R1(D,A,B,C,X[ 6], 5,0x5A827999L); | ||
126 | R1(C,D,A,B,X[10], 9,0x5A827999L); | ||
127 | R1(B,C,D,A,X[14],13,0x5A827999L); | ||
128 | R1(A,B,C,D,X[ 3], 3,0x5A827999L); | ||
129 | R1(D,A,B,C,X[ 7], 5,0x5A827999L); | ||
130 | R1(C,D,A,B,X[11], 9,0x5A827999L); | ||
131 | R1(B,C,D,A,X[15],13,0x5A827999L); | ||
132 | /* Round 2 */ | ||
133 | R2(A,B,C,D,X[ 0], 3,0x6ED9EBA1); | ||
134 | R2(D,A,B,C,X[ 8], 9,0x6ED9EBA1); | ||
135 | R2(C,D,A,B,X[ 4],11,0x6ED9EBA1); | ||
136 | R2(B,C,D,A,X[12],15,0x6ED9EBA1); | ||
137 | R2(A,B,C,D,X[ 2], 3,0x6ED9EBA1); | ||
138 | R2(D,A,B,C,X[10], 9,0x6ED9EBA1); | ||
139 | R2(C,D,A,B,X[ 6],11,0x6ED9EBA1); | ||
140 | R2(B,C,D,A,X[14],15,0x6ED9EBA1); | ||
141 | R2(A,B,C,D,X[ 1], 3,0x6ED9EBA1); | ||
142 | R2(D,A,B,C,X[ 9], 9,0x6ED9EBA1); | ||
143 | R2(C,D,A,B,X[ 5],11,0x6ED9EBA1); | ||
144 | R2(B,C,D,A,X[13],15,0x6ED9EBA1); | ||
145 | R2(A,B,C,D,X[ 3], 3,0x6ED9EBA1); | ||
146 | R2(D,A,B,C,X[11], 9,0x6ED9EBA1); | ||
147 | R2(C,D,A,B,X[ 7],11,0x6ED9EBA1); | ||
148 | R2(B,C,D,A,X[15],15,0x6ED9EBA1); | ||
149 | |||
150 | A = c->A += A; | ||
151 | B = c->B += B; | ||
152 | C = c->C += C; | ||
153 | D = c->D += D; | ||
154 | } | ||
155 | } | ||
156 | #endif | ||
157 | |||
85 | #ifndef md4_block_data_order | 158 | #ifndef md4_block_data_order |
86 | #ifdef X | 159 | #ifdef X |
87 | #undef X | 160 | #undef X |
88 | #endif | 161 | #endif |
89 | void md4_block_data_order (MD4_CTX *c, const void *data_, size_t num) | 162 | void md4_block_data_order (MD4_CTX *c, const void *data_, int num) |
90 | { | 163 | { |
91 | const unsigned char *data=data_; | 164 | const unsigned char *data=data_; |
92 | register unsigned MD32_REG_T A,B,C,D,l; | 165 | register unsigned MD32_REG_T A,B,C,D,l; |
@@ -167,3 +240,19 @@ void md4_block_data_order (MD4_CTX *c, const void *data_, size_t num) | |||
167 | } | 240 | } |
168 | } | 241 | } |
169 | #endif | 242 | #endif |
243 | |||
244 | #ifdef undef | ||
245 | int printit(unsigned long *l) | ||
246 | { | ||
247 | int i,ii; | ||
248 | |||
249 | for (i=0; i<2; i++) | ||
250 | { | ||
251 | for (ii=0; ii<8; ii++) | ||
252 | { | ||
253 | fprintf(stderr,"%08lx ",l[i*8+ii]); | ||
254 | } | ||
255 | fprintf(stderr,"\n"); | ||
256 | } | ||
257 | } | ||
258 | #endif | ||
diff --git a/src/lib/libcrypto/md4/md4_locl.h b/src/lib/libcrypto/md4/md4_locl.h index c8085b0ead..a8d31d7a73 100644 --- a/src/lib/libcrypto/md4/md4_locl.h +++ b/src/lib/libcrypto/md4/md4_locl.h | |||
@@ -65,13 +65,41 @@ | |||
65 | #define MD4_LONG_LOG2 2 /* default to 32 bits */ | 65 | #define MD4_LONG_LOG2 2 /* default to 32 bits */ |
66 | #endif | 66 | #endif |
67 | 67 | ||
68 | void md4_block_data_order (MD4_CTX *c, const void *p,size_t num); | 68 | void md4_block_host_order (MD4_CTX *c, const void *p,int num); |
69 | void md4_block_data_order (MD4_CTX *c, const void *p,int num); | ||
70 | |||
71 | #if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__INTEL__) | ||
72 | /* | ||
73 | * *_block_host_order is expected to handle aligned data while | ||
74 | * *_block_data_order - unaligned. As algorithm and host (x86) | ||
75 | * are in this case of the same "endianness" these two are | ||
76 | * otherwise indistinguishable. But normally you don't want to | ||
77 | * call the same function because unaligned access in places | ||
78 | * where alignment is expected is usually a "Bad Thing". Indeed, | ||
79 | * on RISCs you get punished with BUS ERROR signal or *severe* | ||
80 | * performance degradation. Intel CPUs are in turn perfectly | ||
81 | * capable of loading unaligned data without such drastic side | ||
82 | * effect. Yes, they say it's slower than aligned load, but no | ||
83 | * exception is generated and therefore performance degradation | ||
84 | * is *incomparable* with RISCs. What we should weight here is | ||
85 | * costs of unaligned access against costs of aligning data. | ||
86 | * According to my measurements allowing unaligned access results | ||
87 | * in ~9% performance improvement on Pentium II operating at | ||
88 | * 266MHz. I won't be surprised if the difference will be higher | ||
89 | * on faster systems:-) | ||
90 | * | ||
91 | * <appro@fy.chalmers.se> | ||
92 | */ | ||
93 | #define md4_block_data_order md4_block_host_order | ||
94 | #endif | ||
69 | 95 | ||
70 | #define DATA_ORDER_IS_LITTLE_ENDIAN | 96 | #define DATA_ORDER_IS_LITTLE_ENDIAN |
71 | 97 | ||
72 | #define HASH_LONG MD4_LONG | 98 | #define HASH_LONG MD4_LONG |
99 | #define HASH_LONG_LOG2 MD4_LONG_LOG2 | ||
73 | #define HASH_CTX MD4_CTX | 100 | #define HASH_CTX MD4_CTX |
74 | #define HASH_CBLOCK MD4_CBLOCK | 101 | #define HASH_CBLOCK MD4_CBLOCK |
102 | #define HASH_LBLOCK MD4_LBLOCK | ||
75 | #define HASH_UPDATE MD4_Update | 103 | #define HASH_UPDATE MD4_Update |
76 | #define HASH_TRANSFORM MD4_Transform | 104 | #define HASH_TRANSFORM MD4_Transform |
77 | #define HASH_FINAL MD4_Final | 105 | #define HASH_FINAL MD4_Final |
@@ -82,7 +110,21 @@ void md4_block_data_order (MD4_CTX *c, const void *p,size_t num); | |||
82 | ll=(c)->C; HOST_l2c(ll,(s)); \ | 110 | ll=(c)->C; HOST_l2c(ll,(s)); \ |
83 | ll=(c)->D; HOST_l2c(ll,(s)); \ | 111 | ll=(c)->D; HOST_l2c(ll,(s)); \ |
84 | } while (0) | 112 | } while (0) |
113 | #define HASH_BLOCK_HOST_ORDER md4_block_host_order | ||
114 | #if !defined(L_ENDIAN) || defined(md4_block_data_order) | ||
85 | #define HASH_BLOCK_DATA_ORDER md4_block_data_order | 115 | #define HASH_BLOCK_DATA_ORDER md4_block_data_order |
116 | /* | ||
117 | * Little-endians (Intel and Alpha) feel better without this. | ||
118 | * It looks like memcpy does better job than generic | ||
119 | * md4_block_data_order on copying-n-aligning input data. | ||
120 | * But frankly speaking I didn't expect such result on Alpha. | ||
121 | * On the other hand I've got this with egcs-1.0.2 and if | ||
122 | * program is compiled with another (better?) compiler it | ||
123 | * might turn out other way around. | ||
124 | * | ||
125 | * <appro@fy.chalmers.se> | ||
126 | */ | ||
127 | #endif | ||
86 | 128 | ||
87 | #include "md32_common.h" | 129 | #include "md32_common.h" |
88 | 130 | ||
diff --git a/src/lib/libcrypto/md4/md4_one.c b/src/lib/libcrypto/md4/md4_one.c index bb64362638..50f79352f6 100644 --- a/src/lib/libcrypto/md4/md4_one.c +++ b/src/lib/libcrypto/md4/md4_one.c | |||
@@ -65,7 +65,7 @@ | |||
65 | #include <openssl/ebcdic.h> | 65 | #include <openssl/ebcdic.h> |
66 | #endif | 66 | #endif |
67 | 67 | ||
68 | unsigned char *MD4(const unsigned char *d, size_t n, unsigned char *md) | 68 | unsigned char *MD4(const unsigned char *d, unsigned long n, unsigned char *md) |
69 | { | 69 | { |
70 | MD4_CTX c; | 70 | MD4_CTX c; |
71 | static unsigned char m[MD4_DIGEST_LENGTH]; | 71 | static unsigned char m[MD4_DIGEST_LENGTH]; |
diff --git a/src/lib/libcrypto/md4/md4s.cpp b/src/lib/libcrypto/md4/md4s.cpp new file mode 100644 index 0000000000..c0ec97fc9f --- /dev/null +++ b/src/lib/libcrypto/md4/md4s.cpp | |||
@@ -0,0 +1,78 @@ | |||
1 | // | ||
2 | // gettsc.inl | ||
3 | // | ||
4 | // gives access to the Pentium's (secret) cycle counter | ||
5 | // | ||
6 | // This software was written by Leonard Janke (janke@unixg.ubc.ca) | ||
7 | // in 1996-7 and is entered, by him, into the public domain. | ||
8 | |||
9 | #if defined(__WATCOMC__) | ||
10 | void GetTSC(unsigned long&); | ||
11 | #pragma aux GetTSC = 0x0f 0x31 "mov [edi], eax" parm [edi] modify [edx eax]; | ||
12 | #elif defined(__GNUC__) | ||
13 | inline | ||
14 | void GetTSC(unsigned long& tsc) | ||
15 | { | ||
16 | asm volatile(".byte 15, 49\n\t" | ||
17 | : "=eax" (tsc) | ||
18 | : | ||
19 | : "%edx", "%eax"); | ||
20 | } | ||
21 | #elif defined(_MSC_VER) | ||
22 | inline | ||
23 | void GetTSC(unsigned long& tsc) | ||
24 | { | ||
25 | unsigned long a; | ||
26 | __asm _emit 0fh | ||
27 | __asm _emit 31h | ||
28 | __asm mov a, eax; | ||
29 | tsc=a; | ||
30 | } | ||
31 | #endif | ||
32 | |||
33 | #include <stdio.h> | ||
34 | #include <stdlib.h> | ||
35 | #include <openssl/md4.h> | ||
36 | |||
37 | extern "C" { | ||
38 | void md4_block_x86(MD4_CTX *ctx, unsigned char *buffer,int num); | ||
39 | } | ||
40 | |||
41 | void main(int argc,char *argv[]) | ||
42 | { | ||
43 | unsigned char buffer[64*256]; | ||
44 | MD4_CTX ctx; | ||
45 | unsigned long s1,s2,e1,e2; | ||
46 | unsigned char k[16]; | ||
47 | unsigned long data[2]; | ||
48 | unsigned char iv[8]; | ||
49 | int i,num=0,numm; | ||
50 | int j=0; | ||
51 | |||
52 | if (argc >= 2) | ||
53 | num=atoi(argv[1]); | ||
54 | |||
55 | if (num == 0) num=16; | ||
56 | if (num > 250) num=16; | ||
57 | numm=num+2; | ||
58 | num*=64; | ||
59 | numm*=64; | ||
60 | |||
61 | for (j=0; j<6; j++) | ||
62 | { | ||
63 | for (i=0; i<10; i++) /**/ | ||
64 | { | ||
65 | md4_block_x86(&ctx,buffer,numm); | ||
66 | GetTSC(s1); | ||
67 | md4_block_x86(&ctx,buffer,numm); | ||
68 | GetTSC(e1); | ||
69 | GetTSC(s2); | ||
70 | md4_block_x86(&ctx,buffer,num); | ||
71 | GetTSC(e2); | ||
72 | md4_block_x86(&ctx,buffer,num); | ||
73 | } | ||
74 | printf("md4 (%d bytes) %d %d (%.2f)\n",num, | ||
75 | e1-s1,e2-s2,(double)((e1-s1)-(e2-s2))/2); | ||
76 | } | ||
77 | } | ||
78 | |||
diff --git a/src/lib/libcrypto/md4/md4test.c b/src/lib/libcrypto/md4/md4test.c new file mode 100644 index 0000000000..21a77d96f7 --- /dev/null +++ b/src/lib/libcrypto/md4/md4test.c | |||
@@ -0,0 +1,136 @@ | |||
1 | /* crypto/md4/md4test.c */ | ||
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
3 | * All rights reserved. | ||
4 | * | ||
5 | * This package is an SSL implementation written | ||
6 | * by Eric Young (eay@cryptsoft.com). | ||
7 | * The implementation was written so as to conform with Netscapes SSL. | ||
8 | * | ||
9 | * This library is free for commercial and non-commercial use as long as | ||
10 | * the following conditions are aheared to. The following conditions | ||
11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
13 | * included with this distribution is covered by the same copyright terms | ||
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
15 | * | ||
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
17 | * the code are not to be removed. | ||
18 | * If this package is used in a product, Eric Young should be given attribution | ||
19 | * as the author of the parts of the library used. | ||
20 | * This can be in the form of a textual message at program startup or | ||
21 | * in documentation (online or textual) provided with the package. | ||
22 | * | ||
23 | * Redistribution and use in source and binary forms, with or without | ||
24 | * modification, are permitted provided that the following conditions | ||
25 | * are met: | ||
26 | * 1. Redistributions of source code must retain the copyright | ||
27 | * notice, this list of conditions and the following disclaimer. | ||
28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
29 | * notice, this list of conditions and the following disclaimer in the | ||
30 | * documentation and/or other materials provided with the distribution. | ||
31 | * 3. All advertising materials mentioning features or use of this software | ||
32 | * must display the following acknowledgement: | ||
33 | * "This product includes cryptographic software written by | ||
34 | * Eric Young (eay@cryptsoft.com)" | ||
35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
36 | * being used are not cryptographic related :-). | ||
37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
38 | * the apps directory (application code) you must include an acknowledgement: | ||
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
40 | * | ||
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
51 | * SUCH DAMAGE. | ||
52 | * | ||
53 | * The licence and distribution terms for any publically available version or | ||
54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
55 | * copied and put under another distribution licence | ||
56 | * [including the GNU Public Licence.] | ||
57 | */ | ||
58 | |||
59 | #include <stdio.h> | ||
60 | #include <string.h> | ||
61 | #include <stdlib.h> | ||
62 | |||
63 | #include "../e_os.h" | ||
64 | |||
65 | #ifdef OPENSSL_NO_MD4 | ||
66 | int main(int argc, char *argv[]) | ||
67 | { | ||
68 | printf("No MD4 support\n"); | ||
69 | return(0); | ||
70 | } | ||
71 | #else | ||
72 | #include <openssl/evp.h> | ||
73 | #include <openssl/md4.h> | ||
74 | |||
75 | static char *test[]={ | ||
76 | "", | ||
77 | "a", | ||
78 | "abc", | ||
79 | "message digest", | ||
80 | "abcdefghijklmnopqrstuvwxyz", | ||
81 | "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", | ||
82 | "12345678901234567890123456789012345678901234567890123456789012345678901234567890", | ||
83 | NULL, | ||
84 | }; | ||
85 | |||
86 | static char *ret[]={ | ||
87 | "31d6cfe0d16ae931b73c59d7e0c089c0", | ||
88 | "bde52cb31de33e46245e05fbdbd6fb24", | ||
89 | "a448017aaf21d8525fc10ae87aa6729d", | ||
90 | "d9130a8164549fe818874806e1c7014b", | ||
91 | "d79e1c308aa5bbcdeea8ed63df412da9", | ||
92 | "043f8582f241db351ce627e153e7f0e4", | ||
93 | "e33b4ddc9c38f2199c3e7b164fcc0536", | ||
94 | }; | ||
95 | |||
96 | static char *pt(unsigned char *md); | ||
97 | int main(int argc, char *argv[]) | ||
98 | { | ||
99 | int i,err=0; | ||
100 | unsigned char **P,**R; | ||
101 | char *p; | ||
102 | unsigned char md[MD4_DIGEST_LENGTH]; | ||
103 | |||
104 | P=(unsigned char **)test; | ||
105 | R=(unsigned char **)ret; | ||
106 | i=1; | ||
107 | while (*P != NULL) | ||
108 | { | ||
109 | EVP_Digest(&(P[0][0]),(unsigned long)strlen((char *)*P),md,NULL,EVP_md4(), NULL); | ||
110 | p=pt(md); | ||
111 | if (strcmp(p,(char *)*R) != 0) | ||
112 | { | ||
113 | printf("error calculating MD4 on '%s'\n",*P); | ||
114 | printf("got %s instead of %s\n",p,*R); | ||
115 | err++; | ||
116 | } | ||
117 | else | ||
118 | printf("test %d ok\n",i); | ||
119 | i++; | ||
120 | R++; | ||
121 | P++; | ||
122 | } | ||
123 | EXIT(err); | ||
124 | return(0); | ||
125 | } | ||
126 | |||
127 | static char *pt(unsigned char *md) | ||
128 | { | ||
129 | int i; | ||
130 | static char buf[80]; | ||
131 | |||
132 | for (i=0; i<MD4_DIGEST_LENGTH; i++) | ||
133 | sprintf(&(buf[i*2]),"%02x",md[i]); | ||
134 | return(buf); | ||
135 | } | ||
136 | #endif | ||