[Ttssh2-commit] [5767] コメント修正

svnno****@sourc***** svnno****@sourc*****
2015年 1月 28日 (水) 01:59:41 JST


Revision: 5767
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5767
Author:   maya
Date:     2015-01-28 01:59:40 +0900 (Wed, 28 Jan 2015)
Log Message:
-----------
コメント修正
変数名修正

Modified Paths:
--------------
    trunk/ttssh2/ttxssh/auth.c
    trunk/ttssh2/ttxssh/keyfiles.c

-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/auth.c
===================================================================
--- trunk/ttssh2/ttxssh/auth.c	2015-01-23 08:56:13 UTC (rev 5766)
+++ trunk/ttssh2/ttxssh/auth.c	2015-01-27 16:59:40 UTC (rev 5767)
@@ -442,13 +442,13 @@
 	}
 
 	if (method == SSH_AUTH_RSA || method == SSH_AUTH_RHOSTS_RSA) {
-		char buf[2048];
+		char keyfile[2048];
 		int file_ctl_ID =
 			method == SSH_AUTH_RSA ? IDC_RSAFILENAME : IDC_HOSTRSAFILENAME;
 
-		buf[0] = 0;
-		GetDlgItemText(dlg, file_ctl_ID, buf, sizeof(buf));
-		if (buf[0] == 0) {
+		keyfile[0] = 0;
+		GetDlgItemText(dlg, file_ctl_ID, keyfile, sizeof(keyfile));
+		if (keyfile[0] == 0) {
 			UTIL_get_lang_msg("MSG_KEYSPECIFY_ERROR", pvar,
 			                  "You must specify a file containing the RSA/DSA/ECDSA/ED25519 private key.");
 			notify_nonfatal_error(pvar, pvar->ts->UIMsg);
@@ -460,7 +460,7 @@
 		if (SSHv1(pvar)) {
 			BOOL invalid_passphrase = FALSE;
 
-			key_pair = KEYFILES_read_private_key(pvar, buf, password,
+			key_pair = KEYFILES_read_private_key(pvar, keyfile, password,
 			                                     &invalid_passphrase,
 			                                     FALSE);
 
@@ -485,7 +485,7 @@
 
 			memset(errmsg, 0, sizeof(errmsg));
 
-			keyfile_type = get_ssh2_keytype(buf, &fp, errmsg, sizeof(errmsg));
+			keyfile_type = get_ssh2_keytype(keyfile, &fp, errmsg, sizeof(errmsg));
 			switch (keyfile_type) {
 				case SSH2_KEYFILE_TYPE_OPENSSH:
 				{

Modified: trunk/ttssh2/ttxssh/keyfiles.c
===================================================================
--- trunk/ttssh2/ttxssh/keyfiles.c	2015-01-23 08:56:13 UTC (rev 5766)
+++ trunk/ttssh2/ttxssh/keyfiles.c	2015-01-27 16:59:40 UTC (rev 5767)
@@ -595,7 +595,7 @@
 	free(salt);
 	free(comment);
 
-	// ED25519 \x82ł͂Ȃ\xA9\x82\xC1\x82\xBD
+	// KDF \x82ł͂Ȃ\xA9\x82\xC1\x82\xBD
 	if (keyfmt == NULL) {
 		fseek(fp, 0, SEEK_SET);
 



Ttssh2-commit メーリングリストの案内