Commit 9ad76517 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Fix escaping code for string printing. If *any* escaping is enabled we 

must escape the escape character itself (backslash).
parent c8e3c1a9

CHANGES

+4 −1
Original line number Diff line number Diff line
@@ -4,7 +4,10 @@ 


 Changes between 0.9.8q and 0.9.8r [xx XXX xxxx]



  *)

  *) Fix bug in string printing code: if *any* escaping is enabled we must

     escape the escape character (backslash) or the resulting string is

     ambiguous.

     [Steve Henson]



 Changes between 0.9.8p and 0.9.8q [2 Dec 2010]

crypto/asn1/a_strex.c

+12 −5
Original line number Diff line number Diff line
@@ -74,6 +74,11 @@ 


#define CHARTYPE_BS_ESC		(ASN1_STRFLGS_ESC_2253 | CHARTYPE_FIRST_ESC_2253 | CHARTYPE_LAST_ESC_2253)



#define ESC_FLAGS (ASN1_STRFLGS_ESC_2253 | \

		  ASN1_STRFLGS_ESC_QUOTE | \

		  ASN1_STRFLGS_ESC_CTRL | \

		  ASN1_STRFLGS_ESC_MSB)





/* Three IO functions for sending data to memory, a BIO and

 * and a FILE pointer.
@@ -148,6 +153,13 @@ static int do_esc_char(unsigned long c, unsigned char flags, char *do_quotes, ch 
		if(!io_ch(arg, tmphex, 3)) return -1;

		return 3;

	}

	/* If we get this far and do any escaping at all must escape 

	 * the escape character itself: backslash.

	 */

	if (chtmp == '\\' && flags & ESC_FLAGS) {

		if(!io_ch(arg, "\\\\", 2)) return -1;

		return 2;

	}

	if(!io_ch(arg, &chtmp, 1)) return -1;

	return 1;

}
@@ -292,11 +304,6 @@ static const signed char tag2nbyte[] = { 
	4, -1, 2		/* 28-30 */

};



#define ESC_FLAGS (ASN1_STRFLGS_ESC_2253 | \

		  ASN1_STRFLGS_ESC_QUOTE | \

		  ASN1_STRFLGS_ESC_CTRL | \

		  ASN1_STRFLGS_ESC_MSB)



/* This is the main function, print out an

 * ASN1_STRING taking note of various escape

 * and display options. Returns number of