diff options
| author | Simon Josefsson <simon@josefsson.org> | 2005-10-21 13:40:20 +0000 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2005-10-21 13:40:20 +0000 |
| commit | 67208b773e30cae794d80d94a59de680b4eb94e8 (patch) | |
| tree | fcee86d2d0c9910ab036a0c212eca1cef0065635 /gl/gc-gnulib.c | |
| parent | 0ff06ae49d498812ef7ff01a286369f5e7969d39 (diff) | |
| download | gnutls-67208b773e30cae794d80d94a59de680b4eb94e8.tar.gz | |
Update.
Diffstat (limited to 'gl/gc-gnulib.c')
| -rw-r--r-- | gl/gc-gnulib.c | 60 |
1 files changed, 57 insertions, 3 deletions
diff --git a/gl/gc-gnulib.c b/gl/gc-gnulib.c index 832c5bb413..68dcc76884 100644 --- a/gl/gc-gnulib.c +++ b/gl/gc-gnulib.c @@ -25,7 +25,7 @@ #endif /* Get prototype. */ -#include <gc.h> +#include "gc.h" #include <stdlib.h> #include <string.h> @@ -166,6 +166,7 @@ typedef struct _gc_cipher_ctx { Gc_cipher_mode mode; #ifdef GC_USE_ARCTWO arctwo_context arctwoContext; + char arctwoIV[ARCTWO_BLOCK_SIZE]; #endif #ifdef GC_USE_ARCFOUR arcfour_context arcfourContext; @@ -199,6 +200,7 @@ gc_cipher_open (Gc_cipher alg, Gc_cipher_mode mode, switch (mode) { case GC_ECB: + case GC_CBC: break; default: @@ -333,6 +335,14 @@ gc_cipher_setiv (gc_cipher_handle handle, size_t ivlen, const char *iv) switch (ctx->alg) { +#ifdef GC_USE_ARCTWO + case GC_ARCTWO40: + if (ivlen != ARCTWO_BLOCK_SIZE) + return GC_INVALID_CIPHER; + memcpy (ctx->arctwoIV, iv, ivlen); + break; +#endif + #ifdef GC_USE_RIJNDAEL case GC_AES128: case GC_AES192: @@ -381,7 +391,28 @@ gc_cipher_encrypt_inline (gc_cipher_handle handle, size_t len, char *data) { #ifdef GC_USE_ARCTWO case GC_ARCTWO40: - arctwo_encrypt (&ctx->arctwoContext, data, data, len); + switch (ctx->mode) + { + case GC_ECB: + arctwo_encrypt (&ctx->arctwoContext, data, data, len); + break; + + case GC_CBC: + for (; len >= ARCTWO_BLOCK_SIZE; len -= ARCTWO_BLOCK_SIZE, + data += ARCTWO_BLOCK_SIZE) + { + size_t i; + for (i = 0; i < ARCTWO_BLOCK_SIZE; i++) + data[i] ^= ctx->arctwoIV[i]; + arctwo_encrypt (&ctx->arctwoContext, data, data, + ARCTWO_BLOCK_SIZE); + memcpy (ctx->arctwoIV, data, ARCTWO_BLOCK_SIZE); + } + break; + + default: + return GC_INVALID_CIPHER; + } break; #endif @@ -430,7 +461,30 @@ gc_cipher_decrypt_inline (gc_cipher_handle handle, size_t len, char *data) { #ifdef GC_USE_ARCTWO case GC_ARCTWO40: - arctwo_decrypt (&ctx->arctwoContext, data, data, len); + switch (ctx->mode) + { + case GC_ECB: + arctwo_decrypt (&ctx->arctwoContext, data, data, len); + break; + + case GC_CBC: + for (; len >= ARCTWO_BLOCK_SIZE; len -= ARCTWO_BLOCK_SIZE, + data += ARCTWO_BLOCK_SIZE) + { + char tmpIV[ARCTWO_BLOCK_SIZE]; + size_t i; + memcpy (tmpIV, data, ARCTWO_BLOCK_SIZE); + arctwo_decrypt (&ctx->arctwoContext, data, data, + ARCTWO_BLOCK_SIZE); + for (i = 0; i < ARCTWO_BLOCK_SIZE; i++) + data[i] ^= ctx->arctwoIV[i]; + memcpy (ctx->arctwoIV, tmpIV, ARCTWO_BLOCK_SIZE); + } + break; + + default: + return GC_INVALID_CIPHER; + } break; #endif |