Recent changes from 0.9.7-stable.

diff --git a/Configure b/Configure
index ee4b0e726574fc5340f726179fffa94f26dbde41..51f849f5802ad81061ff92da203afa5cb2afc1aa 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -561,6 +561,7 @@ my %table=(
 "vxworks-ppc405","ccppc:-g -msoft-float -mlongcall -DCPU=PPC405 -I\$(WIND_BASE)/target/h:::VXWORKS:-r:::::",
 "vxworks-ppc750","ccppc:-ansi -nostdinc -DPPC750 -D_REENTRANT -fvolatile -fno-builtin -fno-for-scope -fsigned-char -Wall -msoft-float -mlongcall -DCPU=PPC604 -I\$(WIND_BASE)/target/h \$(DEBUG_FLAG):::VXWORKS:-r:::::",
 "vxworks-ppc750-debug","ccppc:-ansi -nostdinc -DPPC750 -D_REENTRANT -fvolatile -fno-builtin -fno-for-scope -fsigned-char -Wall -msoft-float -mlongcall -DCPU=PPC604 -I\$(WIND_BASE)/target/h -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DDEBUG -g:::VXWORKS:-r:::::",
+"vxworks-ppc860","ccppc:-g -msoft-float -DCPU=PPC860 -DNO_STRINGS_H -I\$(WIND_BASE)/target/h:::VXWORKS:-r:::::",
 
 ##### Compaq Non-Stop Kernel (Tandem)
 "tandem-c89","c89:-Ww -D__TANDEM -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D_TANDEM_SOURCE -DB_ENDIAN::(unknown):::THIRTY_TWO_BIT:::",

diff --git a/e_os.h b/e_os.h
index 16126b2a38528d4b06fe3c458b33e05b1ac03e21..dbe08e69e680087e33c4ec4d7ba70610ad59e72d 100644 (file)
--- a/e_os.h
+++ b/e_os.h
@@ -541,7 +541,7 @@ extern char *sys_errlist[]; extern int sys_nerr;
 #if defined(ioctlsocket)
 #undef ioctlsocket
 #endif
-#define ioctlsocket(a,b,c) ioctl((a),(b),*(c))
+#define ioctlsocket(a,b,c)  ioctl((a),(b),*(int*)(c))
 
 #include <vxWorks.h>
 #include <sockLib.h>

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 2d502d13545280f8eebc58de8b5dc501e59590ef..3e0e703019a6054967714a0df2451a4fbb902f38 100644 (file)
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -474,6 +474,11 @@ void SSL_free(SSL *s)
 
        if (s->method != NULL) s->method->ssl_free(s);
 
+#ifndef        OPENSSL_NO_KRB5
+       if (s->kssl_ctx != NULL)
+               kssl_ctx_free(s->kssl_ctx);
+#endif /* OPENSSL_NO_KRB5 */
+
        OPENSSL_free(s);
        }