20001210

 - (bal) OpenBSD CVS updates
   - markus@cvs.openbsd.org 2000/12/09 13:41:51
     [cipher.c cipher.h rijndael.c rijndael.h rijndael_boxes.h]
     undo rijndael changes
   - markus@cvs.openbsd.org 2000/12/09 13:48:31
     [rijndael.c]
     fix byte order bug w/o introducing new implementation
   - markus@cvs.openbsd.org 2000/12/09 14:08:27
     [sftp-server.c]
     "" -> "." for realpath; from vinschen@redhat.com
   - markus@cvs.openbsd.org 2000/12/09 14:06:54
     [ssh-agent.c]
     extern int optind; from stevesk@sweden.hp.com

1 files changed, 31 insertions, 36 deletions

diff --git a/cipher.c b/cipher.c
index 46ca830e3..788028c13 100644
--- a/cipher.c
+++ b/cipher.c
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: cipher.c,v 1.39 2000/12/06 23:05:42 markus Exp $");
+RCSID("$OpenBSD: cipher.c,v 1.40 2000/12/09 13:41:52 markus Exp $");
 
 #include "ssh.h"
 #include "xmalloc.h"
@@ -285,45 +285,40 @@ cast_cbc_decrypt(CipherContext *cc, u_char *dest, const u_char *src, u_int len)
 /* RIJNDAEL */
 
 #define RIJNDAEL_BLOCKSIZE 16
-
 void
 rijndael_setkey(CipherContext *cc, const u_char *key, u_int keylen)
 {
-        if (rijndael_makekey(&cc->u.rijndael.enc, RIJNDAEL_ENCRYPT,
-                    8*keylen, (char *)key) == -1)
-                fatal("rijndael_setkey: RIJNDAEL_ENCRYPT");
-        if (rijndael_makekey(&cc->u.rijndael.dec, RIJNDAEL_DECRYPT,
-                    8*keylen, (char *)key) == -1)
-                fatal("rijndael_setkey: RIJNDAEL_DECRYPT");
+        rijndael_set_key(&cc->u.rijndael.enc, (u4byte *)key, 8*keylen, 1);
+        rijndael_set_key(&cc->u.rijndael.dec, (u4byte *)key, 8*keylen, 0);
 }
 void
 rijndael_setiv(CipherContext *cc, const u_char *iv, u_int ivlen)
 {
-        if (iv == NULL || ivlen != RIJNDAEL_BLOCKSIZE) 
-                fatal("bad/no IV for %s.", cc->cipher->name);
-        memcpy(cc->u.rijndael.iv, iv, RIJNDAEL_BLOCKSIZE);
+        if (iv == NULL) 
+                fatal("no IV for %s.", cc->cipher->name);
+        memcpy((u_char *)cc->u.rijndael.iv, iv, RIJNDAEL_BLOCKSIZE);
 }
-
 void
 rijndael_cbc_encrypt(CipherContext *cc, u_char *dest, const u_char *src,
     u_int len)
 {
-        rijndael_key *ctx = &cc->u.rijndael.enc;
-        u_char *iv = cc->u.rijndael.iv;
-        u_char in[RIJNDAEL_BLOCKSIZE];
-        u_char *cprev, *cnow, *plain;
-        int i, j, blocks = len / RIJNDAEL_BLOCKSIZE;
+        rijndael_ctx *ctx = &cc->u.rijndael.enc;
+        u4byte *iv = cc->u.rijndael.iv;
+        u4byte in[4];
+        u4byte *cprev, *cnow, *plain;
+        int i, blocks = len / RIJNDAEL_BLOCKSIZE;
         if (len == 0)
                 return;
         if (len % RIJNDAEL_BLOCKSIZE)
                 fatal("rijndael_cbc_encrypt: bad len %d", len);
-        cnow  = dest;
-        plain = (u_char *) src;
+        cnow  = (u4byte*) dest;
+        plain = (u4byte*) src;
         cprev = iv;
-        for(i = 0; i < blocks; i++, plain+=RIJNDAEL_BLOCKSIZE,
-            cnow+=RIJNDAEL_BLOCKSIZE) {
-                for (j = 0; j < RIJNDAEL_BLOCKSIZE; j++)
-                        in[j] = plain[j] ^ cprev[j];
+        for(i = 0; i < blocks; i++, plain+=4, cnow+=4) {
+                in[0] = plain[0] ^ cprev[0];
+                in[1] = plain[1] ^ cprev[1];
+                in[2] = plain[2] ^ cprev[2];
+                in[3] = plain[3] ^ cprev[3];
                 rijndael_encrypt(ctx, in, cnow);
                 cprev = cnow;
         }
@@ -334,25 +329,25 @@ void
 rijndael_cbc_decrypt(CipherContext *cc, u_char *dest, const u_char *src,
     u_int len)
 {
-        rijndael_key *ctx = &cc->u.rijndael.dec;
-        u_char *iv = cc->u.rijndael.iv;
-        u_char ivsaved[RIJNDAEL_BLOCKSIZE];
-        u_char *cnow  = (u_char *) (src+len-RIJNDAEL_BLOCKSIZE);
-        u_char *plain = dest+len-RIJNDAEL_BLOCKSIZE;
-        u_char *ivp;
-        int i, j, blocks = len / RIJNDAEL_BLOCKSIZE;
+        rijndael_ctx *ctx = &cc->u.rijndael.dec;
+        u4byte *iv = cc->u.rijndael.iv;
+        u4byte ivsaved[4];
+        u4byte *cnow =  (u4byte*) (src+len-RIJNDAEL_BLOCKSIZE);
+        u4byte *plain = (u4byte*) (dest+len-RIJNDAEL_BLOCKSIZE);
+        u4byte *ivp;
+        int i, blocks = len / RIJNDAEL_BLOCKSIZE;
         if (len == 0)
                 return;
         if (len % RIJNDAEL_BLOCKSIZE)
                 fatal("rijndael_cbc_decrypt: bad len %d", len);
         memcpy(ivsaved, cnow, RIJNDAEL_BLOCKSIZE);
-        for(i = blocks; i > 0; i--, cnow-=RIJNDAEL_BLOCKSIZE,
-            plain-=RIJNDAEL_BLOCKSIZE) {
+        for(i = blocks; i > 0; i--, cnow-=4, plain-=4) {
                 rijndael_decrypt(ctx, cnow, plain);
-                //rijndael_decrypt(cnow, plain, ctx->keySched, ctx->ROUNDS);
-                ivp = (i == 1) ? iv : cnow-RIJNDAEL_BLOCKSIZE;
-                for (j = 0; j < RIJNDAEL_BLOCKSIZE; j++)
-                        plain[j] ^= ivp[j];
+                ivp =  (i == 1) ? iv : cnow-4;
+                plain[0] ^= ivp[0];
+                plain[1] ^= ivp[1];
+                plain[2] ^= ivp[2];
+                plain[3] ^= ivp[3];
         }
         memcpy(iv, ivsaved, RIJNDAEL_BLOCKSIZE);
 }