OpenSSL: openssl/ssl/ s3_srvr.c t1_lib.c

  OpenSSL CVS Repository
  http://cvs.openssl.org/
 
____________________________________________________________
________________

  Server: cvs.openssl.org                  Name:   Dr.
Stephen Henson
  Root:   /v/openssl/cvs                   Email:  steveopenssl.org
  Module: openssl                          Date:  
12-Aug-2007 19:06:28
  Branch: HEAD                             Handle:
2007081218062305

  Modified files:
    openssl/ssl             s3_srvr.c t1_lib.c

  Log:
    Remove debugging fprintfs, fix typo.

  Summary:
    Revision    Changes     Path
    1.153       +1  -1      openssl/ssl/s3_srvr.c
    1.42        +0  -4      openssl/ssl/t1_lib.c
 
____________________________________________________________
________________

  patch -p0 <<' .'
  Index: openssl/ssl/s3_srvr.c
 
============================================================
================
  $ cvs diff -u -r1.152 -r1.153 s3_srvr.c
  --- openssl/ssl/s3_srvr.c	11 Aug 2007 23:18:21
-0000	1.152
  +++ openssl/ssl/s3_srvr.c	12 Aug 2007 17:06:23
-0000	1.153
   -2730,7 +2730,7 
   	/* 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)
   .
  patch -p0 <<' .'
  Index: openssl/ssl/t1_lib.c
 
============================================================
================
  $ cvs diff -u -r1.41 -r1.42 t1_lib.c
  --- openssl/ssl/t1_lib.c	11 Aug 2007 23:18:29 -0000	1.41
  +++ openssl/ssl/t1_lib.c	12 Aug 2007 17:06:28 -0000	1.42
   -991,7 +991,6 
   	/* Check key name matches */
   	if (memcmp(etick, s->ctx->tlsext_tick_key_name,
16))
   		goto tickerr;
  -fprintf(stderr, "Ticket match OKn");
   	/* Check HMAC of encrypted ticket */
   	HMAC_CTX_init(&hctx);
   	HMAC_Init_ex(&hctx,
s->ctx->tlsext_tick_hmac_key, 16,
   -1001,7 +1000,6 
   	HMAC_CTX_cleanup(&hctx);
   	if (memcmp(tick_hmac, etick + eticklen, mlen))
   		goto tickerr;
  -fprintf(stderr, "HMAC match OKn");
   	/* Set p to start of IV */
   	p = etick + 16;
   	EVP_CIPHER_CTX_init(&ctx);
   -1020,7 +1018,6 
   	EVP_DecryptUpdate(&ctx, sdec, &slen, p,
eticklen);
   	if (EVP_DecryptFinal(&ctx, sdec + slen, &mlen)
<= 0)
   		goto tickerr;
  -fprintf(stderr, "Decrypt OKn");
   	slen += mlen;
   	EVP_CIPHER_CTX_cleanup(&ctx);
   	p = sdec;
   -1047,6 +1044,5 
   	s->tlsext_ticket_expected = 1;
   	return 0;
   	}
  -	
   
   #endif
   .
____________________________________________________________
__________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                    
openssl-cvsopenssl.org
Automated List Manager                          
majordomoopenssl.org