• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
Keine Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

FFFTPのソースコードです。


Commit MetaInfo

Revision4a6f29d2616cdecbb9366e5f462c5815c64fbaf6 (tree)
Zeit2011-10-15 21:49:34
Autors_kawamoto <s_kawamoto@user...>
Commiters_kawamoto

Log Message

Change behavior of confirming certificate.
Modify UI for encryption.

Ändern Zusammenfassung

Diff

Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ
Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ
--- a/Resource/FFFTP.rc
+++ b/Resource/FFFTP.rc
@@ -1346,9 +1346,13 @@ hset_crypt_dlg DIALOG 0, 0, 207, 139
13461346 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
13471347 FONT 9, "MS Pゴシック"
13481348 BEGIN
1349- CONTROL "FTPS (Explicit)で接続",HSET_FTPES,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,7,148,10
1350- CONTROL "FTPS (Implicit)で接続",HSET_FTPIS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,148,10
1351- CONTROL "SFTPで接続",HSET_SFTP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,35,148,10
1349+ CONTROL "暗号化なしで接続を許可",HSET_NO_ENCRYPTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,148,10
1350+ CONTROL "FTPS (Explicit)で接続",HSET_FTPES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,148,10
1351+ CONTROL "FTPS (Implicit)で接続",HSET_FTPIS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,35,148,10
1352+ CONTROL "SFTPで接続",HSET_SFTP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,49,148,10
1353+ LTEXT "秘密鍵のテキスト",-1,7,63,64,8
1354+ PUSHBUTTON "...",PKEY_FILE_BR,72,63,13,12
1355+ EDITTEXT HSET_PRIVATE_KEY,7,79,193,44,ES_MULTILINE | ES_AUTOHSCROLL | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL
13521356 END
13531357
13541358 hset_adv3_dlg DIALOG 0, 0, 207, 139
--- a/Resource/resource.h
+++ b/Resource/resource.h
@@ -421,11 +421,14 @@
421421 #define HSET_SJIS_CNV 1195
422422 #define HSET_UTF8N_CNV 1196
423423 #define HSET_FN_SJIS_CNV 1197
424-#define HSET_FTPES 1198
425-#define HSET_FTPIS 1199
426-#define HSET_SFTP 1200
427-#define HSET_THREAD_COUNT 1201
428-#define HSET_THREAD_COUNT_SPN 1202
424+#define HSET_NO_ENCRYPTION 1198
425+#define HSET_FTPES 1199
426+#define HSET_FTPIS 1200
427+#define HSET_SFTP 1201
428+#define PKEY_FILE_BR 1202
429+#define HSET_PRIVATE_KEY 1203
430+#define HSET_THREAD_COUNT 1204
431+#define HSET_THREAD_COUNT_SPN 1205
429432 #define MENU_END 40001
430433 #define MENU_EXIT 40001
431434 #define MENU_CONNECT 40003
@@ -611,7 +614,7 @@
611614 #ifndef APSTUDIO_READONLY_SYMBOLS
612615 #define _APS_NEXT_RESOURCE_VALUE 191
613616 #define _APS_NEXT_COMMAND_VALUE 40175
614-#define _APS_NEXT_CONTROL_VALUE 1203
617+#define _APS_NEXT_CONTROL_VALUE 1206
615618 #define _APS_NEXT_SYMED_VALUE 101
616619 #endif
617620 #endif
--- a/Resource_eng/FFFTP-eng.rc
+++ b/Resource_eng/FFFTP-eng.rc
@@ -1371,9 +1371,13 @@ hset_crypt_dlg DIALOG 0, 0, 207, 139
13711371 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
13721372 FONT 9, "MS Sans Serif"
13731373 BEGIN
1374- CONTROL "Connect with FTPS (Explicit)",HSET_FTPES,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,7,148,10
1375- CONTROL "Connect with FTPS (Implicit)",HSET_FTPIS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,148,10
1376- CONTROL "Connect with SFTP",HSET_SFTP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,35,148,10
1374+ CONTROL "Allow to connect without encryption",HSET_NO_ENCRYPTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,148,10
1375+ CONTROL "Connect with FTPS (Explicit)",HSET_FTPES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,148,10
1376+ CONTROL "Connect with FTPS (Implicit)",HSET_FTPIS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,35,148,10
1377+ CONTROL "Connect with SFTP",HSET_SFTP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,49,148,10
1378+ LTEXT "Private key text",-1,7,63,64,8
1379+ PUSHBUTTON "...",PKEY_FILE_BR,72,63,13,12
1380+ EDITTEXT HSET_PRIVATE_KEY,7,79,193,44,ES_MULTILINE | ES_AUTOHSCROLL | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL
13771381 END
13781382
13791383 hset_adv3_dlg DIALOG 0, 0, 207, 139
--- a/Resource_eng/resource.h
+++ b/Resource_eng/resource.h
@@ -421,11 +421,14 @@
421421 #define HSET_SJIS_CNV 1195
422422 #define HSET_UTF8N_CNV 1196
423423 #define HSET_FN_SJIS_CNV 1197
424-#define HSET_FTPES 1198
425-#define HSET_FTPIS 1199
426-#define HSET_SFTP 1200
427-#define HSET_THREAD_COUNT 1201
428-#define HSET_THREAD_COUNT_SPN 1202
424+#define HSET_NO_ENCRYPTION 1198
425+#define HSET_FTPES 1199
426+#define HSET_FTPIS 1200
427+#define HSET_SFTP 1201
428+#define PKEY_FILE_BR 1202
429+#define HSET_PRIVATE_KEY 1203
430+#define HSET_THREAD_COUNT 1204
431+#define HSET_THREAD_COUNT_SPN 1205
429432 #define MENU_END 40001
430433 #define MENU_EXIT 40001
431434 #define MENU_CONNECT 40003
@@ -611,7 +614,7 @@
611614 #ifndef APSTUDIO_READONLY_SYMBOLS
612615 #define _APS_NEXT_RESOURCE_VALUE 191
613616 #define _APS_NEXT_COMMAND_VALUE 40175
614-#define _APS_NEXT_CONTROL_VALUE 1203
617+#define _APS_NEXT_CONTROL_VALUE 1206
615618 #define _APS_NEXT_SYMED_VALUE 101
616619 #endif
617620 #endif
--- a/common.h
+++ b/common.h
@@ -71,7 +71,7 @@
7171 //#define VER_NUM 1921 /* 設定バージョン */
7272 //#define PROGRAM_VERSION_NUM 1972 /* バージョン */
7373 #define VER_STR "1.99"
74-#define VER_NUM 1980 /* 設定バージョン */
74+#define VER_NUM 1990 /* 設定バージョン */
7575 #define PROGRAM_VERSION_NUM 1990 /* バージョン */
7676
7777
@@ -139,6 +139,9 @@
139139
140140 #define ONELINE_BUF_SIZE (10*1024)
141141
142+// 暗号化通信対応
143+#define PRIVATE_KEY_LEN 4096
144+
142145 /*===== 初期値 =====*/
143146
144147 #define SAMBA_HEX_TAG ':' /* Samba-HEX の区切り文字 */
@@ -932,6 +935,7 @@ typedef struct {
932935 int UseFTPES; /* FTPESで接続する (YES/NO) */
933936 int UseFTPIS; /* FTPISで接続する (YES/NO) */
934937 int UseSFTP; /* SFTPで接続する (YES/NO) */
938+ char PrivateKey[PRIVATE_KEY_LEN+1]; /* テキスト形式の秘密鍵 */
935939 // 同時接続対応
936940 int MaxThreadCount; /* 同時接続数 */
937941 // FEAT対応
@@ -987,9 +991,11 @@ typedef struct historydata {
987991 int DialupNotify; /* 再接続の際に確認する (YES/NO) */
988992 char DialEntry[RAS_NAME_LEN+1]; /* ダイアルアップエントリ */
989993 // 暗号化通信対応
994+ int UseNoEncryption; /* 暗号化なしで接続する (YES/NO) */
990995 int UseFTPES; /* FTPESで接続する (YES/NO) */
991996 int UseFTPIS; /* FTPISで接続する (YES/NO) */
992997 int UseSFTP; /* SFTPで接続する (YES/NO) */
998+ char PrivateKey[PRIVATE_KEY_LEN+1]; /* テキスト形式の秘密鍵 */
993999 // 同時接続対応
9941000 int MaxThreadCount; /* 同時接続数 */
9951001 // MLSD対応
@@ -1405,9 +1411,11 @@ int AskTryingConnect(void);
14051411 int SocksGet2ndBindReply(SOCKET Socket, SOCKET *Data);
14061412 // 暗号化通信対応
14071413 int AskCryptMode(void);
1414+int AskUseNoEncryption(void);
14081415 int AskUseFTPES(void);
14091416 int AskUseFTPIS(void);
14101417 int AskUseSFTP(void);
1418+char *AskPrivateKey(void);
14111419 // 同時接続対応
14121420 int AskMaxThreadCount(void);
14131421 // FEAT対応
--- a/connect.c
+++ b/connect.c
@@ -1271,7 +1271,8 @@ static SOCKET DoConnectCrypt(int CryptMode, HOSTDATA* HostData, char *Host, char
12711271 Fwall = FWALL_NONE;
12721272
12731273 TryConnect = YES;
1274- CancelFlg = NO;
1274+ // 暗号化通信対応
1275+// CancelFlg = NO;
12751276 #if 0
12761277 // WSASetBlockingHook(BlkHookFnc);
12771278 #endif
@@ -1567,25 +1568,26 @@ static SOCKET DoConnect(HOSTDATA* HostData, char *Host, char *User, char *Pass,
15671568 {
15681569 SOCKET ContSock;
15691570 ContSock = INVALID_SOCKET;
1570- if(ContSock == INVALID_SOCKET && HostData->UseSFTP == YES)
1571+ CancelFlg = NO;
1572+ if(CancelFlg == NO && ContSock == INVALID_SOCKET && HostData->UseSFTP == YES)
15711573 {
15721574 SetTaskMsg(MSGJPN317);
15731575 if((ContSock = DoConnectCrypt(CRYPT_SFTP, HostData, Host, User, Pass, Acct, Port, Fwall, SavePass, Security)) != INVALID_SOCKET)
15741576 HostData->CryptMode = CRYPT_SFTP;
15751577 }
1576-// if(ContSock == INVALID_SOCKET && HostData->UseFTPIS == YES)
1578+// if(CancelFlg == NO && ContSock == INVALID_SOCKET && HostData->UseFTPIS == YES)
15771579 // {
15781580 // SetTaskMsg(MSGJPN316);
15791581 // if((ContSock = DoConnectCrypt(CRYPT_FTPIS, HostData, Host, User, Pass, Acct, Port, Fwall, SavePass, Security)) != INVALID_SOCKET)
15801582 // HostData->CryptMode = CRYPT_FTPIS;
15811583 // }
1582- if(ContSock == INVALID_SOCKET && HostData->UseFTPES == YES)
1584+ if(CancelFlg == NO && ContSock == INVALID_SOCKET && HostData->UseFTPES == YES)
15831585 {
15841586 SetTaskMsg(MSGJPN315);
15851587 if((ContSock = DoConnectCrypt(CRYPT_FTPES, HostData, Host, User, Pass, Acct, Port, Fwall, SavePass, Security)) != INVALID_SOCKET)
15861588 HostData->CryptMode = CRYPT_FTPES;
15871589 }
1588- if(ContSock == INVALID_SOCKET && HostData->UseNoEncryption == YES)
1590+ if(CancelFlg == NO && ContSock == INVALID_SOCKET && HostData->UseNoEncryption == YES)
15891591 {
15901592 SetTaskMsg(MSGJPN314);
15911593 if((ContSock = DoConnectCrypt(CRYPT_NONE, HostData, Host, User, Pass, Acct, Port, Fwall, SavePass, Security)) != INVALID_SOCKET)
@@ -2352,6 +2354,11 @@ int AskUseSFTP(void)
23522354 return(CurHost.UseSFTP);
23532355 }
23542356
2357+char *AskPrivateKey(void)
2358+{
2359+ return(CurHost.PrivateKey);
2360+}
2361+
23552362 // 同時接続対応
23562363 int AskMaxThreadCount(void)
23572364 {
--- a/history.c
+++ b/history.c
@@ -224,9 +224,11 @@ static void CopyHostToHistory(HOSTDATA *Host, HISTORYDATA *New)
224224 New->DialupNotify = Host->DialupNotify;
225225 strcpy(New->DialEntry, Host->DialEntry);
226226 // 暗号化通信対応
227+ New->UseNoEncryption = Host->UseNoEncryption;
227228 New->UseFTPES = Host->UseFTPES;
228229 New->UseFTPIS = Host->UseFTPIS;
229230 New->UseSFTP = Host->UseSFTP;
231+ strcpy(New->PrivateKey, Host->PrivateKey);
230232 // 同時接続対応
231233 New->MaxThreadCount = Host->MaxThreadCount;
232234 // MLSD対応
@@ -283,9 +285,11 @@ void CopyHistoryToHost(HISTORYDATA *Hist, HOSTDATA *Host)
283285 Host->DialupNotify = Hist->DialupNotify;
284286 strcpy(Host->DialEntry, Hist->DialEntry);
285287 // 暗号化通信対応
288+ Host->UseNoEncryption = Hist->UseNoEncryption;
286289 Host->UseFTPES = Hist->UseFTPES;
287290 Host->UseFTPIS = Hist->UseFTPIS;
288291 Host->UseSFTP = Hist->UseSFTP;
292+ strcpy(Host->PrivateKey, Hist->PrivateKey);
289293 // 同時接続対応
290294 Host->MaxThreadCount = Hist->MaxThreadCount;
291295 // MLSD対応
--- a/hostman.c
+++ b/hostman.c
@@ -1030,6 +1030,7 @@ int CopyHostFromListInConnect(int Num, HOSTDATA *Set)
10301030 Set->LastDir = Pos->Set.LastDir;
10311031 Set->TimeZone = Pos->Set.TimeZone;
10321032 // 暗号化通信対応
1033+ Set->UseNoEncryption = Pos->Set.UseNoEncryption;
10331034 Set->UseFTPES = Pos->Set.UseFTPES;
10341035 Set->UseFTPIS = Pos->Set.UseFTPIS;
10351036 Set->UseSFTP = Pos->Set.UseSFTP;
@@ -1318,6 +1319,7 @@ void CopyDefaultHost(HOSTDATA *Set)
13181319 Set->UseFTPES = YES;
13191320 Set->UseFTPIS = YES;
13201321 Set->UseSFTP = YES;
1322+ strcpy(Set->PrivateKey, "");
13211323 // 同時接続対応
13221324 Set->MaxThreadCount = 1;
13231325 // MLSD対応
@@ -2146,11 +2148,11 @@ static BOOL CALLBACK CryptSettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, L
21462148 switch (iMessage)
21472149 {
21482150 case WM_INITDIALOG :
2151+ SendDlgItemMessage(hDlg, HSET_NO_ENCRYPTION, BM_SETCHECK, TmpHost.UseNoEncryption, 0);
21492152 if(IsOpenSSLLoaded())
21502153 {
21512154 SendDlgItemMessage(hDlg, HSET_FTPES, BM_SETCHECK, TmpHost.UseFTPES, 0);
21522155 SendDlgItemMessage(hDlg, HSET_FTPIS, BM_SETCHECK, TmpHost.UseFTPIS, 0);
2153- SendDlgItemMessage(hDlg, HSET_SFTP, BM_SETCHECK, TmpHost.UseSFTP, 0);
21542156 }
21552157 else
21562158 {
@@ -2158,9 +2160,9 @@ static BOOL CALLBACK CryptSettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, L
21582160 EnableWindow(GetDlgItem(hDlg, HSET_FTPES), FALSE);
21592161 SendDlgItemMessage(hDlg, HSET_FTPIS, BM_SETCHECK, BST_UNCHECKED, 0);
21602162 EnableWindow(GetDlgItem(hDlg, HSET_FTPIS), FALSE);
2161- SendDlgItemMessage(hDlg, HSET_SFTP, BM_SETCHECK, BST_UNCHECKED, 0);
2162- EnableWindow(GetDlgItem(hDlg, HSET_SFTP), FALSE);
21632163 }
2164+ SendDlgItemMessage(hDlg, HSET_SFTP, BM_SETCHECK, TmpHost.UseSFTP, 0);
2165+ SendDlgItemMessage(hDlg, HSET_PRIVATE_KEY, WM_SETTEXT, 0, (LPARAM)TmpHost.PrivateKey);
21642166 // TODO: FTPIS対応
21652167 SendDlgItemMessage(hDlg, HSET_FTPIS, BM_SETCHECK, BST_UNCHECKED, 0);
21662168 EnableWindow(GetDlgItem(hDlg, HSET_FTPIS), FALSE);
@@ -2174,14 +2176,16 @@ static BOOL CALLBACK CryptSettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, L
21742176 switch(pnmhdr->code)
21752177 {
21762178 case PSN_APPLY :
2179+ TmpHost.UseNoEncryption = SendDlgItemMessage(hDlg, HSET_NO_ENCRYPTION, BM_GETCHECK, 0, 0);
21772180 if(IsOpenSSLLoaded())
21782181 {
21792182 TmpHost.UseFTPES = SendDlgItemMessage(hDlg, HSET_FTPES, BM_GETCHECK, 0, 0);
21802183 // TODO: FTPIS対応
21812184 // TmpHost.UseFTPIS = SendDlgItemMessage(hDlg, HSET_FTPIS, BM_GETCHECK, 0, 0);
2182- // TODO: SFTP対応
2183-// TmpHost.UseSFTP = SendDlgItemMessage(hDlg, HSET_SFTP, BM_GETCHECK, 0, 0);
21842185 }
2186+ // TODO: SFTP対応
2187+// TmpHost.UseSFTP = SendDlgItemMessage(hDlg, HSET_SFTP, BM_GETCHECK, 0, 0);
2188+ SendDlgItemMessage(hDlg, HSET_PRIVATE_KEY, WM_GETTEXT, PRIVATE_KEY_LEN+1, (LPARAM)TmpHost.PrivateKey);
21852189 Apply = YES;
21862190 break;
21872191
--- a/main.c
+++ b/main.c
@@ -2857,6 +2857,8 @@ BOOL __stdcall SSLConfirmCallback(BOOL bVerified, LPCSTR Certificate, LPCSTR Com
28572857 FreeDuplicatedString(pm0);
28582858 }
28592859 }
2860+ if(!bResult)
2861+ CancelFlg = YES;
28602862 return bResult;
28612863 }
28622864
--- a/registory.c
+++ b/registory.c
@@ -287,7 +287,9 @@ void SaveRegistory(void)
287287 void *hKey3;
288288 void *hKey4;
289289 void *hKey5;
290- char Str[FMAX_PATH+1];
290+ // 暗号化通信対応
291+// char Str[FMAX_PATH+1];
292+ char Str[PRIVATE_KEY_LEN*4+1];
291293 int i;
292294 int n;
293295 HOSTDATA DefaultHost;
@@ -466,9 +468,12 @@ void SaveRegistory(void)
466468 SaveIntNum(hKey5, "Notify", Hist.DialupNotify, DefaultHist.DialupNotify);
467469 SaveStr(hKey5, "DialTo", Hist.DialEntry, DefaultHist.DialEntry);
468470 // 暗号化通信対応
471+ SaveIntNum(hKey5, "NoEncryption", Hist.UseNoEncryption, DefaultHist.UseNoEncryption);
469472 SaveIntNum(hKey5, "FTPES", Hist.UseFTPES, DefaultHist.UseFTPES);
470473 SaveIntNum(hKey5, "FTPIS", Hist.UseFTPIS, DefaultHist.UseFTPIS);
471474 SaveIntNum(hKey5, "SFTP", Hist.UseSFTP, DefaultHist.UseSFTP);
475+ EncodePassword(Hist.PrivateKey, Str);
476+ SaveStr(hKey5, "PKey", Str, DefaultHist.PrivateKey);
472477 // 同時接続対応
473478 SaveIntNum(hKey5, "ThreadCount", Hist.MaxThreadCount, DefaultHist.MaxThreadCount);
474479 // MLSD対応
@@ -544,9 +549,12 @@ void SaveRegistory(void)
544549 SaveIntNum(hKey5, "Notify", Host.DialupNotify, DefaultHost.DialupNotify);
545550 SaveStr(hKey5, "DialTo", Host.DialEntry, DefaultHost.DialEntry);
546551 // 暗号化通信対応
552+ SaveIntNum(hKey5, "NoEncryption", Host.UseNoEncryption, DefaultHost.UseNoEncryption);
547553 SaveIntNum(hKey5, "FTPES", Host.UseFTPES, DefaultHost.UseFTPES);
548554 SaveIntNum(hKey5, "FTPIS", Host.UseFTPIS, DefaultHost.UseFTPIS);
549555 SaveIntNum(hKey5, "SFTP", Host.UseSFTP, DefaultHost.UseSFTP);
556+ EncodePassword(Host.PrivateKey, Str);
557+ SaveStr(hKey5, "PKey", Str, DefaultHost.PrivateKey);
550558 // 同時接続対応
551559 SaveIntNum(hKey5, "ThreadCount", Host.MaxThreadCount, DefaultHost.MaxThreadCount);
552560 // MLSD対応
@@ -601,7 +609,9 @@ int LoadRegistory(void)
601609 void *hKey5;
602610 int i;
603611 int Sets;
604- char Str[256]; /* ASCII_EXT_LENより大きい事 */
612+ // 暗号化通信対応
613+// char Str[256]; /* ASCII_EXT_LENより大きい事 */
614+ char Str[PRIVATE_KEY_LEN*4+1];
605615 char *Pos;
606616 char *Pos2;
607617 HOSTDATA Host;
@@ -807,9 +817,13 @@ int LoadRegistory(void)
807817 ReadIntValueFromReg(hKey5, "Notify", &Hist.DialupNotify);
808818 ReadStringFromReg(hKey5, "DialTo", Hist.DialEntry, RAS_NAME_LEN+1);
809819 // 暗号化通信対応
820+ ReadIntValueFromReg(hKey5, "NoEncryption", &Hist.UseNoEncryption);
810821 ReadIntValueFromReg(hKey5, "FTPES", &Hist.UseFTPES);
811822 ReadIntValueFromReg(hKey5, "FTPIS", &Hist.UseFTPIS);
812823 ReadIntValueFromReg(hKey5, "SFTP", &Hist.UseSFTP);
824+ strcpy(Str, "");
825+ ReadStringFromReg(hKey5, "PKey", Str, PRIVATE_KEY_LEN*4+1);
826+ DecodePassword(Str, Hist.PrivateKey);
813827 // 同時接続対応
814828 ReadIntValueFromReg(hKey5, "ThreadCount", &Hist.MaxThreadCount);
815829 // MLSD対応
@@ -887,9 +901,13 @@ int LoadRegistory(void)
887901 ReadIntValueFromReg(hKey5, "Notify", &Host.DialupNotify);
888902 ReadStringFromReg(hKey5, "DialTo", Host.DialEntry, RAS_NAME_LEN+1);
889903 // 暗号化通信対応
904+ ReadIntValueFromReg(hKey5, "NoEncryption", &Host.UseNoEncryption);
890905 ReadIntValueFromReg(hKey5, "FTPES", &Host.UseFTPES);
891906 ReadIntValueFromReg(hKey5, "FTPIS", &Host.UseFTPIS);
892907 ReadIntValueFromReg(hKey5, "SFTP", &Host.UseSFTP);
908+ strcpy(Str, "");
909+ ReadStringFromReg(hKey5, "PKey", Str, PRIVATE_KEY_LEN*4+1);
910+ DecodePassword(Str, Host.PrivateKey);
893911 // 同時接続対応
894912 ReadIntValueFromReg(hKey5, "ThreadCount", &Host.MaxThreadCount);
895913 // MLSD対応