wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-05 13:44:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use native API for ticket callback

Browse Source
This commit is contained in:
Juliusz Sosinowicz
2021-01-20 13:38:53 +01:00
parent 0ae1a8b8c5
commit 9265c3f71f
4 changed files with 122 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

135
src/internal.c
View File

@@ -1677,8 +1677,10 @@ int InitSSL_Side(WOLFSSL* ssl, word16 side)
defined(OPENSSL_EXTRA) defined(OPENSSL_EXTRA)
static int ctxInitTicket(WOLFSSL_CTX* ctx) static int ctxInitTicket(WOLFSSL_CTX* ctx)
{ {
WC_RNG rng;
int ret = 0; int ret = 0;
#if (defined(HAVE_CHACHA) && defined(HAVE_POLY1305)) \
|| (!defined(NO_AES) && defined(HAVE_AESGCM) && defined(HAVE_AESGCM))
WC_RNG rng;
ret = wc_InitRng(&rng); ret = wc_InitRng(&rng);
if (ret != 0) if (ret != 0)
@@ -1689,59 +1691,102 @@ static int ctxInitTicket(WOLFSSL_CTX* ctx)
if (ret == 0) if (ret == 0)
ret = wc_RNG_GenerateBlock(&rng, ret = wc_RNG_GenerateBlock(&rng,
ctx->ticketCompatKey, sizeof(ctx->ticketCompatKey)); ctx->ticketCompatKey, sizeof(ctx->ticketCompatKey));
if (ret == 0)
ret = wc_RNG_GenerateBlock(&rng,
ctx->ticketCompatHmacKey, sizeof(ctx->ticketCompatHmacKey));
if (ret == 0)
ret = wc_RNG_GenerateBlock(&rng,
ctx->ticketCompatIV, sizeof(ctx->ticketCompatIV));
wc_FreeRng(&rng); wc_FreeRng(&rng);
#else
(void)ctx;
#endif
return ret; return ret;
} }
static WC_INLINE int myTicketEncCbCompat(WOLFSSL* ssl, static WC_INLINE int myTicketEncCbCompat(WOLFSSL* ssl,
byte name[WOLFSSL_TICKET_NAME_SZ], byte key_name[WOLFSSL_TICKET_NAME_SZ],
byte iv[WOLFSSL_TICKET_IV_SZ], byte iv[WOLFSSL_TICKET_IV_SZ],
WOLFSSL_EVP_CIPHER_CTX *ectx, byte mac[WOLFSSL_TICKET_MAC_SZ],
WOLFSSL_HMAC_CTX *hctx, int enc) { int enc, byte* ticket, int inLen, int* outLen,
void* userCtx) {
int ret;
word16 sLen = XHTONS(inLen);
byte aad[WOLFSSL_TICKET_NAME_SZ + WOLFSSL_TICKET_IV_SZ + 2];
byte* tmp = aad;
WOLFSSL_ENTER("myTicketEncCbCompat"); WOLFSSL_ENTER("myTicketEncCbCompat");
if (ssl == NULL || name == NULL || iv == NULL || ectx == NULL if (ssl == NULL || key_name == NULL || iv == NULL || mac == NULL
|| hctx == NULL) || ticket == NULL || outLen == NULL)
return TICKET_KEY_CB_RET_FAILURE; return WOLFSSL_TICKET_RET_FATAL;
(void)userCtx;
if (enc) { if (enc) {
XMEMCPY(name, ssl->ctx->ticketCompatName, sizeof(ssl->ctx->ticketCompatName)); XMEMCPY(key_name, ssl->ctx->ticketCompatName, WOLFSSL_TICKET_NAME_SZ);
XMEMCPY(iv, ssl->ctx->ticketCompatIV, sizeof(ssl->ctx->ticketCompatIV)); ret = wc_RNG_GenerateBlock(ssl->rng, iv, WOLFSSL_TICKET_IV_SZ);
} if (ret != 0) return WOLFSSL_TICKET_RET_REJECT;
else if (XMEMCMP(name, ssl->ctx->ticketCompatName,
sizeof(ssl->ctx->ticketCompatName)) != 0 ||
XMEMCMP(iv, ssl->ctx->ticketCompatIV,
sizeof(ssl->ctx->ticketCompatIV)) != 0) {
WOLFSSL_MSG("myTicketEncCbCompat: name or iv mismatch");
return TICKET_KEY_CB_RET_NOT_FOUND;
}
if (wolfSSL_HMAC_Init(hctx, ssl->ctx->ticketCompatHmacKey,
WOLFSSL_TICKET_NAME_SZ, wolfSSL_EVP_sha256()) != WOLFSSL_SUCCESS) {
WOLFSSL_MSG("wolfSSL_HMAC_Init error");
return TICKET_KEY_CB_RET_FAILURE;
}
if (enc) {
if (wolfSSL_EVP_EncryptInit(ectx, wolfSSL_EVP_aes_256_cbc(),
ssl->ctx->ticketCompatKey, iv) != WOLFSSL_SUCCESS) {
WOLFSSL_MSG("wolfSSL_EVP_EncryptInit error");
return TICKET_KEY_CB_RET_FAILURE;
}
} }
else { else {
if (wolfSSL_EVP_DecryptInit(ectx, wolfSSL_EVP_aes_256_cbc(), /* see if we know this key */
ssl->ctx->ticketCompatKey, iv) != WOLFSSL_SUCCESS) { if (XMEMCMP(key_name, ssl->ctx->ticketCompatName,
WOLFSSL_MSG("wolfSSL_EVP_DecryptInit error"); WOLFSSL_TICKET_NAME_SZ) != 0){
return TICKET_KEY_CB_RET_FAILURE; WOLFSSL_MSG("client presented unknown ticket key name");
return WOLFSSL_TICKET_RET_FATAL;
} }
} }
return TICKET_KEY_CB_RET_OK;
/* build aad from key name, iv, and length */
XMEMCPY(tmp, key_name, WOLFSSL_TICKET_NAME_SZ);
tmp += WOLFSSL_TICKET_NAME_SZ;
XMEMCPY(tmp, iv, WOLFSSL_TICKET_IV_SZ);
tmp += WOLFSSL_TICKET_IV_SZ;
XMEMCPY(tmp, &sLen, 2);
/* encrypt */
if (enc) {
#if defined(HAVE_CHACHA) && defined(HAVE_POLY1305)
ret = wc_ChaCha20Poly1305_Encrypt(ssl->ctx->ticketCompatKey, iv,
aad, sizeof(aad), ticket, inLen, ticket, mac);
#elif !defined(NO_AES) && defined(HAVE_AESGCM) && defined(WOLFSSL_AES_256)
Aes aes;
ret = wc_AesInit(&aes, ssl->heap, INVALID_DEVID);
if (ret == 0) {
ret = wc_AesGcmSetKey(&aes, ssl->ctx->ticketCompatKey, AES_256_KEY_SIZE);
if (ret == 0)
ret = wc_AesGcmEncrypt(&aes, ticket, ticket, inLen, iv,
WOLFSSL_TICKET_IV_SZ, mac, AES_BLOCK_SIZE,
aad, sizeof(aad));
wc_AesFree(&aes);
}
#else
WOLFSSL_MSG("Neither chacha20-poly1305 or aes-gcm available for "
"session ticket generation");
return WOLFSSL_TICKET_RET_FATAL;
#endif
}
/* decrypt */
else {
#if defined(HAVE_CHACHA) && defined(HAVE_POLY1305)
ret = wc_ChaCha20Poly1305_Decrypt(ssl->ctx->ticketCompatKey, iv,
aad, sizeof(aad), ticket, inLen, mac, ticket);
#elif !defined(NO_AES) && defined(HAVE_AESGCM) && defined(WOLFSSL_AES_256)
Aes aes;
ret = wc_AesInit(&aes, ssl->heap, INVALID_DEVID);
if (ret == 0) {
ret = wc_AesGcmSetKey(&aes, ssl->ctx->ticketCompatKey, AES_256_KEY_SIZE);
if (ret == 0)
ret = wc_AesGcmDecrypt(&aes, ticket, ticket, inLen, iv,
WOLFSSL_TICKET_IV_SZ, mac, AES_BLOCK_SIZE,
aad, sizeof(aad));
wc_AesFree(&aes);
}
#else
WOLFSSL_MSG("Neither chacha20-poly1305 or aes-gcm available for "
"session ticket decryption");
return WOLFSSL_TICKET_RET_FATAL;
#endif
}
if (ret != 0) return WOLFSSL_TICKET_RET_REJECT;
*outLen = inLen; /* no padding in this mode */
return WOLFSSL_TICKET_RET_OK;
} }
#endif /* HAVE_SESSION_TICKET && !NO_WOLFSSL_SERVER && OPENSSL_EXTRA */ #endif /* HAVE_SESSION_TICKET && !NO_WOLFSSL_SERVER && OPENSSL_EXTRA */
@@ -1900,14 +1945,17 @@ int InitSSL_Ctx(WOLFSSL_CTX* ctx, WOLFSSL_METHOD* method, void* heap)
#ifdef OPENSSL_EXTRA #ifdef OPENSSL_EXTRA
if (ret == 0) if (ret == 0)
ret = ctxInitTicket(ctx); ret = ctxInitTicket(ctx);
#if (defined(HAVE_CHACHA) && defined(HAVE_POLY1305)) \
|| (!defined(NO_AES) && defined(HAVE_AESGCM) && defined(HAVE_AESGCM))
/* No need for compat ticket init flag since below callback setter is /* No need for compat ticket init flag since below callback setter is
* only called when the above parameter generation has succeeded */ * only called when the above parameter generation has succeeded */
if (ret == 0 && if (ret == 0 &&
wolfSSL_CTX_set_tlsext_ticket_key_cb(ctx, myTicketEncCbCompat) wolfSSL_CTX_set_TicketEncCb(ctx, myTicketEncCbCompat)
!= WOLFSSL_SUCCESS) != WOLFSSL_SUCCESS)
ret = SESSION_SECRET_CB_E; ret = SESSION_SECRET_CB_E;
#endif #endif
#endif #endif
#endif
#ifdef HAVE_WOLF_EVENT #ifdef HAVE_WOLF_EVENT
if (ret == 0) if (ret == 0)
@@ -2054,10 +2102,9 @@ void SSL_CtxResourceFree(WOLFSSL_CTX* ctx)
} }
#endif /* WOLFSSL_STATIC_MEMORY */ #endif /* WOLFSSL_STATIC_MEMORY */
#if defined(HAVE_SESSION_TICKET) && !defined(NO_WOLFSSL_SERVER) && \ #if defined(HAVE_SESSION_TICKET) && !defined(NO_WOLFSSL_SERVER) && \
defined(OPENSSL_EXTRA) defined(OPENSSL_EXTRA) && ((defined(HAVE_CHACHA) && defined(HAVE_POLY1305)) \
|| (!defined(NO_AES) && defined(HAVE_AESGCM) && defined(HAVE_AESGCM)))
ForceZero(ctx->ticketCompatKey, sizeof(ctx->ticketCompatKey)); ForceZero(ctx->ticketCompatKey, sizeof(ctx->ticketCompatKey));
ForceZero(ctx->ticketCompatHmacKey, sizeof(ctx->ticketCompatHmacKey));
ForceZero(ctx->ticketCompatIV, sizeof(ctx->ticketCompatIV));
#endif #endif
} }

39
src/ssl.c
View File

@@ -15708,7 +15708,13 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
defined(OPENSSL_EXTRA) defined(OPENSSL_EXTRA)
if (ctx->mask & SSL_OP_NO_TICKET) { if (ctx->mask & SSL_OP_NO_TICKET) {
ctx->ticketEncCb = NULL; ctx->ticketEncCb = NULL;
ctx->ticketCompatCb = NULL; ctx->ticketEncCtx = NULL;
XMEMSET(ctx->ticketCompatName, 0, WOLFSSL_TICKET_NAME_SZ);
#if defined(HAVE_SESSION_TICKET) && !defined(NO_WOLFSSL_SERVER) && \
defined(OPENSSL_EXTRA) && ((defined(HAVE_CHACHA) && defined(HAVE_POLY1305)) \
|| (!defined(NO_AES) && defined(HAVE_AESGCM) && defined(HAVE_AESGCM)))
ForceZero(ctx->ticketCompatKey, sizeof(ctx->ticketCompatKey));
#endif
WOLFSSL_MSG("\tSSL_OP_NO_TICKET"); WOLFSSL_MSG("\tSSL_OP_NO_TICKET");
} }
#endif #endif
@@ -47618,7 +47624,12 @@ int wolfSSL_i2a_ASN1_INTEGER(BIO *bp, const WOLFSSL_ASN1_INTEGER *a)
#if defined(HAVE_SESSION_TICKET) && !defined(NO_WOLFSSL_SERVER) #if defined(HAVE_SESSION_TICKET) && !defined(NO_WOLFSSL_SERVER)
/* Expected return values from implementations of OpenSSL ticket key callback.
*/
#define TICKET_KEY_CB_RET_FAILURE -1
#define TICKET_KEY_CB_RET_NOT_FOUND 0
#define TICKET_KEY_CB_RET_OK 1
#define TICKET_KEY_CB_RET_RENEW 2
/* Implementation of session ticket encryption/decryption using OpenSSL /* Implementation of session ticket encryption/decryption using OpenSSL
* callback to initialize the cipher and HMAC. * callback to initialize the cipher and HMAC.
@@ -47637,11 +47648,11 @@ int wolfSSL_i2a_ASN1_INTEGER(BIO *bp, const WOLFSSL_ASN1_INTEGER *a)
* WOLFSSL_TICKET_RET_FATAL on error. * WOLFSSL_TICKET_RET_FATAL on error.
*/ */
static int wolfSSL_TicketKeyCb(WOLFSSL* ssl, static int wolfSSL_TicketKeyCb(WOLFSSL* ssl,
unsigned char keyName[WOLFSSL_TICKET_NAME_SZ], unsigned char keyName[WOLFSSL_TICKET_NAME_SZ],
unsigned char iv[WOLFSSL_TICKET_IV_SZ], unsigned char iv[WOLFSSL_TICKET_IV_SZ],
unsigned char mac[WOLFSSL_TICKET_MAC_SZ], unsigned char mac[WOLFSSL_TICKET_MAC_SZ],
int enc, unsigned char* encTicket, int enc, unsigned char* encTicket,
int encTicketLen, int* encLen, void* ctx) int encTicketLen, int* encLen, void* ctx)
{ {
byte digest[WC_MAX_DIGEST_SIZE]; byte digest[WC_MAX_DIGEST_SIZE];
WOLFSSL_EVP_CIPHER_CTX evpCtx; WOLFSSL_EVP_CIPHER_CTX evpCtx;
@@ -47655,18 +47666,19 @@ static int wolfSSL_TicketKeyCb(WOLFSSL* ssl,
WOLFSSL_ENTER("wolfSSL_TicketKeyCb"); WOLFSSL_ENTER("wolfSSL_TicketKeyCb");
if (ssl == NULL || ssl->ctx == NULL || ssl->ctx->ticketCompatCb == NULL) { if (ssl == NULL || ssl->ctx == NULL || ssl->ctx->ticketEncCtx == NULL) {
WOLFSSL_MSG("Bad parameter"); WOLFSSL_MSG("Bad parameter");
return WOLFSSL_TICKET_RET_FATAL; return WOLFSSL_TICKET_RET_FATAL;
} }
/* Initialize the cipher and HMAC. */
wolfSSL_EVP_CIPHER_CTX_init(&evpCtx); wolfSSL_EVP_CIPHER_CTX_init(&evpCtx);
if (wolfSSL_HMAC_CTX_Init(&hmacCtx) != WOLFSSL_SUCCESS) { if (wolfSSL_HMAC_CTX_Init(&hmacCtx) != WOLFSSL_SUCCESS) {
WOLFSSL_MSG("wolfSSL_HMAC_CTX_Init error"); WOLFSSL_MSG("wolfSSL_HMAC_CTX_Init error");
return WOLFSSL_TICKET_RET_FATAL; return WOLFSSL_TICKET_RET_FATAL;
} }
/* Initialize the cipher and HMAC. */ res = ((ticketCompatCb)ssl->ctx->ticketEncCtx)(ssl, keyName,
res = ssl->ctx->ticketCompatCb(ssl, keyName, iv, &evpCtx, &hmacCtx, enc); iv, &evpCtx, &hmacCtx, enc);
if (res != TICKET_KEY_CB_RET_OK && res != TICKET_KEY_CB_RET_RENEW) { if (res != TICKET_KEY_CB_RET_OK && res != TICKET_KEY_CB_RET_RENEW) {
WOLFSSL_MSG("Ticket callback error"); WOLFSSL_MSG("Ticket callback error");
return WOLFSSL_TICKET_RET_FATAL; return WOLFSSL_TICKET_RET_FATAL;
@@ -47729,16 +47741,13 @@ end:
* cb The OpenSSL session ticket callback. * cb The OpenSSL session ticket callback.
* returns WOLFSSL_SUCCESS to indicate success. * returns WOLFSSL_SUCCESS to indicate success.
*/ */
int wolfSSL_CTX_set_tlsext_ticket_key_cb(WOLFSSL_CTX *ctx, int (*cb)( int wolfSSL_CTX_set_tlsext_ticket_key_cb(WOLFSSL_CTX *ctx, ticketCompatCb cb)
WOLFSSL *ssl, unsigned char *name, unsigned char *iv,
WOLFSSL_EVP_CIPHER_CTX *ectx, WOLFSSL_HMAC_CTX *hctx, int enc))
{ {
/* Store callback in a global. */
ctx->ticketCompatCb = cb;
/* Set the ticket encryption callback to be a wrapper around OpenSSL /* Set the ticket encryption callback to be a wrapper around OpenSSL
* callback. * callback.
*/ */
ctx->ticketEncCb = wolfSSL_TicketKeyCb; ctx->ticketEncCb = wolfSSL_TicketKeyCb;
ctx->ticketEncCtx = cb;
return WOLFSSL_SUCCESS; return WOLFSSL_SUCCESS;
} }

4
wolfssl/internal.h
View File

@@ -59,6 +59,9 @@
#ifdef HAVE_POLY1305 #ifdef HAVE_POLY1305
#include <wolfssl/wolfcrypt/poly1305.h> #include <wolfssl/wolfcrypt/poly1305.h>
#endif #endif
#if defined(HAVE_CHACHA) && defined(HAVE_POLY1305) && defined(OPENSSL_EXTRA)
#include <wolfssl/wolfcrypt/chacha20_poly1305.h>
#endif
#ifdef HAVE_CAMELLIA #ifdef HAVE_CAMELLIA
#include <wolfssl/wolfcrypt/camellia.h> #include <wolfssl/wolfcrypt/camellia.h>
#endif #endif
@@ -2932,6 +2935,7 @@ struct WOLFSSL_CTX {
#endif #endif
#endif #endif
#endif #endif
#endif
#ifdef HAVE_SUPPORTED_CURVES #ifdef HAVE_SUPPORTED_CURVES
byte userCurves; /* indicates user called wolfSSL_CTX_UseSupportedCurve */ byte userCurves; /* indicates user called wolfSSL_CTX_UseSupportedCurve */
#endif #endif

13
wolfssl/ssl.h
View File

@@ -3252,13 +3252,6 @@ enum TicketEncRet {
WOLFSSL_API int wolfSSL_CTX_NoTicketTLSv12(WOLFSSL_CTX* ctx); WOLFSSL_API int wolfSSL_CTX_NoTicketTLSv12(WOLFSSL_CTX* ctx);
WOLFSSL_API int wolfSSL_NoTicketTLSv12(WOLFSSL* ssl); WOLFSSL_API int wolfSSL_NoTicketTLSv12(WOLFSSL* ssl);
/* Expected return values from implementations of OpenSSL ticket key callback.
*/
#define TICKET_KEY_CB_RET_FAILURE -1
#define TICKET_KEY_CB_RET_NOT_FOUND 0
#define TICKET_KEY_CB_RET_OK 1
#define TICKET_KEY_CB_RET_RENEW 2
typedef int (*SessionTicketEncCb)(WOLFSSL*, typedef int (*SessionTicketEncCb)(WOLFSSL*,
unsigned char key_name[WOLFSSL_TICKET_NAME_SZ], unsigned char key_name[WOLFSSL_TICKET_NAME_SZ],
unsigned char iv[WOLFSSL_TICKET_IV_SZ], unsigned char iv[WOLFSSL_TICKET_IV_SZ],
@@ -3993,9 +3986,9 @@ WOLFSSL_API int wolfSSL_i2a_ASN1_INTEGER(WOLFSSL_BIO *bp,
const WOLFSSL_ASN1_INTEGER *a); const WOLFSSL_ASN1_INTEGER *a);
#ifdef HAVE_SESSION_TICKET #ifdef HAVE_SESSION_TICKET
WOLFSSL_API int wolfSSL_CTX_set_tlsext_ticket_key_cb(WOLFSSL_CTX *, int (*)( typedef int (*ticketCompatCb)(WOLFSSL *ssl, unsigned char *name, unsigned char *iv,
WOLFSSL *ssl, unsigned char *name, unsigned char *iv, WOLFSSL_EVP_CIPHER_CTX *ectx, WOLFSSL_HMAC_CTX *hctx, int enc);
WOLFSSL_EVP_CIPHER_CTX *ectx, WOLFSSL_HMAC_CTX *hctx, int enc)); WOLFSSL_API int wolfSSL_CTX_set_tlsext_ticket_key_cb(WOLFSSL_CTX *, ticketCompatCb);
#endif #endif
#if defined(HAVE_OCSP) || defined(OPENSSL_EXTRA) || defined(OPENSSL_ALL) || \ #if defined(HAVE_OCSP) || defined(OPENSSL_EXTRA) || defined(OPENSSL_ALL) || \