OSDN Git Service

Add routines for trying an AUTH SSL command.
authors_kawamoto <s_kawamoto@users.sourceforge.jp>
Sat, 30 Jun 2012 13:56:58 +0000 (22:56 +0900)
committers_kawamoto <s_kawamoto@users.sourceforge.jp>
Sat, 30 Jun 2012 13:56:58 +0000 (22:56 +0900)
FFFTP_Eng_Release/FFFTP.exe
Release/FFFTP.exe
connect.c

index 61c3414..54141c2 100644 (file)
Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ
index 641ecf6..ce0d191 100644 (file)
Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ
index 122f441..26d61a0 100644 (file)
--- a/connect.c
+++ b/connect.c
@@ -1615,7 +1615,7 @@ static SOCKET DoConnectCrypt(int CryptMode, HOSTDATA* HostData, char *Host, char
                                                                // FTPES対応\r
                                                                if(CryptMode == CRYPT_FTPES)\r
                                                                {\r
                                                                // FTPES対応\r
                                                                if(CryptMode == CRYPT_FTPES)\r
                                                                {\r
-                                                                       if(IsOpenSSLLoaded() && (Sts = command(ContSock, Reply, CancelCheckWork, "AUTH TLS")) == 234)\r
+                                                                       if(IsOpenSSLLoaded() && ((Sts = command(ContSock, Reply, CancelCheckWork, "AUTH TLS")) == 234 || (Sts = command(ContSock, Reply, CancelCheckWork, "AUTH SSL")) == 234))\r
                                                                        {\r
                                                                                if(AttachSSL(ContSock, INVALID_SOCKET, CancelCheckWork))\r
                                                                                {\r
                                                                        {\r
                                                                                if(AttachSSL(ContSock, INVALID_SOCKET, CancelCheckWork))\r
                                                                                {\r