From d29d4b317b9e01da742f1df657ec572e7bc27f9b Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Thu, 19 May 2016 06:19:53 +0200 Subject: [PATCH] Revert "Make it possible to have RFC2254 escapes with ASN1_STRING_print_ex()" This reverts commit 87728c682995d0575b52a5a19d69405bb764e76e. Reviewed-by: Matt Caswell --- apps/apps.c | 1 - crypto/asn1/a_strex.c | 21 ++++++++------------- crypto/asn1/asn1.h | 5 ----- crypto/asn1/charmap.pl | 11 +---------- 4 files changed, 9 insertions(+), 29 deletions(-) diff --git a/apps/apps.c b/apps/apps.c index 566d547653..b1dd97038f 100644 --- a/apps/apps.c +++ b/apps/apps.c @@ -1321,7 +1321,6 @@ int set_name_ex(unsigned long *flags, const char *arg) { static const NAME_EX_TBL ex_tbl[] = { {"esc_2253", ASN1_STRFLGS_ESC_2253, 0}, - {"esc_2254", ASN1_STRFLGS_ESC_2254, 0}, {"esc_ctrl", ASN1_STRFLGS_ESC_CTRL, 0}, {"esc_msb", ASN1_STRFLGS_ESC_MSB, 0}, {"use_quote", ASN1_STRFLGS_ESC_QUOTE, 0}, diff --git a/crypto/asn1/a_strex.c b/crypto/asn1/a_strex.c index 5fa7a31500..35fd44cd22 100644 --- a/crypto/asn1/a_strex.c +++ b/crypto/asn1/a_strex.c @@ -75,7 +75,6 @@ #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_2254 | \ ASN1_STRFLGS_ESC_QUOTE | \ ASN1_STRFLGS_ESC_CTRL | \ ASN1_STRFLGS_ESC_MSB) @@ -125,8 +124,7 @@ typedef int char_io (void *arg, const void *buf, int len); static int do_esc_char(unsigned long c, unsigned char flags, char *do_quotes, char_io *io_ch, void *arg) { - unsigned short chflgs; - unsigned char chtmp; + unsigned char chflgs, chtmp; char tmphex[HEX_SIZE(long) + 3]; if (c > 0xffffffffL) @@ -163,9 +161,7 @@ static int do_esc_char(unsigned long c, unsigned char flags, char *do_quotes, return -1; return 2; } - if (chflgs & (ASN1_STRFLGS_ESC_CTRL - | ASN1_STRFLGS_ESC_MSB - | ASN1_STRFLGS_ESC_2254)) { + if (chflgs & (ASN1_STRFLGS_ESC_CTRL | ASN1_STRFLGS_ESC_MSB)) { BIO_snprintf(tmphex, 11, "\\%02X", chtmp); if (!io_ch(arg, tmphex, 3)) return -1; @@ -195,12 +191,11 @@ static int do_esc_char(unsigned long c, unsigned char flags, char *do_quotes, */ static int do_buf(unsigned char *buf, int buflen, - int type, unsigned short flags, char *quotes, char_io *io_ch, + int type, unsigned char flags, char *quotes, char_io *io_ch, void *arg) { int i, outlen, len; - unsigned short orflags; - unsigned char *p, *q; + unsigned char orflags, *p, *q; unsigned long c; p = buf; q = buf + buflen; @@ -250,7 +245,7 @@ static int do_buf(unsigned char *buf, int buflen, * character will never be escaped on first and last. */ len = - do_esc_char(utfbuf[i], (unsigned short)(flags | orflags), + do_esc_char(utfbuf[i], (unsigned char)(flags | orflags), quotes, io_ch, arg); if (len < 0) return -1; @@ -258,7 +253,7 @@ static int do_buf(unsigned char *buf, int buflen, } } else { len = - do_esc_char(c, (unsigned short)(flags | orflags), quotes, + do_esc_char(c, (unsigned char)(flags | orflags), quotes, io_ch, arg); if (len < 0) return -1; @@ -360,10 +355,10 @@ static int do_print_ex(char_io *io_ch, void *arg, unsigned long lflags, int outlen, len; int type; char quotes; - unsigned short flags; + unsigned char flags; quotes = 0; /* Keep a copy of escape flags */ - flags = (unsigned short)(lflags & ESC_FLAGS); + flags = (unsigned char)(lflags & ESC_FLAGS); type = str->type; diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h index 09335a92b1..68e791fcdb 100644 --- a/crypto/asn1/asn1.h +++ b/crypto/asn1/asn1.h @@ -504,11 +504,6 @@ typedef const ASN1_ITEM *ASN1_ITEM_EXP (void); # define ASN1_STRFLGS_DUMP_DER 0x200 -/* - * This flag specifies that RC2254 escaping shall be performed. - */ -#define ASN1_STRFLGS_ESC_2254 0x400 - /* * All the string flags consistent with RFC2253, escaping control characters * isn't essential in RFC2253 but it is advisable anyway. diff --git a/crypto/asn1/charmap.pl b/crypto/asn1/charmap.pl index 9c15fa5e66..12ac34ad74 100644 --- a/crypto/asn1/charmap.pl +++ b/crypto/asn1/charmap.pl @@ -18,7 +18,6 @@ my $NOESC_QUOTE = 8; # Not escaped if quoted my $PSTRING_CHAR = 0x10; # Valid PrintableString character my $RFC2253_FIRST_ESC = 0x20; # Escaped with \ if first character my $RFC2253_LAST_ESC = 0x40; # Escaped with \ if last character -my $RFC2254_ESC = 0x400; # Character escaped \XX for($i = 0; $i < 128; $i++) { # Set the RFC2253 escape characters (control) @@ -50,14 +49,6 @@ $arr[ord("<")] |= $NOESC_QUOTE | $RFC2253_ESC; $arr[ord(">")] |= $NOESC_QUOTE | $RFC2253_ESC; $arr[ord(";")] |= $NOESC_QUOTE | $RFC2253_ESC; -# Remaining RFC2254 characters - -$arr[0] |= $RFC2254_ESC; -$arr[ord("(")] |= $RFC2254_ESC; -$arr[ord(")")] |= $RFC2254_ESC; -$arr[ord("*")] |= $RFC2254_ESC; -$arr[ord("\\")] |= $RFC2254_ESC; - # Remaining PrintableString characters $arr[ord(" ")] |= $PSTRING_CHAR; @@ -81,7 +72,7 @@ print <