~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a preference list for SSH-2 key exchange algorithms, on a new "Kex" panel
[sgt/putty]
/
windows
/
wincons.c
diff --git
a/windows/wincons.c
b/windows/wincons.c
index
757f753
..
38b46fa
100644
(file)
--- a/
windows/wincons.c
+++ b/
windows/wincons.c
@@
-33,6
+33,14
@@
void cleanup_exit(int code)
exit(code);
}
exit(code);
}
+void notify_remote_exit(void *frontend)
+{
+}
+
+void timer_change_notify(long next)
+{
+}
+
void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
char *keystr, char *fingerprint)
{
void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
char *keystr, char *fingerprint)
{
@@
-139,21
+147,20
@@
void update_specials_menu(void *frontend)
}
/*
}
/*
- * 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).
* below the configured 'warn' threshold).
- * cs: 0 = both ways, 1 = client->server, 2 = server->client
*/
*/
-void ask
cipher(void *frontend, char *ciphername, int cs
)
+void ask
alg(void *frontend, const char *algtype, const char *algname
)
{
HANDLE hin;
DWORD savemode, i;
static const char msg[] =
{
HANDLE hin;
DWORD savemode, i;
static const char msg[] =
- "The first %s
cipher
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[] =
"%s, which is below the configured warning threshold.\n"
"Continue with connection? (y/n) ";
static const char msg_batch[] =
- "The first %s
cipher
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";
"%s, which is below the configured warning threshold.\n"
"Connection abandoned.\n";
static const char abandoned[] = "Connection abandoned.\n";
@@
-161,17
+168,11
@@
void askcipher(void *frontend, char *ciphername, int cs)
char line[32];
if (console_batch_mode) {
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);
}
cleanup_exit(1);
}
- fprintf(stderr, msg,
- (cs == 0) ? "" :
- (cs == 1) ? "client-to-server " : "server-to-client ",
- ciphername);
+ fprintf(stderr, msg, algtype, algname);
fflush(stderr);
hin = GetStdHandle(STD_INPUT_HANDLE);
fflush(stderr);
hin = GetStdHandle(STD_INPUT_HANDLE);