AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-23 01:49:53 +03:00
Code Releases Activity

Fix compilation with OpenSSL 1.1.0 (broken in #327) (#476)

Browse Source
This commit is contained in:
Alexey Kryuchkov 2018-04-07 22:42:08 +03:00 committed by Moataz Elmasry
parent 2c64df848d
commit 9b19949614
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Mayaqua/Network.c
View File

@ -5809,6 +5809,11 @@ SOCK *ListenAnyPortEx2(bool local_only, bool disable_ca)
return NULL; return NULL;
} }
#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)
@ -5816,6 +5821,7 @@ 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());
@ -5833,9 +5839,10 @@ int SslCertVerifyCallback(int preverify_ok, X509_STORE_CTX *ctx)
} }
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);