Skip to content

Commit 5bb76ef

Browse files
committed
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>
1 parent f36de12 commit 5bb76ef

2 files changed

Lines changed: 13 additions & 28 deletions

File tree

‎src/crypto/crypto_context.cc‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2516,13 +2516,7 @@ int SecureContext::TicketKeyCallback(SSL* ssl,
25162516
unsigned char* name,
25172517
unsigned char* iv,
25182518
EVP_CIPHER_CTX* ectx,
2519-
#if NCRYPTO_USE_OPENSSL_PROVIDER
2520-
EVP_MAC_CTX* hctx,
2521-
#elif NCRYPTO_USE_BORINGSSL
2522-
HMAC_CTX* hctx,
2523-
#else
2524-
#error "Unsupported crypto backend"
2525-
#endif
2519+
TicketHmacCtx* hctx,
25262520
int enc) {
25272521
static const int kTicketPartSize = 16;
25282522

@@ -2615,13 +2609,7 @@ int SecureContext::TicketCompatibilityCallback(SSL* ssl,
26152609
unsigned char* name,
26162610
unsigned char* iv,
26172611
EVP_CIPHER_CTX* ectx,
2618-
#if NCRYPTO_USE_OPENSSL_PROVIDER
2619-
EVP_MAC_CTX* hctx,
2620-
#elif NCRYPTO_USE_BORINGSSL
2621-
HMAC_CTX* hctx,
2622-
#else
2623-
#error "Unsupported crypto backend"
2624-
#endif
2612+
TicketHmacCtx* hctx,
26252613
int enc) {
26262614
SecureContext* sc = static_cast<SecureContext*>(
26272615
SSL_CTX_get_app_data(SSL_get_SSL_CTX(ssl)));

‎src/crypto/crypto_context.h‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,15 @@ void InstallCertVerifyCallback(SSL_CTX* ctx);
3535

3636
ncrypto::BIOPointer LoadBIO(Environment* env, v8::Local<v8::Value> v);
3737

38+
// The HMAC context type passed to TLS session ticket key callbacks.
39+
#if NCRYPTO_USE_OPENSSL_PROVIDER
40+
using TicketHmacCtx = EVP_MAC_CTX;
41+
#elif NCRYPTO_USE_BORINGSSL
42+
using TicketHmacCtx = HMAC_CTX;
43+
#else
44+
#error "Unsupported crypto backend"
45+
#endif
46+
3847
class SecureContext final : public BaseObject {
3948
public:
4049
using GetSessionCb = SSL_SESSION* (*)(SSL*, const unsigned char*, int, int*);
@@ -161,26 +170,14 @@ class SecureContext final : public BaseObject {
161170
unsigned char* name,
162171
unsigned char* iv,
163172
EVP_CIPHER_CTX* ectx,
164-
#if NCRYPTO_USE_OPENSSL_PROVIDER
165-
EVP_MAC_CTX* hctx,
166-
#elif NCRYPTO_USE_BORINGSSL
167-
HMAC_CTX* hctx,
168-
#else
169-
#error "Unsupported crypto backend"
170-
#endif
173+
TicketHmacCtx* hctx,
171174
int enc);
172175

173176
static int TicketCompatibilityCallback(SSL* ssl,
174177
unsigned char* name,
175178
unsigned char* iv,
176179
EVP_CIPHER_CTX* ectx,
177-
#if NCRYPTO_USE_OPENSSL_PROVIDER
178-
EVP_MAC_CTX* hctx,
179-
#elif NCRYPTO_USE_BORINGSSL
180-
HMAC_CTX* hctx,
181-
#else
182-
#error "Unsupported crypto backend"
183-
#endif
180+
TicketHmacCtx* hctx,
184181
int enc);
185182

186183
SecureContext(Environment* env, v8::Local<v8::Object> wrap);

0 commit comments

Comments
 (0)