From 2fe7c59277ac077b8914200e70fa519200fdcf15 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Sat, 27 Sep 2003 10:13:11 +0000 Subject: [PATCH] Recent changes from 0.9.7-stable. --- Configure | 1 + e_os.h | 2 +- ssl/ssl_lib.c | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Configure b/Configure index ee4b0e726..51f849f58 100755 --- 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 16126b2a3..dbe08e69e 100644 --- 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 #include diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 2d502d135..3e0e70301 100644 --- 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); }