diff options
| author | lloyd <[email protected]> | 2014-12-22 01:29:35 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2014-12-22 01:29:35 +0000 |
| commit | 5cfab2d7b0cc5931a09a35745780cf95a0413801 (patch) | |
| tree | 47654d8e63d2c271f80194455b8f89513bb877fb | |
| parent | e6af27a8be91db29b44c7a15eb762c6547275506 (diff) | |
Fix a couple things pointed out by VC++ warnings.
| -rw-r--r-- | src/lib/cert/x509/x509_ca.cpp | 7 | ||||
| -rw-r--r-- | src/lib/tls/msg_client_kex.cpp | 4 |
2 files changed, 3 insertions, 8 deletions
diff --git a/src/lib/cert/x509/x509_ca.cpp b/src/lib/cert/x509/x509_ca.cpp index 2857072ea..3a849a29f 100644 --- a/src/lib/cert/x509/x509_ca.cpp +++ b/src/lib/cert/x509/x509_ca.cpp @@ -101,7 +101,7 @@ X509_Certificate X509_CA::make_cert(PK_Signer* signer, BigInt serial_no(rng, SERIAL_BITS); - const std::vector<byte> cert = X509_Object::make_signed( + return X509_Certificate(X509_Object::make_signed( signer, rng, sig_algo, DER_Encoder().start_cons(SEQUENCE) .start_explicit(0) @@ -127,9 +127,8 @@ X509_Certificate X509_CA::make_cert(PK_Signer* signer, .end_cons() .end_explicit() .end_cons() - .get_contents()); - - return X509_Certificate(cert); + .get_contents() + ));; } /* diff --git a/src/lib/tls/msg_client_kex.cpp b/src/lib/tls/msg_client_kex.cpp index a6368bb50..3ca455b6b 100644 --- a/src/lib/tls/msg_client_kex.cpp +++ b/src/lib/tls/msg_client_kex.cpp @@ -65,8 +65,6 @@ Client_Key_Exchange::Client_Key_Exchange(Handshake_IO& io, identity_hint = reader.get_string(2, 0, 65535); } - const std::string hostname = state.client_hello()->sni_hostname(); - const std::string psk_identity = creds.psk_identity("tls-client", hostname, identity_hint); @@ -90,8 +88,6 @@ Client_Key_Exchange::Client_Key_Exchange(Handshake_IO& io, { std::string identity_hint = reader.get_string(2, 0, 65535); - const std::string hostname = state.client_hello()->sni_hostname(); - const std::string psk_identity = creds.psk_identity("tls-client", hostname, identity_hint); |