Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix false positives of IS_*() macros for 8-bit ASCII characters #5844

Closed
wants to merge 3 commits into from
Closed

Fix false positives of IS_*() macros for 8-bit ASCII characters #5844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
44a5fd7
Make the IS_*() macros work correctly for 8-bit ASCII characters
mspncp Apr 2, 2018
eacf9fe
fixup! Make the IS_*() macros work correctly for 8-bit ASCII characters
mspncp Apr 2, 2018
4334a2a
Enlarge CONF_type_default and CONF_type_win32... [fixup]
mspncp Apr 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
60 changes: 46 additions & 14 deletions crypto/conf/conf_def.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,23 +28,23 @@
#define KEYTYPES(c) ((const unsigned short *)((c)->meth_data))

#ifndef CHARSET_EBCDIC
# define CVT(a) ((a) & 0x7F)
# define CVT(a) ((unsigned char)(a))
#else
# define CVT(a) os_toascci[(a) & 0x7F]
# define CVT(a) os_toascii[(unsigned char)(a)]
#endif

#define IS_COMMENT(c,a) (KEYTYPES(c)[CVT(a)] & CONF_COMMENT)
#define IS_FCOMMENT(c,a) (KEYTYPES(c)[CVT(a)] & CONF_FCOMMENT)
#define IS_EOF(c,a) (KEYTYPES(c)[CVT(a)] & CONF_EOF)
#define IS_ESC(c,a) (KEYTYPES(c)[CVT(a)] & CONF_ESC)
#define IS_NUMBER(c,a) (KEYTYPES(c)[CVT(a)] & CONF_NUMBER)
#define IS_WS(c,a) (KEYTYPES(c)[CVT(a)] & CONF_WS)
#define IS_ALNUM(c,a) (KEYTYPES(c)[CVT(a)] & CONF_ALNUM)
#define IS_ALNUM_PUNCT(c,a) (KEYTYPES(c)[CVT(a)] & CONF_ALNUM_PUNCT)
#define IS_QUOTE(c,a) (KEYTYPES(c)[CVT(a)] & CONF_QUOTE)
#define IS_DQUOTE(c,a) (KEYTYPES(c)[CVT(a)] & CONF_DQUOTE)
#define IS_COMMENT(c,a) ((KEYTYPES(c)[CVT(a)] & CONF_COMMENT) ? 1 : 0)
#define IS_FCOMMENT(c,a) ((KEYTYPES(c)[CVT(a)] & CONF_FCOMMENT) ? 1 : 0)
#define IS_EOF(c,a) ((KEYTYPES(c)[CVT(a)] & CONF_EOF) ? 1 : 0)
#define IS_ESC(c,a) ((KEYTYPES(c)[CVT(a)] & CONF_ESC) ? 1 : 0)
#define IS_NUMBER(c,a) ((KEYTYPES(c)[CVT(a)] & CONF_NUMBER) ? 1 : 0)
#define IS_WS(c,a) ((KEYTYPES(c)[CVT(a)] & CONF_WS) ? 1 : 0)
#define IS_ALNUM(c,a) ((KEYTYPES(c)[CVT(a)] & CONF_ALNUM) ? 1 : 0)
#define IS_ALNUM_PUNCT(c,a) ((KEYTYPES(c)[CVT(a)] & CONF_ALNUM_PUNCT) ? 1 : 0)
#define IS_QUOTE(c,a) ((KEYTYPES(c)[CVT(a)] & CONF_QUOTE) ? 1 : 0)
#define IS_DQUOTE(c,a) ((KEYTYPES(c)[CVT(a)] & CONF_DQUOTE) ? 1 : 0)

static const unsigned short CONF_type_default[128] = {
static const unsigned short CONF_type_default[256] = {
0x0008, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0010, 0x0010, 0x0000, 0x0000, 0x0010, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
Expand All @@ -61,9 +61,25 @@ static const unsigned short CONF_type_default[128] = {
0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004,
0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004,
0x0004, 0x0004, 0x0004, 0x0000, 0x0200, 0x0000, 0x0200, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
};

static const unsigned short CONF_type_win32[128] = {
static const unsigned short CONF_type_win32[256] = {
0x0008, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0010, 0x0010, 0x0000, 0x0000, 0x0010, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
Expand All @@ -80,4 +96,20 @@ static const unsigned short CONF_type_win32[128] = {
0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004,
0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004,
0x0004, 0x0004, 0x0004, 0x0000, 0x0200, 0x0000, 0x0200, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
};
34 changes: 17 additions & 17 deletions crypto/conf/keysets.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

my $v;
my $c;
foreach (0 .. 127) {
foreach (0 .. 255) {
$c = sprintf("%c", $_);
$v = 0;
$v |= $NUMBER if $c =~ /[0-9]/;
Expand Down Expand Up @@ -88,35 +88,35 @@
#define KEYTYPES(c) ((const unsigned short *)((c)->meth_data))

#ifndef CHARSET_EBCDIC
# define CVT(a) ((a) & 0x7F)
# define CVT(a) ((unsigned char)(a))
#else
# define CVT(a) os_toascci[(a) & 0x7F]
# define CVT(a) os_toascii[(unsigned char)(a)]
#endif

#define IS_COMMENT(c,a) (KEYTYPES(c)[CVT(a)] & CONF_COMMENT)
#define IS_FCOMMENT(c,a) (KEYTYPES(c)[CVT(a)] & CONF_FCOMMENT)
#define IS_EOF(c,a) (KEYTYPES(c)[CVT(a)] & CONF_EOF)
#define IS_ESC(c,a) (KEYTYPES(c)[CVT(a)] & CONF_ESC)
#define IS_NUMBER(c,a) (KEYTYPES(c)[CVT(a)] & CONF_NUMBER)
#define IS_WS(c,a) (KEYTYPES(c)[CVT(a)] & CONF_WS)
#define IS_ALNUM(c,a) (KEYTYPES(c)[CVT(a)] & CONF_ALNUM)
#define IS_ALNUM_PUNCT(c,a) (KEYTYPES(c)[CVT(a)] & CONF_ALNUM_PUNCT)
#define IS_QUOTE(c,a) (KEYTYPES(c)[CVT(a)] & CONF_QUOTE)
#define IS_DQUOTE(c,a) (KEYTYPES(c)[CVT(a)] & CONF_DQUOTE)
#define IS_COMMENT(c,a) ((KEYTYPES(c)[CVT(a)] & CONF_COMMENT) ? 1 : 0)
#define IS_FCOMMENT(c,a) ((KEYTYPES(c)[CVT(a)] & CONF_FCOMMENT) ? 1 : 0)
#define IS_EOF(c,a) ((KEYTYPES(c)[CVT(a)] & CONF_EOF) ? 1 : 0)
#define IS_ESC(c,a) ((KEYTYPES(c)[CVT(a)] & CONF_ESC) ? 1 : 0)
#define IS_NUMBER(c,a) ((KEYTYPES(c)[CVT(a)] & CONF_NUMBER) ? 1 : 0)
#define IS_WS(c,a) ((KEYTYPES(c)[CVT(a)] & CONF_WS) ? 1 : 0)
#define IS_ALNUM(c,a) ((KEYTYPES(c)[CVT(a)] & CONF_ALNUM) ? 1 : 0)
#define IS_ALNUM_PUNCT(c,a) ((KEYTYPES(c)[CVT(a)] & CONF_ALNUM_PUNCT) ? 1 : 0)
#define IS_QUOTE(c,a) ((KEYTYPES(c)[CVT(a)] & CONF_QUOTE) ? 1 : 0)
#define IS_DQUOTE(c,a) ((KEYTYPES(c)[CVT(a)] & CONF_DQUOTE) ? 1 : 0)

EOF

my $i;

print "static const unsigned short CONF_type_default[128] = {";
for ($i = 0; $i < 128; $i++) {
print "static const unsigned short CONF_type_default[256] = {";
for ($i = 0; $i < 256; $i++) {
print "\n " if ($i % 8) == 0;
printf " 0x%04X,", $V_def[$i];
}
print "\n};\n\n";

print "static const unsigned short CONF_type_win32[128] = {";
for ($i = 0; $i < 128; $i++) {
print "static const unsigned short CONF_type_win32[256] = {";
for ($i = 0; $i < 256; $i++) {
print "\n " if ($i % 8) == 0;
printf " 0x%04X,", $V_w32[$i];
}
Expand Down