diff options
Diffstat (limited to 'lib/includes')
| -rw-r--r-- | lib/includes/gnutls/crypto.h | 6 | ||||
| -rw-r--r-- | lib/includes/gnutls/gnutls.h.in | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/lib/includes/gnutls/crypto.h b/lib/includes/gnutls/crypto.h index 0f61981d99..edec2f4d87 100644 --- a/lib/includes/gnutls/crypto.h +++ b/lib/includes/gnutls/crypto.h @@ -76,7 +76,7 @@ extern "C" /* register ciphers */ -#define GNUTLS_CRYPTO_API_VERSION 0x03 +#define GNUTLS_CRYPTO_API_VERSION 0x04 #define gnutls_crypto_single_cipher_st gnutls_crypto_cipher_st #define gnutls_crypto_single_mac_st gnutls_crypto_mac_st @@ -91,6 +91,8 @@ extern "C" void *encr, size_t encrsize); int (*decrypt) (void *ctx, const void *encr, size_t encrsize, void *plain, size_t plainsize); + int (*auth) (void *ctx, const void *data, size_t datasize); + void (*tag) (void *ctx, void *tag, size_t tagsize); void (*deinit) (void *ctx); } gnutls_crypto_cipher_st; @@ -98,6 +100,7 @@ extern "C" { int (*init) (gnutls_mac_algorithm_t, void **ctx); int (*setkey) (void *ctx, const void *key, size_t keysize); + void (*reset) (void *ctx); int (*hash) (void *ctx, const void *text, size_t textsize); int (*output) (void *src_ctx, void *digest, size_t digestsize); void (*deinit) (void *ctx); @@ -106,6 +109,7 @@ extern "C" typedef struct { int (*init) (gnutls_mac_algorithm_t, void **ctx); + void (*reset) (void *ctx); int (*hash) (void *ctx, const void *text, size_t textsize); int (*copy) (void **dst_ctx, void *src_ctx); int (*output) (void *src_ctx, void *digest, size_t digestsize); diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in index cd0b96b771..eb5fdd9e4c 100644 --- a/lib/includes/gnutls/gnutls.h.in +++ b/lib/includes/gnutls/gnutls.h.in @@ -73,13 +73,14 @@ extern "C" * @GNUTLS_CIPHER_ARCFOUR_128: ARCFOUR stream cipher with 128-bit keys. * @GNUTLS_CIPHER_3DES_CBC: 3DES in CBC mode. * @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_256_CBC: AES in CBC mode with 256-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_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_DES_CBC: DES in CBC mode (56-bit keys). - * @GNUTLS_CIPHER_AES_192_CBC: AES in CBC mode with 192-bit keys. + * @GNUTLS_CIPHER_AES_128_GCM: AES in GCM mode with 128-bit keys. * @GNUTLS_CIPHER_IDEA_PGP_CFB: IDEA in CFB mode. * @GNUTLS_CIPHER_3DES_PGP_CFB: 3DES in CFB mode. * @GNUTLS_CIPHER_CAST5_PGP_CFB: CAST5 in CFB mode. @@ -106,6 +107,7 @@ extern "C" GNUTLS_CIPHER_RC2_40_CBC = 90, GNUTLS_CIPHER_DES_CBC = 91, GNUTLS_CIPHER_AES_192_CBC = 92, + GNUTLS_CIPHER_AES_128_GCM = 93, /* used only for PGP internals. Ignored in TLS/SSL */ @@ -213,9 +215,10 @@ extern "C" GNUTLS_MAC_SHA256 = 6, GNUTLS_MAC_SHA384 = 7, GNUTLS_MAC_SHA512 = 8, - GNUTLS_MAC_SHA224 = 9 + GNUTLS_MAC_SHA224 = 9, /* If you add anything here, make sure you align with gnutls_digest_algorithm_t. */ + GNUTLS_MAC_AEAD = 200 /* indicates that MAC is on the cipher */ } gnutls_mac_algorithm_t; /** |