softethervpn: Update to rtm version 4.29-9680

[feed/packages.git] / net / softethervpn / patches / 120-openssl-deprecated.patch

diff --git a/net/softethervpn/patches/120-openssl-deprecated.patch b/net/softethervpn/patches/120-openssl-deprecated.patch
index 6c06e64748bf83a089e86fe22d1a1410d6f65710..3a154ce40e35aa5bb7bdf25a579c16b7934f06fa 100644 (file)
--- a/net/softethervpn/patches/120-openssl-deprecated.patch
+++ b/net/softethervpn/patches/120-openssl-deprecated.patch
@@ -2,7 +2,7 @@ diff --git a/src/Mayaqua/Encrypt.c b/src/Mayaqua/Encrypt.c
 index f3b3908..06b7fea 100644
 --- a/src/Mayaqua/Encrypt.c
 +++ b/src/Mayaqua/Encrypt.c
-@@ -129,6 +129,7 @@
+@@ -120,6 +120,7 @@
  #include <openssl/rand.h>\r
  #include <openssl/engine.h>\r
  #include <openssl/bio.h>\r
@@ -10,7 +10,7 @@ index f3b3908..06b7fea 100644
  #include <openssl/x509.h>\r
  #include <openssl/pkcs7.h>\r
  #include <openssl/pkcs12.h>\r
-@@ -137,6 +138,7 @@
+@@ -128,6 +129,7 @@
  #include <openssl/md4.h>\r
  #include <openssl/hmac.h>\r
  #include <openssl/sha.h>\r
@@ -18,7 +18,7 @@ index f3b3908..06b7fea 100644
  #include <openssl/des.h>\r
  #include <openssl/aes.h>\r
  #include <openssl/dh.h>\r
-@@ -634,7 +636,7 @@ UINT CipherProcess(CIPHER *c, void *iv, void *dest, void *src, UINT size)
+@@ -625,7 +627,7 @@ UINT CipherProcess(CIPHER *c, void *iv, void *dest, void *src, UINT size)
                return 0;\r
        }\r
  \r
@@ -27,7 +27,7 @@ index f3b3908..06b7fea 100644
        {\r
                return 0;\r
        }\r
-@@ -933,6 +935,7 @@ BUF *BigNumToBuf(const BIGNUM *bn)
+@@ -924,6 +926,7 @@ BUF *BigNumToBuf(const BIGNUM *bn)
  // Initialization of the lock of OpenSSL\r
  void OpenSSL_InitLock()\r
  {\r
@@ -35,7 +35,7 @@ index f3b3908..06b7fea 100644
        UINT i;\r
  \r
        // Initialization of the lock object\r
-@@ -946,11 +949,13 @@ void OpenSSL_InitLock()
+@@ -937,11 +940,13 @@ void OpenSSL_InitLock()
        // Setting the lock function\r
        CRYPTO_set_locking_callback(OpenSSL_Lock);\r
        CRYPTO_set_id_callback(OpenSSL_Id);\r
@@ -49,7 +49,7 @@ index f3b3908..06b7fea 100644
        UINT i;\r
  \r
        for (i = 0;i < ssl_lock_num;i++)\r
-@@ -962,11 +967,13 @@ void OpenSSL_FreeLock()
+@@ -953,11 +958,13 @@ void OpenSSL_FreeLock()
  \r
        CRYPTO_set_locking_callback(NULL);\r
        CRYPTO_set_id_callback(NULL);\r
@@ -63,7 +63,7 @@ index f3b3908..06b7fea 100644
        LOCK *lock = ssl_lock_obj[n];\r
  \r
        if (mode & CRYPTO_LOCK)\r
-@@ -979,12 +986,15 @@ void OpenSSL_Lock(int mode, int n, const char *file, int line)
+@@ -970,12 +977,15 @@ void OpenSSL_Lock(int mode, int n, const char *file, int line)
                // Unlock\r
                Unlock(lock);\r
        }\r
@@ -79,7 +79,7 @@ index f3b3908..06b7fea 100644
  }\r
  \r
  // Get the display name of the certificate\r
-@@ -1908,8 +1918,8 @@ X509 *NewX509(K *pub, K *priv, X *ca, NAME *name, UINT days, X_SERIAL *serial)
+@@ -1899,8 +1909,8 @@ X509 *NewX509(K *pub, K *priv, X *ca, NAME *name, UINT days, X_SERIAL *serial)
        X509_set_version(x509, 2L);\r
  \r
        // Set the Expiration\r
@@ -90,7 +90,7 @@ index f3b3908..06b7fea 100644
        if (!UINT64ToAsn1Time(t1, notBefore))\r
        {\r
                FreeX509(x509);\r
-@@ -2050,8 +2060,8 @@ X509 *NewRootX509(K *pub, K *priv, NAME *name, UINT days, X_SERIAL *serial)
+@@ -2041,8 +2051,8 @@ X509 *NewRootX509(K *pub, K *priv, NAME *name, UINT days, X_SERIAL *serial)
        X509_set_version(x509, 2L);\r
  \r
        // Set the Expiration\r
@@ -101,7 +101,7 @@ index f3b3908..06b7fea 100644
        if (!UINT64ToAsn1Time(t1, notBefore))\r
        {\r
                FreeX509(x509);\r
-@@ -2677,6 +2687,43 @@ bool RsaCheckEx()
+@@ -2697,6 +2707,43 @@ bool RsaCheckEx()
  \r
        return false;\r
  }\r
@@ -145,7 +145,7 @@ index f3b3908..06b7fea 100644
  bool RsaCheck()\r
  {\r
        RSA *rsa;\r
-@@ -2690,12 +2737,11 @@ bool RsaCheck()
+@@ -2710,12 +2757,11 @@ bool RsaCheck()
        // Key generation\r
        Lock(openssl_lock);\r
        {\r
@@ -159,7 +159,7 @@ index f3b3908..06b7fea 100644
                return false;\r
        }\r
  \r
-@@ -2760,12 +2806,11 @@ bool RsaGen(K **priv, K **pub, UINT bit)
+@@ -2780,12 +2826,11 @@ bool RsaGen(K **priv, K **pub, UINT bit)
        // Key generation\r
        Lock(openssl_lock);\r
        {\r
@@ -173,7 +173,7 @@ index f3b3908..06b7fea 100644
                return false;\r
        }\r
  \r
-@@ -3875,7 +3920,7 @@ X *X509ToX(X509 *x509)
+@@ -3895,7 +3940,7 @@ X *X509ToX(X509 *x509)
                                {\r
                                        if (OBJ_obj2nid(ad->method) == NID_ad_ca_issuers && ad->location->type == GEN_URI)\r
                                        {\r
@@ -182,7 +182,7 @@ index f3b3908..06b7fea 100644
  \r
                                                if (IsEmptyStr(uri) == false)\r
                                                {\r
-@@ -4088,7 +4133,9 @@ void Rand(void *buf, UINT size)
+@@ -4108,7 +4153,9 @@ void Rand(void *buf, UINT size)
  // Delete a thread-specific information that OpenSSL has holded\r
  void FreeOpenSSLThreadState()\r
  {\r
@@ -192,7 +192,7 @@ index f3b3908..06b7fea 100644
  }\r
  \r
  // Release the Crypt library\r
-@@ -4110,13 +4157,16 @@ void InitCryptLibrary()
+@@ -4130,13 +4177,16 @@ void InitCryptLibrary()
        CheckIfIntelAesNiSupportedInit();\r
  //    RAND_Init_For_SoftEther()\r
        openssl_lock = NewLock();\r