Update OpenSSL to version 1.0.1s

(cherry picked from commit c860574d8b
and commit 2cbd850979)
This commit is contained in:
mrezai
2016-04-10 17:48:59 +04:30
committed by Rémi Verschelde
parent b2b5c495e1
commit b24c3be564
914 changed files with 217503 additions and 210862 deletions

View File

@ -227,7 +227,7 @@
#endif
#if defined(DES_RISC1) && defined(DES_RISC2)
YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
#error YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
#endif
/* Unroll the inner loop, this sometimes helps, sometimes hinders.
@ -246,7 +246,7 @@ YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
optimization options. Older Sparc's work better with only UNROLL, but
there's no way to tell at compile time what it is you're running on */
#if defined( sun ) /* Newer Sparc's */
#if defined( __sun ) || defined ( sun ) /* Newer Sparc's */
# define DES_PTR
# define DES_RISC1
# define DES_UNROLL