diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-05-14 10:01:29 +0200 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-05-14 10:01:29 +0200 |
commit | 2d366e54e7a507b6b3dfa4c3c8bc29f55e62785e (patch) | |
tree | 34bfe092eedb7f65647e9a204587d2656210a517 /ACE/ace | |
parent | db3c5ecbc94edb3feca008433aeeb34f9c289b2d (diff) | |
download | ATCD-2d366e54e7a507b6b3dfa4c3c8bc29f55e62785e.tar.gz |
Layout, const, logging, doxygen changes
* ACE/ace/SSL/SSL_Asynch_Stream.cpp:
* ACE/ace/SSL/SSL_Context.cpp:
* ACE/examples/IPC_SAP/SSL_SAP/README:
* ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.h:
* ACE/examples/IPC_SAP/SSL_SAP/SSL-client.h:
* ACE/examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp:
* ACE/examples/IPC_SAP/SSL_SAP/SSL-server.cpp:
* ACE/tests/SSL/Bug_2912_Regression_Test.cpp:
* ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp:
* ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.h:
* TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp:
Diffstat (limited to 'ACE/ace')
-rw-r--r-- | ACE/ace/SSL/SSL_Asynch_Stream.cpp | 7 | ||||
-rw-r--r-- | ACE/ace/SSL/SSL_Context.cpp | 11 |
2 files changed, 5 insertions, 13 deletions
diff --git a/ACE/ace/SSL/SSL_Asynch_Stream.cpp b/ACE/ace/SSL/SSL_Asynch_Stream.cpp index b493e98a750..f084c5375e7 100644 --- a/ACE/ace/SSL/SSL_Asynch_Stream.cpp +++ b/ACE/ace/SSL/SSL_Asynch_Stream.cpp @@ -256,7 +256,6 @@ ACE_SSL_Asynch_Stream::open (ACE_Handler & handler, ACE_TEXT ("- invalid handle")), -1); - // Get a proactor for/from the user. this->proactor_ = this->get_proactor (proactor, handler); this->ext_handler_ = & handler; @@ -407,8 +406,7 @@ ACE_SSL_Asynch_Stream::do_SSL_state_machine (void) { // this protected member should be called // with locked mutex_ - - int retval = this->do_SSL_handshake (); + int const retval = this->do_SSL_handshake (); if (retval == 0) // handshake in progress ? return 0; @@ -527,7 +525,7 @@ ACE_SSL_Asynch_Stream::do_SSL_handshake (void) -1); } - int status = ::SSL_get_error (this->ssl_, retval); + int const status = ::SSL_get_error (this->ssl_, retval); switch (status) { @@ -552,7 +550,6 @@ ACE_SSL_Asynch_Stream::do_SSL_handshake (void) return 1; } - bool ACE_SSL_Asynch_Stream::post_handshake_check (void) { diff --git a/ACE/ace/SSL/SSL_Context.cpp b/ACE/ace/SSL/SSL_Context.cpp index bbbfb632541..e0d6530f426 100644 --- a/ACE/ace/SSL/SSL_Context.cpp +++ b/ACE/ace/SSL/SSL_Context.cpp @@ -352,7 +352,6 @@ ACE_SSL_Context::filter_versions (const char* versionlist) return 0; } - bool ACE_SSL_Context::check_host (const ACE_INET_Addr &host, SSL *peerssl) { @@ -360,7 +359,6 @@ ACE_SSL_Context::check_host (const ACE_INET_Addr &host, SSL *peerssl) this->check_context (); - int result = 0; char name[MAXHOSTNAMELEN+1]; if (peerssl == 0 || host.get_host_name (name, MAXHOSTNAMELEN) == -1) @@ -379,13 +377,13 @@ ACE_SSL_Context::check_host (const ACE_INET_Addr &host, SSL *peerssl) int flags = X509_CHECK_FLAG_ALWAYS_CHECK_SUBJECT; size_t len = ACE_OS::strlen (name); - result = ::X509_check_host (cert, name, len, flags, peerarg); + int const result = ::X509_check_host (cert, name, len, flags, peerarg); if (ACE::debug ()) { ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) SSL_Context::check_host ") - ACE_TEXT ("name <%s> returns %d, peer <%s>\n"), + ACE_TEXT ("name <%C> returns %d, peer <%s>\n"), name, result, peer)); } if (peer != 0) @@ -516,7 +514,6 @@ ACE_SSL_Context::load_trusted_ca (const char* ca_file, return 0; } - int ACE_SSL_Context::private_key (const char *file_name, int type) @@ -598,8 +595,7 @@ ACE_SSL_Context::set_verify_peer (int strict, int once, int depth) { this->check_context (); - // Setup the peer verififcation mode. - + // Setup the peer verification mode. int verify_mode = SSL_VERIFY_PEER; if (once) verify_mode |= SSL_VERIFY_CLIENT_ONCE; @@ -615,7 +611,6 @@ ACE_SSL_Context::set_verify_peer (int strict, int once, int depth) ::SSL_CTX_set_verify_depth (this->context_, depth + 1); } - int ACE_SSL_Context::random_seed (const char * seed) { |