| gnutls.h (3.4.7) | | gnutls.h (3.4.8) | |
| | | | |
| 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.4.7" | | #define GNUTLS_VERSION "3.4.8" | |
| | | | |
| #define GNUTLS_VERSION_MAJOR 3 | | #define GNUTLS_VERSION_MAJOR 3 | |
| #define GNUTLS_VERSION_MINOR 4 | | #define GNUTLS_VERSION_MINOR 4 | |
|
| #define GNUTLS_VERSION_PATCH 7 | | #define GNUTLS_VERSION_PATCH 8 | |
| | | | |
|
| #define GNUTLS_VERSION_NUMBER 0x030407 | | #define GNUTLS_VERSION_NUMBER 0x030408 | |
| | | | |
| #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 | |
| | | | |
| #if !defined(GNUTLS_INTERNAL_BUILD) && defined(_WIN32) | | #if !defined(GNUTLS_INTERNAL_BUILD) && defined(_WIN32) | |
| # define _SYM_EXPORT __declspec(dllimport) | | # define _SYM_EXPORT __declspec(dllimport) | |
| #else | | #else | |
| # define _SYM_EXPORT | | # define _SYM_EXPORT | |
| #endif | | #endif | |
| | | | |
| /* Use the following definition globally in your program to disable | | /* Use the following definition globally in your program to disable | |
| * implicit initialization of gnutls. */ | | * implicit initialization of gnutls. */ | |
| #define GNUTLS_SKIP_GLOBAL_INIT int _gnutls_global_init_skip(void); \ | | #define GNUTLS_SKIP_GLOBAL_INIT int _gnutls_global_init_skip(void); \ | |
| int _gnutls_global_init_skip(void) {return 1;} | | int _gnutls_global_init_skip(void) {return 1;} | |
| | | | |
| /** | | /** | |
| * gnutls_cipher_algorithm_t: | | * gnutls_cipher_algorithm_t: | |
|
| * @GNUTLS_CIPHER_UNKNOWN: Unknown algorithm. | | * @GNUTLS_CIPHER_UNKNOWN: Value to identify an unknown/unsupported algorit | |
| * @GNUTLS_CIPHER_NULL: NULL algorithm. | | hm. | |
| | | * @GNUTLS_CIPHER_NULL: The NULL (identity) encryption algorithm. | |
| * @GNUTLS_CIPHER_ARCFOUR_128: ARCFOUR stream cipher with 128-bit keys. | | * @GNUTLS_CIPHER_ARCFOUR_128: ARCFOUR stream cipher with 128-bit keys. | |
| * @GNUTLS_CIPHER_3DES_CBC: 3DES in CBC mode. | | * @GNUTLS_CIPHER_3DES_CBC: 3DES in CBC mode. | |
| * @GNUTLS_CIPHER_AES_128_CBC: AES in CBC mode with 128-bit keys. | | * @GNUTLS_CIPHER_AES_128_CBC: AES in CBC mode with 128-bit keys. | |
| * @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. | |
| | | | |
| skipping to change at line 106 | | skipping to change at line 106 | |
| * @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_AES_128_CCM: AES in CCM mode with 128-bit keys. | | * @GNUTLS_CIPHER_AES_128_CCM: AES in CCM mode with 128-bit keys. | |
| * @GNUTLS_CIPHER_AES_256_CCM: AES in CCM mode with 256-bit keys. | | * @GNUTLS_CIPHER_AES_256_CCM: AES in CCM mode with 256-bit keys. | |
| * @GNUTLS_CIPHER_AES_128_CCM_8: AES in CCM mode with 64-bit tag and 128-bi
t keys. | | * @GNUTLS_CIPHER_AES_128_CCM_8: AES in CCM mode with 64-bit tag and 128-bi
t keys. | |
| * @GNUTLS_CIPHER_AES_256_CCM_8: AES in CCM mode with 64-bit tag and 256-bi
t keys. | | * @GNUTLS_CIPHER_AES_256_CCM_8: AES in CCM mode with 64-bit tag and 256-bi
t 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_SALSA20_256: Salsa20 with 256-bit keys. | |
| * @GNUTLS_CIPHER_ESTREAM_SALSA20_256: Estream's Salsa20 variant with 256-b
it keys. | | * @GNUTLS_CIPHER_ESTREAM_SALSA20_256: Estream's Salsa20 variant with 256-b
it keys. | |
| * @GNUTLS_CIPHER_CHACHA20_POLY1305: The Chacha20 cipher with the Poly1305
authenticator (AEAD). | | * @GNUTLS_CIPHER_CHACHA20_POLY1305: The Chacha20 cipher with the Poly1305
authenticator (AEAD). | |
|
| * @GNUTLS_CIPHER_IDEA_PGP_CFB: IDEA in CFB mode. | | * @GNUTLS_CIPHER_IDEA_PGP_CFB: IDEA in CFB mode (placeholder - unsupported | |
| * @GNUTLS_CIPHER_3DES_PGP_CFB: 3DES in CFB mode. | | ). | |
| * @GNUTLS_CIPHER_CAST5_PGP_CFB: CAST5 in CFB mode. | | * @GNUTLS_CIPHER_3DES_PGP_CFB: 3DES in CFB mode (placeholder - unsupported | |
| * @GNUTLS_CIPHER_BLOWFISH_PGP_CFB: Blowfish in CFB mode. | | ). | |
| * @GNUTLS_CIPHER_SAFER_SK128_PGP_CFB: Safer-SK in CFB mode with 128-bit ke | | * @GNUTLS_CIPHER_CAST5_PGP_CFB: CAST5 in CFB mode (placeholder - unsupport | |
| ys. | | ed). | |
| * @GNUTLS_CIPHER_AES128_PGP_CFB: AES in CFB mode with 128-bit keys. | | * @GNUTLS_CIPHER_BLOWFISH_PGP_CFB: Blowfish in CFB mode (placeholder - uns | |
| * @GNUTLS_CIPHER_AES192_PGP_CFB: AES in CFB mode with 192-bit keys. | | upported). | |
| * @GNUTLS_CIPHER_AES256_PGP_CFB: AES in CFB mode with 256-bit keys. | | * @GNUTLS_CIPHER_SAFER_SK128_PGP_CFB: Safer-SK in CFB mode with 128-bit ke | |
| * @GNUTLS_CIPHER_TWOFISH_PGP_CFB: Twofish in CFB mode. | | ys (placeholder - unsupported). | |
| | | * @GNUTLS_CIPHER_AES128_PGP_CFB: AES in CFB mode with 128-bit keys (placeh | |
| | | older - unsupported). | |
| | | * @GNUTLS_CIPHER_AES192_PGP_CFB: AES in CFB mode with 192-bit keys (placeh | |
| | | older - unsupported). | |
| | | * @GNUTLS_CIPHER_AES256_PGP_CFB: AES in CFB mode with 256-bit keys (placeh | |
| | | older - unsupported). | |
| | | * @GNUTLS_CIPHER_TWOFISH_PGP_CFB: Twofish in CFB mode (placeholder - unsup | |
| | | ported). | |
| * | | * | |
| * Enumeration of different symmetric encryption algorithms. | | * Enumeration of different symmetric encryption algorithms. | |
| */ | | */ | |
| typedef enum gnutls_cipher_algorithm { | | typedef enum gnutls_cipher_algorithm { | |
| GNUTLS_CIPHER_UNKNOWN = 0, | | GNUTLS_CIPHER_UNKNOWN = 0, | |
| GNUTLS_CIPHER_NULL = 1, | | GNUTLS_CIPHER_NULL = 1, | |
| GNUTLS_CIPHER_ARCFOUR_128 = 2, | | GNUTLS_CIPHER_ARCFOUR_128 = 2, | |
| GNUTLS_CIPHER_3DES_CBC = 3, | | GNUTLS_CIPHER_3DES_CBC = 3, | |
| GNUTLS_CIPHER_AES_128_CBC = 4, | | GNUTLS_CIPHER_AES_128_CBC = 4, | |
| GNUTLS_CIPHER_AES_256_CBC = 5, | | GNUTLS_CIPHER_AES_256_CBC = 5, | |
| | | | |
End of changes. 5 change blocks. |
| 15 lines changed or deleted | | 24 lines changed or added | |
|
| pkcs7.h (3.4.7) | | pkcs7.h (3.4.8) | |
| | | | |
| skipping to change at line 58 | | skipping to change at line 58 | |
| const gnutls_datum_t * data, | | const gnutls_datum_t * data, | |
| gnutls_x509_crt_fmt_t format); | | gnutls_x509_crt_fmt_t format); | |
| int gnutls_pkcs7_export(gnutls_pkcs7_t pkcs7, | | int gnutls_pkcs7_export(gnutls_pkcs7_t pkcs7, | |
| gnutls_x509_crt_fmt_t format, | | gnutls_x509_crt_fmt_t format, | |
| void *output_data, size_t * output_data_size); | | void *output_data, size_t * output_data_size); | |
| int gnutls_pkcs7_export2(gnutls_pkcs7_t pkcs7, | | int gnutls_pkcs7_export2(gnutls_pkcs7_t pkcs7, | |
| gnutls_x509_crt_fmt_t format, | | gnutls_x509_crt_fmt_t format, | |
| gnutls_datum_t * out); | | gnutls_datum_t * out); | |
| | | | |
| int gnutls_pkcs7_get_signature_count(gnutls_pkcs7_t pkcs7); | | int gnutls_pkcs7_get_signature_count(gnutls_pkcs7_t pkcs7); | |
|
| | | int gnutls_pkcs7_get_embedded_data(gnutls_pkcs7_t pkcs7, unsigned idx, gnut
ls_datum_t *data); | |
| | | | |
| int gnutls_pkcs7_get_crt_count(gnutls_pkcs7_t pkcs7); | | int gnutls_pkcs7_get_crt_count(gnutls_pkcs7_t pkcs7); | |
| int gnutls_pkcs7_get_crt_raw(gnutls_pkcs7_t pkcs7, int indx, | | int gnutls_pkcs7_get_crt_raw(gnutls_pkcs7_t pkcs7, int indx, | |
| void *certificate, size_t * certificate_size); | | void *certificate, size_t * certificate_size); | |
| | | | |
| int gnutls_pkcs7_set_crt_raw(gnutls_pkcs7_t pkcs7, | | int gnutls_pkcs7_set_crt_raw(gnutls_pkcs7_t pkcs7, | |
| const gnutls_datum_t * crt); | | const gnutls_datum_t * crt); | |
| int gnutls_pkcs7_set_crt(gnutls_pkcs7_t pkcs7, gnutls_x509_crt_t crt); | | int gnutls_pkcs7_set_crt(gnutls_pkcs7_t pkcs7, gnutls_x509_crt_t crt); | |
| int gnutls_pkcs7_delete_crt(gnutls_pkcs7_t pkcs7, int indx); | | int gnutls_pkcs7_delete_crt(gnutls_pkcs7_t pkcs7, int indx); | |
| | | | |
| | | | |
End of changes. 1 change blocks. |
| 0 lines changed or deleted | | 1 lines changed or added | |
|