Updating code to PuTTY acdcf2bf

Source commit: 671be1ddb03698a63ee7356b74d6e7509f61e556

source/putty/sshdes.c

@@ -66,11 +66,11 @@
  */
 static inline uint32_t rol(uint32_t x, unsigned c)
 {
-    return (x << (31 & c)) | (x >> (31 & -c));
+    return (x << (31 & c)) | (x >> (31 & -(int/*WINSCP*/)c));
 }
 static inline uint32_t ror(uint32_t x, unsigned c)
 {
-    return rol(x, -c);
+    return rol(x, -(int/*WINSCP*/)c);
 }
 
 /*
@@ -267,6 +267,7 @@ static inline uint32_t des_S(uint32_t si6420, uint32_t si7531)
      */
 
     /* Set up the gadgets */
+    { // WINSCP
     uint32_t c40 = ((si6420     ) & 0x00FC00FC) | 0xFF00FF00;
     uint32_t c62 = ((si6420 >> 8) & 0x00FC00FC) | 0xFF00FF00;
     uint32_t c51 = ((si7531     ) & 0x00FC00FC) | 0xFF00FF00;
@@ -275,13 +276,15 @@ static inline uint32_t des_S(uint32_t si6420, uint32_t si7531)
           " c51=%08"PRIx32" c73=%08"PRIx32"\n", c40, c62, c51, c73);
 
     /* Iterate over the table */
+    { // WINSCP
     static const struct tbl { uint32_t t40, t62, t51, t73; } tbl[32] = {
-#define TABLE32(a, b) { ((uint32_t)a), (a>>32), ((uint32_t)b), (b>>32) },
+#define TABLE32(a, b) { ((uint32_t)a##LL), (a##LL>>32), ((uint32_t)b##LL), (b##LL>>32) }, // WINSCP
         SBOX_ITERATION(TABLE32)
 #undef TABLE32
     };
     uint32_t s40 = 0, s62 = 0, s51 = 0, s73 = 0;
-    for (const struct tbl *t = tbl, *limit = tbl + 32; t < limit; t++) {
+    const struct tbl *t, *limit; // WINSCP
+    for (t = tbl, limit = tbl + 32; t < limit; t++) {
         s40 ^= c40 & t->t40; c40 += 0x00080008;
         s62 ^= c62 & t->t62; c62 += 0x00080008;
         s51 ^= c51 & t->t51; c51 += 0x00080008;
@@ -313,6 +316,8 @@ static inline uint32_t des_S(uint32_t si6420, uint32_t si7531)
 
     /* Recombine and return */
     return (s40 >> 12) | (s62 >> 4) | (s51 >> 8) | (s73);
+    } // WINSCP
+    } // WINSCP
 
 #endif /* SIXTY_FOUR_BIT */
 
@@ -450,17 +455,20 @@ void des_key_setup(uint64_t key, des_keysched *sched)
      * 28-bit integers starting at bits 0 and 32. */
     uint64_t CD = bitsel(key, PC1, lenof(PC1));
 
-    for (size_t i = 0; i < 16; i++) {
+    { // WINSCP
+    size_t i; // WINSCP
+    for (i = 0; i < 16; i++) {
         /* Rotate each 28-bit half of CD left by 1 or 2 bits (varying
          * between rounds) */
         CD <<= leftshifts[i];
-        CD = (CD & 0x0FFFFFFF0FFFFFFF) | ((CD & 0xF0000000F0000000) >> 28);
+        CD = (CD & 0x0FFFFFFF0FFFFFFFLL) | ((CD & 0xF0000000F0000000LL) >> 28); // WINSCP
 
         /* Select key bits from the rotated word to use during the
          * actual cipher */
         sched->k7531[i] = bitsel(CD, PC2_7531, lenof(PC2_7531));
         sched->k6420[i] = bitsel(CD, PC2_6420, lenof(PC2_6420));
     }
+    } // WINSCP
 }
 
 /*
@@ -724,7 +732,8 @@ static void des3_cbc1_setkey(ssh_cipher *ciph, const void *vkey)
 {
     struct des3_cbc1_ctx *ctx = container_of(ciph, struct des3_cbc1_ctx, ciph);
     const uint8_t *key = (const uint8_t *)vkey;
-    for (size_t i = 0; i < 3; i++)
+    size_t i; // WINSCP
+    for (i = 0; i < 3; i++)
         des_key_setup(GET_64BIT_MSB_FIRST(key + 8*i), &ctx->sched[i]);
 }
 
@@ -748,10 +757,12 @@ static void des3_cbc1_cbc_encrypt(ssh_cipher *ciph, void *vdata, int len)
         lr = des_inner_cipher(lr, &ctx->sched[0], ENCIPHER);
         lr = des_inner_cipher(lr, &ctx->sched[1], DECIPHER);
         lr = des_inner_cipher(lr, &ctx->sched[2], ENCIPHER);
+        { // WINSCP
         LR ciphertext = des_FP(lr);
 
         des_store_lr(data, ciphertext);
         ctx->iv = ciphertext;
+        } // WINSCP
     }
 }
 
@@ -767,11 +778,13 @@ static void des3_cbc1_cbc_decrypt(ssh_cipher *ciph, void *vdata, int len)
         lr = des_inner_cipher(lr, &ctx->sched[2], DECIPHER);
         lr = des_inner_cipher(lr, &ctx->sched[1], ENCIPHER);
         lr = des_inner_cipher(lr, &ctx->sched[0], DECIPHER);
+        { // WINSCP
         LR cipher_out = des_FP(lr);
 
         LR plaintext = des_xor_lr(cipher_out, ctx->iv);
         des_store_lr(data, plaintext);
         ctx->iv = ciphertext;
+        } // WINSCP
     }
 }
 
@@ -815,7 +828,8 @@ static void des3_sdctr_setkey(ssh_cipher *ciph, const void *vkey)
     struct des3_sdctr_ctx *ctx = container_of(
         ciph, struct des3_sdctr_ctx, ciph);
     const uint8_t *key = (const uint8_t *)vkey;
-    for (size_t i = 0; i < 3; i++)
+    size_t i; // WINSCP
+    for (i = 0; i < 3; i++)
         des_key_setup(GET_64BIT_MSB_FIRST(key + 8*i), &ctx->sched[i]);
 }
 
@@ -826,7 +840,8 @@ static void des3_sdctr_setiv(ssh_cipher *ciph, const void *viv)
     const uint8_t *iv = (const uint8_t *)viv;
 
     /* Import the initial counter value into the internal representation */
-    for (unsigned i = 0; i < SDCTR_WORDS; i++)
+    unsigned i = 0; // WINSCP
+    for (i = 0; i < SDCTR_WORDS; i++)
         ctx->counter[i] = GET_BIGNUMINT_MSB_FIRST(
             iv + 8 - BIGNUM_INT_BYTES - i*BIGNUM_INT_BYTES);
 }
@@ -839,26 +854,33 @@ static void des3_sdctr_encrypt_decrypt(ssh_cipher *ciph, void *vdata, int len)
     uint8_t iv_buf[8];
     for (; len > 0; len -= 8, data += 8) {
         /* Format the counter value into the buffer. */
-        for (unsigned i = 0; i < SDCTR_WORDS; i++)
+        unsigned i; // WINSCP
+        for (i = 0; i < SDCTR_WORDS; i++)
             PUT_BIGNUMINT_MSB_FIRST(
                 iv_buf + 8 - BIGNUM_INT_BYTES - i*BIGNUM_INT_BYTES,
                 ctx->counter[i]);
 
         /* Increment the counter. */
+        { // WINSCP
         BignumCarry carry = 1;
-        for (unsigned i = 0; i < SDCTR_WORDS; i++)
+        for (i = 0; i < SDCTR_WORDS; i++) // WINSCP
             BignumADC(ctx->counter[i], carry, ctx->counter[i], 0, carry);
 
         /* Triple-encrypt the counter value from the IV. */
+        { // WINSCP
         LR lr = des_IP(des_load_lr(iv_buf));
         lr = des_inner_cipher(lr, &ctx->sched[0], ENCIPHER);
         lr = des_inner_cipher(lr, &ctx->sched[1], DECIPHER);
         lr = des_inner_cipher(lr, &ctx->sched[2], ENCIPHER);
+        { // WINSCP
         LR keystream = des_FP(lr);
 
         LR input = des_load_lr(data);
         LR output = des_xor_lr(input, keystream);
         des_store_lr(data, output);
+        } // WINSCP
+        } // WINSCP
+        } // WINSCP
     }
     smemclr(iv_buf, sizeof(iv_buf));
 }
@@ -906,7 +928,8 @@ static void des3_cbc3_setkey(ssh_cipher *ciph, const void *vkey)
 {
     struct des3_cbc3_ctx *ctx = container_of(ciph, struct des3_cbc3_ctx, ciph);
     const uint8_t *key = (const uint8_t *)vkey;
-    for (size_t i = 0; i < 3; i++)
+    size_t i; // WINSCP
+    for (i = 0; i < 3; i++)
         des_key_setup(GET_64BIT_MSB_FIRST(key + 8*i), &ctx->sched[i]);
 }
 
@@ -929,8 +952,11 @@ static void des3_cbc3_setiv(ssh_cipher *ciph, const void *viv)
     /* But we store the IVs in permuted form, so that we can handle
      * all three CBC layers without having to do IP/FP in between. */
     iv = des_IP(iv);
-    for (size_t i = 0; i < 3; i++)
+    { // WINSCP
+    size_t i; // WINSCP
+    for (i = 0; i < 3; i++)
         ctx->iv[i] = iv;
+    } // WINSCP
 }
 
 static void des3_cbc3_cbc_encrypt(ssh_cipher *ciph, void *vdata, int len)
@@ -948,6 +974,7 @@ static void des3_cbc3_cbc_encrypt(ssh_cipher *ciph, void *vdata, int len)
         lr = des_inner_cipher(lr, &ctx->sched[0], ENCIPHER);
         ctx->iv[0] = lr;
 
+        { // WINSCP
         LR ciphertext = lr;
         lr = des_inner_cipher(ciphertext, &ctx->sched[1], DECIPHER);
         lr = des_xor_lr(lr, ctx->iv[1]);
@@ -958,6 +985,7 @@ static void des3_cbc3_cbc_encrypt(ssh_cipher *ciph, void *vdata, int len)
         ctx->iv[2] = lr;
 
         des_store_lr(data, des_FP(lr));
+        } // WINSCP
     }
 }