[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU gnutls branch, master, updated. gnutls_2_9_10-392-g9e29e5b
|
From: |
Simon Josefsson |
|
Subject: |
[SCM] GNU gnutls branch, master, updated. gnutls_2_9_10-392-g9e29e5b |
|
Date: |
Fri, 01 Oct 2010 09:20: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=9e29e5be692a074b72e6817879635669d518d30b
The branch, master has been updated
via 9e29e5be692a074b72e6817879635669d518d30b (commit)
via cc81cd0ca10bb454bb1520a6b2acba61ecbc4c2f (commit)
from c6b2251770db3a18de3ff76023b0583d37eb57a1 (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 9e29e5be692a074b72e6817879635669d518d30b
Author: Simon Josefsson <address@hidden>
Date: Fri Oct 1 11:20:36 2010 +0200
Fix compiler warnings.
commit cc81cd0ca10bb454bb1520a6b2acba61ecbc4c2f
Author: Simon Josefsson <address@hidden>
Date: Fri Oct 1 11:20:28 2010 +0200
Mention new APIs.
-----------------------------------------------------------------------
Summary of changes:
NEWS | 3 +-
doc/manpages/Makefile.am | 2 +
lib/gnutls_int.h | 21 +++++++------
lib/includes/gnutls/gnutls.h.in | 52 +++++++++++++++++-----------------
lib/includes/gnutls/pkcs11.h | 60 +++++++++++++++++++-------------------
5 files changed, 71 insertions(+), 67 deletions(-)
diff --git a/NEWS b/NEWS
index 71caf65..af4a431 100644
--- a/NEWS
+++ b/NEWS
@@ -23,7 +23,8 @@ introduced with the new nettle code.
** libgnutls: Corrected advertizing issue for session tickets.
** API and ABI modifications:
-No changes since last version.
+gnutls_x509_crt_get_subject_unique_id: ADDED.
+gnutls_x509_crt_get_issuer_unique_id: ADDED.
* Version 2.11.1 (released 2010-09-14)
diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
index 794c1fa..97ad516 100644
--- a/doc/manpages/Makefile.am
+++ b/doc/manpages/Makefile.am
@@ -561,6 +561,8 @@ APIMANS += gnutls_x509_crt_get_key_purpose_oid.3
APIMANS += gnutls_x509_crt_get_pk_rsa_raw.3
APIMANS += gnutls_x509_crt_get_pk_dsa_raw.3
APIMANS += gnutls_x509_crt_list_import.3
+APIMANS += gnutls_x509_crt_get_subject_unique_id.3
+APIMANS += gnutls_x509_crt_get_issuer_unique_id.3
APIMANS += gnutls_x509_crt_set_dn_by_oid.3
APIMANS += gnutls_x509_crt_set_issuer_dn_by_oid.3
APIMANS += gnutls_x509_crt_set_proxy_dn.3
diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h
index 5d1b64e..5e8d6df 100644
--- a/lib/gnutls_int.h
+++ b/lib/gnutls_int.h
@@ -168,15 +168,16 @@ typedef enum handshake_state_t
#define MAX_CIPHERSUITES 256
typedef enum extensions_t
-{ GNUTLS_EXTENSION_SERVER_NAME = 0,
- GNUTLS_EXTENSION_MAX_RECORD_SIZE = 1,
- GNUTLS_EXTENSION_CERT_TYPE = 9,
- GNUTLS_EXTENSION_SRP = 12,
- GNUTLS_EXTENSION_SIGNATURE_ALGORITHMS = 13,
- GNUTLS_EXTENSION_SESSION_TICKET = 35,
- GNUTLS_EXTENSION_INNER_APPLICATION = 37703,
- GNUTLS_EXTENSION_SAFE_RENEGOTIATION = 65281, /* aka: 0xff01 */
-} extensions_t;
+ {
+ GNUTLS_EXTENSION_SERVER_NAME = 0,
+ GNUTLS_EXTENSION_MAX_RECORD_SIZE = 1,
+ GNUTLS_EXTENSION_CERT_TYPE = 9,
+ GNUTLS_EXTENSION_SRP = 12,
+ GNUTLS_EXTENSION_SIGNATURE_ALGORITHMS = 13,
+ GNUTLS_EXTENSION_SESSION_TICKET = 35,
+ GNUTLS_EXTENSION_INNER_APPLICATION = 37703,
+ GNUTLS_EXTENSION_SAFE_RENEGOTIATION = 65281 /* aka: 0xff01 */
+ } extensions_t;
typedef enum
{ CIPHER_STREAM, CIPHER_BLOCK } cipher_type_t;
@@ -424,7 +425,7 @@ typedef enum {
SR_DISABLED,
SR_UNSAFE,
SR_PARTIAL,
- SR_SAFE,
+ SR_SAFE
} safe_renegotiation_t;
/* For the external api */
diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index 58053f5..79bc595 100644
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -585,21 +585,21 @@ extern "C"
* Enumeration of different digital signature algorithms.
*/
typedef enum
- {
- GNUTLS_SIGN_UNKNOWN = 0,
- GNUTLS_SIGN_RSA_SHA1 = 1,
- GNUTLS_SIGN_RSA_SHA = GNUTLS_SIGN_RSA_SHA1,
- GNUTLS_SIGN_DSA_SHA1 = 2,
- GNUTLS_SIGN_DSA_SHA = GNUTLS_SIGN_DSA_SHA1,
- GNUTLS_SIGN_RSA_MD5 = 3,
- GNUTLS_SIGN_RSA_MD2 = 4,
- GNUTLS_SIGN_RSA_RMD160 = 5,
- GNUTLS_SIGN_RSA_SHA256 = 6,
- GNUTLS_SIGN_RSA_SHA384 = 7,
- GNUTLS_SIGN_RSA_SHA512 = 8,
- GNUTLS_SIGN_RSA_SHA224 = 9,
- GNUTLS_SIGN_DSA_SHA224 = 10,
- GNUTLS_SIGN_DSA_SHA256 = 11,
+ {
+ GNUTLS_SIGN_UNKNOWN = 0,
+ GNUTLS_SIGN_RSA_SHA1 = 1,
+ GNUTLS_SIGN_RSA_SHA = GNUTLS_SIGN_RSA_SHA1,
+ GNUTLS_SIGN_DSA_SHA1 = 2,
+ GNUTLS_SIGN_DSA_SHA = GNUTLS_SIGN_DSA_SHA1,
+ GNUTLS_SIGN_RSA_MD5 = 3,
+ GNUTLS_SIGN_RSA_MD2 = 4,
+ GNUTLS_SIGN_RSA_RMD160 = 5,
+ GNUTLS_SIGN_RSA_SHA256 = 6,
+ GNUTLS_SIGN_RSA_SHA384 = 7,
+ GNUTLS_SIGN_RSA_SHA512 = 8,
+ GNUTLS_SIGN_RSA_SHA224 = 9,
+ GNUTLS_SIGN_DSA_SHA224 = 10,
+ GNUTLS_SIGN_DSA_SHA256 = 11
} gnutls_sign_algorithm_t;
const char *gnutls_sign_algorithm_get_name (gnutls_sign_algorithm_t sign);
@@ -616,14 +616,14 @@ extern "C"
* Enumeration of security parameters for passive attacks
*/
typedef enum
- {
- GNUTLS_SEC_PARAM_UNKNOWN,
- GNUTLS_SEC_PARAM_WEAK,
- GNUTLS_SEC_PARAM_LOW,
- GNUTLS_SEC_PARAM_NORMAL,
- GNUTLS_SEC_PARAM_HIGH,
- GNUTLS_SEC_PARAM_ULTRA,
- } gnutls_sec_param_t;
+ {
+ GNUTLS_SEC_PARAM_UNKNOWN,
+ GNUTLS_SEC_PARAM_WEAK,
+ GNUTLS_SEC_PARAM_LOW,
+ GNUTLS_SEC_PARAM_NORMAL,
+ GNUTLS_SEC_PARAM_HIGH,
+ GNUTLS_SEC_PARAM_ULTRA
+ } gnutls_sec_param_t;
/* If you want to change this, then also change the define in
@@ -1463,9 +1463,9 @@ extern "C"
typedef struct gnutls_pkcs11_privkey_st* gnutls_pkcs11_privkey_t;
typedef enum {
- GNUTLS_PRIVKEY_X509, /* gnutls_x509_privkey_t */
- GNUTLS_PRIVKEY_OPENPGP, /* gnutls_openpgp_privkey_t */
- GNUTLS_PRIVKEY_PKCS11, /* gnutls_pkcs11_privkey_t */
+ GNUTLS_PRIVKEY_X509, /* gnutls_x509_privkey_t */
+ GNUTLS_PRIVKEY_OPENPGP, /* gnutls_openpgp_privkey_t */
+ GNUTLS_PRIVKEY_PKCS11 /* gnutls_pkcs11_privkey_t */
} gnutls_privkey_type_t;
typedef struct gnutls_retr2_st
diff --git a/lib/includes/gnutls/pkcs11.h b/lib/includes/gnutls/pkcs11.h
index 470fe98..477c9ad 100644
--- a/lib/includes/gnutls/pkcs11.h
+++ b/lib/includes/gnutls/pkcs11.h
@@ -53,9 +53,9 @@ int gnutls_pkcs11_obj_init ( gnutls_pkcs11_obj_t
*certificate);
#define GNUTLS_PKCS11_OBJ_FLAG_MARK_SENSITIVE (1<<2) /* object marked as
sensitive (unexportable) */
typedef enum {
- GNUTLS_PKCS11_URL_GENERIC, /* URL specifies the object on token level */
- GNUTLS_PKCS11_URL_LIB, /* URL specifies the object on module level */
- GNUTLS_PKCS11_URL_LIB_VERSION, /* URL specifies the object on module
and version level */
+ GNUTLS_PKCS11_URL_GENERIC, /* URL specifies the object on token level */
+ GNUTLS_PKCS11_URL_LIB, /* URL specifies the object on module level */
+ 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, const char * url,
@@ -76,45 +76,45 @@ int gnutls_pkcs11_delete_url(const char* object_url,
unsigned int flags/* GNUTLS_PKCS11_OBJ_FLAG_* */);
typedef enum {
- GNUTLS_PKCS11_OBJ_ID_HEX=1,
- GNUTLS_PKCS11_OBJ_LABEL,
- GNUTLS_PKCS11_OBJ_TOKEN_LABEL,
- GNUTLS_PKCS11_OBJ_TOKEN_SERIAL,
- GNUTLS_PKCS11_OBJ_TOKEN_MANUFACTURER,
- GNUTLS_PKCS11_OBJ_TOKEN_MODEL,
- GNUTLS_PKCS11_OBJ_ID,
- /* the pkcs11 provider library info */
- GNUTLS_PKCS11_OBJ_LIBRARY_VERSION,
- GNUTLS_PKCS11_OBJ_LIBRARY_DESCRIPTION,
- GNUTLS_PKCS11_OBJ_LIBRARY_MANUFACTURER,
+ GNUTLS_PKCS11_OBJ_ID_HEX=1,
+ GNUTLS_PKCS11_OBJ_LABEL,
+ GNUTLS_PKCS11_OBJ_TOKEN_LABEL,
+ GNUTLS_PKCS11_OBJ_TOKEN_SERIAL,
+ GNUTLS_PKCS11_OBJ_TOKEN_MANUFACTURER,
+ GNUTLS_PKCS11_OBJ_TOKEN_MODEL,
+ GNUTLS_PKCS11_OBJ_ID,
+ /* the pkcs11 provider library info */
+ GNUTLS_PKCS11_OBJ_LIBRARY_VERSION,
+ GNUTLS_PKCS11_OBJ_LIBRARY_DESCRIPTION,
+ GNUTLS_PKCS11_OBJ_LIBRARY_MANUFACTURER
} gnutls_pkcs11_obj_info_t;
int gnutls_pkcs11_obj_get_info(gnutls_pkcs11_obj_t crt,
gnutls_pkcs11_obj_info_t itype, void* output, size_t* output_size);
typedef enum {
- GNUTLS_PKCS11_OBJ_ATTR_CRT_ALL=1, /* all certificates */
- GNUTLS_PKCS11_OBJ_ATTR_CRT_TRUSTED, /* certificates marked as trusted */
- GNUTLS_PKCS11_OBJ_ATTR_CRT_WITH_PRIVKEY, /* certificates with
corresponding private key */
- GNUTLS_PKCS11_OBJ_ATTR_PUBKEY, /* public keys */
- GNUTLS_PKCS11_OBJ_ATTR_PRIVKEY, /* private keys */
- GNUTLS_PKCS11_OBJ_ATTR_ALL, /* everything! */
+ GNUTLS_PKCS11_OBJ_ATTR_CRT_ALL=1, /* all certificates */
+ GNUTLS_PKCS11_OBJ_ATTR_CRT_TRUSTED, /* certificates marked as trusted */
+ GNUTLS_PKCS11_OBJ_ATTR_CRT_WITH_PRIVKEY, /* certificates with corresponding
private key */
+ GNUTLS_PKCS11_OBJ_ATTR_PUBKEY, /* public keys */
+ GNUTLS_PKCS11_OBJ_ATTR_PRIVKEY, /* private keys */
+ GNUTLS_PKCS11_OBJ_ATTR_ALL /* everything! */
} gnutls_pkcs11_obj_attr_t;
/* token info */
typedef enum {
- GNUTLS_PKCS11_TOKEN_LABEL,
- GNUTLS_PKCS11_TOKEN_SERIAL,
- GNUTLS_PKCS11_TOKEN_MANUFACTURER,
- GNUTLS_PKCS11_TOKEN_MODEL,
+ GNUTLS_PKCS11_TOKEN_LABEL,
+ GNUTLS_PKCS11_TOKEN_SERIAL,
+ GNUTLS_PKCS11_TOKEN_MANUFACTURER,
+ GNUTLS_PKCS11_TOKEN_MODEL
} gnutls_pkcs11_token_info_t;
typedef enum {
- GNUTLS_PKCS11_OBJ_UNKNOWN,
- GNUTLS_PKCS11_OBJ_X509_CRT,
- GNUTLS_PKCS11_OBJ_PUBKEY,
- GNUTLS_PKCS11_OBJ_PRIVKEY,
- GNUTLS_PKCS11_OBJ_SECRET_KEY,
- GNUTLS_PKCS11_OBJ_DATA,
+ GNUTLS_PKCS11_OBJ_UNKNOWN,
+ GNUTLS_PKCS11_OBJ_X509_CRT,
+ GNUTLS_PKCS11_OBJ_PUBKEY,
+ GNUTLS_PKCS11_OBJ_PRIVKEY,
+ GNUTLS_PKCS11_OBJ_SECRET_KEY,
+ GNUTLS_PKCS11_OBJ_DATA
} gnutls_pkcs11_obj_type_t;
int gnutls_pkcs11_token_get_url (unsigned int seq, gnutls_pkcs11_url_type_t
detailed, char** url);
hooks/post-receive
--
GNU gnutls
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU gnutls branch, master, updated. gnutls_2_9_10-392-g9e29e5b,
Simon Josefsson <=