コミット: f941a5f80f51b64d153f715ba9eb3db9b754511d - ffftp (git)

Loweynet

コミットメタ情報

• リビジョン: f941a5f80f51b64d153f715ba9eb3db9b754511d (tree)
• 日時: 2012-06-30 22:56:58
• 作者: s_kawamoto <s_kawamoto@user...>
• コミッター: s_kawamoto

ログメッセージ

Add routines for trying an AUTH SSL command.

変更サマリ

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: connect.c

差分

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/connect.c
+++ b/connect.c
@@ -1615,7 +1615,7 @@ static SOCKET DoConnectCrypt(int CryptMode, HOSTDATA* HostData, char *Host, char
 								// FTPES対応
 								if(CryptMode == CRYPT_FTPES)
 								{
-									if(IsOpenSSLLoaded() && (Sts = command(ContSock, Reply, CancelCheckWork, "AUTH TLS")) == 234)
+									if(IsOpenSSLLoaded() && ((Sts = command(ContSock, Reply, CancelCheckWork, "AUTH TLS")) == 234 || (Sts = command(ContSock, Reply, CancelCheckWork, "AUTH SSL")) == 234))
 									{
 										if(AttachSSL(ContSock, INVALID_SOCKET, CancelCheckWork))
 										{