From 24ded9d9eb60a842bff08583b34219219dd479a6 Mon Sep 17 00:00:00 2001
From: Richard Mudgett <rmudgett@digium.com>
Date: Fri, 3 Oct 2014 21:58:03 +0000
Subject: [PATCH] res_pjsip: Fix XML typo and update CHANGES.
ASTERISK-24199
........
Merged revisions 424528 from http://svn.asterisk.org/svn/asterisk/branches/12
........
Merged revisions 424529 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@424530 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
CHANGES | 6 ++++++
res/res_pjsip.c | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/CHANGES b/CHANGES
index 7a36f96166..3bef611608 100644
--- a/CHANGES
+++ b/CHANGES
@@ -241,6 +241,12 @@ chan_jingle
* This module was deprecated and has been removed. Users of chan_jingle
should use chan_motif.
+chan_pjsip
+------------------
+ * Added the CLI command 'pjsip list ciphers' so a user can know what
+ OpenSSL names are available on their system for the pjsip.conf cipher
+ option.
+
chan_sip
------------------
* The SIPPEER dialplan function no longer supports using a colon as a
diff --git a/res/res_pjsip.c b/res/res_pjsip.c
index bbcf543df6..69feabafb2 100644
--- a/res/res_pjsip.c
+++ b/res/res_pjsip.c
@@ -823,7 +823,7 @@
<synopsis>Preferred cryptography cipher names (TLS ONLY)</synopsis>
<description>
<para>Comma separated list of cipher names or numeric equivalents.
- Numeric quivalents can be either decimal or hexadecimal (0xX).
+ Numeric equivalents can be either decimal or hexadecimal (0xX).
</para>
<para>There are many cipher names. Use the CLI command
<literal>pjsip list ciphers</literal> to see a list of cipher
--
GitLab