merge 0.9.7c; minor bugsfixes;

API addition: ERR_release_err_state_table
[make includes before you build libssl/libcrypto]

2 files changed, 4 insertions, 2 deletions

diff --git a/src/lib/libcrypto/md5/asm/md5-586.pl b/src/lib/libcrypto/md5/asm/md5-586.pl
index 5fc6a205ce..fa3fa3bed5 100644
--- a/src/lib/libcrypto/md5/asm/md5-586.pl
+++ b/src/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/src/lib/libcrypto/md5/asm/md5-sparcv9.S b/src/lib/libcrypto/md5/asm/md5-sparcv9.S
index a599ed5660..db45aa4c97 100644
--- a/src/lib/libcrypto/md5/asm/md5-sparcv9.S
+++ b/src/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