aboutsummaryrefslogtreecommitdiff
path: root/net/softethervpn/patches
diff options
context:
space:
mode:
Diffstat (limited to 'net/softethervpn/patches')
-rw-r--r--net/softethervpn/patches/120-openssl-deprecated.patch12
-rw-r--r--net/softethervpn/patches/130-iconv.patch2
2 files changed, 7 insertions, 7 deletions
diff --git a/net/softethervpn/patches/120-openssl-deprecated.patch b/net/softethervpn/patches/120-openssl-deprecated.patch
index e722fab98..4ed0d9222 100644
--- a/net/softethervpn/patches/120-openssl-deprecated.patch
+++ b/net/softethervpn/patches/120-openssl-deprecated.patch
@@ -99,7 +99,7 @@
if (!UINT64ToAsn1Time(t1, notBefore))
{
FreeX509(x509);
-@@ -2697,6 +2707,43 @@ bool RsaCheckEx()
+@@ -2698,6 +2708,43 @@ bool RsaCheckEx()
return false;
}
@@ -143,7 +143,7 @@
bool RsaCheck()
{
RSA *rsa;
-@@ -2710,12 +2757,11 @@ bool RsaCheck()
+@@ -2711,12 +2758,11 @@ bool RsaCheck()
// Key generation
Lock(openssl_lock);
{
@@ -157,7 +157,7 @@
return false;
}
-@@ -2780,12 +2826,11 @@ bool RsaGen(K **priv, K **pub, UINT bit)
+@@ -2781,12 +2827,11 @@ bool RsaGen(K **priv, K **pub, UINT bit)
// Key generation
Lock(openssl_lock);
{
@@ -171,7 +171,7 @@
return false;
}
-@@ -3895,7 +3940,7 @@ X *X509ToX(X509 *x509)
+@@ -3896,7 +3941,7 @@ X *X509ToX(X509 *x509)
{
if (OBJ_obj2nid(ad->method) == NID_ad_ca_issuers && ad->location->type == GEN_URI)
{
@@ -180,7 +180,7 @@
if (IsEmptyStr(uri) == false)
{
-@@ -4108,7 +4153,9 @@ void Rand(void *buf, UINT size)
+@@ -4109,7 +4154,9 @@ void Rand(void *buf, UINT size)
// Delete a thread-specific information that OpenSSL has holded
void FreeOpenSSLThreadState()
{
@@ -190,7 +190,7 @@
}
// Release the Crypt library
-@@ -4130,12 +4177,14 @@ void InitCryptLibrary()
+@@ -4131,12 +4178,14 @@ void InitCryptLibrary()
CheckIfIntelAesNiSupportedInit();
// RAND_Init_For_SoftEther()
openssl_lock = NewLock();
diff --git a/net/softethervpn/patches/130-iconv.patch b/net/softethervpn/patches/130-iconv.patch
index 935216df4..fd90a97a8 100644
--- a/net/softethervpn/patches/130-iconv.patch
+++ b/net/softethervpn/patches/130-iconv.patch
@@ -1,6 +1,6 @@
--- a/src/Mayaqua/Mayaqua.h
+++ b/src/Mayaqua/Mayaqua.h
-@@ -283,7 +283,7 @@ int PASCAL WinMain(HINSTANCE hInst, HINS
+@@ -284,7 +284,7 @@ int PASCAL WinMain(HINSTANCE hInst, HINS
#include <ifaddrs.h>
#endif // MAYAQUA_SUPPORTS_GETIFADDRS