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:06:30 +0100 |
| commit | 521246e6085d5e1530c58ab8a50ce898d280ceed (patch) | |
| tree | ba673a4e70f251fe23a76e919d0d38737953406c | |
| parent | ef6d3485eca973edf1cf94a8b0156588753aaf3f (diff) | |
| download | openssl-new-521246e6085d5e1530c58ab8a50ce898d280ceed.tar.gz | |
Fix wrong numbers being passed as string lengths
Signed-off-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(cherry picked from commit 0b142f022e2c5072295e00ebc11c5b707a726d74)
| -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 d5ac75ac7b..caba5b3af0 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -2642,7 +2642,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; STACK_OF(SSL_CIPHER) *sk; diff --git a/crypto/asn1/asn1_gen.c b/crypto/asn1/asn1_gen.c index aaec009f22..b71ae4841b 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_UNKOWN_FORMAT); diff --git a/crypto/asn1/asn1_par.c b/crypto/asn1/asn1_par.c index f6cd4b2b8c..a5d2da10bb 100644 --- a/crypto/asn1/asn1_par.c +++ b/crypto/asn1/asn1_par.c @@ -337,7 +337,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); |