7 files changed, 5 insertions, 7 deletions

diff --git a/src/lib/libcrypto/asn1/asn1_gen.c b/src/lib/libcrypto/asn1/asn1_gen.c
index 4fc241908f..81a7a38895 100644
--- a/src/lib/libcrypto/asn1/asn1_gen.c
+++ b/src/lib/libcrypto/asn1/asn1_gen.c
@@ -368,7 +368,7 @@ static int asn1_cb(const char *elem, int len, void *bitstr)
                         arg->format = ASN1_GEN_FORMAT_UTF8;
                 else if (!strncmp(vstart, "HEX", 3))
                         arg->format = ASN1_GEN_FORMAT_HEX;
-                else if (!strncmp(vstart, "BITLIST", 3))
+                else if (!strncmp(vstart, "BITLIST", 7))
                         arg->format = ASN1_GEN_FORMAT_BITLIST;
                 else
                         {
diff --git a/src/lib/libcrypto/asn1/asn1_par.c b/src/lib/libcrypto/asn1/asn1_par.c
index 29b0ba46b5..e34c75a418 100644
--- a/src/lib/libcrypto/asn1/asn1_par.c
+++ b/src/lib/libcrypto/asn1/asn1_par.c
@@ -375,7 +375,7 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length, int offse
                                         }
                                 else
                                         {
-                                        if (BIO_write(bp,"BAD ENUMERATED",11) <= 0)
+                                        if (BIO_write(bp,"BAD ENUMERATED",14) <= 0)
                                                 goto end;
                                         }
                                 M_ASN1_ENUMERATED_free(bs);
diff --git a/src/lib/libssl/d1_both.c b/src/lib/libssl/d1_both.c
index ab6b168410..731245c6a6 100644
--- a/src/lib/libssl/d1_both.c
+++ b/src/lib/libssl/d1_both.c
@@ -1213,7 +1213,6 @@ dtls1_retransmit_message(SSL *s, unsigned short seq, unsigned long frag_off,
         saved_state.compress = s->compress;
         saved_state.session = s->session;
         saved_state.epoch = s->d1->w_epoch;
-        saved_state.epoch = s->d1->w_epoch;
 
         s->d1->retransmitting = 1;
 
diff --git a/src/lib/libssl/src/apps/s_server.c b/src/lib/libssl/src/apps/s_server.c
index 8d7568085a..74cd2c83b3 100644
--- a/src/lib/libssl/src/apps/s_server.c
+++ b/src/lib/libssl/src/apps/s_server.c
@@ -2494,7 +2494,7 @@ static int www_body(char *hostname, int s, unsigned char *context)
 
                 /* else we have data */
                 if (    ((www == 1) && (strncmp("GET ",buf,4) == 0)) ||
-                        ((www == 2) && (strncmp("GET /stats ",buf,10) == 0)))
+                        ((www == 2) && (strncmp("GET /stats ",buf,11) == 0)))
                         {
                         char *p;
                         X509 *peer;
diff --git a/src/lib/libssl/src/crypto/asn1/asn1_gen.c b/src/lib/libssl/src/crypto/asn1/asn1_gen.c
index 4fc241908f..81a7a38895 100644
--- a/src/lib/libssl/src/crypto/asn1/asn1_gen.c
+++ b/src/lib/libssl/src/crypto/asn1/asn1_gen.c
@@ -368,7 +368,7 @@ static int asn1_cb(const char *elem, int len, void *bitstr)
                         arg->format = ASN1_GEN_FORMAT_UTF8;
                 else if (!strncmp(vstart, "HEX", 3))
                         arg->format = ASN1_GEN_FORMAT_HEX;
-                else if (!strncmp(vstart, "BITLIST", 3))
+                else if (!strncmp(vstart, "BITLIST", 7))
                         arg->format = ASN1_GEN_FORMAT_BITLIST;
                 else
                         {
diff --git a/src/lib/libssl/src/crypto/asn1/asn1_par.c b/src/lib/libssl/src/crypto/asn1/asn1_par.c
index 29b0ba46b5..e34c75a418 100644
--- a/src/lib/libssl/src/crypto/asn1/asn1_par.c
+++ b/src/lib/libssl/src/crypto/asn1/asn1_par.c
@@ -375,7 +375,7 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length, int offse
                                         }
                                 else
                                         {
-                                        if (BIO_write(bp,"BAD ENUMERATED",11) <= 0)
+                                        if (BIO_write(bp,"BAD ENUMERATED",14) <= 0)
                                                 goto end;
                                         }
                                 M_ASN1_ENUMERATED_free(bs);
diff --git a/src/lib/libssl/src/ssl/d1_both.c b/src/lib/libssl/src/ssl/d1_both.c
index ab6b168410..731245c6a6 100644
--- a/src/lib/libssl/src/ssl/d1_both.c
+++ b/src/lib/libssl/src/ssl/d1_both.c
@@ -1213,7 +1213,6 @@ dtls1_retransmit_message(SSL *s, unsigned short seq, unsigned long frag_off,
         saved_state.compress = s->compress;
         saved_state.session = s->session;
         saved_state.epoch = s->d1->w_epoch;
-        saved_state.epoch = s->d1->w_epoch;
 
         s->d1->retransmitting = 1;