Commit b5894279 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

WIN32 fixes signed/unsigned issues and slightly socket semantics.

parent f0fa285f

apps/ocsp.c

+17 −4
Original line number Diff line number Diff line
@@ -1270,8 +1270,22 @@ static OCSP_RESPONSE *query_responder(BIO *err, BIO *cbio, char *path, 
		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 @@ static OCSP_RESPONSE *query_responder(BIO *err, BIO *cbio, char *path, 
		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 @@ static OCSP_RESPONSE *query_responder(BIO *err, BIO *cbio, char *path, 
			}

			

		}



	err:



	OCSP_REQ_CTX_free(ctx);

crypto/ocsp/ocsp_ht.c

+2 −3
Original line number Diff line number Diff line
@@ -237,7 +237,6 @@ int OCSP_sendreq_nbio(OCSP_RESPONSE **presp, OCSP_REQ_CTX *rctx) 
	{

	int i, n;

	const unsigned char *p;

	

	next_io:

	if (!(rctx->state & OHS_NOREAD))

		{
@@ -420,7 +419,7 @@ int OCSP_sendreq_nbio(OCSP_RESPONSE **presp, OCSP_REQ_CTX *rctx) 
		

		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;

util/libeay.num

+3 −0
Original line number Diff line number Diff line
@@ -3772,3 +3772,6 @@ OBJ_sigid_free 4164 EXIST::FUNCTION: 
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: