diff options
author | Costa Tsaousis <costa@netdata.cloud> | 2022-10-05 14:59:25 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-05 14:59:25 +0300 |
commit | ecbf10c87ca0d4296ecb0cf8e485b68a15ba9613 (patch) | |
tree | abab301b989aa1dbc198b6a6597d7f86804bfae3 /libnetdata | |
parent | 8fc3b351a2e7fc96eced8f924de2e9cec9842128 (diff) |
fix bad merge (#13764)
* fix bad merge
* fix for ssl_security_cert
Diffstat (limited to 'libnetdata')
-rw-r--r-- | libnetdata/socket/security.c | 10 | ||||
-rw-r--r-- | libnetdata/socket/security.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libnetdata/socket/security.c b/libnetdata/socket/security.c index f229b7aa36..3ba964ee70 100644 --- a/libnetdata/socket/security.c +++ b/libnetdata/socket/security.c @@ -5,8 +5,8 @@ SSL_CTX *netdata_ssl_exporting_ctx =NULL; SSL_CTX *netdata_ssl_client_ctx =NULL; SSL_CTX *netdata_ssl_srv_ctx =NULL; -const char *ssl_security_key =NULL; -const char *ssl_security_cert =NULL; +const char *netdata_ssl_security_key =NULL; +const char *netdata_ssl_security_cert =NULL; const char *tls_version=NULL; const char *tls_ciphers=NULL; int netdata_ssl_validate_server = NETDATA_SSL_VALID_CERTIFICATE; @@ -169,11 +169,11 @@ static SSL_CTX * security_initialize_openssl_server() { return NULL; } - SSL_CTX_use_certificate_chain_file(ctx, ssl_security_cert); + SSL_CTX_use_certificate_chain_file(ctx, netdata_ssl_security_cert); #endif security_openssl_common_options(ctx, 0); - SSL_CTX_use_PrivateKey_file(ctx, ssl_security_key,SSL_FILETYPE_PEM); + SSL_CTX_use_PrivateKey_file(ctx, netdata_ssl_security_key,SSL_FILETYPE_PEM); if (!SSL_CTX_check_private_key(ctx)) { ERR_error_string_n(ERR_get_error(),lerror,sizeof(lerror)); @@ -207,7 +207,7 @@ void security_start_ssl(int selector) { switch (selector) { case NETDATA_SSL_CONTEXT_SERVER: { struct stat statbuf; - if (stat(ssl_security_key, &statbuf) || stat(ssl_security_cert, &statbuf)) { + if (stat(netdata_ssl_security_key, &statbuf) || stat(netdata_ssl_security_cert, &statbuf)) { info("To use encryption it is necessary to set \"ssl certificate\" and \"ssl key\" in [web] !\n"); return; } diff --git a/libnetdata/socket/security.h b/libnetdata/socket/security.h index a9b41fac46..5c9842e07a 100644 --- a/libnetdata/socket/security.h +++ b/libnetdata/socket/security.h @@ -45,8 +45,8 @@ struct netdata_ssl{ extern SSL_CTX *netdata_ssl_exporting_ctx; extern SSL_CTX *netdata_ssl_client_ctx; extern SSL_CTX *netdata_ssl_srv_ctx; -extern const char *ssl_security_key; -extern const char *ssl_security_cert; +extern const char *netdata_ssl_security_key; +extern const char *netdata_ssl_security_cert; extern const char *tls_version; extern const char *tls_ciphers; extern int netdata_ssl_validate_server; |