Harmonise setting the header and closing construction

[openssl.git] / ssl / statem / statem_lib.c

diff --git a/ssl/statem/statem_lib.c b/ssl/statem/statem_lib.c
index cac18cc550b47056b25581d532cad55ae7c36d26..fa0032bcb40181f9739c0b0ccb39ccf6ffd758a2 100644 (file)
--- a/ssl/statem/statem_lib.c
+++ b/ssl/statem/statem_lib.c
@@ -57,11 +57,11 @@ int ssl3_do_write(SSL *s, int type)
     return (0);
 }
 
     return (0);
 }
 

-int tls_close_construct_packet(SSL *s, WPACKET *pkt)
+int tls_close_construct_packet(SSL *s, WPACKET *pkt, int htype)

 {
     size_t msglen;
 
 {
     size_t msglen;
 

-    if (!WPACKET_close(pkt)
+    if ((htype != SSL3_MT_CHANGE_CIPHER_SPEC && !WPACKET_close(pkt))

             || !WPACKET_get_length(pkt, &msglen)
             || msglen > INT_MAX)
         return 0;
             || !WPACKET_get_length(pkt, &msglen)
             || msglen > INT_MAX)
         return 0;


@@ -260,9 +260,6 @@ int tls_construct_change_cipher_spec(SSL *s, WPACKET *pkt)
         return 0;
     }
 
         return 0;
     }
 

-    s->init_num = 1;
-    s->init_off = 0;
-

     return 1;
 }
 
     return 1;
 }