1 files changed, 3 insertions, 9 deletions

diff --git a/src/lib/libcrypto/ocsp/ocsp_ht.c b/src/lib/libcrypto/ocsp/ocsp_ht.c
index af5fc16691..12bbfcffd1 100644
--- a/src/lib/libcrypto/ocsp/ocsp_ht.c
+++ b/src/lib/libcrypto/ocsp/ocsp_ht.c
@@ -397,12 +397,11 @@ int OCSP_sendreq_nbio(OCSP_RESPONSE **presp, OCSP_REQ_CTX *rctx)
 
 
                 case OHS_ASN1_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.
+                /* 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 < 2)
+                if (n < 6)
                         goto next_io;
 
                 /* Check it is an ASN1 SEQUENCE */
@@ -415,11 +414,6 @@ int OCSP_sendreq_nbio(OCSP_RESPONSE **presp, OCSP_REQ_CTX *rctx)
                 /* Check out length field */
                 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 */
                         if (!n || (n > 4))