diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2014-10-03 21:58:03 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2014-10-03 21:58:03 +0000 |
| commit | 24ded9d9eb60a842bff08583b34219219dd479a6 (patch) | |
| tree | c7285f1caba62449da59387abf4dd1bfbae559b6 | |
| parent | 70301b04387cb54d01732f984b671ad7de8090aa (diff) | |
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
| -rw-r--r-- | CHANGES | 6 | ||||
| -rw-r--r-- | res/res_pjsip.c | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -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 bbcf543df..69feabafb 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 |