From: Lutz Jänicke <jaenicke@openssl.org>
Date: Wed, 21 Feb 2007 17:44:53 +0000 (+0000)
Subject: Fix incorrect handling of special characters
X-Git-Tag: OpenSSL_0_9_8k^2~960
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0636c39bb153110dcb2b04d59229cebd0bf3ca39;p=oweals%2Fopenssl.git

Fix incorrect handling of special characters
PR: 1459
Submitted by: tnitschke@innominate.com
Reviewed by: steve@openssl.org
---

diff --git a/crypto/asn1/a_strex.c b/crypto/asn1/a_strex.c
index fc743c2ad0..c2dbb6f9a5 100644
--- a/crypto/asn1/a_strex.c
+++ b/crypto/asn1/a_strex.c
@@ -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;