X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/51e9d3c00a3471f284e89ec1f59f38ca25f10c5f..c6e05bdcc58c3dfe7aa245fe3a7b23160cebeaa5:/sshdes.c?ds=sidebyside diff --git a/sshdes.c b/sshdes.c index 506e2458..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) { @@ -964,12 +968,14 @@ static const struct ssh2_cipher ssh_3des_ssh2 = { 8, 168, "triple-DES CBC" }; +#ifdef ENABLE_3DES_SSH2_CTR static const struct ssh2_cipher ssh_3des_ssh2_ctr = { des3_make_context, des3_free_context, des3_iv, des3_key, des3_ssh2_sdctr, des3_ssh2_sdctr, "3des-ctr", 8, 168, "triple-DES SDCTR" }; +#endif /* * Single DES in SSH-2. "des-cbc" is marked as HISTORIC in @@ -1000,7 +1006,9 @@ static const struct ssh2_cipher ssh_des_sshcom_ssh2 = { * builds. */ static const struct ssh2_cipher *const des3_list[] = { -/* &ssh_3des_ssh2_ctr, */ +#ifdef ENABLE_3DES_SSH2_CTR + &ssh_3des_ssh2_ctr, +#endif &ssh_3des_ssh2 };