diff options
| author | Pauli <paul.dale@oracle.com> | 2017-08-20 23:19:17 +0200 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2017-08-22 01:45:25 +0200 |
| commit | a1df06b36347a31c17d09e6ca3e1464bdf7eb4d5 (patch) | |
| tree | beb260df46896a5c8668dd7f64c5dcefe677b1e6 /crypto/asn1/a_time.c | |
| parent | Fix ctype arguments. (diff) | |
| download | openssl-a1df06b36347a31c17d09e6ca3e1464bdf7eb4d5.tar.xz openssl-a1df06b36347a31c17d09e6ca3e1464bdf7eb4d5.zip | |
This has been added to avoid the situation where some host ctype.h functions
return true for characters > 127. I.e. they are allowing extended ASCII
characters through which then cause problems. E.g. marking superscript '2' as
a number then causes the common (ch - '0') conversion to number to fail
miserably. Likewise letters with diacritical marks can also cause problems.
If a non-ASCII character set is being used (currently only EBCDIC), it is
adjusted for.
The implementation uses a single table with a bit for each of the defined
classes. These functions accept an int argument and fail for
values out of range or for characters outside of the ASCII set. They will
work for both signed and unsigned character inputs.
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4102)
Diffstat (limited to 'crypto/asn1/a_time.c')
| -rw-r--r-- | crypto/asn1/a_time.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/crypto/asn1/a_time.c b/crypto/asn1/a_time.c index 507292b76e..cb19e8024a 100644 --- a/crypto/asn1/a_time.c +++ b/crypto/asn1/a_time.c @@ -16,7 +16,7 @@ #include <stdio.h> #include <time.h> -#include <ctype.h> +#include "internal/ctype.h" #include "internal/cryptlib.h" #include <openssl/asn1t.h> #include "asn1_locl.h" @@ -124,14 +124,14 @@ int asn1_time_to_tm(struct tm *tm, const ASN1_TIME *d) i++; break; } - if (!isdigit(a[o])) + if (!ossl_isdigit(a[o])) goto err; n = a[o] - '0'; /* incomplete 2-digital number */ if (++o == l) goto err; - if (!isdigit(a[o])) + if (!ossl_isdigit(a[o])) goto err; n = (n * 10) + a[o] - '0'; /* no more bytes to read, but we haven't seen time-zone yet */ @@ -192,7 +192,7 @@ int asn1_time_to_tm(struct tm *tm, const ASN1_TIME *d) if (++o == l) goto err; i = o; - while ((o < l) && isdigit(a[o])) + while ((o < l) && ossl_isdigit(a[o])) o++; /* Must have at least one digit after decimal point */ if (i == o) @@ -223,11 +223,11 @@ int asn1_time_to_tm(struct tm *tm, const ASN1_TIME *d) if (o + 4 != l) goto err; for (i = end; i < end + 2; i++) { - if (!isdigit(a[o])) + if (!ossl_isdigit(a[o])) goto err; n = a[o] - '0'; o++; - if (!isdigit(a[o])) + if (!ossl_isdigit(a[o])) goto err; n = (n * 10) + a[o] - '0'; i2 = (d->type == V_ASN1_UTCTIME) ? i + 1 : i; @@ -489,7 +489,7 @@ int ASN1_TIME_print(BIO *bp, const ASN1_TIME *tm) if (tm->length > 15 && v[14] == '.') { f = &v[14]; f_len = 1; - while (14 + f_len < l && isdigit(f[f_len])) + while (14 + f_len < l && ossl_isdigit(f[f_len])) ++f_len; } |