resolve conflicts

9 files changed, 441 insertions, 132 deletions

diff --git a/src/lib/libcrypto/ocsp/ocsp.h b/src/lib/libcrypto/ocsp/ocsp.h
index fab3c03182..a0577a717e 100644
--- a/src/lib/libcrypto/ocsp/ocsp.h
+++ b/src/lib/libcrypto/ocsp/ocsp.h
@@ -186,11 +186,11 @@ typedef struct ocsp_resp_bytes_st
  *      responseStatus         OCSPResponseStatus,
  *      responseBytes          [0] EXPLICIT ResponseBytes OPTIONAL }
  */
-typedef struct ocsp_response_st
+struct ocsp_response_st
         {
         ASN1_ENUMERATED *responseStatus;
         OCSP_RESPBYTES  *responseBytes;
-        } OCSP_RESPONSE;
+        };
 
 /*   ResponderID ::= CHOICE {
  *      byName   [1] Name,
@@ -198,14 +198,18 @@ typedef struct ocsp_response_st
  */
 #define V_OCSP_RESPID_NAME 0
 #define V_OCSP_RESPID_KEY  1
-typedef struct ocsp_responder_id_st
+struct ocsp_responder_id_st
         {
         int type;
         union   {
                 X509_NAME* byName;
                 ASN1_OCTET_STRING *byKey;
                 } value;
-        } OCSP_RESPID;
+        };
+
+DECLARE_STACK_OF(OCSP_RESPID)
+DECLARE_ASN1_FUNCTIONS(OCSP_RESPID)
+
 /*   KeyHash ::= OCTET STRING --SHA-1 hash of responder's public key
  *                            --(excluding the tag and length fields)
  */
@@ -349,13 +353,9 @@ typedef struct ocsp_service_locator_st
 #define PEM_STRING_OCSP_REQUEST "OCSP REQUEST"
 #define PEM_STRING_OCSP_RESPONSE "OCSP RESPONSE"
 
-#define d2i_OCSP_REQUEST_bio(bp,p) (OCSP_REQUEST*)ASN1_d2i_bio((char*(*)()) \
-                OCSP_REQUEST_new,(char *(*)())d2i_OCSP_REQUEST, (bp),\
-                (unsigned char **)(p))
+#define d2i_OCSP_REQUEST_bio(bp,p) ASN1_d2i_bio_of(OCSP_REQUEST,OCSP_REQUEST_new,d2i_OCSP_REQUEST,bp,p)
 
-#define d2i_OCSP_RESPONSE_bio(bp,p) (OCSP_RESPONSE*)ASN1_d2i_bio((char*(*)())\
-                OCSP_REQUEST_new,(char *(*)())d2i_OCSP_RESPONSE, (bp),\
-                (unsigned char **)(p))
+#define d2i_OCSP_RESPONSE_bio(bp,p) ASN1_d2i_bio_of(OCSP_RESPONSE,OCSP_RESPONSE_new,d2i_OCSP_RESPONSE,bp,p)
 
 #define PEM_read_bio_OCSP_REQUEST(bp,x,cb) (OCSP_REQUEST *)PEM_ASN1_read_bio( \
      (char *(*)())d2i_OCSP_REQUEST,PEM_STRING_OCSP_REQUEST,bp,(char **)x,cb,NULL)
@@ -371,11 +371,9 @@ typedef struct ocsp_service_locator_st
     PEM_ASN1_write_bio((int (*)())i2d_OCSP_RESPONSE,PEM_STRING_OCSP_RESPONSE,\
                         bp,(char *)o, NULL,NULL,0,NULL,NULL)
 
-#define i2d_OCSP_RESPONSE_bio(bp,o) ASN1_i2d_bio(i2d_OCSP_RESPONSE,bp,\
-                (unsigned char *)o)
+#define i2d_OCSP_RESPONSE_bio(bp,o) ASN1_i2d_bio_of(OCSP_RESPONSE,i2d_OCSP_RESPONSE,bp,o)
 
-#define i2d_OCSP_REQUEST_bio(bp,o) ASN1_i2d_bio(i2d_OCSP_REQUEST,bp,\
-                (unsigned char *)o)
+#define i2d_OCSP_REQUEST_bio(bp,o) ASN1_i2d_bio_of(OCSP_REQUEST,i2d_OCSP_REQUEST,bp,o)
 
 #define OCSP_REQUEST_sign(o,pkey,md) \
         ASN1_item_sign(ASN1_ITEM_rptr(OCSP_REQINFO),\
@@ -396,14 +394,17 @@ typedef struct ocsp_service_locator_st
 #define ASN1_BIT_STRING_digest(data,type,md,len) \
         ASN1_item_digest(ASN1_ITEM_rptr(ASN1_BIT_STRING),type,data,md,len)
 
-#define OCSP_CERTID_dup(cid) (OCSP_CERTID*)ASN1_dup((int(*)())i2d_OCSP_CERTID,\
-                (char *(*)())d2i_OCSP_CERTID,(char *)(cid))
+#define OCSP_CERTID_dup(cid) ASN1_dup_of(OCSP_CERTID,i2d_OCSP_CERTID,d2i_OCSP_CERTID,cid)
 
 #define OCSP_CERTSTATUS_dup(cs)\
                 (OCSP_CERTSTATUS*)ASN1_dup((int(*)())i2d_OCSP_CERTSTATUS,\
                 (char *(*)())d2i_OCSP_CERTSTATUS,(char *)(cs))
 
 OCSP_RESPONSE *OCSP_sendreq_bio(BIO *b, char *path, OCSP_REQUEST *req);
+OCSP_REQ_CTX *OCSP_sendreq_new(BIO *io, char *path, OCSP_REQUEST *req,
+                                                                int maxline);
+int OCSP_sendreq_nbio(OCSP_RESPONSE **presp, OCSP_REQ_CTX *rctx);
+void OCSP_REQ_CTX_free(OCSP_REQ_CTX *rctx);
 
 OCSP_CERTID *OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
 
@@ -473,8 +474,10 @@ int OCSP_basic_sign(OCSP_BASICRESP *brsp,
                         X509 *signer, EVP_PKEY *key, const EVP_MD *dgst,
                         STACK_OF(X509) *certs, unsigned long flags);
 
-ASN1_STRING *ASN1_STRING_encode(ASN1_STRING *s, int (*i2d)(), 
-                                char *data, STACK_OF(ASN1_OBJECT) *sk);
+ASN1_STRING *ASN1_STRING_encode(ASN1_STRING *s, i2d_of_void *i2d,
+                                void *data, STACK_OF(ASN1_OBJECT) *sk);
+#define ASN1_STRING_encode_of(type,s,i2d,data,sk) \
+        ASN1_STRING_encode(s, CHECKED_I2D_OF(type, i2d), data, sk)
 
 X509_EXTENSION *OCSP_crlID_new(char *url, long *n, char *tim);
 
@@ -564,11 +567,11 @@ void ERR_load_OCSP_strings(void);
 
 /* Function codes. */
 #define OCSP_F_ASN1_STRING_ENCODE                        100
-#define OCSP_F_CERT_ID_NEW                               101
 #define OCSP_F_D2I_OCSP_NONCE                            102
 #define OCSP_F_OCSP_BASIC_ADD1_STATUS                    103
 #define OCSP_F_OCSP_BASIC_SIGN                           104
 #define OCSP_F_OCSP_BASIC_VERIFY                         105
+#define OCSP_F_OCSP_CERT_ID_NEW                          101
 #define OCSP_F_OCSP_CHECK_DELEGATED                      106
 #define OCSP_F_OCSP_CHECK_IDS                            107
 #define OCSP_F_OCSP_CHECK_ISSUER                         108
@@ -579,6 +582,7 @@ void ERR_load_OCSP_strings(void);
 #define OCSP_F_OCSP_REQUEST_VERIFY                       116
 #define OCSP_F_OCSP_RESPONSE_GET1_BASIC                  111
 #define OCSP_F_OCSP_SENDREQ_BIO                          112
+#define OCSP_F_PARSE_HTTP_LINE1                          117
 #define OCSP_F_REQUEST_VERIFY                            113
 
 /* Reason codes. */
diff --git a/src/lib/libcrypto/ocsp/ocsp_asn.c b/src/lib/libcrypto/ocsp/ocsp_asn.c
index 6a3a360d54..39b7a1c568 100644
--- a/src/lib/libcrypto/ocsp/ocsp_asn.c
+++ b/src/lib/libcrypto/ocsp/ocsp_asn.c
@@ -62,7 +62,7 @@
 ASN1_SEQUENCE(OCSP_SIGNATURE) = {
         ASN1_SIMPLE(OCSP_SIGNATURE, signatureAlgorithm, X509_ALGOR),
         ASN1_SIMPLE(OCSP_SIGNATURE, signature, ASN1_BIT_STRING),
-        ASN1_EXP_SEQUENCE_OF(OCSP_SIGNATURE, certs, X509, 0)
+        ASN1_EXP_SEQUENCE_OF_OPT(OCSP_SIGNATURE, certs, X509, 0)
 } ASN1_SEQUENCE_END(OCSP_SIGNATURE)
 
 IMPLEMENT_ASN1_FUNCTIONS(OCSP_SIGNATURE)
diff --git a/src/lib/libcrypto/ocsp/ocsp_cl.c b/src/lib/libcrypto/ocsp/ocsp_cl.c
index 9b3e6dd8ca..17bab5fc59 100644
--- a/src/lib/libcrypto/ocsp/ocsp_cl.c
+++ b/src/lib/libcrypto/ocsp/ocsp_cl.c
@@ -101,6 +101,8 @@ int OCSP_request_set1_name(OCSP_REQUEST *req, X509_NAME *nm)
         {
         GENERAL_NAME *gen;
         gen = GENERAL_NAME_new();
+        if (gen == NULL)
+                return 0;
         if (!X509_NAME_set(&gen->d.directoryName, nm))
                 {
                 GENERAL_NAME_free(gen);
diff --git a/src/lib/libcrypto/ocsp/ocsp_err.c b/src/lib/libcrypto/ocsp/ocsp_err.c
index 65e6093fbc..d2f2e79f44 100644
--- a/src/lib/libcrypto/ocsp/ocsp_err.c
+++ b/src/lib/libcrypto/ocsp/ocsp_err.c
@@ -1,6 +1,6 @@
 /* crypto/ocsp/ocsp_err.c */
 /* ====================================================================
- * Copyright (c) 1999-2005 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1999-2007 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -71,11 +71,11 @@
 static ERR_STRING_DATA OCSP_str_functs[]=
         {
 {ERR_FUNC(OCSP_F_ASN1_STRING_ENCODE),   "ASN1_STRING_encode"},
-{ERR_FUNC(OCSP_F_CERT_ID_NEW),  "CERT_ID_NEW"},
 {ERR_FUNC(OCSP_F_D2I_OCSP_NONCE),       "D2I_OCSP_NONCE"},
 {ERR_FUNC(OCSP_F_OCSP_BASIC_ADD1_STATUS),       "OCSP_basic_add1_status"},
 {ERR_FUNC(OCSP_F_OCSP_BASIC_SIGN),      "OCSP_basic_sign"},
 {ERR_FUNC(OCSP_F_OCSP_BASIC_VERIFY),    "OCSP_basic_verify"},
+{ERR_FUNC(OCSP_F_OCSP_CERT_ID_NEW),     "OCSP_cert_id_new"},
 {ERR_FUNC(OCSP_F_OCSP_CHECK_DELEGATED), "OCSP_CHECK_DELEGATED"},
 {ERR_FUNC(OCSP_F_OCSP_CHECK_IDS),       "OCSP_CHECK_IDS"},
 {ERR_FUNC(OCSP_F_OCSP_CHECK_ISSUER),    "OCSP_CHECK_ISSUER"},
@@ -86,6 +86,7 @@ static ERR_STRING_DATA OCSP_str_functs[]=
 {ERR_FUNC(OCSP_F_OCSP_REQUEST_VERIFY),  "OCSP_request_verify"},
 {ERR_FUNC(OCSP_F_OCSP_RESPONSE_GET1_BASIC),     "OCSP_response_get1_basic"},
 {ERR_FUNC(OCSP_F_OCSP_SENDREQ_BIO),     "OCSP_sendreq_bio"},
+{ERR_FUNC(OCSP_F_PARSE_HTTP_LINE1),     "PARSE_HTTP_LINE1"},
 {ERR_FUNC(OCSP_F_REQUEST_VERIFY),       "REQUEST_VERIFY"},
 {0,NULL}
         };
@@ -129,15 +130,12 @@ static ERR_STRING_DATA OCSP_str_reasons[]=
 
 void ERR_load_OCSP_strings(void)
         {
-        static int init=1;
+#ifndef OPENSSL_NO_ERR
 
-        if (init)
+        if (ERR_func_error_string(OCSP_str_functs[0].error) == NULL)
                 {
-                init=0;
-#ifndef OPENSSL_NO_ERR
                 ERR_load_strings(0,OCSP_str_functs);
                 ERR_load_strings(0,OCSP_str_reasons);
-#endif
-
                 }
+#endif
         }
diff --git a/src/lib/libcrypto/ocsp/ocsp_ext.c b/src/lib/libcrypto/ocsp/ocsp_ext.c
index 57399433fc..815cc29d58 100644
--- a/src/lib/libcrypto/ocsp/ocsp_ext.c
+++ b/src/lib/libcrypto/ocsp/ocsp_ext.c
@@ -265,8 +265,8 @@ int OCSP_SINGLERESP_add_ext(OCSP_SINGLERESP *x, X509_EXTENSION *ex, int loc)
 
 /* also CRL Entry Extensions */
 
-ASN1_STRING *ASN1_STRING_encode(ASN1_STRING *s, int (*i2d)(), 
-                                char *data, STACK_OF(ASN1_OBJECT) *sk)
+ASN1_STRING *ASN1_STRING_encode(ASN1_STRING *s, i2d_of_void *i2d,
+                                void *data, STACK_OF(ASN1_OBJECT) *sk)
         {
         int i;
         unsigned char *p, *b = NULL;
@@ -274,18 +274,23 @@ ASN1_STRING *ASN1_STRING_encode(ASN1_STRING *s, int (*i2d)(),
         if (data)
                 {
                 if ((i=i2d(data,NULL)) <= 0) goto err;
-                if (!(b=p=(unsigned char*)OPENSSL_malloc((unsigned int)i)))
+                if (!(b=p=OPENSSL_malloc((unsigned int)i)))
                         goto err;
                 if (i2d(data, &p) <= 0) goto err;
                 }
         else if (sk)
                 {
-                if ((i=i2d_ASN1_SET_OF_ASN1_OBJECT(sk,NULL,i2d,V_ASN1_SEQUENCE,
-                                   V_ASN1_UNIVERSAL,IS_SEQUENCE))<=0) goto err;
-                if (!(b=p=(unsigned char*)OPENSSL_malloc((unsigned int)i)))
+                if ((i=i2d_ASN1_SET_OF_ASN1_OBJECT(sk,NULL,
+                                                   (I2D_OF(ASN1_OBJECT))i2d,
+                                                   V_ASN1_SEQUENCE,
+                                                   V_ASN1_UNIVERSAL,
+                                                   IS_SEQUENCE))<=0) goto err;
+                if (!(b=p=OPENSSL_malloc((unsigned int)i)))
                         goto err;
-                if (i2d_ASN1_SET_OF_ASN1_OBJECT(sk,&p,i2d,V_ASN1_SEQUENCE,
-                                 V_ASN1_UNIVERSAL,IS_SEQUENCE)<=0) goto err;
+                if (i2d_ASN1_SET_OF_ASN1_OBJECT(sk,&p,(I2D_OF(ASN1_OBJECT))i2d,
+                                                V_ASN1_SEQUENCE,
+                                                V_ASN1_UNIVERSAL,
+                                                IS_SEQUENCE)<=0) goto err;
                 }
         else
                 {
@@ -439,7 +444,8 @@ X509_EXTENSION *OCSP_crlID_new(char *url, long *n, char *tim)
                 }
         if (!(x = X509_EXTENSION_new())) goto err;
         if (!(x->object = OBJ_nid2obj(NID_id_pkix_OCSP_CrlID))) goto err;
-        if (!(ASN1_STRING_encode(x->value,i2d_OCSP_CRLID,(char*)cid,NULL)))
+        if (!(ASN1_STRING_encode_of(OCSP_CRLID,x->value,i2d_OCSP_CRLID,cid,
+                                    NULL)))
                 goto err;
         OCSP_CRLID_free(cid);
         return x;
@@ -467,7 +473,8 @@ X509_EXTENSION *OCSP_accept_responses_new(char **oids)
         if (!(x = X509_EXTENSION_new())) goto err;
         if (!(x->object = OBJ_nid2obj(NID_id_pkix_OCSP_acceptableResponses)))
                 goto err;
-        if (!(ASN1_STRING_encode(x->value,i2d_ASN1_OBJECT,NULL,sk)))
+        if (!(ASN1_STRING_encode_of(ASN1_OBJECT,x->value,i2d_ASN1_OBJECT,NULL,
+                                    sk)))
                 goto err;
         sk_ASN1_OBJECT_pop_free(sk, ASN1_OBJECT_free);
         return x;
@@ -487,8 +494,8 @@ X509_EXTENSION *OCSP_archive_cutoff_new(char* tim)
         if (!(ASN1_GENERALIZEDTIME_set_string(gt, tim))) goto err;
         if (!(x = X509_EXTENSION_new())) goto err;
         if (!(x->object=OBJ_nid2obj(NID_id_pkix_OCSP_archiveCutoff)))goto err;
-        if (!(ASN1_STRING_encode(x->value,i2d_ASN1_GENERALIZEDTIME,
-                                 (char*)gt,NULL))) goto err;
+        if (!(ASN1_STRING_encode_of(ASN1_GENERALIZEDTIME,x->value,
+                                    i2d_ASN1_GENERALIZEDTIME,gt,NULL))) goto err;
         ASN1_GENERALIZEDTIME_free(gt);
         return x;
 err:
@@ -526,8 +533,8 @@ X509_EXTENSION *OCSP_url_svcloc_new(X509_NAME* issuer, char **urls)
         if (!(x = X509_EXTENSION_new())) goto err;
         if (!(x->object = OBJ_nid2obj(NID_id_pkix_OCSP_serviceLocator))) 
                 goto err;
-        if (!(ASN1_STRING_encode(x->value, i2d_OCSP_SERVICELOC,
-                                 (char*)sloc, NULL))) goto err;
+        if (!(ASN1_STRING_encode_of(OCSP_SERVICELOC,x->value,
+                                    i2d_OCSP_SERVICELOC,sloc,NULL))) goto err;
         OCSP_SERVICELOC_free(sloc);
         return x;
 err:
diff --git a/src/lib/libcrypto/ocsp/ocsp_ht.c b/src/lib/libcrypto/ocsp/ocsp_ht.c
index 2c48171883..a8e569b74a 100644
--- a/src/lib/libcrypto/ocsp/ocsp_ht.c
+++ b/src/lib/libcrypto/ocsp/ocsp_ht.c
@@ -1,9 +1,9 @@
 /* ocsp_ht.c */
 /* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 2000.
+ * project 2006.
  */
 /* ====================================================================
- * Copyright (c) 2000 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -68,106 +68,404 @@
 #define strtoul (unsigned long)strtol
 #endif /* OPENSSL_SYS_SUNOS */
 
-/* Quick and dirty HTTP OCSP request handler.
- * Could make this a bit cleverer by adding
- * support for non blocking BIOs and a few
- * other refinements.
- */
+/* Stateful OCSP request code, supporting non-blocking I/O */
 
-OCSP_RESPONSE *OCSP_sendreq_bio(BIO *b, char *path, OCSP_REQUEST *req)
-{
-        BIO *mem = NULL;
-        char tmpbuf[1024];
-        OCSP_RESPONSE *resp = NULL;
-        char *p, *q, *r;
-        int len, retcode;
-        static char req_txt[] =
-"POST %s HTTP/1.0\r\n\
-Content-Type: application/ocsp-request\r\n\
-Content-Length: %d\r\n\r\n";
-
-        len = i2d_OCSP_REQUEST(req, NULL);
-        if(BIO_printf(b, req_txt, path, len) < 0) {
-                OCSPerr(OCSP_F_OCSP_SENDREQ_BIO,OCSP_R_SERVER_WRITE_ERROR);
-                goto err;
-        }
-        if(i2d_OCSP_REQUEST_bio(b, req) <= 0) {
-                OCSPerr(OCSP_F_OCSP_SENDREQ_BIO,OCSP_R_SERVER_WRITE_ERROR);
-                goto err;
+/* Opaque OCSP request status structure */
+
+struct ocsp_req_ctx_st {
+        int state;              /* Current I/O state */
+        unsigned char *iobuf;   /* Line buffer */
+        int iobuflen;           /* Line buffer length */
+        BIO *io;                /* BIO to perform I/O with */
+        BIO *mem;               /* Memory BIO response is built into */
+        unsigned long asn1_len; /* ASN1 length of response */
+        };
+
+#define OCSP_MAX_REQUEST_LENGTH (100 * 1024)
+#define OCSP_MAX_LINE_LEN       4096;
+
+/* OCSP states */
+
+/* If set no reading should be performed */
+#define OHS_NOREAD              0x1000
+/* Error condition */
+#define OHS_ERROR               (0 | OHS_NOREAD)
+/* First line being read */
+#define OHS_FIRSTLINE           1
+/* MIME headers being read */
+#define OHS_HEADERS             2
+/* OCSP initial header (tag + length) being read */
+#define OHS_ASN1_HEADER         3
+/* OCSP content octets being read */
+#define OHS_ASN1_CONTENT        4
+/* Request being sent */
+#define OHS_ASN1_WRITE          (6 | OHS_NOREAD)
+/* Request being flushed */
+#define OHS_ASN1_FLUSH          (7 | OHS_NOREAD)
+/* Completed */
+#define OHS_DONE                (8 | OHS_NOREAD)
+
+
+static int parse_http_line1(char *line);
+
+void OCSP_REQ_CTX_free(OCSP_REQ_CTX *rctx)
+        {
+        if (rctx->mem)
+                BIO_free(rctx->mem);
+        if (rctx->iobuf)
+                OPENSSL_free(rctx->iobuf);
+        OPENSSL_free(rctx);
         }
-        if(!(mem = BIO_new(BIO_s_mem()))) goto err;
-        /* Copy response to a memory BIO: socket bios can't do gets! */
-        while ((len = BIO_read(b, tmpbuf, sizeof tmpbuf))) {
-                if(len < 0) {
-                        OCSPerr(OCSP_F_OCSP_SENDREQ_BIO,OCSP_R_SERVER_READ_ERROR);
-                        goto err;
+
+OCSP_REQ_CTX *OCSP_sendreq_new(BIO *io, char *path, OCSP_REQUEST *req,
+                                                                int maxline)
+        {
+        static char post_hdr[] = "POST %s HTTP/1.0\r\n"
+        "Content-Type: application/ocsp-request\r\n"
+        "Content-Length: %d\r\n\r\n";
+
+        OCSP_REQ_CTX *rctx;
+        rctx = OPENSSL_malloc(sizeof(OCSP_REQ_CTX));
+        rctx->state = OHS_FIRSTLINE;
+        rctx->mem = BIO_new(BIO_s_mem());
+        rctx->io = io;
+        if (maxline > 0)
+                rctx->iobuflen = maxline;
+        else
+                rctx->iobuflen = OCSP_MAX_LINE_LEN;
+        rctx->iobuf = OPENSSL_malloc(rctx->iobuflen);
+        if (!path)
+                path = "/";
+
+        if (BIO_printf(rctx->mem, post_hdr, path,
+                                i2d_OCSP_REQUEST(req, NULL)) <= 0)
+                {
+                rctx->state = OHS_ERROR;
+                return 0;
                 }
-                BIO_write(mem, tmpbuf, len);
-        }
-        if(BIO_gets(mem, tmpbuf, 512) <= 0) {
-                OCSPerr(OCSP_F_OCSP_SENDREQ_BIO,OCSP_R_SERVER_RESPONSE_PARSE_ERROR);
-                goto err;
+        if (i2d_OCSP_REQUEST_bio(rctx->mem, req) <= 0)
+                {
+                rctx->state = OHS_ERROR;
+                return 0;
+                }
+        rctx->state = OHS_ASN1_WRITE;
+        rctx->asn1_len = BIO_get_mem_data(rctx->mem, NULL);
+
+        return rctx;
         }
-        /* Parse the HTTP response. This will look like this:
-         * "HTTP/1.0 200 OK". We need to obtain the numeric code and
-         * (optional) informational message.
-         */
 
+/* Parse the HTTP response. This will look like this:
+ * "HTTP/1.0 200 OK". We need to obtain the numeric code and
+ * (optional) informational message.
+ */
+
+static int parse_http_line1(char *line)
+        {
+        int retcode;
+        char *p, *q, *r;
         /* Skip to first white space (passed protocol info) */
-        for(p = tmpbuf; *p && !isspace((unsigned char)*p); p++) continue;
-        if(!*p) {
-                OCSPerr(OCSP_F_OCSP_SENDREQ_BIO,OCSP_R_SERVER_RESPONSE_PARSE_ERROR);
-                goto err;
-        }
+
+        for(p = line; *p && !isspace((unsigned char)*p); p++)
+                continue;
+        if(!*p)
+                {
+                OCSPerr(OCSP_F_PARSE_HTTP_LINE1,
+                                        OCSP_R_SERVER_RESPONSE_PARSE_ERROR);
+                return 0;
+                }
+
         /* Skip past white space to start of response code */
-        while(isspace((unsigned char)*p)) p++;
-        if(!*p) {
-                OCSPerr(OCSP_F_OCSP_SENDREQ_BIO,OCSP_R_SERVER_RESPONSE_PARSE_ERROR);
-                goto err;
-        }
+        while(*p && isspace((unsigned char)*p))
+                p++;
+
+        if(!*p)
+                {
+                OCSPerr(OCSP_F_PARSE_HTTP_LINE1,
+                                        OCSP_R_SERVER_RESPONSE_PARSE_ERROR);
+                return 0;
+                }
+
         /* Find end of response code: first whitespace after start of code */
-        for(q = p; *q && !isspace((unsigned char)*q); q++) continue;
-        if(!*q) {
-                OCSPerr(OCSP_F_OCSP_SENDREQ_BIO,OCSP_R_SERVER_RESPONSE_PARSE_ERROR);
-                goto err;
-        }
+        for(q = p; *q && !isspace((unsigned char)*q); q++)
+                continue;
+
+        if(!*q)
+                {
+                OCSPerr(OCSP_F_PARSE_HTTP_LINE1,
+                                        OCSP_R_SERVER_RESPONSE_PARSE_ERROR);
+                return 0;
+                }
+
         /* Set end of response code and start of message */ 
         *q++ = 0;
+
         /* Attempt to parse numeric code */
         retcode = strtoul(p, &r, 10);
-        if(*r) goto err;
+
+        if(*r)
+                return 0;
+
         /* Skip over any leading white space in message */
-        while(isspace((unsigned char)*q))  q++;
-        if(*q) {
-        /* Finally zap any trailing white space in message (include CRLF) */
-        /* We know q has a non white space character so this is OK */
-                for(r = q + strlen(q) - 1; isspace((unsigned char)*r); r--) *r = 0;
-        }
-        if(retcode != 200) {
-                OCSPerr(OCSP_F_OCSP_SENDREQ_BIO,OCSP_R_SERVER_RESPONSE_ERROR);
-                if(!*q) { 
-                        ERR_add_error_data(2, "Code=", p);
+        while(*q && isspace((unsigned char)*q))
+                q++;
+
+        if(*q)
+                {
+                /* Finally zap any trailing white space in message (include
+                 * CRLF) */
+
+                /* We know q has a non white space character so this is OK */
+                for(r = q + strlen(q) - 1; isspace((unsigned char)*r); r--)
+                        *r = 0;
                 }
-                else {
+        if(retcode != 200)
+                {
+                OCSPerr(OCSP_F_PARSE_HTTP_LINE1, OCSP_R_SERVER_RESPONSE_ERROR);
+                if(!*q)
+                        ERR_add_error_data(2, "Code=", p);
+                else
                         ERR_add_error_data(4, "Code=", p, ",Reason=", q);
+                return 0;
                 }
-                goto err;
+
+
+        return 1;
+
         }
-        /* Find blank line marking beginning of content */      
-        while(BIO_gets(mem, tmpbuf, 512) > 0)
+
+int OCSP_sendreq_nbio(OCSP_RESPONSE **presp, OCSP_REQ_CTX *rctx)
         {
-                for(p = tmpbuf; isspace((unsigned char)*p); p++) continue;
-                if(!*p) break;
-        }
-        if(*p) {
-                OCSPerr(OCSP_F_OCSP_SENDREQ_BIO,OCSP_R_NO_CONTENT);
-                goto err;
+        int i, n;
+        const unsigned char *p;
+        next_io:
+        if (!(rctx->state & OHS_NOREAD))
+                {
+                n = BIO_read(rctx->io, rctx->iobuf, rctx->iobuflen);
+
+                if (n <= 0)
+                        {
+                        if (BIO_should_retry(rctx->io))
+                                return -1;
+                        return 0;
+                        }
+
+                /* Write data to memory BIO */
+
+                if (BIO_write(rctx->mem, rctx->iobuf, n) != n)
+                        return 0;
+                }
+
+        switch(rctx->state)
+                {
+
+                case OHS_ASN1_WRITE:
+                n = BIO_get_mem_data(rctx->mem, &p);
+
+                i = BIO_write(rctx->io,
+                        p + (n - rctx->asn1_len), rctx->asn1_len);
+
+                if (i <= 0)
+                        {
+                        if (BIO_should_retry(rctx->io))
+                                return -1;
+                        rctx->state = OHS_ERROR;
+                        return 0;
+                        }
+
+                rctx->asn1_len -= i;
+
+                if (rctx->asn1_len > 0)
+                        goto next_io;
+
+                rctx->state = OHS_ASN1_FLUSH;
+
+                (void)BIO_reset(rctx->mem);
+
+                case OHS_ASN1_FLUSH:
+
+                i = BIO_flush(rctx->io);
+
+                if (i > 0)
+                        {
+                        rctx->state = OHS_FIRSTLINE;
+                        goto next_io;
+                        }
+
+                if (BIO_should_retry(rctx->io))
+                        return -1;
+
+                rctx->state = OHS_ERROR;
+                return 0;
+
+                case OHS_ERROR:
+                return 0;
+
+                case OHS_FIRSTLINE:
+                case OHS_HEADERS:
+
+                /* Attempt to read a line in */
+
+                next_line:
+                /* Due to &%^*$" memory BIO behaviour with BIO_gets we
+                 * have to check there's a complete line in there before
+                 * calling BIO_gets or we'll just get a partial read.
+                 */
+                n = BIO_get_mem_data(rctx->mem, &p);
+                if ((n <= 0) || !memchr(p, '\n', n))
+                        {
+                        if (n >= rctx->iobuflen)
+                                {
+                                rctx->state = OHS_ERROR;
+                                return 0;
+                                }
+                        goto next_io;
+                        }
+                n = BIO_gets(rctx->mem, (char *)rctx->iobuf, rctx->iobuflen);
+
+                if (n <= 0)
+                        {
+                        if (BIO_should_retry(rctx->mem))
+                                goto next_io;
+                        rctx->state = OHS_ERROR;
+                        return 0;
+                        }
+
+                /* Don't allow excessive lines */
+                if (n == rctx->iobuflen)
+                        {
+                        rctx->state = OHS_ERROR;
+                        return 0;
+                        }
+
+                /* First line */
+                if (rctx->state == OHS_FIRSTLINE)
+                        {
+                        if (parse_http_line1((char *)rctx->iobuf))
+                                {
+                                rctx->state = OHS_HEADERS;
+                                goto next_line;
+                                }
+                        else
+                                {
+                                rctx->state = OHS_ERROR;
+                                return 0;
+                                }
+                        }
+                else
+                        {
+                        /* Look for blank line: end of headers */
+                        for (p = rctx->iobuf; *p; p++)
+                                {
+                                if ((*p != '\r') && (*p != '\n'))
+                                        break;
+                                }
+                        if (*p)
+                                goto next_line;
+
+                        rctx->state = OHS_ASN1_HEADER;
+
+                        }
+ 
+                /* Fall thru */
+
+
+                case OHS_ASN1_HEADER:
+                /* Now reading ASN1 header: can read at least 6 bytes which
+                 * is more than enough for any valid ASN1 SEQUENCE header
+                 */
+                n = BIO_get_mem_data(rctx->mem, &p);
+                if (n < 6)
+                        goto next_io;
+
+                /* Check it is an ASN1 SEQUENCE */
+                if (*p++ != (V_ASN1_SEQUENCE|V_ASN1_CONSTRUCTED))
+                        {
+                        rctx->state = OHS_ERROR;
+                        return 0;
+                        }
+
+                /* Check out length field */
+                if (*p & 0x80)
+                        {
+                        n = *p & 0x7F;
+                        /* Not NDEF or excessive length */
+                        if (!n || (n > 4))
+                                {
+                                rctx->state = OHS_ERROR;
+                                return 0;
+                                }
+                        p++;
+                        rctx->asn1_len = 0;
+                        for (i = 0; i < n; i++)
+                                {
+                                rctx->asn1_len <<= 8;
+                                rctx->asn1_len |= *p++;
+                                }
+
+                        if (rctx->asn1_len > OCSP_MAX_REQUEST_LENGTH)
+                                {
+                                rctx->state = OHS_ERROR;
+                                return 0;
+                                }
+
+                        rctx->asn1_len += n + 2;
+                        }
+                else
+                        rctx->asn1_len = *p + 2;
+
+                rctx->state = OHS_ASN1_CONTENT;
+
+                /* Fall thru */
+                
+                case OHS_ASN1_CONTENT:
+                n = BIO_get_mem_data(rctx->mem, &p);
+                if (n < (int)rctx->asn1_len)
+                        goto next_io;
+
+
+                *presp = d2i_OCSP_RESPONSE(NULL, &p, rctx->asn1_len);
+                if (*presp)
+                        {
+                        rctx->state = OHS_DONE;
+                        return 1;
+                        }
+
+                rctx->state = OHS_ERROR;
+                return 0;
+
+                break;
+
+                case OHS_DONE:
+                return 1;
+
+                }
+
+
+
+        return 0;
+
+
         }
-        if(!(resp = d2i_OCSP_RESPONSE_bio(mem, NULL))) {
-                OCSPerr(OCSP_F_OCSP_SENDREQ_BIO,ERR_R_NESTED_ASN1_ERROR);
-                goto err;
+
+/* Blocking OCSP request handler: now a special case of non-blocking I/O */
+
+OCSP_RESPONSE *OCSP_sendreq_bio(BIO *b, char *path, OCSP_REQUEST *req)
+        {
+        OCSP_RESPONSE *resp = NULL;
+        OCSP_REQ_CTX *ctx;
+        int rv;
+
+        ctx = OCSP_sendreq_new(b, path, req, -1);
+
+        do
+                {
+                rv = OCSP_sendreq_nbio(&resp, ctx);
+                } while ((rv == -1) && BIO_should_retry(b));
+
+        OCSP_REQ_CTX_free(ctx);
+
+        if (rv)
+                return resp;
+
+        return NULL;
         }
-        err:
-        BIO_free(mem);
-        return resp;
-}
diff --git a/src/lib/libcrypto/ocsp/ocsp_lib.c b/src/lib/libcrypto/ocsp/ocsp_lib.c
index 9e87fc7895..27450811d7 100644
--- a/src/lib/libcrypto/ocsp/ocsp_lib.c
+++ b/src/lib/libcrypto/ocsp/ocsp_lib.c
@@ -112,7 +112,7 @@ OCSP_CERTID *OCSP_cert_id_new(const EVP_MD *dgst,
         if (alg->algorithm != NULL) ASN1_OBJECT_free(alg->algorithm);
         if ((nid = EVP_MD_type(dgst)) == NID_undef)
                 {
-                OCSPerr(OCSP_F_CERT_ID_NEW,OCSP_R_UNKNOWN_NID);
+                OCSPerr(OCSP_F_OCSP_CERT_ID_NEW,OCSP_R_UNKNOWN_NID);
                 goto err;
                 }
         if (!(alg->algorithm=OBJ_nid2obj(nid))) goto err;
@@ -134,7 +134,7 @@ OCSP_CERTID *OCSP_cert_id_new(const EVP_MD *dgst,
                 }
         return cid;
 digerr:
-        OCSPerr(OCSP_F_CERT_ID_NEW,OCSP_R_DIGEST_ERR);
+        OCSPerr(OCSP_F_OCSP_CERT_ID_NEW,OCSP_R_DIGEST_ERR);
 err:
         if (cid) OCSP_CERTID_free(cid);
         return NULL;
diff --git a/src/lib/libcrypto/ocsp/ocsp_prn.c b/src/lib/libcrypto/ocsp/ocsp_prn.c
index 4b7bc28769..3dfb51c1e4 100644
--- a/src/lib/libcrypto/ocsp/ocsp_prn.c
+++ b/src/lib/libcrypto/ocsp/ocsp_prn.c
@@ -194,7 +194,7 @@ int OCSP_RESPONSE_print(BIO *bp, OCSP_RESPONSE* o, unsigned long flags)
 
         if (BIO_puts(bp,"OCSP Response Data:\n") <= 0) goto err;
         l=ASN1_ENUMERATED_get(o->responseStatus);
-        if (BIO_printf(bp,"    OCSP Response Status: %s (0x%x)\n",
+        if (BIO_printf(bp,"    OCSP Response Status: %s (0x%lx)\n",
                        OCSP_response_status_str(l), l) <= 0) goto err;
         if (rb == NULL) return 1;
         if (BIO_puts(bp,"    Response Type: ") <= 0)
@@ -252,7 +252,7 @@ int OCSP_RESPONSE_print(BIO *bp, OCSP_RESPONSE* o, unsigned long flags)
                                 {
                                 l=ASN1_ENUMERATED_get(rev->revocationReason);
                                 if (BIO_printf(bp, 
-                                         "\n    Revocation Reason: %s (0x%x)",
+                                         "\n    Revocation Reason: %s (0x%lx)",
                                                OCSP_crl_reason_str(l), l) <= 0)
                                         goto err;
                                 }
diff --git a/src/lib/libcrypto/ocsp/ocsp_vfy.c b/src/lib/libcrypto/ocsp/ocsp_vfy.c
index 3d58dfb06c..23ea41c847 100644
--- a/src/lib/libcrypto/ocsp/ocsp_vfy.c
+++ b/src/lib/libcrypto/ocsp/ocsp_vfy.c
@@ -367,7 +367,7 @@ int OCSP_request_verify(OCSP_REQUEST *req, STACK_OF(X509) *certs, X509_STORE *st
                 return 0;
                 }
         gen = req->tbsRequest->requestorName;
-        if (gen->type != GEN_DIRNAME)
+        if (!gen || gen->type != GEN_DIRNAME)
                 {
                 OCSPerr(OCSP_F_OCSP_REQUEST_VERIFY, OCSP_R_UNSUPPORTED_REQUESTORNAME_TYPE);
                 return 0;