src: colocate GetSSLOCSPResponse with callsite

Only used one place so move it out of crypto-common
nodejs · Dec 31, 2024 · 7b5bf07 · 7b5bf07
1 parent bd25380
commit 7b5bf07
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 25 deletions.
diff --git a/src/crypto/crypto_common.cc b/src/crypto/crypto_common.cc
@@ -43,25 +43,6 @@ using v8::Value;
 
 namespace crypto {
 
-MaybeLocal<Value> GetSSLOCSPResponse(
-    Environment* env,
-    SSL* ssl,
-    Local<Value> default_value) {
-  const unsigned char* resp;
-  int len = SSL_get_tlsext_status_ocsp_resp(ssl, &resp);
-  if (resp == nullptr)
-    return default_value;
-
-  Local<Value> ret;
-  MaybeLocal<Object> maybe_buffer =
-      Buffer::Copy(env, reinterpret_cast<const char*>(resp), len);
-
-  if (!maybe_buffer.ToLocal(&ret))
-    return MaybeLocal<Value>();
-
-  return ret;
-}
-
 bool SetTLSSession(
     const SSLPointer& ssl,
     const SSLSessionPointer& session) {

diff --git a/src/crypto/crypto_common.h b/src/crypto/crypto_common.h
@@ -22,11 +22,6 @@
 namespace node {
 namespace crypto {
 
-v8::MaybeLocal<v8::Value> GetSSLOCSPResponse(
-    Environment* env,
-    SSL* ssl,
-    v8::Local<v8::Value> default_value);
-
 bool SetTLSSession(
     const SSLPointer& ssl,
     const SSLSessionPointer& session);

diff --git a/src/crypto/crypto_tls.cc b/src/crypto/crypto_tls.cc
@@ -303,6 +303,20 @@ int SelectALPNCallback(
                                           : SSL_TLSEXT_ERR_ALERT_FATAL;
 }
 
+MaybeLocal<Value> GetSSLOCSPResponse(Environment* env, SSL* ssl) {
+  const unsigned char* resp;
+  int len = SSL_get_tlsext_status_ocsp_resp(ssl, &resp);
+  if (resp == nullptr) return Null(env->isolate());
+
+  Local<Value> ret;
+  MaybeLocal<Object> maybe_buffer =
+      Buffer::Copy(env, reinterpret_cast<const char*>(resp), len);
+
+  if (!maybe_buffer.ToLocal(&ret)) return MaybeLocal<Value>();
+
+  return ret;
+}
+
 int TLSExtStatusCallback(SSL* s, void* arg) {
   TLSWrap* w = static_cast<TLSWrap*>(SSL_get_app_data(s));
   Environment* env = w->env();
@@ -311,7 +325,7 @@ int TLSExtStatusCallback(SSL* s, void* arg) {
   if (w->is_client()) {
     // Incoming response
     Local<Value> arg;
-    if (GetSSLOCSPResponse(env, s, Null(env->isolate())).ToLocal(&arg))
+    if (GetSSLOCSPResponse(env, s).ToLocal(&arg))
       w->MakeCallback(env->onocspresponse_string(), 1, &arg);
 
     // No async acceptance is possible, so always return 1 to accept the