X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/2d3f15fac22aad183784edf0a378e7c4229cd238..83e7d008503efaaf4b727224b71a0fd828960c81:/unix/uxcons.c

diff --git a/unix/uxcons.c b/unix/uxcons.c
index a8effe90..b5bf840b 100644
--- a/unix/uxcons.c
+++ b/unix/uxcons.c
@@ -143,18 +143,17 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
 }
 
 /*
- * Ask whether the selected cipher is acceptable (since it was
+ * Ask whether the selected algorithm is acceptable (since it was
  * below the configured 'warn' threshold).
- * cs: 0 = both ways, 1 = client->server, 2 = server->client
  */
-void askcipher(void *frontend, char *ciphername, int cs)
+void askalg(void *frontend, const char *algtype, const char *algname)
 {
     static const char msg[] =
-	"The first %scipher supported by the server is\n"
+	"The first %s supported by the server is\n"
 	"%s, which is below the configured warning threshold.\n"
 	"Continue with connection? (y/n) ";
     static const char msg_batch[] =
-	"The first %scipher supported by the server is\n"
+	"The first %s supported by the server is\n"
 	"%s, which is below the configured warning threshold.\n"
 	"Connection abandoned.\n";
     static const char abandoned[] = "Connection abandoned.\n";
@@ -162,17 +161,11 @@ void askcipher(void *frontend, char *ciphername, int cs)
     char line[32];
 
     if (console_batch_mode) {
-	fprintf(stderr, msg_batch,
-		(cs == 0) ? "" :
-		(cs == 1) ? "client-to-server " : "server-to-client ",
-		ciphername);
+	fprintf(stderr, msg_batch, algtype, algname);
 	cleanup_exit(1);
     }
 
-    fprintf(stderr, msg,
-	    (cs == 0) ? "" :
-	    (cs == 1) ? "client-to-server " : "server-to-client ",
-	    ciphername);
+    fprintf(stderr, msg, algtype, algname);
     fflush(stderr);
 
     {