Socket address stuff. Sockid is broken still.

[chiark-tcl.git] / crypto / bcmode.c

diff --git a/crypto/bcmode.c b/crypto/bcmode.c
index 7d5a5d4f6ea500e03835393f79b61e9470b36147..f7c808d55410796b4589220e28554b2669109b06 100644 (file)
--- a/crypto/bcmode.c
+++ b/crypto/bcmode.c
@@ -3,10 +3,10 @@
   
 #include "hbytes.h"
 
-const char *mode_cbc_encrypt(Byte *data, int blocks,
-                            const Byte *iv, Byte *chain,
-                            const BlockCipherAlgInfo *alg, int encr,
-                            int blocksize, const void *sch) {
+static const char *mode_cbc_encrypt(Byte *data, int blocks,
+                                   const Byte *iv, Byte *chain,
+                                   const BlockCipherAlgInfo *alg, int encr,
+                                   int blocksize, const void *sch) {
   memcpy(chain,iv,blocksize);
   alg->byteswap(chain);
   
@@ -23,10 +23,10 @@ const char *mode_cbc_encrypt(Byte *data, int blocks,
   return 0;
 }
 
-const char *mode_cbc_decrypt(Byte *data, int blocks,
-                            const Byte *iv, Byte *chain,
-                            const BlockCipherAlgInfo *alg, int encr,
-                            int blocksize, const void *sch) {
+static const char *mode_cbc_decrypt(Byte *data, int blocks,
+                                   const Byte *iv, Byte *chain,
+                                   const BlockCipherAlgInfo *alg, int encr,
+                                   int blocksize, const void *sch) {
   int cchain= 0;
 
   memcpy(chain,iv,blocksize);
@@ -46,7 +46,21 @@ const char *mode_cbc_decrypt(Byte *data, int blocks,
   return 0;
 }
 
+static const char *mode_ecb(Byte *data, int blocks,
+                           const Byte *iv, Byte *chain,
+                           const BlockCipherAlgInfo *alg, int encr,
+                           int blocksize, const void *sch) {
+  while (blocks > 0) {
+    alg->byteswap(data);
+    (encr ? &alg->encrypt : &alg->decrypt)->crypt(sch, data, data);
+    alg->byteswap(data);
+    blocks--; data += blocksize;
+  }
+  return 0;
+}
+
 const BlockCipherModeInfo blockciphermodeinfos[]= {
   { "cbc", 1, 2, mode_cbc_encrypt, mode_cbc_decrypt },
+  { "ecb", 0, 0, mode_ecb,         mode_ecb         },
   { 0 }
 };