Commit acb1a71
build: fix compiling against openssl with no-psk
Node 15 prior to this commit will not compile if openssl is built with
no-psk. Compiling emits an error like this:
```
crypto_tls.cc:(.text+0x4c27): undefined reference to
`node::crypto::TLSWrap::SetCACerts(node::crypto::SecureContext*)'
```
Blame on crypto_tls.cc shows the file was created in a refactor. Before
that refactor SetCACerts was defined outside OPENSSL_NO_PSK ifndef.
PR-URL: #36881
Fixes: #36464
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>1 parent 0ee168c commit acb1a71
1 file changed
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1339,8 +1339,6 @@ int TLSWrap::SelectSNIContextCallback(SSL* s, int* ad, void* arg) { | |||
| 1339 | 1339 | return SSL_TLSEXT_ERR_OK; | |
| 1340 | 1340 | } | |
| 1341 | 1341 | ||
| 1342 | - #ifndef OPENSSL_NO_PSK | ||
| 1343 | - | ||
| 1344 | 1342 | int TLSWrap::SetCACerts(SecureContext* sc) { | |
| 1345 | 1343 | int err = SSL_set1_verify_cert_store( | |
| 1346 | 1344 | ssl_.get(), SSL_CTX_get_cert_store(sc->ctx_.get())); | |
@@ -1355,6 +1353,8 @@ int TLSWrap::SetCACerts(SecureContext* sc) { | |||
| 1355 | 1353 | return 1; | |
| 1356 | 1354 | } | |
| 1357 | 1355 | ||
| 1356 | + #ifndef OPENSSL_NO_PSK | ||
| 1357 | + | ||
| 1358 | 1358 | void TLSWrap::SetPskIdentityHint(const FunctionCallbackInfo<Value>& args) { | |
| 1359 | 1359 | TLSWrap* p; | |
| 1360 | 1360 | ASSIGN_OR_RETURN_UNWRAP(&p, args.Holder()); | |
0 commit comments