Loading ssl/s3_srvr.c +1 −1 Original line number Diff line number Diff line Loading @@ -2730,7 +2730,7 @@ int ssl3_send_server_certificate(SSL *s) /* SSL3_ST_SW_CERT_B */ return(ssl3_do_write(s,SSL3_RT_HANDSHAKE)); } #ifndef OPENSSLP_NO_TLSEXT #ifndef OPENSSL_NO_TLSEXT int ssl3_send_newsession_ticket(SSL *s) { if (s->state == SSL3_ST_SW_SESSION_TICKET_A) Loading ssl/t1_lib.c +0 −4 Original line number Diff line number Diff line Loading @@ -991,7 +991,6 @@ static int tls_decrypt_ticket(SSL *s, const unsigned char *etick, int eticklen, /* Check key name matches */ if (memcmp(etick, s->ctx->tlsext_tick_key_name, 16)) goto tickerr; fprintf(stderr, "Ticket match OK\n"); /* Check HMAC of encrypted ticket */ HMAC_CTX_init(&hctx); HMAC_Init_ex(&hctx, s->ctx->tlsext_tick_hmac_key, 16, Loading @@ -1001,7 +1000,6 @@ fprintf(stderr, "Ticket match OK\n"); HMAC_CTX_cleanup(&hctx); if (memcmp(tick_hmac, etick + eticklen, mlen)) goto tickerr; fprintf(stderr, "HMAC match OK\n"); /* Set p to start of IV */ p = etick + 16; EVP_CIPHER_CTX_init(&ctx); Loading @@ -1020,7 +1018,6 @@ fprintf(stderr, "HMAC match OK\n"); EVP_DecryptUpdate(&ctx, sdec, &slen, p, eticklen); if (EVP_DecryptFinal(&ctx, sdec + slen, &mlen) <= 0) goto tickerr; fprintf(stderr, "Decrypt OK\n"); slen += mlen; EVP_CIPHER_CTX_cleanup(&ctx); p = sdec; Loading Loading @@ -1048,5 +1045,4 @@ fprintf(stderr, "Decrypt OK\n"); return 0; } #endif Loading
ssl/s3_srvr.c +1 −1 Original line number Diff line number Diff line Loading @@ -2730,7 +2730,7 @@ int ssl3_send_server_certificate(SSL *s) /* SSL3_ST_SW_CERT_B */ return(ssl3_do_write(s,SSL3_RT_HANDSHAKE)); } #ifndef OPENSSLP_NO_TLSEXT #ifndef OPENSSL_NO_TLSEXT int ssl3_send_newsession_ticket(SSL *s) { if (s->state == SSL3_ST_SW_SESSION_TICKET_A) Loading
ssl/t1_lib.c +0 −4 Original line number Diff line number Diff line Loading @@ -991,7 +991,6 @@ static int tls_decrypt_ticket(SSL *s, const unsigned char *etick, int eticklen, /* Check key name matches */ if (memcmp(etick, s->ctx->tlsext_tick_key_name, 16)) goto tickerr; fprintf(stderr, "Ticket match OK\n"); /* Check HMAC of encrypted ticket */ HMAC_CTX_init(&hctx); HMAC_Init_ex(&hctx, s->ctx->tlsext_tick_hmac_key, 16, Loading @@ -1001,7 +1000,6 @@ fprintf(stderr, "Ticket match OK\n"); HMAC_CTX_cleanup(&hctx); if (memcmp(tick_hmac, etick + eticklen, mlen)) goto tickerr; fprintf(stderr, "HMAC match OK\n"); /* Set p to start of IV */ p = etick + 16; EVP_CIPHER_CTX_init(&ctx); Loading @@ -1020,7 +1018,6 @@ fprintf(stderr, "HMAC match OK\n"); EVP_DecryptUpdate(&ctx, sdec, &slen, p, eticklen); if (EVP_DecryptFinal(&ctx, sdec + slen, &mlen) <= 0) goto tickerr; fprintf(stderr, "Decrypt OK\n"); slen += mlen; EVP_CIPHER_CTX_cleanup(&ctx); p = sdec; Loading Loading @@ -1048,5 +1045,4 @@ fprintf(stderr, "Decrypt OK\n"); return 0; } #endif