diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-27 09:46:41 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-27 09:46:41 +0200 |
| commit | 16dc3aab3db9b8db4cb4fc8d241d4cd5d5362b8a (patch) | |
| tree | 09945c52f5b465460a1ffd9b0f2fb2b3d8939c9f | |
| parent | f3d4d83ce5a921899775eb59997d9d954b2f423d (diff) | |
| parent | f3a7232069730e94519d7cc06fe0d82bf21b0162 (diff) | |
| download | rsyslog-16dc3aab3db9b8db4cb4fc8d241d4cd5d5362b8a.tar.gz rsyslog-16dc3aab3db9b8db4cb4fc8d241d4cd5d5362b8a.tar.xz rsyslog-16dc3aab3db9b8db4cb4fc8d241d4cd5d5362b8a.zip | |
Merge branch 'v5-stable' into beta
Conflicts:
ChangeLog
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | runtime/nsd_gtls.c | 8 |
2 files changed, 18 insertions, 3 deletions
@@ -14,6 +14,9 @@ Version 6.2.0 [v6-stable], 2011-0?-?? rule engine as omfile could not really recover. - bugfix: rsyslogd -v always said 64 atomics were not present thanks to mono_matsuko for the patch +- 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 6.1.12 [BETA], 2011-09-01 - bugfix/security: off-by-two bug in legacy syslog parser, CVE-2011-3200 @@ -239,6 +242,11 @@ Version 5.9.0 [V5-DEVEL] (rgerhards), 2011-03-?? affected directive was: $ActionExecOnlyWhenPreviousIsSuspended on closes: http://bugzilla.adiscon.com/show_bug.cgi?id=236 --------------------------------------------------------------------------- +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 @@ -1080,12 +1088,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 cc8f78d1..ad39ccb7 100644 --- a/runtime/nsd_gtls.c +++ b/runtime/nsd_gtls.c @@ -202,10 +202,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; } |