return FALSE;\r
#ifdef ENABLE_PROCESS_PROTECTION\r
// 同梱するOpenSSLのバージョンに合わせてSHA1ハッシュ値を変更すること\r
- // ssleay32.dll 1.0.0e\r
- // libssl32.dll 1.0.0e\r
- RegisterTrustedModuleSHA1Hash("\x4E\xB7\xA0\x22\x14\x4B\x58\x6D\xBC\xF5\x21\x0D\x96\x78\x0D\x79\x7D\x66\xB2\xB0");\r
- // libeay32.dll 1.0.0e\r
- RegisterTrustedModuleSHA1Hash("\x01\x32\x7A\xAE\x69\x26\xE6\x58\xC7\x63\x22\x1E\x53\x5A\x78\xBC\x61\xC7\xB5\xC1");\r
+ // ssleay32.dll 1.0.0g\r
+ // libssl32.dll 1.0.0g\r
+ RegisterTrustedModuleSHA1Hash("\x42\x32\x3E\x44\x35\xBC\x98\x6C\x45\xC9\xA2\xB8\x41\xE7\xDA\x7B\x6A\x98\xB2\x28");\r
+ // libeay32.dll 1.0.0g\r
+ RegisterTrustedModuleSHA1Hash("\x3F\xC8\x07\x84\xB3\xF0\x71\x4A\x18\x59\x52\x1F\x99\x09\x65\xB9\x49\xA7\x15\x36");\r
#endif\r
g_hOpenSSL = LoadLibrary("ssleay32.dll");\r
// バージョン固定のためlibssl32.dllの読み込みは脆弱性の原因になり得るので廃止\r
\r
// IPv6対応\r
\r
+const struct in6_addr IN6ADDR_NONE = {{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}};\r
+\r
typedef struct\r
{\r
HANDLE h;\r
pHost->h_addr_list[0] = (char*)(&pHost->h_addr_list[2]);\r
pHost->h_addr_list[1] = NULL;\r
memcpy(pHost->h_addr_list[0], &((struct sockaddr_in*)p->ai_addr)->sin_addr, sizeof(struct in_addr));\r
- PostMessage(pData->hWnd, pData->wMsg, (WPARAM)pData->h, (LPARAM)(sizeof(struct hostent) + sizeof(char*) * 2 + p->ai_addrlen));\r
+ PostMessage(pData->hWnd, pData->wMsg, (WPARAM)pData->h, (LPARAM)(sizeof(struct hostent) + sizeof(char*) * 2 + sizeof(struct in_addr)));\r
}\r
else\r
PostMessage(pData->hWnd, pData->wMsg, (WPARAM)pData->h, (LPARAM)(WSAENOBUFS << 16));\r
pHost->h_addr_list[0] = (char*)(&pHost->h_addr_list[2]);\r
pHost->h_addr_list[1] = NULL;\r
memcpy(pHost->h_addr_list[0], &((struct sockaddr_in6*)p->ai_addr)->sin6_addr, sizeof(struct in6_addr));\r
- PostMessage(pData->hWnd, pData->wMsg, (WPARAM)pData->h, (LPARAM)(sizeof(struct hostent) + sizeof(char*) * 2 + p->ai_addrlen));\r
+ PostMessage(pData->hWnd, pData->wMsg, (WPARAM)pData->h, (LPARAM)(sizeof(struct hostent) + sizeof(char*) * 2 + sizeof(struct in6_addr)));\r
}\r
else\r
PostMessage(pData->hWnd, pData->wMsg, (WPARAM)pData->h, (LPARAM)(WSAENOBUFS << 16));\r
}\r
else\r
PostMessage(pData->hWnd, pData->wMsg, (WPARAM)pData->h, (LPARAM)(ERROR_INVALID_FUNCTION << 16));\r
- free(pData->name);\r
- free(pData);\r
// CreateThreadが返すハンドルが重複するのを回避\r
Sleep(10000);\r
+ CloseHandle(pData->h);\r
+ free(pData->name);\r
+ free(pData);\r
return 0;\r
}\r
\r
int Result;\r
Result = SOCKET_ERROR;\r
if(TerminateThread(hAsyncTaskHandle, 0))\r
+ {\r
+ CloseHandle(hAsyncTaskHandle);\r
Result = 0;\r
+ }\r
return Result;\r
}\r
\r
{\r
if(!cp)\r
{\r
- memset(&Result, 0xff, sizeof(Result));\r
+ memcpy(&Result, &IN6ADDR_NONE, sizeof(struct in6_addr));\r
break;\r
}\r
if(i >= AfterZero)\r
Result.u.Word[i] = ((Result.u.Word[i] & 0xff00) >> 8) | ((Result.u.Word[i] & 0x00ff) << 8);\r
if(strncmp(p, ":", 1) != 0 && strlen(p) > 0)\r
{\r
- memset(&Result, 0xff, sizeof(Result));\r
+ memcpy(&Result, &IN6ADDR_NONE, sizeof(struct in6_addr));\r
break;\r
}\r
if(cp = strstr(cp, ":"))\r
return r;\r
}\r
\r
-// SFTP対応\r
-\r
-typedef void* (__cdecl* _SFTP_Create)();\r
-typedef void (__cdecl* _SFTP_Destroy)(void*);\r
-typedef BOOL (__cdecl* _SFTP_IsExited)(void*);\r
-typedef BOOL (__cdecl* _SFTP_SetTimeoutCallback)(void*, void*);\r
-typedef size_t (__cdecl* _SFTP_PeekStdOut)(void*, void*, size_t);\r
-typedef size_t (__cdecl* _SFTP_ReadStdOut)(void*, void*, size_t);\r
-typedef size_t (__cdecl* _SFTP_WriteStdIn)(void*, const void*, size_t);\r
-typedef size_t (__cdecl* _SFTP_PeekDataOut)(void*, void*, size_t);\r
-typedef size_t (__cdecl* _SFTP_ReadDataOut)(void*, void*, size_t);\r
-typedef size_t (__cdecl* _SFTP_WriteDataIn)(void*, const void*, size_t);\r
-typedef BOOL (__cdecl* _SFTP_SetFilePosition)(void*, LONGLONG);\r
-\r
-_SFTP_Create p_SFTP_Create;\r
-_SFTP_Destroy p_SFTP_Destroy;\r
-_SFTP_IsExited p_SFTP_IsExited;\r
-_SFTP_SetTimeoutCallback p_SFTP_SetTimeoutCallback;\r
-_SFTP_PeekStdOut p_SFTP_PeekStdOut;\r
-_SFTP_ReadStdOut p_SFTP_ReadStdOut;\r
-_SFTP_WriteStdIn p_SFTP_WriteStdIn;\r
-_SFTP_PeekDataOut p_SFTP_PeekDataOut;\r
-_SFTP_ReadDataOut p_SFTP_ReadDataOut;\r
-_SFTP_WriteDataIn p_SFTP_WriteDataIn;\r
-_SFTP_SetFilePosition p_SFTP_SetFilePosition;\r
-\r
-typedef struct\r
-{\r
- SOCKET Control;\r
- SOCKET Data;\r
- void* Handle;\r
- char Host[1024];\r
- int Port;\r
- char User[1024];\r
- char Password[1024];\r
-} SFTPDATA;\r
-\r
-#define MAX_SFTP_SOCKET 16\r
-\r
-BOOL g_bPuTTYLoaded;\r
-HMODULE g_hPuTTY;\r
-CRITICAL_SECTION g_PuTTYLock;\r
-SFTPDATA g_SFTPData[MAX_SFTP_SOCKET];\r
-\r
-// PuTTYを初期化\r
-BOOL LoadPuTTY()\r
-{\r
- int i;\r
- if(g_bPuTTYLoaded)\r
- return FALSE;\r
-#ifdef ENABLE_PROCESS_PROTECTION\r
- // ビルドしたputty.dllに合わせてSHA1ハッシュ値を変更すること\r
- RegisterTrustedModuleSHA1Hash("\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00");\r
-#endif\r
- // デバッグ用\r
-// g_hPuTTY = LoadLibrary("putty.dll");\r
- g_hPuTTY = LoadLibrary("C:\\SourceForge\\ffftp\\putty\\Debug\\PuTTY.dll");\r
- if(!g_hPuTTY\r
- || !(p_SFTP_Create = (_SFTP_Create)GetProcAddress(g_hPuTTY, "SFTP_Create"))\r
- || !(p_SFTP_Destroy = (_SFTP_Destroy)GetProcAddress(g_hPuTTY, "SFTP_Destroy"))\r
- || !(p_SFTP_IsExited = (_SFTP_IsExited)GetProcAddress(g_hPuTTY, "SFTP_IsExited"))\r
- || !(p_SFTP_SetTimeoutCallback = (_SFTP_SetTimeoutCallback)GetProcAddress(g_hPuTTY, "SFTP_SetTimeoutCallback"))\r
- || !(p_SFTP_PeekStdOut = (_SFTP_PeekStdOut)GetProcAddress(g_hPuTTY, "SFTP_PeekStdOut"))\r
- || !(p_SFTP_ReadStdOut = (_SFTP_ReadStdOut)GetProcAddress(g_hPuTTY, "SFTP_ReadStdOut"))\r
- || !(p_SFTP_WriteStdIn = (_SFTP_WriteStdIn)GetProcAddress(g_hPuTTY, "SFTP_WriteStdIn"))\r
- || !(p_SFTP_PeekDataOut = (_SFTP_PeekDataOut)GetProcAddress(g_hPuTTY, "SFTP_PeekDataOut"))\r
- || !(p_SFTP_ReadDataOut = (_SFTP_ReadDataOut)GetProcAddress(g_hPuTTY, "SFTP_ReadDataOut"))\r
- || !(p_SFTP_WriteDataIn = (_SFTP_WriteDataIn)GetProcAddress(g_hPuTTY, "SFTP_WriteDataIn"))\r
- || !(p_SFTP_SetFilePosition = (_SFTP_SetFilePosition)GetProcAddress(g_hPuTTY, "SFTP_SetFilePosition")))\r
- {\r
- if(g_hPuTTY)\r
- FreeLibrary(g_hPuTTY);\r
- g_hPuTTY = NULL;\r
- return FALSE;\r
- }\r
- for(i = 0; i < MAX_SFTP_SOCKET; i++)\r
- {\r
- g_SFTPData[i].Control = INVALID_SOCKET;\r
- g_SFTPData[i].Data = INVALID_SOCKET;\r
- }\r
- InitializeCriticalSection(&g_PuTTYLock);\r
- g_bPuTTYLoaded = TRUE;\r
- return TRUE;\r
-}\r
-\r
-// PuTTYを解放\r
-void FreePuTTY()\r
-{\r
- int i;\r
- if(!g_bPuTTYLoaded)\r
- return;\r
- EnterCriticalSection(&g_PuTTYLock);\r
- for(i = 0; i < MAX_SFTP_SOCKET; i++)\r
- {\r
- if(g_SFTPData[i].Control != INVALID_SOCKET)\r
- {\r
- closesocket(g_SFTPData[i].Control);\r
- g_SFTPData[i].Control = INVALID_SOCKET;\r
- p_SFTP_Destroy(g_SFTPData[i].Handle);\r
- }\r
- if(g_SFTPData[i].Data != INVALID_SOCKET)\r
- {\r
- closesocket(g_SFTPData[i].Data);\r
- g_SFTPData[i].Data = INVALID_SOCKET;\r
- }\r
- }\r
- FreeLibrary(g_hPuTTY);\r
- g_hPuTTY = NULL;\r
- LeaveCriticalSection(&g_PuTTYLock);\r
- DeleteCriticalSection(&g_PuTTYLock);\r
- g_bPuTTYLoaded = FALSE;\r
-}\r
-\r
-// PuTTYが使用可能かどうか確認\r
-BOOL IsPuTTYLoaded()\r
-{\r
- return g_bPuTTYLoaded;\r
-}\r
-\r
-SFTPDATA* GetUnusedSFTPData()\r
-{\r
- int i;\r
- for(i = 0; i < MAX_SFTP_SOCKET; i++)\r
- {\r
- if(g_SFTPData[i].Control == INVALID_SOCKET)\r
- {\r
- memset(&g_SFTPData[i], 0, sizeof(SFTPDATA));\r
- return &g_SFTPData[i];\r
- }\r
- }\r
- return NULL;\r
-}\r
-\r
-SFTPDATA* FindSFTPDataFromSocket(SOCKET s)\r
-{\r
- int i;\r
- for(i = 0; i < MAX_SFTP_SOCKET; i++)\r
- {\r
- if(g_SFTPData[i].Control == s || g_SFTPData[i].Data == s)\r
- return &g_SFTPData[i];\r
- }\r
- return NULL;\r
-}\r
-\r
-// SFTPとしてマークされているか確認\r
-// マークされていればTRUEを返す\r
-BOOL IsSFTPAttached(SOCKET s)\r
-{\r
- SFTPDATA* pSFTPData;\r
- if(!g_bPuTTYLoaded)\r
- return FALSE;\r
- EnterCriticalSection(&g_PuTTYLock);\r
- pSFTPData = FindSFTPDataFromSocket(s);\r
- LeaveCriticalSection(&g_PuTTYLock);\r
- if(!pSFTPData)\r
- return FALSE;\r
- return TRUE;\r
-}\r
-\r
-// コントロール用の仮想的なソケットを取得\r
-// 識別子としてダミーのソケットを返す\r
-SOCKET SFTP_socket(int af, int type, int protocol)\r
-{\r
- SOCKET r;\r
- SFTPDATA* pSFTPData;\r
- if(!g_bPuTTYLoaded)\r
- return INVALID_SOCKET;\r
- r = INVALID_SOCKET;\r
- EnterCriticalSection(&g_PuTTYLock);\r
- if(pSFTPData = GetUnusedSFTPData())\r
- {\r
- r = socket(af, type, protocol);\r
- pSFTPData->Control = r;\r
- pSFTPData->Data = INVALID_SOCKET;\r
- pSFTPData->Handle = p_SFTP_Create();\r
- }\r
- LeaveCriticalSection(&g_PuTTYLock);\r
- return r;\r
-}\r
-\r
-int SFTP_bind(SOCKET s, const struct sockaddr *addr, int namelen)\r
-{\r
- return SOCKET_ERROR;\r
-}\r
-\r
-int SFTP_listen(SOCKET s, int backlog)\r
-{\r
- return SOCKET_ERROR;\r
-}\r
-\r
-// accept相当の関数\r
-SOCKET SFTP_accept(SOCKET s, struct sockaddr *addr, int *addrlen)\r
-{\r
- return INVALID_SOCKET;\r
-}\r
-\r
-// connect相当の関数\r
-int SFTP_connect(SOCKET s, const struct sockaddr *name, int namelen)\r
-{\r
- SFTPDATA* pSFTPData;\r
- if(!g_bPuTTYLoaded)\r
- return SOCKET_ERROR;\r
- EnterCriticalSection(&g_PuTTYLock);\r
- pSFTPData = FindSFTPDataFromSocket(s);\r
- LeaveCriticalSection(&g_PuTTYLock);\r
- if(!pSFTPData)\r
- return SOCKET_ERROR;\r
- if(namelen == sizeof(struct sockaddr_in))\r
- {\r
- }\r
- else if(namelen == sizeof(struct sockaddr_in6))\r
- {\r
- }\r
- else\r
- return SOCKET_ERROR;\r
- return 0;\r
-}\r
-\r
-// closesocket相当の関数\r
-int SFTP_closesocket(SOCKET s)\r
-{\r
- SFTPDATA* pSFTPData;\r
- if(!g_bPuTTYLoaded)\r
- return SOCKET_ERROR;\r
- EnterCriticalSection(&g_PuTTYLock);\r
- if(pSFTPData = FindSFTPDataFromSocket(s))\r
- {\r
- if(pSFTPData->Control == s)\r
- {\r
- pSFTPData->Control = INVALID_SOCKET;\r
- p_SFTP_Destroy(pSFTPData->Handle);\r
- }\r
- if(pSFTPData->Data == s)\r
- pSFTPData->Data = INVALID_SOCKET;\r
- }\r
- LeaveCriticalSection(&g_PuTTYLock);\r
- return closesocket(s);\r
-}\r
-\r
-// send相当の関数\r
-int SFTP_send(SOCKET s, const char * buf, int len, int flags)\r
-{\r
- int r;\r
- SFTPDATA* pSFTPData;\r
- if(!g_bPuTTYLoaded)\r
- return SOCKET_ERROR;\r
- EnterCriticalSection(&g_PuTTYLock);\r
- pSFTPData = FindSFTPDataFromSocket(s);\r
- LeaveCriticalSection(&g_PuTTYLock);\r
- if(!pSFTPData)\r
- return SOCKET_ERROR;\r
- if(p_SFTP_IsExited(pSFTPData->Handle))\r
- return SOCKET_ERROR;\r
- r = SOCKET_ERROR;\r
- if(pSFTPData->Control == s)\r
- r = (int)p_SFTP_WriteStdIn(pSFTPData->Handle, buf, len);\r
- else if(pSFTPData->Data == s)\r
- r = (int)p_SFTP_WriteDataIn(pSFTPData->Handle, buf, len);\r
- return r;\r
-}\r
-\r
-// recv相当の関数\r
-int SFTP_recv(SOCKET s, char * buf, int len, int flags)\r
-{\r
- int r;\r
- SFTPDATA* pSFTPData;\r
- if(!g_bPuTTYLoaded)\r
- return SOCKET_ERROR;\r
- EnterCriticalSection(&g_PuTTYLock);\r
- pSFTPData = FindSFTPDataFromSocket(s);\r
- LeaveCriticalSection(&g_PuTTYLock);\r
- if(!pSFTPData)\r
- return SOCKET_ERROR;\r
- if(p_SFTP_IsExited(pSFTPData->Handle))\r
- return SOCKET_ERROR;\r
- r = SOCKET_ERROR;\r
- if(pSFTPData->Control == s)\r
- {\r
- if(flags & MSG_PEEK)\r
- r = (int)p_SFTP_PeekStdOut(pSFTPData->Handle, buf, len);\r
- else\r
- r = (int)p_SFTP_ReadStdOut(pSFTPData->Handle, buf, len);\r
- }\r
- else if(pSFTPData->Data == s)\r
- {\r
- if(flags & MSG_PEEK)\r
- r = (int)p_SFTP_PeekDataOut(pSFTPData->Handle, buf, len);\r
- else\r
- r = (int)p_SFTP_ReadDataOut(pSFTPData->Handle, buf, len);\r
- }\r
- return r;\r
-}\r
-\r
-BOOL SFTP_SetTimeoutCallback(SOCKET s, void* pCallback)\r
-{\r
- SFTPDATA* pSFTPData;\r
- if(!g_bPuTTYLoaded)\r
- return FALSE;\r
- EnterCriticalSection(&g_PuTTYLock);\r
- pSFTPData = FindSFTPDataFromSocket(s);\r
- LeaveCriticalSection(&g_PuTTYLock);\r
- if(!pSFTPData)\r
- return FALSE;\r
- return p_SFTP_SetTimeoutCallback(pSFTPData->Handle, pCallback);\r
-}\r
-\r
-// データ用の仮想的なソケットを取得\r
-// 識別子としてダミーのソケットを返す\r
-SOCKET SFTP_GetDataHandle(SOCKET s, int af, int type, int protocol)\r
-{\r
- SOCKET r;\r
- SFTPDATA* pSFTPData;\r
- if(!g_bPuTTYLoaded)\r
- return INVALID_SOCKET;\r
- r = INVALID_SOCKET;\r
- EnterCriticalSection(&g_PuTTYLock);\r
- if(pSFTPData = FindSFTPDataFromSocket(s))\r
- {\r
- r = socket(af, type, protocol);\r
- pSFTPData->Data = r;\r
- }\r
- LeaveCriticalSection(&g_PuTTYLock);\r
- return r;\r
-}\r
-\r
-BOOL SFTP_SetFilePosition(SOCKET s, LONGLONG Position)\r
-{\r
- SFTPDATA* pSFTPData;\r
- if(!g_bPuTTYLoaded)\r
- return FALSE;\r
- EnterCriticalSection(&g_PuTTYLock);\r
- pSFTPData = FindSFTPDataFromSocket(s);\r
- LeaveCriticalSection(&g_PuTTYLock);\r
- if(!pSFTPData)\r
- return FALSE;\r
- return p_SFTP_SetFilePosition(pSFTPData->Handle, Position);\r
-}\r
-\r
OSDN Git Service
