diff options
| author | Simon Josefsson <simon@josefsson.org> | 2006-12-27 18:23:17 +0000 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2006-12-27 18:23:17 +0000 |
| commit | 2b5ebcce74f9c2ed244dc7497c1f71a2a728f8cf (patch) | |
| tree | 8660e058b930632c626c5a399ac10f7658439e3f | |
| parent | 59cdd529a64f56c22ecc765aa8a333f752fd3ff5 (diff) | |
| download | gnutls-2b5ebcce74f9c2ed244dc7497c1f71a2a728f8cf.tar.gz | |
(_oid2str): Mark UID as a CHOICE-field (i.e., DirectoryString).
(_gnutls_x509_oid_data2string): Handle ia5String in CHOICEs.
Fixes problem reported by Max Kellermann <max@duempel.org>.
| -rw-r--r-- | lib/x509/common.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/x509/common.c b/lib/x509/common.c index 4e2bbc1bf1..ddcb378c97 100644 --- a/lib/x509/common.c +++ b/lib/x509/common.c @@ -74,7 +74,7 @@ static const oid2string _oid2str[] = { {"2.5.4.46", "dnQualifier", 0, 1}, {"0.9.2342.19200300.100.1.25", "DC", 0, 1}, - {"0.9.2342.19200300.100.1.1", "UID", 0, 1}, + {"0.9.2342.19200300.100.1.1", "UID", 1, 1}, /* PKCS #9 */ @@ -254,6 +254,7 @@ _gnutls_x509_oid_data2string (const char *oid, void *value, * UTF-8 (thus ASCII as well). */ if (strcmp (str, "printableString") != 0 && + strcmp (str, "ia5String") != 0 && strcmp (str, "utf8String") != 0) { non_printable = 1; |