diff options
| author | Justin Blanchard <uncombedcoconut@gmail.com> | 2014-08-18 11:01:15 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@akamai.com> | 2014-08-18 11:49:16 -0400 |
| commit | f756fb430eb8f5f70696f174460eb90740b318f7 (patch) | |
| tree | ce3c86c0c6717e30193a3ba15d176e390d322707 /crypto/conf | |
| parent | defe438d472bbef4d2bc5e4893560bc4eae43760 (diff) | |
RT1815: More const'ness improvements
Add a dozen more const declarations where appropriate.
These are from Justin; while adding his patch, I noticed
ASN1_BIT_STRING_check could be fixed, too.
Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
Diffstat (limited to 'crypto/conf')
| -rw-r--r-- | crypto/conf/conf_def.h | 6 | ||||
| -rw-r--r-- | crypto/conf/keysets.pl | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/crypto/conf/conf_def.h b/crypto/conf/conf_def.h index 92a7d8ad77..f26acd7dba 100644 --- a/crypto/conf/conf_def.h +++ b/crypto/conf/conf_def.h @@ -77,7 +77,7 @@ #define CONF_ALPHA_NUMERIC_PUNCT (CONF_ALPHA|CONF_NUMBER|CONF_UNDER| \ CONF_PUNCTUATION) -#define KEYTYPES(c) ((unsigned short *)((c)->meth_data)) +#define KEYTYPES(c) ((const unsigned short *)((c)->meth_data)) #ifndef CHARSET_EBCDIC #define IS_COMMENT(c,a) (KEYTYPES(c)[(a)&0xff]&CONF_COMMENT) #define IS_FCOMMENT(c,a) (KEYTYPES(c)[(a)&0xff]&CONF_FCOMMENT) @@ -108,7 +108,7 @@ #define IS_HIGHBIT(c,a) (KEYTYPES(c)[os_toascii[a]&0xff]&CONF_HIGHBIT) #endif /*CHARSET_EBCDIC*/ -static unsigned short CONF_type_default[256]={ +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, @@ -143,7 +143,7 @@ static unsigned short CONF_type_default[256]={ 0x1000,0x1000,0x1000,0x1000,0x1000,0x1000,0x1000,0x1000, }; -static unsigned short CONF_type_win32[256]={ +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, diff --git a/crypto/conf/keysets.pl b/crypto/conf/keysets.pl index 50ed67fa52..a9baca4b0f 100644 --- a/crypto/conf/keysets.pl +++ b/crypto/conf/keysets.pl @@ -131,7 +131,7 @@ print <<"EOF"; #define CONF_ALPHA_NUMERIC_PUNCT (CONF_ALPHA|CONF_NUMBER|CONF_UNDER| \\ CONF_PUNCTUATION) -#define KEYTYPES(c) ((unsigned short *)((c)->meth_data)) +#define KEYTYPES(c) ((const unsigned short *)((c)->meth_data)) #ifndef CHARSET_EBCDIC #define IS_COMMENT(c,a) (KEYTYPES(c)[(a)&0xff]&CONF_COMMENT) #define IS_FCOMMENT(c,a) (KEYTYPES(c)[(a)&0xff]&CONF_FCOMMENT) @@ -164,7 +164,7 @@ print <<"EOF"; EOF -print "static unsigned short CONF_type_default[256]={"; +print "static const unsigned short CONF_type_default[256]={"; for ($i=0; $i<256; $i++) { @@ -174,7 +174,7 @@ for ($i=0; $i<256; $i++) print "\n\t};\n\n"; -print "static unsigned short CONF_type_win32[256]={"; +print "static const unsigned short CONF_type_win32[256]={"; for ($i=0; $i<256; $i++) { |