diff options
Diffstat (limited to 'src/lib/libcrypto/x509v3/v3_utl.c')
| -rw-r--r-- | src/lib/libcrypto/x509v3/v3_utl.c | 18 |
1 files changed, 0 insertions, 18 deletions
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) | |||
| 378 | *q++ = ':'; | 378 | *q++ = ':'; |
| 379 | } | 379 | } |
| 380 | q[-1] = 0; | 380 | q[-1] = 0; |
| 381 | #ifdef CHARSET_EBCDIC | ||
| 382 | ebcdic2ascii(tmp, tmp, q - tmp - 1); | ||
| 383 | #endif | ||
| 384 | |||
| 385 | return tmp; | 381 | return tmp; |
| 386 | } | 382 | } |
| 387 | 383 | ||
| @@ -400,14 +396,8 @@ unsigned char *string_to_hex(const char *str, long *len) | |||
| 400 | if(!(hexbuf = OPENSSL_malloc(strlen(str) >> 1))) goto err; | 396 | if(!(hexbuf = OPENSSL_malloc(strlen(str) >> 1))) goto err; |
| 401 | for(p = (unsigned char *)str, q = hexbuf; *p;) { | 397 | for(p = (unsigned char *)str, q = hexbuf; *p;) { |
| 402 | ch = *p++; | 398 | ch = *p++; |
| 403 | #ifdef CHARSET_EBCDIC | ||
| 404 | ch = os_toebcdic[ch]; | ||
| 405 | #endif | ||
| 406 | if(ch == ':') continue; | 399 | if(ch == ':') continue; |
| 407 | cl = *p++; | 400 | cl = *p++; |
| 408 | #ifdef CHARSET_EBCDIC | ||
| 409 | cl = os_toebcdic[cl]; | ||
| 410 | #endif | ||
| 411 | if(!cl) { | 401 | if(!cl) { |
| 412 | X509V3err(X509V3_F_STRING_TO_HEX,X509V3_R_ODD_NUMBER_OF_DIGITS); | 402 | X509V3err(X509V3_F_STRING_TO_HEX,X509V3_R_ODD_NUMBER_OF_DIGITS); |
| 413 | OPENSSL_free(hexbuf); | 403 | OPENSSL_free(hexbuf); |
| @@ -844,21 +834,13 @@ int X509V3_NAME_from_section(X509_NAME *nm, STACK_OF(CONF_VALUE)*dn_sk, | |||
| 844 | * multiple instances | 834 | * multiple instances |
| 845 | */ | 835 | */ |
| 846 | for(p = type; *p ; p++) | 836 | for(p = type; *p ; p++) |
| 847 | #ifndef CHARSET_EBCDIC | ||
| 848 | if ((*p == ':') || (*p == ',') || (*p == '.')) | 837 | if ((*p == ':') || (*p == ',') || (*p == '.')) |
| 849 | #else | ||
| 850 | if ((*p == os_toascii[':']) || (*p == os_toascii[',']) || (*p == os_toascii['.'])) | ||
| 851 | #endif | ||
| 852 | { | 838 | { |
| 853 | p++; | 839 | p++; |
| 854 | if(*p) type = p; | 840 | if(*p) type = p; |
| 855 | break; | 841 | break; |
| 856 | } | 842 | } |
| 857 | #ifndef CHARSET_EBCDIC | ||
| 858 | if (*type == '+') | 843 | if (*type == '+') |
| 859 | #else | ||
| 860 | if (*type == os_toascii['+']) | ||
| 861 | #endif | ||
| 862 | { | 844 | { |
| 863 | mval = -1; | 845 | mval = -1; |
| 864 | type++; | 846 | type++; |
