gnutls: corrected regression with camellia cipher

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
This commit is contained in:
Nikos Mavrogiannopoulos 2015-05-30 22:50:55 +02:00
parent f5ca16f98d
commit 5244681f2d
2 changed files with 27 additions and 1 deletions

View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gnutls
PKG_VERSION:=3.4.1
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_USE_MIPS16:=0
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz

View File

@ -0,0 +1,26 @@
From 6adde30fcea02d3cb541b5a5bfb3b12074f1f3e9 Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Thu, 14 May 2015 14:00:11 +0200
Subject: [PATCH] camellia256-gcm: corrected regression
Reported by Manuel Pegourie-Gonnard.
---
lib/nettle/cipher.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/nettle/cipher.c b/lib/nettle/cipher.c
index 59e70dd..74e4203 100644
--- a/lib/nettle/cipher.c
+++ b/lib/nettle/cipher.c
@@ -302,7 +302,7 @@ static const struct nettle_cipher_st builtin_ciphers[] = {
.ctx_size = sizeof(struct gcm_camellia256_ctx),
.encrypt = _gcm_encrypt,
.decrypt = _gcm_decrypt,
- .set_encrypt_key = (nettle_set_key_func*)gcm_camellia128_set_key,
+ .set_encrypt_key = (nettle_set_key_func*)gcm_camellia256_set_key,
.set_decrypt_key = (nettle_set_key_func*)gcm_camellia256_set_key,
.tag = (nettle_hash_digest_func*)gcm_camellia256_digest,
--
2.1.4