From aeef9bbe727d80c5882cc0a883b8dfd5df461f10 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Wed, 2 Jul 2008 11:56:54 +0200 Subject: bugfix: machine certificate was required for client even in TLS anon mode Reference: http://bugzilla.adiscon.com/show_bug.cgi?id=85 The fix also slightly improves performance by not storing certificates in client sessions when there is no need to do so. --- runtime/glbl.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'runtime/glbl.c') diff --git a/runtime/glbl.c b/runtime/glbl.c index deb32471..11a664f8 100644 --- a/runtime/glbl.c +++ b/runtime/glbl.c @@ -42,15 +42,6 @@ #ifndef DFLT_NETSTRM_DRVR # define DFLT_NETSTRM_DRVR ((uchar*)"ptcp") #endif -#ifndef DFLT_NETSTRM_DRVR_CAF -# define DFLT_NETSTRM_DRVR_CAF ((uchar*)"ca.pem") -#endif -#ifndef DFLT_NETSTRM_DRVR_KEYFILE -# define DFLT_NETSTRM_DRVR_KEYFILE ((uchar*)"key.pem") -#endif -#ifndef DFLT_NETSTRM_DRVR_CERTFILE -# define DFLT_NETSTRM_DRVR_CERTFILE ((uchar*)"cert.pem") -#endif /* static data */ DEFobjStaticHelpers @@ -141,7 +132,7 @@ GetDfltNetstrmDrvr(void) static uchar* GetDfltNetstrmDrvrCAF(void) { - return(pszDfltNetstrmDrvrCAF == NULL ? DFLT_NETSTRM_DRVR_CAF : pszDfltNetstrmDrvrCAF); + return(pszDfltNetstrmDrvrCAF); } @@ -149,7 +140,7 @@ GetDfltNetstrmDrvrCAF(void) static uchar* GetDfltNetstrmDrvrKeyFile(void) { - return(pszDfltNetstrmDrvrKeyFile == NULL ? DFLT_NETSTRM_DRVR_KEYFILE : pszDfltNetstrmDrvrKeyFile); + return(pszDfltNetstrmDrvrKeyFile); } @@ -157,7 +148,7 @@ GetDfltNetstrmDrvrKeyFile(void) static uchar* GetDfltNetstrmDrvrCertFile(void) { - return(pszDfltNetstrmDrvrCertFile == NULL ? DFLT_NETSTRM_DRVR_CERTFILE : pszDfltNetstrmDrvrCertFile); + return(pszDfltNetstrmDrvrCertFile); } -- cgit v1.2.3