mirrors/ngircd
1
0
Fork 0
mirror of https://github.com/osmarks/ngircd.git synced 2024-12-13 10:20:28 +00:00
Code Issues Releases Wiki Activity

S2S-TLS/OpenSSL: Set the verification flags only once

Browse Source 
Set the verification flags in the ConnSSL_SetVerifyProperties_openssl
function only, don't override them in ConnSSL_InitLibrary() afterwards.

No functional changes, now ConnSSL_SetVerifyProperties_openssl() sets
exactly the parameters which ConnSSL_InitLibrary() always overwrote ...
This commit is contained in:
Alexander Barton 2024-01-02 20:55:15 +01:00
parent 84b019b11f
commit 08647ab1e7
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ngircd/conn-ssl.c
View File

@ -401,8 +401,6 @@ ConnSSL_InitLibrary( void )
SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1 | SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1 |
SSL_OP_NO_COMPRESSION); SSL_OP_NO_COMPRESSION);
SSL_CTX_set_mode(newctx, SSL_MODE_ENABLE_PARTIAL_WRITE); SSL_CTX_set_mode(newctx, SSL_MODE_ENABLE_PARTIAL_WRITE);
SSL_CTX_set_verify(newctx, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE,
Verify_openssl);
SSL_CTX_free(ssl_ctx); SSL_CTX_free(ssl_ctx);
ssl_ctx = newctx; ssl_ctx = newctx;
Log(LOG_INFO, "%s initialized.", OpenSSL_version(OPENSSL_VERSION)); Log(LOG_INFO, "%s initialized.", OpenSSL_version(OPENSSL_VERSION));
@ -615,7 +613,6 @@ ConnSSL_SetVerifyProperties_openssl(SSL_CTX * ctx)
{ {
X509_STORE *store = NULL; X509_STORE *store = NULL;
X509_LOOKUP *lookup; X509_LOOKUP *lookup;
int verify_flags = SSL_VERIFY_PEER;
bool ret = false; bool ret = false;
if (!Conf_SSLOptions.CAFile) if (!Conf_SSLOptions.CAFile)
@ -649,7 +646,8 @@ ConnSSL_SetVerifyProperties_openssl(SSL_CTX * ctx)
} }
} }
SSL_CTX_set_verify(ctx, verify_flags, Verify_openssl); SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE,
Verify_openssl);
SSL_CTX_set_verify_depth(ctx, MAX_CERT_CHAIN_LENGTH); SSL_CTX_set_verify_depth(ctx, MAX_CERT_CHAIN_LENGTH);
ret = true; ret = true;
out: out: