From: Matt Caswell <matt@openssl.org>
Date: Tue, 13 Sep 2016 22:59:11 +0000 (+0100)
Subject: Fix OCSP_RESPID processing bug introduced by WPACKET changes
X-Git-Tag: OpenSSL_1_1_1-pre1~3538
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dd8710dc54f5123d0fa54b5c90fc2c3a9dae43fe;p=thirdparty%2Fopenssl.git

Fix OCSP_RESPID processing bug introduced by WPACKET changes

An OCSP_RESPID in a status request extension has 2 bytes for the length
not 1.

Reviewed-by: Rich Salz <rsalz@openssl.org>
---

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 696998fe5ea..4f5ea42b5a1 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -1209,7 +1209,7 @@ int ssl_add_clienthello_tlsext(SSL *s, WPACKET *pkt, int *al)
             idlen = i2d_OCSP_RESPID(id, NULL);
             if (idlen <= 0
                        /* Sub-packet for an individual id */
-                    || !WPACKET_sub_allocate_bytes_u8(pkt, idlen, &idbytes)
+                    || !WPACKET_sub_allocate_bytes_u16(pkt, idlen, &idbytes)
                     || i2d_OCSP_RESPID(id, &idbytes) != idlen) {
                 SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
                 return 0;