diff options
| author | deraadt <> | 2014-06-01 15:39:52 +0000 |
|---|---|---|
| committer | deraadt <> | 2014-06-01 15:39:52 +0000 |
| commit | fbd9ff3897ff9e100514731e2a4e2398e392c69b (patch) | |
| tree | ba4eb6eea9ebe3252938a9c96edb36559bb83100 /src/lib | |
| parent | 8651fd5ff025be46cca91efe623b138186b69326 (diff) | |
| download | openbsd-fbd9ff3897ff9e100514731e2a4e2398e392c69b.tar.gz openbsd-fbd9ff3897ff9e100514731e2a4e2398e392c69b.tar.bz2 openbsd-fbd9ff3897ff9e100514731e2a4e2398e392c69b.zip | |
There is no need for is{upper,lower}() tests before to{lower,uppper}(),
since all other characters are mapped through transparently.
ok jsing
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/libcrypto/asn1/asn_mime.c | 29 | ||||
| -rw-r--r-- | src/lib/libcrypto/x509v3/v3_utl.c | 6 | ||||
| -rw-r--r-- | src/lib/libssl/src/crypto/asn1/asn_mime.c | 29 | ||||
| -rw-r--r-- | src/lib/libssl/src/crypto/x509v3/v3_utl.c | 6 |
4 files changed, 16 insertions, 54 deletions
diff --git a/src/lib/libcrypto/asn1/asn_mime.c b/src/lib/libcrypto/asn1/asn_mime.c index f123a7ddc0..d3bc90665f 100644 --- a/src/lib/libcrypto/asn1/asn_mime.c +++ b/src/lib/libcrypto/asn1/asn_mime.c | |||
| @@ -826,29 +826,18 @@ mime_hdr_new(char *name, char *value) | |||
| 826 | { | 826 | { |
| 827 | MIME_HEADER *mhdr; | 827 | MIME_HEADER *mhdr; |
| 828 | char *tmpname = NULL, *tmpval = NULL, *p; | 828 | char *tmpname = NULL, *tmpval = NULL, *p; |
| 829 | int c; | ||
| 830 | 829 | ||
| 831 | if (name) { | 830 | if (name) { |
| 832 | if (!(tmpname = BUF_strdup(name))) | 831 | if (!(tmpname = BUF_strdup(name))) |
| 833 | goto err; | 832 | goto err; |
| 834 | for (p = tmpname; *p; p++) { | 833 | for (p = tmpname; *p; p++) |
| 835 | c = (unsigned char)*p; | 834 | *p = tolower((unsigned char)*p); |
| 836 | if (isupper(c)) { | ||
| 837 | c = tolower(c); | ||
| 838 | *p = c; | ||
| 839 | } | ||
| 840 | } | ||
| 841 | } | 835 | } |
| 842 | if (value) { | 836 | if (value) { |
| 843 | if (!(tmpval = BUF_strdup(value))) | 837 | if (!(tmpval = BUF_strdup(value))) |
| 844 | goto err; | 838 | goto err; |
| 845 | for (p = tmpval; *p; p++) { | 839 | for (p = tmpval; *p; p++) |
| 846 | c = (unsigned char)*p; | 840 | *p = tolower((unsigned char)*p); |
| 847 | if (isupper(c)) { | ||
| 848 | c = tolower(c); | ||
| 849 | *p = c; | ||
| 850 | } | ||
| 851 | } | ||
| 852 | } | 841 | } |
| 853 | mhdr = malloc(sizeof(MIME_HEADER)); | 842 | mhdr = malloc(sizeof(MIME_HEADER)); |
| 854 | if (!mhdr) | 843 | if (!mhdr) |
| @@ -870,20 +859,14 @@ static int | |||
| 870 | mime_hdr_addparam(MIME_HEADER *mhdr, char *name, char *value) | 859 | mime_hdr_addparam(MIME_HEADER *mhdr, char *name, char *value) |
| 871 | { | 860 | { |
| 872 | char *tmpname = NULL, *tmpval = NULL, *p; | 861 | char *tmpname = NULL, *tmpval = NULL, *p; |
| 873 | int c; | ||
| 874 | MIME_PARAM *mparam; | 862 | MIME_PARAM *mparam; |
| 875 | 863 | ||
| 876 | if (name) { | 864 | if (name) { |
| 877 | tmpname = BUF_strdup(name); | 865 | tmpname = BUF_strdup(name); |
| 878 | if (!tmpname) | 866 | if (!tmpname) |
| 879 | goto err; | 867 | goto err; |
| 880 | for (p = tmpname; *p; p++) { | 868 | for (p = tmpname; *p; p++) |
| 881 | c = (unsigned char)*p; | 869 | *p = tolower((unsigned char)*p); |
| 882 | if (isupper(c)) { | ||
| 883 | c = tolower(c); | ||
| 884 | *p = c; | ||
| 885 | } | ||
| 886 | } | ||
| 887 | } | 870 | } |
| 888 | if (value) { | 871 | if (value) { |
| 889 | tmpval = BUF_strdup(value); | 872 | tmpval = BUF_strdup(value); |
diff --git a/src/lib/libcrypto/x509v3/v3_utl.c b/src/lib/libcrypto/x509v3/v3_utl.c index bf6f81a5e9..4f4dc15221 100644 --- a/src/lib/libcrypto/x509v3/v3_utl.c +++ b/src/lib/libcrypto/x509v3/v3_utl.c | |||
| @@ -468,10 +468,8 @@ string_to_hex(const char *str, long *len) | |||
| 468 | free(hexbuf); | 468 | free(hexbuf); |
| 469 | return NULL; | 469 | return NULL; |
| 470 | } | 470 | } |
| 471 | if (isupper(ch)) | 471 | ch = tolower(ch); |
| 472 | ch = tolower(ch); | 472 | cl = tolower(cl); |
| 473 | if (isupper(cl)) | ||
| 474 | cl = tolower(cl); | ||
| 475 | 473 | ||
| 476 | if ((ch >= '0') && (ch <= '9')) | 474 | if ((ch >= '0') && (ch <= '9')) |
| 477 | ch -= '0'; | 475 | ch -= '0'; |
diff --git a/src/lib/libssl/src/crypto/asn1/asn_mime.c b/src/lib/libssl/src/crypto/asn1/asn_mime.c index f123a7ddc0..d3bc90665f 100644 --- a/src/lib/libssl/src/crypto/asn1/asn_mime.c +++ b/src/lib/libssl/src/crypto/asn1/asn_mime.c | |||
| @@ -826,29 +826,18 @@ mime_hdr_new(char *name, char *value) | |||
| 826 | { | 826 | { |
| 827 | MIME_HEADER *mhdr; | 827 | MIME_HEADER *mhdr; |
| 828 | char *tmpname = NULL, *tmpval = NULL, *p; | 828 | char *tmpname = NULL, *tmpval = NULL, *p; |
| 829 | int c; | ||
| 830 | 829 | ||
| 831 | if (name) { | 830 | if (name) { |
| 832 | if (!(tmpname = BUF_strdup(name))) | 831 | if (!(tmpname = BUF_strdup(name))) |
| 833 | goto err; | 832 | goto err; |
| 834 | for (p = tmpname; *p; p++) { | 833 | for (p = tmpname; *p; p++) |
| 835 | c = (unsigned char)*p; | 834 | *p = tolower((unsigned char)*p); |
| 836 | if (isupper(c)) { | ||
| 837 | c = tolower(c); | ||
| 838 | *p = c; | ||
| 839 | } | ||
| 840 | } | ||
| 841 | } | 835 | } |
| 842 | if (value) { | 836 | if (value) { |
| 843 | if (!(tmpval = BUF_strdup(value))) | 837 | if (!(tmpval = BUF_strdup(value))) |
| 844 | goto err; | 838 | goto err; |
| 845 | for (p = tmpval; *p; p++) { | 839 | for (p = tmpval; *p; p++) |
| 846 | c = (unsigned char)*p; | 840 | *p = tolower((unsigned char)*p); |
| 847 | if (isupper(c)) { | ||
| 848 | c = tolower(c); | ||
| 849 | *p = c; | ||
| 850 | } | ||
| 851 | } | ||
| 852 | } | 841 | } |
| 853 | mhdr = malloc(sizeof(MIME_HEADER)); | 842 | mhdr = malloc(sizeof(MIME_HEADER)); |
| 854 | if (!mhdr) | 843 | if (!mhdr) |
| @@ -870,20 +859,14 @@ static int | |||
| 870 | mime_hdr_addparam(MIME_HEADER *mhdr, char *name, char *value) | 859 | mime_hdr_addparam(MIME_HEADER *mhdr, char *name, char *value) |
| 871 | { | 860 | { |
| 872 | char *tmpname = NULL, *tmpval = NULL, *p; | 861 | char *tmpname = NULL, *tmpval = NULL, *p; |
| 873 | int c; | ||
| 874 | MIME_PARAM *mparam; | 862 | MIME_PARAM *mparam; |
| 875 | 863 | ||
| 876 | if (name) { | 864 | if (name) { |
| 877 | tmpname = BUF_strdup(name); | 865 | tmpname = BUF_strdup(name); |
| 878 | if (!tmpname) | 866 | if (!tmpname) |
| 879 | goto err; | 867 | goto err; |
| 880 | for (p = tmpname; *p; p++) { | 868 | for (p = tmpname; *p; p++) |
| 881 | c = (unsigned char)*p; | 869 | *p = tolower((unsigned char)*p); |
| 882 | if (isupper(c)) { | ||
| 883 | c = tolower(c); | ||
| 884 | *p = c; | ||
| 885 | } | ||
| 886 | } | ||
| 887 | } | 870 | } |
| 888 | if (value) { | 871 | if (value) { |
| 889 | tmpval = BUF_strdup(value); | 872 | tmpval = BUF_strdup(value); |
diff --git a/src/lib/libssl/src/crypto/x509v3/v3_utl.c b/src/lib/libssl/src/crypto/x509v3/v3_utl.c index bf6f81a5e9..4f4dc15221 100644 --- a/src/lib/libssl/src/crypto/x509v3/v3_utl.c +++ b/src/lib/libssl/src/crypto/x509v3/v3_utl.c | |||
| @@ -468,10 +468,8 @@ string_to_hex(const char *str, long *len) | |||
| 468 | free(hexbuf); | 468 | free(hexbuf); |
| 469 | return NULL; | 469 | return NULL; |
| 470 | } | 470 | } |
| 471 | if (isupper(ch)) | 471 | ch = tolower(ch); |
| 472 | ch = tolower(ch); | 472 | cl = tolower(cl); |
| 473 | if (isupper(cl)) | ||
| 474 | cl = tolower(cl); | ||
| 475 | 473 | ||
| 476 | if ((ch >= '0') && (ch <= '9')) | 474 | if ((ch >= '0') && (ch <= '9')) |
| 477 | ch -= '0'; | 475 | ch -= '0'; |