diff options
| author | David Benjamin <davidben@google.com> | 2016-06-12 02:01:56 +0300 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2016-06-14 22:40:25 +0300 |
| commit | f715c423224a292d79ba0e3df373c828fbae29f7 (patch) | |
| tree | 05a763b9fb59e48acc27a565419bbcda601630bb /include/openssl/ssl.h | |
| parent | 5c0fb889a1348ecaa5691f6139f9d60a610f2129 (diff) | |
Make SSL_set_bio's ownership easier to reason about.
SSL_set_bio has some rather complex ownership story because whether rbio/wbio
are both owning depends on whether they are equal. Moreover, whether
SSL_set_bio(ssl, rbio, wbio) frees ssl->rbio depends on whether rbio is the
existing rbio or not. The current logic doesn't even get it right; see tests.
Simplify this. First, rbio and wbio are always owning. All the weird ownership
cases which we're stuck with for compatibility will live in SSL_set_bio. It
will internally BIO_up_ref if necessary and appropriately no-op the left or
right side as needed. It will then call more well-behaved ssl_set_rbio or
ssl_set_wbio functions as necessary.
Change-Id: I6b4b34e23ed01561a8c0aead8bb905363ee413bb
Reviewed-on: https://boringssl-review.googlesource.com/8240
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'include/openssl/ssl.h')
| -rw-r--r-- | include/openssl/ssl.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index 03a4ea5d..086aa9da 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -237,7 +237,10 @@ OPENSSL_EXPORT int SSL_is_server(SSL *ssl); * In DTLS, if |rbio| is blocking, it must handle * |BIO_CTRL_DGRAM_SET_NEXT_TIMEOUT| control requests to set read timeouts. * - * Calling this function on an already-configured |ssl| is deprecated. */ + * If |rbio| (respectively, |wbio|) is the same as the currently configured + * |BIO| for reading (respectivly, writing), that side is left untouched and is + * not freed. Using this behavior and calling this function if |ssl| already has + * |BIO|s configured is deprecated. */ OPENSSL_EXPORT void SSL_set_bio(SSL *ssl, BIO *rbio, BIO *wbio); /* SSL_get_rbio returns the |BIO| that |ssl| reads from. */ |