Revert "Documented use gnutls_priority_set2()."

This reverts commit b4aed16.
gnutls · Jul 25, 2017 · ae6b9b2 · ae6b9b2
1 parent 3c2e13a
commit ae6b9b2
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 14 deletions.
diff --git a/NEWS b/NEWS
@@ -97,7 +97,6 @@ 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
@@ -464,7 +464,7 @@ and the underlying protocol type, i.e., datagram (UDP) or reliable (TCP).
 
 After the session initialization details on the allowed ciphersuites
 and protocol versions should be set using the priority functions
-such as @funcref{gnutls_priority_set2} and @funcref{gnutls_priority_set_direct}.
+such as @funcref{gnutls_priority_set} and @funcref{gnutls_priority_set_direct}.
 We elaborate on them in @ref{Priority Strings}.
 The credentials used for the key exchange method, such as certificates 
 or usernames and passwords should also be associated with the session
@@ -1088,7 +1088,7 @@ and share the generated data across sessions. The following functions
 allow the generation of a "priority cache" and the sharing of it across
 sessions.
 
-@showfuncC{gnutls_priority_init,gnutls_priority_set2,gnutls_priority_deinit}
+@showfuncC{gnutls_priority_init,gnutls_priority_set,gnutls_priority_deinit}
 
 @subheading Using Priority Strings
 
@@ -1099,7 +1099,6 @@ 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).
 
-
 @float Table,tab:prio-keywords
 @multitable @columnfractions .20 .70
 @headitem Keyword @tab Description

diff --git 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_set2}.  To allow the best
+application via @funcref{gnutls_priority_set}.  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
@@ -199,8 +199,4 @@ 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
@@ -174,7 +174,7 @@ int main(void)
                         continue;
 
                 gnutls_init(&session, GNUTLS_SERVER | GNUTLS_DATAGRAM);
-                gnutls_priority_set2(session, priority_cache, 0);
+                gnutls_priority_set(session, priority_cache);
                 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
@@ -109,7 +109,7 @@ int main(void)
         client_len = sizeof(sa_cli);
         for (;;) {
                 gnutls_init(&session, GNUTLS_SERVER);
-                gnutls_priority_set2(session, priority_cache, 0);
+                gnutls_priority_set(session, priority_cache);
                 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
@@ -109,7 +109,7 @@ int main(void)
         client_len = sizeof(sa_cli);
         for (;;) {
                 CHECK(gnutls_init(&session, GNUTLS_SERVER));
-                CHECK(gnutls_priority_set2(session, priority_cache, 0));
+                CHECK(gnutls_priority_set(session, priority_cache));
                 CHECK(gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE,
                                              x509_cred));
 

diff --git a/lib/priority.c b/lib/priority.c
@@ -561,8 +561,6 @@ 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)