]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
res_pjsip: Fix XML typo and update CHANGES.
authorRichard Mudgett <rmudgett@digium.com>
Fri, 3 Oct 2014 21:56:15 +0000 (21:56 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Fri, 3 Oct 2014 21:56:15 +0000 (21:56 +0000)
ASTERISK-24199
........

Merged revisions 424528 from http://svn.asterisk.org/svn/asterisk/branches/12

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@424529 65c4cc65-6c06-0410-ace0-fbb531ad65f3

CHANGES
res/res_pjsip.c

diff --git a/CHANGES b/CHANGES
index 15141750c169e898afc77e9e5b491f6efd93b628..7d657104eef839ad5be7589bc993920e76da76fe 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -206,6 +206,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
index bbcf543df68d8c3c26bbc6e8332f81051a0e46c9..69feabafb284823a118e8bd6e4b8e4f61200ca51 100644 (file)
                                        <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