diff options
| author | Claudius 'keldu' Holeksa <mail@keldu.de> | 2024-10-18 20:51:30 +0200 |
|---|---|---|
| committer | Claudius 'keldu' Holeksa <mail@keldu.de> | 2024-10-18 20:51:30 +0200 |
| commit | 7ea851ddceafb03a6a789451063c0158f2df25a7 (patch) | |
| tree | ba7a29d5399deb248c194eba3d64669d151d58f6 | |
| parent | 0a374c58a6859c962ca8d779490c379a643180a9 (diff) | |
Forgot I need to provide const char* and not strings
| -rw-r--r-- | modules/io-tls/c++/tls.hpp | 2 | ||||
| -rw-r--r-- | modules/io-tls/c++/tls.tmpl.hpp | 17 |
2 files changed, 10 insertions, 9 deletions
diff --git a/modules/io-tls/c++/tls.hpp b/modules/io-tls/c++/tls.hpp index 5082ee9..df21c81 100644 --- a/modules/io-tls/c++/tls.hpp +++ b/modules/io-tls/c++/tls.hpp @@ -77,7 +77,7 @@ public: /** * Set up a listener on this address */ - virtual error_or<own<server<net::Tls<T>>>> listen(network_address<net::Tls<T>> &bind_addr) = 0; + virtual error_or<own<server<net::Tls<T>>>> listen(network_address<net::Tls<T>> &bind_addr, const std::string& key_file) = 0; /** * Connect to a remote address diff --git a/modules/io-tls/c++/tls.tmpl.hpp b/modules/io-tls/c++/tls.tmpl.hpp index d76e482..8c2ba83 100644 --- a/modules/io-tls/c++/tls.tmpl.hpp +++ b/modules/io-tls/c++/tls.tmpl.hpp @@ -202,16 +202,17 @@ error_or<own<server<net::Tls<T>>>> tls_network<T>::listen(network_address<net::T gnutls_certificate_credentials_t x509_cred; gnutls_certificate_allocate_credentials(&x509_cred); - std::string_view KEYFILE = "key.pem"; - std::string_view CERTFILE = "cert.pem"; - std::string_view CAFILE = "/etc/ssl/certs/ca-certificates.crt"; - std::string_view CRLFILE = "crl.pem"; + std::string KEYFILE = "key.pem"; + std::string CERTFILE = "cert.pem"; + std::string CAFILE = "/etc/ssl/certs/ca-certificates.crt"; + std::string CRLFILE = "crl.pem"; + std::string OCSP_STATUS_FILE = "ocsp-status.der"; - gnutls_certificate_set_x509_trust_file(x509_cred, CAFILE, GNUTLS_X509_FMT_PEM); - gnutls_certificate_set_x509_crl_file(x509_cred, CRLFILE, GNUTLS_X509_FMT_PEM); - gnutls_certificate_set_x509_key_file(x509_cred, CERTFILE, KEYFILE, GNUTLS_X509_FMT_PEM); + gnutls_certificate_set_x509_trust_file(x509_cred, CAFILE.c_str(), GNUTLS_X509_FMT_PEM); + gnutls_certificate_set_x509_crl_file(x509_cred, CRLFILE.c_str(), GNUTLS_X509_FMT_PEM); + gnutls_certificate_set_x509_key_file(x509_cred, CERTFILE.c_str(), KEYFILE.c_str(), GNUTLS_X509_FMT_PEM); - gnutls_certificate_set_x509_ocsp_status_request_file(x509_cred, OCSP_STATUS_FILE, 0); + gnutls_certificate_set_ocsp_status_request_file(x509_cred, OCSP_STATUS_FILE.c_str(), 0); auto int_srv = internal_().listen(address.get_handle()); |