• R/O
  • SSH
  • HTTPS

ttssh2: Commit


Commit MetaInfo

Revision5767 (tree)
Time2015-01-28 01:59:40
Author(del#1144)

Log Message

コメント修正
変数名修正

Change Summary

Incremental Difference

--- trunk/ttssh2/ttxssh/auth.c (revision 5766)
+++ trunk/ttssh2/ttxssh/auth.c (revision 5767)
@@ -442,13 +442,13 @@
442442 }
443443
444444 if (method == SSH_AUTH_RSA || method == SSH_AUTH_RHOSTS_RSA) {
445- char buf[2048];
445+ char keyfile[2048];
446446 int file_ctl_ID =
447447 method == SSH_AUTH_RSA ? IDC_RSAFILENAME : IDC_HOSTRSAFILENAME;
448448
449- buf[0] = 0;
450- GetDlgItemText(dlg, file_ctl_ID, buf, sizeof(buf));
451- if (buf[0] == 0) {
449+ keyfile[0] = 0;
450+ GetDlgItemText(dlg, file_ctl_ID, keyfile, sizeof(keyfile));
451+ if (keyfile[0] == 0) {
452452 UTIL_get_lang_msg("MSG_KEYSPECIFY_ERROR", pvar,
453453 "You must specify a file containing the RSA/DSA/ECDSA/ED25519 private key.");
454454 notify_nonfatal_error(pvar, pvar->ts->UIMsg);
@@ -460,7 +460,7 @@
460460 if (SSHv1(pvar)) {
461461 BOOL invalid_passphrase = FALSE;
462462
463- key_pair = KEYFILES_read_private_key(pvar, buf, password,
463+ key_pair = KEYFILES_read_private_key(pvar, keyfile, password,
464464 &invalid_passphrase,
465465 FALSE);
466466
@@ -485,7 +485,7 @@
485485
486486 memset(errmsg, 0, sizeof(errmsg));
487487
488- keyfile_type = get_ssh2_keytype(buf, &fp, errmsg, sizeof(errmsg));
488+ keyfile_type = get_ssh2_keytype(keyfile, &fp, errmsg, sizeof(errmsg));
489489 switch (keyfile_type) {
490490 case SSH2_KEYFILE_TYPE_OPENSSH:
491491 {
--- trunk/ttssh2/ttxssh/keyfiles.c (revision 5766)
+++ trunk/ttssh2/ttxssh/keyfiles.c (revision 5767)
@@ -595,7 +595,7 @@
595595 free(salt);
596596 free(comment);
597597
598- // ED25519 ではなかった
598+ // KDF ではなかった
599599 if (keyfmt == NULL) {
600600 fseek(fp, 0, SEEK_SET);
601601
Show on old repository browser