nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 09:58:01 +00:00
Code Issues Projects Releases Wiki Activity

Simon (accidentally, I think) enabled 3des-ctr and blowfish-ctr. Turn them

Browse Source 
back off again since they're still untested.

[originally from svn r5651]
This commit is contained in:
Ben Harris 2005-04-20 22:47:29 +00:00
parent 55eadb067b
commit 5079fcc182
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sshblowf.c
View File

@ -500,7 +500,7 @@ static void blowfish_key(void *handle, unsigned char *key)
blowfish_setkey(ctx, key, 16); blowfish_setkey(ctx, key, 16);
} }
#ifndef ENABLE_BLOWFISH_SSH2_CTR #ifdef ENABLE_BLOWFISH_SSH2_CTR
static void blowfish256_key(void *handle, unsigned char *key) static void blowfish256_key(void *handle, unsigned char *key)
{ {
BlowfishContext *ctx = (BlowfishContext *)handle; BlowfishContext *ctx = (BlowfishContext *)handle;
@ -552,7 +552,7 @@ static void blowfish_ssh2_decrypt_blk(void *handle, unsigned char *blk,
blowfish_msb_decrypt_cbc(blk, len, ctx); blowfish_msb_decrypt_cbc(blk, len, ctx);
} }
#ifndef ENABLE_BLOWFISH_SSH2_CTR #ifdef ENABLE_BLOWFISH_SSH2_CTR
static void blowfish_ssh2_sdctr(void *handle, unsigned char *blk, static void blowfish_ssh2_sdctr(void *handle, unsigned char *blk,
int len) int len)
{ {
@ -574,7 +574,7 @@ static const struct ssh2_cipher ssh_blowfish_ssh2 = {
8, 128, "Blowfish-128 CBC" 8, 128, "Blowfish-128 CBC"
}; };
#ifndef ENABLE_BLOWFISH_SSH2_CTR #ifdef ENABLE_BLOWFISH_SSH2_CTR
static const struct ssh2_cipher ssh_blowfish_ssh2_ctr = { static const struct ssh2_cipher ssh_blowfish_ssh2_ctr = {
blowfish_make_context, blowfish_free_context, blowfish_iv, blowfish256_key, blowfish_make_context, blowfish_free_context, blowfish_iv, blowfish256_key,
blowfish_ssh2_sdctr, blowfish_ssh2_sdctr, blowfish_ssh2_sdctr, blowfish_ssh2_sdctr,
@ -590,7 +590,7 @@ static const struct ssh2_cipher ssh_blowfish_ssh2_ctr = {
* builds. * builds.
*/ */
static const struct ssh2_cipher *const blowfish_list[] = { static const struct ssh2_cipher *const blowfish_list[] = {
#ifndef ENABLE_BLOWFISH_SSH2_CTR #ifdef ENABLE_BLOWFISH_SSH2_CTR
&ssh_blowfish_ssh2_ctr, &ssh_blowfish_ssh2_ctr,
#endif #endif
&ssh_blowfish_ssh2 &ssh_blowfish_ssh2

4
sshdes.c
View File

@ -964,7 +964,7 @@ static const struct ssh2_cipher ssh_3des_ssh2 = {
8, 168, "triple-DES CBC" 8, 168, "triple-DES CBC"
}; };
#ifndef ENABLE_3DES_SSH2_CTR #ifdef ENABLE_3DES_SSH2_CTR
static const struct ssh2_cipher ssh_3des_ssh2_ctr = { static const struct ssh2_cipher ssh_3des_ssh2_ctr = {
des3_make_context, des3_free_context, des3_iv, des3_key, des3_make_context, des3_free_context, des3_iv, des3_key,
des3_ssh2_sdctr, des3_ssh2_sdctr, des3_ssh2_sdctr, des3_ssh2_sdctr,
@ -1002,7 +1002,7 @@ static const struct ssh2_cipher ssh_des_sshcom_ssh2 = {
* builds. * builds.
*/ */
static const struct ssh2_cipher *const des3_list[] = { static const struct ssh2_cipher *const des3_list[] = {
#ifndef ENABLE_3DES_SSH2_CTR #ifdef ENABLE_3DES_SSH2_CTR
&ssh_3des_ssh2_ctr, &ssh_3des_ssh2_ctr,
#endif #endif
&ssh_3des_ssh2 &ssh_3des_ssh2