Commit: 2335c90d75fc705460a84d66f6a13bf57115f8ca - ffftp (git)

FFFTPのソースコードです。

Commit MetaInfo

• Revision: 2335c90d75fc705460a84d66f6a13bf57115f8ca (tree)
• Zeit: 2018-01-07 16:01:12
• Autor: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Implement Subject Alternative Names check.

Ändern Zusammenfassung

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: FFFTP_Eng_Release_64/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: Release_64/FFFTP.exe
• modified: doc/eng/FFFTP.txt
• modified: doc/eng/history.txt
• modified: doc/jpn/FFFTP.txt
• modified: doc/jpn/history.txt
• modified: src/common.h
• modified: src/main.c
• modified: src/mesg-eng.h
• modified: src/mesg-jpn.h
• modified: src/socketwrapper.c
• modified: src/socketwrapper.h

Diff

Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ

Binary files a/FFFTP_Eng_Release_64/FFFTP.exe and b/FFFTP_Eng_Release_64/FFFTP.exe differ

Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ

Binary files a/Release_64/FFFTP.exe and b/Release_64/FFFTP.exe differ

--- a/doc/eng/FFFTP.txt
+++ b/doc/eng/FFFTP.txt
@@ -65,6 +65,9 @@ This list includes changes applied by automatic software updates.
 -- Implemented Server Name Indication.
    This solves the problem that it cannot connect to some shared servers.
 
+-- Changed to check Subject Alternative Names at validation of SSL/TLS
+   certificates.
+
 -- Fixed bugs that sometimes it cannot reconnect after transfer failure.
 
 -- Fixed bugs that the queue of file transfer is not released on disconnection.

--- a/doc/eng/history.txt
+++ b/doc/eng/history.txt
@@ -35,6 +35,9 @@ Changes in Ver.2.00
 -- Implemented Server Name Indication.
    This solves the problem that it cannot connect to some shared servers.
 
+-- Changed to check Subject Alternative Names at validation of SSL/TLS
+   certificates.
+
 -- Fixed bugs that sometimes it cannot reconnect after transfer failure.
 
 -- Fixed bugs that the queue of file transfer is not released on disconnection.

--- a/doc/jpn/FFFTP.txt
+++ b/doc/jpn/FFFTP.txt
@@ -61,7 +61,10 @@ Ver 2.00
 ・バグ対策の副作用によるウィンドウのちらつきを解消しました。
 
 ・Server Name Indicationを実装しました。
-　これにより一部の共用サーバーに接続できない問題が解消されます。                                                    
+　これにより一部の共用サーバーに接続できない問題が解消されます。
+
+・SSL/TLS証明書の検証時にSubject Alternative Namesを確認するように
+　変更しました。
 
 ・転送失敗時に再接続できない場合があるバグを修正しました。
 

--- a/doc/jpn/history.txt
+++ b/doc/jpn/history.txt
@@ -31,7 +31,10 @@ FFFTP
 ・バグ対策の副作用によるウィンドウのちらつきを解消しました。
 
 ・Server Name Indicationを実装しました。
-　これにより一部の共用サーバーに接続できない問題が解消されます。                                                    
+　これにより一部の共用サーバーに接続できない問題が解消されます。
+
+・SSL/TLS証明書の検証時にSubject Alternative Namesを確認するように
+　変更しました。
 
 ・転送失敗時に再接続できない場合があるバグを修正しました。
 

--- a/src/common.h
+++ b/src/common.h
@@ -81,7 +81,7 @@
 // ソフトウェア自動更新
 // リリースバージョンはリリース予定年（10進数4桁）+月（2桁）+日（2桁）+通し番号（0スタート2桁）とする
 // 2014年7月31日中の30個目のリリースは2014073129
-#define RELEASE_VERSION_NUM		2017110400	/* リリースバージョン */
+#define RELEASE_VERSION_NUM		2018010700	/* リリースバージョン */
 
 
 // SourceForge.JPによるフォーク
@@ -1423,7 +1423,7 @@ void ResetAutoExitFlg(void);
 int AskAutoExit(void);
 // 暗号化通信対応
 BOOL __stdcall SSLTimeoutCallback(BOOL* pbAborted);
-BOOL __stdcall SSLConfirmCallback(BOOL* pbAborted, BOOL bVerified, LPCSTR Certificate, LPCSTR CommonName);
+BOOL __stdcall SSLConfirmCallback(BOOL* pbAborted, BOOL bVerified, LPCSTR Certificate);
 BOOL LoadSSLRootCAFile();
 // マルチコアCPUの特定環境下でファイル通信中にクラッシュするバグ対策
 BOOL IsMainThread();

--- a/src/main.c
+++ b/src/main.c
@@ -3588,7 +3588,7 @@ BOOL __stdcall SSLTimeoutCallback(BOOL* pbAborted)
 	return FALSE;
 }
 
-BOOL __stdcall SSLConfirmCallback(BOOL* pbAborted, BOOL bVerified, LPCSTR Certificate, LPCSTR CommonName)
+BOOL __stdcall SSLConfirmCallback(BOOL* pbAborted, BOOL bVerified, LPCSTR Certificate)
 {
 	BOOL bResult;
 	uint32 Hash[5];
@@ -3616,7 +3616,7 @@ BOOL __stdcall SSLConfirmCallback(BOOL* pbAborted, BOOL bVerified, LPCSTR Certif
 		{
 			if(pm1 = AllocateStringM(strlen(Certificate) * 2 + 1024))
 			{
-				sprintf(pm0, MSGJPN326, IsHostNameMatched(AskHostAdrs(), CommonName) ? MSGJPN327 : MSGJPN328, bVerified ? MSGJPN327 : MSGJPN328, Certificate);
+				sprintf(pm0, MSGJPN326, bVerified ? MSGJPN327 : MSGJPN328, Certificate);
 				ReplaceAllStrings(pm1, pm0, "\n", "\r\n");
 				if(DialogBoxParam(GetFtpInst(), MAKEINTRESOURCE(ssl_confirm_dlg), GetMainHwnd(), ExeEscTextDialogProc, (LPARAM)pm1) == YES)
 				{

--- a/src/mesg-eng.h
+++ b/src/mesg-eng.h
@@ -324,7 +324,7 @@
 #define MSGJPN323		_Tu8("Failed to unload untrustworthy DLLs.", "Failed to unload untrustworthy DLLs.")
 #define MSGJPN324		_Tu8("Failed to hook required functions to protect the process.", "Failed to hook required functions to protect the process.")
 #define MSGJPN325		_Tu8("New master passwords are not identical.", "New master passwords are not identical.")
-#define MSGJPN326		_Tu8("Summary\nCN is identical: %s\nVerified successfully: %s\n\nDetailed information\n%s", "Summary\nCN is identical: %s\nVerified successfully: %s\n\nDetailed information\n%s")
+#define MSGJPN326		_Tu8("Summary\nVerified successfully: %s\n\nDetailed information\n%s", "Summary\nVerified successfully: %s\n\nDetailed information\n%s")
 #define MSGJPN327		_Tu8("Yes", "Yes")
 #define MSGJPN328		_Tu8("No", "No")
 #define MSGJPN329		_Tu8("UTF-8 BOM", "UTF-8 BOM")

--- a/src/mesg-jpn.h
+++ b/src/mesg-jpn.h
@@ -324,7 +324,7 @@
 #define MSGJPN323		_Tu8("信頼できないDLLをアンロードできませんでした.", "\xE4\xBF\xA1\xE9\xA0\xBC\xE3\x81\xA7\xE3\x81\x8D\xE3\x81\xAA\xE3\x81\x84\x44LL\xE3\x82\x92\xE3\x82\xA2\xE3\x83\xB3\xE3\x83\xAD\xE3\x83\xBC\xE3\x83\x89\xE3\x81\xA7\xE3\x81\x8D\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93\xE3\x81\xA7\xE3\x81\x97\xE3\x81\x9F.")
 #define MSGJPN324		_Tu8("プロセスの保護に必要な関数をフックできませんでした.", "\xE3\x83\x97\xE3\x83\xAD\xE3\x82\xBB\xE3\x82\xB9\xE3\x81\xAE\xE4\xBF\x9D\xE8\xAD\xB7\xE3\x81\xAB\xE5\xBF\x85\xE8\xA6\x81\xE3\x81\xAA\xE9\x96\xA2\xE6\x95\xB0\xE3\x82\x92\xE3\x83\x95\xE3\x83\x83\xE3\x82\xAF\xE3\x81\xA7\xE3\x81\x8D\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93\xE3\x81\xA7\xE3\x81\x97\xE3\x81\x9F.")
 #define MSGJPN325		_Tu8("新しいマスターパスワードが一致しません.", "\xE6\x96\xB0\xE3\x81\x97\xE3\x81\x84\xE3\x83\x9E\xE3\x82\xB9\xE3\x82\xBF\xE3\x83\xBC\xE3\x83\x91\xE3\x82\xB9\xE3\x83\xAF\xE3\x83\xBC\xE3\x83\x89\xE3\x81\x8C\xE4\xB8\x80\xE8\x87\xB4\xE3\x81\x97\xE3\x81\xBE\xE3\x81\x9B\xE3\x82\x93.")
-#define MSGJPN326		_Tu8("概要\nCNの一致: %s\n検証に成功: %s\n\n詳細情報\n%s", "\xE6\xA6\x82\xE8\xA6\x81\nCN\xE3\x81\xAE\xE4\xB8\x80\xE8\x87\xB4: %s\n\xE6\xA4\x9C\xE8\xA8\xBC\xE3\x81\xAB\xE6\x88\x90\xE5\x8A\x9F: %s\n\n\xE8\xA9\xB3\xE7\xB4\xB0\xE6\x83\x85\xE5\xA0\xB1\n%s")
+#define MSGJPN326		_Tu8("概要\n検証に成功: %s\n\n詳細情報\n%s", "\xE6\xA6\x82\xE8\xA6\x81\n\xE6\xA4\x9C\xE8\xA8\xBC\xE3\x81\xAB\xE6\x88\x90\xE5\x8A\x9F: %s\n\n\xE8\xA9\xB3\xE7\xB4\xB0\xE6\x83\x85\xE5\xA0\xB1\n%s")
 #define MSGJPN327		_Tu8("はい", "\xE3\x81\xAF\xE3\x81\x84")
 #define MSGJPN328		_Tu8("いいえ", "\xE3\x81\x84\xE3\x81\x84\xE3\x81\x88")
 #define MSGJPN329		_Tu8("UTF-8 BOM", "UTF-8 BOM")

--- a/src/socketwrapper.c
+++ b/src/socketwrapper.c
@@ -38,6 +38,7 @@ typedef int (__cdecl* _SSL_write)(SSL*, const void*, int);
 typedef int (__cdecl* _SSL_peek)(SSL*, void*, int);
 typedef int (__cdecl* _SSL_read)(SSL*, void*, int);
 typedef int (__cdecl* _SSL_get_error)(SSL*, int);
+typedef int (__cdecl* _SSL_set1_param)(SSL*, X509_VERIFY_PARAM*);
 typedef X509* (__cdecl* _SSL_get_peer_certificate)(const SSL*);
 typedef long (__cdecl* _SSL_get_verify_result)(const SSL*);
 typedef SSL_SESSION* (__cdecl* _SSL_get_session)(SSL*);
@@ -56,6 +57,9 @@ typedef void (__cdecl* _X509_free)(X509*);
 typedef int (__cdecl* _X509_print_ex)(BIO*, X509*, unsigned long, unsigned long);
 typedef X509_NAME* (__cdecl* _X509_get_subject_name)(X509*);
 typedef int (__cdecl* _X509_NAME_print_ex)(BIO*, X509_NAME*, int, unsigned long);
+typedef X509_VERIFY_PARAM* (__cdecl* _X509_VERIFY_PARAM_new)();
+typedef void (__cdecl* _X509_VERIFY_PARAM_free)(X509_VERIFY_PARAM*);
+typedef int (__cdecl* _X509_VERIFY_PARAM_set1_host)(X509_VERIFY_PARAM*, const char*, size_t);
 typedef void (__cdecl* _X509_CRL_free)(X509_CRL*);
 typedef EVP_PKEY* (__cdecl* _PEM_read_bio_PrivateKey)(BIO*, EVP_PKEY**, pem_password_cb*, void*);
 typedef EVP_PKEY* (__cdecl* _PEM_read_bio_PUBKEY)(BIO*, EVP_PKEY**, pem_password_cb*, void*);
@@ -94,6 +98,7 @@ _SSL_write p_SSL_write;
 _SSL_peek p_SSL_peek;
 _SSL_read p_SSL_read;
 _SSL_get_error p_SSL_get_error;
+_SSL_set1_param p_SSL_set1_param;
 _SSL_get_peer_certificate p_SSL_get_peer_certificate;
 _SSL_get_verify_result p_SSL_get_verify_result;
 _SSL_get_session p_SSL_get_session;
@@ -112,6 +117,9 @@ _X509_free p_X509_free;
 _X509_print_ex p_X509_print_ex;
 _X509_get_subject_name p_X509_get_subject_name;
 _X509_NAME_print_ex p_X509_NAME_print_ex;
+_X509_VERIFY_PARAM_new p_X509_VERIFY_PARAM_new;
+_X509_VERIFY_PARAM_free p_X509_VERIFY_PARAM_free;
+_X509_VERIFY_PARAM_set1_host p_X509_VERIFY_PARAM_set1_host;
 _X509_CRL_free p_X509_CRL_free;
 _PEM_read_bio_PrivateKey p_PEM_read_bio_PrivateKey;
 _PEM_read_bio_PUBKEY p_PEM_read_bio_PUBKEY;
@@ -149,7 +157,7 @@ BOOL __stdcall DefaultSSLTimeoutCallback(BOOL* pbAborted)
 	return *pbAborted;
 }
 
-BOOL __stdcall DefaultSSLConfirmCallback(BOOL* pbAborted, BOOL bVerified, LPCSTR Certificate, LPCSTR CommonName)
+BOOL __stdcall DefaultSSLConfirmCallback(BOOL* pbAborted, BOOL bVerified, LPCSTR Certificate)
 {
 	return bVerified;
 }
@@ -195,6 +203,7 @@ BOOL LoadOpenSSL()
 		|| !(p_SSL_peek = (_SSL_peek)GetProcAddress(g_hOpenSSL, "SSL_peek"))
 		|| !(p_SSL_read = (_SSL_read)GetProcAddress(g_hOpenSSL, "SSL_read"))
 		|| !(p_SSL_get_error = (_SSL_get_error)GetProcAddress(g_hOpenSSL, "SSL_get_error"))
+		|| !(p_SSL_set1_param = (_SSL_set1_param)GetProcAddress(g_hOpenSSL, "SSL_set1_param"))
 		|| !(p_SSL_get_peer_certificate = (_SSL_get_peer_certificate)GetProcAddress(g_hOpenSSL, "SSL_get_peer_certificate"))
 		|| !(p_SSL_get_verify_result = (_SSL_get_verify_result)GetProcAddress(g_hOpenSSL, "SSL_get_verify_result"))
 		|| !(p_SSL_get_session = (_SSL_get_session)GetProcAddress(g_hOpenSSL, "SSL_get_session"))
@@ -227,6 +236,9 @@ BOOL LoadOpenSSL()
 		|| !(p_X509_print_ex = (_X509_print_ex)GetProcAddress(g_hOpenSSLCommon, "X509_print_ex"))
 		|| !(p_X509_get_subject_name = (_X509_get_subject_name)GetProcAddress(g_hOpenSSLCommon, "X509_get_subject_name"))
 		|| !(p_X509_NAME_print_ex = (_X509_NAME_print_ex)GetProcAddress(g_hOpenSSLCommon, "X509_NAME_print_ex"))
+		|| !(p_X509_VERIFY_PARAM_new = (_X509_VERIFY_PARAM_new)GetProcAddress(g_hOpenSSLCommon, "X509_VERIFY_PARAM_new"))
+		|| !(p_X509_VERIFY_PARAM_free = (_X509_VERIFY_PARAM_free)GetProcAddress(g_hOpenSSLCommon, "X509_VERIFY_PARAM_free"))
+		|| !(p_X509_VERIFY_PARAM_set1_host = (_X509_VERIFY_PARAM_set1_host)GetProcAddress(g_hOpenSSLCommon, "X509_VERIFY_PARAM_set1_host"))
 		|| !(p_X509_CRL_free = (_X509_CRL_free)GetProcAddress(g_hOpenSSLCommon, "X509_CRL_free"))
 		|| !(p_PEM_read_bio_PrivateKey = (_PEM_read_bio_PrivateKey)GetProcAddress(g_hOpenSSLCommon, "PEM_read_bio_PrivateKey"))
 		|| !(p_PEM_read_bio_PUBKEY = (_PEM_read_bio_PUBKEY)GetProcAddress(g_hOpenSSLCommon, "PEM_read_bio_PUBKEY"))
@@ -340,8 +352,6 @@ BOOL ConfirmSSLCertificate(SSL* pSSL, BOOL* pbAborted)
 	BIO* pBIO;
 	long Length;
 	char* pBuffer;
-	char* pCN;
-	char* p;
 	bResult = FALSE;
 	bVerified = FALSE;
 	pData = NULL;
@@ -374,24 +384,10 @@ BOOL ConfirmSSLCertificate(SSL* pSSL, BOOL* pbAborted)
 			}
 			p_BIO_free(pBIO);
 		}
-		p_X509_free(pX509);
 	}
 	if(pX509 && p_SSL_get_verify_result(pSSL) == X509_V_OK)
 		bVerified = TRUE;
-	pCN = pSubject;
-	while(pCN)
-	{
-		if(strncmp(pCN, "CN=", strlen("CN=")) == 0)
-		{
-			pCN += strlen("CN=");
-			if(p = strchr(pCN, ','))
-				*p = '\0';
-			break;
-		}
-		if(pCN = strchr(pCN, ','))
-			pCN++;
-	}
-	bResult = g_pOpenSSLConfirmCallback(pbAborted, bVerified, pData, pCN);
+	bResult = g_pOpenSSLConfirmCallback(pbAborted, bVerified, pData);
 	if(pData)
 		free(pData);
 	if(pSubject)
@@ -528,55 +524,6 @@ BOOL SetSSLRootCertificate(const void* pData, DWORD Length)
 	return r;
 }
 
-// ワイルドカードの比較
-// 主にSSL証明書のCN確認用
-BOOL IsHostNameMatched(LPCSTR HostName, LPCSTR CommonName)
-{
-	BOOL bResult;
-	char* pa0;
-	const char* pAsterisk;
-	size_t BeforeAsterisk;
-	const char* pBeginAsterisk;
-	const char* pEndAsterisk;
-	const char* pDot;
-	bResult = FALSE;
-	if(HostName && CommonName)
-	{
-		if(pa0 = AllocateStringA(strlen(HostName) * 4))
-		{
-			if(ConvertNameToPunycode(pa0, HostName))
-			{
-				if(pAsterisk = strchr(CommonName, '*'))
-				{
-					BeforeAsterisk = ((size_t)pAsterisk - (size_t)CommonName) / sizeof(char);
-					pBeginAsterisk = pa0 + BeforeAsterisk;
-					while(*pAsterisk == '*')
-					{
-						pAsterisk++;
-					}
-					pEndAsterisk = pa0 + strlen(pa0) - strlen(pAsterisk);
-					// "*"より前は大文字小文字を無視して完全一致
-					if(_strnicmp(pa0, CommonName, BeforeAsterisk) == 0)
-					{
-						// "*"より後は大文字小文字を無視して完全一致
-						if(_stricmp(pEndAsterisk, pAsterisk) == 0)
-						{
-							// "*"と一致する範囲に"."が含まれてはならない
-							pDot = strchr(pBeginAsterisk, '.');
-							if(!pDot || pDot >= pEndAsterisk)
-								bResult = TRUE;
-						}
-					}
-				}
-				else if(_stricmp(pa0, CommonName) == 0)
-					bResult = TRUE;
-			}
-		}
-		FreeDuplicatedString(pa0);
-	}
-	return bResult;
-}
-
 #pragma warning(push)
 #pragma warning(disable:4090)
 
@@ -705,6 +652,7 @@ BOOL AttachSSL(SOCKET s, SOCKET parent, BOOL* pbAborted, BOOL bStrengthen, const
 	SSL** ppSSLParent;
 	SSL_SESSION* pSession;
 	char* pa0;
+	X509_VERIFY_PARAM* pParam;
 	int Return;
 	int Error;
 	if(!g_bOpenSSLLoaded)
@@ -753,7 +701,15 @@ BOOL AttachSSL(SOCKET s, SOCKET parent, BOOL* pbAborted, BOOL bStrengthen, const
 							if(pa0 = AllocateStringA(strlen(ServerName) * 4))
 							{
 								if(ConvertNameToPunycode(pa0, ServerName))
+								{
 									p_SSL_ctrl(*ppSSL, SSL_CTRL_SET_TLSEXT_HOSTNAME, TLSEXT_NAMETYPE_host_name, pa0);
+									if(pParam = p_X509_VERIFY_PARAM_new())
+									{
+										p_X509_VERIFY_PARAM_set1_host(pParam, pa0, 0);
+										p_SSL_set1_param(*ppSSL, pParam);
+										p_X509_VERIFY_PARAM_free(pParam);
+									}
+								}
 							}
 							FreeDuplicatedString(pa0);
 						}

--- a/src/socketwrapper.h
+++ b/src/socketwrapper.h
@@ -11,7 +11,7 @@
 #define USE_OPENSSL
 
 typedef BOOL (__stdcall* LPSSLTIMEOUTCALLBACK)(BOOL*);
-typedef BOOL (__stdcall* LPSSLCONFIRMCALLBACK)(BOOL*, BOOL, LPCSTR, LPCSTR);
+typedef BOOL (__stdcall* LPSSLCONFIRMCALLBACK)(BOOL*, BOOL, LPCSTR);
 
 BOOL LoadOpenSSL();
 void FreeOpenSSL();
@@ -19,7 +19,6 @@ BOOL IsOpenSSLLoaded();
 void SetSSLTimeoutCallback(DWORD Timeout, LPSSLTIMEOUTCALLBACK pCallback);
 void SetSSLConfirmCallback(LPSSLCONFIRMCALLBACK pCallback);
 BOOL SetSSLRootCertificate(const void* pData, DWORD Length);
-BOOL IsHostNameMatched(LPCSTR HostName, LPCSTR CommonName);
 BOOL EncryptSignature(const char* PrivateKey, const char* Password, const void* pIn, DWORD InLength, void* pOut, DWORD OutLength, DWORD* pOutLength);
 BOOL DecryptSignature(const char* PublicKey, const char* Password, const void* pIn, DWORD InLength, void* pOut, DWORD OutLength, DWORD* pOutLength);
 BOOL GetHashSHA1(const void* pData, DWORD Size, void* pHash);