projects / buildroot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: eb91fa7)
package/softether: bump to version 4.30-9700-beta
authorFabrice Fontaine <fontaine.fabrice@gmail.com>
Sun, 27 Oct 2019 14:32:11 +0000 (15:32 +0100)
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>
Sun, 27 Oct 2019 15:39:11 +0000 (16:39 +0100)
- Update first patch
- Drop last patch, not needed since
  https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/commit/553978c9a505c2fa427dba7633e69c8f147e9223
- License is Apache-2.0 since version 4.29-9678-rtm and
  https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/commit/0e317124ae6e266d8d5c8c5e6b208633b7706af2

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
package/softether/0001-Create-autotools-plumbing-for-SoftEther.patch patch | blob | history
package/softether/0010-Encrypt-set-default-RSA-key-size-to-1024-everywhere-.patch [deleted file] patch | blob | history
package/softether/softether.hash patch | blob | history
package/softether/softether.mk patch | blob | history

diff --git a/package/softether/0001-Create-autotools-plumbing-for-SoftEther.patch b/package/softether/0001-Create-autotools-plumbing-for-SoftEther.patch
index 3f17a74dba1f9187b96b65b6eef0bdb599734ede..92c2885a66d839687159c6e960ad148c0d00e4d1 100644 (file)
--- a/package/softether/0001-Create-autotools-plumbing-for-SoftEther.patch
+++ b/package/softether/0001-Create-autotools-plumbing-for-SoftEther.patch
@@ -28,6 +28,8 @@ NB: http://www.gnu.org/software/autoconf-archive/
 
 [Upstream commit: https://github.com/dajhorn/SoftEtherVPN/commit/c5e5d7e93c6f3302adf5821c29c4efdb7630e418]
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+[Fabrice: update for 4.30-9700-beta]
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
 ---
  Makefile.am                    |  21 ++
  autotools/ax_check_openssl.m4  | 124 ++++++++++
@@ -1502,12 +1504,12 @@ index 00000000..4a3fc2ba
 -echo '---------------------------------------------------------------------'
 -echo 'SoftEther VPN for Unix'
 -echo
--echo 'Copyright (c) SoftEther VPN Project at University of Tsukuba, Japan.'
--echo 'Copyright (c) Daiyuu Nobori. All Rights Reserved.'
+-echo 'Copyright (c) Daiyuu Nobori.'
+-echo 'Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.'
+-echo 'Copyright (c) SoftEther Corporation.'
+-echo 'Copyright (c) all contributors on SoftEther VPN project in GitHub.'
 -echo
--echo 'This program is free software; you can redistribute it and/or'
--echo 'modify it under the terms of the GNU General Public License'
--echo 'version 2 as published by the Free Software Foundation.'
+-echo 'License: The Apache License, Version 2.0'
 -echo
 -echo 'Read and understand README.TXT, LICENSE.TXT and WARNING.TXT before use.'
 -echo '---------------------------------------------------------------------'
diff --git a/package/softether/0010-Encrypt-set-default-RSA-key-size-to-1024-everywhere-.patch b/package/softether/0010-Encrypt-set-default-RSA-key-size-to-1024-everywhere-.patch
deleted file mode 100644 (file)
index 20a1f06..0000000
--- a/package/softether/0010-Encrypt-set-default-RSA-key-size-to-1024-everywhere-.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 1fad008e1adba5cb596da6f9ec6a244d49a585cf Mon Sep 17 00:00:00 2001
-From: Davide Beatrici <davidebeatrici@gmail.com>
-Date: Mon, 9 Apr 2018 22:02:34 +0200
-Subject: [PATCH] Encrypt: set default RSA key size to 1024 everywhere, using
- the RSA_KEY_SIZE macro
-
-This commit also fixes the problem described in #31, which was caused by the test key generated in RsaCheck() being too small for newer OpenSSL versions.
-
-Failure looks like
--- Alert: RsaCheck() --
-OpenSSL Library Init Failed. (too old?)
-Please install the latest version of OpenSSL.
-
-Upstream: https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/commit/1fad008e1adba5cb596da6f9ec6a244d49a585cf
-(Currently still on an active pull request https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/pull/1)
-
-Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
----
- src/Mayaqua/Encrypt.c | 8 ++++----
- src/Mayaqua/Encrypt.h | 2 +-
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/Mayaqua/Encrypt.c b/src/Mayaqua/Encrypt.c
-index 381d1c5..a557052 100644
---- a/src/Mayaqua/Encrypt.c
-+++ b/src/Mayaqua/Encrypt.c
-@@ -2194,7 +2194,7 @@ bool RsaVerifyEx(void *data, UINT data_size, void *sign, K *k, UINT bits)
-       }\r
-       if (bits == 0)\r
-       {\r
--              bits = 1024;\r
-+              bits = RSA_KEY_SIZE;\r
-       }\r
- \r
-       // Hash the data\r
-@@ -2233,7 +2233,7 @@ bool RsaSignEx(void *dst, void *src, UINT size, K *k, UINT bits)
-       }\r
-       if (bits == 0)\r
-       {\r
--              bits = 1024;\r
-+              bits = RSA_KEY_SIZE;\r
-       }\r
- \r
-       Zero(dst, bits / 8);\r
-@@ -2302,7 +2302,7 @@ bool RsaCheck()
-       BIO *bio;\r
-       char errbuf[MAX_SIZE];\r
-       UINT size = 0;\r
--      UINT bit = 32;\r
-+      UINT bit = RSA_KEY_SIZE;\r
-       // Validate arguments\r
- \r
-       // Key generation\r
-@@ -2372,7 +2372,7 @@ bool RsaGen(K **priv, K **pub, UINT bit)
-       }\r
-       if (bit == 0)\r
-       {\r
--              bit = 1024;\r
-+              bit = RSA_KEY_SIZE;\r
-       }\r
- \r
-       // Key generation\r
-diff --git a/src/Mayaqua/Encrypt.h b/src/Mayaqua/Encrypt.h
-index d795d2d..0c48161 100644
---- a/src/Mayaqua/Encrypt.h
-+++ b/src/Mayaqua/Encrypt.h
-@@ -128,7 +128,7 @@ void RAND_Free_For_SoftEther();
- #define       DES_IV_SIZE                                     8                       // DES IV size\r
- #define DES_BLOCK_SIZE                                8                       // DES block size\r
- #define DES3_KEY_SIZE                         (8 * 3)         // 3DES key size\r
--#define RSA_KEY_SIZE                          128                     // RSA key size\r
-+#define RSA_KEY_SIZE                          1024            // RSA key size\r
- #define DH_KEY_SIZE                                   128                     // DH key size\r
- #define       RSA_MIN_SIGN_HASH_SIZE          (15 + SHA1_HASH_SIZE)   // Minimum RSA hash size\r
- #define       RSA_SIGN_HASH_SIZE                      (RSA_MIN_SIGN_HASH_SIZE)        // RSA hash size\r
--- 
-1.9.1
-
diff --git a/package/softether/softether.hash b/package/softether/softether.hash
index 986aac859b704a464f0ad9266defa2d063cc93fe..01bdc629f099579f13096090cb206ce15fccdcb4 100644 (file)
--- a/package/softether/softether.hash
+++ b/package/softether/softether.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256 fbf6e04c4451d0cb1555c3a53c178b5453c7d761119f82fd693538c9f115fecb softether-4.28-9669-beta.tar.gz
-sha256 0a889e7e7a277397d0a2d56c37814eefd8c6b6129d8b74ee2d27fc3415fad561 LICENSE
+sha256 f579fa938f6d5d0622f23b3c163b3de5dc171e30175e44511bf269b3bb9fb1fc softether-4.30-9700-beta.tar.gz
+sha256 5da6241ddb987c4543bf1cbba6b40a3cd3ecb624dbd4a63daf04440911656bde LICENSE
diff --git a/package/softether/softether.mk b/package/softether/softether.mk
index b7c6738b9a2eda7bd121c7b4a05939ed6ff8efc2..2dbe7edbf3fff759c9de6c4d1ebcfd41380dcd3d 100644 (file)
--- a/package/softether/softether.mk
+++ b/package/softether/softether.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-SOFTETHER_VERSION = 4.28-9669-beta
+SOFTETHER_VERSION = 4.30-9700-beta
 SOFTETHER_SITE = $(call github,SoftEtherVPN,SoftEtherVPN_stable,v$(SOFTETHER_VERSION))
-SOFTETHER_LICENSE = GPL-2.0
+SOFTETHER_LICENSE = Apache-2.0
 SOFTETHER_LICENSE_FILES = LICENSE
 SOFTETHER_DEPENDENCIES = host-pkgconf host-softether libopenssl readline
 SOFTETHER_AUTORECONF = YES