AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2025-06-28 20:05:08 +03:00
Code Releases Activity

v4.30-9700-beta

Browse Source
This commit is contained in:
dnobori 2019-07-14 11:15:10 +09:00
parent 9686292a6a
commit a81e4c2eb8
9 changed files with 155 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Cedar/Cedar.h
View File

@ -129,7 +129,7 @@
#define CEDAR_VER 430 #define CEDAR_VER 430
// Build Number // Build Number
#define CEDAR_BUILD 9696 #define CEDAR_BUILD 9700
// Beta number // Beta number
//#define BETA_NUMBER 3 //#define BETA_NUMBER 3
@ -150,10 +150,10 @@
// Specifies the build date // Specifies the build date
#define BUILD_DATE_Y 2019 #define BUILD_DATE_Y 2019
#define BUILD_DATE_M 7 #define BUILD_DATE_M 7
#define BUILD_DATE_D 8 #define BUILD_DATE_D 13
#define BUILD_DATE_HO 12 #define BUILD_DATE_HO 21
#define BUILD_DATE_MI 9 #define BUILD_DATE_MI 37
#define BUILD_DATE_SE 40 #define BUILD_DATE_SE 51
// Tolerable time difference // Tolerable time difference
#define ALLOW_TIMESTAMP_DIFF (UINT64)(3 * 24 * 60 * 60 * 1000) #define ALLOW_TIMESTAMP_DIFF (UINT64)(3 * 24 * 60 * 60 * 1000)

4
src/CurrentBuild.txt
View File

@ -1,4 +1,4 @@
BUILD_NUMBER 9696 BUILD_NUMBER 9700
VERSION 430 VERSION 430
BUILD_NAME beta BUILD_NAME beta
BUILD_DATE 20190708_120940 BUILD_DATE 20190713_213751

18
src/Mayaqua/Network.c
View File

@ -5946,6 +5946,10 @@ int cb_test(int a, X509_STORE_CTX *ctx)
return 1; return 1;
} }
#if OPENSSL_VERSION_NUMBER < 0x10100000L
#define X509_STORE_CTX_get0_cert(o) ((o)->cert)
#endif
// Verify client SSL certificate during TLS handshake. // Verify client SSL certificate during TLS handshake.
// //
// (actually, only save the certificate for later authentication in Protocol.c) // (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; SSL *ssl;
struct SslClientCertInfo *clientcert; struct SslClientCertInfo *clientcert;
X509 *cert;
ssl = X509_STORE_CTX_get_ex_data(ctx, SSL_get_ex_data_X509_STORE_CTX_idx()); ssl = X509_STORE_CTX_get_ex_data(ctx, SSL_get_ex_data_X509_STORE_CTX_idx());
clientcert = SSL_get_ex_data(ssl, GetSslClientCertIndex()); clientcert = SSL_get_ex_data(ssl, GetSslClientCertIndex());
if (clientcert != NULL) if (clientcert != NULL)
{ {
clientcert->PreverifyErr = 0; clientcert->PreverifyErr = X509_STORE_CTX_get_error(ctx);
clientcert->PreverifyErrMessage[0] = '\0'; clientcert->PreverifyErrMessage[0] = '\0';
if (!preverify_ok) if (!preverify_ok)
{ {
char *msg; const char *msg = X509_verify_cert_error_string(clientcert->PreverifyErr);
clientcert->PreverifyErr = X509_STORE_CTX_get_error(ctx); StrCpy(clientcert->PreverifyErrMessage, PREVERIFY_ERR_MESSAGE_SIZE, (char *)msg);
msg = (char *)X509_verify_cert_error_string(clientcert->PreverifyErr);
StrCpy(clientcert->PreverifyErrMessage, PREVERIFY_ERR_MESSAGE_SIZE, msg);
Debug("SslCertVerifyCallback preverify error: '%s'\n", msg); Debug("SslCertVerifyCallback preverify error: '%s'\n", msg);
} }
else 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); X *copyX = CloneX(tmpX);
tmpX->do_not_free = true; // do not release inner X509 object tmpX->do_not_free = true; // do not release inner X509 object
FreeX(tmpX); FreeX(tmpX);

268
src/bin/hamcore/vpnserver_api_doc.html
View File

File diff suppressed because it is too large Load Diff

BIN
src/bin/vpnweb.cab
View File

Binary file not shown.

BIN
src/bin/vpnweb.ocx
View File

Binary file not shown.

2
src/vpnweb/vpnweb.h
View File

@ -4,7 +4,7 @@
/* File created by MIDL compiler version 7.00.0500 */ /* 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: /* Compiler settings for .\vpnweb.idl:
Oicf, W1, Zp8, env=Win32 (32b run) Oicf, W1, Zp8, env=Win32 (32b run)

2
src/vpnweb/vpnweb_i.c
View File

@ -6,7 +6,7 @@
/* File created by MIDL compiler version 7.00.0500 */ /* 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: /* Compiler settings for .\vpnweb.idl:
Oicf, W1, Zp8, env=Win32 (32b run) Oicf, W1, Zp8, env=Win32 (32b run)

2
src/vpnweb/vpnweb_p.c
View File

@ -4,7 +4,7 @@
/* File created by MIDL compiler version 7.00.0500 */ /* 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: /* Compiler settings for .\vpnweb.idl:
Oicf, W1, Zp8, env=Win32 (32b run) Oicf, W1, Zp8, env=Win32 (32b run)