diff --git a/.version b/.version
index 044669358e61274f9d5ae5fe53410bc4d438950b..fac594a30c7e67301acb602c7d4e96524037deb2 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-18.11.1
\ No newline at end of file
+18.11.2
\ No newline at end of file
diff --git a/ChangeLog b/ChangeLog
index 0c9eff1852faf1af055e25281a69192659e78d93..f0a54332a96b6c1cee0ee326a0d7685a36005af2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,60 @@
+2022-04-14 21:00 +0000 Asterisk Development Team <asteriskteam@digium.com>
+
+ * asterisk 18.11.2 Released.
+
+2022-04-14 15:47 +0000 [1422d098e7] Asterisk Development Team <asteriskteam@digium.com>
+
+ * Update CHANGES and UPGRADE.txt for 18.11.2
+2022-02-28 11:19 +0000 [353142a2b4] Ben Ford <bford@digium.com>
+
+ * AST-2022-002 - res_stir_shaken/curl: Add ACL checks for Identity header.
+
+ Adds a new configuration option, stir_shaken_profile, in pjsip.conf that
+ can be specified on a per endpoint basis. This option will reference a
+ stir_shaken_profile that can be configured in stir_shaken.conf. The type
+ of this option must be 'profile'. The stir_shaken option can be
+ specified on this object with the same values as before (attest, verify,
+ on), but it cannot be off since having the profile itself implies wanting
+ STIR/SHAKEN support. You can also specify an ACL from acl.conf (along
+ with permit and deny lines in the object itself) that will be used to
+ limit what interfaces Asterisk will attempt to retrieve information from
+ when reading the Identity header.
+
+ ASTERISK-29476
+
+ Change-Id: I87fa61f78a9ea0cd42530691a30da3c781842406
+
+2022-01-07 08:50 +0000 [1fdb1a6edf] Ben Ford <bford@digium.com>
+
+ * AST-2022-001 - res_stir_shaken/curl: Limit file size and check start.
+
+ Put checks in place to limit how much we will actually download, as well
+ as a check for the data we receive at the start to ensure it begins with
+ what we would expect a certificate to begin with.
+
+ ASTERISK-29872
+
+ Change-Id: Ifd3c6b8bd52b8b6192a04166ccce4fc8a8000b46
+
+2022-02-10 06:02 +0000 [88522c22aa] Joshua C. Colp <jcolp@sangoma.com>
+
+ * func_odbc: Add SQL_ESC_BACKSLASHES dialplan function.
+
+ Some databases depending on their configuration using backslashes
+ for escaping. When combined with the use of ' this can result in
+ a broken func_odbc query.
+
+ This change adds a SQL_ESC_BACKSLASHES dialplan function which can
+ be used to escape the backslashes.
+
+ This is done as a dialplan function instead of being always done
+ as some databases do not require this, and always doing it would
+ result in incorrect data being put into the database.
+
+ ASTERISK-29838
+
+ Change-Id: I152bf34899b96ddb09cca3e767254d8d78f0c83d
+
2022-03-29 21:46 +0000 Asterisk Development Team <asteriskteam@digium.com>
* asterisk 18.11.1 Released.
diff --git a/asterisk-18.11.1-summary.html b/asterisk-18.11.1-summary.html
deleted file mode 100644
index e709a44a6c4c3d3333b9f2754f983e6b4fce761a..0000000000000000000000000000000000000000
--- a/asterisk-18.11.1-summary.html
+++ /dev/null
@@ -1,16 +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-18.11.1</title><h1 align="center"><a name="top">Release Summary</a></h1><h3 align="center">asterisk-18.11.1</h3><h3 align="center">Date: 2022-03-29</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-18.11.0.</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%">2 George Joseph <gjoseph@digium.com><br/></td><td width="33%"><td width="33%">1 Stefan Ruijsenaars <stefanr@wave.com><br/>1 Stefan Ruijsenaars<br/>1 George Joseph <gjoseph@digium.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: Core/BuildSystem</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29986">ASTERISK-29986</a>: build: Asterisk 18.11.0 doesn't compile when wget isn't available<br/>Reported by: Stefan Ruijsenaars<ul>
-<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=663b565647e8cf289e91cc18144ec34dc7e2c837">[663b565647]</a> George Joseph -- make_xml_documentation: Remove usage of get_sourceable_makeopts</li>
-</ul><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29988">ASTERISK-29988</a>: REGRESSION: The build process is requiring xmllint or xmlstarlet ro be installed when it shouldn't<br/>Reported by: George Joseph<ul>
-<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=99fa792482b7c5bab5c2e2ee45bf6f75ac588f93">[99fa792482]</a> George Joseph -- Makefile: Disable XML doc validation</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>b/Makefile | 9 ++++-
-b/build_tools/make_xml_documentation | 14 ---------
-build_tools/get_sourceable_makeopts | 54 -----------------------------------
-3 files changed, 7 insertions(+), 70 deletions(-)</pre><br></html>
\ No newline at end of file
diff --git a/asterisk-18.11.1-summary.txt b/asterisk-18.11.1-summary.txt
deleted file mode 100644
index d10d6357ff76cde9f2d4ce60ee0fc49055df1a30..0000000000000000000000000000000000000000
--- a/asterisk-18.11.1-summary.txt
+++ /dev/null
@@ -1,91 +0,0 @@
- Release Summary
-
- asterisk-18.11.1
-
- Date: 2022-03-29
-
- <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-18.11.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 affected by commits that went into
- this release.
-
- Coders Testers Reporters
- 2 George Joseph 1 Stefan Ruijsenaars
- 1 Stefan Ruijsenaars
- 1 George Joseph
-
- ----------------------------------------------------------------------
-
- 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: Core/BuildSystem
-
- ASTERISK-29986: build: Asterisk 18.11.0 doesn't compile when wget isn't
- available
- Reported by: Stefan Ruijsenaars
- * [663b565647] George Joseph -- make_xml_documentation: Remove usage of
- get_sourceable_makeopts
- ASTERISK-29988: REGRESSION: The build process is requiring xmllint or
- xmlstarlet ro be installed when it shouldn't
- Reported by: George Joseph
- * [99fa792482] George Joseph -- Makefile: Disable XML doc validation
-
- ----------------------------------------------------------------------
-
- 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.
-
- b/Makefile | 9 ++++-
- b/build_tools/make_xml_documentation | 14 ---------
- build_tools/get_sourceable_makeopts | 54 -----------------------------------
- 3 files changed, 7 insertions(+), 70 deletions(-)
diff --git a/asterisk-18.11.2-summary.html b/asterisk-18.11.2-summary.html
new file mode 100644
index 0000000000000000000000000000000000000000..37a47054f91b4b469a28cc0d100838009f885a49
--- /dev/null
+++ b/asterisk-18.11.2-summary.html
@@ -0,0 +1,37 @@
+<!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-18.11.2</title><h1 align="center"><a name="top">Release Summary</a></h1><h3 align="center">asterisk-18.11.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,AST-2022-004,AST-2022-003.html">AST-2022-001,AST-2022-004,AST-2022-003</a></li>
+</ul><p>The data in this summary reflects changes that have been made since the previous release, asterisk-18.11.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%">2 Ben Ford <bford@digium.com><br/>1 Joshua C. Colp <jcolp@sangoma.com><br/>1 Asterisk Development Team <asteriskteam@digium.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=88522c22aa1985667c813c11df6f53d9f78b80a1">[88522c22aa]</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=353142a2b4a8f30b860754115feae4618f48cfcb">[353142a2b4]</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=1fdb1a6edf997ed1337df20228748199f12b039b">[1fdb1a6edf]</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=1422d098e70b09193f1d85c87aabdf86bf6ac059">1422d098e7</a></td><td>Asterisk Development Team</td><td>Update CHANGES and UPGRADE.txt for 18.11.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>CHANGES | 12 +
+configs/samples/func_odbc.conf.sample | 4
+configs/samples/pjsip.conf.sample | 4
+configs/samples/stir_shaken.conf.sample | 18 ++
+funcs/func_odbc.c | 39 ++++-
+include/asterisk/res_pjsip.h | 2
+include/asterisk/res_stir_shaken.h | 54 +++++++
+res/res_pjsip/pjsip_config.xml | 7
+res/res_pjsip/pjsip_configuration.c | 1
+res/res_pjsip_stir_shaken.c | 14 +
+res/res_stir_shaken.c | 90 ++++++++++-
+res/res_stir_shaken/curl.c | 177 ++++++++++++++++++-----
+res/res_stir_shaken/curl.h | 5
+res/res_stir_shaken/profile.c | 241 ++++++++++++++++++++++++++++++++
+res/res_stir_shaken/profile.h | 39 +++++
+res/res_stir_shaken/profile_private.h | 31 ++++
+16 files changed, 685 insertions(+), 53 deletions(-)</pre><br></html>
\ No newline at end of file
diff --git a/asterisk-18.11.2-summary.txt b/asterisk-18.11.2-summary.txt
new file mode 100644
index 0000000000000000000000000000000000000000..fc7804b86670eb75880b85b59b351e6491e381ca
--- /dev/null
+++ b/asterisk-18.11.2-summary.txt
@@ -0,0 +1,129 @@
+ Release Summary
+
+ asterisk-18.11.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-004,AST-2022-003
+
+ The data in this summary reflects changes that have been made since the
+ previous release, asterisk-18.11.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
+ 2 Ben Ford 1 Benjamin Keith Ford
+ 1 Joshua C. Colp 1 Clint Ruoho
+ 1 Asterisk Development Team 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
+ * [88522c22aa] 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
+ * [353142a2b4] 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
+ * [1fdb1a6edf] 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 |
+ |------------+---------------------------+-------------------------------|
+ | 1422d098e7 | Asterisk Development Team | Update CHANGES and |
+ | | | UPGRADE.txt for 18.11.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.
+
+ CHANGES | 12 +
+ configs/samples/func_odbc.conf.sample | 4
+ configs/samples/pjsip.conf.sample | 4
+ configs/samples/stir_shaken.conf.sample | 18 ++
+ funcs/func_odbc.c | 39 ++++-
+ include/asterisk/res_pjsip.h | 2
+ include/asterisk/res_stir_shaken.h | 54 +++++++
+ res/res_pjsip/pjsip_config.xml | 7
+ res/res_pjsip/pjsip_configuration.c | 1
+ res/res_pjsip_stir_shaken.c | 14 +
+ res/res_stir_shaken.c | 90 ++++++++++-
+ res/res_stir_shaken/curl.c | 177 ++++++++++++++++++-----
+ res/res_stir_shaken/curl.h | 5
+ res/res_stir_shaken/profile.c | 241 ++++++++++++++++++++++++++++++++
+ res/res_stir_shaken/profile.h | 39 +++++
+ res/res_stir_shaken/profile_private.h | 31 ++++
+ 16 files changed, 685 insertions(+), 53 deletions(-)