Late break-in patch for MacOS support.
This commit is contained in:
parent
099f1b32c8
commit
a7c5241f5f
@ -8,8 +8,8 @@ VN!!!!kbi!!!25!!!!+-"!J%!!!!!!!!!!!"$Ef4P9f&bFQP[FL"3FQpUC@0d!!!
|
|||||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!$+J!
|
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!$+J!
|
||||||
!!d!!!'%r!!"N!!!!!bS!!!"I!!8!!!!!!'!!!3!!!!!!CJ!!!P`!!!*J!!!E2`!
|
!!d!!!'%r!!"N!!!!!bS!!!"I!!8!!!!!!'!!!3!!!!!!CJ!!!P`!!!*J!!!E2`!
|
||||||
!(!!!!!*F!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!$!!!!$!!!!!-!!!!-Y)+VS2r
|
!(!!!!!*F!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!$!!!!$!!!!!-!!!!-Y),)q`!
|
||||||
rhp-!!!!!!!!!!!!!!!!!!!!!$!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
!HMS!!!!!!!!!!!!!!!!!!!!!$!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||||
@ -2427,8 +2427,8 @@ TCA-!!!!#4e*98!!!!!!!!!!h!e"33`!!!!*'58a&!J!!"NC*6%8#!!-94e*98!!
|
|||||||
-D@*bBA*TCA-!!!!#4e*98!!!!!!!!!!e!e"33`!!!!K'58a&!J!!#NC*6%8#!!!
|
-D@*bBA*TCA-!!!!#4e*98!!!!!!!!!!e!e"33`!!!!K'58a&!J!!#NC*6%8#!!!
|
||||||
)4NP-43)!!!P'58a&!J!"PNC*6%8#!!!H4NP-43)!!"e'58a&!J!!&8C*6%8#!!!
|
)4NP-43)!!!P'58a&!J!"PNC*6%8#!!!H4NP-43)!!"e'58a&!J!!&8C*6%8#!!!
|
||||||
84e*98!!!!!!!!!!j!cBiD`!!!!9'58a&$!!$3NC*6%8-!!0$4NP-43`!!d4'58a
|
84e*98!!!!!!!!!!j!cBiD`!!!!9'58a&$!!$3NC*6%8-!!0$4NP-43`!!d4'58a
|
||||||
&$!!$48C*6%8-!!0'H`#++E"[HfplEhY[HfplEhY[HfplEhY[HfplEhY[HfplEhY
|
&$!!$48C*6%8-!!0'!!%1cd!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||||
[H`!!!!%!!!!#!!!!!`!!!!!!!!&q!!!!#3!!!!S!!!!,!!!!$!!!!!d!!!!1!!!
|
!!!!!!!%!!!!#!!!!!`!!!!!!!!&q!!!!#3!!!!S!!!!,!!!!$!!!!!d!!!!1!!!
|
||||||
!$`!!!"!!!!!4!!!!%J!!!"-!!!!8!!!!&3!!!"B!!!!A!!!!'!!!!"N!!!!D!!!
|
!$`!!!"!!!!!4!!!!%J!!!"-!!!!8!!!!&3!!!"B!!!!A!!!!'!!!!"N!!!!D!!!
|
||||||
!'`!!!"`!!!!G!!!!(J!!!"m!!!!J!!!!)3!!!#)!!!!M!!!!*!!!!#8!!!!Q!!!
|
!'`!!!"`!!!!G!!!!(J!!!"m!!!!J!!!!)3!!!#)!!!!M!!!!*!!!!#8!!!!Q!!!
|
||||||
!*`!!!#J!!!!T!!!!+J!!!#X!!!!X!!!!,3!!!#i!!!![!!!!-!!!!$%!!!!b!!!
|
!*`!!!#J!!!!T!!!!+J!!!#X!!!!X!!!!,3!!!#i!!!![!!!!-!!!!$%!!!!b!!!
|
||||||
@ -5100,4 +5100,4 @@ J!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!#!!-k!!!"i!)"!!!!!!!
|
|||||||
!!!!!!!#1D3!!!!T`FQ9Q!!3UPJ!!!b3!!!!!!!#1F`!!!!a`FQ9Q!!6#J!!!!b8
|
!!!!!!!#1D3!!!!T`FQ9Q!!3UPJ!!!b3!!!!!!!#1F`!!!!a`FQ9Q!!6#J!!!!b8
|
||||||
!!!!!!!$[bJ!!!-4`FQ9Q!!5%A!!!!bB!!!!!!!$aDJ!!!4K`FQ9Q!!5EfJ!!!bF
|
!!!!!!!$[bJ!!!-4`FQ9Q!!5%A!!!!bB!!!!!!!$aDJ!!!4K`FQ9Q!!5EfJ!!!bF
|
||||||
!!!!!!!&9$J!!!+K`FQ9Q!!38Y3!!!bJ!!!!!!!$`MJ!!!#j`FQ9Q!!4U(3!!!bN
|
!!!!!!!&9$J!!!+K`FQ9Q!!38Y3!!!bJ!!!!!!!$`MJ!!!#j`FQ9Q!!4U(3!!!bN
|
||||||
!!!!!!!'bF!!!!Ja`FQ9Q!!5"83!!!bS!!!!!pP)!!!:
|
!!!!!!!'bF!!!!Ja`FQ9Q!!5"83!!!bS!!!!!eT8!!!:
|
||||||
|
@ -6,8 +6,6 @@
|
|||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define OPENSSL_UNISTD <unistd.h>
|
|
||||||
|
|
||||||
#if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
|
#if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
|
||||||
#define IDEA_INT unsigned int
|
#define IDEA_INT unsigned int
|
||||||
#endif
|
#endif
|
||||||
@ -115,4 +113,5 @@ YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
|
|||||||
|
|
||||||
#ifndef __POWERPC__
|
#ifndef __POWERPC__
|
||||||
#define SHA_XARRAY
|
#define SHA_XARRAY
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -183,7 +183,7 @@ unsigned long CRYPTO_thread_id(void)
|
|||||||
ret=(unsigned long)GetCurrentTask();
|
ret=(unsigned long)GetCurrentTask();
|
||||||
#elif defined(WIN32)
|
#elif defined(WIN32)
|
||||||
ret=(unsigned long)GetCurrentThreadId();
|
ret=(unsigned long)GetCurrentThreadId();
|
||||||
#elif defined(MSDOS)
|
#elif defined(GETPID_IS_MEANINGLESS)
|
||||||
ret=1L;
|
ret=1L;
|
||||||
#else
|
#else
|
||||||
ret=(unsigned long)getpid();
|
ret=(unsigned long)getpid();
|
||||||
|
@ -183,11 +183,10 @@
|
|||||||
# define ROTATE(a,n) _lrotl(a,n)
|
# define ROTATE(a,n) _lrotl(a,n)
|
||||||
# elif defined(__MWERKS__)
|
# elif defined(__MWERKS__)
|
||||||
# ifdef __POWERPC__
|
# ifdef __POWERPC__
|
||||||
# defined ROTATE(a,n) __rlwinm(a,n,0,31)
|
# define ROTATE(a,n) __rlwinm(a,n,0,31)
|
||||||
# else
|
# else
|
||||||
# define ROTATE(a,n) __rol(a,n)
|
# define ROTATE(a,n) __rol(a,n)
|
||||||
# endif
|
# endif
|
||||||
B
|
|
||||||
# elif defined(__GNUC__) && __GNUC__>=2 && !defined(NO_ASM)
|
# elif defined(__GNUC__) && __GNUC__>=2 && !defined(NO_ASM)
|
||||||
/*
|
/*
|
||||||
* Some GNU C inline assembler templates. Note that these are
|
* Some GNU C inline assembler templates. Note that these are
|
||||||
|
@ -93,7 +93,7 @@ static void (*free_func)(void *) = free;
|
|||||||
static void (*realloc_debug_func)()= NULL;
|
static void (*realloc_debug_func)()= NULL;
|
||||||
static void (*free_debug_func)()= NULL;
|
static void (*free_debug_func)()= NULL;
|
||||||
static void (*set_debug_options_func)()= NULL;
|
static void (*set_debug_options_func)()= NULL;
|
||||||
static int (*get_debug_options_func)()= NULL;
|
static long (*get_debug_options_func)()= NULL;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
6
e_os.h
6
e_os.h
@ -251,7 +251,11 @@ extern "C" {
|
|||||||
# endif
|
# endif
|
||||||
# else
|
# else
|
||||||
/* !defined VMS */
|
/* !defined VMS */
|
||||||
# include OPENSLL_UNISTD
|
# ifdef OPENSSL_UNISTD
|
||||||
|
# include OPENSLL_UNISTD
|
||||||
|
# else
|
||||||
|
# include <unistd.h>
|
||||||
|
# endif
|
||||||
# ifndef NO_SYS_TYPES_H
|
# ifndef NO_SYS_TYPES_H
|
||||||
# include <sys/types.h>
|
# include <sys/types.h>
|
||||||
# endif
|
# endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user