[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU gnutls branch, master, updated. gnutls_2_11_6-56-g7e2cbf8
|
From: |
Nikos Mavrogiannopoulos |
|
Subject: |
[SCM] GNU gnutls branch, master, updated. gnutls_2_11_6-56-g7e2cbf8 |
|
Date: |
Sat, 15 Jan 2011 18:43:29 +0000 |
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=7e2cbf896881816df86fcfef0ad10a45e60741b3
The branch, master has been updated
via 7e2cbf896881816df86fcfef0ad10a45e60741b3 (commit)
via b2d19eb2fa0cf5b40f91d004c6153bc8f06e644b (commit)
from 59b6fb0c5390de21670e9e24c07275291ec7f270 (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 7e2cbf896881816df86fcfef0ad10a45e60741b3
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Sat Jan 15 19:37:03 2011 +0100
deprecated gnutls_x509_crl_sign(), gnutls_x509_crl_sign2() and
gnutls_x509_crq_get_preferred_hash_algorithm().
commit b2d19eb2fa0cf5b40f91d004c6153bc8f06e644b
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Sat Jan 15 19:17:24 2011 +0100
Deprecated gnutls_x509_crq_sign2() and gnutls_x509_crq_sign() in
favor for gnutls_x509_crq_privkey_sign().
-----------------------------------------------------------------------
Summary of changes:
NEWS | 35 ++++++++++++++++++++++++-----------
lib/includes/gnutls/compat.h | 27 +++++++++++++++++++++++++++
lib/includes/gnutls/x509.h | 18 +-----------------
lib/x509/crl_write.c | 6 ++++--
lib/x509/crq.c | 6 ++++--
5 files changed, 60 insertions(+), 32 deletions(-)
diff --git a/NEWS b/NEWS
index 844e767..773a4fc 100644
--- a/NEWS
+++ b/NEWS
@@ -9,16 +9,24 @@ See the end for copying conditions.
replaced by gnutls_privkey_sign_hash2().
** libgnutls: gnutls_pubkey_verify_data, gnutls_pubkey_verify_hash,
-gnutls_openpgp_crt_verify_hash, gnutls_x509_privkey_verify_data,
-gnutls_x509_crt_verify_data, gnutls_x509_crt_verify_hash
-return the negative error code GNUTLS_E_PK_SIG_VERIFY_FAILED
-if verification fails to simplify error checking.
+gnutls_x509_privkey_verify_data, gnutls_x509_crt_verify_data,
+gnutls_x509_crt_verify_hash return the negative error code
+GNUTLS_E_PK_SIG_VERIFY_FAILED if verification fails to simplify error
+checking.
** libgnutls: Added helper functions for signature verification:
gnutls_pubkey_verify_data() and gnutls_pubkey_import_privkey().
** libgnutls: Added gnutls_privkey_sign_hash2().
+** 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_pubkey_verify_data() respectively.
+
** libgnutls: gnutls_*_export_raw() functions now add leading zero in
integers.
@@ -30,16 +38,21 @@ 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_x509_privkey_sign_data: DEPRECATED
-gnutls_x509_privkey_sign_hash: DEPRECATED
-gnutls_x509_privkey_verify_data: DEPRECATED
+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
+gnutls_x509_crl_sign: DEPRECATED (use: gnutls_x509_crl_privkey_sign)
+gnutls_x509_crl_sign2: DEPRECATED (use: gnutls_x509_crl_privkey_sign)
+gnutls_x509_privkey_sign_data: DEPRECATED (use: gnutls_privkey_sign_data2)
+gnutls_x509_privkey_sign_hash: DEPRECATED (use: gnutls_privkey_sign_hash2)
+gnutls_x509_privkey_verify_data: DEPRECATED (use: gnutls_pubkey_verify_data)
gnutls_psk_netconf_derive_key: DEPRECATED
gnutls_session_set_finished_function: DEPRECATED
gnutls_ext_register: DEPRECATED
-gnutls_x509_crt_verify_hash: DEPRECATED
-gnutls_x509_crt_verify_data: DEPRECATED
-gnutls_x509_crt_get_verify_algorithm: DEPRECATED
-gnutls_x509_crt_get_preferred_hash_algorithm: DEPRECATED
+gnutls_x509_crt_verify_hash: DEPRECATED (use: gnutls_pubkey_verify_hash)
+gnutls_x509_crt_verify_data: DEPRECATED (use: gnutls_pubkey_verify_data)
+gnutls_x509_crt_get_verify_algorithm: DEPRECATED (use:
gnutls_pubkey_get_verify_algorithm)
+gnutls_x509_crt_get_preferred_hash_algorithm: DEPRECATED (use:
gnutls_pubkey_get_preferred_hash_algorithm)
gnutls_openpgp_privkey_sign_hash: REMOVED
gnutls_openpgp_privkey_decrypt_data: REMOVED
gnutls_pkcs11_privkey_sign_hash: REMOVED
diff --git a/lib/includes/gnutls/compat.h b/lib/includes/gnutls/compat.h
index befae6f..30b2094 100644
--- a/lib/includes/gnutls/compat.h
+++ b/lib/includes/gnutls/compat.h
@@ -272,5 +272,32 @@ gnutls_sign_callback_get (gnutls_session_t session, void
**userdata)
unsigned int *mand)
_GNUTLS_GCC_ATTR_DEPRECATED;
+ int gnutls_x509_crq_get_preferred_hash_algorithm (gnutls_x509_crq_t crq,
+ gnutls_digest_algorithm_t * hash,
+ unsigned int *mand)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
+
+ /* gnutls_x509_crq_privkey_sign() */
+ int gnutls_x509_crq_sign2 (gnutls_x509_crq_t crq,
+ gnutls_x509_privkey_t key,
+ gnutls_digest_algorithm_t dig,
+ unsigned int flags)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
+ int gnutls_x509_crq_sign (gnutls_x509_crq_t crq, gnutls_x509_privkey_t key)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
+
+
+ /* 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)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
+ int gnutls_x509_crl_sign2 (gnutls_x509_crl_t crl,
+ gnutls_x509_crt_t issuer,
+ gnutls_x509_privkey_t issuer_key,
+ gnutls_digest_algorithm_t dig,
+ unsigned int flags)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
+
#endif /* _GNUTLS_COMPAT_H */
diff --git a/lib/includes/gnutls/x509.h b/lib/includes/gnutls/x509.h
index 579bb91..9b42dcd 100644
--- a/lib/includes/gnutls/x509.h
+++ b/lib/includes/gnutls/x509.h
@@ -426,14 +426,6 @@ extern "C"
*/
int gnutls_x509_crl_set_version (gnutls_x509_crl_t crl,
unsigned int version);
- int gnutls_x509_crl_sign (gnutls_x509_crl_t crl,
- gnutls_x509_crt_t issuer,
- gnutls_x509_privkey_t issuer_key);
- int gnutls_x509_crl_sign2 (gnutls_x509_crl_t crl,
- gnutls_x509_crt_t issuer,
- gnutls_x509_privkey_t issuer_key,
- gnutls_digest_algorithm_t dig,
- unsigned int flags);
int gnutls_x509_crl_set_this_update (gnutls_x509_crl_t crl,
time_t act_time);
int gnutls_x509_crl_set_next_update (gnutls_x509_crl_t crl,
@@ -718,10 +710,6 @@ extern "C"
int gnutls_x509_crq_import (gnutls_x509_crq_t crq,
const gnutls_datum_t * data,
gnutls_x509_crt_fmt_t format);
- int gnutls_x509_crq_get_preferred_hash_algorithm (gnutls_x509_crq_t crq,
- gnutls_digest_algorithm_t
- * hash,
- unsigned int *mand);
int gnutls_x509_crq_get_dn (gnutls_x509_crq_t crq, char *buf,
size_t * sizeof_buf);
@@ -741,11 +729,6 @@ extern "C"
int gnutls_x509_crq_get_version (gnutls_x509_crq_t crq);
int gnutls_x509_crq_set_key (gnutls_x509_crq_t crq,
gnutls_x509_privkey_t key);
- int gnutls_x509_crq_sign2 (gnutls_x509_crq_t crq,
- gnutls_x509_privkey_t key,
- gnutls_digest_algorithm_t dig,
- unsigned int flags);
- int gnutls_x509_crq_sign (gnutls_x509_crq_t crq, gnutls_x509_privkey_t key);
int gnutls_x509_crq_set_challenge_password (gnutls_x509_crq_t crq,
const char *pass);
@@ -834,3 +817,4 @@ extern "C"
#endif
#endif /* GNUTLS_X509_H */
+
diff --git a/lib/x509/crl_write.c b/lib/x509/crl_write.c
index 8d772dc..03c2e57 100644
--- a/lib/x509/crl_write.c
+++ b/lib/x509/crl_write.c
@@ -92,6 +92,8 @@ 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.
**/
@@ -138,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
@@ -149,7 +151,7 @@ fail:
*
* Returns: On success, %GNUTLS_E_SUCCESS is returned, otherwise a
* negative error value.
- **/
+ -*/
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 577d7e2..e96facb 100644
--- a/lib/x509/crq.c
+++ b/lib/x509/crq.c
@@ -1003,6 +1003,8 @@ 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
@@ -1051,7 +1053,7 @@ fail:
return result;
}
-/**
+/*-
* gnutls_x509_crq_sign:
* @crq: should contain a #gnutls_x509_crq_t structure
* @key: holds a private key
@@ -1061,7 +1063,7 @@ fail:
*
* Returns: On success, %GNUTLS_E_SUCCESS is returned, otherwise a
* negative error value.
- **/
+ -*/
int
gnutls_x509_crq_sign (gnutls_x509_crq_t crq, gnutls_x509_privkey_t key)
{
hooks/post-receive
--
GNU gnutls
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU gnutls branch, master, updated. gnutls_2_11_6-56-g7e2cbf8,
Nikos Mavrogiannopoulos <=