diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2000-07-13 13:52:51 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2000-07-13 13:52:51 +0000 |
| commit | 0cd2918c2ac1af013082b8bbc661aa52489eade2 (patch) | |
| tree | 5b9e668ffcffb5ec8c552703b4380c2801756d3f | |
| parent | c44dcd45e452ce4bd204b92a11605d276849dd51 (diff) | |
| download | ATCD-0cd2918c2ac1af013082b8bbc661aa52489eade2.tar.gz | |
ChangeLogTag:Thu Jul 13 09:33:45 2000 Ossama Othman <ossama@uci.edu>
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 10 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 10 | ||||
| -rw-r--r-- | ace/SSL/SSL_SOCK_Stream.i | 8 |
4 files changed, 34 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index dd69713ac36..24a42d98f9d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Thu Jul 13 09:33:45 2000 Ossama Othman <ossama@uci.edu> + + * ace/SSL/SSL_SOCK_Stream.i (send, recv): + + Fixed typos where size of buffer being sent/received was passed + to the OpenSSL SSL_get_error() function, instead of the return + status of the SSL_write()/SSL_read() call. This will fix + some broken error handling. + Reported by Craig Perras <cperras@watchguard.com> + Thu Jul 13 07:55:41 2000 David L. Levine <levine@cs.wustl.edu> * docs/ACE-guidelines.html: added general guideline to not diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index dd69713ac36..24a42d98f9d 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,13 @@ +Thu Jul 13 09:33:45 2000 Ossama Othman <ossama@uci.edu> + + * ace/SSL/SSL_SOCK_Stream.i (send, recv): + + Fixed typos where size of buffer being sent/received was passed + to the OpenSSL SSL_get_error() function, instead of the return + status of the SSL_write()/SSL_read() call. This will fix + some broken error handling. + Reported by Craig Perras <cperras@watchguard.com> + Thu Jul 13 07:55:41 2000 David L. Levine <levine@cs.wustl.edu> * docs/ACE-guidelines.html: added general guideline to not diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index dd69713ac36..24a42d98f9d 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,13 @@ +Thu Jul 13 09:33:45 2000 Ossama Othman <ossama@uci.edu> + + * ace/SSL/SSL_SOCK_Stream.i (send, recv): + + Fixed typos where size of buffer being sent/received was passed + to the OpenSSL SSL_get_error() function, instead of the return + status of the SSL_write()/SSL_read() call. This will fix + some broken error handling. + Reported by Craig Perras <cperras@watchguard.com> + Thu Jul 13 07:55:41 2000 David L. Levine <levine@cs.wustl.edu> * docs/ACE-guidelines.html: added general guideline to not diff --git a/ace/SSL/SSL_SOCK_Stream.i b/ace/SSL/SSL_SOCK_Stream.i index cb57f7b17b3..89488a2d457 100644 --- a/ace/SSL/SSL_SOCK_Stream.i +++ b/ace/SSL/SSL_SOCK_Stream.i @@ -77,7 +77,7 @@ ACE_SSL_SOCK_Stream::send (const void *buf, if (status <= 0) { - switch (::SSL_get_error (this->ssl_, n)) + switch (::SSL_get_error (this->ssl_, status)) { case SSL_ERROR_WANT_WRITE: case SSL_ERROR_WANT_READ: @@ -117,7 +117,7 @@ ACE_SSL_SOCK_Stream::recv (void *buf, n); if (status <= 0) { - switch (::SSL_get_error (this->ssl_, n)) + switch (::SSL_get_error (this->ssl_, status)) { case SSL_ERROR_WANT_WRITE: case SSL_ERROR_WANT_READ: @@ -147,7 +147,7 @@ ACE_SSL_SOCK_Stream::send (const void *buf, if (status <= 0) { - switch (::SSL_get_error (this->ssl_, n)) + switch (::SSL_get_error (this->ssl_, status)) { case SSL_ERROR_WANT_WRITE: case SSL_ERROR_WANT_READ: @@ -177,7 +177,7 @@ ACE_SSL_SOCK_Stream::recv (void *buf, if (status <= 0) { - switch (::SSL_get_error (this->ssl_, n)) + switch (::SSL_get_error (this->ssl_, status)) { case SSL_ERROR_WANT_WRITE: case SSL_ERROR_WANT_READ: |