[SCM] GNU gnutls branch, gnutls_2_12_x, updated. gnutls_2_11_6-111-g8921bad

[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=8921bad3b00a43c520637463b0bae1f8ae03b09b

The branch, gnutls_2_12_x has been updated
       via  8921bad3b00a43c520637463b0bae1f8ae03b09b (commit)
       via  0d1c720e2d0fb1fa66fbc7b6fa1da4da5cae0867 (commit)
      from  4b8db2d896f96d4ba4faf015cd357835eef8696f (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 8921bad3b00a43c520637463b0bae1f8ae03b09b
Author: Simon Josefsson <address@hidden>
Date:   Sun Feb 20 19:30:02 2011 +0100

    Rename gnutls_privkey_sign_data2 to gnutls_privkey_sign_data and 
gnutls_privkey_sign_hash2 to gnutls_privkey_sign_hash.
    
    These were added during the 2.11 cycle where we don't promise ABI
    compatibility.

commit 0d1c720e2d0fb1fa66fbc7b6fa1da4da5cae0867
Author: Simon Josefsson <address@hidden>
Date:   Sun Feb 20 19:07:51 2011 +0100

    Fix docstring of deprecated functions.

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

Summary of changes:
 NEWS                           |   20 ++++++++++----------
 lib/gnutls_cert.c              |   12 ++++++------
 lib/gnutls_extensions.c        |    6 +++---
 lib/gnutls_privkey.c           |   18 +++++++++++-------
 lib/includes/gnutls/abstract.h |   13 ++++++-------
 lib/includes/gnutls/compat.h   |    4 ++--
 lib/libgnutls.map              |    6 +++---
 lib/x509/crq.c                 |    2 +-
 lib/x509/privkey.c             |   14 ++++++++------
 lib/x509/sign.c                |    2 +-
 tests/x509sign-verify.c        |   12 +++++-------
 11 files changed, 56 insertions(+), 53 deletions(-)

diff --git a/NEWS b/NEWS
index f60bb71..77e60b3 100644
--- a/NEWS
+++ b/NEWS
@@ -18,8 +18,8 @@ They have to be explicitly set.
 ** libgnutls: During handshake message verification using DSS
 use the hash algorithm required by it.
 
-** libgnutls: The deprecated  gnutls_x509_privkey_sign_hash() was
-replaced by gnutls_privkey_sign_hash2().
+** libgnutls: gnutls_x509_privkey_sign_hash() is deprecated.
+Use gnutls_privkey_sign_hash() instead.
 
 ** libgnutls: gnutls_pubkey_verify_data, gnutls_pubkey_verify_hash,
 gnutls_x509_privkey_verify_data, gnutls_x509_crt_verify_data, 
@@ -30,14 +30,14 @@ checking.
 ** libgnutls: Added helper functions for signature verification:
 gnutls_pubkey_verify_data() and gnutls_pubkey_import_privkey().
 
-** libgnutls: Added gnutls_privkey_sign_hash2().
+** libgnutls: Modified gnutls_privkey_sign_data().
 
 ** gnutls_x509_crl_privkey_sign2(), gnutls_x509_crq_sign2()
-gnutls_x509_privkey_sign_hash(), gnutls_x509_privkey_sign_data(), 
-gnutls_x509_crt_verify_hash(), gnutls_x509_crt_verify_data(), 
-were deprecated for gnutls_x509_crl_privkey_sign(), 
-gnutls_x509_crq_privkey_sign(), gnutls_privkey_sign_hash2(),
-gnutls_privkey_sign_data2(), gnutls_pubkey_verify_hash()
+gnutls_x509_privkey_sign_hash(), gnutls_x509_privkey_sign_data(),
+gnutls_x509_crt_verify_hash(), gnutls_x509_crt_verify_data(), were
+deprecated for gnutls_x509_crl_privkey_sign(),
+gnutls_x509_crq_privkey_sign(), gnutls_privkey_sign_hash(),
+gnutls_privkey_sign_data(), gnutls_pubkey_verify_hash()
 gnutls_pubkey_verify_data() respectively.
 
 ** libgnutls: gnutls_*_export_raw() functions now add leading zero in
@@ -50,8 +50,8 @@ Reported by "Brendan Doherty" <address@hidden>.
 gnutls_x509_crl_get_raw_issuer_dn: ADDED
 gnutls_pubkey_import_privkey: ADDED
 gnutls_pubkey_verify_data: ADDED
-gnutls_privkey_sign_hash2: ADDED
-gnutls_privkey_sign_data2: ADDED (in place of gnutls_privkey_sign_data)
+gnutls_privkey_sign_hash: MODIFIED (was added in 2.11.0)
+gnutls_privkey_sign_data: MODIFIED (was added in 2.11.0)
 gnutls_x509_crq_sign2: DEPRECATED (use: gnutls_x509_crq_privkey_sign)
 gnutls_x509_crq_sign: DEPRECATED (use: gnutls_x509_crq_privkey_sign)
 gnutls_x509_crq_get_preferred_hash_algorithm: DEPRECATED
diff --git a/lib/gnutls_cert.c b/lib/gnutls_cert.c
index ab6831f..68641b1 100644
--- a/lib/gnutls_cert.c
+++ b/lib/gnutls_cert.c
@@ -984,7 +984,7 @@ _gnutls_gcert_deinit (gnutls_cert * cert)
   _gnutls_free_datum (&cert->raw);
 }
 
-/*-
+/**
  * gnutls_sign_callback_set:
  * @session: is a gnutls session
  * @sign_func: function pointer to application's sign callback.
@@ -1003,8 +1003,8 @@ _gnutls_gcert_deinit (gnutls_cert * cert)
  * can be used to store application-specific data needed in the
  * callback function.  See also gnutls_sign_callback_get().
  *
- * Deprecated in: 2.11.0
- -*/
+ * Deprecated in: 2.12.0
+ */
 void
 gnutls_sign_callback_set (gnutls_session_t session,
                           gnutls_sign_func sign_func, void *userdata)
@@ -1013,7 +1013,7 @@ gnutls_sign_callback_set (gnutls_session_t session,
   session->internals.sign_func_userdata = userdata;
 }
 
-/*-
+/**
  * gnutls_sign_callback_get:
  * @session: is a gnutls session
  * @userdata: if non-%NULL, will be set to abstract callback pointer.
@@ -1023,8 +1023,8 @@ gnutls_sign_callback_set (gnutls_session_t session,
  * Returns: The function pointer set by gnutls_sign_callback_set(), or
  *   if not set, %NULL.
  *
- * Deprecated in: 2.11.0
- -*/
+ * Deprecated in: 2.12.0
+ */
 gnutls_sign_func
 gnutls_sign_callback_get (gnutls_session_t session, void **userdata)
 {
diff --git a/lib/gnutls_extensions.c b/lib/gnutls_extensions.c
index bf474ec..54c5b4f 100644
--- a/lib/gnutls_extensions.c
+++ b/lib/gnutls_extensions.c
@@ -396,7 +396,7 @@ _gnutls_ext_register (extension_entry_st * mod)
   return GNUTLS_E_SUCCESS;
 }
 
-/*-
+/**
  * gnutls_ext_register:
  * @type: the 16-bit integer referring to the extension type
  * @name: human printable name of the extension used for debugging
@@ -408,8 +408,8 @@ _gnutls_ext_register (extension_entry_st * mod)
  *
  * Returns: %GNUTLS_E_SUCCESS on success, or an error code.
  *
- * Deprecated in: 2.11.0
- -*/
+ * Deprecated in: 2.12.0
+ */
 int
 gnutls_ext_register (int type,
                      const char *name,
diff --git a/lib/gnutls_privkey.c b/lib/gnutls_privkey.c
index 6b930d7..c52be50 100644
--- a/lib/gnutls_privkey.c
+++ b/lib/gnutls_privkey.c
@@ -418,9 +418,11 @@ int ret;
  *
  * Returns: On success, %GNUTLS_E_SUCCESS is returned, otherwise a
  * negative error value.
+ *
+ * Since: 2.12.0
  **/
 int
-gnutls_privkey_sign_data2 (gnutls_privkey_t signer,
+gnutls_privkey_sign_data (gnutls_privkey_t signer,
                           gnutls_digest_algorithm_t hash,
                           unsigned int flags,
                           const gnutls_datum_t * data,
@@ -460,7 +462,7 @@ cleanup:
 }
 
 /**
- * gnutls_privkey_sign_hash2:
+ * gnutls_privkey_sign_hash:
  * @signer: Holds the signer's key
  * @hash_algo: The hash algorithm used
  * @flags: zero for now
@@ -477,13 +479,15 @@ cleanup:
  *
  * Returns: On success, %GNUTLS_E_SUCCESS is returned, otherwise a
  *   negative error value.
+ *
+ * Since: 2.12.0
  **/
 int
-gnutls_privkey_sign_hash2 (gnutls_privkey_t signer,
-                           gnutls_digest_algorithm_t hash_algo,
-                           unsigned int flags,
-                           const gnutls_datum_t * hash_data,
-                           gnutls_datum_t * signature)
+gnutls_privkey_sign_hash (gnutls_privkey_t signer,
+                         gnutls_digest_algorithm_t hash_algo,
+                         unsigned int flags,
+                         const gnutls_datum_t * hash_data,
+                         gnutls_datum_t * signature)
 {
   int ret;
   gnutls_datum_t digest;
diff --git a/lib/includes/gnutls/abstract.h b/lib/includes/gnutls/abstract.h
index b4c1b30..6791b82 100644
--- a/lib/includes/gnutls/abstract.h
+++ b/lib/includes/gnutls/abstract.h
@@ -108,18 +108,17 @@ int gnutls_privkey_import_openpgp (gnutls_privkey_t pkey,
                                    gnutls_openpgp_privkey_t key,
                                    unsigned int flags);
 
-int gnutls_privkey_sign_data2 (gnutls_privkey_t signer,
+int gnutls_privkey_sign_data (gnutls_privkey_t signer,
                               gnutls_digest_algorithm_t hash,
                               unsigned int flags,
                               const gnutls_datum_t * data,
                               gnutls_datum_t * signature);
 
-int
-gnutls_privkey_sign_hash2 (gnutls_privkey_t signer,
-                           gnutls_digest_algorithm_t hash_algo,
-                           unsigned int flags,
-                           const gnutls_datum_t * hash_data,
-                           gnutls_datum_t * signature);
+int gnutls_privkey_sign_hash (gnutls_privkey_t signer,
+                             gnutls_digest_algorithm_t hash_algo,
+                             unsigned int flags,
+                             const gnutls_datum_t * hash_data,
+                             gnutls_datum_t * signature);
 
 int gnutls_privkey_decrypt_data (gnutls_privkey_t signer,
                                  unsigned int flags,
diff --git a/lib/includes/gnutls/compat.h b/lib/includes/gnutls/compat.h
index 6c3b511..9272807 100644
--- a/lib/includes/gnutls/compat.h
+++ b/lib/includes/gnutls/compat.h
@@ -220,7 +220,7 @@ gnutls_sign_callback_get (gnutls_session_t session, void 
**userdata)
   _GNUTLS_GCC_ATTR_DEPRECATED;
 
 /* This is a very dangerous and error-prone function.
- * Use gnutls_privkey_sign_hash2() instead.
+ * Use gnutls_privkey_sign_hash() instead.
  */
   int gnutls_x509_privkey_sign_hash (gnutls_x509_privkey_t key,
                                         const gnutls_datum_t * hash,
@@ -242,7 +242,7 @@ gnutls_sign_callback_get (gnutls_session_t session, void 
**userdata)
                                        const gnutls_datum_t * signature)
                                        _GNUTLS_GCC_ATTR_DEPRECATED;
 
-/* we support the gnutls_privkey_sign_data2() instead.
+/* we support the gnutls_privkey_sign_data() instead.
  */
   int gnutls_x509_privkey_sign_data (gnutls_x509_privkey_t key,
                                      gnutls_digest_algorithm_t digest,
diff --git a/lib/libgnutls.map b/lib/libgnutls.map
index 0937324..9c2f6d1 100644
--- a/lib/libgnutls.map
+++ b/lib/libgnutls.map
@@ -1,5 +1,5 @@
 # libgnutls.map -- libgnutls linker version script.           -*- ld-script -*-
-# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
 # Foundation, Inc.
 #
 # Author: Simon Josefsson
@@ -690,8 +690,8 @@ GNUTLS_2_12
        gnutls_pkcs11_token_init;
        gnutls_pkcs11_token_set_pin;
        gnutls_pkcs11_token_get_mechanism;
-       gnutls_privkey_sign_hash2;
-       gnutls_privkey_sign_data2;
+       gnutls_privkey_sign_hash;
+       gnutls_privkey_sign_data;
        gnutls_openpgp_crt_verify_hash;
        gnutls_pubkey_import_privkey;
        gnutls_pubkey_verify_data;
diff --git a/lib/x509/crq.c b/lib/x509/crq.c
index e96facb..71b2d11 100644
--- a/lib/x509/crq.c
+++ b/lib/x509/crq.c
@@ -2548,7 +2548,7 @@ gnutls_x509_crq_privkey_sign (gnutls_x509_crq_t crq, 
gnutls_privkey_t key,
       return result;
     }
 
-  result = gnutls_privkey_sign_data2 (key, dig, 0, &tbs, &signature);
+  result = gnutls_privkey_sign_data (key, dig, 0, &tbs, &signature);
   gnutls_free (tbs.data);
 
   if (result < 0)
diff --git a/lib/x509/privkey.c b/lib/x509/privkey.c
index c322934..0391ee4 100644
--- a/lib/x509/privkey.c
+++ b/lib/x509/privkey.c
@@ -1718,8 +1718,8 @@ cleanup:
   return ret;
 }
 
-/*-
- * _gnutls_x509_privkey_sign_hash:
+/**
+ * gnutls_x509_privkey_sign_hash:
  * @key: Holds the key
  * @hash: holds the data to be signed
  * @signature: will contain newly allocated signature
@@ -1732,8 +1732,8 @@ cleanup:
  * Returns: On success, %GNUTLS_E_SUCCESS is returned, otherwise a
  *   negative error value.
  *
- * Deprecated in: 2.11.0
- -*/
+ * Deprecated in: 2.12.0
+ */
 int
 gnutls_x509_privkey_sign_hash (gnutls_x509_privkey_t key,
                                const gnutls_datum_t * hash,
@@ -1758,7 +1758,7 @@ gnutls_x509_privkey_sign_hash (gnutls_x509_privkey_t key,
   return 0;
 }
 
-/*-
+/**
  * gnutls_x509_privkey_sign_data:
  * @key: Holds the key
  * @digest: should be MD5 or SHA1
@@ -1782,7 +1782,9 @@ gnutls_x509_privkey_sign_hash (gnutls_x509_privkey_t key,
  *
  * Returns: On success, %GNUTLS_E_SUCCESS is returned, otherwise a
  *   negative error value.
- -*/
+ *
+ * Deprecated: 2.12.0
+ */
 int
 gnutls_x509_privkey_sign_data (gnutls_x509_privkey_t key,
                                gnutls_digest_algorithm_t digest,
diff --git a/lib/x509/sign.c b/lib/x509/sign.c
index 6897b35..7860855 100644
--- a/lib/x509/sign.c
+++ b/lib/x509/sign.c
@@ -138,7 +138,7 @@ _gnutls_x509_pkix_sign (ASN1_TYPE src, const char *src_name,
       return result;
     }
 
-  result = gnutls_privkey_sign_data2 (issuer_key, dig, 0, &tbs, &signature);
+  result = gnutls_privkey_sign_data (issuer_key, dig, 0, &tbs, &signature);
   gnutls_free (tbs.data);
 
   if (result < 0)
diff --git a/tests/x509sign-verify.c b/tests/x509sign-verify.c
index 7791117..cecff55 100644
--- a/tests/x509sign-verify.c
+++ b/tests/x509sign-verify.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
  * Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos, Simon Josefsson
@@ -181,15 +181,13 @@ doit (void)
       if (ret < 0)
         fail ("gnutls_privkey_import_x509\n");
 
-      ret =
-        gnutls_privkey_sign_hash2 (privkey, GNUTLS_DIG_SHA1, 0, &hash_data,
-                                        &signature2);
+      ret = gnutls_privkey_sign_hash (privkey, GNUTLS_DIG_SHA1, 0,
+                                     &hash_data, &signature2);
       if (ret < 0)
         fail ("gnutls_privkey_sign_hash\n");
 
-      ret =
-        gnutls_privkey_sign_data2 (privkey, GNUTLS_DIG_SHA1, 0, &raw_data,
-                                        &signature);
+      ret = gnutls_privkey_sign_data (privkey, GNUTLS_DIG_SHA1, 0,
+                                     &raw_data, &signature);
       if (ret < 0)
         fail ("gnutls_x509_privkey_sign_hash\n");
 


hooks/post-receive
-- 
GNU gnutls