Use correct C format for keysets.pl

Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Dr. Stephen Henson 2016-03-17 18:16:09 +00:00
parent a4a7174890
commit 4f59fd4d55

View File

@ -52,7 +52,6 @@ foreach (0 .. 255)
} }
print <<"EOF"; print <<"EOF";
/* crypto/conf/conf_def.h */
/* Copyright (C) 1995-1998 Eric Young (eay\@cryptsoft.com) /* Copyright (C) 1995-1998 Eric Young (eay\@cryptsoft.com)
* All rights reserved. * All rights reserved.
* *
@ -110,22 +109,24 @@ print <<"EOF";
* [including the GNU Public Licence.] * [including the GNU Public Licence.]
*/ */
/* THIS FILE WAS AUTOMAGICALLY GENERATED! /*
Please modify and use keysets.pl to regenerate it. */ * THIS FILE WAS AUTOMAGICALLY GENERATED! Please modify and use keysets.pl to
* regenerate it.
*/
#define CONF_NUMBER $NUMBER #define CONF_NUMBER 1
#define CONF_UPPER $UPPER #define CONF_UPPER 2
#define CONF_LOWER $LOWER #define CONF_LOWER 4
#define CONF_UNDER $UNDER #define CONF_UNDER 256
#define CONF_PUNCTUATION $PUNCTUATION #define CONF_PUNCTUATION 512
#define CONF_WS $WS #define CONF_WS 16
#define CONF_ESC $ESC #define CONF_ESC 32
#define CONF_QUOTE $QUOTE #define CONF_QUOTE 64
#define CONF_DQUOTE $DQUOTE #define CONF_DQUOTE 1024
#define CONF_COMMENT $COMMENT #define CONF_COMMENT 128
#define CONF_FCOMMENT $FCOMMENT #define CONF_FCOMMENT 2048
#define CONF_EOF $EOF #define CONF_EOF 8
#define CONF_HIGHBIT $HIGHBIT #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_ALPHA_NUMERIC (CONF_ALPHA|CONF_NUMBER|CONF_UNDER)
#define CONF_ALPHA_NUMERIC_PUNCT (CONF_ALPHA|CONF_NUMBER|CONF_UNDER| \\ #define CONF_ALPHA_NUMERIC_PUNCT (CONF_ALPHA|CONF_NUMBER|CONF_UNDER| \\
@ -168,18 +169,18 @@ print "static const unsigned short CONF_type_default[256]={";
for ($i=0; $i<256; $i++) for ($i=0; $i<256; $i++)
{ {
print "\n\t" if ($i % 8) == 0; print "\n " if ($i % 8) == 0;
printf " 0x%04X,",$V_def[$i]; printf " 0x%04X,",$V_def[$i];
} }
print "\n\t};\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\t" if ($i % 8) == 0; print "\n " if ($i % 8) == 0;
printf " 0x%04X,",$V_w32[$i]; printf " 0x%04X,",$V_w32[$i];
} }
print "\n\t};\n\n"; print "\n};\n";