1 files changed, 14 insertions, 5 deletions

diff --git a/src/lib/libcrypto/ocsp/ocsp_ht.c b/src/lib/libcrypto/ocsp/ocsp_ht.c
index b78cd37092..9213e58ae4 100644
--- a/src/lib/libcrypto/ocsp/ocsp_ht.c
+++ b/src/lib/libcrypto/ocsp/ocsp_ht.c
@@ -64,6 +64,9 @@
 #include <openssl/ocsp.h>
 #include <openssl/err.h>
 #include <openssl/buffer.h>
+#ifdef OPENSSL_SYS_SUNOS
+#define strtoul (unsigned long)strtol
+#endif /* OPENSSL_SYS_SUNOS */
 
 /* Quick and dirty HTTP OCSP request handler.
  * Could make this a bit cleverer by adding
@@ -94,7 +97,7 @@ Content-Length: %d\r\n\r\n";
         }
         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, 1024))) {
+        while ((len = BIO_read(b, tmpbuf, sizeof tmpbuf))) {
                 if(len < 0) {
                         OCSPerr(OCSP_F_OCSP_SENDREQ_BIO,OCSP_R_SERVER_READ_ERROR);
                         goto err;
@@ -107,7 +110,7 @@ Content-Length: %d\r\n\r\n";
         }
         /* Parse the HTTP response. This will look like this:
          * "HTTP/1.0 200 OK". We need to obtain the numeric code and
-         * informational message.
+         * (optional) informational message.
          */
 
         /* Skip to first white space (passed protocol info) */
@@ -135,13 +138,19 @@ Content-Length: %d\r\n\r\n";
         if(*r) goto err;
         /* Skip over any leading white space in message */
         while(*q && isspace((unsigned char)*q))  q++;
-        if(!*q) goto err;
+        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;
+                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);
-                ERR_add_error_data(4, "Code=", p, ",Reason=", q);
+                if(!*q) { 
+                        ERR_add_error_data(2, "Code=", p);
+                }
+                else {
+                        ERR_add_error_data(4, "Code=", p, ",Reason=", q);
+                }
                 goto err;
         }
         /* Find blank line marking beginning of content */