generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

WCE update, mostly typos.

Browse Source
This commit is contained in:
Andy Polyakov 2005-08-03 19:56:36 +00:00
parent 45771abbd6
commit 19bd66fe74
6 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/cryptlib.c
View File

@ -669,9 +669,9 @@ void OPENSSL_showfatal (const char *fmta,...)
{ va_list ap; { va_list ap;
TCHAR buf[256]; TCHAR buf[256];
const TCHAR *fmt; const TCHAR *fmt;
#ifdef STD_ERROR_HANDLE /* what a dirty trick! */
HANDLE h; HANDLE h;
#ifdef STD_ERROR_HANDLE /* what a dirty trick! */
if ((h=GetStdHandle(STD_ERROR_HANDLE)) != NULL && if ((h=GetStdHandle(STD_ERROR_HANDLE)) != NULL &&
GetFileType(h)!=FILE_TYPE_UNKNOWN) GetFileType(h)!=FILE_TYPE_UNKNOWN)
{ /* must be console application */ { /* must be console application */
@ -734,7 +734,7 @@ void OPENSSL_showfatal (const char *fmta,...)
} }
else else
#endif #endif
MessageBox (NULL,buf,_T("OpenSSL: FATAL"),MB_OK|MB_ICONSTOP|MB_TASKMODAL); MessageBox (NULL,buf,_T("OpenSSL: FATAL"),MB_OK|MB_ICONSTOP);
} }
#else #else
void OPENSSL_showfatal (const char *fmta,...) void OPENSSL_showfatal (const char *fmta,...)

4
crypto/dso/dso_win32.c
View File

@ -86,13 +86,13 @@ static FARPROC GetProcAddressA(HMODULE hModule,LPCSTR lpProcName)
# undef GetProcAddress # undef GetProcAddress
# define GetProcAddress GetProcAddressA # define GetProcAddress GetProcAddressA
static HINSTANCE LoadLibraryA(LPCSTR *lpLibFileName) static HINSTANCE LoadLibraryA(LPCSTR lpLibFileName)
{ {
WCHAR *fnamw; WCHAR *fnamw;
size_t len_0=strlen(lpLibFileName)+1,i; size_t len_0=strlen(lpLibFileName)+1,i;
#ifdef _MSC_VER #ifdef _MSC_VER
fname = (WCHAR *)_alloca (len_0*sizeof(WCHAR)); fnamw = (WCHAR *)_alloca (len_0*sizeof(WCHAR));
#else #else
fnamw = (WCHAR *)alloca (len_0*sizeof(WCHAR)); fnamw = (WCHAR *)alloca (len_0*sizeof(WCHAR));
#endif #endif

1
crypto/md2/md2test.c
View File

@ -128,6 +128,7 @@ int main(int argc, char *argv[])
if (err) printf("ERROR: %d\n", err); if (err) printf("ERROR: %d\n", err);
#endif #endif
EXIT(err); EXIT(err);
return err;
} }
static char *pt(unsigned char *md) static char *pt(unsigned char *md)

4
crypto/rand/rand_win.c
View File

@ -205,7 +205,9 @@ int RAND_poll(void)
GetVersionEx( &osverinfo ) ; GetVersionEx( &osverinfo ) ;
#if defined(OPENSSL_SYS_WINCE) #if defined(OPENSSL_SYS_WINCE)
# if defined(_WIN32_WCE) && _WIN32_WCE>=210 # if defined(_WIN32_WCE) && _WIN32_WCE>=300
/* Even though MSDN says _WIN32_WCE>=210, it doesn't seem to be available
* in commonly available implementations prior 300... */
# ifndef CryptAcquireContext # ifndef CryptAcquireContext
/* reserve for broken header... */ /* reserve for broken header... */
# define CryptAcquireContext CryptAcquireContextW # define CryptAcquireContext CryptAcquireContextW

1
ssl/ssltest.c
View File

@ -893,6 +893,7 @@ end:
CRYPTO_mem_leaks(bio_err); CRYPTO_mem_leaks(bio_err);
if (bio_err != NULL) BIO_free(bio_err); if (bio_err != NULL) BIO_free(bio_err);
EXIT(ret); EXIT(ret);
return ret;
} }
int doit_biopair(SSL *s_ssl, SSL *c_ssl, long count, int doit_biopair(SSL *s_ssl, SSL *c_ssl, long count,

11
util/pl/VC-32.pl
View File

@ -48,15 +48,15 @@ elsif ($FLAVOR =~ /CE/)
$wcetgt = $ENV{'TARGETCPU'}; # just shorter name... $wcetgt = $ENV{'TARGETCPU'}; # just shorter name...
SWITCH: for($wcetgt) { SWITCH: for($wcetgt) {
/^X86/ && do { $wcecdefs.=" -Dx86 -D_X86_"; /^X86/ && do { $wcecdefs.=" -Dx86 -D_X86_";
$wcelflag.=" /machine:X86"; last; } $wcelflag.=" /machine:X86"; last; };
/^ARM/ && do { $wcecdefs.=" -DARM -D_ARM_"; /^ARM/ && do { $wcecdefs.=" -DARM -D_ARM_";
$wcelflag.=" /machine:$wcetgt"; last; } $wcelflag.=" /machine:$wcetgt"; last; };
/^R4[0-9]{3}/ && do { $wcecdefs.=" -DMIPS -D_MIPS_ -DMIPS_R4000"; /^R4[0-9]{3}/ && do { $wcecdefs.=" -DMIPS -D_MIPS_ -DMIPS_R4000";
$wcelflag.=" /machine:$wcetgt"; last; } $wcelflag.=" /machine:MIPS"; last; };
/^SH[0-9]/ && do { $wcecdefs.=" -D$wcetgt -D_$wcetgt_ -DSHx"; /^SH[0-9]/ && do { $wcecdefs.=" -D$wcetgt -D_$wcetgt_ -DSHx";
$wcelflag.=" /machine:$wcetgt"; last; } $wcelflag.=" /machine:$wcetgt"; last; };
{ $wcecdefs.=" -D$wcetgt -D_$wcetgt_"; { $wcecdefs.=" -D$wcetgt -D_$wcetgt_";
$wcelflag.=" /machine:$wcetgt"; last; } $wcelflag.=" /machine:$wcetgt"; last; };
} }
$cc='$(CC)'; $cc='$(CC)';
@ -64,6 +64,7 @@ elsif ($FLAVOR =~ /CE/)
$base_cflags.=" $wcecdefs"; $base_cflags.=" $wcecdefs";
$base_cflags.=" -Qsh4" if ($wcetgt =~ /^SH4/); $base_cflags.=" -Qsh4" if ($wcetgt =~ /^SH4/);
$opt_cflags=' /MC /O1i'; # optimize for space, but with intrinsics... $opt_cflags=' /MC /O1i'; # optimize for space, but with intrinsics...
$opt_cflags.=' /wd4959'; # disable "too large to optimize" warning...
$dbg_clfags=' /MC /Od -DDEBUG -D_DEBUG'; $dbg_clfags=' /MC /Od -DDEBUG -D_DEBUG';
$lflags="/nologo /opt:ref $wcelflag"; $lflags="/nologo /opt:ref $wcelflag";
} }