Commit abb0f6c
crypto: fix build when OCSP-stapling not provided
node_crypto.cc attempts to handle the case where OCSP stapling APIs
aren't provided by using NODE__HAVE_TLSEXT_STATUS_CB. But the build
would actually fail in this case because of a couple of places that were
missing #ifdefs.
With this change the build works although, as expected,
test-tls-ocsp-callback.js will fail.
PR-URL: #4914
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Shigeki Ohtsu <ohtsu@iij.ad.jp>1 parent e415eb2 commit abb0f6c
1 file changed
Lines changed: 10 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -156,7 +156,11 @@ template int SSLWrap<TLSWrap>::SelectNextProtoCallback( | |||
| 156 | 156 | unsigned int inlen, | |
| 157 | 157 | void* arg); | |
| 158 | 158 | #endif | |
| 159 | + | ||
| 160 | + #ifdef NODE__HAVE_TLSEXT_STATUS_CB | ||
| 159 | 161 | template int SSLWrap<TLSWrap>::TLSExtStatusCallback(SSL* s, void* arg); | |
| 162 | + #endif | ||
| 163 | + | ||
| 160 | 164 | template void SSLWrap<TLSWrap>::DestroySSL(); | |
| 161 | 165 | template int SSLWrap<TLSWrap>::SSLCertCallback(SSL* s, void* arg); | |
| 162 | 166 | template void SSLWrap<TLSWrap>::WaitForCertCb(CertCb cb, void* arg); | |
@@ -2263,7 +2267,12 @@ int SSLWrap<Base>::SSLCertCallback(SSL* s, void* arg) { | |||
| 2263 | 2267 | info->Set(env->tls_ticket_string(), | |
| 2264 | 2268 | Boolean::New(env->isolate(), sess->tlsext_ticklen != 0)); | |
| 2265 | 2269 | } | |
| 2266 | - bool ocsp = s->tlsext_status_type == TLSEXT_STATUSTYPE_ocsp; | ||
| 2270 | + | ||
| 2271 | + bool ocsp = false; | ||
| 2272 | + #ifdef NODE__HAVE_TLSEXT_STATUS_CB | ||
| 2273 | + ocsp = s->tlsext_status_type == TLSEXT_STATUSTYPE_ocsp; | ||
| 2274 | + #endif | ||
| 2275 | + | ||
| 2267 | 2276 | info->Set(env->ocsp_request_string(), Boolean::New(env->isolate(), ocsp)); | |
| 2268 | 2277 | ||
| 2269 | 2278 | Local<Value> argv[] = { info }; | |
0 commit comments