Tera TermRevision: 7902
https://osdn.net/projects/ttssh2/scm/svn/commits/7902
Author: yutakapon
Date: 2019-08-03 15:15:59 +0900 (Sat, 03 Aug 2019)
Log Message:
-----------
お試しパッチの削除。
チケット #36876
Ticket Links:
------------
https://osdn.net/projects/ttssh2/tracker/detail/36876
Removed Paths:
-------------
branches/openssl_1_1_1_v2/libs/openssl_patch/CryptAcquireContextW.txt
branches/openssl_1_1_1_v2/libs/openssl_patch/InitializeCriticalSectionAndSpinCount_patch.txt
branches/openssl_1_1_1_v2/libs/openssl_patch/thread_win.txt
-------------- next part --------------
Deleted: branches/openssl_1_1_1_v2/libs/openssl_patch/CryptAcquireContextW.txt
===================================================================
--- branches/openssl_1_1_1_v2/libs/openssl_patch/CryptAcquireContextW.txt 2019-08-02 10:54:30 UTC (rev 7901)
+++ branches/openssl_1_1_1_v2/libs/openssl_patch/CryptAcquireContextW.txt 2019-08-03 06:15:59 UTC (rev 7902)
@@ -1,53 +0,0 @@
-*** openssl-1.1.1c.org/crypto/rand/rand_win.c 2019-05-28 22:12:20.000000000 +0900
---- openssl/crypto/rand/rand_win.c 2019-07-11 00:27:30.582096400 +0900
-***************
-*** 36,42 ****
- * http://developer.intel.com/design/security/rng/redist_license.htm
- */
- # define PROV_INTEL_SEC 22
-! # define INTEL_DEF_PROV L"Intel Hardware Cryptographic Service Provider"
- # endif
-
- size_t rand_pool_acquire_entropy(RAND_POOL *pool)
---- 36,42 ----
- * http://developer.intel.com/design/security/rng/redist_license.htm
- */
- # define PROV_INTEL_SEC 22
-! # define INTEL_DEF_PROV ("Intel Hardware Cryptographic Service Provider")
- # endif
-
- size_t rand_pool_acquire_entropy(RAND_POOL *pool)
-*************** size_t rand_pool_acquire_entropy(RAND_PO
-*** 81,87 ****
- if (buffer != NULL) {
- size_t bytes = 0;
- /* poll the CryptoAPI PRNG */
-! if (CryptAcquireContextW(&hProvider, NULL, NULL, PROV_RSA_FULL,
- CRYPT_VERIFYCONTEXT | CRYPT_SILENT) != 0) {
- if (CryptGenRandom(hProvider, bytes_needed, buffer) != 0)
- bytes = bytes_needed;
---- 81,87 ----
- if (buffer != NULL) {
- size_t bytes = 0;
- /* poll the CryptoAPI PRNG */
-! if (CryptAcquireContextA(&hProvider, NULL, NULL, PROV_RSA_FULL,
- CRYPT_VERIFYCONTEXT | CRYPT_SILENT) != 0) {
- if (CryptGenRandom(hProvider, bytes_needed, buffer) != 0)
- bytes = bytes_needed;
-*************** size_t rand_pool_acquire_entropy(RAND_PO
-*** 100,106 ****
- if (buffer != NULL) {
- size_t bytes = 0;
- /* poll the Pentium PRG with CryptoAPI */
-! if (CryptAcquireContextW(&hProvider, NULL,
- INTEL_DEF_PROV, PROV_INTEL_SEC,
- CRYPT_VERIFYCONTEXT | CRYPT_SILENT) != 0) {
- if (CryptGenRandom(hProvider, bytes_needed, buffer) != 0)
---- 100,106 ----
- if (buffer != NULL) {
- size_t bytes = 0;
- /* poll the Pentium PRG with CryptoAPI */
-! if (CryptAcquireContextA(&hProvider, NULL,
- INTEL_DEF_PROV, PROV_INTEL_SEC,
- CRYPT_VERIFYCONTEXT | CRYPT_SILENT) != 0) {
- if (CryptGenRandom(hProvider, bytes_needed, buffer) != 0)
Deleted: branches/openssl_1_1_1_v2/libs/openssl_patch/InitializeCriticalSectionAndSpinCount_patch.txt
===================================================================
--- branches/openssl_1_1_1_v2/libs/openssl_patch/InitializeCriticalSectionAndSpinCount_patch.txt 2019-08-02 10:54:30 UTC (rev 7901)
+++ branches/openssl_1_1_1_v2/libs/openssl_patch/InitializeCriticalSectionAndSpinCount_patch.txt 2019-08-03 06:15:59 UTC (rev 7902)
@@ -1,22 +0,0 @@
-*** openssl-1.1.1c/crypto/threads_win.c 2019-05-28 22:12:20.000000000 +0900
---- openssl/crypto/threads_win.c 2019-07-07 21:47:16.730284500 +0900
-*************** CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(vo
-*** 24,30 ****
- return NULL;
- }
-
-! #if !defined(_WIN32_WCE)
- /* 0x400 is the spin count value suggested in the documentation */
- if (!InitializeCriticalSectionAndSpinCount(lock, 0x400)) {
- OPENSSL_free(lock);
---- 24,33 ----
- return NULL;
- }
-
-! //#if !defined(_WIN32_WCE)
-! // We do not use InitializeCriticalSectionAndSpinCount API for
-! // running on Windows95. The API has been added on Windows98.
-! #if 0
- /* 0x400 is the spin count value suggested in the documentation */
- if (!InitializeCriticalSectionAndSpinCount(lock, 0x400)) {
- OPENSSL_free(lock);
Deleted: branches/openssl_1_1_1_v2/libs/openssl_patch/thread_win.txt
===================================================================
--- branches/openssl_1_1_1_v2/libs/openssl_patch/thread_win.txt 2019-08-02 10:54:30 UTC (rev 7901)
+++ branches/openssl_1_1_1_v2/libs/openssl_patch/thread_win.txt 2019-08-03 06:15:59 UTC (rev 7902)
@@ -1,45 +0,0 @@
-*** openssl-1.1.1c.org/crypto/threads_win.c 2019-05-28 22:12:20.000000000 +0900
---- openssl/crypto/threads_win.c 2019-07-10 23:26:55.883810800 +0900
-***************
-*** 13,18 ****
---- 13,52 ----
-
- #include <openssl/crypto.h>
-
-+ // Windows95\x82ŋN\x93\xAE\x82\xB3\x82\xB9\x82邽\x82߂ɁA\x8B[\x8E\x97\x83R\x81[\x83h\x82ŏ㏑\x82\xAB\x82\xB7\x82\xE9\x81B
-+ // \x83A\x83g\x83~\x83b\x83N\x82ɂȂ\xC1\x82Ă\xA2\x82Ȃ\xA2\x82̂ŃA\x83Z\x83\x93\x83u\x83\x89\x82ŏ\x91\x82\xAB\x92\xBC\x82\xB7\x95K\x97v\x82\xA0\x82\xE8\x81B
-+ #define InitializeCriticalSectionAndSpinCount(a, b) myInitializeCriticalSectionAndSpinCount(a)
-+ int myInitializeCriticalSectionAndSpinCount(void *arg)
-+ {
-+ InitializeCriticalSection(arg);
-+ return 1;
-+ }
-+
-+ #define InterlockedCompareExchange(a, b, c) myInterlockedCompareExchange(a, b, c)
-+ LONG myInterlockedCompareExchange(
-+ LPLONG volatile Destination,
-+ LONG Exchange,
-+ LONG Comperand
-+ )
-+ {
-+ LONG ret = *Destination;
-+
-+ if (*Destination == Comperand)
-+ ret = InterlockedExchange(Destination, Exchange);
-+ return (ret);
-+ }
-+
-+ #define InterlockedExchangeAdd(a, b) myInterlockedExchangeAdd(a, b)
-+ LONG myInterlockedExchangeAdd(
-+ LONG volatile *Addend,
-+ LONG Value
-+ )
-+ {
-+ while (Value-- > 0)
-+ InterlockedIncrement(Addend);
-+ }
-+
-+
- #if defined(OPENSSL_THREADS) && !defined(CRYPTO_TDEBUG) && defined(OPENSSL_SYS_WINDOWS)
-
- CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void)