Remove some node.js hacks.
These are no longer needed.
Change-Id: I909f7d690f57dafcdad6254948b5683757da69f4
Reviewed-on: https://boringssl-review.googlesource.com/13160
Commit-Queue: David Benjamin <davidben@google.com>
Reviewed-by: Adam Langley <agl@google.com>
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 5a3205e..7c48b17 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -4070,9 +4070,7 @@
* be negotiated and zero otherwise. */
unsigned short_header_enabled:1;
- /* extra_certs is a dummy value included for compatibility.
- * TODO(agl): remove once node.js no longer references this. */
- STACK_OF(X509)* extra_certs;
+ /* TODO(agl): remove once node.js no longer references this. */
int freelist_max_len;
};
@@ -4244,9 +4242,6 @@
* session space. Only effective on the server side. */
unsigned retain_only_sha256_of_client_certs:1;
- /* TODO(agl): remove once node.js not longer references this. */
- int tlsext_status_type;
-
/* session_timeout is the default lifetime in seconds of the session
* created in this connection. */
long session_timeout;
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 0681919..dc377c4 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -1136,10 +1136,6 @@
*
* https://tools.ietf.org/html/rfc6066#section-8 */
-static void ext_ocsp_init(SSL_HANDSHAKE *hs) {
- hs->ssl->tlsext_status_type = -1;
-}
-
static int ext_ocsp_add_clienthello(SSL_HANDSHAKE *hs, CBB *out) {
SSL *const ssl = hs->ssl;
if (!ssl->ocsp_stapling_enabled) {
@@ -1156,7 +1152,6 @@
return 0;
}
- ssl->tlsext_status_type = TLSEXT_STATUSTYPE_ocsp;
return 1;
}
@@ -2633,7 +2628,7 @@
},
{
TLSEXT_TYPE_status_request,
- ext_ocsp_init,
+ NULL,
ext_ocsp_add_clienthello,
ext_ocsp_parse_serverhello,
ext_ocsp_parse_clienthello,
