Changeset 808 for openssl/trunk/crypto/ocsp/ocsp_ht.c

Timestamp:

Aug 7, 2014, 8:25:37 PM (11 years ago)

Author:

dmik

Message:

openssl: Merge version 1.0.0n from vendor to trunk.

Location:

openssl/trunk

Files:

• . (modified) (1 prop)
• crypto/ocsp/ocsp_ht.c (modified) (5 diffs)

openssl/trunk/crypto/ocsp/ocsp_ht.c ¶

@@ -159 +159 @@
         OCSP_REQ_CTX *rctx;
         rctx = OPENSSL_malloc(sizeof(OCSP_REQ_CTX));
+        if (!rctx)
+                return NULL;
         rctx->state = OHS_ERROR;
         rctx->mem = BIO_new(BIO_s_mem());
@@ -168 +170 @@
                 rctx->iobuflen = OCSP_MAX_LINE_LEN;
         rctx->iobuf = OPENSSL_malloc(rctx->iobuflen);
-        if (!rctx->iobuf)
-                return 0;
+        if (!rctx->mem || !rctx->iobuf)
+                goto err;
         if (!path)
                 path = "/";
 
         if (BIO_printf(rctx->mem, post_hdr, path) <= 0)
-                return 0;
+                goto err;
 
         if (req && !OCSP_REQ_CTX_set1_req(rctx, req))
-                return 0;
+                goto err;
 
         return rctx;
+        err:
+        OCSP_REQ_CTX_free(rctx);
+        return NULL;
         }
 
@@ -398 +403 @@
 
                 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
+                /* Now reading ASN1 header: can read at least 2 bytes which
+                 * is enough for ASN1 SEQUENCE header and either length field
+                 * or at least the length of the length field.
                  */
                 n = BIO_get_mem_data(rctx->mem, &p);
-                if (n < 6)
+                if (n < 2)
                         goto next_io;
 
@@ -415 +421 @@
                 if (*p & 0x80)
                         {
+                        /* If MSB set on initial length octet we can now
+                         * always read 6 octets: make sure we have them.
+                         */
+                        if (n < 6)
+                                goto next_io;
                         n = *p & 0x7F;
                         /* Not NDEF or excessive length */
@@ -485 +496 @@
         ctx = OCSP_sendreq_new(b, path, req, -1);
 
+        if (!ctx)
+                return NULL;
+
         do
                 {