[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  dd8710dc54f5123d0fa54b5c90fc2c3a9dae43fe (commit)
      from  73f0df8331910d6726d45ecaab12bd93cc48b4e2 (commit)


- Log -----------------------------------------------------------------
commit dd8710dc54f5123d0fa54b5c90fc2c3a9dae43fe
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Sep 13 23:59:11 2016 +0100

    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 at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/t1_lib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 696998f..4f5ea42 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;