[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU gnutls branch, gnutls_3_0_x, updated. gnutls_3_0_0-4-gd73f4b8
|
From: |
Simon Josefsson |
|
Subject: |
[SCM] GNU gnutls branch, gnutls_3_0_x, updated. gnutls_3_0_0-4-gd73f4b8 |
|
Date: |
Tue, 02 Aug 2011 19:34:52 +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=d73f4b89b7cc9866028203d8c00953cc0256db3c
The branch, gnutls_3_0_x has been updated
via d73f4b89b7cc9866028203d8c00953cc0256db3c (commit)
from 6fead893ea19df1514a5a8a49bff6b8af51ba7ce (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 d73f4b89b7cc9866028203d8c00953cc0256db3c
Author: Simon Josefsson <address@hidden>
Date: Tue Aug 2 21:32:32 2011 +0200
Fix GTK-DOC manual.
-----------------------------------------------------------------------
Summary of changes:
lib/algorithms/sign.c | 5 +++--
lib/gnutls_dtls.c | 2 --
lib/gnutls_pubkey.c | 22 ++++++++++++----------
lib/gnutls_record.c | 2 +-
lib/includes/gnutls/abstract.h | 30 +++++++++++++++++++++++++++---
lib/includes/gnutls/crypto.h | 2 +-
lib/includes/gnutls/dtls.h | 6 +++---
lib/includes/gnutls/gnutls.h.in | 21 ++++++++++++---------
lib/includes/gnutls/openpgp.h | 6 +++---
lib/includes/gnutls/pkcs11.h | 3 +--
lib/nettle/ecc_free.c | 4 ++--
lib/nettle/ecc_make_key.c | 4 ++--
lib/nettle/ecc_map.c | 4 ++--
lib/nettle/ecc_mulmod.c | 4 ++--
lib/nettle/ecc_points.c | 6 +++---
lib/nettle/ecc_projective_add_point.c | 4 ++--
lib/nettle/ecc_projective_dbl_point.c | 2 +-
lib/nettle/ecc_projective_dbl_point_3.c | 4 ++--
lib/nettle/ecc_shared_secret.c | 4 ++--
lib/nettle/ecc_sign_hash.c | 4 ++--
lib/nettle/ecc_verify_hash.c | 4 ++--
lib/pkcs11.c | 17 ++++++-----------
22 files changed, 91 insertions(+), 69 deletions(-)
diff --git a/lib/algorithms/sign.c b/lib/algorithms/sign.c
index 9af8a53..5f45636 100644
--- a/lib/algorithms/sign.c
+++ b/lib/algorithms/sign.c
@@ -90,7 +90,7 @@ static const gnutls_sign_entry sign_algorithms[] = {
/**
* gnutls_sign_get_name:
- * @sign: is a sign algorithm
+ * @algorithm: is a sign algorithm
*
* Convert a #gnutls_sign_algorithm_t value to a string.
*
@@ -98,8 +98,9 @@ static const gnutls_sign_entry sign_algorithms[] = {
* algorithm, or %NULL.
**/
const char *
-gnutls_sign_get_name (gnutls_sign_algorithm_t sign)
+gnutls_sign_get_name (gnutls_sign_algorithm_t algorithm)
{
+ gnutls_sign_algorithm_t sign = algorithm;
const char *ret = NULL;
/* avoid prefix */
diff --git a/lib/gnutls_dtls.c b/lib/gnutls_dtls.c
index 51560f3..adafc6b 100644
--- a/lib/gnutls_dtls.c
+++ b/lib/gnutls_dtls.c
@@ -683,8 +683,6 @@ uint8_t digest[C_HASH_SIZE];
* the cookie authentication with the client, with the newly
* established session.
*
- * Returns: %GNUTLS_E_SUCCESS (0) on success, or a negative error code.
- *
* Since: 3.0.0
**/
void gnutls_dtls_prestate_set(gnutls_session_t session,
gnutls_dtls_prestate_st* prestate)
diff --git a/lib/gnutls_pubkey.c b/lib/gnutls_pubkey.c
index 864a45a..45c8118 100644
--- a/lib/gnutls_pubkey.c
+++ b/lib/gnutls_pubkey.c
@@ -187,14 +187,14 @@ gnutls_pubkey_import_x509 (gnutls_pubkey_t key,
gnutls_x509_crt_t crt,
}
/**
- * gnutls_pubkey_import_privkey: Imports the public key from a private
+ * gnutls_pubkey_import_privkey:
* @key: The public key
* @pkey: The private key
* @usage: GNUTLS_KEY_* key usage flags.
* @flags: should be zero
*
- * This function will import the given public key to the abstract
- * #gnutls_pubkey_t structure.
+ * Imports the public key from a private. This function will import
+ * the given public key to the abstract #gnutls_pubkey_t structure.
*
* Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
* negative error value.
@@ -250,13 +250,13 @@ gnutls_pubkey_get_preferred_hash_algorithm
(gnutls_pubkey_t key,
#ifdef ENABLE_PKCS11
/**
- * gnutls_pubkey_import_pkcs11: Imports a public key from a pkcs11 key
+ * gnutls_pubkey_import_pkcs11:
* @key: The public key
* @obj: The parameters to be imported
* @flags: should be zero
*
- * This function will import the given public key to the abstract
- * #gnutls_pubkey_t structure.
+ * Imports a public key from a pkcs11 key. This function will import
+ * the given public key to the abstract #gnutls_pubkey_t structure.
*
* Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
* negative error value.
@@ -304,15 +304,17 @@ gnutls_pubkey_import_pkcs11 (gnutls_pubkey_t key,
#endif /* ENABLE_PKCS11 */
#ifdef ENABLE_OPENPGP
+
/**
- * gnutls_pubkey_import_openpgp: Imports a public key from an openpgp key
+ * gnutls_pubkey_import_openpgp:
* @key: The public key
* @crt: The certificate to be imported
* @flags: should be zero
*
- * This function will import the given public key to the abstract
- * #gnutls_pubkey_t structure. The subkey set as preferred will be
- * imported or the master key otherwise.
+ * Imports a public key from an openpgp key. This function will import
+ * the given public key to the abstract #gnutls_pubkey_t
+ * structure. The subkey set as preferred will be imported or the
+ * master key otherwise.
*
* Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
* negative error value.
diff --git a/lib/gnutls_record.c b/lib/gnutls_record.c
index 771d6e4..053e317 100644
--- a/lib/gnutls_record.c
+++ b/lib/gnutls_record.c
@@ -1204,7 +1204,7 @@ _gnutls_recv_int (gnutls_session_t session,
content_type_t type,
* number of bytes sent might be less than @data_size. The maximum
* number of bytes this function can send in a single call depends
* on the negotiated maximum record size.
- **/
+ **/
ssize_t
gnutls_record_send (gnutls_session_t session, const void *data,
size_t data_size)
diff --git a/lib/includes/gnutls/abstract.h b/lib/includes/gnutls/abstract.h
index c1a028e..a374c03 100644
--- a/lib/includes/gnutls/abstract.h
+++ b/lib/includes/gnutls/abstract.h
@@ -1,3 +1,27 @@
+/*
+ * Copyright (C) 2010-2011 Free Software Foundation, Inc.
+ *
+ * Author: Nikos Mavrogiannopoulos
+ *
+ * This file is part of GnuTLS.
+ *
+ * The GnuTLS is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ */
+
#ifndef __GNUTLS_ABSTRACT_H
#define __GNUTLS_ABSTRACT_H
@@ -21,9 +45,9 @@ int gnutls_pubkey_get_pk_algorithm (gnutls_pubkey_t key,
unsigned int *bits);
int gnutls_pubkey_import_x509 (gnutls_pubkey_t key, gnutls_x509_crt_t crt,
unsigned int flags);
-int gnutls_pubkey_import_pkcs11 (gnutls_pubkey_t pkey,
- gnutls_pkcs11_obj_t crt, unsigned int flags);
-int gnutls_pubkey_import_openpgp (gnutls_pubkey_t pkey,
+int gnutls_pubkey_import_pkcs11 (gnutls_pubkey_t key,
+ gnutls_pkcs11_obj_t obj, unsigned int flags);
+int gnutls_pubkey_import_openpgp (gnutls_pubkey_t key,
gnutls_openpgp_crt_t crt,
unsigned int flags);
int
diff --git a/lib/includes/gnutls/crypto.h b/lib/includes/gnutls/crypto.h
index 2681d81..61d851a 100644
--- a/lib/includes/gnutls/crypto.h
+++ b/lib/includes/gnutls/crypto.h
@@ -50,7 +50,7 @@ extern "C"
void gnutls_cipher_set_iv (gnutls_cipher_hd_t handle, void *iv, size_t
ivlen);
int gnutls_cipher_tag( gnutls_cipher_hd_t handle, void* tag, size_t
tag_size);
- int gnutls_cipher_add_auth( gnutls_cipher_hd_t handle, const void* test,
size_t textlen);
+ int gnutls_cipher_add_auth( gnutls_cipher_hd_t handle, const void* text,
size_t text_size);
void gnutls_cipher_deinit (gnutls_cipher_hd_t handle);
int gnutls_cipher_get_block_size (gnutls_cipher_algorithm_t algorithm);
diff --git a/lib/includes/gnutls/dtls.h b/lib/includes/gnutls/dtls.h
index 39cb52d..da8d283 100644
--- a/lib/includes/gnutls/dtls.h
+++ b/lib/includes/gnutls/dtls.h
@@ -53,15 +53,15 @@ typedef struct {
} gnutls_dtls_prestate_st;
int gnutls_dtls_cookie_send(gnutls_datum_t* key, void* client_data, size_t
client_data_size,
- gnutls_dtls_prestate_st* state,
+ gnutls_dtls_prestate_st* prestate,
gnutls_transport_ptr_t ptr, gnutls_push_func push_func);
int gnutls_dtls_cookie_verify(gnutls_datum_t* key,
void* client_data, size_t client_data_size,
- void* _msg, size_t msg_size, gnutls_dtls_prestate_st* state);
+ void* _msg, size_t msg_size, gnutls_dtls_prestate_st* prestate);
-void gnutls_dtls_prestate_set(gnutls_session_t session,
gnutls_dtls_prestate_st* st);
+void gnutls_dtls_prestate_set(gnutls_session_t session,
gnutls_dtls_prestate_st* prestate);
#ifdef __cplusplus
}
diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index 912da27..5220ab8 100644
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -1,6 +1,6 @@
/* -*- c -*-
* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
- * 2009, 2010 Free Software Foundation, Inc.
+ * 2009, 2010, 2011 Free Software Foundation, Inc.
*
* Author: Nikos Mavroyanopoulos
*
@@ -167,6 +167,7 @@ extern "C"
* gnutls_params_type_t:
* @GNUTLS_PARAMS_RSA_EXPORT: Session RSA-EXPORT parameters.
* @GNUTLS_PARAMS_DH: Session Diffie-Hellman parameters.
+ * @GNUTLS_PARAMS_ECDH: Session Elliptic-Curve Diffie-Hellman parameters.
*
* Enumeration of different TLS session parameter types.
*/
@@ -211,6 +212,7 @@ extern "C"
* @GNUTLS_MAC_SHA384: HMAC-SHA-384 algorithm.
* @GNUTLS_MAC_SHA512: HMAC-SHA-512 algorithm.
* @GNUTLS_MAC_SHA224: HMAC-SHA-224 algorithm.
+ * @GNUTLS_MAC_AEAD: MAC implicit through AEAD cipher.
*
* Enumeration of different Message Authentication Code (MAC)
* algorithms.
@@ -285,7 +287,7 @@ extern "C"
GNUTLS_COMP_ZLIB = GNUTLS_COMP_DEFLATE,
} gnutls_compression_method_t;
- /**
+ /*
* Flags for gnutls_init()
*
* @GNUTLS_SERVER: Connection end is a server.
@@ -397,7 +399,8 @@ extern "C"
* @GNUTLS_HANDSHAKE_CLIENT_KEY_EXCHANGE: Client key exchange.
* @GNUTLS_HANDSHAKE_FINISHED: Finished.
* @GNUTLS_HANDSHAKE_SUPPLEMENTAL: Supplemental.
- * @GNUTLS_HANDSHAKE_CHANGE_CIPHER_SPEC: Change Cipher Spec
+ * @GNUTLS_HANDSHAKE_CHANGE_CIPHER_SPEC: Change Cipher Spe.ec
+ * @GNUTLS_HANDSHAKE_CLIENT_HELLO_V2: SSLv2 Client Hello.
*
* Enumeration of different TLS handshake packets.
*/
@@ -802,7 +805,7 @@ gnutls_ecc_curve_t gnutls_ecc_curve_get(gnutls_session_t
session);
gnutls_kx_algorithm_t * kx,
gnutls_cipher_algorithm_t * cipher,
gnutls_mac_algorithm_t * mac,
- gnutls_protocol_t * version);
+ gnutls_protocol_t * min_version);
/* error functions */
int gnutls_error_is_fatal (int error);
@@ -824,9 +827,9 @@ gnutls_ecc_curve_t gnutls_ecc_curve_get(gnutls_session_t
session);
/* Record layer functions.
*/
ssize_t gnutls_record_send (gnutls_session_t session, const void *data,
- size_t sizeofdata);
+ size_t data_size);
ssize_t gnutls_record_recv (gnutls_session_t session, void *data,
- size_t sizeofdata);
+ size_t data_size);
#define gnutls_read gnutls_record_recv
#define gnutls_write gnutls_record_send
ssize_t gnutls_record_recv_seq (gnutls_session_t session, void *data, size_t
data_size,
@@ -1162,7 +1165,7 @@ gnutls_ecc_curve_t gnutls_ecc_curve_get(gnutls_session_t
session);
gnutls_realloc_function realloc_func,
gnutls_free_function free_func);
- void gnutls_global_set_time_function (gnutls_time_func);
+ void gnutls_global_set_time_function (gnutls_time_func time_func);
/* For use in callbacks */
extern gnutls_alloc_function gnutls_malloc;
@@ -1217,7 +1220,7 @@ gnutls_ecc_curve_t gnutls_ecc_curve_get(gnutls_session_t
session);
const gnutls_datum_t * u);
int gnutls_rsa_params_generate2 (gnutls_rsa_params_t params,
unsigned int bits);
- int gnutls_rsa_params_export_raw (gnutls_rsa_params_t params,
+ int gnutls_rsa_params_export_raw (gnutls_rsa_params_t rsa,
gnutls_datum_t * m, gnutls_datum_t * e,
gnutls_datum_t * d, gnutls_datum_t * p,
gnutls_datum_t * q, gnutls_datum_t * u,
@@ -1399,7 +1402,7 @@ gnutls_ecc_curve_t gnutls_ecc_curve_get(gnutls_session_t
session);
int gnutls_psk_set_client_credentials (gnutls_psk_client_credentials_t res,
const char *username,
const gnutls_datum_t * key,
- gnutls_psk_key_flags format);
+ gnutls_psk_key_flags flags);
void
gnutls_psk_free_server_credentials (gnutls_psk_server_credentials_t sc);
diff --git a/lib/includes/gnutls/openpgp.h b/lib/includes/gnutls/openpgp.h
index 6dfa786..884af35 100644
--- a/lib/includes/gnutls/openpgp.h
+++ b/lib/includes/gnutls/openpgp.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+ * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
* Software Foundation, Inc.
*
* Author: Nikos Mavrogiannopoulos
@@ -318,8 +318,8 @@ extern "C"
/* certificate authentication stuff.
*/
- int gnutls_certificate_set_openpgp_key (gnutls_certificate_credentials_t
- res, gnutls_openpgp_crt_t key,
+ int gnutls_certificate_set_openpgp_key (gnutls_certificate_credentials_t res,
+ gnutls_openpgp_crt_t crt,
gnutls_openpgp_privkey_t pkey);
int
diff --git a/lib/includes/gnutls/pkcs11.h b/lib/includes/gnutls/pkcs11.h
index 647b241..ca893b9 100644
--- a/lib/includes/gnutls/pkcs11.h
+++ b/lib/includes/gnutls/pkcs11.h
@@ -242,8 +242,7 @@ int gnutls_x509_crt_import_pkcs11_url (gnutls_x509_crt_t
crt, const char *url,
unsigned int flags
/* GNUTLS_PKCS11_OBJ_FLAG_* */ );
-gnutls_pkcs11_obj_type_t gnutls_pkcs11_obj_get_type (gnutls_pkcs11_obj_t
- certificate);
+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);
int gnutls_x509_crt_list_import_pkcs11 (gnutls_x509_crt_t * certs, unsigned
int cert_max,
diff --git a/lib/nettle/ecc_free.c b/lib/nettle/ecc_free.c
index bdc244e..a07d107 100644
--- a/lib/nettle/ecc_free.c
+++ b/lib/nettle/ecc_free.c
@@ -24,12 +24,12 @@
#include "ecc.h"
-/**
+/*
@file ecc_free.c
ECC Crypto, Tom St Denis
*/
-/**
+/*
Free an ECC key from memory
@param key The key you wish to free
*/
diff --git a/lib/nettle/ecc_make_key.c b/lib/nettle/ecc_make_key.c
index a86608d..ba19e3d 100644
--- a/lib/nettle/ecc_make_key.c
+++ b/lib/nettle/ecc_make_key.c
@@ -24,12 +24,12 @@
#include "ecc.h"
-/**
+/*
@file ecc_make_key.c
ECC Crypto, Tom St Denis
*/
-/**
+/*
Make a new ECC key
@param prng An active PRNG state
@param wprng The index of the PRNG you wish to use
diff --git a/lib/nettle/ecc_map.c b/lib/nettle/ecc_map.c
index 501e61c..a08f720 100644
--- a/lib/nettle/ecc_map.c
+++ b/lib/nettle/ecc_map.c
@@ -24,12 +24,12 @@
#include "ecc.h"
-/**
+/*
@file ecc_map.c
ECC Crypto, Tom St Denis
*/
-/**
+/*
Map a projective jacobian point back to affine space
@param P [in/out] The point to map
@param modulus The modulus of the field the ECC curve is in
diff --git a/lib/nettle/ecc_mulmod.c b/lib/nettle/ecc_mulmod.c
index d43aa05..e4f8f99 100644
--- a/lib/nettle/ecc_mulmod.c
+++ b/lib/nettle/ecc_mulmod.c
@@ -24,12 +24,12 @@
#include "ecc.h"
-/**
+/*
@file ecc_mulmod_timing.c
ECC Crypto, Tom St Denis
*/
-/**
+/*
Perform a point multiplication (timing resistant)
@param k The scalar to multiply by
@param G The base point
diff --git a/lib/nettle/ecc_points.c b/lib/nettle/ecc_points.c
index c1a90aa..44f1350 100644
--- a/lib/nettle/ecc_points.c
+++ b/lib/nettle/ecc_points.c
@@ -24,12 +24,12 @@
#include "ecc.h"
-/**
+/*
@file ecc_points.c
ECC Crypto, Tom St Denis
*/
-/**
+/*
Allocate a new ECC point
@return A newly allocated point or NULL on error
*/
@@ -50,7 +50,7 @@ ecc_new_point (void)
return p;
}
-/** Free an ECC point from memory
+/* Free an ECC point from memory
@param p The point to free
*/
void
diff --git a/lib/nettle/ecc_projective_add_point.c
b/lib/nettle/ecc_projective_add_point.c
index 30c4cbb..912f849 100644
--- a/lib/nettle/ecc_projective_add_point.c
+++ b/lib/nettle/ecc_projective_add_point.c
@@ -24,12 +24,12 @@
#include "ecc.h"
-/**
+/*
@file ecc_projective_add_point.c
ECC Crypto, Tom St Denis
*/
-/**
+/*
Add two ECC points
@param P The point to add
@param Q The point to add
diff --git a/lib/nettle/ecc_projective_dbl_point.c
b/lib/nettle/ecc_projective_dbl_point.c
index 859ebd4..2b2ce2d 100644
--- a/lib/nettle/ecc_projective_dbl_point.c
+++ b/lib/nettle/ecc_projective_dbl_point.c
@@ -26,7 +26,7 @@
#ifndef ECC_SECP_CURVES_ONLY
-/**
+/*
Double an ECC point
@param P The point to double
@param R [out] The destination of the double
diff --git a/lib/nettle/ecc_projective_dbl_point_3.c
b/lib/nettle/ecc_projective_dbl_point_3.c
index c48a947..8695044 100644
--- a/lib/nettle/ecc_projective_dbl_point_3.c
+++ b/lib/nettle/ecc_projective_dbl_point_3.c
@@ -24,14 +24,14 @@
#include "ecc.h"
-/**
+/*
@file ecc_projective_dbl_point.c
ECC Crypto, Tom St Denis
*/
#ifdef ECC_SECP_CURVES_ONLY
-/**
+/*
Double an ECC point
@param P The point to double
@param R [out] The destination of the double
diff --git a/lib/nettle/ecc_shared_secret.c b/lib/nettle/ecc_shared_secret.c
index 2adea7c..85246a1 100644
--- a/lib/nettle/ecc_shared_secret.c
+++ b/lib/nettle/ecc_shared_secret.c
@@ -25,12 +25,12 @@
#include "ecc.h"
#include <string.h>
-/**
+/*
@file ecc_shared_secret.c
ECC Crypto, Tom St Denis
*/
-/**
+/*
Create an ECC shared secret between two keys
@param private_key The private ECC key
@param public_key The public key
diff --git a/lib/nettle/ecc_sign_hash.c b/lib/nettle/ecc_sign_hash.c
index af395db..1993656 100644
--- a/lib/nettle/ecc_sign_hash.c
+++ b/lib/nettle/ecc_sign_hash.c
@@ -25,12 +25,12 @@
#include "ecc.h"
#include <nettle/dsa.h>
-/**
+/*
@file ecc_sign_hash.c
ECC Crypto, Tom St Denis
*/
-/**
+/*
Sign a message digest
@param in The message digest to sign
@param inlen The length of the digest
diff --git a/lib/nettle/ecc_verify_hash.c b/lib/nettle/ecc_verify_hash.c
index 4f4ddbb..3a6b2f7 100644
--- a/lib/nettle/ecc_verify_hash.c
+++ b/lib/nettle/ecc_verify_hash.c
@@ -24,7 +24,7 @@
#include "ecc.h"
-/**
+/*
@file ecc_verify_hash.c
ECC Crypto, Tom St Denis
*/
@@ -39,7 +39,7 @@
* accept if v == r
*/
-/**
+/*
Verify an ECC signature
@param signature The signature to verify
@param hash The hash (message digest) that was signed
diff --git a/lib/pkcs11.c b/lib/pkcs11.c
index 7366965..a444417 100644
--- a/lib/pkcs11.c
+++ b/lib/pkcs11.c
@@ -1,6 +1,6 @@
/*
* GnuTLS PKCS#11 support
- * Copyright (C) 2010 Free Software Foundation
+ * Copyright (C) 2010, 2011 Free Software Foundation
* Copyright (C) 2008, Joe Orton <address@hidden>
*
* Author: Nikos Mavrogiannopoulos
@@ -281,10 +281,11 @@ gnutls_pkcs11_add_provider (const char *name, const char
*params)
* @output: where output will be stored
* @output_size: contains the maximum size of the output and will be
overwritten with actual
*
- * This function will return information about the PKCS 11 certificatesuch
- * as the label, id as well as token information where the key is stored. When
- * output is text it returns null terminated string although %output_size
contains
- * the size of the actual data only.
+ * This function will return information about the PKCS 11
+ * certificatesuch as the label, id as well as token information where
+ * the key is stored. When output is text it returns null terminated
+ * string although @output_size contains the size of the actual data
+ * only.
*
* Returns: %GNUTLS_E_SUCCESS (0) on success or a negative error code on error.
**/
@@ -583,9 +584,6 @@ gnutls_pkcs11_deinit (void)
* the token is locked due to too many incorrect PINs!). For the
* first such invocation, the 'attempt' counter will have value zero;
* it will increase by one for each subsequent attempt.
- *
- * Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
- * negative error value.
**/
void
gnutls_pkcs11_set_pin_function (gnutls_pkcs11_pin_callback_t fn,
@@ -602,9 +600,6 @@ gnutls_pkcs11_set_pin_function
(gnutls_pkcs11_pin_callback_t fn,
*
* This function will set a callback function to be used when a token
* needs to be inserted to continue PKCS 11 operations.
- *
- * Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
- * negative error value.
**/
void
gnutls_pkcs11_set_token_function (gnutls_pkcs11_token_callback_t fn,
hooks/post-receive
--
GNU gnutls
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU gnutls branch, gnutls_3_0_x, updated. gnutls_3_0_0-4-gd73f4b8,
Simon Josefsson <=