WIN32 fixes signed/unsigned issues and slightly socket semantics.

[openssl.git] / crypto / ocsp / ocsp_ht.c

diff --git a/crypto/ocsp/ocsp_ht.c b/crypto/ocsp/ocsp_ht.c
index 41e3da8..4b19920 100644 (file)
--- a/crypto/ocsp/ocsp_ht.c
+++ b/crypto/ocsp/ocsp_ht.c
@@ -169,7 +169,7 @@ static int parse_http_line1(char *line)
                continue;
        if(!*p)
                {
-               OCSPerr(OCSP_F_OCSP_SENDREQ_NBIO,
+               OCSPerr(OCSP_F_PARSE_HTTP_LINE1,
                                        OCSP_R_SERVER_RESPONSE_PARSE_ERROR);
                return 0;
                }
@@ -180,7 +180,7 @@ static int parse_http_line1(char *line)
 
        if(!*p)
                {
-               OCSPerr(OCSP_F_OCSP_SENDREQ_NBIO,
+               OCSPerr(OCSP_F_PARSE_HTTP_LINE1,
                                        OCSP_R_SERVER_RESPONSE_PARSE_ERROR);
                return 0;
                }
@@ -191,7 +191,7 @@ static int parse_http_line1(char *line)
 
        if(!*q)
                {
-               OCSPerr(OCSP_F_OCSP_SENDREQ_NBIO,
+               OCSPerr(OCSP_F_PARSE_HTTP_LINE1,
                                        OCSP_R_SERVER_RESPONSE_PARSE_ERROR);
                return 0;
                }
@@ -220,7 +220,7 @@ static int parse_http_line1(char *line)
                }
        if(retcode != 200)
                {
-               OCSPerr(OCSP_F_OCSP_SENDREQ_NBIO, OCSP_R_SERVER_RESPONSE_ERROR);
+               OCSPerr(OCSP_F_PARSE_HTTP_LINE1, OCSP_R_SERVER_RESPONSE_ERROR);
                if(!*q)
                        ERR_add_error_data(2, "Code=", p);
                else
@@ -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))
                {
@@ -246,7 +245,7 @@ int OCSP_sendreq_nbio(OCSP_RESPONSE **presp, OCSP_REQ_CTX *rctx)
                if (n <= 0)
                        {
                        if (BIO_should_retry(rctx->io))
-                       return -1;
+                               return -1;
                        return 0;
                        }
 
@@ -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;