From: ben Date: Wed, 20 Apr 2005 22:52:54 +0000 (+0000) Subject: Ifdef out the actual code supporting 3des-ctr and blowfish-ctr, since GCC X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/commitdiff_plain/e94b1ec49475425f8fa8002b405ae8c5a3e3b31b Ifdef out the actual code supporting 3des-ctr and blowfish-ctr, since GCC now notices that it isn't used. git-svn-id: svn://svn.tartarus.org/sgt/putty@5652 cda61777-01e9-0310-a592-d414129be87e --- diff --git a/sshblowf.c b/sshblowf.c index 60835b3e..a264c3c5 100644 --- a/sshblowf.c +++ b/sshblowf.c @@ -389,6 +389,7 @@ static void blowfish_msb_decrypt_cbc(unsigned char *blk, int len, ctx->iv1 = iv1; } +#ifdef ENABLE_BLOWFISH_SSH2_CTR static void blowfish_msb_sdctr(unsigned char *blk, int len, BlowfishContext * ctx) { @@ -414,6 +415,7 @@ static void blowfish_msb_sdctr(unsigned char *blk, int len, ctx->iv0 = iv0; ctx->iv1 = iv1; } +#endif static void blowfish_setkey(BlowfishContext * ctx, const unsigned char *key, short keybytes) diff --git a/sshdes.c b/sshdes.c index 78bb8d7f..034176ab 100644 --- a/sshdes.c +++ b/sshdes.c @@ -732,6 +732,7 @@ static void des_cbc3_decrypt(unsigned char *dest, const unsigned char *src, scheds->iv1 = iv1; } +#ifdef ENABLE_3DES_SSH2_CTR static void des_sdctr3(unsigned char *dest, const unsigned char *src, unsigned int len, DESContext * scheds) { @@ -760,6 +761,7 @@ static void des_sdctr3(unsigned char *dest, const unsigned char *src, scheds->iv0 = iv0; scheds->iv1 = iv1; } +#endif static void *des3_make_context(void) { @@ -844,11 +846,13 @@ static void des3_ssh2_decrypt_blk(void *handle, unsigned char *blk, int len) 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) {