Browse Source

Use OPENSSL_hexchar2int

Reviewed-by: Richard Levitte <levitte@openssl.org>
master
Rich Salz 6 years ago
parent
commit
49445f21da
8 changed files with 26 additions and 59 deletions
  1. +4
    -7
      apps/s_client.c
  2. +2
    -8
      crypto/asn1/f_int.c
  3. +2
    -8
      crypto/asn1/f_string.c
  4. +2
    -7
      crypto/bn/bn_print.c
  5. +2
    -7
      crypto/pem/pem_lib.c
  6. +4
    -7
      crypto/poly1305/poly1305.c
  7. +5
    -7
      crypto/x509v3/v3_utl.c
  8. +5
    -8
      test/danetest.c

+ 4
- 7
apps/s_client.c View File

@ -518,19 +518,16 @@ static ossl_ssize_t hexdecode(const char **inptr, void *result)
return -1;
for (byte = 0; *in; ++in) {
char c;
int x;
if (isspace(_UC(*in)))
continue;
c = tolower(_UC(*in));
if ('0' <= c && c <= '9') {
byte |= c - '0';
} else if ('a' <= c && c <= 'f') {
byte |= c - 'a' + 10;
} else {
x = OPENSSL_hexchar2int(*in);
if (x < 0) {
OPENSSL_free(ret);
return 0;
}
byte |= (char)x;
if ((nibble ^= 1) == 0) {
*cp++ = byte;
byte = 0;


+ 2
- 8
crypto/asn1/f_int.c View File

@ -175,14 +175,8 @@ int a2i_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *bs, char *buf, int size)
}
for (j = 0; j < i; j++, k += 2) {
for (n = 0; n < 2; n++) {
m = bufp[k + n];
if ((m >= '0') && (m <= '9'))
m -= '0';
else if ((m >= 'a') && (m <= 'f'))
m = m - 'a' + 10;
else if ((m >= 'A') && (m <= 'F'))
m = m - 'A' + 10;
else {
m = OPENSSL_hexchar2int(bufp[k + n]);
if (m < 0) {
ASN1err(ASN1_F_A2I_ASN1_INTEGER,
ASN1_R_NON_HEX_CHARACTERS);
goto err;


+ 2
- 8
crypto/asn1/f_string.c View File

@ -167,14 +167,8 @@ int a2i_ASN1_STRING(BIO *bp, ASN1_STRING *bs, char *buf, int size)
}
for (j = 0; j < i; j++, k += 2) {
for (n = 0; n < 2; n++) {
m = bufp[k + n];
if ((m >= '0') && (m <= '9'))
m -= '0';
else if ((m >= 'a') && (m <= 'f'))
m = m - 'a' + 10;
else if ((m >= 'A') && (m <= 'F'))
m = m - 'A' + 10;
else {
m = OPENSSL_hexchar2int(bufp[k + n]);
if (m < 0) {
ASN1err(ASN1_F_A2I_ASN1_STRING,
ASN1_R_NON_HEX_CHARACTERS);
return 0;


+ 2
- 7
crypto/bn/bn_print.c View File

@ -215,13 +215,8 @@ int BN_hex2bn(BIGNUM **bn, const char *a)
l = 0;
for (;;) {
c = a[j - m];
if ((c >= '0') && (c <= '9'))
k = c - '0';
else if ((c >= 'a') && (c <= 'f'))
k = c - 'a' + 10;
else if ((c >= 'A') && (c <= 'F'))
k = c - 'A' + 10;
else
k = OPENSSL_hexchar2int(c);
if (k < 0)
k = 0; /* paranoia */
l = (l << 4) | k;


+ 2
- 7
crypto/pem/pem_lib.c View File

@ -558,13 +558,8 @@ static int load_iv(char **fromp, unsigned char *to, int num)
to[i] = 0;
num *= 2;
for (i = 0; i < num; i++) {
if ((*from >= '0') && (*from <= '9'))
v = *from - '0';
else if ((*from >= 'A') && (*from <= 'F'))
v = *from - 'A' + 10;
else if ((*from >= 'a') && (*from <= 'f'))
v = *from - 'a' + 10;
else {
v = OPENSSL_hexchar2int(*from);
if (v < 0) {
PEMerr(PEM_F_LOAD_IV, PEM_R_BAD_IV_CHARS);
return (0);
}


+ 4
- 7
crypto/poly1305/poly1305.c View File

@ -871,14 +871,11 @@ static const struct poly1305_test poly1305_tests[] = {
static unsigned char hex_digit(char h)
{
if (h >= '0' && h <= '9')
return h - '0';
else if (h >= 'a' && h <= 'f')
return h - 'a' + 10;
else if (h >= 'A' && h <= 'F')
return h - 'A' + 10;
else
int i = OPENSSL_hexchar2int(h);
if (i < 0)
abort();
return i;
}
static void hex_decode(unsigned char *out, const char *hex)


+ 5
- 7
crypto/x509v3/v3_utl.c View File

@ -1177,19 +1177,17 @@ static int ipv6_hex(unsigned char *out, const char *in, int inlen)
{
unsigned char c;
unsigned int num = 0;
int x;
if (inlen > 4)
return 0;
while (inlen--) {
c = *in++;
num <<= 4;
if ((c >= '0') && (c <= '9'))
num |= c - '0';
else if ((c >= 'A') && (c <= 'F'))
num |= c - 'A' + 10;
else if ((c >= 'a') && (c <= 'f'))
num |= c - 'a' + 10;
else
x = OPENSSL_hexchar2int(c);
if (x < 0)
return 0;
num |= (char)x;
}
out[0] = num >> 8;
out[1] = num & 0xff;


+ 5
- 8
test/danetest.c View File

@ -198,7 +198,7 @@ static STACK_OF(X509) *load_chain(BIO *fp, int nelem)
fprintf(stderr, "error reading: malformed %s\n", errtype);
goto err;
}
if (count == nelem) {
ERR_clear_error();
return chain;
@ -252,19 +252,16 @@ static ossl_ssize_t hexdecode(const char *in, void *result)
return -1;
for (byte = 0; *in; ++in) {
char c;
int x;
if (isspace(_UC(*in)))
continue;
c = tolower(_UC(*in));
if ('0' <= c && c <= '9') {
byte |= c - '0';
} else if ('a' <= c && c <= 'f') {
byte |= c - 'a' + 10;
} else {
x = OPENSSL_hexchar2int(*in);
if (x < 0) {
OPENSSL_free(ret);
return 0;
}
byte |= (char)x;
if ((nibble ^= 1) == 0) {
*cp++ = byte;
byte = 0;


Loading…
Cancel
Save