Documented use gnutls_priority_set2().

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>

8 files changed, 12 insertions, 5 deletions

diff --git a/NEWS b/NEWS
index 33b733da21..2dd5150b2b 100644
--- a/NEWS
+++ b/NEWS
@@ -90,6 +90,7 @@ gnutls_pubkey_export_ecc_raw2: Added
 gnutls_privkey_export_rsa_raw2: Added
 gnutls_privkey_export_dsa_raw2: Added
 gnutls_privkey_export_ecc_raw2: Added
+gnutls_priority_set2: Added
 GNUTLS_EXPORT_FLAG_NO_LZ: Added
 GNUTLS_DT_IP_ADDRESS: Added
 GNUTLS_X509_CRT_FLAG_IGNORE_SANITY: Added
diff --git a/doc/cha-gtls-app.texi b/doc/cha-gtls-app.texi
index 37df31a5db..bc06c5e2b0 100644
--- a/doc/cha-gtls-app.texi
+++ b/doc/cha-gtls-app.texi
@@ -1075,7 +1075,7 @@ specific algorithm details, as the priority strings are not constant between
 gnutls versions (they are periodically updated to account for cryptographic
 advances while providing compatibility with old clients and servers).
 
-@showfuncB{gnutls_priority_set_direct,gnutls_priority_set}
+@showfuncB{gnutls_priority_set_direct,gnutls_priority_set2}
 
 @float Table,tab:prio-keywords
 @multitable @columnfractions .20 .70
diff --git a/doc/cha-intro-tls.texi b/doc/cha-intro-tls.texi
index 3f1ea66126..a8dc95c8af 100644
--- a/doc/cha-intro-tls.texi
+++ b/doc/cha-intro-tls.texi
@@ -273,7 +273,7 @@ solves the problem by using minimal padding.
 If you implement an application that has a configuration file, we
 recommend that you make it possible for users or administrators to
 specify a GnuTLS protocol priority string, which is used by your
-application via @funcref{gnutls_priority_set}.  To allow the best
+application via @funcref{gnutls_priority_set2}.  To allow the best
 flexibility, make it possible to have a different priority string for
 different incoming IP addresses.
 
diff --git a/doc/cha-upgrade.texi b/doc/cha-upgrade.texi
index 0401719ec9..f32acfadc7 100644
--- a/doc/cha-upgrade.texi
+++ b/doc/cha-upgrade.texi
@@ -199,4 +199,8 @@ however, there are minor differences, listed below.
 @funcintref{gnutls_compression_get_name}, @funcintref{gnutls_compression_list},
 and @funcintref{gnutls_compression_get_id}.
 
+@item The @funcref{gnutls_priority_set} has been superseded by @funcref{gnutls_priority_set2}.
+@tab The function @funcref{gnutls_priority_set2} allows for sharing priority
+caches across multiple sessions reducing allocated memory per session.
+
 @end multitable
diff --git a/doc/examples/ex-serv-dtls.c b/doc/examples/ex-serv-dtls.c
index 887b4b83df..0166493b3d 100644
--- a/doc/examples/ex-serv-dtls.c
+++ b/doc/examples/ex-serv-dtls.c
@@ -174,7 +174,7 @@ int main(void)
                         continue;
 
                 gnutls_init(&session, GNUTLS_SERVER | GNUTLS_DATAGRAM);
-                gnutls_priority_set(session, priority_cache);
+                gnutls_priority_set2(session, priority_cache, 0);
                 gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE,
                                        x509_cred);
 
diff --git a/doc/examples/ex-serv-psk.c b/doc/examples/ex-serv-psk.c
index 26aad02f47..6463fddca8 100644
--- a/doc/examples/ex-serv-psk.c
+++ b/doc/examples/ex-serv-psk.c
@@ -109,7 +109,7 @@ int main(void)
         client_len = sizeof(sa_cli);
         for (;;) {
                 gnutls_init(&session, GNUTLS_SERVER);
-                gnutls_priority_set(session, priority_cache);
+                gnutls_priority_set2(session, priority_cache, 0);
                 gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE,
                                        x509_cred);
                 gnutls_credentials_set(session, GNUTLS_CRD_PSK, psk_cred);
diff --git a/doc/examples/ex-serv-x509.c b/doc/examples/ex-serv-x509.c
index 4bf1940b89..65f94a3b94 100644
--- a/doc/examples/ex-serv-x509.c
+++ b/doc/examples/ex-serv-x509.c
@@ -107,7 +107,7 @@ int main(void)
         client_len = sizeof(sa_cli);
         for (;;) {
                 CHECK(gnutls_init(&session, GNUTLS_SERVER));
-                CHECK(gnutls_priority_set(session, priority_cache));
+                CHECK(gnutls_priority_set2(session, priority_cache, 0));
                 CHECK(gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE,
                                              x509_cred));
 
diff --git a/lib/priority.c b/lib/priority.c
index 8fca2f194c..670775de7e 100644
--- a/lib/priority.c
+++ b/lib/priority.c
@@ -557,6 +557,8 @@ gnutls_priority_set(gnutls_session_t session, gnutls_priority_t priority)
  * must remain valid for the lifetime of the session.
  *
  * Returns: %GNUTLS_E_SUCCESS on success, or an error code.
+ *
+ * Since: 3.6.0
  **/
 int
 gnutls_priority_set2(gnutls_session_t session, gnutls_priority_t priority, unsigned int flags)