Convert ClientVerify Construction to WPACKET

[oweals/openssl.git] / ssl / statem / statem_dtls.c

diff --git a/ssl/statem/statem_dtls.c b/ssl/statem/statem_dtls.c
index 6d6c5a3aa6775187a59db331bffd717bf77f57ab..b9a53b054382c90a2ff3980caa21a285f4d315c6 100644 (file)
--- a/ssl/statem/statem_dtls.c
+++ b/ssl/statem/statem_dtls.c
@@ -1192,34 +1192,36 @@ void dtls1_get_message_header(unsigned char *data, struct hm_header_st *msg_hdr)
 }
 
 /*
- * Temporary name. To be renamed dtls1_set_handshake_header() once all PACKETW
+ * Temporary name. To be renamed dtls1_set_handshake_header() once all WPACKET
  * conversion is complete. The old dtls1_set_handshake_heder() can be deleted
  * at that point.
  * TODO - RENAME ME
  */
-int dtls1_set_handshake_header2(SSL *s, PACKETW *pkt, PACKETW *body, int htype)
+int dtls1_set_handshake_header2(SSL *s, WPACKET *pkt, int htype)
 {
     unsigned char *header;
+
     dtls1_set_message_header(s, htype, 0, 0, 0);
 
     /*
      * We allocate space at the start for the message header. This gets filled
      * in later
      */
-    if (!PACKETW_allocate_bytes(pkt, DTLS1_HM_HEADER_LENGTH, &header)
-            || !PACKETW_get_sub_packet(pkt, body))
+    if (!WPACKET_allocate_bytes(pkt, DTLS1_HM_HEADER_LENGTH, &header)
+            || !WPACKET_start_sub_packet(pkt))
         return 0;
 
     return 1;
 }
 
-int dtls1_close_construct_packet(SSL *s, PACKETW *pkt)
+int dtls1_close_construct_packet(SSL *s, WPACKET *pkt)
 {
     size_t msglen;
 
-    if (!PACKETW_get_length(pkt, &msglen)
+    if (!WPACKET_close(pkt)
+            || !WPACKET_get_length(pkt, &msglen)
             || msglen > INT_MAX
-            || !PACKETW_close(pkt))
+            || !WPACKET_finish(pkt))
         return 0;
     s->d1->w_msg_hdr.msg_len = msglen - DTLS1_HM_HEADER_LENGTH;
     s->d1->w_msg_hdr.frag_len = msglen - DTLS1_HM_HEADER_LENGTH;
@@ -1227,7 +1229,6 @@ int dtls1_close_construct_packet(SSL *s, PACKETW *pkt)
     s->init_off = 0;
 
     /* Buffer the message to handle re-xmits */
-
     if (!dtls1_buffer_message(s, 0))
         return 0;