output[1] = R;
}
-#define GET_32BIT_MSB_FIRST(cp) \
- (((unsigned long)(unsigned char)(cp)[3]) | \
- ((unsigned long)(unsigned char)(cp)[2] << 8) | \
- ((unsigned long)(unsigned char)(cp)[1] << 16) | \
- ((unsigned long)(unsigned char)(cp)[0] << 24))
-
-#define PUT_32BIT_MSB_FIRST(cp, value) do { \
- (cp)[3] = (value); \
- (cp)[2] = (value) >> 8; \
- (cp)[1] = (value) >> 16; \
- (cp)[0] = (value) >> 24; } while (0)
-
static void des_cbc_encrypt(unsigned char *dest, const unsigned char *src,
unsigned int len, DESContext * sched)
{
scheds->iv1 = iv1;
}
+#ifdef ENABLE_3DES_SSH2_CTR
static void des_sdctr3(unsigned char *dest, const unsigned char *src,
unsigned int len, DESContext * scheds)
{
iv0 = scheds->iv0;
iv1 = scheds->iv1;
for (i = 0; i < len; i += 8) {
- des_encipher(b, iv0, iv1, &scheds[2]);
+ des_encipher(b, iv0, iv1, &scheds[0]);
des_decipher(b, b[0], b[1], &scheds[1]);
- des_encipher(b, b[0], b[1], &scheds[0]);
+ 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;
scheds->iv0 = iv0;
scheds->iv1 = iv1;
}
+#endif
static void *des3_make_context(void)
{
des_cbc3_decrypt(blk, blk, len, keys);
}
+#ifdef ENABLE_3DES_SSH2_CTR
static void des3_ssh2_sdctr(void *handle, unsigned char *blk, int len)
{
DESContext *keys = (DESContext *) handle;
des_sdctr3(blk, blk, len, keys);
}
+#endif
static void des_ssh2_encrypt_blk(void *handle, unsigned char *blk, int len)
{
des3_make_context, des3_free_context, des3_iv, des3_key,
des3_ssh2_encrypt_blk, des3_ssh2_decrypt_blk,
"3des-cbc",
- 8, 168, "triple-DES CBC"
+ 8, 168, SSH_CIPHER_IS_CBC, "triple-DES CBC"
};
+#ifdef ENABLE_3DES_SSH2_CTR
static const struct ssh2_cipher ssh_3des_ssh2_ctr = {
des3_make_context, des3_free_context, des3_iv, des3_key,
des3_ssh2_sdctr, des3_ssh2_sdctr,
"3des-ctr",
- 8, 168, "triple-DES SDCTR"
+ 8, 168, 0, "triple-DES SDCTR"
};
+#endif
/*
* Single DES in SSH-2. "des-cbc" is marked as HISTORIC in
des_make_context, des3_free_context, des3_iv, des_key,
des_ssh2_encrypt_blk, des_ssh2_decrypt_blk,
"des-cbc",
- 8, 56, "single-DES CBC"
+ 8, 56, SSH_CIPHER_IS_CBC, "single-DES CBC"
};
static const struct ssh2_cipher ssh_des_sshcom_ssh2 = {
des_make_context, des3_free_context, des3_iv, des_key,
des_ssh2_encrypt_blk, des_ssh2_decrypt_blk,
"des-cbc@ssh.com",
- 8, 56, "single-DES CBC"
+ 8, 56, SSH_CIPHER_IS_CBC, "single-DES CBC"
};
/*
* builds.
*/
static const struct ssh2_cipher *const des3_list[] = {
-/* &ssh_3des_ssh2_ctr, */
+#ifdef ENABLE_3DES_SSH2_CTR
+ &ssh_3des_ssh2_ctr,
+#endif
&ssh_3des_ssh2
};