v4.30-9700-betav4.30-9700-beta

9 files changed, 155 insertions, 151 deletions

diff --git a/src/Cedar/Cedar.h b/src/Cedar/Cedar.h
index f5b3230f..cc32fc28 100644
--- a/src/Cedar/Cedar.h
+++ b/src/Cedar/Cedar.h
@@ -129,7 +129,7 @@
 #define	CEDAR_VER					430

 

 // Build Number

-#define	CEDAR_BUILD					9696

+#define	CEDAR_BUILD					9700

 

 // Beta number

 //#define	BETA_NUMBER					3

@@ -150,10 +150,10 @@
 // Specifies the build date

 #define	BUILD_DATE_Y		2019

 #define	BUILD_DATE_M		7

-#define	BUILD_DATE_D		8

-#define	BUILD_DATE_HO		12

-#define	BUILD_DATE_MI		9

-#define	BUILD_DATE_SE		40

+#define	BUILD_DATE_D		13

+#define	BUILD_DATE_HO		21

+#define	BUILD_DATE_MI		37

+#define	BUILD_DATE_SE		51

 

 // Tolerable time difference

 #define	ALLOW_TIMESTAMP_DIFF		(UINT64)(3 * 24 * 60 * 60 * 1000)

diff --git a/src/CurrentBuild.txt b/src/CurrentBuild.txt
index 2ba87d10..cdd79644 100644
--- a/src/CurrentBuild.txt
+++ b/src/CurrentBuild.txt
@@ -1,4 +1,4 @@
-BUILD_NUMBER 9696

+BUILD_NUMBER 9700

 VERSION 430

 BUILD_NAME beta

-BUILD_DATE 20190708_120940

+BUILD_DATE 20190713_213751

diff --git a/src/Mayaqua/Network.c b/src/Mayaqua/Network.c
index ded99b77..8527953f 100644
--- a/src/Mayaqua/Network.c
+++ b/src/Mayaqua/Network.c
@@ -5946,6 +5946,10 @@ int cb_test(int a, X509_STORE_CTX *ctx)
 	return 1;

 }

 

+#if OPENSSL_VERSION_NUMBER < 0x10100000L

+#define X509_STORE_CTX_get0_cert(o) ((o)->cert)

+#endif

+

 // Verify client SSL certificate during TLS handshake.

 //

 // (actually, only save the certificate for later authentication in Protocol.c)

@@ -5953,27 +5957,27 @@ int SslCertVerifyCallback(int preverify_ok, X509_STORE_CTX *ctx)
 {

 	SSL *ssl;

 	struct SslClientCertInfo *clientcert;

+	X509 *cert;

 

 	ssl = X509_STORE_CTX_get_ex_data(ctx, SSL_get_ex_data_X509_STORE_CTX_idx());

 	clientcert = SSL_get_ex_data(ssl, GetSslClientCertIndex());

 

 	if (clientcert != NULL)

 	{

-		clientcert->PreverifyErr = 0;

+		clientcert->PreverifyErr = X509_STORE_CTX_get_error(ctx);

 		clientcert->PreverifyErrMessage[0] = '\0';

 		if (!preverify_ok)

 		{

-			char *msg;

-			clientcert->PreverifyErr = X509_STORE_CTX_get_error(ctx);

-			msg = (char *)X509_verify_cert_error_string(clientcert->PreverifyErr);

-			StrCpy(clientcert->PreverifyErrMessage, PREVERIFY_ERR_MESSAGE_SIZE, msg);

+			const char *msg = X509_verify_cert_error_string(clientcert->PreverifyErr);

+			StrCpy(clientcert->PreverifyErrMessage, PREVERIFY_ERR_MESSAGE_SIZE, (char *)msg);

 			Debug("SslCertVerifyCallback preverify error: '%s'\n", msg);

 		}

 		else

 		{

-			if (ctx->cert != NULL)

+			cert = X509_STORE_CTX_get0_cert(ctx);

+			if (cert != NULL)

 			{

-				X *tmpX = X509ToX(ctx->cert); // this only wraps ctx->cert, but we need to make a copy

+				X *tmpX = X509ToX(cert); // this only wraps cert, but we need to make a copy

 				X *copyX = CloneX(tmpX);

 				tmpX->do_not_free = true; // do not release inner X509 object

 				FreeX(tmpX);

diff --git a/src/bin/hamcore/vpnserver_api_doc.html b/src/bin/hamcore/vpnserver_api_doc.html
index 64e7f10c..dd7e7b6d 100644
--- a/src/bin/hamcore/vpnserver_api_doc.html
+++ b/src/bin/hamcore/vpnserver_api_doc.html
@@ -254,7 +254,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -324,7 +324,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -478,7 +478,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -696,7 +696,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -756,7 +756,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -813,7 +813,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -861,7 +861,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -907,7 +907,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -972,7 +972,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -1063,7 +1063,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -1174,7 +1174,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -1329,7 +1329,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -1437,7 +1437,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -1525,7 +1525,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -1570,7 +1570,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -1614,7 +1614,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -1655,7 +1655,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -1706,7 +1706,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -1782,7 +1782,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -1853,7 +1853,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -1988,7 +1988,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -2139,7 +2139,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -2184,7 +2184,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -2253,7 +2253,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -2338,7 +2338,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -2414,7 +2414,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -2466,7 +2466,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -2564,7 +2564,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -2633,7 +2633,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -2807,7 +2807,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -2882,7 +2882,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -2950,7 +2950,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -3016,7 +3016,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -3085,7 +3085,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -3138,7 +3138,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -3281,7 +3281,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -3641,7 +3641,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -4044,7 +4044,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -4380,7 +4380,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -4468,7 +4468,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -4516,7 +4516,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -4564,7 +4564,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -4614,7 +4614,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -4704,7 +4704,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -5009,7 +5009,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -5222,7 +5222,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -5375,7 +5375,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -5800,7 +5800,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -6125,7 +6125,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -6596,7 +6596,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -7016,7 +7016,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -7374,7 +7374,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -7485,7 +7485,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -7720,7 +7720,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -8110,7 +8110,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -8458,7 +8458,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -8756,7 +8756,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -8825,7 +8825,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -8964,7 +8964,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -9161,7 +9161,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -9454,7 +9454,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -9532,7 +9532,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -9620,7 +9620,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -9698,7 +9698,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -9786,7 +9786,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -9840,7 +9840,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -9903,7 +9903,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -9964,7 +9964,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -10005,7 +10005,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -10084,7 +10084,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -10239,7 +10239,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -10422,7 +10422,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -10562,7 +10562,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -10650,7 +10650,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -10737,7 +10737,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -10793,7 +10793,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -10859,7 +10859,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -10940,7 +10940,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -11005,7 +11005,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -11052,7 +11052,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -11122,7 +11122,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -11177,7 +11177,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -11224,7 +11224,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -11287,7 +11287,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -11365,7 +11365,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -11460,7 +11460,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -11538,7 +11538,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -11633,7 +11633,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -11694,7 +11694,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -11735,7 +11735,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -11796,7 +11796,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -11862,7 +11862,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -11903,7 +11903,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -11950,7 +11950,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -12010,7 +12010,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -12086,7 +12086,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -12160,7 +12160,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -12229,7 +12229,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -12313,7 +12313,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -12398,7 +12398,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -12473,7 +12473,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -12575,7 +12575,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -12677,7 +12677,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -12776,7 +12776,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -12919,7 +12919,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -13021,7 +13021,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -13114,7 +13114,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -13178,7 +13178,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -13238,7 +13238,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -13289,7 +13289,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -13342,7 +13342,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -13389,7 +13389,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -13436,7 +13436,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -13491,7 +13491,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -13538,7 +13538,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -13602,7 +13602,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -13665,7 +13665,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -13732,7 +13732,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -13791,7 +13791,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -13850,7 +13850,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -13923,7 +13923,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -13988,7 +13988,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -14039,7 +14039,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -14096,7 +14096,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -14180,7 +14180,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -14239,7 +14239,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -14296,7 +14296,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -14354,7 +14354,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -14399,7 +14399,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -14444,7 +14444,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -14491,7 +14491,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -14539,7 +14539,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -14608,7 +14608,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 <tr>

 <th>Name</th>

 <th>Type</th>

-<th>Descrption</th>

+<th>Description</th>

 </tr>

 </thead>

 <tbody>

@@ -14640,7 +14640,7 @@ All APIs are based on the <a href="https://www.jsonrpc.org/specification">JSON-R
 </tbody>

 </table>

 <hr />

-<p>Automatically generated at 2019-06-29 21:13:00 by vpnserver-jsonrpc-codegen.<br />

+<p>Automatically generated at 2019-07-10 14:36:11 by vpnserver-jsonrpc-codegen.<br />

 Copyright (c) 2014-2019 <a href="https://www.softether.org/">SoftEther VPN Project</a> under the Apache License 2.0.</p>

 

 	</article>

diff --git a/src/bin/vpnweb.cab b/src/bin/vpnweb.cab
index 2b3c0199..204e9140 100644
--- a/src/bin/vpnweb.cab
+++ b/src/bin/vpnweb.cab
diff --git a/src/bin/vpnweb.ocx b/src/bin/vpnweb.ocx
index 84c1fdab..74d11e51 100644
--- a/src/bin/vpnweb.ocx
+++ b/src/bin/vpnweb.ocx
diff --git a/src/vpnweb/vpnweb.h b/src/vpnweb/vpnweb.h
index 4328253d..30533a21 100644
--- a/src/vpnweb/vpnweb.h
+++ b/src/vpnweb/vpnweb.h
@@ -4,7 +4,7 @@
 

 

  /* File created by MIDL compiler version 7.00.0500 */

-/* at Mon Jul 08 12:10:02 2019

+/* at Sat Jul 13 21:38:11 2019

  */

 /* Compiler settings for .\vpnweb.idl:

     Oicf, W1, Zp8, env=Win32 (32b run)

diff --git a/src/vpnweb/vpnweb_i.c b/src/vpnweb/vpnweb_i.c
index 5dcfd3bb..d8db5a66 100644
--- a/src/vpnweb/vpnweb_i.c
+++ b/src/vpnweb/vpnweb_i.c
@@ -6,7 +6,7 @@
 

 

  /* File created by MIDL compiler version 7.00.0500 */

-/* at Mon Jul 08 12:10:02 2019

+/* at Sat Jul 13 21:38:11 2019

  */

 /* Compiler settings for .\vpnweb.idl:

     Oicf, W1, Zp8, env=Win32 (32b run)

diff --git a/src/vpnweb/vpnweb_p.c b/src/vpnweb/vpnweb_p.c
index aada7d05..a4909755 100644
--- a/src/vpnweb/vpnweb_p.c
+++ b/src/vpnweb/vpnweb_p.c
@@ -4,7 +4,7 @@
 

 

  /* File created by MIDL compiler version 7.00.0500 */

-/* at Mon Jul 08 12:10:02 2019

+/* at Sat Jul 13 21:38:11 2019

  */

 /* Compiler settings for .\vpnweb.idl:

     Oicf, W1, Zp8, env=Win32 (32b run)