summaryrefslogtreecommitdiff
path: root/lgl
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2007-09-24 12:39:58 +0200
committerSimon Josefsson <simon@josefsson.org>2007-09-24 12:39:58 +0200
commit3e36432062f6a1a1758a13591aed7951d4081a30 (patch)
treec79fec7a1692bbd9259bf974220617607cb04793 /lgl
parent4f1a8ab89e804066e54dce364b15f00d9c2e3f30 (diff)
downloadgnutls-3e36432062f6a1a1758a13591aed7951d4081a30.tar.gz
Add patch to support Camellia, contributed by Yoshisato YANAGISAWA. Fixes #1.
See http://permalink.gmane.org/gmane.comp.encryption.gpg.gnutls.devel/2331
Diffstat (limited to 'lgl')
-rw-r--r--lgl/gc-libgcrypt.c10
-rw-r--r--lgl/gc.h4
2 files changed, 13 insertions, 1 deletions
diff --git a/lgl/gc-libgcrypt.c b/lgl/gc-libgcrypt.c
index 683c73ffb4..f28a20f9f9 100644
--- a/lgl/gc-libgcrypt.c
+++ b/lgl/gc-libgcrypt.c
@@ -142,6 +142,16 @@ gc_cipher_open (Gc_cipher alg, Gc_cipher_mode mode,
gcryalg = GCRY_CIPHER_RFC2268_40;
break;
+#ifdef ENABLE_CAMELLIA
+ case GC_CAMELLIA128:
+ gcryalg = GCRY_CIPHER_CAMELLIA128;
+ break;
+
+ case GC_CAMELLIA256:
+ gcryalg = GCRY_CIPHER_CAMELLIA256;
+ break;
+#endif
+
default:
return GC_INVALID_CIPHER;
}
diff --git a/lgl/gc.h b/lgl/gc.h
index 9f4bf21515..da29344ebd 100644
--- a/lgl/gc.h
+++ b/lgl/gc.h
@@ -79,7 +79,9 @@ enum Gc_cipher
GC_DES,
GC_ARCFOUR128,
GC_ARCFOUR40,
- GC_ARCTWO40
+ GC_ARCTWO40,
+ GC_CAMELLIA128,
+ GC_CAMELLIA256
};
typedef enum Gc_cipher Gc_cipher;