Remove debugging fprintfs, fix typo.

diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index 0d90198a8fd6a7d53f15a082065a1c8beeb470a9..1246cd227f7c2fe9a8b07bbecd21ed92e45c1aa5 100644 (file)
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -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)

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 6c78abe7fce387f48ef960a5c219b2de4a6588f0..da98e9b1cda2ec39928bbb6475c565c04573bb11 100644 (file)
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -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,
@@ -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);
@@ -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;
@@ -1047,6 +1044,5 @@ fprintf(stderr, "Decrypt OK\n");
        s->tlsext_ticket_expected = 1;
        return 0;
        }
-       
 
 #endif