octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-09-18 18:49:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

X509: updates to getOID() as suggested by bantu

Browse Source
This commit is contained in:
terrafrost 2015-08-31 07:38:14 -05:00
parent d7d9d782b0
commit abbee318cc
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
phpseclib/File/X509.php
View File

@ -4618,9 +4618,10 @@ class File_X509
/** /**
* Returns the OID corresponding to a name * Returns the OID corresponding to a name
* *
* What's returned in the associative array is either a name or an OID if no OID to name mapping is available. * What's returned in the associative array returned by loadX509() (or load*()) is either a name or an OID if
* The problem with this is that what may be an unmapped OID in one version of phpseclib may not be unmapped * no OID to name mapping is available. The problem with this is that what may be an unmapped OID in one version
* in the next version, so apps that are looking at this OID may not be able to work from version to version. * of phpseclib may not be unmapped in the next version, so apps that are looking at this OID may not be able
* to work from version to version.
* *
* This method will return the OID if a name is passed to it and if no mapping is avialable it'll assume that * This method will return the OID if a name is passed to it and if no mapping is avialable it'll assume that
* what's being passed to it already is an OID and return that instead. A few examples. * what's being passed to it already is an OID and return that instead. A few examples.
@ -4634,7 +4635,10 @@ class File_X509
*/ */
function getOID($name) function getOID($name)
{ {
$idx = array_search($name, $this->oids); static $reverseMap;
return $idx === false ? $name : $idx; if (!isset($reverseMap)) {
$reverseMap = array_flip($this->oids);
}
return isset($reverseMap[$name]) ? $reverseMap[$name] : $name;
} }
} }