[vlc-commits] Document size restrictions of SRTP parameters

Pierre Ynard git at videolan.org
Sat Nov 26 04:09:13 CET 2011


vlc | branch: master | Pierre Ynard <linkfanel at yahoo.fr> | Sat Nov 26 04:08:27 2011 +0100| [5b29de4706c98821e385b868ef8f178393c4ca86] | committer: Pierre Ynard

Document size restrictions of SRTP parameters

Feel free to improve/add rationale

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5b29de4706c98821e385b868ef8f178393c4ca86
---

 modules/access/rtp/rtp.c |    6 ++++--
 modules/stream_out/rtp.c |    6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/modules/access/rtp/rtp.c b/modules/access/rtp/rtp.c
index d0a8fa2..1692166 100644
--- a/modules/access/rtp/rtp.c
+++ b/modules/access/rtp/rtp.c
@@ -49,11 +49,13 @@
 #define SRTP_KEY_TEXT N_("SRTP key (hexadecimal)")
 #define SRTP_KEY_LONGTEXT N_( \
     "RTP packets will be authenticated and deciphered "\
-    "with this Secure RTP master shared secret key.")
+    "with this Secure RTP master shared secret key. "\
+    "This must be a 32-character-long hexadecimal string.")
 
 #define SRTP_SALT_TEXT N_("SRTP salt (hexadecimal)")
 #define SRTP_SALT_LONGTEXT N_( \
-    "Secure RTP requires a (non-secret) master salt value.")
+    "Secure RTP requires a (non-secret) master salt value. " \
+    "This must be a 28-character-long hexadecimal string.")
 
 #define RTP_MAX_SRC_TEXT N_("Maximum RTP sources")
 #define RTP_MAX_SRC_LONGTEXT N_( \
diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c
index 613f6c0..103bb62 100644
--- a/modules/stream_out/rtp.c
+++ b/modules/stream_out/rtp.c
@@ -144,11 +144,13 @@
 #define SRTP_KEY_TEXT N_("SRTP key (hexadecimal)")
 #define SRTP_KEY_LONGTEXT N_( \
     "RTP packets will be integrity-protected and ciphered "\
-    "with this Secure RTP master shared secret key.")
+    "with this Secure RTP master shared secret key. "\
+    "This must be a 32-character-long hexadecimal string.")
 
 #define SRTP_SALT_TEXT N_("SRTP salt (hexadecimal)")
 #define SRTP_SALT_LONGTEXT N_( \
-    "Secure RTP requires a (non-secret) master salt value.")
+    "Secure RTP requires a (non-secret) master salt value. " \
+    "This must be a 28-character-long hexadecimal string.")
 
 static const char *const ppsz_protos[] = {
     "dccp", "sctp", "tcp", "udp", "udplite",



More information about the vlc-commits mailing list