commit 0217dd19c00657b8bfd2bce1090785eb32abb235
author Matt Caswell <matt@openssl.org> Tue Sep 06 15:09:51 2016 +0100
committer Matt Caswell <matt@openssl.org> Tue Sep 13 09:41:21 2016 +0100
tree 3d8d15ce4dbd512de85108994590be59fd83e801
parent ae2f7b37da3640f4cfa5df0e5bad2aa2ca5f1ba3

Move from explicit sub-packets to implicit ones

No need to declare an explicit sub-packet. Just start one.

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

ssl/t1_ext.c

diff --git a/ssl/t1_ext.c b/ssl/t1_ext.c
index 734522b..cf4f5b0 100644
--- a/ssl/t1_ext.c
+++ b/ssl/t1_ext.c
@@ -148,7 +148,6 @@
     for (i = 0; i < exts->meths_count; i++) {
         const unsigned char *out = NULL;
         size_t outlen = 0;
-        WPACKET spkt;
 
         meth = exts->meths + i;
 
@@ -173,9 +172,9 @@
         }
 
         if (!WPACKET_put_bytes(pkt, meth->ext_type, 2)
-                || !WPACKET_get_sub_packet_len(pkt, &spkt, 2)
-                || (outlen > 0 && !WPACKET_memcpy(&spkt, out, outlen))
-                || !WPACKET_close(&spkt)) {
+                || !WPACKET_start_sub_packet_len(pkt, 2)
+                || (outlen > 0 && !WPACKET_memcpy(pkt, out, outlen))
+                || !WPACKET_close(pkt)) {
             *al = SSL_AD_INTERNAL_ERROR;
             return 0;
         }