diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2018-05-05 22:51:26 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2018-05-09 21:44:33 +0200 |
| commit | cbfd03f6fc7820cb721615f44b1955e4d0b667c9 (patch) | |
| tree | 788d7aef5c0684cf23b7eb5fe6a7f5adffa888bd | |
| parent | 0776fa5eb7f99953cd1be760b39694590b08b7bf (diff) | |
| download | gnutls-cbfd03f6fc7820cb721615f44b1955e4d0b667c9.tar.gz | |
nettle: fix casts which result to warnings in newer gcc
Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
| -rw-r--r-- | lib/nettle/cipher.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/lib/nettle/cipher.c b/lib/nettle/cipher.c index 4bcbe42269..8832d49de6 100644 --- a/lib/nettle/cipher.c +++ b/lib/nettle/cipher.c @@ -188,6 +188,16 @@ _gcm_decrypt(struct nettle_cipher_ctx *ctx, size_t length, uint8_t * dst, length, dst, src); } +static void _des_set_key(struct des_ctx *ctx, const uint8_t *key) +{ + des_set_key(ctx, key); +} + +static void _des3_set_key(struct des3_ctx *ctx, const uint8_t *key) +{ + des3_set_key(ctx, key); +} + static const struct nettle_cipher_st builtin_ciphers[] = { { .algo = GNUTLS_CIPHER_AES_128_GCM, .block_size = AES_BLOCK_SIZE, @@ -407,8 +417,8 @@ static const struct nettle_cipher_st builtin_ciphers[] = { .ctx_size = sizeof(struct CBC_CTX(struct des_ctx, DES_BLOCK_SIZE)), .encrypt = _cbc_encrypt, .decrypt = _cbc_decrypt, - .set_encrypt_key = (nettle_set_key_func*)des_set_key, - .set_decrypt_key = (nettle_set_key_func*)des_set_key, + .set_encrypt_key = (nettle_set_key_func*)_des_set_key, + .set_decrypt_key = (nettle_set_key_func*)_des_set_key, .max_iv_size = DES_BLOCK_SIZE, }, { .algo = GNUTLS_CIPHER_3DES_CBC, @@ -420,8 +430,8 @@ static const struct nettle_cipher_st builtin_ciphers[] = { .ctx_size = sizeof(struct CBC_CTX(struct des3_ctx, DES3_BLOCK_SIZE)), .encrypt = _cbc_encrypt, .decrypt = _cbc_decrypt, - .set_encrypt_key = (nettle_set_key_func*)des3_set_key, - .set_decrypt_key = (nettle_set_key_func*)des3_set_key, + .set_encrypt_key = (nettle_set_key_func*)_des3_set_key, + .set_decrypt_key = (nettle_set_key_func*)_des3_set_key, .max_iv_size = DES_BLOCK_SIZE, }, { .algo = GNUTLS_CIPHER_ARCFOUR_128, |