summaryrefslogtreecommitdiff
path: root/ACE/ace/SSL
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2010-09-13 18:24:51 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2010-09-13 18:24:51 +0000
commit93bd37499c0f1ea062d123a8425c7157503510e2 (patch)
tree29cdfc1a8d692b206a02154d887747a5249dfd30 /ACE/ace/SSL
parented8291d8da71da82a9d8f1e05a516d844bcb103b (diff)
downloadATCD-93bd37499c0f1ea062d123a8425c7157503510e2.tar.gz
Mon Sep 13 18:15:27 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
*: Zapped trailing whitespaces using find -name \*.h -o -name \*.cpp -name \*.inl | xargs perl -i -pe's/\s+\n/\n/'
Diffstat (limited to 'ACE/ace/SSL')
-rw-r--r--ACE/ace/SSL/SSL_Asynch_Stream.h12
-rw-r--r--ACE/ace/SSL/SSL_SOCK_Stream.h2
2 files changed, 7 insertions, 7 deletions
diff --git a/ACE/ace/SSL/SSL_Asynch_Stream.h b/ACE/ace/SSL/SSL_Asynch_Stream.h
index 1957c023468..29da8944cdc 100644
--- a/ACE/ace/SSL/SSL_Asynch_Stream.h
+++ b/ACE/ace/SSL/SSL_Asynch_Stream.h
@@ -306,13 +306,13 @@ protected:
*
* Check 1:
*
- * SSL clients that require a peer certificate must specify SSL_VERIFY_PEER
+ * SSL clients that require a peer certificate must specify SSL_VERIFY_PEER
* via ACE_SSL_Context::default_verify_mode. If the peer sends an invalid
* certificate, the SSL handshake will fail; however, if the peer does not
- * send a certificate, the SSL handshake will complete successfully which
+ * send a certificate, the SSL handshake will complete successfully which
* may not be acceptable. In this case, you must override this method in a
* subclass and return false if the call to SSL_get_peer_certificate returns
- * null.
+ * null.
*
* Check 2:
*
@@ -322,10 +322,10 @@ protected:
* by your CA to usurp your session. For further info on this check, see
* the post_connection_check method in Example 5-8 of 'Network Security with
* OpenSSL' by Viega, et. al.
- *
+ *
* Return:
- *
- * false - Terminate the connection. Outstanding IO complete with ERR_CANCELED.
+ *
+ * false - Terminate the connection. Outstanding IO complete with ERR_CANCELED.
*
* true - Proceed with connection. The default implementation returns true.
*/
diff --git a/ACE/ace/SSL/SSL_SOCK_Stream.h b/ACE/ace/SSL/SSL_SOCK_Stream.h
index f7a7da788bd..c3d8da6faed 100644
--- a/ACE/ace/SSL/SSL_SOCK_Stream.h
+++ b/ACE/ace/SSL/SSL_SOCK_Stream.h
@@ -233,7 +233,7 @@ public:
int flags,
const ACE_Time_Value *timeout,
size_t *bytes_transferred = 0) const;
-
+
/**
* Try to receive exactly len bytes into buf (uses the recv() call).
* The ACE_Time_Value indicates how long to blocking trying to