OpenSSL: openssl/apps/ ocsp.c openssl/crypto/ocsp/ ocsp_ht.c ope...

  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:  
17-Jul-2006 20:52:52
  Branch: HEAD                             Handle:
2006071719525001

  Modified files:
    openssl/apps            ocsp.c
    openssl/crypto/ocsp     ocsp_ht.c
    openssl/util            libeay.num

  Log:
    WIN32 fixes signed/unsigned issues and slightly socket
semantics.

  Summary:
    Revision    Changes     Path
    1.36        +17 -4      openssl/apps/ocsp.c
    1.9         +2  -3      openssl/crypto/ocsp/ocsp_ht.c
    1.274       +3  -0      openssl/util/libeay.num
 
____________________________________________________________
________________

  patch -p0 <<' .'
  Index: openssl/apps/ocsp.c
 
============================================================
================
  $ cvs diff -u -r1.35 -r1.36 ocsp.c
  --- openssl/apps/ocsp.c	17 Jul 2006 13:26:54 -0000	1.35
  +++ openssl/apps/ocsp.c	17 Jul 2006 18:52:50 -0000	1.36
   -1270,8 +1270,22 
   		goto err;
   		}
   
  -	ctx = OCSP_sendreq_new(cbio, path, req, -1);
  +	if (rv <= 0)
  +		{
  +		FD_ZERO(&confds);
  +		openssl_fdset(fd, &confds);
  +		tv.tv_usec = 0;
  +		tv.tv_sec = req_timeout;
  +		rv = select(fd + 1, NULL, (void *)&confds, NULL,
&tv);
  +		if (rv == 0)
  +			{
  +			BIO_puts(err, "Timeout on connect\n");
  +			return NULL;
  +			}
  +		}
   
  +
  +	ctx = OCSP_sendreq_new(cbio, path, req, -1);
   	if (!ctx)
   		return NULL;
   	
   -1281,10 +1295,10 
   		if (rv != -1)
   			break;
   		FD_ZERO(&confds);
  -		FD_SET(fd, &confds);
  +		openssl_fdset(fd, &confds);
   		tv.tv_usec = 0;
   		tv.tv_sec = req_timeout;
  -		if (BIO_should_read(cbio) ||
BIO_should_io_special(cbio))
  +		if (BIO_should_read(cbio))
   			rv = select(fd + 1, (void *)&confds, NULL, NULL,
&tv);
   		else if (BIO_should_write(cbio))
   			rv = select(fd + 1, NULL, (void *)&confds, NULL,
&tv);
   -1305,7 +1319,6 
   			}
   			
   		}
  -
   	err:
   
   	OCSP_REQ_CTX_free(ctx);
   .
  patch -p0 <<' .'
  Index: openssl/crypto/ocsp/ocsp_ht.c
 
============================================================
================
  $ cvs diff -u -r1.8 -r1.9 ocsp_ht.c
  --- openssl/crypto/ocsp/ocsp_ht.c	17 Jul 2006 16:33:28
-0000	1.8
  +++ openssl/crypto/ocsp/ocsp_ht.c	17 Jul 2006 18:52:51
-0000	1.9
   -237,7 +237,6 
   	{
   	int i, n;
   	const unsigned char *p;
  -	
   	next_io:
   	if (!(rctx->state & OHS_NOREAD))
   		{
   -246,7 +245,7 
   		if (n <= 0)
   			{
   			if (BIO_should_retry(rctx->io))
  -			return -1;
  +				return -1;
   			return 0;
   			}
   
   -420,7 +419,7 
   		
   		case OHS_ASN1_CONTENT:
   		n = BIO_get_mem_data(rctx->mem, &p);
  -		if (n < rctx->asn1_len)
  +		if (n < (int)rctx->asn1_len)
   			goto next_io;
   
   
   .
  patch -p0 <<' .'
  Index: openssl/util/libeay.num
 
============================================================
================
  $ cvs diff -u -r1.273 -r1.274 libeay.num
  --- openssl/util/libeay.num	10 Jul 2006 18:40:42
-0000	1.273
  +++ openssl/util/libeay.num	17 Jul 2006 18:52:51
-0000	1.274
   -3772,3 +3772,6 
   EVP_CIPHER_do_all                      
4165	EXIST::FUNCTION:
   EVP_CIPHER_do_all_sorted               
4166	EXIST::FUNCTION:
   EVP_MD_do_all                          
4167	EXIST::FUNCTION:
  +OCSP_REQ_CTX_free                      
4168	EXIST::FUNCTION:
  +OCSP_sendreq_nbio                      
4169	EXIST::FUNCTION:
  +OCSP_sendreq_new                       
4170	EXIST::FUNCTION:
   .
____________________________________________________________
__________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                    
openssl-cvsopenssl.org
Automated List Manager                          
majordomoopenssl.org