aboutsummaryrefslogtreecommitdiff
path: root/crypto/asn1
diff options
context:
space:
mode:
authorDmitry-Me <wipedout@yandex.ru>2014-06-01 21:30:52 +0400
committerRichard Levitte <levitte@openssl.org>2015-03-09 21:02:41 +0100
commit0b142f022e2c5072295e00ebc11c5b707a726d74 (patch)
tree1faea7110420e31d780d6f20985c612aac8776da /crypto/asn1
parent99e1ad3c4bb1dd03f36429c1ce4eafa5ed162964 (diff)
downloadopenssl-0b142f022e2c5072295e00ebc11c5b707a726d74.zip
openssl-0b142f022e2c5072295e00ebc11c5b707a726d74.tar.gz
openssl-0b142f022e2c5072295e00ebc11c5b707a726d74.tar.bz2
Fix wrong numbers being passed as string lengths
Signed-off-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'crypto/asn1')
-rw-r--r--crypto/asn1/asn1_gen.c2
-rw-r--r--crypto/asn1/asn1_par.c2
2 files changed, 2 insertions, 2 deletions
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);