Commit 0636c39b authored by Lutz Jänicke's avatar Lutz Jänicke
Browse files

Fix incorrect handling of special characters 

PR: 1459
Submitted by: tnitschke@innominate.com
Reviewed by: steve@openssl.org
parent a2e623c0

crypto/asn1/a_strex.c

+2 −2
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ static int do_buf(unsigned char *buf, int buflen, 
	q = buf + buflen;

	outlen = 0;

	while(p != q) {

		if(p == buf) orflags = CHARTYPE_FIRST_ESC_2253;

		if(p == buf && flags & ASN1_STRFLGS_ESC_2253) orflags = CHARTYPE_FIRST_ESC_2253;

		else orflags = 0;

		switch(type & BUF_TYPE_WIDTH_MASK) {

			case 4:
@@ -197,7 +197,7 @@ static int do_buf(unsigned char *buf, int buflen, 
			default:

			return -1;	/* invalid width */

		}

		if (p == q) orflags = CHARTYPE_LAST_ESC_2253;

		if (p == q && flags & ASN1_STRFLGS_ESC_2253) orflags = CHARTYPE_LAST_ESC_2253;

		if(type & BUF_TYPE_CONVUTF8) {

			unsigned char utfbuf[6];

			int utflen;