[SCM] GNU gnutls branch, gnutls_2_12_x, updated. gnutls_2_11_6-118-gee74170

[Simon Josefsson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=ee74170e17016996101668dab5aab84071a6a63a

The branch, gnutls_2_12_x has been updated
       via  ee74170e17016996101668dab5aab84071a6a63a (commit)
       via  9b7a34cab6583ab870790896991027f89680da05 (commit)
       via  29d58b56398673365306cdf1e11d09ff5d0c05a2 (commit)
       via  6215ce424026b5649026d4b678755849b0936f75 (commit)
       via  9033cb5e40eac443aa167598f1772751e1a2c568 (commit)
      from  888c05d028dc2160252aa8de5e19db19022597cb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ee74170e17016996101668dab5aab84071a6a63a
Author: Simon Josefsson <address@hidden>
Date:   Sun Feb 20 19:42:58 2011 +0100

    Improve text.

commit 9b7a34cab6583ab870790896991027f89680da05
Author: Simon Josefsson <address@hidden>
Date:   Sun Feb 20 19:42:32 2011 +0100

    Fix typo.

commit 29d58b56398673365306cdf1e11d09ff5d0c05a2
Author: Simon Josefsson <address@hidden>
Date:   Sun Feb 20 19:42:14 2011 +0100

    Fix docstrinf of new function.

commit 6215ce424026b5649026d4b678755849b0936f75
Author: Simon Josefsson <address@hidden>
Date:   Sun Feb 20 19:40:30 2011 +0100

    Fix docstring of deprecated function.

commit 9033cb5e40eac443aa167598f1772751e1a2c568
Author: Simon Josefsson <address@hidden>
Date:   Sun Feb 20 19:39:59 2011 +0100

    Make it build.

-----------------------------------------------------------------------

Summary of changes:
 doc/reference/gnutls-docs.sgml |    6 +++---
 lib/gnutls_pubkey.c            |    2 ++
 lib/gnutls_sig.c               |    2 +-
 lib/openpgp/privkey.c          |    6 ++++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/doc/reference/gnutls-docs.sgml b/doc/reference/gnutls-docs.sgml
index beefae5..03d3aa3 100644
--- a/doc/reference/gnutls-docs.sgml
+++ b/doc/reference/gnutls-docs.sgml
@@ -10,8 +10,8 @@
     <title>GnuTLS API Reference Manual</title>
 
     <para>
-      GnuTLS implements the TLS (Transport Layer Security) and SSL
-      (Secure Sockets Layer) protocols for the GNU project.
+      GnuTLS implements the Transport Layer Security (TLS) and Secure
+      Sockets Layer (SSL) protocols for the GNU project.
     </para>
 
     <para>
@@ -48,7 +48,7 @@
   <index role="2.10.0" id="api-index-2-10-0">
     <title>Index of new symbols in 2.10.0</title>
   </index>
-  <index role="2.10.0" id="api-index-2-12-0">
+  <index role="2.12.0" id="api-index-2-12-0">
     <title>Index of new symbols in 2.12.0</title>
   </index>
 </book>
diff --git a/lib/gnutls_pubkey.c b/lib/gnutls_pubkey.c
index d691559..17b644c 100644
--- a/lib/gnutls_pubkey.c
+++ b/lib/gnutls_pubkey.c
@@ -214,6 +214,8 @@ gnutls_pubkey_import_x509 (gnutls_pubkey_t key, 
gnutls_x509_crt_t crt,
  *
  * Returns: On success, %GNUTLS_E_SUCCESS is returned, otherwise a
  *   negative error value.
+ *
+ * Since: 2.12.0
  **/
 int
 gnutls_pubkey_import_privkey (gnutls_pubkey_t key, gnutls_privkey_t pkey,
diff --git a/lib/gnutls_sig.c b/lib/gnutls_sig.c
index 5b07e47..2c195b9 100644
--- a/lib/gnutls_sig.c
+++ b/lib/gnutls_sig.c
@@ -271,7 +271,7 @@ sign_tls_hash (gnutls_session_t session, 
gnutls_digest_algorithm_t hash_algo,
    if (!_gnutls_version_has_selectable_sighash (ver))
     return _gnutls_privkey_sign_hash (pkey, hash_concat, signature);
   else
-    return gnutls_privkey_sign_hash2 (pkey, hash_algo, 0, hash_concat, 
signature);
+    return gnutls_privkey_sign_hash (pkey, hash_algo, 0, hash_concat, 
signature);
 }
 
 static int
diff --git a/lib/openpgp/privkey.c b/lib/openpgp/privkey.c
index 2ebcb99..be56305 100644
--- a/lib/openpgp/privkey.c
+++ b/lib/openpgp/privkey.c
@@ -1225,7 +1225,7 @@ gnutls_openpgp_privkey_set_preferred_key_id 
(gnutls_openpgp_privkey_t key,
   return 0;
 }
 
-/*-
+/**
  * gnutls_openpgp_privkey_sign_hash:
  * @key: Holds the key
  * @hash: holds the data to be signed
@@ -1237,7 +1237,9 @@ gnutls_openpgp_privkey_set_preferred_key_id 
(gnutls_openpgp_privkey_t key,
  *
  * Returns: On success, %GNUTLS_E_SUCCESS is returned, otherwise a
  *   negative error value.
- -*/
+ *
+ * Deprecated: Use gnutls_privkey_sign_hash() instead.
+ */
 int
 gnutls_openpgp_privkey_sign_hash (gnutls_openpgp_privkey_t key,
                                    const gnutls_datum_t * hash,


hooks/post-receive
-- 
GNU gnutls