提交: 8cdba6986cfab763ef8a267a092bc4f94b316974 - Osdn (git)

Loweynet

Commit MetaInfo

• 修訂: 8cdba6986cfab763ef8a267a092bc4f94b316974 (tree)
• 時間: 2017-12-03 20:30:48
• 作者: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Change UI of SSL certificate confirmation dialog.

Change Summary

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: FFFTP_Eng_Release_64/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: Release_64/FFFTP.exe
• modified: Resource/FFFTP.rc
• modified: Resource/resource.h
• modified: Resource_eng/ffftp.rc
• modified: Resource_eng/resource.h
• modified: src/common.h
• modified: src/main.c
• modified: src/mesg-eng.h
• modified: src/mesg-jpn.h
• modified: src/misc.c

差異

Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ

Binary files a/FFFTP_Eng_Release_64/FFFTP.exe and b/FFFTP_Eng_Release_64/FFFTP.exe differ

Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ

Binary files a/Release_64/FFFTP.exe and b/Release_64/FFFTP.exe differ

--- a/Resource/FFFTP.rc
+++ b/Resource/FFFTP.rc
@@ -1496,6 +1496,17 @@ BEGIN
     PUSHBUTTON      "–³Ž‹",IDIGNORE,173,42,50,14
 END
 
+ssl_confirm_dlg DIALOGEX 0, 0, 360, 222
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION
+CAPTION "Ø–¾‘‚ÌŠm”F"
+FONT 9, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    LTEXT           "‚±‚̏ؖ¾‘‚ðM—Š‚µA’ʐM‚𑱍s‚·‚é‚ɂ́uOKv‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢B",-1,7,7,345,10
+    EDITTEXT        COMMON_TEXT,7,21,345,170,ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_HSCROLL
+    PUSHBUTTON      "OK",IDOK,127,197,50,14
+    PUSHBUTTON      "ƒLƒƒƒ“ƒZƒ‹",IDCANCEL,182,197,50,14
+END
+
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1510,7 +1521,6 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 312
         TOPMARGIN, 4
-        BOTTOMMARGIN, 308
     END
 
     transfer_dlg, DIALOG
@@ -2191,6 +2201,14 @@ BEGIN
         TOPMARGIN, 7
         BOTTOMMARGIN, 57
     END
+
+    ssl_confirm_dlg, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 353
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 215
+    END
 END
 #endif    // APSTUDIO_INVOKED
 

--- a/Resource/resource.h
+++ b/Resource/resource.h
@@ -119,6 +119,7 @@
 #define opt_disp2_dlg                   196
 #define opt_updates_dlg                 197
 #define corruptsettings_dlg             198
+#define ssl_confirm_dlg                 199
 #define TRANS_TIME_BAR                  1002
 #define TRANS_TEXT                      1003
 #define TRANS_REMOTE                    1003
@@ -664,7 +665,7 @@
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        199
+#define _APS_NEXT_RESOURCE_VALUE        200
 #define _APS_NEXT_COMMAND_VALUE         40183
 #define _APS_NEXT_CONTROL_VALUE         1231
 #define _APS_NEXT_SYMED_VALUE           101

--- a/Resource_eng/ffftp.rc
+++ b/Resource_eng/ffftp.rc
@@ -1540,6 +1540,17 @@ BEGIN
     PUSHBUTTON      "Ignore",IDIGNORE,173,42,50,14
 END
 
+ssl_confirm_dlg DIALOGEX 0, 0, 360, 222
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION
+CAPTION "Confirmation of certificate"
+FONT 9, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    LTEXT           "Choose 'OK' if you trust this certificate and continue.",-1,7,7,345,10
+    EDITTEXT        COMMON_TEXT,7,21,345,170,ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_HSCROLL
+    PUSHBUTTON      "OK",IDOK,127,197,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,182,197,50,14
+END
+
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -2232,6 +2243,14 @@ BEGIN
         TOPMARGIN, 7
         BOTTOMMARGIN, 57
     END
+
+    ssl_confirm_dlg, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 353
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 215
+    END
 END
 #endif    // APSTUDIO_INVOKED
 

--- a/Resource_eng/resource.h
+++ b/Resource_eng/resource.h
@@ -119,6 +119,7 @@
 #define opt_disp2_dlg                   196
 #define opt_updates_dlg                 197
 #define corruptsettings_dlg             198
+#define ssl_confirm_dlg                 199
 #define TRANS_TIME_BAR                  1002
 #define TRANS_TEXT                      1003
 #define TRANS_REMOTE                    1003
@@ -664,7 +665,7 @@
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        199
+#define _APS_NEXT_RESOURCE_VALUE        200
 #define _APS_NEXT_COMMAND_VALUE         40183
 #define _APS_NEXT_CONTROL_VALUE         1231
 #define _APS_NEXT_SYMED_VALUE           101

--- a/src/common.h
+++ b/src/common.h
@@ -1975,6 +1975,8 @@ int CalcPixelY(int y);
 HBITMAP ResizeBitmap(HBITMAP hBitmap, int UnitSizeX, int UnitSizeY, int ScaleNumerator, int ScaleDenominator);
 // ソフトウェア自動更新
 void DecodeLineFeed(char* Str);
+// 暗号化通信対応
+int ReplaceAllStrings(char* Out, char* In, char* From, char* To);
 
 /*===== dlgsize.c =====*/
 

--- a/src/main.c
+++ b/src/main.c
@@ -3579,6 +3579,7 @@ BOOL __stdcall SSLConfirmCallback(BOOL* pbAborted, BOOL bVerified, LPCSTR Certif
 	uint32 Hash[5];
 	int i;
 	char* pm0;
+	char* pm1;
 	bResult = FALSE;
 	sha_memory((char*)Certificate, (uint32)(strlen(Certificate) * sizeof(char)), (uint32*)&Hash);
 	// sha.cはビッグエンディアンのため
@@ -3598,13 +3599,18 @@ BOOL __stdcall SSLConfirmCallback(BOOL* pbAborted, BOOL bVerified, LPCSTR Certif
 	{
 		if(pm0 = AllocateStringM(strlen(Certificate) + 1024))
 		{
-			sprintf(pm0, MSGJPN326, IsHostNameMatched(AskHostAdrs(), CommonName) ? MSGJPN327 : MSGJPN328, bVerified ? MSGJPN327 : MSGJPN328, Certificate);
-			if(MessageBox(GetMainHwnd(), pm0, "FFFTP", MB_YESNO) == IDYES)
+			if(pm1 = AllocateStringM(strlen(Certificate) * 2 + 1024))
 			{
-				for(i = MAX_CERT_CACHE_HASH - 1; i >= 1; i--)
-					memcpy(&CertificateCacheHash[i], &CertificateCacheHash[i - 1], 20);
-				memcpy(&CertificateCacheHash[0], &Hash, 20);
-				bResult = TRUE;
+				sprintf(pm0, MSGJPN326, IsHostNameMatched(AskHostAdrs(), CommonName) ? MSGJPN327 : MSGJPN328, bVerified ? MSGJPN327 : MSGJPN328, Certificate);
+				ReplaceAllStrings(pm1, pm0, "\n", "\r\n");
+				if(DialogBoxParam(GetFtpInst(), MAKEINTRESOURCE(ssl_confirm_dlg), GetMainHwnd(), ExeEscTextDialogProc, (LPARAM)pm1) == YES)
+				{
+					for(i = MAX_CERT_CACHE_HASH - 1; i >= 1; i--)
+						memcpy(&CertificateCacheHash[i], &CertificateCacheHash[i - 1], 20);
+					memcpy(&CertificateCacheHash[0], &Hash, 20);
+					bResult = TRUE;
+				}
+				FreeDuplicatedString(pm1);
 			}
 			FreeDuplicatedString(pm0);
 		}

--- a/src/mesg-eng.h
+++ b/src/mesg-eng.h
@@ -324,7 +324,7 @@
 #define MSGJPN323		_Tu8("Failed to unload untrustworthy DLLs.", "Failed to unload untrustworthy DLLs.")
 #define MSGJPN324		_Tu8("Failed to hook required functions to protect the process.", "Failed to hook required functions to protect the process.")
 #define MSGJPN325		_Tu8("New master passwords are not identical.", "New master passwords are not identical.")
-#define MSGJPN326		_Tu8("Choose 'Yes' if you trust this certificate and continue.\r\nCN is identical: %s\r\nVerified successfully: %s\r\n\r\n%s", "Choose 'Yes' if you trust this certificate and continue.\r\nCN is identical: %s\r\nVerified successfully: %s\r\n\r\n%s")
+#define MSGJPN326		_Tu8("Summary\nCN is identical: %s\nVerified successfully: %s\n\nDetailed information\n%s", "Summary\nCN is identical: %s\nVerified successfully: %s\n\nDetailed information\n%s")
 #define MSGJPN327		_Tu8("Yes", "Yes")
 #define MSGJPN328		_Tu8("No", "No")
 #define MSGJPN329		_Tu8("UTF-8 BOM", "UTF-8 BOM")

--- a/src/mesg-jpn.h
+++ b/src/mesg-jpn.h
@@ -324,7 +324,7 @@
 #define MSGJPN323		_Tu8("信頼できないDLLをアンロードできませんでした.", "\xE4\xBF\xA1\xE9\xA0\xBC\xE3\x81\xA7\xE3\x81\x8D\xE3\x81\xAA\xE3\x81\x84\x44LL\xE3\x82\x92\xE3\x82\xA2\xE3\x83\xB3\xE3\x83\xAD\xE3\x83\xBC\xE3\x83\x89\xE3\x81\xA7\xE3\x81\x8D\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93\xE3\x81\xA7\xE3\x81\x97\xE3\x81\x9F.")
 #define MSGJPN324		_Tu8("プロセスの保護に必要な関数をフックできませんでした.", "\xE3\x83\x97\xE3\x83\xAD\xE3\x82\xBB\xE3\x82\xB9\xE3\x81\xAE\xE4\xBF\x9D\xE8\xAD\xB7\xE3\x81\xAB\xE5\xBF\x85\xE8\xA6\x81\xE3\x81\xAA\xE9\x96\xA2\xE6\x95\xB0\xE3\x82\x92\xE3\x83\x95\xE3\x83\x83\xE3\x82\xAF\xE3\x81\xA7\xE3\x81\x8D\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93\xE3\x81\xA7\xE3\x81\x97\xE3\x81\x9F.")
 #define MSGJPN325		_Tu8("新しいマスターパスワードが一致しません.", "\xE6\x96\xB0\xE3\x81\x97\xE3\x81\x84\xE3\x83\x9E\xE3\x82\xB9\xE3\x82\xBF\xE3\x83\xBC\xE3\x83\x91\xE3\x82\xB9\xE3\x83\xAF\xE3\x83\xBC\xE3\x83\x89\xE3\x81\x8C\xE4\xB8\x80\xE8\x87\xB4\xE3\x81\x97\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93.")
-#define MSGJPN326		_Tu8("この証明書を信頼し,通信を続行するには「はい」を選択してください.\r\nCNの一致: %s\r\n検証に成功: %s\r\n\r\n%s", "\xE3\x81\x93\xE3\x81\xAE\xE8\xA8\xBC\xE6\x98\x8E\xE6\x9B\xB8\xE3\x82\x92\xE4\xBF\xA1\xE9\xA0\xBC\xE3\x81\x97,\xE9\x80\x9A\xE4\xBF\xA1\xE3\x82\x92\xE7\xB6\x9A\xE8\xA1\x8C\xE3\x81\x99\xE3\x82\x8B\xE3\x81\xAB\xE3\x81\xAF\xE3\x80\x8C\xE3\x81\xAF\xE3\x81\x84\xE3\x80\x8D\xE3\x82\x92\xE9\x81\xB8\xE6\x8A\x9E\xE3\x81\x97\xE3\x81\xA6\xE3\x81\x8F\xE3\x81\xA0\xE3\x81\x95\xE3\x81\x84.\r\nCN\xE3\x81\xAE\xE4\xB8\x80\xE8\x87\xB4: %s\r\n\xE6\xA4\x9C\xE8\xA8\xBC\xE3\x81\xAB\xE6\x88\x90\xE5\x8A\x9F: %s\r\n\r\n%s")
+#define MSGJPN326		_Tu8("概要\nCNの一致: %s\n検証に成功: %s\n\n詳細情報\n%s", "\xE6\xA6\x82\xE8\xA6\x81\nCN\xE3\x81\xAE\xE4\xB8\x80\xE8\x87\xB4: %s\n\xE6\xA4\x9C\xE8\xA8\xBC\xE3\x81\xAB\xE6\x88\x90\xE5\x8A\x9F: %s\n\n\xE8\xA9\xB3\xE7\xB4\xB0\xE6\x83\x85\xE5\xA0\xB1\n%s")
 #define MSGJPN327		_Tu8("はい", "\xE3\x81\xAF\xE3\x81\x84")
 #define MSGJPN328		_Tu8("いいえ", "\xE3\x81\x84\xE3\x81\x84\xE3\x81\x88")
 #define MSGJPN329		_Tu8("UTF-8 BOM", "UTF-8 BOM")

--- a/src/misc.c
+++ b/src/misc.c
@@ -241,6 +241,11 @@ INT_PTR CALLBACK ExeEscTextDialogProc(HWND hDlg, UINT message, WPARAM wParam, LP
 {
 	switch (message)
 	{
+		// 暗号化通信対応
+		case WM_SHOWWINDOW :
+			SendDlgItemMessage(hDlg, COMMON_TEXT, EM_SETSEL, 0, 0);
+			return(TRUE);
+
 		case WM_INITDIALOG :
 			SendDlgItemMessage(hDlg, COMMON_TEXT, WM_SETTEXT, 0, lParam);
 			return(TRUE);
@@ -2074,3 +2079,42 @@ void DecodeLineFeed(char* Str)
 	}
 }
 
+// 暗号化通信対応
+int ReplaceAllStrings(char* Out, char* In, char* From, char* To)
+{
+	int InLen;
+	int FromLen;
+	int ToLen;
+	int Count;
+	char* p;
+	int Len;
+	InLen = strlen(In);
+	FromLen = strlen(From);
+	ToLen = strlen(To);
+	Count = 0;
+	if(Out)
+	{
+		while(p = strstr(In, From))
+		{
+			Len = p - In;
+			strncpy(Out, In, Len);
+			Out += Len;
+			In += Len;
+			strncpy(Out, To, ToLen);
+			Out += ToLen;
+			In += FromLen;
+			Count++;
+		}
+		*Out = '\0';
+	}
+	else
+	{
+		while(In = strstr(In, From))
+		{
+			In += FromLen;
+			Count++;
+		}
+	}
+	return InLen + (ToLen - FromLen) * Count;
+}
+