svnno****@sourc*****
svnno****@sourc*****
2013年 5月 13日 (月) 16:43:42 JST
Tera TermRevision: 5262
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5262
Author: doda
Date: 2013-05-13 16:43:42 +0900 (Mon, 13 May 2013)
Log Message:
-----------
HMAC -> MAC
Modified Paths:
--------------
trunk/ttssh2/ttxssh/ssh.c
trunk/ttssh2/ttxssh/ttxssh.c
-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c 2013-05-13 05:37:00 UTC (rev 5261)
+++ trunk/ttssh2/ttxssh/ssh.c 2013-05-13 07:43:42 UTC (rev 5262)
@@ -1059,11 +1059,11 @@
pvar->ssh_state.sender_sequence_number,
data, encryption_size,
data + encryption_size);
- if (ret == FALSE) { // HMAC\x82\xAA\x82܂\xBE\x90ݒ肳\x82\xEA\x82Ă\xA2\x82Ȃ\xA2\x8Fꍇ
+ if (ret == FALSE) { // MAC\x82\xAA\x82܂\xBE\x90ݒ肳\x82\xEA\x82Ă\xA2\x82Ȃ\xA2\x8Fꍇ
data_length = encryption_size;
}
- // \x83p\x83P\x83b\x83g\x82\xF0\x88Í\x86\x89\xBB\x82\xB7\x82\xE9\x81BHMAC\x88ȍ~\x82͈Í\x86\x89\xBB\x91ΏۊO\x81B
+ // \x83p\x83P\x83b\x83g\x82\xF0\x88Í\x86\x89\xBB\x82\xB7\x82\xE9\x81BMAC\x88ȍ~\x82͈Í\x86\x89\xBB\x91ΏۊO\x81B
CRYPT_encrypt(pvar, data, encryption_size);
}
@@ -4874,7 +4874,7 @@
}
- // HMAC(Hash Message Authentication Code)\x83A\x83\x8B\x83S\x83\x8A\x83Y\x83\x80\x82̌\x88\x92\xE8 (2004.12.17 yutaka)
+ // MAC(Hash Message Authentication Code)\x83A\x83\x8B\x83S\x83\x8A\x83Y\x83\x80\x82̌\x88\x92\xE8 (2004.12.17 yutaka)
size = get_payload_uint32(pvar, offset);
offset += 4;
for (i = 0; i < size; i++) {
@@ -4888,7 +4888,7 @@
pvar->ctos_hmac = choose_SSH2_hmac_algorithm(buf, myproposal[PROPOSAL_MAC_ALGS_CTOS]);
if (pvar->ctos_hmac == HMAC_UNKNOWN) { // not match
- strncpy_s(tmp, sizeof(tmp), "unknown HMAC algorithm: ", _TRUNCATE);
+ strncpy_s(tmp, sizeof(tmp), "unknown MAC algorithm: ", _TRUNCATE);
strncat_s(tmp, sizeof(tmp), buf, _TRUNCATE);
msg = tmp;
goto error;
@@ -4908,7 +4908,7 @@
pvar->stoc_hmac = choose_SSH2_hmac_algorithm(buf, myproposal[PROPOSAL_MAC_ALGS_STOC]);
if (pvar->stoc_hmac == HMAC_UNKNOWN) { // not match
- strncpy_s(tmp, sizeof(tmp), "unknown HMAC algorithm: ", _TRUNCATE);
+ strncpy_s(tmp, sizeof(tmp), "unknown MAC algorithm: ", _TRUNCATE);
strncat_s(tmp, sizeof(tmp), buf, _TRUNCATE);
msg = tmp;
goto error;
Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c 2013-05-13 05:37:00 UTC (rev 5261)
+++ trunk/ttssh2/ttxssh/ttxssh.c 2013-05-13 07:43:42 UTC (rev 5262)
@@ -2418,7 +2418,7 @@
UTIL_get_lang_msg("DLG_ABOUT_HOSTKEY", pvar, "Host Key:");
append_about_text(dlg, pvar->ts->UIMsg, buf);
- // add HMAC algorithm (2004.12.17 yutaka)
+ // add MAC algorithm (2004.12.17 yutaka)
buf[0] = '\0';
strncat_s(buf, sizeof(buf), get_ssh2_mac_name(pvar->ctos_hmac) , _TRUNCATE);
UTIL_get_lang_msg("DLG_ABOUT_TOSERVER", pvar, " to server,");
@@ -2426,7 +2426,7 @@
strncat_s(buf, sizeof(buf), get_ssh2_mac_name(pvar->stoc_hmac) , _TRUNCATE);
UTIL_get_lang_msg("DLG_ABOUT_FROMSERVER", pvar, " from server");
strncat_s(buf, sizeof(buf), pvar->ts->UIMsg, _TRUNCATE);
- append_about_text(dlg, "HMAC:", buf);
+ append_about_text(dlg, "MAC:", buf);
CRYPT_get_cipher_info(pvar, buf, sizeof(buf));
UTIL_get_lang_msg("DLG_ABOUT_ENCRYPTION", pvar, "Encryption:");