mirror of
https://github.com/QuasarApp/openssl.git
synced 2025-05-12 17:39:41 +00:00
Revise and cleanup; use strict,warnings
Use shorter names for some defines, so also had to change the .c file that used them. Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5669)
This commit is contained in:
Rich Salz
parent
8a5ed9dce8
commit
69e2b8d67d
@ -558,7 +558,7 @@ static int str_copy(CONF *conf, char *section, char **pto, char *from)
|
|||||||
s++;
|
s++;
|
||||||
cp = section;
|
cp = section;
|
||||||
e = np = s;
|
e = np = s;
|
||||||
while (IS_ALPHA_NUMERIC(conf, *e))
|
while (IS_ALNUM(conf, *e))
|
||||||
e++;
|
e++;
|
||||||
if ((e[0] == ':') && (e[1] == ':')) {
|
if ((e[0] == ':') && (e[1] == ':')) {
|
||||||
cp = np;
|
cp = np;
|
||||||
@ -567,7 +567,7 @@ static int str_copy(CONF *conf, char *section, char **pto, char *from)
|
|||||||
*rrp = '\0';
|
*rrp = '\0';
|
||||||
e += 2;
|
e += 2;
|
||||||
np = e;
|
np = e;
|
||||||
while (IS_ALPHA_NUMERIC(conf, *e))
|
while (IS_ALNUM(conf, *e))
|
||||||
e++;
|
e++;
|
||||||
}
|
}
|
||||||
r = *e;
|
r = *e;
|
||||||
@ -759,7 +759,7 @@ static char *eat_alpha_numeric(CONF *conf, char *p)
|
|||||||
p = scan_esc(conf, p);
|
p = scan_esc(conf, p);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (!IS_ALPHA_NUMERIC_PUNCT(conf, *p))
|
if (!IS_ALNUM_PUNCT(conf, *p))
|
||||||
return p;
|
return p;
|
||||||
p++;
|
p++;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -13,7 +13,7 @@
|
|||||||
#define CONF_UPPER 2
|
#define CONF_UPPER 2
|
||||||
#define CONF_LOWER 4
|
#define CONF_LOWER 4
|
||||||
#define CONF_UNDER 256
|
#define CONF_UNDER 256
|
||||||
#define CONF_PUNCTUATION 512
|
#define CONF_PUNCT 512
|
||||||
#define CONF_WS 16
|
#define CONF_WS 16
|
||||||
#define CONF_ESC 32
|
#define CONF_ESC 32
|
||||||
#define CONF_QUOTE 64
|
#define CONF_QUOTE 64
|
||||||
@ -23,40 +23,28 @@
|
|||||||
#define CONF_EOF 8
|
#define CONF_EOF 8
|
||||||
#define CONF_HIGHBIT 4096
|
#define CONF_HIGHBIT 4096
|
||||||
#define CONF_ALPHA (CONF_UPPER|CONF_LOWER)
|
#define CONF_ALPHA (CONF_UPPER|CONF_LOWER)
|
||||||
#define CONF_ALPHA_NUMERIC (CONF_ALPHA|CONF_NUMBER|CONF_UNDER)
|
#define CONF_ALNUM (CONF_ALPHA|CONF_NUMBER|CONF_UNDER)
|
||||||
#define CONF_ALPHA_NUMERIC_PUNCT (CONF_ALPHA|CONF_NUMBER|CONF_UNDER| \
|
#define CONF_ALNUM_PUNCT (CONF_ALPHA|CONF_NUMBER|CONF_UNDER|CONF_PUNCT)
|
||||||
CONF_PUNCTUATION)
|
|
||||||
|
|
||||||
#define KEYTYPES(c) ((const unsigned short *)((c)->meth_data))
|
#define KEYTYPES(c) ((const unsigned short *)((c)->meth_data))
|
||||||
|
|
||||||
#ifndef CHARSET_EBCDIC
|
#ifndef CHARSET_EBCDIC
|
||||||
# define IS_COMMENT(c,a) (KEYTYPES(c)[(a)&0xff]&CONF_COMMENT)
|
# define CVT(a) ((a) & 0xFF)
|
||||||
# define IS_FCOMMENT(c,a) (KEYTYPES(c)[(a)&0xff]&CONF_FCOMMENT)
|
#else
|
||||||
# define IS_EOF(c,a) (KEYTYPES(c)[(a)&0xff]&CONF_EOF)
|
# define CVT(a) os_toascci[(a) & 0FF]
|
||||||
# define IS_ESC(c,a) (KEYTYPES(c)[(a)&0xff]&CONF_ESC)
|
#endif
|
||||||
# define IS_NUMBER(c,a) (KEYTYPES(c)[(a)&0xff]&CONF_NUMBER)
|
|
||||||
# define IS_WS(c,a) (KEYTYPES(c)[(a)&0xff]&CONF_WS)
|
|
||||||
# define IS_ALPHA_NUMERIC(c,a) (KEYTYPES(c)[(a)&0xff]&CONF_ALPHA_NUMERIC)
|
|
||||||
# define IS_ALPHA_NUMERIC_PUNCT(c,a) \
|
|
||||||
(KEYTYPES(c)[(a)&0xff]&CONF_ALPHA_NUMERIC_PUNCT)
|
|
||||||
# define IS_QUOTE(c,a) (KEYTYPES(c)[(a)&0xff]&CONF_QUOTE)
|
|
||||||
# define IS_DQUOTE(c,a) (KEYTYPES(c)[(a)&0xff]&CONF_DQUOTE)
|
|
||||||
# define IS_HIGHBIT(c,a) (KEYTYPES(c)[(a)&0xff]&CONF_HIGHBIT)
|
|
||||||
|
|
||||||
#else /* CHARSET_EBCDIC */
|
#define IS_COMMENT(c,a) (KEYTYPES(c)[CVT(a)] & CONF_COMMENT)
|
||||||
|
#define IS_FCOMMENT(c,a) (KEYTYPES(c)[CVT(a)] & CONF_FCOMMENT)
|
||||||
# define IS_COMMENT(c,a) (KEYTYPES(c)[os_toascii[a & 0xff]]&CONF_COMMENT)
|
#define IS_EOF(c,a) (KEYTYPES(c)[CVT(a)] & CONF_EOF)
|
||||||
# define IS_FCOMMENT(c,a) (KEYTYPES(c)[os_toascii[a & 0xff]]&CONF_FCOMMENT)
|
#define IS_ESC(c,a) (KEYTYPES(c)[CVT(a)] & CONF_ESC)
|
||||||
# define IS_EOF(c,a) (KEYTYPES(c)[os_toascii[a & 0xff]]&CONF_EOF)
|
#define IS_NUMBER(c,a) (KEYTYPES(c)[CVT(a)] & CONF_NUMBER)
|
||||||
# define IS_ESC(c,a) (KEYTYPES(c)[os_toascii[a & 0xff]]&CONF_ESC)
|
#define IS_WS(c,a) (KEYTYPES(c)[CVT(a)] & CONF_WS)
|
||||||
# define IS_NUMBER(c,a) (KEYTYPES(c)[os_toascii[a & 0xff]]&CONF_NUMBER)
|
#define IS_ALNUM(c,a) (KEYTYPES(c)[CVT(a)] & CONF_ALNUM)
|
||||||
# define IS_WS(c,a) (KEYTYPES(c)[os_toascii[a & 0xff]]&CONF_WS)
|
#define IS_ALNUM_PUNCT(c,a) (KEYTYPES(c)[CVT(a)] & CONF_ALNUM_PUNCT)
|
||||||
# define IS_ALPHA_NUMERIC(c,a) (KEYTYPES(c)[os_toascii[a & 0xff]]&CONF_ALPHA_NUMERIC)
|
#define IS_QUOTE(c,a) (KEYTYPES(c)[CVT(a)] & CONF_QUOTE)
|
||||||
# define IS_ALPHA_NUMERIC_PUNCT(c,a) \
|
#define IS_DQUOTE(c,a) (KEYTYPES(c)[CVT(a)] & CONF_DQUOTE)
|
||||||
(KEYTYPES(c)[os_toascii[a & 0xff]]&CONF_ALPHA_NUMERIC_PUNCT)
|
#define IS_HIGHBIT(c,a) (KEYTYPES(c)[CVT(a)] & CONF_HIGHBIT)
|
||||||
# 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 */
|
|
||||||
|
|
||||||
static const unsigned short CONF_type_default[256] = {
|
static const unsigned short CONF_type_default[256] = {
|
||||||
0x0008, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
|
0x0008, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
|
||||||
|
|||||||
@ -6,59 +6,60 @@
|
|||||||
# in the file LICENSE in the source distribution or at
|
# in the file LICENSE in the source distribution or at
|
||||||
# https://www.openssl.org/source/license.html
|
# https://www.openssl.org/source/license.html
|
||||||
|
|
||||||
$NUMBER=0x01;
|
use strict;
|
||||||
$UPPER=0x02;
|
use warnings;
|
||||||
$LOWER=0x04;
|
|
||||||
$UNDER=0x100;
|
|
||||||
$PUNCTUATION=0x200;
|
|
||||||
$WS=0x10;
|
|
||||||
$ESC=0x20;
|
|
||||||
$QUOTE=0x40;
|
|
||||||
$DQUOTE=0x400;
|
|
||||||
$COMMENT=0x80;
|
|
||||||
$FCOMMENT=0x800;
|
|
||||||
$EOF=0x08;
|
|
||||||
$HIGHBIT=0x1000;
|
|
||||||
|
|
||||||
foreach (0 .. 255)
|
my $NUMBER = 0x0001;
|
||||||
{
|
my $UPPER = 0x0002;
|
||||||
$v=0;
|
my $LOWER = 0x0004;
|
||||||
|
my $UNDER = 0x0100;
|
||||||
|
my $PUNCTUATION = 0x0200;
|
||||||
|
my $WS = 0x0010;
|
||||||
|
my $ESC = 0x0020;
|
||||||
|
my $QUOTE = 0x0040;
|
||||||
|
my $DQUOTE = 0x0400;
|
||||||
|
my $COMMENT = 0x0080;
|
||||||
|
my $FCOMMENT = 0x0800;
|
||||||
|
my $EOF = 0x0008;
|
||||||
|
my $HIGHBIT = 0x1000;
|
||||||
|
my @V_def;
|
||||||
|
my @V_w32;
|
||||||
|
|
||||||
|
my $v;
|
||||||
|
my $c;
|
||||||
|
foreach (0 .. 255) {
|
||||||
$c = sprintf("%c", $_);
|
$c = sprintf("%c", $_);
|
||||||
$v|=$NUMBER if ($c =~ /[0-9]/);
|
$v = 0;
|
||||||
$v|=$UPPER if ($c =~ /[A-Z]/);
|
$v |= $NUMBER if $c =~ /[0-9]/;
|
||||||
$v|=$LOWER if ($c =~ /[a-z]/);
|
$v |= $UPPER if $c =~ /[A-Z]/;
|
||||||
$v|=$UNDER if ($c =~ /_/);
|
$v |= $LOWER if $c =~ /[a-z]/;
|
||||||
$v|=$PUNCTUATION if ($c =~ /[!\.%&\*\+,\/;\?\@\^\~\|-]/);
|
$v |= $UNDER if $c =~ /_/;
|
||||||
$v|=$WS if ($c =~ /[ \t\r\n]/);
|
$v |= $PUNCTUATION if $c =~ /[!\.%&\*\+,\/;\?\@\^\~\|-]/;
|
||||||
$v|=$ESC if ($c =~ /\\/);
|
$v |= $WS if $c =~ /[ \t\r\n]/;
|
||||||
$v|=$QUOTE if ($c =~ /['`"]/); # for emacs: "`'}/)
|
$v |= $ESC if $c =~ /\\/;
|
||||||
$v|=$COMMENT if ($c =~ /\#/);
|
$v |= $QUOTE if $c =~ /['`"]/; # for emacs: "`'
|
||||||
$v|=$EOF if ($c =~ /\0/);
|
$v |= $COMMENT if $c =~ /\#/;
|
||||||
$v|=$HIGHBIT if ($c =~/[\x80-\xff]/);
|
$v |= $EOF if $c =~ /\0/;
|
||||||
|
$v |= $HIGHBIT if $c =~ /[\x80-\xff]/;
|
||||||
push(@V_def, $v);
|
push(@V_def, $v);
|
||||||
}
|
|
||||||
|
|
||||||
foreach (0 .. 255)
|
|
||||||
{
|
|
||||||
$v = 0;
|
$v = 0;
|
||||||
$c=sprintf("%c",$_);
|
$v |= $NUMBER if $c =~ /[0-9]/;
|
||||||
$v|=$NUMBER if ($c =~ /[0-9]/);
|
$v |= $UPPER if $c =~ /[A-Z]/;
|
||||||
$v|=$UPPER if ($c =~ /[A-Z]/);
|
$v |= $LOWER if $c =~ /[a-z]/;
|
||||||
$v|=$LOWER if ($c =~ /[a-z]/);
|
$v |= $UNDER if $c =~ /_/;
|
||||||
$v|=$UNDER if ($c =~ /_/);
|
$v |= $PUNCTUATION if $c =~ /[!\.%&\*\+,\/;\?\@\^\~\|-]/;
|
||||||
$v|=$PUNCTUATION if ($c =~ /[!\.%&\*\+,\/;\?\@\^\~\|-]/);
|
$v |= $WS if $c =~ /[ \t\r\n]/;
|
||||||
$v|=$WS if ($c =~ /[ \t\r\n]/);
|
$v |= $DQUOTE if $c =~ /["]/; # for emacs: "
|
||||||
$v|=$DQUOTE if ($c =~ /["]/); # for emacs: "}/)
|
$v |= $FCOMMENT if $c =~ /;/;
|
||||||
$v|=$FCOMMENT if ($c =~ /;/);
|
$v |= $EOF if $c =~ /\0/;
|
||||||
$v|=$EOF if ($c =~ /\0/);
|
$v |= $HIGHBIT if $c =~ /[\x80-\xff]/;
|
||||||
$v|=$HIGHBIT if ($c =~/[\x80-\xff]/);
|
|
||||||
|
|
||||||
push(@V_w32, $v);
|
push(@V_w32, $v);
|
||||||
}
|
}
|
||||||
|
|
||||||
# Output year depends on the year of the script.
|
# Output year depends on the year of the script.
|
||||||
my $YEAR = [localtime([stat($0)]->[9])]->[5] + 1900;
|
my $YEAR = [localtime([stat($0)]->[9])]->[5] + 1900;
|
||||||
|
|
||||||
print <<"EOF";
|
print <<"EOF";
|
||||||
/*
|
/*
|
||||||
* WARNING: do not edit!
|
* WARNING: do not edit!
|
||||||
@ -75,7 +76,7 @@ print <<"EOF";
|
|||||||
#define CONF_UPPER $UPPER
|
#define CONF_UPPER $UPPER
|
||||||
#define CONF_LOWER $LOWER
|
#define CONF_LOWER $LOWER
|
||||||
#define CONF_UNDER $UNDER
|
#define CONF_UNDER $UNDER
|
||||||
#define CONF_PUNCTUATION $PUNCTUATION
|
#define CONF_PUNCT $PUNCTUATION
|
||||||
#define CONF_WS $WS
|
#define CONF_WS $WS
|
||||||
#define CONF_ESC $ESC
|
#define CONF_ESC $ESC
|
||||||
#define CONF_QUOTE $QUOTE
|
#define CONF_QUOTE $QUOTE
|
||||||
@ -85,59 +86,43 @@ print <<"EOF";
|
|||||||
#define CONF_EOF $EOF
|
#define CONF_EOF $EOF
|
||||||
#define CONF_HIGHBIT $HIGHBIT
|
#define CONF_HIGHBIT $HIGHBIT
|
||||||
#define CONF_ALPHA (CONF_UPPER|CONF_LOWER)
|
#define CONF_ALPHA (CONF_UPPER|CONF_LOWER)
|
||||||
#define CONF_ALPHA_NUMERIC (CONF_ALPHA|CONF_NUMBER|CONF_UNDER)
|
#define CONF_ALNUM (CONF_ALPHA|CONF_NUMBER|CONF_UNDER)
|
||||||
#define CONF_ALPHA_NUMERIC_PUNCT (CONF_ALPHA|CONF_NUMBER|CONF_UNDER| \\
|
#define CONF_ALNUM_PUNCT (CONF_ALPHA|CONF_NUMBER|CONF_UNDER|CONF_PUNCT)
|
||||||
CONF_PUNCTUATION)
|
|
||||||
|
|
||||||
#define KEYTYPES(c) ((const unsigned short *)((c)->meth_data))
|
#define KEYTYPES(c) ((const unsigned short *)((c)->meth_data))
|
||||||
|
|
||||||
#ifndef CHARSET_EBCDIC
|
#ifndef CHARSET_EBCDIC
|
||||||
# define IS_COMMENT(c,a) (KEYTYPES(c)[(a)&0xff]&CONF_COMMENT)
|
# define CVT(a) ((a) & 0xFF)
|
||||||
# define IS_FCOMMENT(c,a) (KEYTYPES(c)[(a)&0xff]&CONF_FCOMMENT)
|
#else
|
||||||
# define IS_EOF(c,a) (KEYTYPES(c)[(a)&0xff]&CONF_EOF)
|
# define CVT(a) os_toascci[(a) & 0FF]
|
||||||
# define IS_ESC(c,a) (KEYTYPES(c)[(a)&0xff]&CONF_ESC)
|
#endif
|
||||||
# define IS_NUMBER(c,a) (KEYTYPES(c)[(a)&0xff]&CONF_NUMBER)
|
|
||||||
# define IS_WS(c,a) (KEYTYPES(c)[(a)&0xff]&CONF_WS)
|
|
||||||
# define IS_ALPHA_NUMERIC(c,a) (KEYTYPES(c)[(a)&0xff]&CONF_ALPHA_NUMERIC)
|
|
||||||
# define IS_ALPHA_NUMERIC_PUNCT(c,a) \\
|
|
||||||
(KEYTYPES(c)[(a)&0xff]&CONF_ALPHA_NUMERIC_PUNCT)
|
|
||||||
# define IS_QUOTE(c,a) (KEYTYPES(c)[(a)&0xff]&CONF_QUOTE)
|
|
||||||
# define IS_DQUOTE(c,a) (KEYTYPES(c)[(a)&0xff]&CONF_DQUOTE)
|
|
||||||
# define IS_HIGHBIT(c,a) (KEYTYPES(c)[(a)&0xff]&CONF_HIGHBIT)
|
|
||||||
|
|
||||||
#else /* CHARSET_EBCDIC */
|
#define IS_COMMENT(c,a) (KEYTYPES(c)[CVT(a)] & CONF_COMMENT)
|
||||||
|
#define IS_FCOMMENT(c,a) (KEYTYPES(c)[CVT(a)] & CONF_FCOMMENT)
|
||||||
# define IS_COMMENT(c,a) (KEYTYPES(c)[os_toascii[a & 0xff]]&CONF_COMMENT)
|
#define IS_EOF(c,a) (KEYTYPES(c)[CVT(a)] & CONF_EOF)
|
||||||
# define IS_FCOMMENT(c,a) (KEYTYPES(c)[os_toascii[a & 0xff]]&CONF_FCOMMENT)
|
#define IS_ESC(c,a) (KEYTYPES(c)[CVT(a)] & CONF_ESC)
|
||||||
# define IS_EOF(c,a) (KEYTYPES(c)[os_toascii[a & 0xff]]&CONF_EOF)
|
#define IS_NUMBER(c,a) (KEYTYPES(c)[CVT(a)] & CONF_NUMBER)
|
||||||
# define IS_ESC(c,a) (KEYTYPES(c)[os_toascii[a & 0xff]]&CONF_ESC)
|
#define IS_WS(c,a) (KEYTYPES(c)[CVT(a)] & CONF_WS)
|
||||||
# define IS_NUMBER(c,a) (KEYTYPES(c)[os_toascii[a & 0xff]]&CONF_NUMBER)
|
#define IS_ALNUM(c,a) (KEYTYPES(c)[CVT(a)] & CONF_ALNUM)
|
||||||
# define IS_WS(c,a) (KEYTYPES(c)[os_toascii[a & 0xff]]&CONF_WS)
|
#define IS_ALNUM_PUNCT(c,a) (KEYTYPES(c)[CVT(a)] & CONF_ALNUM_PUNCT)
|
||||||
# define IS_ALPHA_NUMERIC(c,a) (KEYTYPES(c)[os_toascii[a & 0xff]]&CONF_ALPHA_NUMERIC)
|
#define IS_QUOTE(c,a) (KEYTYPES(c)[CVT(a)] & CONF_QUOTE)
|
||||||
# define IS_ALPHA_NUMERIC_PUNCT(c,a) \\
|
#define IS_DQUOTE(c,a) (KEYTYPES(c)[CVT(a)] & CONF_DQUOTE)
|
||||||
(KEYTYPES(c)[os_toascii[a & 0xff]]&CONF_ALPHA_NUMERIC_PUNCT)
|
#define IS_HIGHBIT(c,a) (KEYTYPES(c)[CVT(a)] & CONF_HIGHBIT)
|
||||||
# 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
|
EOF
|
||||||
|
|
||||||
print "static const unsigned short CONF_type_default[256] = {";
|
my $i;
|
||||||
|
|
||||||
for ($i=0; $i<256; $i++)
|
print "static const unsigned short CONF_type_default[256] = {";
|
||||||
{
|
for ($i = 0; $i < 256; $i++) {
|
||||||
print "\n " if ($i % 8) == 0;
|
print "\n " if ($i % 8) == 0;
|
||||||
printf " 0x%04X,", $V_def[$i];
|
printf " 0x%04X,", $V_def[$i];
|
||||||
}
|
}
|
||||||
|
|
||||||
print "\n};\n\n";
|
print "\n};\n\n";
|
||||||
|
|
||||||
print "static const unsigned short CONF_type_win32[256] = {";
|
print "static const unsigned short CONF_type_win32[256] = {";
|
||||||
|
for ($i = 0; $i < 256; $i++) {
|
||||||
for ($i=0; $i<256; $i++)
|
|
||||||
{
|
|
||||||
print "\n " if ($i % 8) == 0;
|
print "\n " if ($i % 8) == 0;
|
||||||
printf " 0x%04X,", $V_w32[$i];
|
printf " 0x%04X,", $V_w32[$i];
|
||||||
}
|
}
|
||||||
|
|
||||||
print "\n};\n";
|
print "\n};\n";
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user