diff options
| author | Matt Caswell <matt@openssl.org> | 2016-04-28 11:34:54 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-04-29 15:04:15 +0100 |
| commit | 5fd1478df34be8d17c8507f17ec4298635c72814 (patch) | |
| tree | 562c1f48842ca2ebc57bb54e86850f760e49ca21 /crypto | |
| parent | e590afdcf41c63255d6393a3299c71fdb4813d66 (diff) | |
Fix building with -DCHARSET_EBCDIC
Building with -DCHARSET_EBCDIC and using --strict-warnings resulted in
lots of miscellaneous errors. This fixes it.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/asn1/a_print.c | 1 | ||||
| -rw-r--r-- | crypto/asn1/f_int.c | 1 | ||||
| -rw-r--r-- | crypto/asn1/f_string.c | 1 | ||||
| -rw-r--r-- | crypto/conf/conf_def.h | 22 | ||||
| -rw-r--r-- | crypto/ebcdic.c | 2 |
5 files changed, 15 insertions, 12 deletions
diff --git a/crypto/asn1/a_print.c b/crypto/asn1/a_print.c index 9c70891c22..cd65bb1154 100644 --- a/crypto/asn1/a_print.c +++ b/crypto/asn1/a_print.c @@ -56,6 +56,7 @@ */ #include <stdio.h> +#include <ctype.h> #include "internal/cryptlib.h" #include <openssl/asn1.h> diff --git a/crypto/asn1/f_int.c b/crypto/asn1/f_int.c index 0feb7a15b6..e0e49de475 100644 --- a/crypto/asn1/f_int.c +++ b/crypto/asn1/f_int.c @@ -56,6 +56,7 @@ */ #include <stdio.h> +#include <ctype.h> #include "internal/cryptlib.h" #include <openssl/buffer.h> #include <openssl/asn1.h> diff --git a/crypto/asn1/f_string.c b/crypto/asn1/f_string.c index 7d9eb1475a..2b2b545dee 100644 --- a/crypto/asn1/f_string.c +++ b/crypto/asn1/f_string.c @@ -56,6 +56,7 @@ */ #include <stdio.h> +#include <ctype.h> #include "internal/cryptlib.h" #include <openssl/buffer.h> #include <openssl/asn1.h> diff --git a/crypto/conf/conf_def.h b/crypto/conf/conf_def.h index 3ebb0f7a73..21a41ea01b 100644 --- a/crypto/conf/conf_def.h +++ b/crypto/conf/conf_def.h @@ -95,18 +95,18 @@ #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[(int)a]&0xff]&CONF_COMMENT) +# define IS_FCOMMENT(c,a) (KEYTYPES(c)[os_toascii[(int)a]&0xff]&CONF_FCOMMENT) +# define IS_EOF(c,a) (KEYTYPES(c)[os_toascii[(int)a]&0xff]&CONF_EOF) +# define IS_ESC(c,a) (KEYTYPES(c)[os_toascii[(int)a]&0xff]&CONF_ESC) +# define IS_NUMBER(c,a) (KEYTYPES(c)[os_toascii[(int)a]&0xff]&CONF_NUMBER) +# define IS_WS(c,a) (KEYTYPES(c)[os_toascii[(int)a]&0xff]&CONF_WS) +# define IS_ALPHA_NUMERIC(c,a) (KEYTYPES(c)[os_toascii[(int)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[(int)a]&0xff]&CONF_ALPHA_NUMERIC_PUNCT) +# define IS_QUOTE(c,a) (KEYTYPES(c)[os_toascii[(int)a]&0xff]&CONF_QUOTE) +# define IS_DQUOTE(c,a) (KEYTYPES(c)[os_toascii[(int)a]&0xff]&CONF_DQUOTE) +# define IS_HIGHBIT(c,a) (KEYTYPES(c)[os_toascii[(int)a]&0xff]&CONF_HIGHBIT) #endif /* CHARSET_EBCDIC */ static const unsigned short CONF_type_default[256] = { diff --git a/crypto/ebcdic.c b/crypto/ebcdic.c index 1248cba260..995dbdf574 100644 --- a/crypto/ebcdic.c +++ b/crypto/ebcdic.c @@ -4,7 +4,7 @@ NON_EMPTY_TRANSLATION_UNIT #else -# include "ebcdic.h" +# include <openssl/ebcdic.h> /*- * Initial Port for Apache-1.3 by <Martin.Kraemer@Mch.SNI.De> |