summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ncr-sessions.c8
-rw-r--r--ncr.h4
2 files changed, 10 insertions, 2 deletions
diff --git a/ncr-sessions.c b/ncr-sessions.c
index c30bc66..e86b162 100644
--- a/ncr-sessions.c
+++ b/ncr-sessions.c
@@ -127,12 +127,18 @@ static const struct algo_properties_st {
.needs_iv = 1, .symmetric=1, .can_encrypt=1 },
{ .algo = NCR_ALG_AES_CBC, .kstr = "cbc(aes)",
.needs_iv = 1, .symmetric=1, .can_encrypt=1 },
- { .algo = NCR_ALG_CAMELLIA_CBC, .kstr = "ecb(camelia)",
+ { .algo = NCR_ALG_CAMELLIA_CBC, .kstr = "cbc(camelia)",
+ .needs_iv = 1, .symmetric=1, .can_encrypt=1 },
+ { .algo = NCR_ALG_AES_CTR, .kstr = "ctr(aes)",
+ .needs_iv = 1, .symmetric=1, .can_encrypt=1 },
+ { .algo = NCR_ALG_CAMELLIA_CTR, .kstr = "ctr(camelia)",
.needs_iv = 1, .symmetric=1, .can_encrypt=1 },
{ .algo = NCR_ALG_ARCFOUR, .kstr = NULL,
.needs_iv = 0, .symmetric=1, .can_encrypt=1 },
{ .algo = NCR_ALG_AES_ECB, .kstr = "ecb(aes)",
.needs_iv = 0, .symmetric=1, .can_encrypt=1 },
+ { .algo = NCR_ALG_CAMELLIA_ECB, .kstr = "ecb(camelia)",
+ .needs_iv = 0, .symmetric=1, .can_encrypt=1 },
{ .algo = NCR_ALG_SHA1, .kstr = "sha1",
.digest_size = 20, .can_digest=1 },
{ .algo = NCR_ALG_MD5, .kstr = "md5",
diff --git a/ncr.h b/ncr.h
index 8933a04..45f4432 100644
--- a/ncr.h
+++ b/ncr.h
@@ -17,8 +17,10 @@ typedef enum {
NCR_ALG_AES_CBC,
NCR_ALG_CAMELLIA_CBC,
NCR_ALG_ARCFOUR,
-
NCR_ALG_AES_ECB,
+ NCR_ALG_CAMELLIA_ECB,
+ NCR_ALG_AES_CTR,
+ NCR_ALG_CAMELLIA_CTR,
NCR_ALG_SHA1=40,
NCR_ALG_MD5,