diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2003-11-11 22:15:21 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2003-11-11 22:15:21 +0000 |
| commit | bdb4cf312bb57e75d91c0b6c4b3b47fc10463260 (patch) | |
| tree | 159bb0ea93999f8989ed1fc59ad8981ac286c1e1 /lib/libcrypto/md5 | |
| parent | 122826059125660856e13fb3df457cb87744c415 (diff) | |
merge 0.9.7c; minor bugsfixes;
API addition: ERR_release_err_state_table
[make includes before you build libssl/libcrypto]
Diffstat (limited to 'lib/libcrypto/md5')
| -rw-r--r-- | lib/libcrypto/md5/Makefile.ssl | 3 | ||||
| -rw-r--r-- | lib/libcrypto/md5/asm/md5-586.pl | 2 | ||||
| -rw-r--r-- | lib/libcrypto/md5/asm/md5-sparcv9.S | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/lib/libcrypto/md5/Makefile.ssl b/lib/libcrypto/md5/Makefile.ssl index b11ab476d6a..2361775a2dc 100644 --- a/lib/libcrypto/md5/Makefile.ssl +++ b/lib/libcrypto/md5/Makefile.ssl @@ -6,7 +6,7 @@ DIR= md5 TOP= ../.. CC= cc CPP= $(CC) -E -INCLUDES= +INCLUDES=-I.. -I$(TOP) -I../../include CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl @@ -20,6 +20,7 @@ AR= ar r MD5_ASM_OBJ= CFLAGS= $(INCLUDES) $(CFLAG) +ASFLAGS= $(INCLUDES) $(ASFLAG) GENERAL=Makefile TEST=md5test.c diff --git a/lib/libcrypto/md5/asm/md5-586.pl b/lib/libcrypto/md5/asm/md5-586.pl index 5fc6a205ce0..fa3fa3bed59 100644 --- a/lib/libcrypto/md5/asm/md5-586.pl +++ b/lib/libcrypto/md5/asm/md5-586.pl @@ -293,7 +293,7 @@ sub md5_block &mov(&DWP(12,$tmp2,"",0),$D); &cmp($tmp1,$X) unless $normal; # check count - &jge(&label("start")) unless $normal; + &jae(&label("start")) unless $normal; &pop("eax"); # pop the temp variable off the stack &pop("ebx"); diff --git a/lib/libcrypto/md5/asm/md5-sparcv9.S b/lib/libcrypto/md5/asm/md5-sparcv9.S index a599ed5660b..db45aa4c977 100644 --- a/lib/libcrypto/md5/asm/md5-sparcv9.S +++ b/lib/libcrypto/md5/asm/md5-sparcv9.S @@ -34,10 +34,12 @@ * * or if above fails (it does if you have gas): * - * gcc -E -DULTRASPARC -DMD5_BLOCK_DATA_ORDER md5_block.sparc.S | \ + * gcc -E -DOPENSSL_SYSNAMEULTRASPARC -DMD5_BLOCK_DATA_ORDER md5_block.sparc.S | \ * as -xarch=v8plus /dev/fd/0 -o md5-sparcv9.o */ +#include <openssl/e_os2.h> + #define A %o0 #define B %o1 #define C %o2 |