summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
be47bb5)
Thanks to der Mouse for help with the testing.
git-svn-id: svn://svn.tartarus.org/sgt/putty@5701
cda61777-01e9-0310-a592-
d414129be87e
-#ifdef ENABLE_BLOWFISH_SSH2_CTR
static void blowfish_msb_sdctr(unsigned char *blk, int len,
BlowfishContext * ctx)
{
static void blowfish_msb_sdctr(unsigned char *blk, int len,
BlowfishContext * ctx)
{
ctx->iv0 = iv0;
ctx->iv1 = iv1;
}
ctx->iv0 = iv0;
ctx->iv1 = iv1;
}
static void blowfish_setkey(BlowfishContext * ctx,
const unsigned char *key, short keybytes)
static void blowfish_setkey(BlowfishContext * ctx,
const unsigned char *key, short keybytes)
blowfish_setkey(ctx, key, 16);
}
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);
}
static void blowfish256_key(void *handle, unsigned char *key)
{
BlowfishContext *ctx = (BlowfishContext *)handle;
blowfish_setkey(ctx, key, 32);
}
static void blowfish_iv(void *handle, unsigned char *key)
{
static void blowfish_iv(void *handle, unsigned char *key)
{
blowfish_msb_decrypt_cbc(blk, len, ctx);
}
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);
}
static void blowfish_ssh2_sdctr(void *handle, unsigned char *blk,
int len)
{
BlowfishContext *ctx = (BlowfishContext *)handle;
blowfish_msb_sdctr(blk, len, ctx);
}
const struct ssh_cipher ssh_blowfish_ssh1 = {
blowfish_ssh1_make_context, blowfish_free_context, blowfish_sesskey,
const struct ssh_cipher ssh_blowfish_ssh1 = {
blowfish_ssh1_make_context, blowfish_free_context, blowfish_sesskey,
8, 128, SSH_CIPHER_IS_CBC, "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, 0, "Blowfish-256 SDCTR"
};
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, 0, "Blowfish-256 SDCTR"
};
-/*
- * "blowfish-ctr" is disabled because it hasn't had any interoperability
- * testing, which is in turn because I couldn't find another implementation
- * to test against. Once it's been tested, it can be enabled in standard
- * builds.
- */
static const struct ssh2_cipher *const blowfish_list[] = {
static const struct ssh2_cipher *const blowfish_list[] = {
-#ifdef ENABLE_BLOWFISH_SSH2_CTR