diff options
| author | Dmitry-Me <wipedout@yandex.ru> | 2014-06-01 21:30:52 +0400 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2015-03-09 21:02:41 +0100 |
| commit | 0b142f022e2c5072295e00ebc11c5b707a726d74 (patch) | |
| tree | 1faea7110420e31d780d6f20985c612aac8776da | |
| parent | 99e1ad3c4bb1dd03f36429c1ce4eafa5ed162964 (diff) | |
Fix wrong numbers being passed as string lengths
Signed-off-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
| -rw-r--r-- | apps/s_server.c | 2 | ||||
| -rw-r--r-- | crypto/asn1/asn1_gen.c | 2 | ||||
| -rw-r--r-- | 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 cf5b50016f..42088d0e84 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 9735cb5b45..16a1b5aea2 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 58d65ac820..b12edf9c4a 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); |