|  | gnutls.h (3.2.4) |  | gnutls.h (3.2.5) |  | 
|---|
 
      |  |  |  |  |  | 
      |  | skipping to change at line 54 |  | skipping to change at line 54 |  | 
|---|
      |  | #include <sys/types.h> |  | #include <sys/types.h> |  | 
      |  | /* *INDENT-ON* */ |  | /* *INDENT-ON* */ |  | 
      |  | #endif |  | #endif |  | 
      |  | /* Get time_t. */ |  | /* Get time_t. */ |  | 
      |  | #include <time.h> |  | #include <time.h> |  | 
      |  | #ifdef __cplusplus |  | #ifdef __cplusplus |  | 
      |  | extern "C" |  | extern "C" |  | 
      |  | { |  | { |  | 
      |  | #endif |  | #endif |  | 
      |  |  |  |  |  | 
      |  | 
      |  | #define GNUTLS_VERSION "3.2.4" |  | #define GNUTLS_VERSION "3.2.5" |  | 
      |  |  |  |  |  | 
      |  | #define GNUTLS_VERSION_MAJOR 3 |  | #define GNUTLS_VERSION_MAJOR 3 |  | 
      |  | #define GNUTLS_VERSION_MINOR 2 |  | #define GNUTLS_VERSION_MINOR 2 |  | 
      |  | 
      |  | #define GNUTLS_VERSION_PATCH 4 |  | #define GNUTLS_VERSION_PATCH 5 |  | 
      |  |  |  |  |  | 
      |  | 
      |  | #define GNUTLS_VERSION_NUMBER 0x030204 |  | #define GNUTLS_VERSION_NUMBER 0x030205 |  | 
      |  |  |  |  |  | 
      |  | #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 84 |  | skipping to change at line 84 |  | 
|---|
      |  | * @GNUTLS_CIPHER_AES_192_CBC: AES in CBC mode with 192-bit keys. |  | * @GNUTLS_CIPHER_AES_192_CBC: AES in CBC mode with 192-bit keys. |  | 
      |  | * @GNUTLS_CIPHER_AES_256_CBC: AES in CBC mode with 256-bit keys. |  | * @GNUTLS_CIPHER_AES_256_CBC: AES in CBC mode with 256-bit keys. |  | 
      |  | * @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_256_GCM: CAMELLIA in GCM mode with 256-bit 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 115 |  | skipping to change at line 117 |  | 
|---|
      |  | GNUTLS_CIPHER_CAMELLIA_128_CBC = 7, |  | GNUTLS_CIPHER_CAMELLIA_128_CBC = 7, |  | 
      |  | GNUTLS_CIPHER_CAMELLIA_256_CBC = 8, |  | GNUTLS_CIPHER_CAMELLIA_256_CBC = 8, |  | 
      |  | GNUTLS_CIPHER_RC2_40_CBC = 90, |  | GNUTLS_CIPHER_RC2_40_CBC = 90, |  | 
      |  | GNUTLS_CIPHER_DES_CBC = 91, |  | GNUTLS_CIPHER_DES_CBC = 91, |  | 
      |  | GNUTLS_CIPHER_AES_192_CBC = 92, |  | GNUTLS_CIPHER_AES_192_CBC = 92, |  | 
      |  | GNUTLS_CIPHER_AES_128_GCM = 93, |  | GNUTLS_CIPHER_AES_128_GCM = 93, |  | 
      |  | GNUTLS_CIPHER_AES_256_GCM = 94, |  | GNUTLS_CIPHER_AES_256_GCM = 94, |  | 
      |  | GNUTLS_CIPHER_CAMELLIA_192_CBC = 95, |  | GNUTLS_CIPHER_CAMELLIA_192_CBC = 95, |  | 
      |  | GNUTLS_CIPHER_SALSA20_256 = 96, |  | GNUTLS_CIPHER_SALSA20_256 = 96, |  | 
      |  | GNUTLS_CIPHER_ESTREAM_SALSA20_256 = 97, |  | GNUTLS_CIPHER_ESTREAM_SALSA20_256 = 97, |  | 
      |  | 
      |  |  |  | GNUTLS_CIPHER_CAMELLIA_128_GCM = 98, |  | 
      |  |  |  | GNUTLS_CIPHER_CAMELLIA_256_GCM = 99, |  | 
      |  |  |  |  |  | 
      |  | /* used only for PGP internals. Ignored in TLS/SSL |  | /* used only for PGP internals. Ignored in TLS/SSL |  | 
      |  | */ |  | */ |  | 
      |  | GNUTLS_CIPHER_IDEA_PGP_CFB = 200, |  | GNUTLS_CIPHER_IDEA_PGP_CFB = 200, |  | 
      |  | GNUTLS_CIPHER_3DES_PGP_CFB = 201, |  | GNUTLS_CIPHER_3DES_PGP_CFB = 201, |  | 
      |  | GNUTLS_CIPHER_CAST5_PGP_CFB = 202, |  | GNUTLS_CIPHER_CAST5_PGP_CFB = 202, |  | 
      |  | GNUTLS_CIPHER_BLOWFISH_PGP_CFB = 203, |  | GNUTLS_CIPHER_BLOWFISH_PGP_CFB = 203, |  | 
      |  | GNUTLS_CIPHER_SAFER_SK128_PGP_CFB = 204, |  | GNUTLS_CIPHER_SAFER_SK128_PGP_CFB = 204, |  | 
      |  | GNUTLS_CIPHER_AES128_PGP_CFB = 205, |  | GNUTLS_CIPHER_AES128_PGP_CFB = 205, |  | 
      |  | GNUTLS_CIPHER_AES192_PGP_CFB = 206, |  | GNUTLS_CIPHER_AES192_PGP_CFB = 206, |  | 
      |  |  |  |  |  | 
      |  | skipping to change at line 220 |  | skipping to change at line 224 |  | 
|---|
      |  | * @GNUTLS_MAC_NULL: NULL MAC algorithm (empty output). |  | * @GNUTLS_MAC_NULL: NULL MAC algorithm (empty output). |  | 
      |  | * @GNUTLS_MAC_MD5: HMAC-MD5 algorithm. |  | * @GNUTLS_MAC_MD5: HMAC-MD5 algorithm. |  | 
      |  | * @GNUTLS_MAC_SHA1: HMAC-SHA-1 algorithm. |  | * @GNUTLS_MAC_SHA1: HMAC-SHA-1 algorithm. |  | 
      |  | * @GNUTLS_MAC_RMD160: HMAC-RMD160 algorithm. |  | * @GNUTLS_MAC_RMD160: HMAC-RMD160 algorithm. |  | 
      |  | * @GNUTLS_MAC_MD2: HMAC-MD2 algorithm. |  | * @GNUTLS_MAC_MD2: HMAC-MD2 algorithm. |  | 
      |  | * @GNUTLS_MAC_SHA256: HMAC-SHA-256 algorithm. |  | * @GNUTLS_MAC_SHA256: HMAC-SHA-256 algorithm. |  | 
      |  | * @GNUTLS_MAC_SHA384: HMAC-SHA-384 algorithm. |  | * @GNUTLS_MAC_SHA384: HMAC-SHA-384 algorithm. |  | 
      |  | * @GNUTLS_MAC_SHA512: HMAC-SHA-512 algorithm. |  | * @GNUTLS_MAC_SHA512: HMAC-SHA-512 algorithm. |  | 
      |  | * @GNUTLS_MAC_SHA224: HMAC-SHA-224 algorithm. |  | * @GNUTLS_MAC_SHA224: HMAC-SHA-224 algorithm. |  | 
      |  | * @GNUTLS_MAC_AEAD: MAC implicit through AEAD cipher. |  | * @GNUTLS_MAC_AEAD: MAC implicit through AEAD cipher. |  | 
      |  | 
      |  |  |  | * @GNUTLS_MAC_UMAC_96: The UMAC-96 MAC algorithm. |  | 
      |  |  |  | * @GNUTLS_MAC_UMAC_128: The UMAC-128 MAC algorithm. |  | 
      |  | * |  | * |  | 
      |  | * Enumeration of different Message Authentication Code (MAC) |  | * Enumeration of different Message Authentication Code (MAC) |  | 
      |  | * algorithms. |  | * algorithms. |  | 
      |  | */ |  | */ |  | 
      |  | typedef enum |  | typedef enum |  | 
      |  | { |  | { |  | 
      |  | GNUTLS_MAC_UNKNOWN = 0, |  | GNUTLS_MAC_UNKNOWN = 0, |  | 
      |  | GNUTLS_MAC_NULL = 1, |  | GNUTLS_MAC_NULL = 1, |  | 
      |  | GNUTLS_MAC_MD5 = 2, |  | GNUTLS_MAC_MD5 = 2, |  | 
      |  | GNUTLS_MAC_SHA1 = 3, |  | GNUTLS_MAC_SHA1 = 3, |  | 
      |  |  |  |  |  | 
      |  | skipping to change at line 1296 |  | skipping to change at line 1302 |  | 
|---|
      |  | void |  | void |  | 
      |  | gnutls_certificate_free_credentials (gnutls_certificate_credentials_t s
c); |  | gnutls_certificate_free_credentials (gnutls_certificate_credentials_t s
c); |  | 
      |  | int |  | int |  | 
      |  | gnutls_certificate_allocate_credentials (gnutls_certificate_credentials
_t |  | gnutls_certificate_allocate_credentials (gnutls_certificate_credentials
_t |  | 
      |  | * res); |  | * res); |  | 
      |  |  |  |  |  | 
      |  | int |  | int |  | 
      |  | gnutls_certificate_get_issuer (gnutls_certificate_credentials_t sc, |  | gnutls_certificate_get_issuer (gnutls_certificate_credentials_t sc, |  | 
      |  | gnutls_x509_crt_t cert, gnutls_x509_crt_t* issuer, unsigned int flags); |  | gnutls_x509_crt_t cert, gnutls_x509_crt_t* issuer, unsigned int flags); |  | 
      |  |  |  |  |  | 
      |  | 
      |  |  |  | int gnutls_certificate_get_crt_raw (gnutls_certificate_credentials_t sc, |  | 
      |  |  |  | unsigned idx1, |  | 
      |  |  |  | unsigned idx2, gnutls_datum_t * cert); |  | 
      |  |  |  |  |  | 
      |  | void gnutls_certificate_free_keys (gnutls_certificate_credentials_t sc); |  | void gnutls_certificate_free_keys (gnutls_certificate_credentials_t sc); |  | 
      |  | void gnutls_certificate_free_cas (gnutls_certificate_credentials_t sc); |  | void gnutls_certificate_free_cas (gnutls_certificate_credentials_t sc); |  | 
      |  | void gnutls_certificate_free_ca_names (gnutls_certificate_credentials_t s
c); |  | void gnutls_certificate_free_ca_names (gnutls_certificate_credentials_t s
c); |  | 
      |  | void gnutls_certificate_free_crls (gnutls_certificate_credentials_t sc); |  | void gnutls_certificate_free_crls (gnutls_certificate_credentials_t sc); |  | 
      |  |  |  |  |  | 
      |  | void gnutls_certificate_set_dh_params (gnutls_certificate_credentials_t r
es, |  | void gnutls_certificate_set_dh_params (gnutls_certificate_credentials_t r
es, |  | 
      |  | gnutls_dh_params_t dh_params); |  | gnutls_dh_params_t dh_params); |  | 
      |  | void gnutls_certificate_set_verify_flags (gnutls_certificate_credentials_
t |  | void gnutls_certificate_set_verify_flags (gnutls_certificate_credentials_
t |  | 
      |  | res, unsigned int flags); |  | res, unsigned int flags); |  | 
      |  | void gnutls_certificate_set_verify_limits (gnutls_certificate_credentials
_t |  | void gnutls_certificate_set_verify_limits (gnutls_certificate_credentials
_t |  | 
     |  |  |  |  |  | 
     | End of changes. 7 change blocks. | 
|---|
     |  | 3 lines changed or deleted |  | 13 lines changed or added |  | 
|---|
     |  |