Compare commits

...

11 Commits

Author SHA1 Message Date
Asterisk Autobuilder
e1736c6dd5 Importing release summary for 11.13.1 release.
git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/11.13.1@426066 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-10-20 15:40:56 +00:00
Asterisk Autobuilder
80c1c3eaf5 Merge 425986
git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/11.13.1@426019 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-10-20 14:25:08 +00:00
Asterisk Autobuilder
e6d25aa91c Update .version, remove summaries
git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/11.13.1@426002 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-10-20 14:19:58 +00:00
Asterisk Autobuilder
1a26ce65c5 Create 11.13.1
git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/11.13.1@425989 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-10-20 14:14:25 +00:00
Asterisk Autobuilder
294da68ab6 Importing release summary for 11.13.0 release.
git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/11.13.0@423873 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-09-24 19:00:38 +00:00
Asterisk Autobuilder
934d01a2e7 Update ChangeLog
git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/11.13.0@423870 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-09-24 18:55:46 +00:00
Asterisk Autobuilder
d3aa6620b2 Create 11.13.0
git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/11.13.0@423864 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-09-24 16:25:39 +00:00
Asterisk Autobuilder
5e0c36bb87 Use autotagged externals
git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/11.13.0-rc1@423601 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-09-19 20:20:46 +00:00
Asterisk Autobuilder
28fab22ddf Importing release summary for 11.13.0-rc1 release.
git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/11.13.0-rc1@423599 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-09-19 20:20:32 +00:00
Asterisk Autobuilder
7c1c9a2120 Importing files for 11.13.0-rc1 release.
git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/11.13.0-rc1@423597 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-09-19 20:20:21 +00:00
Asterisk Autobuilder
16db4da72f Creating tag for the release of asterisk-11.13.0-rc1
git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/11.13.0-rc1@423588 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-09-19 20:17:48 +00:00
9 changed files with 31686 additions and 7 deletions

1
.lastclean Normal file
View File

@@ -0,0 +1 @@
40

1
.version Normal file
View File

@@ -0,0 +1 @@
11.13.1

31486
ChangeLog Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -20,6 +20,18 @@
===
===========================================================
from 11.13.0 to 11.13.1:
* Due to the POODLE vulnerability (see
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-3566), the
default TLS method for TLS clients will no longer allow SSLv3. As
SSLv2 was already deprecated, it is no longer allowed by default as
well. TLS servers no longer allow SSLv2 or SSLv3 connections. This
affects the chan_sip channel driver, AMI, and the Asterisk HTTP server.
* The res_jabber resource module no longer uses SSLv3 to connect to an
XMPP server. It will now only use TLSv1 or later methods.
from 11.10.2 to 11.11.0
- Added a compatibility option for chan_sip, 'websocket_write_timeout'.
When a websocket connection exists where Asterisk writes a substantial

View File

@@ -0,0 +1,65 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /><title>Release Summary - asterisk-11.13.1</title></head>
<body>
<h1 align="center"><a name="top">Release Summary</a></h1>
<h3 align="center">asterisk-11.13.1</h3>
<h3 align="center">Date: 2014-10-20</h3>
<h3 align="center">&lt;asteriskteam@digium.com&gt;</h3>
<hr/>
<h2 align="center">Table of Contents</h2>
<ol>
<li><a href="#summary">Summary</a></li>
<li><a href="#contributors">Contributors</a></li>
<li><a href="#commits">Other Changes</a></li>
<li><a href="#diffstat">Diffstat</a></li>
</ol>
<hr/>
<a name="summary"><h2 align="center">Summary</h2></a>
<center><a href="#top">[Back to Top]</a></center><br/><p>This release has been made to address one or more security vulnerabilities that have been identified. A security advisory document has been published for each vulnerability that includes additional information. Users of versions of Asterisk that are affected are strongly encouraged to review the advisories and determine what action they should take to protect their systems from these issues.</p>
<p>Security Advisories: <a href="http://downloads.asterisk.org/pub/security/AST-2014-011.html">AST-2014-011</a></p>
<p>The data in this summary reflects changes that have been made since the previous release, asterisk-11.13.0.</p>
<hr/>
<a name="contributors"><h2 align="center">Contributors</h2></a>
<center><a href="#top">[Back to Top]</a></center><br/><p>This table lists the people who have submitted code, those that have tested patches, as well as those that reported issues on the issue tracker that were resolved in this release. For coders, the number is how many of their patches (of any size) were committed into this release. For testers, the number is the number of times their name was listed as assisting with testing a patch. Finally, for reporters, the number is the number of issues that they reported that were closed by commits that went into this release.</p>
<table width="100%" border="0">
<tr>
<td width="33%"><h3>Coders</h3></td>
<td width="33%"><h3>Testers</h3></td>
<td width="33%"><h3>Reporters</h3></td>
</tr>
<tr valign="top">
<td>
3 bebuild<br/>
</td>
<td>
</td>
<td>
</td>
</tr>
</table>
<hr/>
<a name="commits"><h2 align="center">Commits Not Associated with an Issue</h2></a>
<center><a href="#top">[Back to Top]</a></center><br/><p>This is a list of all changes that went into this release that did not directly close an issue from the issue tracker. The commits may have been marked as being related to an issue. If that is the case, the issue numbers are listed here, as well.</p>
<table width="100%" border="1">
<tr><td><b>Revision</b></td><td><b>Author</b></td><td><b>Summary</b></td><td><b>Issues Referenced</b></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/tags/11.13.1?view=revision&revision=425989">425989</a></td><td>bebuild</td><td>Create 11.13.1</td>
<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/tags/11.13.1?view=revision&revision=426002">426002</a></td><td>bebuild</td><td>Update .version, remove summaries</td>
<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/tags/11.13.1?view=revision&revision=426019">426019</a></td><td>bebuild</td><td>Merge 425986</td>
<td></td></tr></table>
<hr/>
<a name="diffstat"><h2 align="center">Diffstat Results</h2></a>
<center><a href="#top">[Back to Top]</a></center><br/><p>This is a summary of the changes to the source code that went into this release that was generated using the diffstat utility.</p>
<pre>
.version | 2
ChangeLog | 26 +++
UPGRADE.txt | 12 +
asterisk-11.13.0-summary.html | 237 -------------------------------
asterisk-11.13.0-summary.txt | 321 ------------------------------------------
main/tcptls.c | 22 ++
res/res_jabber.c | 5
res/res_xmpp.c | 6
8 files changed, 65 insertions(+), 566 deletions(-)
</pre><br/>
<hr/>
</body>
</html>

View File

@@ -0,0 +1,95 @@
Release Summary
asterisk-11.13.1
Date: 2014-10-20
<asteriskteam@digium.com>
----------------------------------------------------------------------
Table of Contents
1. Summary
2. Contributors
3. Other Changes
4. Diffstat
----------------------------------------------------------------------
Summary
[Back to Top]
This release has been made to address one or more security vulnerabilities
that have been identified. A security advisory document has been published
for each vulnerability that includes additional information. Users of
versions of Asterisk that are affected are strongly encouraged to review
the advisories and determine what action they should take to protect their
systems from these issues.
Security Advisories: AST-2014-011
The data in this summary reflects changes that have been made since the
previous release, asterisk-11.13.0.
----------------------------------------------------------------------
Contributors
[Back to Top]
This table lists the people who have submitted code, those that have
tested patches, as well as those that reported issues on the issue tracker
that were resolved in this release. For coders, the number is how many of
their patches (of any size) were committed into this release. For testers,
the number is the number of times their name was listed as assisting with
testing a patch. Finally, for reporters, the number is the number of
issues that they reported that were closed by commits that went into this
release.
Coders Testers Reporters
3 bebuild
----------------------------------------------------------------------
Commits Not Associated with an Issue
[Back to Top]
This is a list of all changes that went into this release that did not
directly close an issue from the issue tracker. The commits may have been
marked as being related to an issue. If that is the case, the issue
numbers are listed here, as well.
+------------------------------------------------------------------------+
| Revision | Author | Summary | Issues Referenced |
|----------+---------+-------------------------------+-------------------|
| 425989 | bebuild | Create 11.13.1 | |
|----------+---------+-------------------------------+-------------------|
| 426002 | bebuild | Update .version, remove | |
| | | summaries | |
|----------+---------+-------------------------------+-------------------|
| 426019 | bebuild | Merge 425986 | |
+------------------------------------------------------------------------+
----------------------------------------------------------------------
Diffstat Results
[Back to Top]
This is a summary of the changes to the source code that went into this
release that was generated using the diffstat utility.
.version | 2
ChangeLog | 26 +++
UPGRADE.txt | 12 +
asterisk-11.13.0-summary.html | 237 -------------------------------
asterisk-11.13.0-summary.txt | 321 ------------------------------------------
main/tcptls.c | 22 ++
res/res_jabber.c | 5
res/res_xmpp.c | 6
8 files changed, 65 insertions(+), 566 deletions(-)
----------------------------------------------------------------------

View File

@@ -746,6 +746,8 @@ static int __ssl_setup(struct ast_tls_config *cfg, int client)
cfg->enabled = 0;
return 0;
#else
int disable_ssl = 0;
if (!cfg->enabled) {
return 0;
}
@@ -761,22 +763,21 @@ static int __ssl_setup(struct ast_tls_config *cfg, int client)
if (client) {
#ifndef OPENSSL_NO_SSL2
if (ast_test_flag(&cfg->flags, AST_SSL_SSLV2_CLIENT)) {
ast_log(LOG_WARNING, "Usage of SSLv2 is discouraged due to known vulnerabilities. Please use 'tlsv1' or leave the TLS method unspecified!\n");
cfg->ssl_ctx = SSL_CTX_new(SSLv2_client_method());
} else
#endif
if (ast_test_flag(&cfg->flags, AST_SSL_SSLV3_CLIENT)) {
ast_log(LOG_WARNING, "Usage of SSLv3 is discouraged due to known vulnerabilities. Please use 'tlsv1' or leave the TLS method unspecified!\n");
cfg->ssl_ctx = SSL_CTX_new(SSLv3_client_method());
} else if (ast_test_flag(&cfg->flags, AST_SSL_TLSV1_CLIENT)) {
cfg->ssl_ctx = SSL_CTX_new(TLSv1_client_method());
} else {
/* SSLv23_client_method() sends SSLv2, this was the original
* default for ssl clients before the option was given to
* pick what protocol a client should use. In order not
* to break expected behavior it remains the default. */
disable_ssl = 1;
cfg->ssl_ctx = SSL_CTX_new(SSLv23_client_method());
}
} else {
/* SSLv23_server_method() supports TLSv1, SSLv2, and SSLv3 inbound connections. */
disable_ssl = 1;
cfg->ssl_ctx = SSL_CTX_new(SSLv23_server_method());
}
@@ -786,6 +787,17 @@ static int __ssl_setup(struct ast_tls_config *cfg, int client)
return 0;
}
/* Due to the POODLE vulnerability, completely disable
* SSLv2 and SSLv3 if we are not explicitly told to use
* them. SSLv23_*_method supports TLSv1+.
*/
if (disable_ssl) {
long ssl_opts;
ssl_opts = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
SSL_CTX_set_options(cfg->ssl_ctx, ssl_opts);
}
SSL_CTX_set_verify(cfg->ssl_ctx,
ast_test_flag(&cfg->flags, AST_SSL_VERIFY_CLIENT) ? SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT : SSL_VERIFY_NONE,
NULL);

View File

@@ -1282,14 +1282,17 @@ static int aji_start_tls(struct aji_client *client)
static int aji_tls_handshake(struct aji_client *client)
{
int sock;
long ssl_opts;
ast_debug(1, "Starting TLS handshake\n");
/* Choose an SSL/TLS protocol version, create SSL_CTX */
client->ssl_method = SSLv3_method();
client->ssl_method = SSLv23_method();
if (!(client->ssl_context = SSL_CTX_new((SSL_METHOD *) client->ssl_method))) {
return IKS_NET_TLSFAIL;
}
ssl_opts = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
SSL_CTX_set_options(client->ssl_context, ssl_opts);
/* Create new SSL session */
if (!(client->ssl_session = SSL_new(client->ssl_context))) {

View File

@@ -2501,6 +2501,7 @@ static int xmpp_client_requested_tls(struct ast_xmpp_client *client, struct ast_
{
#ifdef HAVE_OPENSSL
int sock;
long ssl_opts;
#endif
if (!strcmp(iks_name(node), "success")) {
@@ -2519,11 +2520,14 @@ static int xmpp_client_requested_tls(struct ast_xmpp_client *client, struct ast_
ast_log(LOG_ERROR, "Somehow we managed to try to start TLS negotiation on client '%s' without OpenSSL support, disconnecting\n", client->name);
return -1;
#else
client->ssl_method = SSLv3_method();
client->ssl_method = SSLv23_method();
if (!(client->ssl_context = SSL_CTX_new((SSL_METHOD *) client->ssl_method))) {
goto failure;
}
ssl_opts = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
SSL_CTX_set_options(client->ssl_context, ssl_opts);
if (!(client->ssl_session = SSL_new(client->ssl_context))) {
goto failure;
}