diff options
Diffstat (limited to 'src/ssl')
| -rw-r--r-- | src/ssl/cert_ver.cpp | 2 | ||||
| -rw-r--r-- | src/ssl/rec_wri.cpp | 2 | ||||
| -rw-r--r-- | src/ssl/s_kex.cpp | 2 | ||||
| -rw-r--r-- | src/ssl/tls_suites.cpp | 9 |
4 files changed, 9 insertions, 6 deletions
diff --git a/src/ssl/cert_ver.cpp b/src/ssl/cert_ver.cpp index d1d39f74e..dfcf6c7c3 100644 --- a/src/ssl/cert_ver.cpp +++ b/src/ssl/cert_ver.cpp @@ -75,7 +75,7 @@ bool Certificate_Verify::verify(const X509_Certificate& cert, { // FIXME: duplicate of Server_Key_Exchange::verify - std::auto_ptr<Public_Key> key(cert.subject_public_key()); + std::unique_ptr<Public_Key> key(cert.subject_public_key()); std::string padding = ""; Signature_Format format = IEEE_1363; diff --git a/src/ssl/rec_wri.cpp b/src/ssl/rec_wri.cpp index d5358f4c3..2ee0e20d3 100644 --- a/src/ssl/rec_wri.cpp +++ b/src/ssl/rec_wri.cpp @@ -266,7 +266,7 @@ void Record_Writer::send_record(byte type, byte major, byte minor, */ void Record_Writer::alert(Alert_Level level, Alert_Type type) { - byte alert[2] = { level, type }; + byte alert[2] = { (byte)level, (byte)type }; send(ALERT, alert, sizeof(alert)); flush(); } diff --git a/src/ssl/s_kex.cpp b/src/ssl/s_kex.cpp index bf0a25c62..4617d9fb4 100644 --- a/src/ssl/s_kex.cpp +++ b/src/ssl/s_kex.cpp @@ -157,7 +157,7 @@ bool Server_Key_Exchange::verify(const X509_Certificate& cert, const MemoryRegion<byte>& s_random) const { - std::auto_ptr<Public_Key> key(cert.subject_public_key()); + std::unique_ptr<Public_Key> key(cert.subject_public_key()); std::string padding = ""; Signature_Format format = IEEE_1363; diff --git a/src/ssl/tls_suites.cpp b/src/ssl/tls_suites.cpp index a6e630717..56e8fee01 100644 --- a/src/ssl/tls_suites.cpp +++ b/src/ssl/tls_suites.cpp @@ -230,7 +230,8 @@ std::pair<std::string, u32bit> cipher_code_to_name(TLS_Ciphersuite_Algos algo) return std::make_pair("SEED", 16); throw TLS_Exception(INTERNAL_ERROR, - "CipherSuite: Unknown cipher type " + to_string(algo)); + "CipherSuite: Unknown cipher type " + + std::to_string(algo)); } std::string mac_code_to_name(TLS_Ciphersuite_Algos algo) @@ -248,7 +249,8 @@ std::string mac_code_to_name(TLS_Ciphersuite_Algos algo) return "SHA-384"; throw TLS_Exception(INTERNAL_ERROR, - "CipherSuite: Unknown MAC type " + to_string(algo)); + "CipherSuite: Unknown MAC type " + + std::to_string(algo)); } } @@ -264,7 +266,8 @@ CipherSuite::CipherSuite(u16bit suite_code) TLS_Ciphersuite_Algos algos = lookup_ciphersuite(suite_code); if(algos == 0) - throw Invalid_Argument("Unknown ciphersuite: " + to_string(suite_code)); + throw Invalid_Argument("Unknown ciphersuite: " + + std::to_string(suite_code)); sig_algo = TLS_Ciphersuite_Algos(algos & TLS_ALGO_SIGNER_MASK); |