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

Recent CTR mode changes stopped OS X PuTTY from compiling, because

Browse Source 
-Werror objects at various static data items being defined but not
used. Ifdef some things out to restore warning-free compilability.

[originally from svn r5640]
This commit is contained in:
Simon Tatham 2005-04-18 10:01:57 +00:00
parent 40dd62b5e2
commit 208213117a
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sshblowf.c
View File

@ -500,11 +500,13 @@ static void blowfish_key(void *handle, unsigned char *key)
blowfish_setkey(ctx, key, 16); blowfish_setkey(ctx, key, 16);
} }
#ifndef 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;
blowfish_setkey(ctx, key, 32); blowfish_setkey(ctx, key, 32);
} }
#endif
static void blowfish_iv(void *handle, unsigned char *key) static void blowfish_iv(void *handle, unsigned char *key)
{ {
@ -550,12 +552,14 @@ 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
static void blowfish_ssh2_sdctr(void *handle, unsigned char *blk, static void blowfish_ssh2_sdctr(void *handle, unsigned char *blk,
int len) int len)
{ {
BlowfishContext *ctx = (BlowfishContext *)handle; BlowfishContext *ctx = (BlowfishContext *)handle;
blowfish_msb_sdctr(blk, len, ctx); blowfish_msb_sdctr(blk, len, ctx);
} }
#endif
const struct ssh_cipher ssh_blowfish_ssh1 = { const struct ssh_cipher ssh_blowfish_ssh1 = {
blowfish_ssh1_make_context, blowfish_free_context, blowfish_sesskey, blowfish_ssh1_make_context, blowfish_free_context, blowfish_sesskey,
@ -570,12 +574,14 @@ static const struct ssh2_cipher ssh_blowfish_ssh2 = {
8, 128, "Blowfish-128 CBC" 8, 128, "Blowfish-128 CBC"
}; };
#ifndef 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,
"blowfish-ctr", "blowfish-ctr",
8, 256, "Blowfish-256 SDCTR" 8, 256, "Blowfish-256 SDCTR"
}; };
#endif
/* /*
* "blowfish-ctr" is disabled because it hasn't had any interoperability * "blowfish-ctr" is disabled because it hasn't had any interoperability
@ -584,7 +590,9 @@ 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[] = {
/* &ssh_blowfish_ssh2_ctr, */ #ifndef ENABLE_BLOWFISH_SSH2_CTR
&ssh_blowfish_ssh2_ctr,
#endif
&ssh_blowfish_ssh2 &ssh_blowfish_ssh2
}; };

6
sshdes.c
View File

@ -964,12 +964,14 @@ static const struct ssh2_cipher ssh_3des_ssh2 = {
8, 168, "triple-DES CBC" 8, 168, "triple-DES CBC"
}; };
#ifndef 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,
"3des-ctr", "3des-ctr",
8, 168, "triple-DES SDCTR" 8, 168, "triple-DES SDCTR"
}; };
#endif
/* /*
* Single DES in SSH-2. "des-cbc" is marked as HISTORIC in * Single DES in SSH-2. "des-cbc" is marked as HISTORIC in
@ -1000,7 +1002,9 @@ 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[] = {
/* &ssh_3des_ssh2_ctr, */ #ifndef ENABLE_3DES_SSH2_CTR
&ssh_3des_ssh2_ctr,
#endif
&ssh_3des_ssh2 &ssh_3des_ssh2
}; };