Fix a few double ;

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1618)

diff --git a/apps/s_client.c b/apps/s_client.c
index 5307eab11650ad71e94c2f0e92ca221928dcf936..d2f10a6885ba7de26aac03b92e814c7c8f7dc2cc 100644 (file)
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -2365,7 +2365,7 @@ int s_client_main(int argc, char **argv)
                 /* goto end; */
             }
 
                 /* goto end; */
             }
 

-            sbuf_len -= i;;
+            sbuf_len -= i;

             sbuf_off += i;
             if (sbuf_len <= 0) {
                 read_ssl = 1;
             sbuf_off += i;
             if (sbuf_len <= 0) {
                 read_ssl = 1;

diff --git a/ssl/statem/statem_dtls.c b/ssl/statem/statem_dtls.c
index 08937f518b89ab7561acb4af06416d923b7ea68d..1c1758b464e7b0ec2596537b2657130ba2391daf 100644 (file)
--- a/ssl/statem/statem_dtls.c
+++ b/ssl/statem/statem_dtls.c
@@ -656,7 +656,7 @@ dtls1_process_out_of_seq_message(SSL *s, const struct hm_header_st *msg_hdr)
         }
     } else {
         if (frag_len != msg_hdr->msg_len) {
         }
     } else {
         if (frag_len != msg_hdr->msg_len) {

-            return dtls1_reassemble_fragment(s, msg_hdr);;
+            return dtls1_reassemble_fragment(s, msg_hdr);

         }
 
         if (frag_len > dtls1_max_handshake_message_len(s))
         }
 
         if (frag_len > dtls1_max_handshake_message_len(s))

diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index 84f6dfb4c2376c85ce2cbe89b9d4f7737895df82..4d6afd6bc5f6446961ab04e63bf02c1a79d171ca 100644 (file)
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -2944,7 +2944,7 @@ WORK_STATE tls_post_process_client_key_exchange(SSL *s, WORK_STATE wst)
                                            sizeof(labelbuffer), NULL, 0,
                                            0) <= 0) {
                 ossl_statem_set_error(s);
                                            sizeof(labelbuffer), NULL, 0,
                                            0) <= 0) {
                 ossl_statem_set_error(s);

-                return WORK_ERROR;;
+                return WORK_ERROR;

             }
 
             BIO_ctrl(SSL_get_wbio(s), BIO_CTRL_DGRAM_SCTP_ADD_AUTH_KEY,
             }
 
             BIO_ctrl(SSL_get_wbio(s), BIO_CTRL_DGRAM_SCTP_ADD_AUTH_KEY,