Commit a625b01d03f for nodejs
commit a625b01d03f718f79c09d625938e38d72eda5961
Author: James M Snell <jasnell@gmail.com>
Date: Sun Nov 15 18:09:44 2026 +0000
crypto: add TicketHmacCtx alias for TLS ticket key callbacks
The SecureContext ticket key callback signatures repeated the same
backend-specific preprocessor block to select between EVP_MAC_CTX and
HMAC_CTX. Define the type once as TicketHmacCtx and use it instead.
Assisted-by: Claude
Signed-off-by: James M Snell <jasnell@gmail.com>
PR-URL: https://github.com/nodejs/node/pull/67495
Reviewed-By: Guilherme Araújo <arauujogui@gmail.com>
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: Robert Nagy <ronagy@icloud.com>
Reviewed-By: Ethan Arrowood <ethan@arrowood.dev>
diff --git a/src/crypto/crypto_context.cc b/src/crypto/crypto_context.cc
index fe2a872a2ba..6010b90d581 100644
--- a/src/crypto/crypto_context.cc
+++ b/src/crypto/crypto_context.cc
@@ -2518,13 +2518,7 @@ int SecureContext::TicketKeyCallback(SSL* ssl,
unsigned char* name,
unsigned char* iv,
EVP_CIPHER_CTX* ectx,
-#if NCRYPTO_USE_OPENSSL_PROVIDER
- EVP_MAC_CTX* hctx,
-#elif NCRYPTO_USE_BORINGSSL
- HMAC_CTX* hctx,
-#else
-#error "Unsupported crypto backend"
-#endif
+ TicketHmacCtx* hctx,
int enc) {
static const int kTicketPartSize = 16;
@@ -2617,13 +2611,7 @@ int SecureContext::TicketCompatibilityCallback(SSL* ssl,
unsigned char* name,
unsigned char* iv,
EVP_CIPHER_CTX* ectx,
-#if NCRYPTO_USE_OPENSSL_PROVIDER
- EVP_MAC_CTX* hctx,
-#elif NCRYPTO_USE_BORINGSSL
- HMAC_CTX* hctx,
-#else
-#error "Unsupported crypto backend"
-#endif
+ TicketHmacCtx* hctx,
int enc) {
SecureContext* sc = static_cast<SecureContext*>(
SSL_CTX_get_app_data(SSL_get_SSL_CTX(ssl)));
diff --git a/src/crypto/crypto_context.h b/src/crypto/crypto_context.h
index 5073897251a..8b6f0fe1881 100644
--- a/src/crypto/crypto_context.h
+++ b/src/crypto/crypto_context.h
@@ -35,6 +35,15 @@ void InstallCertVerifyCallback(SSL_CTX* ctx);
ncrypto::BIOPointer LoadBIO(Environment* env, v8::Local<v8::Value> v);
+// The HMAC context type passed to TLS session ticket key callbacks.
+#if NCRYPTO_USE_OPENSSL_PROVIDER
+using TicketHmacCtx = EVP_MAC_CTX;
+#elif NCRYPTO_USE_BORINGSSL
+using TicketHmacCtx = HMAC_CTX;
+#else
+#error "Unsupported crypto backend"
+#endif
+
class SecureContext final : public BaseObject {
public:
using GetSessionCb = SSL_SESSION* (*)(SSL*, const unsigned char*, int, int*);
@@ -161,26 +170,14 @@ class SecureContext final : public BaseObject {
unsigned char* name,
unsigned char* iv,
EVP_CIPHER_CTX* ectx,
-#if NCRYPTO_USE_OPENSSL_PROVIDER
- EVP_MAC_CTX* hctx,
-#elif NCRYPTO_USE_BORINGSSL
- HMAC_CTX* hctx,
-#else
-#error "Unsupported crypto backend"
-#endif
+ TicketHmacCtx* hctx,
int enc);
static int TicketCompatibilityCallback(SSL* ssl,
unsigned char* name,
unsigned char* iv,
EVP_CIPHER_CTX* ectx,
-#if NCRYPTO_USE_OPENSSL_PROVIDER
- EVP_MAC_CTX* hctx,
-#elif NCRYPTO_USE_BORINGSSL
- HMAC_CTX* hctx,
-#else
-#error "Unsupported crypto backend"
-#endif
+ TicketHmacCtx* hctx,
int enc);
SecureContext(Environment* env, v8::Local<v8::Object> wrap);