diff options
author | tedu <> | 2014-04-16 18:23:52 +0000 |
---|---|---|
committer | tedu <> | 2014-04-16 18:23:52 +0000 |
commit | e299602ab4efdb932270d2727f84e3b8e870a2f2 (patch) | |
tree | 247cf27f0f5b18ef01ce056599c40401b355c36a /src/lib/libcrypto | |
parent | cd08fd7b7f7dd206dc05c7e18941b10aef11ab9a (diff) | |
download | openbsd-e299602ab4efdb932270d2727f84e3b8e870a2f2.tar.gz openbsd-e299602ab4efdb932270d2727f84e3b8e870a2f2.tar.bz2 openbsd-e299602ab4efdb932270d2727f84e3b8e870a2f2.zip |
fix a few bugs observed on http://www.viva64.com/en/b/0250/
ok krw miod
Diffstat (limited to 'src/lib/libcrypto')
-rw-r--r-- | src/lib/libcrypto/asn1/asn1_gen.c | 2 | ||||
-rw-r--r-- | src/lib/libcrypto/asn1/asn1_par.c | 2 |
2 files changed, 2 insertions, 2 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) | |||
368 | arg->format = ASN1_GEN_FORMAT_UTF8; | 368 | arg->format = ASN1_GEN_FORMAT_UTF8; |
369 | else if (!strncmp(vstart, "HEX", 3)) | 369 | else if (!strncmp(vstart, "HEX", 3)) |
370 | arg->format = ASN1_GEN_FORMAT_HEX; | 370 | arg->format = ASN1_GEN_FORMAT_HEX; |
371 | else if (!strncmp(vstart, "BITLIST", 3)) | 371 | else if (!strncmp(vstart, "BITLIST", 7)) |
372 | arg->format = ASN1_GEN_FORMAT_BITLIST; | 372 | arg->format = ASN1_GEN_FORMAT_BITLIST; |
373 | else | 373 | else |
374 | { | 374 | { |
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 | |||
375 | } | 375 | } |
376 | else | 376 | else |
377 | { | 377 | { |
378 | if (BIO_write(bp,"BAD ENUMERATED",11) <= 0) | 378 | if (BIO_write(bp,"BAD ENUMERATED",14) <= 0) |
379 | goto end; | 379 | goto end; |
380 | } | 380 | } |
381 | M_ASN1_ENUMERATED_free(bs); | 381 | M_ASN1_ENUMERATED_free(bs); |