From: Matt Caswell <matt@openssl.org>
Date: Fri, 29 Apr 2016 09:30:05 +0000 (+0100)
Subject: Fix a build error with strict-warnings and CHARSET_EBCDIC
X-Git-Tag: OpenSSL_1_1_0-pre6~998
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4cd5c3f4eef81c791a5041dc17ec27aa08540e42;p=oweals%2Fopenssl.git

Fix a build error with strict-warnings and CHARSET_EBCDIC

Reviewed-by: Andy Polyakov <appro@openssl.org>
---

diff --git a/crypto/x509/x509_obj.c b/crypto/x509/x509_obj.c
index 8b4d4362ba..ac871b4029 100644
--- a/crypto/x509/x509_obj.c
+++ b/crypto/x509/x509_obj.c
@@ -76,7 +76,7 @@ char *X509_NAME_oneline(X509_NAME *a, char *buf, int len)
     int gs_doit[4];
     char tmp_buf[80];
 #ifdef CHARSET_EBCDIC
-    char ebcdic_buf[1024];
+    unsigned char ebcdic_buf[1024];
 #endif
 
     if (buf == NULL) {
@@ -117,8 +117,8 @@ char *X509_NAME_oneline(X509_NAME *a, char *buf, int len)
             type == V_ASN1_PRINTABLESTRING ||
             type == V_ASN1_TELETEXSTRING ||
             type == V_ASN1_VISIBLESTRING || type == V_ASN1_IA5STRING) {
-            ascii2ebcdic(ebcdic_buf, q, (num > sizeof ebcdic_buf)
-                         ? sizeof ebcdic_buf : num);
+            ascii2ebcdic(ebcdic_buf, q, (num > (int)sizeof(ebcdic_buf))
+                         ? (int)sizeof(ebcdic_buf) : num);
             q = ebcdic_buf;
         }
 #endif