diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2010-07-19 10:00:34 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2010-07-19 10:00:34 +0200 |
| commit | 13629ab760d95f17aa1ebc36d1870d6b044c3acc (patch) | |
| tree | 254c045063a1308edde0ef14c9fc652fdbe8a154 | |
| parent | 43bd4904b4a4ea8218127dc14e12141997beef36 (diff) | |
| download | cryptodev-linux-13629ab760d95f17aa1ebc36d1870d6b044c3acc.tar.gz cryptodev-linux-13629ab760d95f17aa1ebc36d1870d6b044c3acc.tar.xz cryptodev-linux-13629ab760d95f17aa1ebc36d1870d6b044c3acc.zip | |
Added CAMELLIA-ECB and AES-CTR as well as CAMELLIA-CTR.
| -rw-r--r-- | ncr-sessions.c | 8 | ||||
| -rw-r--r-- | ncr.h | 4 |
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", @@ -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, |