X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilccrypt%2Faes.c;h=95bdd68485d8c9b1857c32ffa896ec969c958c69;hb=9cb3b70fbb028d0bc059a3e5af3c4ea532a2b2f5;hp=fc67504d91b362fcfc6962fd2803c62241899c5a;hpb=3ed0f4669135b422c1dd094992ec0fe4cb318bca;p=crypto.git

diff --git a/lib/silccrypt/aes.c b/lib/silccrypt/aes.c
index fc67504d..95bdd684 100644
--- a/lib/silccrypt/aes.c
+++ b/lib/silccrypt/aes.c
@@ -33,8 +33,8 @@
  Issue 09/09/2006
 */
 
-#include "silc.h"
-#include "rijndael_internal.h"
+#include "silccrypto.h"
+#include "aes_internal.h"
 #include "aes.h"
 
 /*
@@ -45,18 +45,20 @@
 
 SILC_CIPHER_API_SET_KEY(aes)
 {
-  switch (cipher->mode) {
+  switch (ops->mode) {
+  case SILC_CIPHER_MODE_CTR:
+  case SILC_CIPHER_MODE_CFB:
+    aes_encrypt_key(key, keylen, &((AesContext *)context)->u.enc);
+    break;
+
   case SILC_CIPHER_MODE_CBC:
+  case SILC_CIPHER_MODE_ECB:
     if (encryption)
       aes_encrypt_key(key, keylen, &((AesContext *)context)->u.enc);
     else
       aes_decrypt_key(key, keylen, &((AesContext *)context)->u.dec);
     break;
 
-  case SILC_CIPHER_MODE_CTR:
-    aes_encrypt_key(key, keylen, &((AesContext *)context)->u.enc);
-    break;
-
   default:
     return FALSE;
   }
@@ -67,19 +69,38 @@ SILC_CIPHER_API_SET_KEY(aes)
 
 SILC_CIPHER_API_SET_IV(aes)
 {
-  if (cipher->mode == SILC_CIPHER_MODE_CTR) {
-    AesContext *aes = context;
+  AesContext *aes = context;
 
+  switch (ops->mode) {
+
+  case SILC_CIPHER_MODE_CTR:
+  case SILC_CIPHER_MODE_CFB:
     /* Starts new block. */
-    aes->u.enc.inf.b[2] = 0;
+    aes->u.enc.inf.b[2] = 16;
+    break;
+
+  default:
+    break;
   }
 }
 
-/* Returns the size of the cipher context. */
+/* Initialize */
 
-SILC_CIPHER_API_CONTEXT_LEN(aes)
+SILC_CIPHER_API_INIT(aes)
 {
-  return sizeof(AesContext);
+  AesContext *aes = silc_calloc(1, sizeof(AesContext));
+  if (aes)
+    aes->u.enc.inf.b[2] = 16;
+  return aes;
+}
+
+/* Unnitialize */
+
+SILC_CIPHER_API_UNINIT(aes)
+{
+  AesContext *aes = context;
+  memset(aes, 0, sizeof(*aes));
+  silc_free(aes);
 }
 
 /* Encrypts with the cipher. Source and destination buffers maybe one and
@@ -90,65 +111,32 @@ SILC_CIPHER_API_ENCRYPT(aes)
   AesContext *aes = context;
   int i;
 
-  switch (cipher->mode) {
-  case SILC_CIPHER_MODE_CBC:
+  switch (ops->mode) {
+  case SILC_CIPHER_MODE_CTR:
+    SILC_CTR_MSB_128_8(iv, cipher->block, aes->u.enc.inf.b[2], src, dst,
+    		       aes_encrypt(iv, cipher->block, &aes->u.enc));
+    break;
+
+  case SILC_CIPHER_MODE_ECB:
     {
-      int nb = len >> 4;
-
-      SILC_ASSERT((len & (16 - 1)) == 0);
-      if (len & (16 - 1))
-	return FALSE;
-
-      while(nb--) {
-	lp32(iv)[0] ^= lp32(src)[0];
-	lp32(iv)[1] ^= lp32(src)[1];
-	lp32(iv)[2] ^= lp32(src)[2];
-	lp32(iv)[3] ^= lp32(src)[3];
-	aes_encrypt(iv, iv, &aes->u.enc);
-	memcpy(dst, iv, 16);
+      SilcUInt32 nb = len >> 4;
+
+      while (nb--) {
+	aes_encrypt(src, dst, &aes->u.enc);
 	src += 16;
 	dst += 16;
       }
     }
     break;
 
-  case SILC_CIPHER_MODE_CTR:
-    {
-      SilcUInt32 ctr[4];
-
-      SILC_GET32_MSB(ctr[0], iv);
-      SILC_GET32_MSB(ctr[1], iv + 4);
-      SILC_GET32_MSB(ctr[2], iv + 8);
-      SILC_GET32_MSB(ctr[3], iv + 12);
-
-      i = aes->u.enc.inf.b[2];
-      if (!i)
-	i = 16;
-
-      while (len-- > 0) {
-	if (i == 16) {
-	  if (++ctr[3] == 0)
-	    if (++ctr[2] == 0)
-	      if (++ctr[1] == 0)
-		++ctr[0];
-
-	  SILC_PUT32_MSB(ctr[0], iv);
-	  SILC_PUT32_MSB(ctr[1], iv + 4);
-	  SILC_PUT32_MSB(ctr[2], iv + 8);
-	  SILC_PUT32_MSB(ctr[3], iv + 12);
-
-	  aes_encrypt(iv, iv, &aes->u.enc);
-	  i = 0;
-	}
-	*dst++ = *src++ ^ iv[i++];
-      }
-      aes->u.enc.inf.b[2] = i;
+  case SILC_CIPHER_MODE_CBC:
+    SILC_CBC_ENC_MSB_128_8(len, iv, src, dst, i,
+			   aes_encrypt(iv, iv, &aes->u.enc));
+    break;
 
-      SILC_PUT32_MSB(ctr[0], iv);
-      SILC_PUT32_MSB(ctr[1], iv + 4);
-      SILC_PUT32_MSB(ctr[2], iv + 8);
-      SILC_PUT32_MSB(ctr[3], iv + 12);
-    }
+  case SILC_CIPHER_MODE_CFB:
+    SILC_CFB_ENC_MSB_128_8(iv, aes->u.enc.inf.b[2], src, dst,
+			   aes_encrypt(iv, iv, &aes->u.enc));
     break;
 
   default:
@@ -163,31 +151,35 @@ SILC_CIPHER_API_ENCRYPT(aes)
 
 SILC_CIPHER_API_DECRYPT(aes)
 {
-  switch (cipher->mode) {
-  case SILC_CIPHER_MODE_CBC:
+  AesContext *aes = context;
+  unsigned char prev[16];
+  int i;
+
+  switch (ops->mode) {
+  case SILC_CIPHER_MODE_CTR:
+    return silc_aes_encrypt(cipher, ops, context, src, dst, len, iv);
+    break;
+
+  case SILC_CIPHER_MODE_ECB:
     {
-      unsigned char tmp[16];
-      int nb = len >> 4;
-
-      if (len & (16 - 1))
-	return FALSE;
-
-      while(nb--) {
-	memcpy(tmp, src, 16);
-	aes_decrypt(src, dst, &((AesContext *)context)->u.dec);
-	lp32(dst)[0] ^= lp32(iv)[0];
-	lp32(dst)[1] ^= lp32(iv)[1];
-	lp32(dst)[2] ^= lp32(iv)[2];
-	lp32(dst)[3] ^= lp32(iv)[3];
-	memcpy(iv, tmp, 16);
+      SilcUInt32 nb = len >> 4;
+
+      while (nb--) {
+	aes_decrypt(src, dst, &aes->u.dec);
 	src += 16;
 	dst += 16;
       }
     }
     break;
 
-  case SILC_CIPHER_MODE_CTR:
-    return silc_aes_encrypt(cipher, context, src, dst, len, iv);
+  case SILC_CIPHER_MODE_CBC:
+    SILC_CBC_DEC_MSB_128_8(len, iv, prev, src, dst, i,
+			   aes_decrypt(src, dst, &aes->u.dec));
+    break;
+
+  case SILC_CIPHER_MODE_CFB:
+    SILC_CFB_DEC_MSB_128_8(iv, aes->u.enc.inf.b[2], src, dst,
+			   aes_encrypt(iv, iv, &aes->u.enc));
     break;
 
   default:
@@ -244,7 +236,6 @@ AES_RETURN aes_encrypt_key128(const unsigned char *key, aes_encrypt_ctx cx[1])
     ke4(cx->ks, 6);  ke4(cx->ks, 7);
     ke4(cx->ks, 8);
     ke4(cx->ks, 9);
-    cx->inf.l = 0;
     cx->inf.b[0] = 10 * 16;
 }
 
@@ -276,7 +267,6 @@ AES_RETURN aes_encrypt_key192(const unsigned char *key, aes_encrypt_ctx cx[1])
     ke6(cx->ks, 4);  ke6(cx->ks, 5);
     ke6(cx->ks, 6);
     kef6(cx->ks, 7);
-    cx->inf.l = 0;
     cx->inf.b[0] = 12 * 16;
 }
 
@@ -311,7 +301,6 @@ AES_RETURN aes_encrypt_key256(const unsigned char *key, aes_encrypt_ctx cx[1])
     ke8(cx->ks, 2); ke8(cx->ks, 3);
     ke8(cx->ks, 4); ke8(cx->ks, 5);
     kef8(cx->ks, 6);
-    cx->inf.l = 0;
     cx->inf.b[0] = 14 * 16;
 }
 
@@ -377,7 +366,6 @@ AES_RETURN aes_decrypt_key128(const unsigned char *key, aes_decrypt_ctx cx[1])
      kd4(cx->ks, 4);  kd4(cx->ks, 5);
      kd4(cx->ks, 6);  kd4(cx->ks, 7);
      kd4(cx->ks, 8); kdl4(cx->ks, 9);
-    cx->inf.l = 0;
     cx->inf.b[0] = 10 * 16;
 }
 
@@ -436,7 +424,6 @@ AES_RETURN aes_decrypt_key192(const unsigned char *key, aes_decrypt_ctx cx[1])
     kd6(cx->ks, 2);  kd6(cx->ks, 3);
     kd6(cx->ks, 4);  kd6(cx->ks, 5);
     kd6(cx->ks, 6); kdl6(cx->ks, 7);
-    cx->inf.l = 0;
     cx->inf.b[0] = 12 * 16;
 }
 
@@ -504,7 +491,6 @@ AES_RETURN aes_decrypt_key256(const unsigned char *key, aes_decrypt_ctx cx[1])
     kd8(cx->ks, 2);  kd8(cx->ks, 3);
     kd8(cx->ks, 4);  kd8(cx->ks, 5);
     kdl8(cx->ks, 6);
-    cx->inf.l = 0;
     cx->inf.b[0] = 14 * 16;
 }