feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

switch user ticket encrypt ctx to WOLFSSL_CTX

Browse Source
This commit is contained in:
toddouska
2015-06-10 18:13:13 -07:00
parent 47af6459d8
commit 89d9accc4d
4 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/internal.c
View File

@ -13772,7 +13772,7 @@ int DoSessionTicket(WOLFSSL* ssl,
encLen = WOLFSSL_TICKET_ENC_SZ; /* max size user can use */ encLen = WOLFSSL_TICKET_ENC_SZ; /* max size user can use */
ret = ssl->ctx->ticketEncCb(ssl, et->key_name, et->iv, et->mac, 1, ret = ssl->ctx->ticketEncCb(ssl, et->key_name, et->iv, et->mac, 1,
et->enc_ticket, sizeof(InternalTicket), et->enc_ticket, sizeof(InternalTicket),
&encLen, ssl->ticket_encrypt_ctx); &encLen, ssl->ctx->ticketEncCtx);
if (ret == WOLFSSL_TICKET_RET_OK) { if (ret == WOLFSSL_TICKET_RET_OK) {
if (encLen < (int)sizeof(InternalTicket) || if (encLen < (int)sizeof(InternalTicket) ||
encLen > WOLFSSL_TICKET_ENC_SZ) { encLen > WOLFSSL_TICKET_ENC_SZ) {
@ -13847,7 +13847,7 @@ int DoSessionTicket(WOLFSSL* ssl,
ret = ssl->ctx->ticketEncCb(ssl, et->key_name, et->iv, ret = ssl->ctx->ticketEncCb(ssl, et->key_name, et->iv,
et->enc_ticket + inLen, 0, et->enc_ticket + inLen, 0,
et->enc_ticket, inLen, &outLen, et->enc_ticket, inLen, &outLen,
ssl->ticket_encrypt_ctx); ssl->ctx->ticketEncCtx);
if (ret == WOLFSSL_TICKET_RET_FATAL || ret < 0) return ret; if (ret == WOLFSSL_TICKET_RET_FATAL || ret < 0) return ret;
if (outLen > inLen || outLen < (int)sizeof(InternalTicket)) { if (outLen > inLen || outLen < (int)sizeof(InternalTicket)) {
WOLFSSL_MSG("Bad user ticket decrypt len"); WOLFSSL_MSG("Bad user ticket decrypt len");

6
src/ssl.c
View File

@ -896,12 +896,12 @@ int wolfSSL_CTX_set_TicketHint(WOLFSSL_CTX* ctx, int hint)
} }
/* set user context, SSL_SUCCESS on ok */ /* set user context, SSL_SUCCESS on ok */
int wolfSSL_set_TicketEncCtx(WOLFSSL* ssl, void* ctx) int wolfSSL_CTX_set_TicketEncCtx(WOLFSSL_CTX* ctx, void* userCtx)
{ {
if (ssl == NULL) if (ctx == NULL)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
ssl->ticket_encrypt_ctx = ctx; ctx->ticketEncCtx = userCtx;
return SSL_SUCCESS; return SSL_SUCCESS;
} }

4
wolfssl/internal.h
View File

@ -1564,6 +1564,7 @@ struct WOLFSSL_CTX {
TLSX* extensions; /* RFC 6066 TLS Extensions data */ TLSX* extensions; /* RFC 6066 TLS Extensions data */
#if defined(HAVE_SESSION_TICKET) && !defined(NO_WOLFSSL_SEVER) #if defined(HAVE_SESSION_TICKET) && !defined(NO_WOLFSSL_SEVER)
SessionTicketEncCb ticketEncCb; /* enc/dec session ticket Cb */ SessionTicketEncCb ticketEncCb; /* enc/dec session ticket Cb */
void* ticketEncCtx; /* session encrypt context */
int ticketHint; /* ticket hint in seconds */ int ticketHint; /* ticket hint in seconds */
#endif #endif
#endif #endif
@ -2251,9 +2252,6 @@ struct WOLFSSL {
void* session_ticket_ctx; void* session_ticket_ctx;
byte expect_session_ticket; byte expect_session_ticket;
#endif #endif
#if !defined(NO_WOLFSSL_SERVER) && defined(HAVE_SESSION_TICKET)
void* ticket_encrypt_ctx; /* session encrypt context */
#endif
#endif /* HAVE_TLS_EXTENSIONS */ #endif /* HAVE_TLS_EXTENSIONS */
#ifdef HAVE_NETX #ifdef HAVE_NETX
NetX_Ctx nxCtx; /* NetX IO Context */ NetX_Ctx nxCtx; /* NetX IO Context */

2
wolfssl/ssl.h
View File

@ -1395,7 +1395,7 @@ typedef int (*SessionTicketEncCb)(WOLFSSL*,
WOLFSSL_API int wolfSSL_CTX_set_TicketEncCb(WOLFSSL_CTX* ctx, WOLFSSL_API int wolfSSL_CTX_set_TicketEncCb(WOLFSSL_CTX* ctx,
SessionTicketEncCb); SessionTicketEncCb);
WOLFSSL_API int wolfSSL_CTX_set_TicketHint(WOLFSSL_CTX* ctx, int); WOLFSSL_API int wolfSSL_CTX_set_TicketHint(WOLFSSL_CTX* ctx, int);
WOLFSSL_API int wolfSSL_set_TicketEncCtx(WOLFSSL* ctx, void*); WOLFSSL_API int wolfSSL_CTX_set_TicketEncCtx(WOLFSSL_CTX* ctx, void*);
#endif /* NO_WOLFSSL_SERVER */ #endif /* NO_WOLFSSL_SERVER */