generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

WIN32 fixes signed/unsigned issues and slightly socket semantics.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2006-07-17 18:52:51 +00:00
parent f0fa285f75
commit b589427941
3 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
apps/ocsp.c
View File

@ -1270,8 +1270,22 @@ static OCSP_RESPONSE *query_responder(BIO *err, BIO *cbio, char *path,
goto err; 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) if (!ctx)
return NULL; return NULL;
@ -1281,10 +1295,10 @@ static OCSP_RESPONSE *query_responder(BIO *err, BIO *cbio, char *path,
if (rv != -1) if (rv != -1)
break; break;
FD_ZERO(&confds); FD_ZERO(&confds);
FD_SET(fd, &confds); openssl_fdset(fd, &confds);
tv.tv_usec = 0; tv.tv_usec = 0;
tv.tv_sec = req_timeout; 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); rv = select(fd + 1, (void *)&confds, NULL, NULL, &tv);
else if (BIO_should_write(cbio)) else if (BIO_should_write(cbio))
rv = select(fd + 1, NULL, (void *)&confds, NULL, &tv); 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: err:
OCSP_REQ_CTX_free(ctx); OCSP_REQ_CTX_free(ctx);

5
crypto/ocsp/ocsp_ht.c
View File

@ -237,7 +237,6 @@ int OCSP_sendreq_nbio(OCSP_RESPONSE **presp, OCSP_REQ_CTX *rctx)
{ {
int i, n; int i, n;
const unsigned char *p; const unsigned char *p;
next_io: next_io:
if (!(rctx->state & OHS_NOREAD)) if (!(rctx->state & OHS_NOREAD))
{ {
@ -246,7 +245,7 @@ int OCSP_sendreq_nbio(OCSP_RESPONSE **presp, OCSP_REQ_CTX *rctx)
if (n <= 0) if (n <= 0)
{ {
if (BIO_should_retry(rctx->io)) if (BIO_should_retry(rctx->io))
return -1; return -1;
return 0; return 0;
} }
@ -420,7 +419,7 @@ int OCSP_sendreq_nbio(OCSP_RESPONSE **presp, OCSP_REQ_CTX *rctx)
case OHS_ASN1_CONTENT: case OHS_ASN1_CONTENT:
n = BIO_get_mem_data(rctx->mem, &p); n = BIO_get_mem_data(rctx->mem, &p);
if (n < rctx->asn1_len) if (n < (int)rctx->asn1_len)
goto next_io; goto next_io;

3
util/libeay.num
View File

@ -3772,3 +3772,6 @@ OBJ_sigid_free 4164 EXIST::FUNCTION:
EVP_CIPHER_do_all 4165 EXIST::FUNCTION: EVP_CIPHER_do_all 4165 EXIST::FUNCTION:
EVP_CIPHER_do_all_sorted 4166 EXIST::FUNCTION: EVP_CIPHER_do_all_sorted 4166 EXIST::FUNCTION:
EVP_MD_do_all 4167 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: