Commit b65b4c34 authored Jun 01, 2014 by Dmitry-Me Committed by Richard Levitte Mar 09, 2015

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 0b142f02)

parent ef116b00

apps/s_server.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2869,7 +2869,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;

crypto/asn1/asn1_gen.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

crypto/asn1/asn1_par.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);