word32 iv0, iv1; /* for CBC mode */
} BlowfishContext;
-#define GET_32BIT_LSB_FIRST(cp) \
- (((unsigned long)(unsigned char)(cp)[0]) | \
- ((unsigned long)(unsigned char)(cp)[1] << 8) | \
- ((unsigned long)(unsigned char)(cp)[2] << 16) | \
- ((unsigned long)(unsigned char)(cp)[3] << 24))
-
-#define PUT_32BIT_LSB_FIRST(cp, value) do { \
- (cp)[0] = (value); \
- (cp)[1] = (value) >> 8; \
- (cp)[2] = (value) >> 16; \
- (cp)[3] = (value) >> 24; } while (0)
-
-#define GET_32BIT_MSB_FIRST(cp) \
- (((unsigned long)(unsigned char)(cp)[0] << 24) | \
- ((unsigned long)(unsigned char)(cp)[1] << 16) | \
- ((unsigned long)(unsigned char)(cp)[2] << 8) | \
- ((unsigned long)(unsigned char)(cp)[3]))
-
-#define PUT_32BIT_MSB_FIRST(cp, value) do { \
- (cp)[0] = (value) >> 24; \
- (cp)[1] = (value) >> 16; \
- (cp)[2] = (value) >> 8; \
- (cp)[3] = (value); } while (0)
-
/*
* The Blowfish init data: hex digits of the fractional part of pi.
* (ie pi as a hex fraction is 3.243F6A8885A308D3...)
ctx->iv1 = iv1;
}
+#ifdef ENABLE_BLOWFISH_SSH2_CTR
static void blowfish_msb_sdctr(unsigned char *blk, int len,
BlowfishContext * ctx)
{
ctx->iv0 = iv0;
ctx->iv1 = iv1;
}
+#endif
static void blowfish_setkey(BlowfishContext * ctx,
const unsigned char *key, short keybytes)
blowfish_setkey(ctx, key, 16);
}
+#ifdef ENABLE_BLOWFISH_SSH2_CTR
static void blowfish256_key(void *handle, unsigned char *key)
{
BlowfishContext *ctx = (BlowfishContext *)handle;
blowfish_setkey(ctx, key, 32);
}
+#endif
static void blowfish_iv(void *handle, unsigned char *key)
{
blowfish_msb_decrypt_cbc(blk, len, ctx);
}
+#ifdef ENABLE_BLOWFISH_SSH2_CTR
static void blowfish_ssh2_sdctr(void *handle, unsigned char *blk,
int len)
{
BlowfishContext *ctx = (BlowfishContext *)handle;
blowfish_msb_sdctr(blk, len, ctx);
}
+#endif
const struct ssh_cipher ssh_blowfish_ssh1 = {
blowfish_ssh1_make_context, blowfish_free_context, blowfish_sesskey,
blowfish_make_context, blowfish_free_context, blowfish_iv, blowfish_key,
blowfish_ssh2_encrypt_blk, blowfish_ssh2_decrypt_blk,
"blowfish-cbc",
- 8, 128, "Blowfish-128 CBC"
+ 8, 128, SSH_CIPHER_IS_CBC, "Blowfish-128 CBC"
};
+#ifdef ENABLE_BLOWFISH_SSH2_CTR
static const struct ssh2_cipher ssh_blowfish_ssh2_ctr = {
blowfish_make_context, blowfish_free_context, blowfish_iv, blowfish256_key,
blowfish_ssh2_sdctr, blowfish_ssh2_sdctr,
"blowfish-ctr",
- 8, 256, "Blowfish-256 SDCTR"
+ 8, 256, 0, "Blowfish-256 SDCTR"
};
+#endif
/*
* "blowfish-ctr" is disabled because it hasn't had any interoperability
* builds.
*/
static const struct ssh2_cipher *const blowfish_list[] = {
-/* &ssh_blowfish_ssh2_ctr, */
+#ifdef ENABLE_BLOWFISH_SSH2_CTR
+ &ssh_blowfish_ssh2_ctr,
+#endif
&ssh_blowfish_ssh2
};