commit 5b1f07e9e7c85d76db4dafbc03cfccc4ee3fdf4e
author David Benjamin <davidben@google.com> Sat Dec 10 15:15:16 2016 -0500
committer Adam Langley <agl@google.com> Mon Dec 12 21:41:41 2016 +0000
tree 63f2e0ab02ce1183e8b1cba03abfa8e0bdbb8643
parent 2ad3c989e872ca63f48f06e421f2902305fe79da

Remove unused BIO_RR_* values.

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>

decrepit/biossl/bio_ssl.c

diff --git a/decrepit/biossl/bio_ssl.c b/decrepit/biossl/bio_ssl.c
index 4574c31..f8147c6 100644
--- a/decrepit/biossl/bio_ssl.c
+++ b/decrepit/biossl/bio_ssl.c
@@ -31,11 +31,6 @@
       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 @@
       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

diff --git a/include/openssl/bio.h b/include/openssl/bio.h
index ef7e465..847cb44 100644
--- a/include/openssl/bio.h
+++ b/include/openssl/bio.h
@@ -184,22 +184,12 @@
  * |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);