[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  0b142f022e2c5072295e00ebc11c5b707a726d74 (commit)
      from  99e1ad3c4bb1dd03f36429c1ce4eafa5ed162964 (commit)


- Log -----------------------------------------------------------------
commit 0b142f022e2c5072295e00ebc11c5b707a726d74
Author: Dmitry-Me <wipedout at yandex.ru>
Date:   Sun Jun 1 21:30:52 2014 +0400

    Fix wrong numbers being passed as string lengths
    
    Signed-off-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 apps/s_server.c        | 2 +-
 crypto/asn1/asn1_gen.c | 2 +-
 crypto/asn1/asn1_par.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/s_server.c b/apps/s_server.c
index cf5b500..42088d0 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -2745,7 +2745,7 @@ static int www_body(char *hostname, int s, int stype, 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;
             STACK_OF(SSL_CIPHER) *sk;
diff --git a/crypto/asn1/asn1_gen.c b/crypto/asn1/asn1_gen.c
index 9735cb5..16a1b5a 100644
--- a/crypto/asn1/asn1_gen.c
+++ b/crypto/asn1/asn1_gen.c
@@ -359,7 +359,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 {
             ASN1err(ASN1_F_ASN1_CB, ASN1_R_UNKNOWN_FORMAT);
diff --git a/crypto/asn1/asn1_par.c b/crypto/asn1/asn1_par.c
index 58d65ac..b12edf9 100644
--- a/crypto/asn1/asn1_par.c
+++ b/crypto/asn1/asn1_par.c
@@ -330,7 +330,7 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length,
                             goto end;
                     }
                 } else {
-                    if (BIO_write(bp, "BAD ENUMERATED", 11) <= 0)
+                    if (BIO_write(bp, "BAD ENUMERATED", 14) <= 0)
                         goto end;
                 }
                 M_ASN1_ENUMERATED_free(bs);