diff options
Diffstat (limited to 'src/lib/libcrypto/ripemd')
-rw-r--r-- | src/lib/libcrypto/ripemd/Makefile.ssl | 21 | ||||
-rw-r--r-- | src/lib/libcrypto/ripemd/rmd160.c | 2 | ||||
-rw-r--r-- | src/lib/libcrypto/ripemd/rmd_dgst.c | 12 | ||||
-rw-r--r-- | src/lib/libcrypto/ripemd/rmd_one.c | 3 | ||||
-rw-r--r-- | src/lib/libcrypto/ripemd/rmdtest.c | 4 |
5 files changed, 21 insertions, 21 deletions
diff --git a/src/lib/libcrypto/ripemd/Makefile.ssl b/src/lib/libcrypto/ripemd/Makefile.ssl index 7ab5d2fc9e..d85515353b 100644 --- a/src/lib/libcrypto/ripemd/Makefile.ssl +++ b/src/lib/libcrypto/ripemd/Makefile.ssl | |||
@@ -47,14 +47,8 @@ lib: $(LIBOBJ) | |||
47 | @touch lib | 47 | @touch lib |
48 | 48 | ||
49 | # elf | 49 | # elf |
50 | asm/rm86-elf.o: asm/rm86unix.cpp | 50 | asm/rm86-elf.s: asm/rmd-586.pl ../perlasm/x86asm.pl |
51 | $(CPP) -DELF -x c asm/rm86unix.cpp | as -o asm/rm86-elf.o | 51 | (cd asm; $(PERL) rmd-586.pl elf $(CFLAGS) > rm86-elf.s) |
52 | |||
53 | # solaris | ||
54 | asm/rm86-sol.o: asm/rm86unix.cpp | ||
55 | $(CC) -E -DSOL asm/rm86unix.cpp | sed 's/^#.*//' > asm/rm86-sol.s | ||
56 | as -o asm/rm86-sol.o asm/rm86-sol.s | ||
57 | rm -f asm/rm86-sol.s | ||
58 | 52 | ||
59 | # a.out | 53 | # a.out |
60 | asm/rm86-out.o: asm/rm86unix.cpp | 54 | asm/rm86-out.o: asm/rm86unix.cpp |
@@ -92,19 +86,22 @@ lint: | |||
92 | lint -DLINT $(INCLUDES) $(SRC)>fluff | 86 | lint -DLINT $(INCLUDES) $(SRC)>fluff |
93 | 87 | ||
94 | depend: | 88 | depend: |
95 | $(MAKEDEPEND) $(CFLAG) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC) | 89 | $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) |
96 | 90 | ||
97 | dclean: | 91 | dclean: |
98 | $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new | 92 | $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new |
99 | mv -f Makefile.new $(MAKEFILE) | 93 | mv -f Makefile.new $(MAKEFILE) |
100 | 94 | ||
101 | clean: | 95 | clean: |
102 | rm -f asm/rm86unix.cpp *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff | 96 | rm -f asm/rm86unix.cpp asm/*-elf.* *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff |
103 | 97 | ||
104 | # DO NOT DELETE THIS LINE -- make depend depends on it. | 98 | # DO NOT DELETE THIS LINE -- make depend depends on it. |
105 | 99 | ||
106 | rmd_dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h | 100 | rmd_dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h |
107 | rmd_dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/ripemd.h | 101 | rmd_dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/ripemd.h |
108 | rmd_dgst.o: ../md32_common.h rmd_dgst.c rmd_locl.h rmdconst.h | 102 | rmd_dgst.o: ../md32_common.h rmd_dgst.c rmd_locl.h rmdconst.h |
109 | rmd_one.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h | 103 | rmd_one.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h |
110 | rmd_one.o: ../../include/openssl/ripemd.h rmd_one.c | 104 | rmd_one.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h |
105 | rmd_one.o: ../../include/openssl/ripemd.h ../../include/openssl/safestack.h | ||
106 | rmd_one.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | ||
107 | rmd_one.o: rmd_one.c | ||
diff --git a/src/lib/libcrypto/ripemd/rmd160.c b/src/lib/libcrypto/ripemd/rmd160.c index 4f8b88a18a..b0ec574498 100644 --- a/src/lib/libcrypto/ripemd/rmd160.c +++ b/src/lib/libcrypto/ripemd/rmd160.c | |||
@@ -64,7 +64,7 @@ | |||
64 | 64 | ||
65 | void do_fp(FILE *f); | 65 | void do_fp(FILE *f); |
66 | void pt(unsigned char *md); | 66 | void pt(unsigned char *md); |
67 | #ifndef _OSD_POSIX | 67 | #if !defined(_OSD_POSIX) && !defined(__DJGPP__) |
68 | int read(int, void *, unsigned int); | 68 | int read(int, void *, unsigned int); |
69 | #endif | 69 | #endif |
70 | 70 | ||
diff --git a/src/lib/libcrypto/ripemd/rmd_dgst.c b/src/lib/libcrypto/ripemd/rmd_dgst.c index a3170f7c8a..f351f00eea 100644 --- a/src/lib/libcrypto/ripemd/rmd_dgst.c +++ b/src/lib/libcrypto/ripemd/rmd_dgst.c | |||
@@ -90,8 +90,8 @@ int RIPEMD160_Init(RIPEMD160_CTX *c) | |||
90 | void ripemd160_block_host_order (RIPEMD160_CTX *ctx, const void *p, int num) | 90 | void ripemd160_block_host_order (RIPEMD160_CTX *ctx, const void *p, int num) |
91 | { | 91 | { |
92 | const RIPEMD160_LONG *XX=p; | 92 | const RIPEMD160_LONG *XX=p; |
93 | register unsigned long A,B,C,D,E; | 93 | register unsigned MD32_REG_T A,B,C,D,E; |
94 | register unsigned long a,b,c,d,e; | 94 | register unsigned MD32_REG_T a,b,c,d,e; |
95 | 95 | ||
96 | for (;num--;XX+=HASH_LBLOCK) | 96 | for (;num--;XX+=HASH_LBLOCK) |
97 | { | 97 | { |
@@ -290,12 +290,12 @@ void ripemd160_block_host_order (RIPEMD160_CTX *ctx, const void *p, int num) | |||
290 | void ripemd160_block_data_order (RIPEMD160_CTX *ctx, const void *p, int num) | 290 | void ripemd160_block_data_order (RIPEMD160_CTX *ctx, const void *p, int num) |
291 | { | 291 | { |
292 | const unsigned char *data=p; | 292 | const unsigned char *data=p; |
293 | register unsigned long A,B,C,D,E; | 293 | register unsigned MD32_REG_T A,B,C,D,E; |
294 | unsigned long a,b,c,d,e,l; | 294 | unsigned MD32_REG_T a,b,c,d,e,l; |
295 | #ifndef MD32_XARRAY | 295 | #ifndef MD32_XARRAY |
296 | /* See comment in crypto/sha/sha_locl.h for details. */ | 296 | /* See comment in crypto/sha/sha_locl.h for details. */ |
297 | unsigned long XX0, XX1, XX2, XX3, XX4, XX5, XX6, XX7, | 297 | unsigned MD32_REG_T XX0, XX1, XX2, XX3, XX4, XX5, XX6, XX7, |
298 | XX8, XX9,XX10,XX11,XX12,XX13,XX14,XX15; | 298 | XX8, XX9,XX10,XX11,XX12,XX13,XX14,XX15; |
299 | # define X(i) XX##i | 299 | # define X(i) XX##i |
300 | #else | 300 | #else |
301 | RIPEMD160_LONG XX[16]; | 301 | RIPEMD160_LONG XX[16]; |
diff --git a/src/lib/libcrypto/ripemd/rmd_one.c b/src/lib/libcrypto/ripemd/rmd_one.c index efdf2dd6ef..f8b580c33a 100644 --- a/src/lib/libcrypto/ripemd/rmd_one.c +++ b/src/lib/libcrypto/ripemd/rmd_one.c | |||
@@ -59,6 +59,7 @@ | |||
59 | #include <stdio.h> | 59 | #include <stdio.h> |
60 | #include <string.h> | 60 | #include <string.h> |
61 | #include <openssl/ripemd.h> | 61 | #include <openssl/ripemd.h> |
62 | #include <openssl/crypto.h> | ||
62 | 63 | ||
63 | unsigned char *RIPEMD160(const unsigned char *d, unsigned long n, | 64 | unsigned char *RIPEMD160(const unsigned char *d, unsigned long n, |
64 | unsigned char *md) | 65 | unsigned char *md) |
@@ -70,7 +71,7 @@ unsigned char *RIPEMD160(const unsigned char *d, unsigned long n, | |||
70 | RIPEMD160_Init(&c); | 71 | RIPEMD160_Init(&c); |
71 | RIPEMD160_Update(&c,d,n); | 72 | RIPEMD160_Update(&c,d,n); |
72 | RIPEMD160_Final(md,&c); | 73 | RIPEMD160_Final(md,&c); |
73 | memset(&c,0,sizeof(c)); /* security consideration */ | 74 | OPENSSL_cleanse(&c,sizeof(c)); /* security consideration */ |
74 | return(md); | 75 | return(md); |
75 | } | 76 | } |
76 | 77 | ||
diff --git a/src/lib/libcrypto/ripemd/rmdtest.c b/src/lib/libcrypto/ripemd/rmdtest.c index be1fb8b1f6..d4c709e646 100644 --- a/src/lib/libcrypto/ripemd/rmdtest.c +++ b/src/lib/libcrypto/ripemd/rmdtest.c | |||
@@ -60,6 +60,8 @@ | |||
60 | #include <string.h> | 60 | #include <string.h> |
61 | #include <stdlib.h> | 61 | #include <stdlib.h> |
62 | 62 | ||
63 | #include "../e_os.h" | ||
64 | |||
63 | #ifdef OPENSSL_NO_RIPEMD | 65 | #ifdef OPENSSL_NO_RIPEMD |
64 | int main(int argc, char *argv[]) | 66 | int main(int argc, char *argv[]) |
65 | { | 67 | { |
@@ -127,7 +129,7 @@ int main(int argc, char *argv[]) | |||
127 | R++; | 129 | R++; |
128 | P++; | 130 | P++; |
129 | } | 131 | } |
130 | exit(err); | 132 | EXIT(err); |
131 | return(0); | 133 | return(0); |
132 | } | 134 | } |
133 | 135 | ||