diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2015-05-04 04:45:59 +0000 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2015-05-04 04:45:59 +0000 |
| commit | a25439b68651d176ae05867f5090d45fd85e9f24 (patch) | |
| tree | 62ff96a32b854c652d9d65280d1d6fd2089b2f1e /contrib/ntp/sntp/libevent/bufferevent_openssl.c | |
| parent | 6a273d5ef7c73b3cbf7ed0379c36f8eec21a858a (diff) | |
| parent | 4ba32eb5a8bf3455c09d1513ed2af8d2c861a6ba (diff) | |
MFV ntp 4.2.8p2 (r281348)
Reviewed by: delphij (suggested MFC)
Approved by: roberto
Security: CVE-2015-1798, CVE-2015-1799
Security: VuXML ebd84c96-dd7e-11e4-854e-3c970e169bc2
MFC after: 1 month
Notes
Notes:
svn path=/head/; revision=282408
Diffstat (limited to 'contrib/ntp/sntp/libevent/bufferevent_openssl.c')
| -rw-r--r-- | contrib/ntp/sntp/libevent/bufferevent_openssl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/contrib/ntp/sntp/libevent/bufferevent_openssl.c b/contrib/ntp/sntp/libevent/bufferevent_openssl.c index 423b34f10097..b30f90ff2e94 100644 --- a/contrib/ntp/sntp/libevent/bufferevent_openssl.c +++ b/contrib/ntp/sntp/libevent/bufferevent_openssl.c @@ -1276,6 +1276,8 @@ be_openssl_ctrl(struct bufferevent *bev, SSL_set_bio(bev_ssl->ssl, bio, bio); bev_ssl->fd_is_set = 1; } + if (data->fd == -1) + bev_ssl->fd_is_set = 0; if (bev_ssl->state == BUFFEREVENT_SSL_OPEN) return set_open_callbacks(bev_ssl, data->fd); else { |