Rebuild OpenSSL with backward compatibility options.

[ffftp/ffftp.git] / main.c

diff --git a/main.c b/main.c
index 121284b..3cbd826 100644 (file)
--- a/main.c
+++ b/main.c
@@ -132,6 +132,8 @@ TRANSPACKET MainTransPkt;           /* ファイル転送用パケット */
 \r
 char TitleHostName[HOST_ADRS_LEN+1];\r
 char FilterStr[FILTER_EXT_LEN+1] = { "*" };\r
+// タイトルバーにユーザー名表示対応\r
+char TitleUserName[USER_NAME_LEN+1];\r
 \r
 int CancelFlg;\r
 \r
@@ -287,6 +289,8 @@ time_t LastAutoCheckForUpdates = 0;
 int AbortOnListError = YES;\r
 // ミラーリング設定追加\r
 int MirrorNoTransferContents = NO; \r
+// FireWall設定追加\r
+int FwallNoSaveUser = NO; \r
 \r
 \r
 \r
@@ -437,7 +441,10 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpszCmdLi
                                                                if(pCommand = GetToken(pCommand, ListFile))\r
                                                                {\r
                                                                        if(pCommand = GetToken(pCommand, Description))\r
+                                                                       {\r
+                                                                               DecodeLineFeed(Description);\r
                                                                                BuildUpdates(PrivateKeyFile, Password, ServerPath, HashFile, ListFile, RELEASE_VERSION_NUM, VER_STR, Description);\r
+                                                                       }\r
                                                                }\r
                                                        }\r
                                                }\r
@@ -626,20 +633,23 @@ static int InitApp(LPSTR lpszCmdLine, int cmdShow)
                        }\r
                }\r
                // バージョン確認\r
-               if(ReadSettingsVersion() > VER_NUM)\r
+               if(PortableVersion == NO)\r
                {\r
-                       if(IsRegAvailable() == YES && IsIniAvailable() == NO)\r
+                       if(ReadSettingsVersion() > VER_NUM)\r
                        {\r
-                               switch(MessageBox(GetMainHwnd(), MSGJPN350, "FFFTP", MB_YESNOCANCEL | MB_DEFBUTTON2))\r
+                               if(IsRegAvailable() == YES && IsIniAvailable() == NO)\r
                                {\r
-                                       case IDCANCEL:\r
-                                               ReadOnlySettings = YES;\r
-                                               break;\r
-                                       case IDYES:\r
-                                               break;\r
-                                       case IDNO:\r
-                                               ImportPortable = YES;\r
-                                               break;\r
+                                       switch(MessageBox(GetMainHwnd(), MSGJPN350, "FFFTP", MB_YESNOCANCEL | MB_DEFBUTTON2))\r
+                                       {\r
+                                               case IDCANCEL:\r
+                                                       ReadOnlySettings = YES;\r
+                                                       break;\r
+                                               case IDYES:\r
+                                                       break;\r
+                                               case IDNO:\r
+                                                       ImportPortable = YES;\r
+                                                       break;\r
+                                       }\r
                                }\r
                        }\r
                }\r
@@ -954,21 +964,22 @@ void DispWindowTitle(void)
 \r
        if(AskConnecting() == YES)\r
        // 暗号化通信対応\r
+       // タイトルバーにユーザー名表示対応\r
 //             sprintf(Tmp, "%s (%s) - FFFTP", TitleHostName, FilterStr);\r
        {\r
                switch(AskCryptMode())\r
                {\r
                case CRYPT_NONE:\r
-                       sprintf(Tmp, "%s (%s) %s - FFFTP", TitleHostName, FilterStr, MSGJPN351);\r
+                       sprintf(Tmp, "%s@%s (%s) %s - FFFTP", TitleUserName, TitleHostName, FilterStr, MSGJPN351);\r
                        break;\r
                case CRYPT_FTPES:\r
-                       sprintf(Tmp, "%s (%s) %s - FFFTP", TitleHostName, FilterStr, MSGJPN352);\r
+                       sprintf(Tmp, "%s@%s (%s) %s - FFFTP", TitleUserName, TitleHostName, FilterStr, MSGJPN352);\r
                        break;\r
                case CRYPT_FTPIS:\r
-                       sprintf(Tmp, "%s (%s) %s - FFFTP", TitleHostName, FilterStr, MSGJPN353);\r
+                       sprintf(Tmp, "%s@%s (%s) %s - FFFTP", TitleUserName, TitleHostName, FilterStr, MSGJPN353);\r
                        break;\r
                case CRYPT_SFTP:\r
-                       sprintf(Tmp, "%s (%s) %s - FFFTP", TitleHostName, FilterStr, MSGJPN354);\r
+                       sprintf(Tmp, "%s@%s (%s) %s - FFFTP", TitleUserName, TitleHostName, FilterStr, MSGJPN354);\r
                        break;\r
                }\r
        }\r
@@ -3585,7 +3596,7 @@ BOOL LoadSSLRootCAFile()
                                for(i = 0; i < 5; i++)\r
                                        Hash[i] = _byteswap_ulong(Hash[i]);\r
                                // 同梱する"ssl.pem"に合わせてSHA1ハッシュ値を変更すること\r
-                               if(memcmp(&Hash, &SSLRootCAFileHash, 20) == 0 || memcmp(&Hash, "\x18\x37\x7B\x10\xA9\x01\xDA\x25\x14\x4C\xD4\xD5\x35\xAE\x4D\x65\x3D\x46\x92\xA2", 20) == 0\r
+                               if(memcmp(&Hash, &SSLRootCAFileHash, 20) == 0 || memcmp(&Hash, "\xDF\x8E\xE2\x5A\xC7\x01\x03\x1C\x3A\x61\x00\xA2\x53\xCA\xF8\xDC\xA0\xC1\xA6\x3B", 20) == 0\r
                                        || DialogBox(GetFtpInst(), MAKEINTRESOURCE(updatesslroot_dlg), GetMainHwnd(), ExeEscDialogProc) == YES)\r
                                {\r
                                        memcpy(&SSLRootCAFileHash, &Hash, 20);\r