oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

(_hx509_Name_to_string): make printableString handle space (0x20)

Browse Source 
diffrences as required by rfc3280.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@21797 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2007-08-02 22:20:25 +00:00
parent ede8492429
commit 0c2180d1de
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/hx509/name.c
View File

@@ -252,6 +252,13 @@ _hx509_Name_to_string(const Name *n, char **str)
* bytes. * bytes.
*/ */
static void
prune_space(const unsigned char **s)
{
while (**s == ' ')
(*s)++;
}
int int
_hx509_name_ds_cmp(const DirectoryString *ds1, const DirectoryString *ds2) _hx509_name_ds_cmp(const DirectoryString *ds1, const DirectoryString *ds2)
{ {
@@ -269,9 +276,22 @@ _hx509_name_ds_cmp(const DirectoryString *ds1, const DirectoryString *ds2)
c = der_heim_octet_string_cmp(&ds1->u.teletexString, c = der_heim_octet_string_cmp(&ds1->u.teletexString,
&ds2->u.teletexString); &ds2->u.teletexString);
break; break;
case choice_DirectoryString_printableString: case choice_DirectoryString_printableString: {
c = strcasecmp(ds1->u.printableString, ds2->u.printableString); const unsigned char *s1 = (unsigned char*)ds1->u.printableString;
const unsigned char *s2 = (unsigned char*)ds2->u.printableString;
prune_space(&s1); prune_space(&s2);
while (*s1 && *s2) {
if (toupper(*s1) != toupper(*s2)) {
c = toupper(*s1) - toupper(*s2);
break;
}
if (*s1 == ' ') { prune_space(&s1); prune_space(&s2); }
else { s1++; s2++; }
}
prune_space(&s1); prune_space(&s2);
c = *s1 - *s2;
break; break;
}
case choice_DirectoryString_utf8String: case choice_DirectoryString_utf8String:
c = strcmp(ds1->u.utf8String, ds2->u.utf8String); c = strcmp(ds1->u.utf8String, ds2->u.utf8String);
break; break;