svn commit: r484284 - in head/security: softether-devel/files softether/files

[Koichiro Iwao]

Author: meta
Date: Tue Nov  6 09:44:22 2018
New Revision: 484284
URL: https://svnweb.freebsd.org/changeset/ports/484284

Log:
  security/softether{,-devel}: fix the build with OpenSSL 1.1.1
  
  Reported by:	pkg-fallout
  Approved by:	mentors (implicit)
  Obtained from:	https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/pull/1
  Sponsored by:	HAW International, Inc.

Added:
  head/security/softether-devel/files/patch-fix-build-openssl111   (contents, props changed)
  head/security/softether/files/patch-fix-build-openssl111   (contents, props changed)

Added: head/security/softether-devel/files/patch-fix-build-openssl111
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/softether-devel/files/patch-fix-build-openssl111	Tue Nov  6 09:44:22 2018	(r484284)
@@ -0,0 +1,22 @@
+--- src/Mayaqua/Encrypt.c.orig	2018-11-06 08:15:31 UTC
++++ src/Mayaqua/Encrypt.c
+@@ -2684,7 +2684,7 @@ bool RsaCheck()
+ 	BIO *bio;
+ 	char errbuf[MAX_SIZE];
+ 	UINT size = 0;
+-	UINT bit = 32;
++	UINT bit = RSA_KEY_SIZE;
+ 	// Validate arguments
+ 
+ 	// Key generation
+--- src/Mayaqua/Encrypt.h.orig	2018-11-06 08:15:31 UTC
++++ src/Mayaqua/Encrypt.h
+@@ -128,7 +128,7 @@ void RAND_Free_For_SoftEther();
+ #define	DES_IV_SIZE					8			// DES IV size
+ #define DES_BLOCK_SIZE				8			// DES block size
+ #define DES3_KEY_SIZE				(8 * 3)		// 3DES key size
+-#define RSA_KEY_SIZE				128			// RSA key size
++#define RSA_KEY_SIZE				4096			// RSA key size
+ #define DH_KEY_SIZE					128			// DH key size
+ #define	RSA_MIN_SIGN_HASH_SIZE		(15 + SHA1_HASH_SIZE)	// Minimum RSA hash size
+ #define	RSA_SIGN_HASH_SIZE			(RSA_MIN_SIGN_HASH_SIZE)	// RSA hash size

Added: head/security/softether/files/patch-fix-build-openssl111
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/softether/files/patch-fix-build-openssl111	Tue Nov  6 09:44:22 2018	(r484284)
@@ -0,0 +1,22 @@
+--- src/Mayaqua/Encrypt.c.orig	2018-11-06 08:15:31 UTC
++++ src/Mayaqua/Encrypt.c
+@@ -2684,7 +2684,7 @@ bool RsaCheck()
+ 	BIO *bio;
+ 	char errbuf[MAX_SIZE];
+ 	UINT size = 0;
+-	UINT bit = 32;
++	UINT bit = RSA_KEY_SIZE;
+ 	// Validate arguments
+ 
+ 	// Key generation
+--- src/Mayaqua/Encrypt.h.orig	2018-11-06 08:15:31 UTC
++++ src/Mayaqua/Encrypt.h
+@@ -128,7 +128,7 @@ void RAND_Free_For_SoftEther();
+ #define	DES_IV_SIZE					8			// DES IV size
+ #define DES_BLOCK_SIZE				8			// DES block size
+ #define DES3_KEY_SIZE				(8 * 3)		// 3DES key size
+-#define RSA_KEY_SIZE				128			// RSA key size
++#define RSA_KEY_SIZE				4096			// RSA key size
+ #define DH_KEY_SIZE					128			// DH key size
+ #define	RSA_MIN_SIGN_HASH_SIZE		(15 + SHA1_HASH_SIZE)	// Minimum RSA hash size
+ #define	RSA_SIGN_HASH_SIZE			(RSA_MIN_SIGN_HASH_SIZE)	// RSA hash size