#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)
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)
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;
*/
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;
* 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;
}
} 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;
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;