[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-58-g836c75d
|
From: |
Simon Josefsson |
|
Subject: |
[SCM] GNU gnutls branch, master, updated. gnutls-3_0_12-58-g836c75d |
|
Date: |
Tue, 24 Jan 2012 09:18:43 +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=836c75deeaa0b1d046e3162ca206096298da463d
The branch, master has been updated
via 836c75deeaa0b1d046e3162ca206096298da463d (commit)
from f0e50f4471a4b8dd30a43fd5f6b5c77a6d257b5a (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 836c75deeaa0b1d046e3162ca206096298da463d
Author: Simon Josefsson <address@hidden>
Date: Tue Jan 24 10:18:38 2012 +0100
Doc fixes.
-----------------------------------------------------------------------
Summary of changes:
doc/manpages/Makefile.am | 3 ++
lib/includes/gnutls/gnutls.h.in | 1 +
lib/includes/gnutls/x509.h | 50 ++++++++++++++++++++++----------------
lib/x509/crl.c | 16 +++++++----
4 files changed, 43 insertions(+), 27 deletions(-)
diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
index 2194e02..687cf2c 100644
--- a/doc/manpages/Makefile.am
+++ b/doc/manpages/Makefile.am
@@ -485,6 +485,7 @@ APIMANS += gnutls_certificate_set_openpgp_key_mem2.3
APIMANS += gnutls_certificate_set_openpgp_keyring_mem.3
APIMANS += gnutls_certificate_set_openpgp_keyring_file.3
APIMANS += gnutls_pkcs11_init.3
+APIMANS += gnutls_pkcs11_reinit.3
APIMANS += gnutls_pkcs11_deinit.3
APIMANS += gnutls_pkcs11_set_token_function.3
APIMANS += gnutls_pkcs11_set_pin_function.3
@@ -559,6 +560,7 @@ APIMANS += gnutls_x509_crt_get_version.3
APIMANS += gnutls_x509_crt_get_key_id.3
APIMANS += gnutls_x509_crt_set_authority_key_id.3
APIMANS += gnutls_x509_crt_get_authority_key_id.3
+APIMANS += gnutls_x509_crt_get_authority_key_gn_serial.3
APIMANS += gnutls_x509_crt_get_subject_key_id.3
APIMANS += gnutls_x509_crt_get_subject_unique_id.3
APIMANS += gnutls_x509_crt_get_issuer_unique_id.3
@@ -646,6 +648,7 @@ APIMANS += gnutls_x509_crl_set_next_update.3
APIMANS += gnutls_x509_crl_set_crt_serial.3
APIMANS += gnutls_x509_crl_set_crt.3
APIMANS += gnutls_x509_crl_get_authority_key_id.3
+APIMANS += gnutls_x509_crl_get_authority_key_gn_serial.3
APIMANS += gnutls_x509_crl_get_number.3
APIMANS += gnutls_x509_crl_get_extension_oid.3
APIMANS += gnutls_x509_crl_get_extension_info.3
diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index c989eec..92acaaa 100644
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -657,6 +657,7 @@ typedef enum
/**
* gnutls_sec_param_t:
* @GNUTLS_SEC_PARAM_UNKNOWN: Cannot be known
+ * @GNUTLS_SEC_PARAM_LOW: low security level
* @GNUTLS_SEC_PARAM_LEGACY: 96 bits of security
* @GNUTLS_SEC_PARAM_NORMAL: 112 bits of security
* @GNUTLS_SEC_PARAM_HIGH: 128 bits of security
diff --git a/lib/includes/gnutls/x509.h b/lib/includes/gnutls/x509.h
index 7fa0ced..b54832a 100644
--- a/lib/includes/gnutls/x509.h
+++ b/lib/includes/gnutls/x509.h
@@ -153,12 +153,16 @@ extern "C"
int gnutls_x509_crt_set_authority_key_id (gnutls_x509_crt_t cert,
const void *id, size_t id_size);
int gnutls_x509_crt_get_authority_key_id (gnutls_x509_crt_t cert,
- void *ret, size_t * ret_size,
+ void *id, size_t * id_size,
unsigned int *critical);
- int gnutls_x509_crt_get_authority_key_gn_serial (gnutls_x509_crt_t cert,
unsigned int seq,
- void *alt, size_t * alt_size, unsigned int
*alt_type,
- void* serial, size_t *serial_size,
- unsigned int *critical);
+ int gnutls_x509_crt_get_authority_key_gn_serial (gnutls_x509_crt_t cert,
+ unsigned int seq,
+ void *alt,
+ size_t * alt_size,
+ unsigned int *alt_type,
+ void* serial,
+ size_t *serial_size,
+ unsigned int *critical);
int gnutls_x509_crt_get_subject_key_id (gnutls_x509_crt_t cert,
void *ret, size_t * ret_size,
@@ -247,13 +251,13 @@ extern "C"
gnutls_datum_t * g, gnutls_datum_t * y);
int gnutls_x509_crt_get_subject_alt_name (gnutls_x509_crt_t cert,
- unsigned int seq, void *ret,
- size_t * ret_size,
+ unsigned int seq, void *san,
+ size_t * san_size,
unsigned int *critical);
int gnutls_x509_crt_get_subject_alt_name2 (gnutls_x509_crt_t cert,
- unsigned int seq, void *ret,
- size_t * ret_size,
- unsigned int *ret_type,
+ unsigned int seq, void *san,
+ size_t * san_size,
+ unsigned int *san_type,
unsigned int *critical);
int gnutls_x509_crt_get_subject_alt_othername_oid (gnutls_x509_crt_t cert,
@@ -262,13 +266,13 @@ extern "C"
size_t * oid_size);
int gnutls_x509_crt_get_issuer_alt_name (gnutls_x509_crt_t cert,
- unsigned int seq, void *ret,
- size_t * ret_size,
+ unsigned int seq, void *ian,
+ size_t * ian_size,
unsigned int *critical);
int gnutls_x509_crt_get_issuer_alt_name2 (gnutls_x509_crt_t cert,
- unsigned int seq, void *ret,
- size_t * ret_size,
- unsigned int *ret_type,
+ unsigned int seq, void *ian,
+ size_t * ian_size,
+ unsigned int *ian_type,
unsigned int *critical);
int gnutls_x509_crt_get_issuer_alt_othername_oid (gnutls_x509_crt_t cert,
@@ -500,13 +504,17 @@ extern "C"
int gnutls_x509_crl_set_crt (gnutls_x509_crl_t crl,
gnutls_x509_crt_t crt, time_t revocation_time);
- int gnutls_x509_crl_get_authority_key_id (gnutls_x509_crl_t crl, void *ret,
- size_t * ret_size,
+ int gnutls_x509_crl_get_authority_key_id (gnutls_x509_crl_t crl, void *id,
+ size_t * id_size,
unsigned int *critical);
- int gnutls_x509_crl_get_authority_key_gn_serial (gnutls_x509_crl_t crl,
unsigned int seq, void *alt,
- size_t * alt_size, unsigned int *alt_type,
- void* serial, size_t *serial_size,
- unsigned int *critical);
+ int gnutls_x509_crl_get_authority_key_gn_serial (gnutls_x509_crl_t crl,
+ unsigned int seq,
+ void *alt,
+ size_t * alt_size,
+ unsigned int *alt_type,
+ void* serial,
+ size_t *serial_size,
+ unsigned int *critical);
int gnutls_x509_crl_get_number (gnutls_x509_crl_t crl, void *ret,
size_t * ret_size, unsigned int *critical);
diff --git a/lib/x509/crl.c b/lib/x509/crl.c
index 9b81ac6..2a3a6aa 100644
--- a/lib/x509/crl.c
+++ b/lib/x509/crl.c
@@ -776,13 +776,17 @@ _get_authority_key_id (gnutls_x509_crl_t cert, ASN1_TYPE
*c2,
* Since: 3.0.0
**/
int
-gnutls_x509_crl_get_authority_key_gn_serial (gnutls_x509_crl_t crl, unsigned
int seq, void *alt,
- size_t * alt_size, unsigned int *alt_type,
- void* serial, size_t *serial_size,
- unsigned int *critical)
+gnutls_x509_crl_get_authority_key_gn_serial (gnutls_x509_crl_t crl,
+ unsigned int seq,
+ void *alt,
+ size_t * alt_size,
+ unsigned int *alt_type,
+ void* serial,
+ size_t *serial_size,
+ unsigned int *critical)
{
-int ret, result, len;
-ASN1_TYPE c2;
+ int ret, result, len;
+ ASN1_TYPE c2;
ret = _get_authority_key_id(crl, &c2, critical);
if (ret < 0)
hooks/post-receive
--
GNU gnutls
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU gnutls branch, master, updated. gnutls-3_0_12-58-g836c75d,
Simon Josefsson <=