| gnutls.h (3.3.10) | | gnutls.h (3.3.11) | |
| | | | |
| skipping to change at line 56 | | skipping to change at line 56 | |
| #endif | | #endif | |
| /* Get time_t. */ | | /* Get time_t. */ | |
| #include <time.h> | | #include <time.h> | |
| | | | |
| /* *INDENT-OFF* */ | | /* *INDENT-OFF* */ | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| extern "C" { | | extern "C" { | |
| #endif | | #endif | |
| /* *INDENT-ON* */ | | /* *INDENT-ON* */ | |
| | | | |
|
| #define GNUTLS_VERSION "3.3.10" | | #define GNUTLS_VERSION "3.3.11" | |
| | | | |
| #define GNUTLS_VERSION_MAJOR 3 | | #define GNUTLS_VERSION_MAJOR 3 | |
| #define GNUTLS_VERSION_MINOR 3 | | #define GNUTLS_VERSION_MINOR 3 | |
|
| #define GNUTLS_VERSION_PATCH 10 | | #define GNUTLS_VERSION_PATCH 11 | |
| | | | |
|
| #define GNUTLS_VERSION_NUMBER 0x03030a | | #define GNUTLS_VERSION_NUMBER 0x03030b | |
| | | | |
| #define GNUTLS_CIPHER_RIJNDAEL_128_CBC GNUTLS_CIPHER_AES_128_CBC | | #define GNUTLS_CIPHER_RIJNDAEL_128_CBC GNUTLS_CIPHER_AES_128_CBC | |
| #define GNUTLS_CIPHER_RIJNDAEL_256_CBC GNUTLS_CIPHER_AES_256_CBC | | #define GNUTLS_CIPHER_RIJNDAEL_256_CBC GNUTLS_CIPHER_AES_256_CBC | |
| #define GNUTLS_CIPHER_RIJNDAEL_CBC GNUTLS_CIPHER_AES_128_CBC | | #define GNUTLS_CIPHER_RIJNDAEL_CBC GNUTLS_CIPHER_AES_128_CBC | |
| #define GNUTLS_CIPHER_ARCFOUR GNUTLS_CIPHER_ARCFOUR_128 | | #define GNUTLS_CIPHER_ARCFOUR GNUTLS_CIPHER_ARCFOUR_128 | |
| | | | |
| /** | | /** | |
| * gnutls_cipher_algorithm_t: | | * gnutls_cipher_algorithm_t: | |
| * @GNUTLS_CIPHER_UNKNOWN: Unknown algorithm. | | * @GNUTLS_CIPHER_UNKNOWN: Unknown algorithm. | |
| * @GNUTLS_CIPHER_NULL: NULL algorithm. | | * @GNUTLS_CIPHER_NULL: NULL algorithm. | |
| | | | |
| skipping to change at line 88 | | skipping to change at line 88 | |
| * @GNUTLS_CIPHER_ARCFOUR_40: ARCFOUR stream cipher with 40-bit keys. | | * @GNUTLS_CIPHER_ARCFOUR_40: ARCFOUR stream cipher with 40-bit keys. | |
| * @GNUTLS_CIPHER_CAMELLIA_128_CBC: Camellia in CBC mode with 128-bit keys. | | * @GNUTLS_CIPHER_CAMELLIA_128_CBC: Camellia in CBC mode with 128-bit keys. | |
| * @GNUTLS_CIPHER_CAMELLIA_192_CBC: Camellia in CBC mode with 192-bit keys. | | * @GNUTLS_CIPHER_CAMELLIA_192_CBC: Camellia in CBC mode with 192-bit keys. | |
| * @GNUTLS_CIPHER_CAMELLIA_256_CBC: Camellia in CBC mode with 256-bit keys. | | * @GNUTLS_CIPHER_CAMELLIA_256_CBC: Camellia in CBC mode with 256-bit keys. | |
| * @GNUTLS_CIPHER_RC2_40_CBC: RC2 in CBC mode with 40-bit keys. | | * @GNUTLS_CIPHER_RC2_40_CBC: RC2 in CBC mode with 40-bit keys. | |
| * @GNUTLS_CIPHER_DES_CBC: DES in CBC mode (56-bit keys). | | * @GNUTLS_CIPHER_DES_CBC: DES in CBC mode (56-bit keys). | |
| * @GNUTLS_CIPHER_AES_128_GCM: AES in GCM mode with 128-bit keys. | | * @GNUTLS_CIPHER_AES_128_GCM: AES in GCM mode with 128-bit keys. | |
| * @GNUTLS_CIPHER_AES_256_GCM: AES in GCM mode with 256-bit keys. | | * @GNUTLS_CIPHER_AES_256_GCM: AES in GCM mode with 256-bit keys. | |
| * @GNUTLS_CIPHER_CAMELLIA_128_GCM: CAMELLIA in GCM mode with 128-bit keys. | | * @GNUTLS_CIPHER_CAMELLIA_128_GCM: CAMELLIA in GCM mode with 128-bit keys. | |
| * @GNUTLS_CIPHER_CAMELLIA_256_GCM: CAMELLIA in GCM mode with 256-bit keys. | | * @GNUTLS_CIPHER_CAMELLIA_256_GCM: CAMELLIA in GCM mode with 256-bit keys. | |
|
| | | * @GNUTLS_CIPHER_SALSA20_256: Salsa20 with 256-bit keys. | |
| | | * @GNUTLS_CIPHER_ESTREAM_SALSA20_256: Estream's Salsa20 variant with 256-b | |
| | | it keys. | |
| * @GNUTLS_CIPHER_IDEA_PGP_CFB: IDEA in CFB mode. | | * @GNUTLS_CIPHER_IDEA_PGP_CFB: IDEA in CFB mode. | |
| * @GNUTLS_CIPHER_3DES_PGP_CFB: 3DES in CFB mode. | | * @GNUTLS_CIPHER_3DES_PGP_CFB: 3DES in CFB mode. | |
| * @GNUTLS_CIPHER_CAST5_PGP_CFB: CAST5 in CFB mode. | | * @GNUTLS_CIPHER_CAST5_PGP_CFB: CAST5 in CFB mode. | |
| * @GNUTLS_CIPHER_BLOWFISH_PGP_CFB: Blowfish in CFB mode. | | * @GNUTLS_CIPHER_BLOWFISH_PGP_CFB: Blowfish in CFB mode. | |
| * @GNUTLS_CIPHER_SAFER_SK128_PGP_CFB: Safer-SK in CFB mode with 128-bit ke
ys. | | * @GNUTLS_CIPHER_SAFER_SK128_PGP_CFB: Safer-SK in CFB mode with 128-bit ke
ys. | |
| * @GNUTLS_CIPHER_AES128_PGP_CFB: AES in CFB mode with 128-bit keys. | | * @GNUTLS_CIPHER_AES128_PGP_CFB: AES in CFB mode with 128-bit keys. | |
| * @GNUTLS_CIPHER_AES192_PGP_CFB: AES in CFB mode with 192-bit keys. | | * @GNUTLS_CIPHER_AES192_PGP_CFB: AES in CFB mode with 192-bit keys. | |
| * @GNUTLS_CIPHER_AES256_PGP_CFB: AES in CFB mode with 256-bit keys. | | * @GNUTLS_CIPHER_AES256_PGP_CFB: AES in CFB mode with 256-bit keys. | |
| * @GNUTLS_CIPHER_TWOFISH_PGP_CFB: Twofish in CFB mode. | | * @GNUTLS_CIPHER_TWOFISH_PGP_CFB: Twofish in CFB mode. | |
| * | | * | |
| | | | |
| skipping to change at line 361 | | skipping to change at line 363 | |
| * @GNUTLS_A_INTERNAL_ERROR: Internal error. | | * @GNUTLS_A_INTERNAL_ERROR: Internal error. | |
| * @GNUTLS_A_NO_RENEGOTIATION: No renegotiation is allowed. | | * @GNUTLS_A_NO_RENEGOTIATION: No renegotiation is allowed. | |
| * @GNUTLS_A_CERTIFICATE_UNOBTAINABLE: Could not retrieve the | | * @GNUTLS_A_CERTIFICATE_UNOBTAINABLE: Could not retrieve the | |
| * specified certificate. | | * specified certificate. | |
| * @GNUTLS_A_UNSUPPORTED_EXTENSION: An unsupported extension was | | * @GNUTLS_A_UNSUPPORTED_EXTENSION: An unsupported extension was | |
| * sent. | | * sent. | |
| * @GNUTLS_A_UNRECOGNIZED_NAME: The server name sent was not | | * @GNUTLS_A_UNRECOGNIZED_NAME: The server name sent was not | |
| * recognized. | | * recognized. | |
| * @GNUTLS_A_UNKNOWN_PSK_IDENTITY: The SRP/PSK username is missing | | * @GNUTLS_A_UNKNOWN_PSK_IDENTITY: The SRP/PSK username is missing | |
| * or not known. | | * or not known. | |
|
| | | * @GNUTLS_A_NO_APPLICATION_PROTOCOL: The ALPN protocol requested is | |
| | | * not supported by the peer. | |
| * | | * | |
| * Enumeration of different TLS alerts. | | * Enumeration of different TLS alerts. | |
| */ | | */ | |
| typedef enum { | | typedef enum { | |
| GNUTLS_A_CLOSE_NOTIFY, | | GNUTLS_A_CLOSE_NOTIFY, | |
| GNUTLS_A_UNEXPECTED_MESSAGE = 10, | | GNUTLS_A_UNEXPECTED_MESSAGE = 10, | |
| GNUTLS_A_BAD_RECORD_MAC = 20, | | GNUTLS_A_BAD_RECORD_MAC = 20, | |
| GNUTLS_A_DECRYPTION_FAILED, | | GNUTLS_A_DECRYPTION_FAILED, | |
| GNUTLS_A_RECORD_OVERFLOW, | | GNUTLS_A_RECORD_OVERFLOW, | |
| GNUTLS_A_DECOMPRESSION_FAILURE = 30, | | GNUTLS_A_DECOMPRESSION_FAILURE = 30, | |
| | | | |
| skipping to change at line 630 | | skipping to change at line 634 | |
| const char *gnutls_pk_algorithm_get_name(gnutls_pk_algorithm_t algorithm); | | const char *gnutls_pk_algorithm_get_name(gnutls_pk_algorithm_t algorithm); | |
| | | | |
| /** | | /** | |
| * gnutls_sign_algorithm_t: | | * gnutls_sign_algorithm_t: | |
| * @GNUTLS_SIGN_UNKNOWN: Unknown signature algorithm. | | * @GNUTLS_SIGN_UNKNOWN: Unknown signature algorithm. | |
| * @GNUTLS_SIGN_RSA_SHA1: Digital signature algorithm RSA with SHA-1 | | * @GNUTLS_SIGN_RSA_SHA1: Digital signature algorithm RSA with SHA-1 | |
| * @GNUTLS_SIGN_RSA_SHA: Same as %GNUTLS_SIGN_RSA_SHA1. | | * @GNUTLS_SIGN_RSA_SHA: Same as %GNUTLS_SIGN_RSA_SHA1. | |
| * @GNUTLS_SIGN_DSA_SHA1: Digital signature algorithm DSA with SHA-1 | | * @GNUTLS_SIGN_DSA_SHA1: Digital signature algorithm DSA with SHA-1 | |
| * @GNUTLS_SIGN_DSA_SHA224: Digital signature algorithm DSA with SHA-224 | | * @GNUTLS_SIGN_DSA_SHA224: Digital signature algorithm DSA with SHA-224 | |
| * @GNUTLS_SIGN_DSA_SHA256: Digital signature algorithm DSA with SHA-256 | | * @GNUTLS_SIGN_DSA_SHA256: Digital signature algorithm DSA with SHA-256 | |
|
| | | * @GNUTLS_SIGN_DSA_SHA384: Digital signature algorithm DSA with SHA-384 | |
| | | * @GNUTLS_SIGN_DSA_SHA512: Digital signature algorithm DSA with SHA-512 | |
| * @GNUTLS_SIGN_DSA_SHA: Same as %GNUTLS_SIGN_DSA_SHA1. | | * @GNUTLS_SIGN_DSA_SHA: Same as %GNUTLS_SIGN_DSA_SHA1. | |
| * @GNUTLS_SIGN_RSA_MD5: Digital signature algorithm RSA with MD5. | | * @GNUTLS_SIGN_RSA_MD5: Digital signature algorithm RSA with MD5. | |
| * @GNUTLS_SIGN_RSA_MD2: Digital signature algorithm RSA with MD2. | | * @GNUTLS_SIGN_RSA_MD2: Digital signature algorithm RSA with MD2. | |
| * @GNUTLS_SIGN_RSA_RMD160: Digital signature algorithm RSA with RMD-160. | | * @GNUTLS_SIGN_RSA_RMD160: Digital signature algorithm RSA with RMD-160. | |
| * @GNUTLS_SIGN_RSA_SHA256: Digital signature algorithm RSA with SHA-256. | | * @GNUTLS_SIGN_RSA_SHA256: Digital signature algorithm RSA with SHA-256. | |
| * @GNUTLS_SIGN_RSA_SHA384: Digital signature algorithm RSA with SHA-384. | | * @GNUTLS_SIGN_RSA_SHA384: Digital signature algorithm RSA with SHA-384. | |
| * @GNUTLS_SIGN_RSA_SHA512: Digital signature algorithm RSA with SHA-512. | | * @GNUTLS_SIGN_RSA_SHA512: Digital signature algorithm RSA with SHA-512. | |
| * @GNUTLS_SIGN_RSA_SHA224: Digital signature algorithm RSA with SHA-224. | | * @GNUTLS_SIGN_RSA_SHA224: Digital signature algorithm RSA with SHA-224. | |
| * @GNUTLS_SIGN_ECDSA_SHA1: ECDSA with SHA1. | | * @GNUTLS_SIGN_ECDSA_SHA1: ECDSA with SHA1. | |
| * @GNUTLS_SIGN_ECDSA_SHA256: Digital signature algorithm ECDSA with SHA-25
6. | | * @GNUTLS_SIGN_ECDSA_SHA256: Digital signature algorithm ECDSA with SHA-25
6. | |
| | | | |
End of changes. 6 change blocks. |
| 3 lines changed or deleted | | 10 lines changed or added | |
|
| pkcs11.h (3.3.10) | | pkcs11.h (3.3.11) | |
| | | | |
| skipping to change at line 100 | | skipping to change at line 100 | |
| | | | |
| /** | | /** | |
| * gnutls_pkcs11_obj_flags: | | * gnutls_pkcs11_obj_flags: | |
| * @GNUTLS_PKCS11_OBJ_FLAG_LOGIN: Force login in the token for the operatio
n. | | * @GNUTLS_PKCS11_OBJ_FLAG_LOGIN: Force login in the token for the operatio
n. | |
| * @GNUTLS_PKCS11_OBJ_FLAG_MARK_TRUSTED: object marked as trusted. | | * @GNUTLS_PKCS11_OBJ_FLAG_MARK_TRUSTED: object marked as trusted. | |
| * @GNUTLS_PKCS11_OBJ_FLAG_MARK_SENSITIVE: object marked as sensitive (unex
portable). | | * @GNUTLS_PKCS11_OBJ_FLAG_MARK_SENSITIVE: object marked as sensitive (unex
portable). | |
| * @GNUTLS_PKCS11_OBJ_FLAG_LOGIN_SO: force login as a security officer in t
he token for the operation. | | * @GNUTLS_PKCS11_OBJ_FLAG_LOGIN_SO: force login as a security officer in t
he token for the operation. | |
| * @GNUTLS_PKCS11_OBJ_FLAG_MARK_PRIVATE: marked as private (requires PIN to
access). | | * @GNUTLS_PKCS11_OBJ_FLAG_MARK_PRIVATE: marked as private (requires PIN to
access). | |
| * @GNUTLS_PKCS11_OBJ_FLAG_MARK_NOT_PRIVATE: marked as not private. | | * @GNUTLS_PKCS11_OBJ_FLAG_MARK_NOT_PRIVATE: marked as not private. | |
| * @GNUTLS_PKCS11_OBJ_FLAG_RETRIEVE_ANY: When retrieving an object, do not
set any requirements. | | * @GNUTLS_PKCS11_OBJ_FLAG_RETRIEVE_ANY: When retrieving an object, do not
set any requirements. | |
|
| * GNUTLS_PKCS11_OBJ_FLAG_RETRIEVE_TRUSTED: When retrieving an object, only
retrieve the marked as trusted. | | * @GNUTLS_PKCS11_OBJ_FLAG_RETRIEVE_TRUSTED: When retrieving an object, onl
y retrieve the marked as trusted. | |
| * In gnutls_pkcs11_crt_is_known() it implies %GNUTLS_PKCS11_OBJ_FLAG_RET
RIEVE_COMPARE if %GNUTLS_PKCS11_OBJ_FLAG_COMPARE_KEY is not given. | | * In gnutls_pkcs11_crt_is_known() it implies %GNUTLS_PKCS11_OBJ_FLAG_RET
RIEVE_COMPARE if %GNUTLS_PKCS11_OBJ_FLAG_COMPARE_KEY is not given. | |
| * @GNUTLS_PKCS11_OBJ_FLAG_RETRIEVE_DISTRUSTED: When retrieving an object,
only retrieve the marked as distrusted. | | * @GNUTLS_PKCS11_OBJ_FLAG_RETRIEVE_DISTRUSTED: When retrieving an object,
only retrieve the marked as distrusted. | |
| * @GNUTLS_PKCS11_OBJ_FLAG_COMPARE: When checking an object's presence, ful
ly compare it before returning any result. | | * @GNUTLS_PKCS11_OBJ_FLAG_COMPARE: When checking an object's presence, ful
ly compare it before returning any result. | |
| * @GNUTLS_PKCS11_OBJ_FLAG_COMPARE_KEY: When checking an object's presence,
compare the key before returning any result. | | * @GNUTLS_PKCS11_OBJ_FLAG_COMPARE_KEY: When checking an object's presence,
compare the key before returning any result. | |
| * @GNUTLS_PKCS11_OBJ_FLAG_PRESENT_IN_TRUSTED_MODULE: The object must be pr
esent in a marked as trusted module. | | * @GNUTLS_PKCS11_OBJ_FLAG_PRESENT_IN_TRUSTED_MODULE: The object must be pr
esent in a marked as trusted module. | |
| * @GNUTLS_PKCS11_OBJ_FLAG_MARK_CA: Mark the object as a CA. | | * @GNUTLS_PKCS11_OBJ_FLAG_MARK_CA: Mark the object as a CA. | |
| * @GNUTLS_PKCS11_OBJ_FLAG_MARK_KEY_WRAP: Mark the generated key pair as wr
apping and unwrapping keys. | | * @GNUTLS_PKCS11_OBJ_FLAG_MARK_KEY_WRAP: Mark the generated key pair as wr
apping and unwrapping keys. | |
| * @GNUTLS_PKCS11_OBJ_FLAG_OVERWRITE_TRUSTMOD_EXT: When an issuer is reques
ted, override its extensions with the ones present in the trust module. | | * @GNUTLS_PKCS11_OBJ_FLAG_OVERWRITE_TRUSTMOD_EXT: When an issuer is reques
ted, override its extensions with the ones present in the trust module. | |
| * | | * | |
| * Enumeration of different PKCS #11 object flags. | | * Enumeration of different PKCS #11 object flags. | |
| | | | |
| skipping to change at line 272 | | skipping to change at line 272 | |
| } gnutls_pkcs11_token_info_t; | | } gnutls_pkcs11_token_info_t; | |
| | | | |
| /** | | /** | |
| * gnutls_pkcs11_obj_type_t: | | * gnutls_pkcs11_obj_type_t: | |
| * @GNUTLS_PKCS11_OBJ_UNKNOWN: Unknown PKCS11 object. | | * @GNUTLS_PKCS11_OBJ_UNKNOWN: Unknown PKCS11 object. | |
| * @GNUTLS_PKCS11_OBJ_X509_CRT: X.509 certificate. | | * @GNUTLS_PKCS11_OBJ_X509_CRT: X.509 certificate. | |
| * @GNUTLS_PKCS11_OBJ_PUBKEY: Public key. | | * @GNUTLS_PKCS11_OBJ_PUBKEY: Public key. | |
| * @GNUTLS_PKCS11_OBJ_PRIVKEY: Private key. | | * @GNUTLS_PKCS11_OBJ_PRIVKEY: Private key. | |
| * @GNUTLS_PKCS11_OBJ_SECRET_KEY: Secret key. | | * @GNUTLS_PKCS11_OBJ_SECRET_KEY: Secret key. | |
| * @GNUTLS_PKCS11_OBJ_DATA: Data object. | | * @GNUTLS_PKCS11_OBJ_DATA: Data object. | |
|
| | | * @GNUTLS_PKCS11_OBJ_X509_CRT_EXTENSION: X.509 certificate extension (supp
orted by p11-kit trust module only). | |
| * | | * | |
| * Enumeration of object types. | | * Enumeration of object types. | |
| */ | | */ | |
| typedef enum { | | typedef enum { | |
| GNUTLS_PKCS11_OBJ_UNKNOWN, | | GNUTLS_PKCS11_OBJ_UNKNOWN, | |
| GNUTLS_PKCS11_OBJ_X509_CRT, | | GNUTLS_PKCS11_OBJ_X509_CRT, | |
| GNUTLS_PKCS11_OBJ_PUBKEY, | | GNUTLS_PKCS11_OBJ_PUBKEY, | |
| GNUTLS_PKCS11_OBJ_PRIVKEY, | | GNUTLS_PKCS11_OBJ_PRIVKEY, | |
| GNUTLS_PKCS11_OBJ_SECRET_KEY, | | GNUTLS_PKCS11_OBJ_SECRET_KEY, | |
| GNUTLS_PKCS11_OBJ_DATA, | | GNUTLS_PKCS11_OBJ_DATA, | |
| | | | |
End of changes. 2 change blocks. |
| 1 lines changed or deleted | | 2 lines changed or added | |
|