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

Merge pull request #1887 from chipitsine/master

Browse Source 
additional error handling if SSL_CTX_new failed
This commit is contained in:
Ilya Shipitsin 2023-08-16 22:47:14 +02:00 committed by GitHub
commit 5d8ff7ed4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Cedar/Proto_OpenVPN.c
View File

@ -824,6 +824,10 @@ void OvsProcessRecvControlPacket(OPENVPN_SERVER *s, OPENVPN_SESSION *se, OPENVPN
} }
c->SslPipe = NewSslPipeEx(true, s->Cedar->ServerX, s->Cedar->ServerK, s->Dh, true, &c->ClientCert); c->SslPipe = NewSslPipeEx(true, s->Cedar->ServerX, s->Cedar->ServerK, s->Dh, true, &c->ClientCert);
if (c->SslPipe == NULL)
{
return;
}
} }
Unlock(s->Cedar->lock); Unlock(s->Cedar->lock);

6
src/Cedar/Proto_PPP.c
View File

@ -3635,6 +3635,12 @@ bool PPPProcessEAPTlsResponse(PPP_SESSION *p, PPP_EAP *eap_packet, UINT eapSize)
{ {
p->Eap_TlsCtx.Dh = DhNewFromBits(DH_PARAM_BITS_DEFAULT); p->Eap_TlsCtx.Dh = DhNewFromBits(DH_PARAM_BITS_DEFAULT);
p->Eap_TlsCtx.SslPipe = NewSslPipeEx3(true, p->Cedar->ServerX, p->Cedar->ServerK, p->Cedar->ServerChain, p->Eap_TlsCtx.Dh, true, &(p->Eap_TlsCtx.ClientCert), p->Eap_TlsCtx.Tls13SessionTicketsCount, p->Eap_TlsCtx.DisableTls13); p->Eap_TlsCtx.SslPipe = NewSslPipeEx3(true, p->Cedar->ServerX, p->Cedar->ServerK, p->Cedar->ServerChain, p->Eap_TlsCtx.Dh, true, &(p->Eap_TlsCtx.ClientCert), p->Eap_TlsCtx.Tls13SessionTicketsCount, p->Eap_TlsCtx.DisableTls13);
if (p->Eap_TlsCtx.SslPipe == NULL)
{
Debug("EAP-TLS: NewSslPipeEx3 failed\n");
PPPSetStatus(p, PPP_STATUS_FAIL);
return false;
}
} }
// If the current frame is fragmented, or it is a possible last of a fragmented series, bufferize it // If the current frame is fragmented, or it is a possible last of a fragmented series, bufferize it

5
src/Cedar/Radius.c
View File

@ -417,6 +417,11 @@ bool StartPeapSslClient(EAP_CLIENT *e)
} }
e->SslPipe = NewSslPipe(false, NULL, NULL, NULL); e->SslPipe = NewSslPipe(false, NULL, NULL, NULL);
if (e->SslPipe == NULL)
{
return false;
}
send_fifo = e->SslPipe->RawOut->RecvFifo; send_fifo = e->SslPipe->RawOut->RecvFifo;
recv_fifo = e->SslPipe->RawIn->SendFifo; recv_fifo = e->SslPipe->RawIn->SendFifo;

8
src/Mayaqua/Network.c
View File

@ -5724,6 +5724,10 @@ SSL_PIPE *NewSslPipeEx3(bool server_mode, X *x, K *k, LIST *chain, DH_CTX *dh, b
SSL_PIPE *s; SSL_PIPE *s;
SSL *ssl; SSL *ssl;
SSL_CTX *ssl_ctx = NewSSLCtx(server_mode); SSL_CTX *ssl_ctx = NewSSLCtx(server_mode);
if (ssl_ctx == NULL)
{
return NULL;
}
Lock(openssl_lock); Lock(openssl_lock);
{ {
@ -11727,6 +11731,10 @@ bool StartSSLEx3(SOCK *sock, X *x, K *priv, LIST *chain, UINT ssl_timeout, char
} }
ssl_ctx = NewSSLCtx(sock->ServerMode); ssl_ctx = NewSSLCtx(sock->ServerMode);
if (ssl_ctx == NULL)
{
return false;
}
Lock(openssl_lock); Lock(openssl_lock);
{ {