Send the rotIBM stream cipher (ebcdic) to Valhalla to party for eternity

with the bearded ones...
some API's that nobody should be using will dissapear with this commit.

3 files changed, 0 insertions, 51 deletions

diff --git a/src/lib/libcrypto/x509v3/v3_ia5.c b/src/lib/libcrypto/x509v3/v3_ia5.c
index 4ff12b52b5..ab1c5188b8 100644
--- a/src/lib/libcrypto/x509v3/v3_ia5.c
+++ b/src/lib/libcrypto/x509v3/v3_ia5.c
@@ -105,9 +105,6 @@ static ASN1_IA5STRING *s2i_ASN1_IA5STRING(X509V3_EXT_METHOD *method,
                 M_ASN1_IA5STRING_free(ia5);
                 goto err;
         }
-#ifdef CHARSET_EBCDIC
-        ebcdic2ascii(ia5->data, ia5->data, ia5->length);
-#endif /*CHARSET_EBCDIC*/
         return ia5;
         err:
         X509V3err(X509V3_F_S2I_ASN1_IA5STRING,ERR_R_MALLOC_FAILURE);
diff --git a/src/lib/libcrypto/x509v3/v3_prn.c b/src/lib/libcrypto/x509v3/v3_prn.c
index 3146218708..2124b447b4 100644
--- a/src/lib/libcrypto/x509v3/v3_prn.c
+++ b/src/lib/libcrypto/x509v3/v3_prn.c
@@ -83,22 +83,7 @@ void X509V3_EXT_val_prn(BIO *out, STACK_OF(CONF_VALUE) *val, int indent, int ml)
                 nval = sk_CONF_VALUE_value(val, i);
                 if(!nval->name) BIO_puts(out, nval->value);
                 else if(!nval->value) BIO_puts(out, nval->name);
-#ifndef CHARSET_EBCDIC
                 else BIO_printf(out, "%s:%s", nval->name, nval->value);
-#else
-                else {
-                        int len;
-                        char *tmp;
-                        len = strlen(nval->value)+1;
-                        tmp = OPENSSL_malloc(len);
-                        if (tmp)
-                        {
-                                ascii2ebcdic(tmp, nval->value, len);
-                                BIO_printf(out, "%s:%s", nval->name, tmp);
-                                OPENSSL_free(tmp);
-                        }
-                }
-#endif
                 if(ml) BIO_puts(out, "\n");
         }
 }
@@ -127,22 +112,7 @@ int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, unsigned long flag, int inde
                         ok = 0;
                         goto err;
                 }
-#ifndef CHARSET_EBCDIC
                 BIO_printf(out, "%*s%s", indent, "", value);
-#else
-                {
-                        int len;
-                        char *tmp;
-                        len = strlen(value)+1;
-                        tmp = OPENSSL_malloc(len);
-                        if (tmp)
-                        {
-                                ascii2ebcdic(tmp, value, len);
-                                BIO_printf(out, "%*s%s", indent, "", tmp);
-                                OPENSSL_free(tmp);
-                        }
-                }
-#endif
         } else if(method->i2v) {
                 if(!(nval = method->i2v(method, ext_str, NULL))) {
                         ok = 0;
diff --git a/src/lib/libcrypto/x509v3/v3_utl.c b/src/lib/libcrypto/x509v3/v3_utl.c
index e030234540..c4b6143eff 100644
--- a/src/lib/libcrypto/x509v3/v3_utl.c
+++ b/src/lib/libcrypto/x509v3/v3_utl.c
@@ -378,10 +378,6 @@ char *hex_to_string(const unsigned char *buffer, long len)
                 *q++ = ':';
         }
         q[-1] = 0;
-#ifdef CHARSET_EBCDIC
-        ebcdic2ascii(tmp, tmp, q - tmp - 1);
-#endif
-
         return tmp;
 }
 
@@ -400,14 +396,8 @@ unsigned char *string_to_hex(const char *str, long *len)
         if(!(hexbuf = OPENSSL_malloc(strlen(str) >> 1))) goto err;
         for(p = (unsigned char *)str, q = hexbuf; *p;) {
                 ch = *p++;
-#ifdef CHARSET_EBCDIC
-                ch = os_toebcdic[ch];
-#endif
                 if(ch == ':') continue;
                 cl = *p++;
-#ifdef CHARSET_EBCDIC
-                cl = os_toebcdic[cl];
-#endif
                 if(!cl) {
                         X509V3err(X509V3_F_STRING_TO_HEX,X509V3_R_ODD_NUMBER_OF_DIGITS);
                         OPENSSL_free(hexbuf);
@@ -844,21 +834,13 @@ int X509V3_NAME_from_section(X509_NAME *nm, STACK_OF(CONF_VALUE)*dn_sk,
                  * multiple instances 
                  */
                 for(p = type; *p ; p++) 
-#ifndef CHARSET_EBCDIC
                         if ((*p == ':') || (*p == ',') || (*p == '.'))
-#else
-                        if ((*p == os_toascii[':']) || (*p == os_toascii[',']) || (*p == os_toascii['.']))
-#endif
                                 {
                                 p++;
                                 if(*p) type = p;
                                 break;
                                 }
-#ifndef CHARSET_EBCDIC
                 if (*type == '+')
-#else
-                if (*type == os_toascii['+'])
-#endif
                         {
                         mval = -1;
                         type++;