octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-12-27 19:54:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/phpseclib/phpseclib

Browse Source
This commit is contained in:
terrafrost 2012-09-30 21:37:25 -05:00
commit 7cfcdf90f6
1 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
phpseclib/File/X509.php
View File

@ -1041,12 +1041,15 @@ class File_X509 {
'2.5.4.10' => 'id-at-organizationName', '2.5.4.10' => 'id-at-organizationName',
'2.5.4.11' => 'id-at-organizationalUnitName', '2.5.4.11' => 'id-at-organizationalUnitName',
'2.5.4.12' => 'id-at-title', '2.5.4.12' => 'id-at-title',
'2.5.4.13' => 'id-at-description',
'2.5.4.46' => 'id-at-dnQualifier', '2.5.4.46' => 'id-at-dnQualifier',
'2.5.4.6' => 'id-at-countryName', '2.5.4.6' => 'id-at-countryName',
'2.5.4.5' => 'id-at-serialNumber', '2.5.4.5' => 'id-at-serialNumber',
'2.5.4.65' => 'id-at-pseudonym', '2.5.4.65' => 'id-at-pseudonym',
'2.5.4.17' => 'id-at-postalCode', '2.5.4.17' => 'id-at-postalCode',
'2.5.4.9' => 'id-at-streetAddress', '2.5.4.9' => 'id-at-streetAddress',
'2.5.4.45' => 'id-at-uniqueIdentifier',
'2.5.4.72' => 'id-at-role',
'0.9.2342.19200300.100.1.25' => 'id-domainComponent', '0.9.2342.19200300.100.1.25' => 'id-domainComponent',
'1.2.840.113549.1.9' => 'pkcs-9', '1.2.840.113549.1.9' => 'pkcs-9',
@ -1749,7 +1752,6 @@ class File_X509 {
return 'id-at-organizationName'; return 'id-at-organizationName';
case 'id-at-dnqualifier': case 'id-at-dnqualifier':
case 'dnqualifier': case 'dnqualifier':
case 'ou':
return 'id-at-dnQualifier'; return 'id-at-dnQualifier';
case 'id-at-commonname': case 'id-at-commonname':
case 'commonname': case 'commonname':
@ -1768,7 +1770,7 @@ class File_X509 {
return 'id-at-localityName'; return 'id-at-localityName';
case 'id-emailaddress': case 'id-emailaddress':
case 'emailaddress': case 'emailaddress':
return 'id-at-emailAddress'; return 'id-emailAddress';
case 'id-at-serialnumber': case 'id-at-serialnumber':
case 'serialnumber': case 'serialnumber':
return 'id-at-serialNumber'; return 'id-at-serialNumber';
@ -1786,6 +1788,7 @@ class File_X509 {
return 'id-at-givenName'; return 'id-at-givenName';
case 'id-at-surname': case 'id-at-surname':
case 'surname': case 'surname':
case 'sn':
return 'id-at-surname'; return 'id-at-surname';
case 'id-at-initials': case 'id-at-initials':
case 'initials': case 'initials':
@ -1795,10 +1798,24 @@ class File_X509 {
return 'id-at-generationQualifier'; return 'id-at-generationQualifier';
case 'id-at-organizationalunitname': case 'id-at-organizationalunitname':
case 'organizationalunitname': case 'organizationalunitname':
case 'ou':
return 'id-at-organizationalUnitName'; return 'id-at-organizationalUnitName';
case 'id-at-pseudonym': case 'id-at-pseudonym':
case 'pseudonym': case 'pseudonym':
return 'id-at-pseudonym'; return 'id-at-pseudonym';
case 'id-at-title':
case 'title':
return 'id-at-title';
case 'id-at-description':
case 'description':
return 'id-at-description';
case 'id-at-role':
case 'role':
return 'id-at-role';
case 'id-at-uniqueidentifier':
case 'uniqueidentifier':
case 'x500uniqueidentifier':
return 'id-at-uniqueIdentifier';
default: default:
return false; return false;
} }
@ -1916,7 +1933,7 @@ class File_X509 {
} }
// handles everything else // handles everything else
$results = preg_split('#((?:^|, |/)(?:C=|O=|OU=|CN=|L=|ST=|postalCode=|streetAddress=|emailAddress=|serialNumber=|organizationalUnitName=))#', $dn, -1, PREG_SPLIT_DELIM_CAPTURE); $results = preg_split('#((?:^|, |/)(?:C=|O=|OU=|CN=|L=|ST=|SN=|postalCode=|streetAddress=|emailAddress=|serialNumber=|organizationalUnitName=|title=|description=|role=|x500UniqueIdentifier=))#', $dn, -1, PREG_SPLIT_DELIM_CAPTURE);
for ($i = 1; $i < count($results); $i+=2) { for ($i = 1; $i < count($results); $i+=2) {
$type = trim($results[$i], ', =/'); $type = trim($results[$i], ', =/');
$value = $results[$i + 1]; $value = $results[$i + 1];
@ -1961,7 +1978,7 @@ class File_X509 {
case 'id-at-organizationName': case 'id-at-organizationName':
$desc = 'O='; $desc = 'O=';
break; break;
case 'id-at-dnQualifier': case 'id-at-organizationalUnitName':
$desc = 'OU='; $desc = 'OU=';
break; break;
case 'id-at-commonName': case 'id-at-commonName':
@ -1970,6 +1987,13 @@ class File_X509 {
case 'id-at-localityName': case 'id-at-localityName':
$desc = 'L='; $desc = 'L=';
break; break;
case 'id-at-surname':
$desc = 'SN=';
break;
case 'id-at-uniqueIdentifier':
$delim = '/';
$desc = 'x500UniqueIdentifier=';
break;
default: default:
$delim = '/'; $delim = '/';
$desc = preg_replace('#.+-([^-]+)$#', '$1', $type) . '='; $desc = preg_replace('#.+-([^-]+)$#', '$1', $type) . '=';