diff options
author | djm <> | 2008-09-06 12:15:54 +0000 |
---|---|---|
committer | djm <> | 2008-09-06 12:15:54 +0000 |
commit | f1625f274acf5dcd5601f6cb5e29e233b2a441a3 (patch) | |
tree | 44899ddfbef8f24aacbea50086c041c1b150f6d6 /src/lib/libcrypto/md5 | |
parent | 4f828b924f54507141fb95ebe49dfcd261945e85 (diff) | |
download | openbsd-f1625f274acf5dcd5601f6cb5e29e233b2a441a3.tar.gz openbsd-f1625f274acf5dcd5601f6cb5e29e233b2a441a3.tar.bz2 openbsd-f1625f274acf5dcd5601f6cb5e29e233b2a441a3.zip |
import of OpenSSL 0.9.8h
Diffstat (limited to 'src/lib/libcrypto/md5')
-rw-r--r-- | src/lib/libcrypto/md5/Makefile | 68 | ||||
-rw-r--r-- | src/lib/libcrypto/md5/md5test.c | 12 |
2 files changed, 29 insertions, 51 deletions
diff --git a/src/lib/libcrypto/md5/Makefile b/src/lib/libcrypto/md5/Makefile index 1ed018526f..ceb00e8956 100644 --- a/src/lib/libcrypto/md5/Makefile +++ b/src/lib/libcrypto/md5/Makefile | |||
@@ -8,11 +8,6 @@ CC= cc | |||
8 | CPP= $(CC) -E | 8 | CPP= $(CC) -E |
9 | INCLUDES=-I.. -I$(TOP) -I../../include | 9 | INCLUDES=-I.. -I$(TOP) -I../../include |
10 | CFLAG=-g | 10 | CFLAG=-g |
11 | INSTALL_PREFIX= | ||
12 | OPENSSLDIR= /usr/local/ssl | ||
13 | INSTALLTOP=/usr/local/ssl | ||
14 | MAKEDEPPROG= makedepend | ||
15 | MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) | ||
16 | MAKEFILE= Makefile | 11 | MAKEFILE= Makefile |
17 | AR= ar r | 12 | AR= ar r |
18 | 13 | ||
@@ -20,6 +15,7 @@ MD5_ASM_OBJ= | |||
20 | 15 | ||
21 | CFLAGS= $(INCLUDES) $(CFLAG) | 16 | CFLAGS= $(INCLUDES) $(CFLAG) |
22 | ASFLAGS= $(INCLUDES) $(ASFLAG) | 17 | ASFLAGS= $(INCLUDES) $(ASFLAG) |
18 | AFLAGS= $(ASFLAGS) | ||
23 | 19 | ||
24 | GENERAL=Makefile | 20 | GENERAL=Makefile |
25 | TEST=md5test.c | 21 | TEST=md5test.c |
@@ -46,38 +42,17 @@ lib: $(LIBOBJ) | |||
46 | $(RANLIB) $(LIB) || echo Never mind. | 42 | $(RANLIB) $(LIB) || echo Never mind. |
47 | @touch lib | 43 | @touch lib |
48 | 44 | ||
49 | # elf | 45 | # ELF |
50 | asm/mx86-elf.s: asm/md5-586.pl ../perlasm/x86asm.pl | 46 | mx86-elf.s: asm/md5-586.pl ../perlasm/x86asm.pl |
51 | (cd asm; $(PERL) md5-586.pl elf $(CFLAGS) > mx86-elf.s) | 47 | (cd asm; $(PERL) md5-586.pl elf $(CFLAGS) > ../$@) |
52 | 48 | # COFF | |
49 | mx86-cof.s: asm/md5-586.pl ../perlasm/x86asm.pl | ||
50 | (cd asm; $(PERL) md5-586.pl coff $(CFLAGS) > ../$@) | ||
53 | # a.out | 51 | # a.out |
54 | asm/mx86-out.o: asm/mx86unix.cpp | 52 | mx86-out.s: asm/md5-586.pl ../perlasm/x86asm.pl |
55 | $(CPP) -DOUT asm/mx86unix.cpp | as -o asm/mx86-out.o | 53 | (cd asm; $(PERL) md5-586.pl a.out $(CFLAGS) > ../$@) |
56 | 54 | ||
57 | # bsdi | 55 | md5-x86_64.s: asm/md5-x86_64.pl; $(PERL) asm/md5-x86_64.pl $@ |
58 | asm/mx86bsdi.o: asm/mx86unix.cpp | ||
59 | $(CPP) -DBSDI asm/mx86unix.cpp | sed 's/ :/:/' | as -o asm/mx86bsdi.o | ||
60 | |||
61 | asm/mx86unix.cpp: asm/md5-586.pl ../perlasm/x86asm.pl | ||
62 | (cd asm; $(PERL) md5-586.pl cpp >mx86unix.cpp) | ||
63 | |||
64 | asm/md5-sparcv8plus.o: asm/md5-sparcv9.S | ||
65 | $(CC) $(ASFLAGS) -DMD5_BLOCK_DATA_ORDER -c \ | ||
66 | -o asm/md5-sparcv8plus.o asm/md5-sparcv9.S | ||
67 | |||
68 | # Old GNU assembler doesn't understand V9 instructions, so we | ||
69 | # hire /usr/ccs/bin/as to do the job. Note that option is called | ||
70 | # *-gcc27, but even gcc 2>=8 users may experience similar problem | ||
71 | # if they didn't bother to upgrade GNU assembler. Such users should | ||
72 | # not choose this option, but be adviced to *remove* GNU assembler | ||
73 | # or upgrade it. | ||
74 | asm/md5-sparcv8plus-gcc27.o: asm/md5-sparcv9.S | ||
75 | $(CC) $(ASFLAGS) -DMD5_BLOCK_DATA_ORDER -E asm/md5-sparcv9.S | \ | ||
76 | /usr/ccs/bin/as -xarch=v8plus - -o asm/md5-sparcv8plus-gcc27.o | ||
77 | |||
78 | asm/md5-sparcv9.o: asm/md5-sparcv9.S | ||
79 | $(CC) $(ASFLAGS) -DMD5_BLOCK_DATA_ORDER -c \ | ||
80 | -o asm/md5-sparcv9.o asm/md5-sparcv9.S | ||
81 | 56 | ||
82 | files: | 57 | files: |
83 | $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO | 58 | $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO |
@@ -88,6 +63,7 @@ links: | |||
88 | @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) | 63 | @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) |
89 | 64 | ||
90 | install: | 65 | install: |
66 | @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... | ||
91 | @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ | 67 | @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ |
92 | do \ | 68 | do \ |
93 | (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ | 69 | (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ |
@@ -103,6 +79,7 @@ lint: | |||
103 | lint -DLINT $(INCLUDES) $(SRC)>fluff | 79 | lint -DLINT $(INCLUDES) $(SRC)>fluff |
104 | 80 | ||
105 | depend: | 81 | depend: |
82 | @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... | ||
106 | $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) | 83 | $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) |
107 | 84 | ||
108 | dclean: | 85 | dclean: |
@@ -110,19 +87,16 @@ dclean: | |||
110 | mv -f Makefile.new $(MAKEFILE) | 87 | mv -f Makefile.new $(MAKEFILE) |
111 | 88 | ||
112 | clean: | 89 | clean: |
113 | rm -f asm/mx86unix.cpp asm/*-elf.* *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff | 90 | rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff |
114 | 91 | ||
115 | # DO NOT DELETE THIS LINE -- make depend depends on it. | 92 | # DO NOT DELETE THIS LINE -- make depend depends on it. |
116 | 93 | ||
117 | md5_dgst.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h | 94 | md5_dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/md5.h |
118 | md5_dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h | 95 | md5_dgst.o: ../../include/openssl/opensslconf.h |
119 | md5_dgst.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h | 96 | md5_dgst.o: ../../include/openssl/opensslv.h ../md32_common.h md5_dgst.c |
120 | md5_dgst.o: ../../include/openssl/md5.h ../../include/openssl/opensslconf.h | 97 | md5_dgst.o: md5_locl.h |
121 | md5_dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h | ||
122 | md5_dgst.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | ||
123 | md5_dgst.o: ../md32_common.h md5_dgst.c md5_locl.h | ||
124 | md5_one.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h | 98 | md5_one.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h |
125 | md5_one.o: ../../include/openssl/md5.h ../../include/openssl/opensslconf.h | 99 | md5_one.o: ../../include/openssl/md5.h ../../include/openssl/opensslconf.h |
126 | md5_one.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h | 100 | md5_one.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h |
127 | md5_one.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | 101 | md5_one.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h |
128 | md5_one.o: md5_one.c | 102 | md5_one.o: ../../include/openssl/symhacks.h md5_one.c |
diff --git a/src/lib/libcrypto/md5/md5test.c b/src/lib/libcrypto/md5/md5test.c index bfd62629ed..2b37190e32 100644 --- a/src/lib/libcrypto/md5/md5test.c +++ b/src/lib/libcrypto/md5/md5test.c | |||
@@ -97,16 +97,16 @@ static char *pt(unsigned char *md); | |||
97 | int main(int argc, char *argv[]) | 97 | int main(int argc, char *argv[]) |
98 | { | 98 | { |
99 | int i,err=0; | 99 | int i,err=0; |
100 | unsigned char **P,**R; | 100 | char **P,**R; |
101 | char *p; | 101 | char *p; |
102 | unsigned char md[MD5_DIGEST_LENGTH]; | 102 | unsigned char md[MD5_DIGEST_LENGTH]; |
103 | 103 | ||
104 | P=(unsigned char **)test; | 104 | P=test; |
105 | R=(unsigned char **)ret; | 105 | R=ret; |
106 | i=1; | 106 | i=1; |
107 | while (*P != NULL) | 107 | while (*P != NULL) |
108 | { | 108 | { |
109 | EVP_Digest(&(P[0][0]),(unsigned long)strlen((char *)*P),md,NULL,EVP_md5(), NULL); | 109 | EVP_Digest(&(P[0][0]),strlen((char *)*P),md,NULL,EVP_md5(), NULL); |
110 | p=pt(md); | 110 | p=pt(md); |
111 | if (strcmp(p,(char *)*R) != 0) | 111 | if (strcmp(p,(char *)*R) != 0) |
112 | { | 112 | { |
@@ -120,6 +120,10 @@ int main(int argc, char *argv[]) | |||
120 | R++; | 120 | R++; |
121 | P++; | 121 | P++; |
122 | } | 122 | } |
123 | |||
124 | #ifdef OPENSSL_SYS_NETWARE | ||
125 | if (err) printf("ERROR: %d\n", err); | ||
126 | #endif | ||
123 | EXIT(err); | 127 | EXIT(err); |
124 | return(0); | 128 | return(0); |
125 | } | 129 | } |