Sebastian Kuschel reports that pfd_closing can be called for a socket

[u/mdw/putty] / sshdes.c

diff --git a/sshdes.c b/sshdes.c
index 6906a65..03d2b3a 100644 (file)
--- a/sshdes.c
+++ b/sshdes.c
@@ -600,7 +600,7 @@ static void des_decipher(word32 * output, word32 L, word32 R,
     output[1] = R;
 }
 
-static void des_cbc_encrypt(unsigned char *dest, const unsigned char *src,
+static void des_cbc_encrypt(unsigned char *blk,
                            unsigned int len, DESContext * sched)
 {
     word32 out[2], iv0, iv1;
@@ -611,23 +611,20 @@ static void des_cbc_encrypt(unsigned char *dest, const unsigned char *src,
     iv0 = sched->iv0;
     iv1 = sched->iv1;
     for (i = 0; i < len; i += 8) {
-       iv0 ^= GET_32BIT_MSB_FIRST(src);
-       src += 4;
-       iv1 ^= GET_32BIT_MSB_FIRST(src);
-       src += 4;
+       iv0 ^= GET_32BIT_MSB_FIRST(blk);
+       iv1 ^= GET_32BIT_MSB_FIRST(blk + 4);
        des_encipher(out, iv0, iv1, sched);
        iv0 = out[0];
        iv1 = out[1];
-       PUT_32BIT_MSB_FIRST(dest, iv0);
-       dest += 4;
-       PUT_32BIT_MSB_FIRST(dest, iv1);
-       dest += 4;
+       PUT_32BIT_MSB_FIRST(blk, iv0);
+       PUT_32BIT_MSB_FIRST(blk + 4, iv1);
+       blk += 8;
     }
     sched->iv0 = iv0;
     sched->iv1 = iv1;
 }
 
-static void des_cbc_decrypt(unsigned char *dest, const unsigned char *src,
+static void des_cbc_decrypt(unsigned char *blk,
                            unsigned int len, DESContext * sched)
 {
     word32 out[2], iv0, iv1, xL, xR;
@@ -638,17 +635,14 @@ static void des_cbc_decrypt(unsigned char *dest, const unsigned char *src,
     iv0 = sched->iv0;
     iv1 = sched->iv1;
     for (i = 0; i < len; i += 8) {
-       xL = GET_32BIT_MSB_FIRST(src);
-       src += 4;
-       xR = GET_32BIT_MSB_FIRST(src);
-       src += 4;
+       xL = GET_32BIT_MSB_FIRST(blk);
+       xR = GET_32BIT_MSB_FIRST(blk + 4);
        des_decipher(out, xL, xR, sched);
        iv0 ^= out[0];
        iv1 ^= out[1];
-       PUT_32BIT_MSB_FIRST(dest, iv0);
-       dest += 4;
-       PUT_32BIT_MSB_FIRST(dest, iv1);
-       dest += 4;
+       PUT_32BIT_MSB_FIRST(blk, iv0);
+       PUT_32BIT_MSB_FIRST(blk + 4, iv1);
+       blk += 8;
        iv0 = xL;
        iv1 = xR;
     }
@@ -656,15 +650,15 @@ static void des_cbc_decrypt(unsigned char *dest, const unsigned char *src,
     sched->iv1 = iv1;
 }
 
-static void des_3cbc_encrypt(unsigned char *dest, const unsigned char *src,
+static void des_3cbc_encrypt(unsigned char *blk,
                             unsigned int len, DESContext * scheds)
 {
-    des_cbc_encrypt(dest, src, len, &scheds[0]);
-    des_cbc_decrypt(dest, src, len, &scheds[1]);
-    des_cbc_encrypt(dest, src, len, &scheds[2]);
+    des_cbc_encrypt(blk, len, &scheds[0]);
+    des_cbc_decrypt(blk, len, &scheds[1]);
+    des_cbc_encrypt(blk, len, &scheds[2]);
 }
 
-static void des_cbc3_encrypt(unsigned char *dest, const unsigned char *src,
+static void des_cbc3_encrypt(unsigned char *blk,
                             unsigned int len, DESContext * scheds)
 {
     word32 out[2], iv0, iv1;
@@ -675,33 +669,30 @@ static void des_cbc3_encrypt(unsigned char *dest, const unsigned char *src,
     iv0 = scheds->iv0;
     iv1 = scheds->iv1;
     for (i = 0; i < len; i += 8) {
-       iv0 ^= GET_32BIT_MSB_FIRST(src);
-       src += 4;
-       iv1 ^= GET_32BIT_MSB_FIRST(src);
-       src += 4;
+       iv0 ^= GET_32BIT_MSB_FIRST(blk);
+       iv1 ^= GET_32BIT_MSB_FIRST(blk + 4);
        des_encipher(out, iv0, iv1, &scheds[0]);
        des_decipher(out, out[0], out[1], &scheds[1]);
        des_encipher(out, out[0], out[1], &scheds[2]);
        iv0 = out[0];
        iv1 = out[1];
-       PUT_32BIT_MSB_FIRST(dest, iv0);
-       dest += 4;
-       PUT_32BIT_MSB_FIRST(dest, iv1);
-       dest += 4;
+       PUT_32BIT_MSB_FIRST(blk, iv0);
+       PUT_32BIT_MSB_FIRST(blk + 4, iv1);
+       blk += 8;
     }
     scheds->iv0 = iv0;
     scheds->iv1 = iv1;
 }
 
-static void des_3cbc_decrypt(unsigned char *dest, const unsigned char *src,
+static void des_3cbc_decrypt(unsigned char *blk,
                             unsigned int len, DESContext * scheds)
 {
-    des_cbc_decrypt(dest, src, len, &scheds[2]);
-    des_cbc_encrypt(dest, src, len, &scheds[1]);
-    des_cbc_decrypt(dest, src, len, &scheds[0]);
+    des_cbc_decrypt(blk, len, &scheds[2]);
+    des_cbc_encrypt(blk, len, &scheds[1]);
+    des_cbc_decrypt(blk, len, &scheds[0]);
 }
 
-static void des_cbc3_decrypt(unsigned char *dest, const unsigned char *src,
+static void des_cbc3_decrypt(unsigned char *blk,
                             unsigned int len, DESContext * scheds)
 {
     word32 out[2], iv0, iv1, xL, xR;
@@ -712,19 +703,16 @@ static void des_cbc3_decrypt(unsigned char *dest, const unsigned char *src,
     iv0 = scheds->iv0;
     iv1 = scheds->iv1;
     for (i = 0; i < len; i += 8) {
-       xL = GET_32BIT_MSB_FIRST(src);
-       src += 4;
-       xR = GET_32BIT_MSB_FIRST(src);
-       src += 4;
+       xL = GET_32BIT_MSB_FIRST(blk);
+       xR = GET_32BIT_MSB_FIRST(blk + 4);
        des_decipher(out, xL, xR, &scheds[2]);
        des_encipher(out, out[0], out[1], &scheds[1]);
        des_decipher(out, out[0], out[1], &scheds[0]);
        iv0 ^= out[0];
        iv1 ^= out[1];
-       PUT_32BIT_MSB_FIRST(dest, iv0);
-       dest += 4;
-       PUT_32BIT_MSB_FIRST(dest, iv1);
-       dest += 4;
+       PUT_32BIT_MSB_FIRST(blk, iv0);
+       PUT_32BIT_MSB_FIRST(blk + 4, iv1);
+       blk += 8;
        iv0 = xL;
        iv1 = xR;
     }
@@ -732,7 +720,7 @@ static void des_cbc3_decrypt(unsigned char *dest, const unsigned char *src,
     scheds->iv1 = iv1;
 }
 
-static void des_sdctr3(unsigned char *dest, const unsigned char *src,
+static void des_sdctr3(unsigned char *blk,
                             unsigned int len, DESContext * scheds)
 {
     word32 b[2], iv0, iv1, tmp;
@@ -746,14 +734,12 @@ static void des_sdctr3(unsigned char *dest, const unsigned char *src,
        des_encipher(b, iv0, iv1, &scheds[0]);
        des_decipher(b, b[0], b[1], &scheds[1]);
        des_encipher(b, b[0], b[1], &scheds[2]);
-       tmp = GET_32BIT_MSB_FIRST(src);
-       PUT_32BIT_MSB_FIRST(dest, tmp ^ b[0]);
-       src += 4;
-       dest += 4;
-       tmp = GET_32BIT_MSB_FIRST(src);
-       PUT_32BIT_MSB_FIRST(dest, tmp ^ b[1]);
-       src += 4;
-       dest += 4;
+       tmp = GET_32BIT_MSB_FIRST(blk);
+       PUT_32BIT_MSB_FIRST(blk, tmp ^ b[0]);
+       blk += 4;
+       tmp = GET_32BIT_MSB_FIRST(blk);
+       PUT_32BIT_MSB_FIRST(blk, tmp ^ b[1]);
+       blk += 4;
        if ((iv1 = (iv1 + 1) & 0xffffffff) == 0)
            iv0 = (iv0 + 1) & 0xffffffff;
     }
@@ -823,43 +809,43 @@ static void des3_sesskey(void *handle, unsigned char *key)
 static void des3_encrypt_blk(void *handle, unsigned char *blk, int len)
 {
     DESContext *keys = (DESContext *) handle;
-    des_3cbc_encrypt(blk, blk, len, keys);
+    des_3cbc_encrypt(blk, len, keys);
 }
 
 static void des3_decrypt_blk(void *handle, unsigned char *blk, int len)
 {
     DESContext *keys = (DESContext *) handle;
-    des_3cbc_decrypt(blk, blk, len, keys+3);
+    des_3cbc_decrypt(blk, len, keys+3);
 }
 
 static void des3_ssh2_encrypt_blk(void *handle, unsigned char *blk, int len)
 {
     DESContext *keys = (DESContext *) handle;
-    des_cbc3_encrypt(blk, blk, len, keys);
+    des_cbc3_encrypt(blk, len, keys);
 }
 
 static void des3_ssh2_decrypt_blk(void *handle, unsigned char *blk, int len)
 {
     DESContext *keys = (DESContext *) handle;
-    des_cbc3_decrypt(blk, blk, len, keys);
+    des_cbc3_decrypt(blk, len, keys);
 }
 
 static void des3_ssh2_sdctr(void *handle, unsigned char *blk, int len)
 {
     DESContext *keys = (DESContext *) handle;
-    des_sdctr3(blk, blk, len, keys);
+    des_sdctr3(blk, len, keys);
 }
 
 static void des_ssh2_encrypt_blk(void *handle, unsigned char *blk, int len)
 {
     DESContext *keys = (DESContext *) handle;
-    des_cbc_encrypt(blk, blk, len, keys);
+    des_cbc_encrypt(blk, len, keys);
 }
 
 static void des_ssh2_decrypt_blk(void *handle, unsigned char *blk, int len)
 {
     DESContext *keys = (DESContext *) handle;
-    des_cbc_decrypt(blk, blk, len, keys);
+    des_cbc_decrypt(blk, len, keys);
 }
 
 void des3_decrypt_pubkey(unsigned char *key, unsigned char *blk, int len)
@@ -871,8 +857,8 @@ void des3_decrypt_pubkey(unsigned char *key, unsigned char *blk, int len)
                  GET_32BIT_MSB_FIRST(key + 12), &ourkeys[1]);
     des_key_setup(GET_32BIT_MSB_FIRST(key),
                  GET_32BIT_MSB_FIRST(key + 4), &ourkeys[2]);
-    des_3cbc_decrypt(blk, blk, len, ourkeys);
-    memset(ourkeys, 0, sizeof(ourkeys));
+    des_3cbc_decrypt(blk, len, ourkeys);
+    smemclr(ourkeys, sizeof(ourkeys));
 }
 
 void des3_encrypt_pubkey(unsigned char *key, unsigned char *blk, int len)
@@ -884,8 +870,8 @@ void des3_encrypt_pubkey(unsigned char *key, unsigned char *blk, int len)
                  GET_32BIT_MSB_FIRST(key + 12), &ourkeys[1]);
     des_key_setup(GET_32BIT_MSB_FIRST(key),
                  GET_32BIT_MSB_FIRST(key + 4), &ourkeys[2]);
-    des_3cbc_encrypt(blk, blk, len, ourkeys);
-    memset(ourkeys, 0, sizeof(ourkeys));
+    des_3cbc_encrypt(blk, len, ourkeys);
+    smemclr(ourkeys, sizeof(ourkeys));
 }
 
 void des3_decrypt_pubkey_ossh(unsigned char *key, unsigned char *iv,
@@ -900,8 +886,8 @@ void des3_decrypt_pubkey_ossh(unsigned char *key, unsigned char *iv,
                  GET_32BIT_MSB_FIRST(key + 20), &ourkeys[2]);
     ourkeys[0].iv0 = GET_32BIT_MSB_FIRST(iv);
     ourkeys[0].iv1 = GET_32BIT_MSB_FIRST(iv+4);
-    des_cbc3_decrypt(blk, blk, len, ourkeys);
-    memset(ourkeys, 0, sizeof(ourkeys));
+    des_cbc3_decrypt(blk, len, ourkeys);
+    smemclr(ourkeys, sizeof(ourkeys));
 }
 
 void des3_encrypt_pubkey_ossh(unsigned char *key, unsigned char *iv,
@@ -916,8 +902,8 @@ void des3_encrypt_pubkey_ossh(unsigned char *key, unsigned char *iv,
                  GET_32BIT_MSB_FIRST(key + 20), &ourkeys[2]);
     ourkeys[0].iv0 = GET_32BIT_MSB_FIRST(iv);
     ourkeys[0].iv1 = GET_32BIT_MSB_FIRST(iv+4);
-    des_cbc3_encrypt(blk, blk, len, ourkeys);
-    memset(ourkeys, 0, sizeof(ourkeys));
+    des_cbc3_encrypt(blk, len, ourkeys);
+    smemclr(ourkeys, sizeof(ourkeys));
 }
 
 static void des_keysetup_xdmauth(unsigned char *keydata, DESContext *dc)
@@ -947,14 +933,14 @@ void des_encrypt_xdmauth(unsigned char *keydata, unsigned char *blk, int len)
 {
     DESContext dc;
     des_keysetup_xdmauth(keydata, &dc);
-    des_cbc_encrypt(blk, blk, 24, &dc);
+    des_cbc_encrypt(blk, 24, &dc);
 }
 
 void des_decrypt_xdmauth(unsigned char *keydata, unsigned char *blk, int len)
 {
     DESContext dc;
     des_keysetup_xdmauth(keydata, &dc);
-    des_cbc_decrypt(blk, blk, 24, &dc);
+    des_cbc_decrypt(blk, 24, &dc);
 }
 
 static const struct ssh2_cipher ssh_3des_ssh2 = {
@@ -973,7 +959,7 @@ static const struct ssh2_cipher ssh_3des_ssh2_ctr = {
 
 /*
  * Single DES in SSH-2. "des-cbc" is marked as HISTORIC in
- * draft-ietf-secsh-assignednumbers-04.txt, referring to
+ * RFC 4250, referring to
  * FIPS-46-3.  ("Single DES (i.e., DES) will be permitted 
  * for legacy systems only.") , but ssh.com support it and 
  * apparently aren't the only people to do so, so we sigh 
@@ -1029,13 +1015,13 @@ static void des_sesskey(void *handle, unsigned char *key)
 static void des_encrypt_blk(void *handle, unsigned char *blk, int len)
 {
     DESContext *keys = (DESContext *) handle;
-    des_cbc_encrypt(blk, blk, len, keys);
+    des_cbc_encrypt(blk, len, keys);
 }
 
 static void des_decrypt_blk(void *handle, unsigned char *blk, int len)
 {
     DESContext *keys = (DESContext *) handle;
-    des_cbc_decrypt(blk, blk, len, keys+1);
+    des_cbc_decrypt(blk, len, keys+1);
 }
 
 const struct ssh_cipher ssh_des = {