generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix wrong numbers being passed as string lengths

Browse Source 
Signed-off-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(cherry picked from commit 0b142f022e2c5072295e00ebc11c5b707a726d74)
This commit is contained in:
Dmitry-Me 2014-06-01 21:30:52 +04:00 committed by Richard Levitte
parent ef6d3485ec
commit 521246e608
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/s_server.c
View File

@ -2642,7 +2642,7 @@ static int www_body(char *hostname, int s, unsigned char *context)
/* else we have data */ /* else we have data */
if (((www == 1) && (strncmp("GET ", buf, 4) == 0)) || 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; char *p;
X509 *peer; X509 *peer;
STACK_OF(SSL_CIPHER) *sk; STACK_OF(SSL_CIPHER) *sk;

2
crypto/asn1/asn1_gen.c
View File

@ -359,7 +359,7 @@ static int asn1_cb(const char *elem, int len, void *bitstr)
arg->format = ASN1_GEN_FORMAT_UTF8; arg->format = ASN1_GEN_FORMAT_UTF8;
else if (!strncmp(vstart, "HEX", 3)) else if (!strncmp(vstart, "HEX", 3))
arg->format = ASN1_GEN_FORMAT_HEX; arg->format = ASN1_GEN_FORMAT_HEX;
else if (!strncmp(vstart, "BITLIST", 3)) else if (!strncmp(vstart, "BITLIST", 7))
arg->format = ASN1_GEN_FORMAT_BITLIST; arg->format = ASN1_GEN_FORMAT_BITLIST;
else { else {
ASN1err(ASN1_F_ASN1_CB, ASN1_R_UNKOWN_FORMAT); ASN1err(ASN1_F_ASN1_CB, ASN1_R_UNKOWN_FORMAT);

2
crypto/asn1/asn1_par.c
View File

@ -337,7 +337,7 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length,
goto end; goto end;
} }
} else { } else {
if (BIO_write(bp, "BAD ENUMERATED", 11) <= 0) if (BIO_write(bp, "BAD ENUMERATED", 14) <= 0)
goto end; goto end;
} }
M_ASN1_ENUMERATED_free(bs); M_ASN1_ENUMERATED_free(bs);