diff options
| author | Rich Salz <rsalz@openssl.org> | 2016-05-12 15:52:58 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-05-16 15:21:10 -0400 |
| commit | 49445f21da5ad436a117d0d4cc6220c4bbbbf8a7 (patch) | |
| tree | b8013a1a1dc02e3b721e137a5bd8847c5a2766d3 /crypto/asn1 | |
| parent | 589902b2cbc667564642a0fdedfb2ef176dba0e8 (diff) | |
| download | openssl-49445f21da5ad436a117d0d4cc6220c4bbbbf8a7.zip openssl-49445f21da5ad436a117d0d4cc6220c4bbbbf8a7.tar.gz openssl-49445f21da5ad436a117d0d4cc6220c4bbbbf8a7.tar.bz2 | |
Use OPENSSL_hexchar2int
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/asn1')
| -rw-r--r-- | crypto/asn1/f_int.c | 10 | ||||
| -rw-r--r-- | crypto/asn1/f_string.c | 10 |
2 files changed, 4 insertions, 16 deletions
diff --git a/crypto/asn1/f_int.c b/crypto/asn1/f_int.c index e0e49de..99932aa 100644 --- a/crypto/asn1/f_int.c +++ b/crypto/asn1/f_int.c @@ -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; diff --git a/crypto/asn1/f_string.c b/crypto/asn1/f_string.c index 2b2b545..892e011 100644 --- a/crypto/asn1/f_string.c +++ b/crypto/asn1/f_string.c @@ -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; |