OpenSSL 0.9.5 merge

*warning* this bumps shared lib minors for libssl and libcrypto from 2.1 to 2.2
if you are using the ssl26 packages for ssh and other things to work you will
need to get new ones (see ~beck/libsslsnap/<arch>) on cvs or ~beck/src-patent.tar.gz on cvs

1 files changed, 11 insertions, 3 deletions

diff --git a/src/lib/libcrypto/bio/bss_log.c b/src/lib/libcrypto/bio/bss_log.c
index db82e757e7..4308b19663 100644
--- a/src/lib/libcrypto/bio/bss_log.c
+++ b/src/lib/libcrypto/bio/bss_log.c
@@ -72,6 +72,8 @@
 #else
 #include <syslog.h>
 #endif
+#else
+#include <process.h>
 #endif
 
 #include "cryptlib.h"
@@ -98,6 +100,7 @@ static BIO_METHOD methods_slg=
         slg_ctrl,
         slg_new,
         slg_free,
+        NULL,
         };
 
 BIO_METHOD *BIO_s_log(void)
@@ -131,8 +134,10 @@ static int MS_CALLBACK slg_write(BIO *b, char *in, int inl)
         char* buf= in;
         char* pp;
 #if defined(WIN32)
-        LPTSTR lpszStrings[1];
+        LPCSTR lpszStrings[2];
         WORD evtype= EVENTLOG_ERROR_TYPE;
+        int pid = _getpid();
+        char pidbuf[20];
 #else
         int priority;
 #endif
@@ -156,10 +161,13 @@ static int MS_CALLBACK slg_write(BIO *b, char *in, int inl)
                 evtype= EVENTLOG_ERROR_TYPE;
                 pp= buf;
         }
-        lpszStrings[0]= pp;
+
+        sprintf(pidbuf, "[%d] ", pid);
+        lpszStrings[0] = pidbuf;
+        lpszStrings[1] = pp;
 
         if(b->ptr)
-                ReportEvent(b->ptr, evtype, 0, 1024, NULL, 1, 0,
+                ReportEvent(b->ptr, evtype, 0, 1024, NULL, 2, 0,
                                 lpszStrings, NULL);
 #else
         if(strncmp(buf, "ERR ", 4) == 0){