diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-27 09:39:45 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-27 09:39:45 +0200 |
| commit | f3a7232069730e94519d7cc06fe0d82bf21b0162 (patch) | |
| tree | 7e1a67cc37d8daf639ef6a9285be5e33cd48c201 | |
| parent | 5d67d98c35da731eab933dbfd858a0e009aa58de (diff) | |
| parent | 9b305b5de54e4dd84a689e7642043253a1bbc94b (diff) | |
| download | rsyslog-f3a7232069730e94519d7cc06fe0d82bf21b0162.tar.gz rsyslog-f3a7232069730e94519d7cc06fe0d82bf21b0162.tar.xz rsyslog-f3a7232069730e94519d7cc06fe0d82bf21b0162.zip | |
Merge branch 'v4-stable' into v5-stable
Conflicts:
ChangeLog
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | runtime/nsd_gtls.c | 8 |
2 files changed, 15 insertions, 3 deletions
@@ -1,4 +1,9 @@ --------------------------------------------------------------------------- +Version 5.8.7 [V5-stable] 2011-??-?? +- bugfix: potential abort after reading invalid X.509 certificate + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=290 + Thanks to Tomas Heinrich for the patch +--------------------------------------------------------------------------- Version 5.8.6 [V5-stable] 2011-10-21 - bugfix: missing whitespace after property-based filter was not detected - bugfix: $OMFileFlushInterval period was doubled - now using correct value @@ -839,12 +844,15 @@ increase. - increased ompgsql performance by adapting to new transactional output module interface --------------------------------------------------------------------------- -Version 4.8.1 [v4-beta], 2011-09-?? +Version 4.8.1 [v4-stable], 2011-09-?? - bugfix: $ActionExecOnlyOnce interval did not work properly Thanks to Tomas Heinrich for the patch - bugfix: potential abort if ultra-large file io buffers are used and dynafile cache exhausts address space (primarily a problem on 32 bit platforms) +- bugfix: potential abort after reading invalid X.509 certificate + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=290 + Thanks to Tomas Heinrich for the patch --------------------------------------------------------------------------- Version 4.8.0 [v4-stable] (rgerhards), 2011-09-07 *************************************************************************** diff --git a/runtime/nsd_gtls.c b/runtime/nsd_gtls.c index ca4b2928..0f0e0862 100644 --- a/runtime/nsd_gtls.c +++ b/runtime/nsd_gtls.c @@ -204,10 +204,14 @@ finalize_it: if(iRet != RS_RET_OK) { if(data.data != NULL) free(data.data); - if(pThis->bOurCertIsInit) + if(pThis->bOurCertIsInit) { gnutls_x509_crt_deinit(pThis->ourCert); - if(pThis->bOurKeyIsInit) + pThis->bOurCertIsInit = 0; + } + if(pThis->bOurKeyIsInit) { gnutls_x509_privkey_deinit(pThis->ourKey); + pThis->bOurKeyIsInit = 0; + } } RETiRet; } |