Enhance the security of routines for changing a master password.

diff --git a/FFFTP_Eng_Release/FFFTP.exe b/FFFTP_Eng_Release/FFFTP.exe
index f104c6e..f78c391 100644 (file)
Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ

diff --git a/Release/FFFTP.exe b/Release/FFFTP.exe
index c5c5246..c7978e9 100644 (file)
Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ

diff --git a/common.h b/common.h
index eb4dae4..f21c08c 100644 (file)
--- a/common.h
+++ b/common.h
@@ -1714,6 +1714,8 @@ void ClearRegistry(void);
 // ポータブル版判定\r
 void ClearIni(void);\r
 void SetMasterPassword( const char* );\r
+// セキュリティ強化\r
+void GetMasterPassword(char*);\r
 int GetMasterPasswordStatus(void);\r
 int ValidateMasterPassword(void);\r
 DWORD LoadHideDriveListRegistry(void);\r

diff --git a/main.c b/main.c
index 0377eab..52fc39d 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1426,9 +1426,34 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
                                                if( DialogBox(hInstFtp, MAKEINTRESOURCE(forcepasschange_dlg), hWnd, ExeEscDialogProc) != YES){\r
                                                        break;\r
                                                }\r
+                                               // セキュリティ強化\r
+                                               if(EnterMasterPasswordAndSet(newmasterpasswd_dlg, hWnd) != 0)\r
+                                                       SetTaskMsg(MSGJPN303);\r
                                        }\r
-                                       if( EnterMasterPasswordAndSet( newmasterpasswd_dlg, hWnd ) != 0 ){\r
-                                               SetTaskMsg( MSGJPN303 );\r
+                                       // セキュリティ強化\r
+//                                     if( EnterMasterPasswordAndSet( newmasterpasswd_dlg, hWnd ) != 0 ){\r
+//                                             SetTaskMsg( MSGJPN303 );\r
+//                                     }\r
+                                       else if(GetMasterPasswordStatus() == PASSWORD_OK)\r
+                                       {\r
+                                               char Password[MAX_PASSWORD_LEN + 1];\r
+                                               GetMasterPassword(Password);\r
+                                               SetMasterPassword(NULL);\r
+                                               while(ValidateMasterPassword() == YES && GetMasterPasswordStatus() == PASSWORD_UNMATCH)\r
+                                               {\r
+                                                       if(EnterMasterPasswordAndSet(masterpasswd_dlg, NULL) == 0)\r
+                                                               break;\r
+                                               }\r
+                                               if(GetMasterPasswordStatus() == PASSWORD_OK && EnterMasterPasswordAndSet(newmasterpasswd_dlg, hWnd) != 0)\r
+                                               {\r
+                                                       SetTaskMsg(MSGJPN303);\r
+                                                       SaveRegistry();\r
+                                               }\r
+                                               else\r
+                                               {\r
+                                                       SetMasterPassword(Password);\r
+                                                       ValidateMasterPassword();\r
+                                               }\r
                                        }\r
                                        break;\r
 \r

diff --git a/registry.c b/registry.c
index 95fada4..f2f7e05 100644 (file)
--- a/registry.c
+++ b/registry.c
@@ -221,6 +221,12 @@ void SetMasterPassword( const char* Password )
        IsMasterPasswordError = PASSWORD_OK;\r
 }\r
 \r
+// セキュリティ強化\r
+void GetMasterPassword(char* Password)\r
+{\r
+       strcpy(Password, SecretKey);\r
+}\r
+\r
 /*----- マスタパスワードの状態取得 ----------------------------------------------\r
 *\r
 *      Parameter\r