OERV-RUNTIME/boringssl
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove unused BIO_RR_* values.

Browse Source 
One of them is used in the new minimal SSL BIO, but cURL doesn't consume
it, so let's just leave it out. A consumer using asynchronous
certificate lookup is unlikely to be doing anything with SSL BIOs.

Change-Id: I10e7bfd643d3a531d42a96a8d675611d13722bd2
Reviewed-on: https://boringssl-review.googlesource.com/12686
Commit-Queue: David Benjamin <davidben@google.com>
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
David Benjamin
2016-12-12 21:41:41 +00:00
committed by Adam Langley
parent 2ad3c989e8
commit 5b1f07e9e7
2 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
decrepit/biossl/bio_ssl.c
-10
View File
@@ -31,11 +31,6 @@ static int ssl_read(BIO *bio, char *out, int outl) {
BIO_set_retry_write(bio);
break;
case SSL_ERROR_WANT_X509_LOOKUP:
BIO_set_retry_special(bio);
bio->retry_reason = BIO_RR_SSL_X509_LOOKUP;
break;
case SSL_ERROR_WANT_ACCEPT:
BIO_set_retry_special(bio);
bio->retry_reason = BIO_RR_ACCEPT;
@@ -76,11 +71,6 @@ static int ssl_write(BIO *bio, const char *out, int outl) {
BIO_set_retry_read(bio);
break;
case SSL_ERROR_WANT_X509_LOOKUP:
BIO_set_retry_special(bio);
bio->retry_reason = BIO_RR_SSL_X509_LOOKUP;
break;
case SSL_ERROR_WANT_CONNECT:
BIO_set_retry_special(bio);
bio->retry_reason = BIO_RR_CONNECT;
include/openssl/bio.h
-10
View File
@@ -184,22 +184,12 @@ OPENSSL_EXPORT int BIO_should_retry(const BIO *bio);
* |BIO_get_retry_reason|. */
OPENSSL_EXPORT int BIO_should_io_special(const BIO *bio);
/* BIO_RR_SSL_X509_LOOKUP indicates that an SSL BIO blocked because the SSL
* library returned with SSL_ERROR_WANT_X509_LOOKUP.
*
* TODO(fork): remove. */
#define BIO_RR_SSL_X509_LOOKUP 0x01
/* BIO_RR_CONNECT indicates that a connect would have blocked */
#define BIO_RR_CONNECT 0x02
/* BIO_RR_ACCEPT indicates that an accept would have blocked */
#define BIO_RR_ACCEPT 0x03
/* BIO_RR_SSL_CHANNEL_ID_LOOKUP indicates that the ChannelID code cannot find
* a private key for a TLS connection. */
#define BIO_RR_SSL_CHANNEL_ID_LOOKUP 0x04
/* BIO_get_retry_reason returns the special I/O operation that needs to be
* retried. The return value is one of the |BIO_RR_*| values. */
OPENSSL_EXPORT int BIO_get_retry_reason(const BIO *bio);