[SCM] GNU gnutls branch, gnutls_2_12_x, updated. gnutls_2_11_6-126-g01fbef7

[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=01fbef761dec93eb398fbe231d60df484c38ca97

The branch, gnutls_2_12_x has been updated
       via  01fbef761dec93eb398fbe231d60df484c38ca97 (commit)
       via  d45a977521f2f32b88bcb046bd2aa50cc94f48d9 (commit)
       via  e312ba246194b351953d5457c8022a6f4af64271 (commit)
       via  1d967e2329939217587d7399ec32fd05428ffd6a (commit)
      from  8a79e674daeae975c1dcb5949d01de706e0b085a (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 01fbef761dec93eb398fbe231d60df484c38ca97
Author: Simon Josefsson <address@hidden>
Date:   Sun Feb 20 20:48:05 2011 +0100

    Fix docstring.

commit d45a977521f2f32b88bcb046bd2aa50cc94f48d9
Author: Simon Josefsson <address@hidden>
Date:   Sun Feb 20 20:45:48 2011 +0100

    Fix deprecated docstring.

commit e312ba246194b351953d5457c8022a6f4af64271
Author: Simon Josefsson <address@hidden>
Date:   Sun Feb 20 20:44:52 2011 +0100

    Add deprecated docstring.

commit 1d967e2329939217587d7399ec32fd05428ffd6a
Author: Simon Josefsson <address@hidden>
Date:   Sun Feb 20 20:43:05 2011 +0100

    Remove dropped functions.

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

Summary of changes:
 lib/libgnutls.map    |    1 -
 lib/x509/crl_write.c |   10 ++++++----
 lib/x509/crq.c       |    9 +++++----
 lib/x509/privkey.c   |    8 ++++----
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/lib/libgnutls.map b/lib/libgnutls.map
index f6203a1..6d0426d 100644
--- a/lib/libgnutls.map
+++ b/lib/libgnutls.map
@@ -629,7 +629,6 @@ GNUTLS_2_12
        gnutls_pkcs11_privkey_get_pk_algorithm;
        gnutls_pkcs11_privkey_get_info;
        gnutls_pkcs11_privkey_import_url;
-       gnutls_pkcs11_privkey_decrypt_data;
        gnutls_pkcs11_obj_export;
        gnutls_pkcs11_type_get_name;
 
diff --git a/lib/x509/crl_write.c b/lib/x509/crl_write.c
index 03c2e57..92fd0eb 100644
--- a/lib/x509/crl_write.c
+++ b/lib/x509/crl_write.c
@@ -92,10 +92,10 @@ gnutls_x509_crl_set_version (gnutls_x509_crl_t crl, 
unsigned int version)
  * This must be the last step in a certificate CRL since all
  * the previously set parameters are now signed.
  *
- * Deprecated: Use gnutls_x509_crl_privkey_sign() instead.
- *
  * Returns: On success, %GNUTLS_E_SUCCESS is returned, otherwise a
  *   negative error value.
+ *
+ * Deprecated: Use gnutls_x509_crl_privkey_sign() instead.
  **/
 int
 gnutls_x509_crl_sign2 (gnutls_x509_crl_t crl, gnutls_x509_crt_t issuer,
@@ -140,7 +140,7 @@ fail:
   return result;
 }
 
-/*-
+/**
  * gnutls_x509_crl_sign:
  * @crl: should contain a gnutls_x509_crl_t structure
  * @issuer: is the certificate of the certificate issuer
@@ -151,7 +151,9 @@ fail:
  *
  * Returns: On success, %GNUTLS_E_SUCCESS is returned, otherwise a
  *   negative error value.
- -*/
+ *
+ * Deprecated: Use gnutls_x509_crl_privkey_sign().
+ */
 int
 gnutls_x509_crl_sign (gnutls_x509_crl_t crl, gnutls_x509_crt_t issuer,
                       gnutls_x509_privkey_t issuer_key)
diff --git a/lib/x509/crq.c b/lib/x509/crq.c
index 71b2d11..9e60e2e 100644
--- a/lib/x509/crq.c
+++ b/lib/x509/crq.c
@@ -1003,13 +1003,12 @@ gnutls_x509_crq_set_challenge_password 
(gnutls_x509_crq_t crq,
  * the digest algorithm to use with the specified public key
  * algorithm.
  *
- * Deprecated: Use gnutls_x509_crq_privkey_sign() instead.
- *
  * Returns: %GNUTLS_E_SUCCESS on success, otherwise an error.
  *   %GNUTLS_E_ASN1_VALUE_NOT_FOUND is returned if you didn't set all
  *   information in the certificate request (e.g., the version using
  *   gnutls_x509_crq_set_version()).
  *
+ * Deprecated: Use gnutls_x509_crq_privkey_sign() instead.
  **/
 int
 gnutls_x509_crq_sign2 (gnutls_x509_crq_t crq, gnutls_x509_privkey_t key,
@@ -1053,7 +1052,7 @@ fail:
   return result;
 }
 
-/*-
+/**
  * gnutls_x509_crq_sign:
  * @crq: should contain a #gnutls_x509_crq_t structure
  * @key: holds a private key
@@ -1063,7 +1062,9 @@ fail:
  *
  * Returns: On success, %GNUTLS_E_SUCCESS is returned, otherwise a
  *   negative error value.
- -*/
+ *
+ * Deprecated: Use gnutls_x509_crq_privkey_sign() instead.
+ */
 int
 gnutls_x509_crq_sign (gnutls_x509_crq_t crq, gnutls_x509_privkey_t key)
 {
diff --git a/lib/x509/privkey.c b/lib/x509/privkey.c
index 0391ee4..c039f01 100644
--- a/lib/x509/privkey.c
+++ b/lib/x509/privkey.c
@@ -1783,7 +1783,7 @@ 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
+ * Deprecated: Use gnutls_privkey_sign_data().
  */
 int
 gnutls_x509_privkey_sign_data (gnutls_x509_privkey_t key,
@@ -1837,7 +1837,7 @@ gnutls_x509_privkey_sign_data (gnutls_x509_privkey_t key,
 }
 
 
-/*-
+/**
  * gnutls_x509_privkey_verify_data:
  * @key: Holds the key
  * @flags: should be 0 for now
@@ -1850,8 +1850,8 @@ gnutls_x509_privkey_sign_data (gnutls_x509_privkey_t key,
  * Returns: In case of a verification failure %GNUTLS_E_PK_SIG_VERIFY_FAILED 
  * is returned, and a positive code on success.
  *
- * Deprecated in: 2.11.0
- -*/
+ * Deprecated: Use gnutls_pubkey_verify_data().
+ */
 int
 gnutls_x509_privkey_verify_data (gnutls_x509_privkey_t key,
                                  unsigned int flags,


hooks/post-receive
-- 
GNU gnutls