Commit e18cf66a authored by Richard Levitte's avatar Richard Levitte
Browse files

Adjust a last few generators to new license boilerplate and C code style 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent e428f595

crypto/asn1/charmap.pl

+16 −4
Original line number Diff line number Diff line
@@ -70,17 +70,29 @@ $arr[ord("?")] |= $PSTRING_CHAR; 
# Now generate the C code



print <<EOF;

/* Auto generated with chartype.pl script.

/*

 * WARNING: do not edit!

 * Generated by crypto/asn1/charmap.pl

 *

 * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.

 * Licensed under the OpenSSL license (the "License").  You may not use

 * this file except in compliance with the License.  You can obtain a copy

 * in the file LICENSE in the source distribution or at

 * https://www.openssl.org/source/license.html

 */



/*

 * Mask of various character properties

 */



static const unsigned char char_type[] = {

EOF



print "   ";

for($i = 0; $i < 128; $i++) {

	print("\n   ") if($i && (($i % 16) == 0));

	printf(" %2d", $arr[$i]);

	print(",") if ($i != 127);

}

print("\n};\n\n");

print("\n};\n");

crypto/conf/keysets.pl

+11 −11
Original line number Diff line number Diff line
@@ -104,18 +104,18 @@ print <<"EOF"; 


#else                           /* CHARSET_EBCDIC */



# define IS_COMMENT(c,a)         (KEYTYPES(c)[os_toascii[a]&0xff]&CONF_COMMENT)

# define IS_FCOMMENT(c,a)        (KEYTYPES(c)[os_toascii[a]&0xff]&CONF_FCOMMENT)

# define IS_EOF(c,a)             (KEYTYPES(c)[os_toascii[a]&0xff]&CONF_EOF)

# define IS_ESC(c,a)             (KEYTYPES(c)[os_toascii[a]&0xff]&CONF_ESC)

# define IS_NUMBER(c,a)          (KEYTYPES(c)[os_toascii[a]&0xff]&CONF_NUMBER)

# define IS_WS(c,a)              (KEYTYPES(c)[os_toascii[a]&0xff]&CONF_WS)

# define IS_ALPHA_NUMERIC(c,a)   (KEYTYPES(c)[os_toascii[a]&0xff]&CONF_ALPHA_NUMERIC)

# define IS_COMMENT(c,a)         (KEYTYPES(c)[os_toascii[a & 0xff]]&CONF_COMMENT)

# define IS_FCOMMENT(c,a)        (KEYTYPES(c)[os_toascii[a & 0xff]]&CONF_FCOMMENT)

# define IS_EOF(c,a)             (KEYTYPES(c)[os_toascii[a & 0xff]]&CONF_EOF)

# define IS_ESC(c,a)             (KEYTYPES(c)[os_toascii[a & 0xff]]&CONF_ESC)

# define IS_NUMBER(c,a)          (KEYTYPES(c)[os_toascii[a & 0xff]]&CONF_NUMBER)

# define IS_WS(c,a)              (KEYTYPES(c)[os_toascii[a & 0xff]]&CONF_WS)

# define IS_ALPHA_NUMERIC(c,a)   (KEYTYPES(c)[os_toascii[a & 0xff]]&CONF_ALPHA_NUMERIC)

# define IS_ALPHA_NUMERIC_PUNCT(c,a) \\

                                (KEYTYPES(c)[os_toascii[a]&0xff]&CONF_ALPHA_NUMERIC_PUNCT)

# define IS_QUOTE(c,a)           (KEYTYPES(c)[os_toascii[a]&0xff]&CONF_QUOTE)

# define IS_DQUOTE(c,a)          (KEYTYPES(c)[os_toascii[a]&0xff]&CONF_DQUOTE)

# define IS_HIGHBIT(c,a)         (KEYTYPES(c)[os_toascii[a]&0xff]&CONF_HIGHBIT)

                                (KEYTYPES(c)[os_toascii[a & 0xff]]&CONF_ALPHA_NUMERIC_PUNCT)

# define IS_QUOTE(c,a)           (KEYTYPES(c)[os_toascii[a & 0xff]]&CONF_QUOTE)

# define IS_DQUOTE(c,a)          (KEYTYPES(c)[os_toascii[a & 0xff]]&CONF_DQUOTE)

# define IS_HIGHBIT(c,a)         (KEYTYPES(c)[os_toascii[a & 0xff]]&CONF_HIGHBIT)

#endif                          /* CHARSET_EBCDIC */



EOF