diff --git a/src/networking/HTTPSRequest.cpp b/src/networking/HTTPSRequest.cpp index 93615c6e4c743279b6cc279a26f85ae810ee66f6..fe7d84f79bc7127b89b591b13ebc881e4a2466c9 100644 --- a/src/networking/HTTPSRequest.cpp +++ b/src/networking/HTTPSRequest.cpp @@ -45,7 +45,7 @@ bool HTTPSRequest::sendRequest(std::function<void(const HTTPResponse&)> response mbedtls_ssl_conf_authmode(&conf, MBEDTLS_SSL_VERIFY_REQUIRED); mbedtls_ssl_conf_rng(&conf, mbedtls_ctr_drbg_random, &ctr_drbg); - mbedtls_ssl_conf_ca_chain( &conf, &cacert, NULL ); + mbedtls_ssl_conf_ca_chain( &conf, &cacert, nullptr ); if( mbedtls_ssl_setup( &ssl, &conf ) != 0 ) { @@ -56,7 +56,7 @@ bool HTTPSRequest::sendRequest(std::function<void(const HTTPResponse&)> response return false; } - mbedtls_ssl_set_bio( &ssl, &server_fd, mbedtls_net_send, mbedtls_net_recv, NULL ); + mbedtls_ssl_set_bio( &ssl, &server_fd, mbedtls_net_send, mbedtls_net_recv, nullptr ); int state = mbedtls_ssl_handshake( &ssl ); while(state != 0) @@ -76,7 +76,7 @@ bool HTTPSRequest::sendRequest(std::function<void(const HTTPResponse&)> response const std::string request = methodToString(method) + std::string(" ") + document + std::string(" ") + versionToString(version) + std::string("\r\nHost: ") + host + std::string("\r\nUser-Agent: ") + userAgent + std::string("\r\n\r\n"); - while( ( state = mbedtls_ssl_write( &ssl, (const unsigned char*)request.c_str(), request.length() ) ) <= 0 ) + while( ( state = mbedtls_ssl_write( &ssl, reinterpret_cast<const unsigned char*>(request.c_str()), request.length() ) ) <= 0 ) { if( state != MBEDTLS_ERR_SSL_WANT_READ && ret != MBEDTLS_ERR_SSL_WANT_WRITE ) { @@ -87,7 +87,7 @@ bool HTTPSRequest::sendRequest(std::function<void(const HTTPResponse&)> response do { - ret = mbedtls_ssl_read( &ssl, (unsigned char*)buffer, 512 ); + ret = mbedtls_ssl_read( &ssl, reinterpret_cast<unsigned char *>(buffer), 512 ); if (ret <= 0) break; else @@ -137,7 +137,7 @@ bool HTTPSRequest::initTLS() const char *seed = "netrunner_ssl_seed$%?rvx86_despair^^%$#@"; mbedtls_entropy_init( &entropy ); - if(mbedtls_ctr_drbg_seed( &ctr_drbg, mbedtls_entropy_func, &entropy, (const unsigned char*)seed, strlen(seed) ) != 0 ) + if(mbedtls_ctr_drbg_seed( &ctr_drbg, mbedtls_entropy_func, &entropy, reinterpret_cast<const unsigned char*>(seed), strlen(seed) ) != 0 ) { return false; } @@ -149,4 +149,4 @@ bool HTTPSRequest::initTLS() return false; } return true; -} \ No newline at end of file +} diff --git a/src/networking/HTTPSRequest.h b/src/networking/HTTPSRequest.h index 2ce2eece23f341d99c79f999b179935275f1797c..0e5b8937a1ba7561e56f24639d4202214922bff7 100644 --- a/src/networking/HTTPSRequest.h +++ b/src/networking/HTTPSRequest.h @@ -2,7 +2,7 @@ #define HTTPSREQUEST_H #include "HTTPCommon.h" -#include "httpResponse.h" +#include "HTTPResponse.h" #include "../URL.h" #include <functional> #include <string>