diff options
| author |   beck <beck@openbsd.org> | 1999-09-29 04:35:07 +0000 |
|---|---|---|
| committer | beck <beck@openbsd.org> | 1999-09-29 04:35:07 +0000 |
| commit | 913ec974266f8a62ab2e5ca34a31d6e6f75b3cf0 (patch) | |
| tree | 62c001f84cb6413a049c5c811a08bfbe7c747b77 /lib/libssl/src/crypto/asn1/f_string.c | |
| parent | fix byte counters; imain@netidea.com (diff) | |
| download | wireguard-openbsd-913ec974266f8a62ab2e5ca34a31d6e6f75b3cf0.tar.xz wireguard-openbsd-913ec974266f8a62ab2e5ca34a31d6e6f75b3cf0.zip | |
OpenSSL 0.9.4 merge
Diffstat (limited to 'lib/libssl/src/crypto/asn1/f_string.c')
| -rw-r--r-- | lib/libssl/src/crypto/asn1/f_string.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/lib/libssl/src/crypto/asn1/f_string.c b/lib/libssl/src/crypto/asn1/f_string.c index ab2837824e5..5d0cf5a46d4 100644 --- a/lib/libssl/src/crypto/asn1/f_string.c +++ b/lib/libssl/src/crypto/asn1/f_string.c @@ -58,16 +58,13 @@ #include <stdio.h> #include "cryptlib.h" -#include "buffer.h" -#include "x509.h" +#include <openssl/buffer.h> +#include <openssl/asn1.h> -int i2a_ASN1_STRING(bp, a, type) -BIO *bp; -ASN1_STRING *a; -int type; +int i2a_ASN1_STRING(BIO *bp, ASN1_STRING *a, int type) { int i,n=0; - static char *h="0123456789ABCDEF"; + static const char *h="0123456789ABCDEF"; char buf[2]; if (a == NULL) return(0); @@ -97,11 +94,7 @@ err: return(-1); } -int a2i_ASN1_STRING(bp,bs,buf,size) -BIO *bp; -ASN1_STRING *bs; -char *buf; -int size; +int a2i_ASN1_STRING(BIO *bp, ASN1_STRING *bs, char *buf, int size) { int ret=0; int i,j,k,m,n,again,bufsize; @@ -130,9 +123,18 @@ int size; for (j=i-1; j>0; j--) { +#ifndef CHARSET_EBCDIC if (!( ((buf[j] >= '0') && (buf[j] <= '9')) || ((buf[j] >= 'a') && (buf[j] <= 'f')) || ((buf[j] >= 'A') && (buf[j] <= 'F')))) +#else + /* This #ifdef is not strictly necessary, since + * the characters A...F a...f 0...9 are contiguous + * (yes, even in EBCDIC - but not the whole alphabet). + * Nevertheless, isxdigit() is faster. + */ + if (!isxdigit(buf[j])) +#endif { i=j; break; |