X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/a2add20851e01de1e69564250aec54f193f742b3..HEAD:/ssharcf.c

diff --git a/ssharcf.c b/ssharcf.c
index 59464881..06f235c5 100644
--- a/ssharcf.c
+++ b/ssharcf.c
@@ -19,7 +19,7 @@ static void arcfour_block(void *handle, unsigned char *blk, int len)
 
     s = ctx->s;
     i = ctx->i; j = ctx->j;
-    for (k = 0; k < len; k++) {
+    for (k = 0; (int)k < len; k++) {
 	i  = (i + 1) & 0xff;
 	j  = (j + s[i]) & 0xff;
 	tmp = s[i]; s[i] = s[j]; s[j] = tmp;
@@ -75,7 +75,7 @@ static void arcfour_stir(ArcfourContext *ctx)
     unsigned char *junk = snewn(1536, unsigned char);
     memset(junk, 0, 1536);
     arcfour_block(ctx, junk, 1536);
-    memset(junk, 0, 1536);
+    smemclr(junk, 1536);
     sfree(junk);
 }
 
@@ -101,23 +101,19 @@ static void arcfour_iv(void *handle, unsigned char *key)
 const struct ssh2_cipher ssh_arcfour128_ssh2 = {
     arcfour_make_context, arcfour_free_context, arcfour_iv, arcfour128_key,
     arcfour_block, arcfour_block,
-    "arcfour128-draft-00@putty.projects.tartarus.org",
-    1, 128, "Arcfour-128"
+    "arcfour128",
+    1, 128, 0, "Arcfour-128"
 };
 
 const struct ssh2_cipher ssh_arcfour256_ssh2 = {
     arcfour_make_context, arcfour_free_context, arcfour_iv, arcfour256_key,
     arcfour_block, arcfour_block,
-    "arcfour256-draft-00@putty.projects.tartarus.org",
-    1, 256, "Arcfour-256"
+    "arcfour256",
+    1, 256, 0, "Arcfour-256"
 };
 
-/*
- * arcfour256-draft-00@putty.projects.tartarus.org is as-yet untested
- * against any other implementation, and hence is commented out.
- */
 static const struct ssh2_cipher *const arcfour_list[] = {
-/*  &ssh_arcfour256_ssh2, */
+    &ssh_arcfour256_ssh2,
     &ssh_arcfour128_ssh2,
 };