diff --git a/src/proxy/tinymitm/ssl.cpp b/src/proxy/tinymitm/ssl.cpp index e6139f7..051cf00 100644 --- a/src/proxy/tinymitm/ssl.cpp +++ b/src/proxy/tinymitm/ssl.cpp @@ -86,16 +86,16 @@ WOLFSSL_CTX* CertificateManager::createHostContext(const std::string& host) sanDer.insert(sanDer.end(), hostTrimmed.begin(), hostTrimmed.end()); memcpy(cert->altNames, sanDer.data(), sanDer.size()); - cert->altNamesSz = (word16)sanDer.size(); + cert->altNamesSz = static_cast(sanDer.size()); /* cert sign */ std::vector hostCertDer(4096); int certLen = - wc_MakeCert(cert.get(), hostCertDer.data(), (word32)hostCertDer.size(), _sessionKey.get(), nullptr, _rng.get()); + wc_MakeCert(cert.get(), hostCertDer.data(), static_cast(hostCertDer.size()), _sessionKey.get(), nullptr, _rng.get()); - certLen = wc_SignCert(cert->bodySz, cert->sigType, hostCertDer.data(), (word32)hostCertDer.size(), _caKey.get(), + certLen = wc_SignCert(cert->bodySz, cert->sigType, hostCertDer.data(), static_cast(hostCertDer.size()), _caKey.get(), nullptr, _rng.get()); hostCertDer.resize(certLen); @@ -104,9 +104,9 @@ WOLFSSL_CTX* CertificateManager::createHostContext(const std::string& host) */ WOLFSSL_CTX* ctx = wolfSSL_CTX_new(wolfSSLv23_server_method()); if (!ctx) return nullptr; - if (wolfSSL_CTX_use_certificate_buffer(ctx, hostCertDer.data(), (long)hostCertDer.size(), WOLFSSL_FILETYPE_ASN1) != + if (wolfSSL_CTX_use_certificate_buffer(ctx, hostCertDer.data(), static_cast(hostCertDer.size()), WOLFSSL_FILETYPE_ASN1) != WOLFSSL_SUCCESS || - wolfSSL_CTX_use_PrivateKey_buffer(ctx, _sessionKeyDer.data(), (long)_sessionKeyDer.size(), + wolfSSL_CTX_use_PrivateKey_buffer(ctx, _sessionKeyDer.data(), static_cast(_sessionKeyDer.size()), WOLFSSL_FILETYPE_ASN1) != WOLFSSL_SUCCESS) { wolfSSL_CTX_free(ctx); @@ -202,7 +202,7 @@ bool CertificateManager::generateAndSaveCA(const char* caName, int days, const s std::ofstream kOut(keyPath, std::ios::binary); if (!kOut.is_open()) return false; - kOut.write((char*)keyPem.data(), keyPemLen); + kOut.write(reinterpret_cast(keyPem.data()), keyPemLen); std::vector certPem(4096); int certPemLen = wc_DerToPem(_caCertDer.data(), static_cast(_caCertDer.size()), certPem.data(), @@ -226,7 +226,7 @@ bool CertificateManager::loadCA(const char* certPath, const char* keyPath) std::streamsize size = file.tellg(); file.seekg(0, std::ios::beg); std::vector buffer((size_t)size); - if (file.read((char*)buffer.data(), size)) return buffer; + if (file.read(reinterpret_cast(buffer.data()), size)) return buffer; return {}; }; @@ -239,7 +239,7 @@ bool CertificateManager::loadCA(const char* certPath, const char* keyPath) std::vector keyDer; DerBuffer* derBuff = nullptr; - int ret = wc_PemToDer(certPem.data(), (long)certPem.size(), CERT_TYPE, &derBuff, nullptr, nullptr, nullptr); + int ret = wc_PemToDer(certPem.data(), static_cast(certPem.size()), CERT_TYPE, &derBuff, nullptr, nullptr, nullptr); if (ret == 0 && derBuff) { certDer.assign(derBuff->buffer, derBuff->buffer + derBuff->length); @@ -250,7 +250,7 @@ bool CertificateManager::loadCA(const char* certPath, const char* keyPath) return false; derBuff = nullptr; - ret = wc_PemToDer(keyPem.data(), (long)keyPem.size(), PRIVATEKEY_TYPE, &derBuff, nullptr, nullptr, nullptr); + ret = wc_PemToDer(keyPem.data(), static_cast(keyPem.size()), PRIVATEKEY_TYPE, &derBuff, nullptr, nullptr, nullptr); if (ret == 0 && derBuff) { keyDer.assign(derBuff->buffer, derBuff->buffer + derBuff->length); @@ -276,7 +276,7 @@ bool CertificateManager::decodeCA(const std::vector& certDer, con std::unique_ptr tempKey(rawKey, RAAIHelper()); word32 idx = 0; - int ret = wc_RsaPrivateKeyDecode(keyDer.data(), &idx, tempKey.get(), (word32)keyDer.size()); + int ret = wc_RsaPrivateKeyDecode(keyDer.data(), &idx, tempKey.get(), static_cast(keyDer.size())); if (ret != 0) return false;