[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU gnutls branch, master, updated. gnutls_3_1_0-106-g920a7aa
|
From: |
Simon Josefsson |
|
Subject: |
[SCM] GNU gnutls branch, master, updated. gnutls_3_1_0-106-g920a7aa |
|
Date: |
Thu, 20 Sep 2012 23:04:25 +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=920a7aa76258583d1ba9b9c1d21f167e01647460
The branch, master has been updated
via 920a7aa76258583d1ba9b9c1d21f167e01647460 (commit)
from 7feebc365756ee1e8d98db1d1b1728ec96c6e688 (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 920a7aa76258583d1ba9b9c1d21f167e01647460
Author: Simon Josefsson <address@hidden>
Date: Fri Sep 21 00:57:30 2012 +0200
Fix GTK-DOC warnings.
-----------------------------------------------------------------------
Summary of changes:
doc/reference/Makefile.am | 6 +++++-
lib/gnutls_ui.c | 9 +++++----
lib/includes/gnutls/abstract.h | 2 +-
lib/includes/gnutls/gnutls.h.in | 15 +++++++++------
lib/includes/gnutls/pkcs11.h | 39 ++++++++++++++++++++-------------------
lib/includes/gnutls/tpm.h | 4 ++--
lib/pkcs11.c | 7 ++++---
lib/pkcs11_privkey.c | 6 ++++--
lib/tpm.c | 13 ++++---------
9 files changed, 54 insertions(+), 47 deletions(-)
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 5825d07..0022f7d 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -65,7 +65,7 @@ EXTRA_HFILES=
# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h private_code
IGNORE_HFILES=
-# find lib -name \*.h -exec basename {} \; | grep -v -e ^abstract.h$ -e
^crypto.h$ -e ^dtls.h$ -e ^gnutls.h$ -e ^openpgp.h$ -e ^pkcs11.h$ -e ^pkcs12.h$
-e ^x509.h$ | sort | uniq | sed -e 's/^/\t/' -e 's/$/ \\/'
+# find lib -name \*.h -exec basename {} \; | grep -v -e ^abstract.h$ -e
^crypto.h$ -e ^dtls.h$ -e ^gnutls.h$ -e ^openpgp.h$ -e ^pkcs11.h$ -e ^pkcs12.h$
-e ^x509.h$ -e ^ocsp.h$ -e ^tpm.h$ | sort | uniq | sed -e 's/^/\t/' -e 's/$/
\\/'
IGNORE_HFILES += \
abstract_int.h \
accelerated.h \
@@ -127,6 +127,7 @@ IGNORE_HFILES += \
gnutlsxx.h \
gstr.h \
hash.h \
+ heartbeat.h \
int.h \
keydb.h \
libtasn1.h \
@@ -138,9 +139,11 @@ IGNORE_HFILES += \
packet.h \
parser_aux.h \
pbkdf2-sha1.h \
+ pin.h \
pkcs11_int.h \
psk.h \
psk_passwd.h \
+ randomart.h \
random.h \
safe_renegotiation.h \
server_name.h \
@@ -153,6 +156,7 @@ IGNORE_HFILES += \
structure.h \
system.h \
types.h \
+ verify-high.h \
x509_b64.h \
x509_int.h \
x86.h
diff --git a/lib/gnutls_ui.c b/lib/gnutls_ui.c
index 7775f59..310627c 100644
--- a/lib/gnutls_ui.c
+++ b/lib/gnutls_ui.c
@@ -778,10 +778,11 @@ size_t len;
* gnutls_url_is_supported:
* @url: A PKCS 11 url
*
- * This function will return non-zero if the given URL
- * is supported, and zero if it is not known. Depending
- * on the system libraries GnuTLS may support pkcs11 or
- * tpmkey URLs.
+ * Check whether url is supported. Depending on the system libraries
+ * GnuTLS may support pkcs11 or tpmkey URLs.
+ *
+ * Returns: return non-zero if the given URL is supported, and zero if
+ * it is not known.
*
* Since: 3.1.0
**/
diff --git a/lib/includes/gnutls/abstract.h b/lib/includes/gnutls/abstract.h
index 68e6fc3..245af87 100644
--- a/lib/includes/gnutls/abstract.h
+++ b/lib/includes/gnutls/abstract.h
@@ -227,7 +227,7 @@ gnutls_privkey_import_tpm_raw (gnutls_privkey_t pkey,
const gnutls_datum_t * fdata,
gnutls_tpmkey_fmt_t format,
const char *srk_password,
- const char *tpm_password, unsigned int flags);
+ const char *key_password, unsigned int flags);
int
gnutls_privkey_import_tpm_url (gnutls_privkey_t pkey,
diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index ce77a8a..5ca00ae 100644
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -754,7 +754,8 @@ typedef enum
int gnutls_handshake (gnutls_session_t session);
#define GNUTLS_DEFAULT_HANDSHAKE_TIMEOUT ((unsigned int)-1)
- void gnutls_handshake_set_timeout (gnutls_session_t session, unsigned int
sec);
+ void gnutls_handshake_set_timeout (gnutls_session_t session,
+ unsigned int ms);
int gnutls_rehandshake (gnutls_session_t session);
gnutls_alert_description_t gnutls_alert_get (gnutls_session_t session);
@@ -804,11 +805,13 @@ gnutls_ecc_curve_t gnutls_ecc_curve_get(gnutls_session_t
session);
type);
const char *gnutls_pk_get_name (gnutls_pk_algorithm_t algorithm);
const char *gnutls_sign_get_name (gnutls_sign_algorithm_t algorithm);
- gnutls_digest_algorithm_t gnutls_sign_get_hash_algorithm
(gnutls_sign_algorithm_t);
- gnutls_pk_algorithm_t gnutls_sign_get_pk_algorithm (gnutls_sign_algorithm_t);
-
- gnutls_sign_algorithm_t gnutls_pk_to_sign (gnutls_pk_algorithm_t pk,
- gnutls_digest_algorithm_t d);
+ gnutls_digest_algorithm_t
+ gnutls_sign_get_hash_algorithm (gnutls_sign_algorithm_t sign);
+ gnutls_pk_algorithm_t
+ gnutls_sign_get_pk_algorithm (gnutls_sign_algorithm_t sign);
+ gnutls_sign_algorithm_t
+ gnutls_pk_to_sign (gnutls_pk_algorithm_t pk,
+ gnutls_digest_algorithm_t hash);
#define gnutls_sign_algorithm_get_name gnutls_sign_get_name
diff --git a/lib/includes/gnutls/pkcs11.h b/lib/includes/gnutls/pkcs11.h
index f9abc11..84af6f2 100644
--- a/lib/includes/gnutls/pkcs11.h
+++ b/lib/includes/gnutls/pkcs11.h
@@ -83,9 +83,9 @@ gnutls_pin_callback_t gnutls_pkcs11_get_pin_function (void
**userdata);
int gnutls_pkcs11_add_provider (const char *name, const char *params);
int gnutls_pkcs11_obj_init (gnutls_pkcs11_obj_t * obj);
-void gnutls_pkcs11_obj_set_pin_function (gnutls_pkcs11_obj_t,
- gnutls_pin_callback_t fn,
- void *userdata);
+void gnutls_pkcs11_obj_set_pin_function (gnutls_pkcs11_obj_t obj,
+ gnutls_pin_callback_t fn,
+ void *userdata);
#define GNUTLS_PKCS11_OBJ_FLAG_LOGIN (1<<0) /* force login in the token
for the operation */
#define GNUTLS_PKCS11_OBJ_FLAG_MARK_TRUSTED (1<<1) /* object marked as
trusted */
@@ -109,10 +109,10 @@ typedef enum
GNUTLS_PKCS11_URL_LIB_VERSION /* URL specifies the object on module and
version level */
} gnutls_pkcs11_url_type_t;
-int gnutls_pkcs11_obj_import_url (gnutls_pkcs11_obj_t cert,
+int gnutls_pkcs11_obj_import_url (gnutls_pkcs11_obj_t obj,
const char *url,
- unsigned int flags
- /* GNUTLS_PKCS11_OBJ_FLAG_* */ );
+ unsigned int flags
+ /* GNUTLS_PKCS11_OBJ_FLAG_* */ );
int gnutls_pkcs11_obj_export_url (gnutls_pkcs11_obj_t obj,
gnutls_pkcs11_url_type_t detailed,
char **url);
@@ -279,32 +279,33 @@ gnutls_pkcs11_obj_type_t gnutls_pkcs11_obj_get_type
(gnutls_pkcs11_obj_t obj);
const char *gnutls_pkcs11_type_get_name (gnutls_pkcs11_obj_type_t type);
int gnutls_x509_crt_list_import_pkcs11 (gnutls_x509_crt_t * certs,
- unsigned int cert_max,
+ unsigned int cert_max,
gnutls_pkcs11_obj_t * const objs,
unsigned int flags /* must be zero */);
/* private key functions...*/
int gnutls_pkcs11_privkey_init (gnutls_pkcs11_privkey_t * key);
-void gnutls_pkcs11_privkey_set_pin_function (gnutls_pkcs11_privkey_t,
- gnutls_pin_callback_t fn, void
*userdata);
+void gnutls_pkcs11_privkey_set_pin_function (gnutls_pkcs11_privkey_t key,
+ gnutls_pin_callback_t fn,
+ void *userdata);
void gnutls_pkcs11_privkey_deinit (gnutls_pkcs11_privkey_t key);
int gnutls_pkcs11_privkey_get_pk_algorithm (gnutls_pkcs11_privkey_t key,
- unsigned int *bits);
+ unsigned int *bits);
int gnutls_pkcs11_privkey_get_info (gnutls_pkcs11_privkey_t pkey,
- gnutls_pkcs11_obj_info_t itype,
- void *output, size_t * output_size);
+ gnutls_pkcs11_obj_info_t itype,
+ void *output, size_t * output_size);
int gnutls_pkcs11_privkey_import_url (gnutls_pkcs11_privkey_t pkey,
- const char *url, unsigned int flags);
+ const char *url, unsigned int flags);
int gnutls_pkcs11_privkey_export_url (gnutls_pkcs11_privkey_t key,
- gnutls_pkcs11_url_type_t detailed,
- char **url);
+ gnutls_pkcs11_url_type_t detailed,
+ char **url);
-int
-gnutls_pkcs11_privkey_generate (const char* url,
- gnutls_pk_algorithm_t pk, unsigned int bits,
- const char* label, unsigned int flags);
+int gnutls_pkcs11_privkey_generate (const char* url,
+ gnutls_pk_algorithm_t pk,
+ unsigned int bits,
+ const char* label, unsigned int flags);
#ifdef __cplusplus
}
diff --git a/lib/includes/gnutls/tpm.h b/lib/includes/gnutls/tpm.h
index cea1c75..7d2ffb6 100644
--- a/lib/includes/gnutls/tpm.h
+++ b/lib/includes/gnutls/tpm.h
@@ -40,8 +40,8 @@ typedef struct tpm_key_list_st *gnutls_tpm_key_list_t;
/**
* gnutls_tpmkey_fmt_t:
- * @GNUTLS_TPM_FMT_DER: The portable data format.
- * @GNUTLS_TPM_FMT_CTK_PEM: A custom data format used by some TPM tools.
+ * @GNUTLS_TPMKEY_FMT_DER: The portable data format.
+ * @GNUTLS_TPMKEY_FMT_CTK_PEM: A custom data format used by some TPM tools.
*
* Enumeration of different certificate encoding formats.
*/
diff --git a/lib/pkcs11.c b/lib/pkcs11.c
index 1e7b034..35be7df 100644
--- a/lib/pkcs11.c
+++ b/lib/pkcs11.c
@@ -761,10 +761,11 @@ gnutls_pkcs11_obj_init (gnutls_pkcs11_obj_t * obj)
* set using gnutls_pkcs11_set_pin_function().
*
* Since: 3.1.0
- *
**/
-void gnutls_pkcs11_obj_set_pin_function (gnutls_pkcs11_obj_t obj,
- gnutls_pin_callback_t fn, void
*userdata)
+void
+gnutls_pkcs11_obj_set_pin_function (gnutls_pkcs11_obj_t obj,
+ gnutls_pin_callback_t fn,
+ void *userdata)
{
obj->pin.cb = fn;
obj->pin.data = userdata;
diff --git a/lib/pkcs11_privkey.c b/lib/pkcs11_privkey.c
index 3a6ce09..4e90657 100644
--- a/lib/pkcs11_privkey.c
+++ b/lib/pkcs11_privkey.c
@@ -686,8 +686,10 @@ cleanup:
* Since: 3.1.0
*
**/
-void gnutls_pkcs11_privkey_set_pin_function (gnutls_pkcs11_privkey_t key,
- gnutls_pin_callback_t fn, void
*userdata)
+void
+gnutls_pkcs11_privkey_set_pin_function (gnutls_pkcs11_privkey_t key,
+ gnutls_pin_callback_t fn,
+ void *userdata)
{
key->pin.cb = fn;
key->pin.data = userdata;
diff --git a/lib/tpm.c b/lib/tpm.c
index 47f0466..848cf96 100644
--- a/lib/tpm.c
+++ b/lib/tpm.c
@@ -1052,19 +1052,18 @@ int ret;
* @fdata: The TPM key to be imported
* @format: The format of the private key
* @srk_password: The password for the SRK key (optional)
- * @key_password: A password for the key (optional)
* @flags: One of the %GNUTLS_PUBKEY flags
*
- * This function will import the public key from the provided
- * TPM key structure.
+ * This function will import the public key from the provided TPM key
+ * structure.
*
- * With respect to passwords the same as in gnutls_pubkey_import_tpm_url()
apply.
+ * With respect to passwords the same as in
+ * gnutls_pubkey_import_tpm_url() apply.
*
* Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
* negative error value.
*
* Since: 3.1.0
- *
**/
int
gnutls_pubkey_import_tpm_raw (gnutls_pubkey_t pkey,
@@ -1469,9 +1468,6 @@ err_cc:
*
* This function will deinitialize the list of stored keys in the TPM.
*
- * Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
- * negative error value.
- *
* Since: 3.1.0
**/
void
@@ -1510,7 +1506,6 @@ gnutls_tpm_key_list_get_url (gnutls_tpm_key_list_t list,
unsigned int idx, char*
/**
* gnutls_tpm_get_registered:
* @list: a list to store the keys
- * @srk_password: a password to protect the exported key (optional)
*
* This function will get a list of stored keys in the TPM. The uuid
* of those keys
hooks/post-receive
--
GNU gnutls
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU gnutls branch, master, updated. gnutls_3_1_0-106-g920a7aa,
Simon Josefsson <=