X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fcryptlib.c;h=be61a9da3f55b45c8bc372de908a1c14b1305565;hb=dfb5de6fc0ff040212deb687d01e2f216edd88df;hp=680dd0a78c95639d2f2606a0837bdbb18e39bb9b;hpb=63fe3221601d55ab340b89d15c17cb90d168487f;p=oweals%2Fopenssl.git

diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index 680dd0a78c..be61a9da3f 100644
--- a/crypto/cryptlib.c
+++ b/crypto/cryptlib.c
@@ -858,8 +858,12 @@ void OPENSSL_showfatal (const char *fmta,...)
     if ((h=GetStdHandle(STD_ERROR_HANDLE)) != NULL &&
 	GetFileType(h)!=FILE_TYPE_UNKNOWN)
     {	/* must be console application */
+	int   len;
+	DWORD out;
+
 	va_start (ap,fmta);
-	vfprintf (stderr,fmta,ap);
+	len=_vsnprintf((char *)buf,sizeof(buf),fmta,ap);
+	WriteFile(h,buf,len<0?sizeof(buf):(DWORD)len,&out,NULL);
 	va_end (ap);
 	return;
     }
@@ -905,7 +909,7 @@ void OPENSSL_showfatal (const char *fmta,...)
 
 #if defined(_WIN32_WINNT) && _WIN32_WINNT>=0x0333
     /* this -------------v--- guards NT-specific calls */
-    if (GetVersion() < 0x80000000 && OPENSSL_isservice() > 0)
+    if (check_winnt() && OPENSSL_isservice() > 0)
     {	HANDLE h = RegisterEventSource(0,_T("OPENSSL"));
 	const TCHAR *pmsg=buf;
 	ReportEvent(h,EVENTLOG_ERROR_TYPE,0,0,0,1,0,&pmsg,0);
@@ -935,7 +939,9 @@ void OpenSSLDie(const char *file,int line,const char *assertion)
 	abort();
 #else
 	/* Win32 abort() customarily shows a dialog, but we just did that... */
+#if !defined(_WIN32_WCE)
 	raise(SIGABRT);
+#endif
 	_exit(3);
 #endif
 	}