[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU gnutls branch, master, updated. gnutls-3_0_12-268-gcd8072b
|
From: |
Nikos Mavrogiannopoulos |
|
Subject: |
[SCM] GNU gnutls branch, master, updated. gnutls-3_0_12-268-gcd8072b |
|
Date: |
Sat, 18 Feb 2012 12:51:58 +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=cd8072b307d32f040e07908362e18319aa6384b4
The branch, master has been updated
via cd8072b307d32f040e07908362e18319aa6384b4 (commit)
via 818a66205411ec4ce32bab151ac02d17722a7b3a (commit)
via 5f735e932e61ac3bc31360051c39904e7f456ce0 (commit)
via b590f456a87beab2285a057b9f990d4a331bbfec (commit)
via d0f762b339119afa6ab28d5d6e7e31f6f580637c (commit)
via 51e5b4341d5ac498f95bffe99f358b56e9b9fc3b (commit)
via cbfaaab0899020b1d50c2aaa7d6fe2ca1c0902fe (commit)
from e6c6e1ffc206713b211b917ef6bd28a9aedd4733 (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 cd8072b307d32f040e07908362e18319aa6384b4
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Sat Feb 18 13:51:58 2012 +0100
Since: 3.0.0 -> Since 3.0 to reflect that it might be on a later version
than 3.0.0.
commit 818a66205411ec4ce32bab151ac02d17722a7b3a
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Sat Feb 18 13:48:54 2012 +0100
Added new functions
commit 5f735e932e61ac3bc31360051c39904e7f456ce0
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Sat Feb 18 13:48:42 2012 +0100
verify that the correct error code is returned
commit b590f456a87beab2285a057b9f990d4a331bbfec
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Sat Feb 18 13:48:23 2012 +0100
do not stick parameters to the next word.
commit d0f762b339119afa6ab28d5d6e7e31f6f580637c
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Sat Feb 18 13:44:42 2012 +0100
return the documented error code
commit 51e5b4341d5ac498f95bffe99f358b56e9b9fc3b
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Sat Feb 18 13:33:33 2012 +0100
copy gnutls.epub to webdir
commit cbfaaab0899020b1d50c2aaa7d6fe2ca1c0902fe
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Sat Feb 18 13:25:47 2012 +0100
gaa is no longer needed
-----------------------------------------------------------------------
Summary of changes:
README-alpha | 1 -
cfg.mk | 1 +
doc/manpages/Makefile.am | 5 +++++
doc/scripts/gdoc | 10 +++++-----
lib/algorithms/ecc.c | 4 ++--
lib/crypto-api.c | 8 ++++----
lib/gnutls_alert.c | 2 +-
lib/gnutls_cert.c | 6 +++---
lib/gnutls_dtls.c | 18 +++++++++---------
lib/gnutls_global.c | 2 +-
lib/gnutls_pcert.c | 12 ++++++------
lib/gnutls_priority.c | 10 +++++-----
lib/gnutls_privkey.c | 2 +-
lib/gnutls_pubkey.c | 14 +++++++-------
lib/gnutls_record.c | 2 +-
lib/gnutls_state.c | 2 +-
lib/gnutls_x509.c | 2 +-
lib/pkcs11.c | 2 +-
lib/pkcs11_privkey.c | 2 +-
lib/system_override.c | 2 +-
lib/verify-tofu.c | 8 ++++----
lib/x509/common.c | 2 +-
lib/x509/crl.c | 6 +++---
lib/x509/privkey.c | 4 ++--
lib/x509/verify-high.c | 16 ++++++++--------
lib/x509/x509.c | 6 +++---
tests/mini-tdb.c | 5 +++++
27 files changed, 82 insertions(+), 72 deletions(-)
diff --git a/README-alpha b/README-alpha
index 3412e5d..b06969a 100644
--- a/README-alpha
+++ b/README-alpha
@@ -25,7 +25,6 @@ We require several tools to build the software, including:
- Valgrind <http://valgrind.org/> (optional)
- libgcrypt <http://www.gnupg.org/>
- Guile <http://www.gnu.org/software/guile/>
-- Gaa <http://gaa.sf.net> (optional)
- libtasn1 <http://josefsson.org/libtasn1/> (optional)
- p11-kit <http://p11-glue.freedesktop.org/p11-kit.html>
- datefudge <http://packages.debian.org/datefudge> (optional)
diff --git a/cfg.mk b/cfg.mk
index de820bb..b8b3aad 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -145,6 +145,7 @@ web:
cd doc && $(SHELL) ../build-aux/gendocs.sh \
--html "--css-include=texinfo.css" \
-o ../$(htmldir)/manual/ $(PACKAGE) "$(PACKAGE_NAME)"
+ -cd doc && make gnutls.epub && cp gnutls.epub ../$(htmldir)/manual/
cd doc && cp *.png ../$(htmldir)/manual/html_node/
#cd doc/doxygen && doxygen && cd ../.. && cp -v doc/doxygen/html/*
$(htmldir)/devel/doxygen/ && cd doc/doxygen/latex && make refman.pdf && cd
../../../ && cp doc/doxygen/latex/refman.pdf
$(htmldir)/devel/doxygen/$(PACKAGE).pdf
-cp -v doc/reference/html/*.html doc/reference/html/*.png
doc/reference/html/*.devhelp doc/reference/html/*.css $(htmldir)/reference/
diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
index 7bdec29..cc44e4b 100644
--- a/doc/manpages/Makefile.am
+++ b/doc/manpages/Makefile.am
@@ -413,6 +413,11 @@ APIMANS += gnutls_certificate_set_params_function.3
APIMANS += gnutls_anon_set_params_function.3
APIMANS += gnutls_psk_set_params_function.3
APIMANS += gnutls_hex2bin.3
+APIMANS += gnutls_tdb_init.3
+APIMANS += gnutls_tdb_set_store_func.3
+APIMANS += gnutls_tdb_set_store_commitment_func.3
+APIMANS += gnutls_tdb_set_verify_func.3
+APIMANS += gnutls_tdb_deinit.3
APIMANS += gnutls_verify_stored_pubkey.3
APIMANS += gnutls_store_commitment.3
APIMANS += gnutls_store_pubkey.3
diff --git a/doc/scripts/gdoc b/doc/scripts/gdoc
index a1ab4ab..9863bae 100755
--- a/doc/scripts/gdoc
+++ b/doc/scripts/gdoc
@@ -148,7 +148,7 @@ $type_env = "(\\\$[A-Za-z0-9_]+)";
%highlights_html = ( $type_constant, '"<i>$1</i>"',
$type_func, '"<b>$1</b>"',
$type_struct, '"<i>$1</i>"',
- $type_param, '" <tt><b>$1</b></tt>"' );
+ $type_param, '" <tt><b>$1</b></tt> "' );
$blankline_html = "<p>";
%highlights_texinfo = ( $type_param, '" address@hidden "',
@@ -158,7 +158,7 @@ $blankline_html = "<p>";
);
$blankline_texinfo = "";
-%highlights_tex = ( $type_param, '" {\\\bf $1}"',
+%highlights_tex = ( $type_param, '" {\\\bf $1} "',
$type_constant, '"{\\\it $1}"',
$type_func, '"{\\\bf $1}"',
$type_struct, '"{\\\it $1}"',
@@ -170,21 +170,21 @@ $blankline_tex = "\\\\";
$type_func, '"<function>$1</function>"',
$type_struct, '"<structname>$1</structname>"',
$type_env, '"<envar>$1</envar>"',
- $type_param, '" <parameter>$1</parameter>"' );
+ $type_param, '" <parameter>$1</parameter> "' );
$blankline_sgml = "</para><para>\n";
# these are pretty rough
%highlights_man = ( $type_constant, '"\\\fB$1\\\fP"',
$type_func, '"\\\fB$1\\\fP"',
$type_struct, '"\\\fB$1\\\fP"',
- $type_param, '" \\\fI$1\\\fP"' );
+ $type_param, '" \\\fI$1\\\fP "' );
$blankline_man = "";
# text-mode
%highlights_text = ( $type_constant, '"$1"',
$type_func, '"$1"',
$type_struct, '"$1"',
- $type_param, '"$1"' );
+ $type_param, '"$1 "' );
$blankline_text = "";
my $lineprefix = "";
diff --git a/lib/algorithms/ecc.c b/lib/algorithms/ecc.c
index 0431450..c64abc3 100644
--- a/lib/algorithms/ecc.c
+++ b/lib/algorithms/ecc.c
@@ -247,7 +247,7 @@ _gnutls_ecc_bits_to_curve (int bits)
* Returns: a string that contains the name of the specified
* curve or %NULL.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
const char *
gnutls_ecc_curve_get_name (gnutls_ecc_curve_t curve)
@@ -322,7 +322,7 @@ _gnutls_ecc_curve_get_params (gnutls_ecc_curve_t curve)
*
* Returns: a the size or (0).
*
- * Since: 3.0.0
+ * Since: 3.0
**/
int gnutls_ecc_curve_get_size (gnutls_ecc_curve_t curve)
{
diff --git a/lib/crypto-api.c b/lib/crypto-api.c
index 2073266..2beb329 100644
--- a/lib/crypto-api.c
+++ b/lib/crypto-api.c
@@ -86,7 +86,7 @@ int ret;
*
* Returns: Zero or a negative error code on error.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
int
gnutls_cipher_tag (gnutls_cipher_hd_t handle, void *tag, size_t tag_size)
@@ -114,7 +114,7 @@ api_cipher_hd_st * h = handle;
*
* Returns: Zero or a negative error code on error.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
int
gnutls_cipher_add_auth (gnutls_cipher_hd_t handle, const void *text, size_t
text_size)
@@ -138,7 +138,7 @@ api_cipher_hd_st * h = handle;
* This function will set the IV to be used for the next
* encryption block.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
void
gnutls_cipher_set_iv (gnutls_cipher_hd_t handle, void *iv, size_t ivlen)
@@ -522,7 +522,7 @@ gnutls_hash_fast (gnutls_digest_algorithm_t algorithm,
* Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, or an
* error code.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
int
gnutls_key_generate (gnutls_datum_t * key, unsigned int key_size)
diff --git a/lib/gnutls_alert.c b/lib/gnutls_alert.c
index 4842c3f..793955f 100644
--- a/lib/gnutls_alert.c
+++ b/lib/gnutls_alert.c
@@ -104,7 +104,7 @@ gnutls_alert_get_name (gnutls_alert_description_t alert)
*
* Returns: string corresponding to #gnutls_alert_description_t value.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
const char *
gnutls_alert_get_strname (gnutls_alert_description_t alert)
diff --git a/lib/gnutls_cert.c b/lib/gnutls_cert.c
index 0b68eb4..4724d55 100644
--- a/lib/gnutls_cert.c
+++ b/lib/gnutls_cert.c
@@ -108,7 +108,7 @@ gnutls_certificate_free_cas
(gnutls_certificate_credentials_t sc)
* Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
* negative error value.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
int
gnutls_certificate_get_issuer (gnutls_certificate_credentials_t sc,
@@ -413,7 +413,7 @@ void gnutls_certificate_server_set_retrieve_function
* number of certificates should be set to zero. The value (-1)
* indicates error and the handshake will be terminated.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
void gnutls_certificate_set_retrieve_function
(gnutls_certificate_credentials_t cred,
@@ -460,7 +460,7 @@ void gnutls_certificate_set_retrieve_function
* number of certificates should be set to zero. The value (-1)
* indicates error and the handshake will be terminated.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
void gnutls_certificate_set_retrieve_function2
(gnutls_certificate_credentials_t cred,
diff --git a/lib/gnutls_dtls.c b/lib/gnutls_dtls.c
index 8886224..f61fea3 100644
--- a/lib/gnutls_dtls.c
+++ b/lib/gnutls_dtls.c
@@ -530,7 +530,7 @@ unsigned int i, offset = 0;
* If the retransmission timeout is zero then the handshake will operate
* in a non-blocking way, i.e., return %GNUTLS_E_AGAIN.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
void gnutls_dtls_set_timeouts (gnutls_session_t session, unsigned int
retrans_timeout,
unsigned int total_timeout)
@@ -547,7 +547,7 @@ void gnutls_dtls_set_timeouts (gnutls_session_t session,
unsigned int retrans_ti
* This function will set the maximum transfer unit of the interface
* that DTLS packets are expected to leave from.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
void gnutls_dtls_set_mtu (gnutls_session_t session, unsigned int mtu)
{
@@ -564,7 +564,7 @@ void gnutls_dtls_set_mtu (gnutls_session_t session,
unsigned int mtu)
*
* Returns: the maximum allowed transfer unit.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
unsigned int gnutls_dtls_get_data_mtu (gnutls_session_t session)
{
@@ -588,7 +588,7 @@ int ret;
*
* Returns: the set maximum transfer unit.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
unsigned int gnutls_dtls_get_mtu (gnutls_session_t session)
{
@@ -607,7 +607,7 @@ unsigned int gnutls_dtls_get_mtu (gnutls_session_t session)
*
* Returns: the remaining time in milliseconds.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
unsigned int gnutls_dtls_get_timeout (gnutls_session_t session)
{
@@ -653,7 +653,7 @@ unsigned int diff;
*
* Returns: the number of bytes sent, or a negative error code.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
int gnutls_dtls_cookie_send(gnutls_datum_t* key, void* client_data, size_t
client_data_size,
gnutls_dtls_prestate_st* prestate,
@@ -755,7 +755,7 @@ uint8_t digest[C_HASH_SIZE];
*
* Returns: %GNUTLS_E_SUCCESS (0) on success, or a negative error code.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
int gnutls_dtls_cookie_verify(gnutls_datum_t* key,
void* client_data, size_t client_data_size,
@@ -823,7 +823,7 @@ uint8_t digest[C_HASH_SIZE];
* the cookie authentication with the client, with the newly
* established session.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
void gnutls_dtls_prestate_set(gnutls_session_t session,
gnutls_dtls_prestate_st* prestate)
{
@@ -855,7 +855,7 @@ void gnutls_dtls_prestate_set(gnutls_session_t session,
gnutls_dtls_prestate_st*
*
* Returns: The number of discarded packets.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
unsigned int gnutls_record_get_discarded (gnutls_session_t session)
{
diff --git a/lib/gnutls_global.c b/lib/gnutls_global.c
index 606d5ba..3a71eae 100644
--- a/lib/gnutls_global.c
+++ b/lib/gnutls_global.c
@@ -81,7 +81,7 @@ gnutls_global_set_log_function (gnutls_log_func log_func)
* @gnutls_audit_log_func is of the form,
* void (*gnutls_audit_log_func)( gnutls_session_t, int level, const char*);
*
- * Since: 3.0.0
+ * Since: 3.0
**/
void
gnutls_global_set_audit_log_function (gnutls_audit_log_func log_func)
diff --git a/lib/gnutls_pcert.c b/lib/gnutls_pcert.c
index 973402e..17e9c4f 100644
--- a/lib/gnutls_pcert.c
+++ b/lib/gnutls_pcert.c
@@ -42,7 +42,7 @@
* Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
* negative error value.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
int gnutls_pcert_import_x509 (gnutls_pcert_st* pcert,
gnutls_x509_crt_t crt, unsigned int flags)
@@ -118,7 +118,7 @@ cleanup:
*
* Returns: the number of certificates read or a negative error value.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
int
gnutls_pcert_list_import_x509_raw (gnutls_pcert_st * pcerts,
@@ -182,7 +182,7 @@ cleanup:
* Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
* negative error value.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
int gnutls_pcert_import_x509_raw (gnutls_pcert_st *pcert,
const gnutls_datum_t* cert,
@@ -234,7 +234,7 @@ cleanup:
* Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
* negative error value.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
int gnutls_pcert_import_openpgp (gnutls_pcert_st* pcert,
gnutls_openpgp_crt_t crt, unsigned int flags)
@@ -308,7 +308,7 @@ cleanup:
* Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
* negative error value.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
int gnutls_pcert_import_openpgp_raw (gnutls_pcert_st *pcert,
const gnutls_datum_t* cert,
@@ -366,7 +366,7 @@ cleanup:
*
* This function will deinitialize a pcert structure.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
void
gnutls_pcert_deinit (gnutls_pcert_st *pcert)
diff --git a/lib/gnutls_priority.c b/lib/gnutls_priority.c
index 406f082..52e5209 100644
--- a/lib/gnutls_priority.c
+++ b/lib/gnutls_priority.c
@@ -1138,7 +1138,7 @@ void _gnutls_priority_prefer_aes_gcm(void)
* structure.
*
* Returns: the number of curves, or an error code.
- * Since: 3.0.0
+ * Since: 3.0
**/
int
gnutls_priority_ecc_curve_list (gnutls_priority_t pcache, const unsigned int**
list)
@@ -1159,7 +1159,7 @@ gnutls_priority_ecc_curve_list (gnutls_priority_t pcache,
const unsigned int** l
* structure.
*
* Returns: the number of methods, or an error code.
- * Since: 3.0.0
+ * Since: 3.0
**/
int
gnutls_priority_compression_list (gnutls_priority_t pcache, const unsigned
int** list)
@@ -1180,7 +1180,7 @@ gnutls_priority_compression_list (gnutls_priority_t
pcache, const unsigned int**
* structure.
*
* Returns: the number of protocols, or an error code.
- * Since: 3.0.0
+ * Since: 3.0
**/
int
gnutls_priority_protocol_list (gnutls_priority_t pcache, const unsigned int**
list)
@@ -1201,7 +1201,7 @@ gnutls_priority_protocol_list (gnutls_priority_t pcache,
const unsigned int** li
* structure.
*
* Returns: the number of algorithms, or an error code.
- * Since: 3.0.0
+ * Since: 3.0
**/
int
gnutls_priority_sign_list (gnutls_priority_t pcache, const unsigned int** list)
@@ -1222,7 +1222,7 @@ gnutls_priority_sign_list (gnutls_priority_t pcache,
const unsigned int** list)
* structure.
*
* Returns: the number of certificate types, or an error code.
- * Since: 3.0.0
+ * Since: 3.0
**/
int
gnutls_priority_certificate_type_list (gnutls_priority_t pcache, const
unsigned int** list)
diff --git a/lib/gnutls_privkey.c b/lib/gnutls_privkey.c
index 13c0918..9cb820e 100644
--- a/lib/gnutls_privkey.c
+++ b/lib/gnutls_privkey.c
@@ -385,7 +385,7 @@ int ret;
* Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
* negative error value.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
int
gnutls_privkey_import_ext (gnutls_privkey_t pkey,
diff --git a/lib/gnutls_pubkey.c b/lib/gnutls_pubkey.c
index 7bebc35..ba0c2c4 100644
--- a/lib/gnutls_pubkey.c
+++ b/lib/gnutls_pubkey.c
@@ -420,7 +420,7 @@ gnutls_pubkey_import_openpgp (gnutls_pubkey_t key,
* Returns: In case of failure a negative error code will be
* returned, and 0 on success.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
int
gnutls_pubkey_get_openpgp_key_id (gnutls_pubkey_t key, unsigned int flags,
@@ -719,7 +719,7 @@ gnutls_pubkey_get_pk_dsa_raw (gnutls_pubkey_t key,
*
* Returns: %GNUTLS_E_SUCCESS on success, otherwise a negative error code.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
int
gnutls_pubkey_get_pk_ecc_raw (gnutls_pubkey_t key, gnutls_ecc_curve_t *curve,
@@ -773,7 +773,7 @@ gnutls_pubkey_get_pk_ecc_raw (gnutls_pubkey_t key,
gnutls_ecc_curve_t *curve,
*
* Returns: %GNUTLS_E_SUCCESS on success, otherwise a negative error code.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
int gnutls_pubkey_get_pk_ecc_x962 (gnutls_pubkey_t key, gnutls_datum_t*
parameters,
gnutls_datum_t * ecpoint)
@@ -1118,7 +1118,7 @@ gnutls_pubkey_import_rsa_raw (gnutls_pubkey_t key,
* Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
* negative error value.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
int
gnutls_pubkey_import_ecc_raw (gnutls_pubkey_t key,
@@ -1176,7 +1176,7 @@ cleanup:
* Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
* negative error value.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
int
gnutls_pubkey_import_ecc_x962 (gnutls_pubkey_t key,
@@ -1346,7 +1346,7 @@ gnutls_pubkey_verify_data (gnutls_pubkey_t pubkey,
unsigned int flags,
* Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
* negative error value (%GNUTLS_E_PK_SIG_VERIFY_FAILED in verification
failure).
*
- * Since: 3.0.0
+ * Since: 3.0
**/
int
gnutls_pubkey_verify_data2 (gnutls_pubkey_t pubkey,
@@ -1422,7 +1422,7 @@ gnutls_pubkey_verify_hash (gnutls_pubkey_t key, unsigned
int flags,
* Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
* negative error value.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
int
gnutls_pubkey_encrypt_data (gnutls_pubkey_t key, unsigned int flags,
diff --git a/lib/gnutls_record.c b/lib/gnutls_record.c
index a9a50c7..84688a3 100644
--- a/lib/gnutls_record.c
+++ b/lib/gnutls_record.c
@@ -1276,7 +1276,7 @@ gnutls_record_recv (gnutls_session_t session, void *data,
size_t data_size)
* error code is returned in case of an error. The number of bytes
* received might be less than @data_size.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
ssize_t
gnutls_record_recv_seq (gnutls_session_t session, void *data, size_t data_size,
diff --git a/lib/gnutls_state.c b/lib/gnutls_state.c
index 354db34..a8d8f0e 100644
--- a/lib/gnutls_state.c
+++ b/lib/gnutls_state.c
@@ -1410,7 +1410,7 @@ int total = 0, ret, iv_size;
* Returns: the currently used curve, a #gnutls_ecc_curve_t
* type.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
gnutls_ecc_curve_t gnutls_ecc_curve_get(gnutls_session_t session)
{
diff --git a/lib/gnutls_x509.c b/lib/gnutls_x509.c
index 56b3e73..3275395 100644
--- a/lib/gnutls_x509.c
+++ b/lib/gnutls_x509.c
@@ -1117,7 +1117,7 @@ cleanup:
*
* Returns: %GNUTLS_E_SUCCESS (0) on success, or a negative error code.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
int
gnutls_certificate_set_key (gnutls_certificate_credentials_t res,
diff --git a/lib/pkcs11.c b/lib/pkcs11.c
index a988471..f3d2fb2 100644
--- a/lib/pkcs11.c
+++ b/lib/pkcs11.c
@@ -575,7 +575,7 @@ gnutls_pkcs11_init (unsigned int flags, const char
*deprecated_config_file)
* Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
* negative error value.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
int gnutls_pkcs11_reinit (void)
{
diff --git a/lib/pkcs11_privkey.c b/lib/pkcs11_privkey.c
index b195489..afbd8e4 100644
--- a/lib/pkcs11_privkey.c
+++ b/lib/pkcs11_privkey.c
@@ -411,7 +411,7 @@ gnutls_pkcs11_privkey_export_url (gnutls_pkcs11_privkey_t
key,
* Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
* negative error value.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
int
gnutls_pkcs11_privkey_generate (const char* url,
diff --git a/lib/system_override.c b/lib/system_override.c
index 120d4e9..df8c094 100644
--- a/lib/system_override.c
+++ b/lib/system_override.c
@@ -99,7 +99,7 @@ gnutls_transport_set_pull_function (gnutls_session_t session,
* @gnutls_pull_timeout_func is of the form,
* ssize_t (*gnutls_pull_timeout_func)(gnutls_transport_ptr_t, unsigned int
ms);
*
- * Since: 3.0.0
+ * Since: 3.0
**/
void
gnutls_transport_set_pull_timeout_function (gnutls_session_t session,
diff --git a/lib/verify-tofu.c b/lib/verify-tofu.c
index aed2e53..7304cb7 100644
--- a/lib/verify-tofu.c
+++ b/lib/verify-tofu.c
@@ -102,7 +102,7 @@ struct gnutls_tdb_int default_tdb = {
* is returned. On success, %GNUTLS_E_SUCCESS (0) is returned,
* or a negative error value on other errors.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
int
gnutls_verify_stored_pubkey(const char* db_name,
@@ -142,7 +142,7 @@ char local_file[MAX_FILENAME];
}
ret = tdb->verify(db_name, host, service, &pubkey);
- if (ret < 0)
+ if (ret < 0 && ret != GNUTLS_E_CERTIFICATE_KEY_MISMATCH)
ret = gnutls_assert_val(GNUTLS_E_NO_CERTIFICATE_FOUND);
cleanup:
@@ -596,7 +596,7 @@ char buffer[MAX_HASH_SIZE*2+1];
* Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
* negative error value.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
int
gnutls_store_pubkey(const char* db_name,
@@ -681,7 +681,7 @@ cleanup:
* Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
* negative error value.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
int
gnutls_store_commitment(const char* db_name,
diff --git a/lib/x509/common.c b/lib/x509/common.c
index 7397a4e..bfb6aa6 100644
--- a/lib/x509/common.c
+++ b/lib/x509/common.c
@@ -183,7 +183,7 @@ _gnutls_x509_oid_data_choice (const char *oid)
*
* Returns: A null terminated string or NULL otherwise.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
const char*
gnutls_x509_dn_oid_name (const char *oid, unsigned int flags)
diff --git a/lib/x509/crl.c b/lib/x509/crl.c
index 46712bc..3a514c9 100644
--- a/lib/x509/crl.c
+++ b/lib/x509/crl.c
@@ -771,7 +771,7 @@ _get_authority_key_id (gnutls_x509_crl_t cert, ASN1_TYPE
*c2,
*
* Returns: Returns 0 on success, or an error code.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
int
gnutls_x509_crl_get_authority_key_gn_serial (gnutls_x509_crl_t crl,
@@ -1124,7 +1124,7 @@ gnutls_x509_crl_get_extension_data (gnutls_x509_crl_t
crl, int indx,
*
* Returns: the number of certificates read or a negative error value.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
int
gnutls_x509_crl_list_import2 (gnutls_x509_crl_t ** crls,
@@ -1182,7 +1182,7 @@ int ret;
*
* Returns: the number of certificates read or a negative error value.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
int
gnutls_x509_crl_list_import (gnutls_x509_crl_t * crls,
diff --git a/lib/x509/privkey.c b/lib/x509/privkey.c
index 4050127..4d622cc 100644
--- a/lib/x509/privkey.c
+++ b/lib/x509/privkey.c
@@ -834,7 +834,7 @@ cleanup:
* Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
* negative error value.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
int
gnutls_x509_privkey_import_ecc_raw (gnutls_x509_privkey_t key,
@@ -1001,7 +1001,7 @@ gnutls_x509_privkey_sec_param (gnutls_x509_privkey_t key)
* Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
* negative error value.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
int gnutls_x509_privkey_export_ecc_raw (gnutls_x509_privkey_t key,
gnutls_ecc_curve_t *curve,
diff --git a/lib/x509/verify-high.c b/lib/x509/verify-high.c
index 993e451..b9572b2 100644
--- a/lib/x509/verify-high.c
+++ b/lib/x509/verify-high.c
@@ -70,7 +70,7 @@ struct gnutls_x509_trust_list_st {
* Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
* negative error value.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
int
gnutls_x509_trust_list_init(gnutls_x509_trust_list_t * list,
@@ -105,7 +105,7 @@ gnutls_x509_trust_list_init(gnutls_x509_trust_list_t * list,
*
* This function will deinitialize a trust list.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
void
gnutls_x509_trust_list_deinit(gnutls_x509_trust_list_t list,
@@ -148,7 +148,7 @@ gnutls_x509_trust_list_deinit(gnutls_x509_trust_list_t list,
*
* Returns: The number of added elements is returned.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
int
gnutls_x509_trust_list_add_cas(gnutls_x509_trust_list_t list,
@@ -211,7 +211,7 @@ gnutls_x509_trust_list_add_cas(gnutls_x509_trust_list_t
list,
* Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
* negative error value.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
int
gnutls_x509_trust_list_add_named_crt(gnutls_x509_trust_list_t list,
@@ -273,7 +273,7 @@
gnutls_x509_trust_list_add_named_crt(gnutls_x509_trust_list_t list,
*
* Returns: The number of added elements is returned.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
int
gnutls_x509_trust_list_add_crls(gnutls_x509_trust_list_t list,
@@ -412,7 +412,7 @@ static int shorten_clist(gnutls_x509_trust_list_t list,
* Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
* negative error value.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
int gnutls_x509_trust_list_get_issuer(gnutls_x509_trust_list_t list,
gnutls_x509_crt_t cert,
@@ -463,7 +463,7 @@ int
gnutls_x509_trust_list_get_issuer(gnutls_x509_trust_list_t list,
* Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
* negative error value.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
int
gnutls_x509_trust_list_verify_crt(gnutls_x509_trust_list_t list,
@@ -563,7 +563,7 @@ gnutls_x509_trust_list_verify_crt(gnutls_x509_trust_list_t
list,
* Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
* negative error value.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
int
gnutls_x509_trust_list_verify_named_crt(gnutls_x509_trust_list_t list,
diff --git a/lib/x509/x509.c b/lib/x509/x509.c
index 253a241..d98a2b6 100644
--- a/lib/x509/x509.c
+++ b/lib/x509/x509.c
@@ -817,7 +817,7 @@ _get_authority_key_id (gnutls_x509_crt_t cert, ASN1_TYPE
*c2,
*
* Returns: Returns 0 on success, or an error code.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
int
gnutls_x509_crt_get_authority_key_gn_serial (gnutls_x509_crt_t cert, unsigned
int seq, void *alt,
@@ -3051,7 +3051,7 @@ cleanup:
*
* Returns: the number of certificates read or a negative error value.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
int
gnutls_x509_crt_list_import2 (gnutls_x509_crt_t ** certs,
@@ -3546,7 +3546,7 @@ _gnutls_parse_aia (ASN1_TYPE src,
* not match (e.g., when using %GNUTLS_IA_OCSP_URI), otherwise a
* negative error code.
*
- * Since: 3.0.0
+ * Since: 3.0
**/
int
gnutls_x509_crt_get_authority_info_access (gnutls_x509_crt_t crt,
diff --git a/tests/mini-tdb.c b/tests/mini-tdb.c
index 90e187a..d5e148d 100644
--- a/tests/mini-tdb.c
+++ b/tests/mini-tdb.c
@@ -165,6 +165,11 @@ void doit(void)
fail("verification succeed when shouldn't!\n");
goto fail;
}
+ if (ret != GNUTLS_E_CERTIFICATE_KEY_MISMATCH)
+ {
+ fail("Wrong error code returned: %s!\n", gnutls_strerror(ret));
+ goto fail;
+ }
if (debug)
success("Public key verification: passed\n");
hooks/post-receive
--
GNU gnutls
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU gnutls branch, master, updated. gnutls-3_0_12-268-gcd8072b,
Nikos Mavrogiannopoulos <=