From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Thu, 1 Nov 2012 22:04:20 +0000 (+0100)
Subject: gnutls_srtp_get_profile_by_name -> gnutls_srtp_get_profile_id
X-Git-Tag: gnutls_3_1_4~52
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=944dcceea3246cda6b37c8ec3843fc59acc9e42e;p=thirdparty%2Fgnutls.git

gnutls_srtp_get_profile_by_name -> gnutls_srtp_get_profile_id
---

diff --git a/NEWS b/NEWS
index b50a73568b..c68e4ceaf7 100644
--- a/NEWS
+++ b/NEWS
@@ -33,7 +33,7 @@ gnutls_srtp_set_profile: Added
 gnutls_srtp_set_profile_direct: Added
 gnutls_srtp_get_selected_profile: Added
 gnutls_srtp_get_profile_name: Added
-gnutls_srtp_get_profile_by_name: Added
+gnutls_srtp_get_profile_id: Added
 gnutls_srtp_profile_t: Added
 dane_cert_type_name: Added
 dane_match_type_name: Added
diff --git a/doc/cha-intro-tls.texi b/doc/cha-intro-tls.texi
index f53cc96472..d72ae2b61f 100644
--- a/doc/cha-intro-tls.texi
+++ b/doc/cha-intro-tls.texi
@@ -399,6 +399,7 @@ and they will be discussed in the subsections that follow.
 * HeartBeat::
 * Safe renegotiation::
 * OCSP status request::
+* SRTP::
 @end menu
 
 @node Maximum fragment length negotiation
@@ -592,6 +593,24 @@ ocsptool --ask --load-cert server_cert.pem --load-issuer the_issuer.pem
 Since version 3.1.3 GnuTLS clients transparently support the certificate status
 request.
 
+@node SRTP
+@subsection SRTP
+@cindex SRTP
+@cindex Secure RTP
+
+The TLS protocol was extended in @xcite{RFC5764} to provide keying material to the
+Secure RTP (SRTP) protocol. The SRTP protocol provides an encapsulation of encrypted
+data that is optimized for voice data. With the SRTP TLS extension two peers can
+negotiate keys using TLS or DTLS and obtain keying material for use with SRTP.
+
+To enable use the following functions.
+
+@showfuncB{gnutls_srtp_set_profile,gnutls_srtp_set_profile_direct}
+
+Other helper functions are listed below.
+
+@showfuncC{gnutls_srtp_get_selected_profile,gnutls_srtp_get_profile_name,gnutls_srtp_get_profile_id}
+
 @include sec-tls-app.texi
 
 @node On SSL 2 and older protocols
diff --git a/lib/ext/srtp.c b/lib/ext/srtp.c
index c7b0e8663d..f0512cefb4 100644
--- a/lib/ext/srtp.c
+++ b/lib/ext/srtp.c
@@ -105,7 +105,7 @@ static gnutls_srtp_profile_t find_profile (const char *str, const char *end)
 }
 
 /**
- * gnutls_srtp_get_profile_by_name
+ * gnutls_srtp_get_profile_id
  * @name: The name of the profile to look up
  * @profile: Will hold the profile id
  *
@@ -116,8 +116,8 @@ static gnutls_srtp_profile_t find_profile (const char *str, const char *end)
  *
  * Since 3.1.4
  **/
-int gnutls_srtp_get_profile_by_name (const char *name,
-                                     gnutls_srtp_profile_t *profile)
+int gnutls_srtp_get_profile_id (const char *name,
+                                gnutls_srtp_profile_t *profile)
 {
   *profile = find_profile (name, NULL);
   if (*profile == 0)
diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index 3a80fc9405..60726d0d1b 100644
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -990,8 +990,8 @@ gnutls_ecc_curve_t gnutls_ecc_curve_get(gnutls_session_t session);
                                         gnutls_srtp_profile_t *profile);
 
   const char *gnutls_srtp_get_profile_name (gnutls_srtp_profile_t profile);
-  int gnutls_srtp_get_profile_by_name (const char *name,
-                                       gnutls_srtp_profile_t *profile);
+  int gnutls_srtp_get_profile_id (const char *name,
+                                  gnutls_srtp_profile_t *profile);
 
   int gnutls_key_generate (gnutls_datum_t * key, unsigned int key_size);
 
diff --git a/lib/libgnutls.map b/lib/libgnutls.map
index 975a32e072..635e58a181 100644
--- a/lib/libgnutls.map
+++ b/lib/libgnutls.map
@@ -354,11 +354,6 @@ GNUTLS_1_4
     gnutls_srp_set_server_credentials_file;
     gnutls_srp_set_server_credentials_function;
     gnutls_srp_verifier;
-    gnutls_srtp_get_profile_by_name;
-    gnutls_srtp_get_profile_name;
-    gnutls_srtp_get_selected_profile;
-    gnutls_srtp_set_profile;
-    gnutls_srtp_set_profile_direct;
     gnutls_strdup;
     gnutls_strerror;
     gnutls_strerror_name;
@@ -866,6 +861,11 @@ GNUTLS_3_1_0 {
 	gnutls_certificate_update_verify_flags;
 	gnutls_certificate_verify_peers3;
 	gnutls_certificate_verification_status_print;
+	gnutls_srtp_get_profile_id;
+	gnutls_srtp_get_profile_name;
+	gnutls_srtp_get_selected_profile;
+	gnutls_srtp_set_profile;
+	gnutls_srtp_set_profile_direct;
 } GNUTLS_3_0_0;
 
 GNUTLS_PRIVATE {