diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-05-01 15:08:34 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-05-01 15:08:34 +0200 |
| commit | e18cf66aaf44b4d476625b2416386b051007d495 (patch) | |
| tree | dae6336093dc2a2101de9871d656a5e5ca4d8065 /crypto | |
| parent | e428f59514291b0c567709cd380fd05a692a2645 (diff) | |
Adjust a last few generators to new license boilerplate and C code style
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/asn1/charmap.pl | 20 | ||||
| -rw-r--r-- | crypto/conf/keysets.pl | 22 |
2 files changed, 27 insertions, 15 deletions
diff --git a/crypto/asn1/charmap.pl b/crypto/asn1/charmap.pl index c36cf78a90..4ddbe0edca 100644 --- a/crypto/asn1/charmap.pl +++ b/crypto/asn1/charmap.pl @@ -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("\n ") if($i && (($i % 16) == 0)); + printf(" %2d", $arr[$i]); print(",") if ($i != 127); } -print("\n};\n\n"); +print("\n};\n"); diff --git a/crypto/conf/keysets.pl b/crypto/conf/keysets.pl index 6db9c5576d..5af08ae20a 100644 --- a/crypto/conf/keysets.pl +++ b/crypto/conf/keysets.pl @@ -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 |