From c67f2abb31d04c97e2a3b410cc081eff99bdcf14 Mon Sep 17 00:00:00 2001
From: Asterisk Development Team <asteriskteam@digium.com>
Date: Tue, 26 Apr 2022 11:28:46 -0500
Subject: [PATCH] Update for 16.25.3
---
.version | 2 +-
ChangeLog | 18 +++++
asterisk-16.25.2-summary.html | 47 -----------
asterisk-16.25.2-summary.txt | 143 ----------------------------------
asterisk-16.25.3-summary.html | 11 +++
asterisk-16.25.3-summary.txt | 82 +++++++++++++++++++
6 files changed, 112 insertions(+), 191 deletions(-)
delete mode 100644 asterisk-16.25.2-summary.html
delete mode 100644 asterisk-16.25.2-summary.txt
create mode 100644 asterisk-16.25.3-summary.html
create mode 100644 asterisk-16.25.3-summary.txt
diff --git a/.version b/.version
index cc9f9aba17..b6d9cb6c1e 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-16.25.2
\ No newline at end of file
+16.25.3
\ No newline at end of file
diff --git a/ChangeLog b/ChangeLog
index ee71a31642..74d7f437b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2022-04-26 16:28 +0000 Asterisk Development Team <asteriskteam@digium.com>
+
+ * asterisk 16.25.3 Released.
+
+2022-04-21 10:26 +0000 [94e895d430] Ben Ford <bford@digium.com>
+
+ * res_pjsip_stir_shaken.c: Fix enabled when not configured.
+
+ There was an issue with the conditional where STIR/SHAKEN would be
+ enabled even when not configured. It has been changed to ensure that if
+ a profile does not exist and stir_shaken is not set in pjsip.conf, then
+ the conditional will return from the function without performing
+ STIR/SHAKEN operations.
+
+ ASTERISK-30024
+
+ Change-Id: I41286a3d35b033ccbfbe4129427a62cb793a86e6
+
2022-04-14 21:50 +0000 Asterisk Development Team <asteriskteam@digium.com>
* asterisk 16.25.2 Released.
diff --git a/asterisk-16.25.2-summary.html b/asterisk-16.25.2-summary.html
deleted file mode 100644
index 65df223730..0000000000
--- a/asterisk-16.25.2-summary.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!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"><title>Release Summary - asterisk-16.25.2</title><h1 align="center"><a name="top">Release Summary</a></h1><h3 align="center">asterisk-16.25.2</h3><h3 align="center">Date: 2022-04-14</h3><h3 align="center"><asteriskteam@digium.com></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="#closed_issues">Closed Issues</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><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:</p><ul>
-<li><a href="http://downloads.asterisk.org/pub/security/AST-2022-001.html">AST-2022-001</a></li>
-<li><a href="http://downloads.asterisk.org/pub/security/AST-2022-002.html">AST-2022-002</a></li>
-<li><a href="http://downloads.asterisk.org/pub/security/AST-2022-003.html">AST-2022-003</a></li>
-</ul><p>The data in this summary reflects changes that have been made since the previous release, asterisk-16.25.1.</p><hr><a name="contributors"><h2 align="center">Contributors</h2></a><center><a href="#top">[Back to Top]</a></center><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 affected by commits that went into this release.</p><table width="100%" border="0">
-<tr><th width="33%">Coders</th><th width="33%">Testers</th><th width="33%">Reporters</th></tr>
-<tr valign="top"><td width="33%">4 Asterisk Development Team <asteriskteam@digium.com><br/>2 Ben Ford <bford@digium.com><br/>1 Joshua C. Colp <jcolp@sangoma.com><br/></td><td width="33%"><td width="33%">1 Benjamin Keith Ford <bford@digium.com><br/>1 Clint Ruoho <clint@ruoho.org><br/>1 Leandro Dardini <ldardini@gmail.com><br/></td></tr>
-</table><hr><a name="closed_issues"><h2 align="center">Closed Issues</h2></a><center><a href="#top">[Back to Top]</a></center><p>This is a list of all issues from the issue tracker that were closed by changes that went into this release.</p><h3>Security</h3><h4>Category: Functions/func_odbc</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29838">ASTERISK-29838</a>: ${SQL_ESC()} not correctly escaping a terminating \<br/>Reported by: Leandro Dardini<ul>
-<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=f52228199dea4d652e8bcafc80f6c3b33a1762fb">[f52228199d]</a> Joshua C. Colp -- func_odbc: Add SQL_ESC_BACKSLASHES dialplan function.</li>
-</ul><br><h4>Category: Resources/res_stir_shaken</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29476">ASTERISK-29476</a>: res_stir_shaken: Blind SSRF vulnerabilities<br/>Reported by: Clint Ruoho<ul>
-<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=82f3ec631563441975066f51393318627ed785f4">[82f3ec6315]</a> Ben Ford -- AST-2022-002 - res_stir_shaken/curl: Add ACL checks for Identity header.</li>
-</ul><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29872">ASTERISK-29872</a>: res_stir_shaken: Resource exhaustion with large files<br/>Reported by: Benjamin Keith Ford<ul>
-<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=bf6234e5dfd3efcacfc791173416f0b0e0bc8400">[bf6234e5df]</a> Ben Ford -- AST-2022-001 - res_stir_shaken/curl: Limit file size and check start.</li>
-</ul><br><hr><a name="commits"><h2 align="center">Commits Not Associated with an Issue</h2></a><center><a href="#top">[Back to Top]</a></center><p>This is a list of all changes that went into this release that did not reference a JIRA issue.</p><table width="100%" border="1">
-<tr><th>Revision</th><th>Author</th><th>Summary</th></tr>
-<tr><td><a href="https://code.asterisk.org/code/changelog/asterisk?cs=4bd01a473f07d881888fb7d0dc16a7d266e189e8">4bd01a473f</a></td><td>Asterisk Development Team</td><td>Doing a fresh summary</td></tr>
-<tr><td><a href="https://code.asterisk.org/code/changelog/asterisk?cs=be4fd38585b851e4f7ba67712d6cdf20b628bf47">be4fd38585</a></td><td>Asterisk Development Team</td><td>Update for 16.25.2</td></tr>
-<tr><td><a href="https://code.asterisk.org/code/changelog/asterisk?cs=cdb5f570c3e945b1ae2863dc1cdb6e58c3f76068">cdb5f570c3</a></td><td>Asterisk Development Team</td><td>Update CHANGES and UPGRADE.txt for 16.25.2</td></tr>
-<tr><td><a href="https://code.asterisk.org/code/changelog/asterisk?cs=8774302f380626d85039cd71935b4eafef736eb2">8774302f38</a></td><td>Asterisk Development Team</td><td>Update CHANGES and UPGRADE.txt for 16.25.2</td></tr>
-</table><hr><a name="diffstat"><h2 align="center">Diffstat Results</h2></a><center><a href="#top">[Back to Top]</a></center><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>asterisk-16.25.1-summary.html | 16 -
-asterisk-16.25.1-summary.txt | 91 -----------
-b/.version | 2
-b/CHANGES | 12 +
-b/ChangeLog | 61 +++++++
-b/configs/samples/func_odbc.conf.sample | 4
-b/configs/samples/pjsip.conf.sample | 4
-b/configs/samples/stir_shaken.conf.sample | 18 ++
-b/funcs/func_odbc.c | 39 ++++
-b/include/asterisk/res_pjsip.h | 2
-b/include/asterisk/res_stir_shaken.h | 54 ++++++
-b/res/res_pjsip/pjsip_config.xml | 7
-b/res/res_pjsip/pjsip_configuration.c | 1
-b/res/res_pjsip_stir_shaken.c | 14 +
-b/res/res_stir_shaken.c | 90 +++++++++--
-b/res/res_stir_shaken/curl.c | 177 +++++++++++++++++-----
-b/res/res_stir_shaken/curl.h | 5
-b/res/res_stir_shaken/profile.c | 241 ++++++++++++++++++++++++++++++
-b/res/res_stir_shaken/profile.h | 39 ++++
-b/res/res_stir_shaken/profile_private.h | 40 ++++
-b/res/res_stir_shaken/stir_shaken.c | 14 -
-21 files changed, 761 insertions(+), 170 deletions(-)</pre><br></html>
\ No newline at end of file
diff --git a/asterisk-16.25.2-summary.txt b/asterisk-16.25.2-summary.txt
deleted file mode 100644
index 01e2096a36..0000000000
--- a/asterisk-16.25.2-summary.txt
+++ /dev/null
@@ -1,143 +0,0 @@
- Release Summary
-
- asterisk-16.25.2
-
- Date: 2022-04-14
-
- <asteriskteam@digium.com>
-
- ----------------------------------------------------------------------
-
- Table of Contents
-
- 1. Summary
- 2. Contributors
- 3. Closed Issues
- 4. Other Changes
- 5. 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-2022-001
- * AST-2022-002
- * AST-2022-003
-
- The data in this summary reflects changes that have been made since the
- previous release, asterisk-16.25.1.
-
- ----------------------------------------------------------------------
-
- 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 affected by commits that went into
- this release.
-
- Coders Testers Reporters
- 4 Asterisk Development Team 1 Benjamin Keith Ford
- 2 Ben Ford 1 Clint Ruoho
- 1 Joshua C. Colp 1 Leandro Dardini
-
- ----------------------------------------------------------------------
-
- Closed Issues
-
- [Back to Top]
-
- This is a list of all issues from the issue tracker that were closed by
- changes that went into this release.
-
- Security
-
- Category: Functions/func_odbc
-
- ASTERISK-29838: ${SQL_ESC()} not correctly escaping a terminating \
- Reported by: Leandro Dardini
- * [f52228199d] Joshua C. Colp -- func_odbc: Add SQL_ESC_BACKSLASHES
- dialplan function.
-
- Category: Resources/res_stir_shaken
-
- ASTERISK-29476: res_stir_shaken: Blind SSRF vulnerabilities
- Reported by: Clint Ruoho
- * [82f3ec6315] Ben Ford -- AST-2022-002 - res_stir_shaken/curl: Add ACL
- checks for Identity header.
- ASTERISK-29872: res_stir_shaken: Resource exhaustion with large files
- Reported by: Benjamin Keith Ford
- * [bf6234e5df] Ben Ford -- AST-2022-001 - res_stir_shaken/curl: Limit
- file size and check start.
-
- ----------------------------------------------------------------------
-
- Commits Not Associated with an Issue
-
- [Back to Top]
-
- This is a list of all changes that went into this release that did not
- reference a JIRA issue.
-
- +------------------------------------------------------------------------+
- | Revision | Author | Summary |
- |------------+---------------------------+-------------------------------|
- | 4bd01a473f | Asterisk Development Team | Doing a fresh summary |
- |------------+---------------------------+-------------------------------|
- | be4fd38585 | Asterisk Development Team | Update for 16.25.2 |
- |------------+---------------------------+-------------------------------|
- | cdb5f570c3 | Asterisk Development Team | Update CHANGES and |
- | | | UPGRADE.txt for 16.25.2 |
- |------------+---------------------------+-------------------------------|
- | 8774302f38 | Asterisk Development Team | Update CHANGES and |
- | | | UPGRADE.txt for 16.25.2 |
- +------------------------------------------------------------------------+
-
- ----------------------------------------------------------------------
-
- 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.
-
- asterisk-16.25.1-summary.html | 16 -
- asterisk-16.25.1-summary.txt | 91 -----------
- b/.version | 2
- b/CHANGES | 12 +
- b/ChangeLog | 61 +++++++
- b/configs/samples/func_odbc.conf.sample | 4
- b/configs/samples/pjsip.conf.sample | 4
- b/configs/samples/stir_shaken.conf.sample | 18 ++
- b/funcs/func_odbc.c | 39 ++++
- b/include/asterisk/res_pjsip.h | 2
- b/include/asterisk/res_stir_shaken.h | 54 ++++++
- b/res/res_pjsip/pjsip_config.xml | 7
- b/res/res_pjsip/pjsip_configuration.c | 1
- b/res/res_pjsip_stir_shaken.c | 14 +
- b/res/res_stir_shaken.c | 90 +++++++++--
- b/res/res_stir_shaken/curl.c | 177 +++++++++++++++++-----
- b/res/res_stir_shaken/curl.h | 5
- b/res/res_stir_shaken/profile.c | 241 ++++++++++++++++++++++++++++++
- b/res/res_stir_shaken/profile.h | 39 ++++
- b/res/res_stir_shaken/profile_private.h | 40 ++++
- b/res/res_stir_shaken/stir_shaken.c | 14 -
- 21 files changed, 761 insertions(+), 170 deletions(-)
diff --git a/asterisk-16.25.3-summary.html b/asterisk-16.25.3-summary.html
new file mode 100644
index 0000000000..17679de59a
--- /dev/null
+++ b/asterisk-16.25.3-summary.html
@@ -0,0 +1,11 @@
+<!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"><title>Release Summary - asterisk-16.25.3</title><h1 align="center"><a name="top">Release Summary</a></h1><h3 align="center">asterisk-16.25.3</h3><h3 align="center">Date: 2022-04-26</h3><h3 align="center"><asteriskteam@digium.com></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="#closed_issues">Closed Issues</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><p>This release is a point release of an existing major version. The changes included were made to address problems that have been identified in this release series, or are minor, backwards compatible new features or improvements. Users should be able to safely upgrade to this version if this release series is already in use. Users considering upgrading from a previous version are strongly encouraged to review the UPGRADE.txt document as well as the CHANGES document for information about upgrading to this release series.</p><p>The data in this summary reflects changes that have been made since the previous release, asterisk-16.25.2.</p><hr><a name="contributors"><h2 align="center">Contributors</h2></a><center><a href="#top">[Back to Top]</a></center><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 affected by commits that went into this release.</p><table width="100%" border="0">
+<tr><th width="33%">Coders</th><th width="33%">Testers</th><th width="33%">Reporters</th></tr>
+<tr valign="top"><td width="33%">1 Ben Ford <bford@digium.com><br/></td><td width="33%"><td width="33%">1 Claude Diderich <claude.diderich@yahoo.com><br/></td></tr>
+</table><hr><a name="closed_issues"><h2 align="center">Closed Issues</h2></a><center><a href="#top">[Back to Top]</a></center><p>This is a list of all issues from the issue tracker that were closed by changes that went into this release.</p><h3>Bug</h3><h4>Category: Resources/res_stir_shaken</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-30024">ASTERISK-30024</a>: Failed to sign STIR/SHAKEN payload with functionality not enabled<br/>Reported by: Claude Diderich<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=94e895d4307b9ef9367e33a0827fd83133a0b33a">[94e895d430]</a> Ben Ford -- res_pjsip_stir_shaken.c: Fix enabled when not configured.</li>
+</ul><br><hr><a name="diffstat"><h2 align="center">Diffstat Results</h2></a><center><a href="#top">[Back to Top]</a></center><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>0 files changed</pre><br></html>
\ No newline at end of file
diff --git a/asterisk-16.25.3-summary.txt b/asterisk-16.25.3-summary.txt
new file mode 100644
index 0000000000..b062ca1227
--- /dev/null
+++ b/asterisk-16.25.3-summary.txt
@@ -0,0 +1,82 @@
+ Release Summary
+
+ asterisk-16.25.3
+
+ Date: 2022-04-26
+
+ <asteriskteam@digium.com>
+
+ ----------------------------------------------------------------------
+
+ Table of Contents
+
+ 1. Summary
+ 2. Contributors
+ 3. Closed Issues
+ 4. Diffstat
+
+ ----------------------------------------------------------------------
+
+ Summary
+
+ [Back to Top]
+
+ This release is a point release of an existing major version. The changes
+ included were made to address problems that have been identified in this
+ release series, or are minor, backwards compatible new features or
+ improvements. Users should be able to safely upgrade to this version if
+ this release series is already in use. Users considering upgrading from a
+ previous version are strongly encouraged to review the UPGRADE.txt
+ document as well as the CHANGES document for information about upgrading
+ to this release series.
+
+ The data in this summary reflects changes that have been made since the
+ previous release, asterisk-16.25.2.
+
+ ----------------------------------------------------------------------
+
+ 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 affected by commits that went into
+ this release.
+
+ Coders Testers Reporters
+ 1 Ben Ford 1 Claude Diderich
+
+ ----------------------------------------------------------------------
+
+ Closed Issues
+
+ [Back to Top]
+
+ This is a list of all issues from the issue tracker that were closed by
+ changes that went into this release.
+
+ Bug
+
+ Category: Resources/res_stir_shaken
+
+ ASTERISK-30024: Failed to sign STIR/SHAKEN payload with functionality not
+ enabled
+ Reported by: Claude Diderich
+ * [94e895d430] Ben Ford -- res_pjsip_stir_shaken.c: Fix enabled when not
+ configured.
+
+ ----------------------------------------------------------------------
+
+ 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.
+
+ 0 files changed
--
GitLab