danog/tgseclib
1
0
Fork 0
mirror of https://github.com/danog/tgseclib.git synced 2025-01-22 05:51:20 +01:00
Code Issues Projects Releases Wiki Activity

Switched out pack/unpack and ip2long/long2ip with inet_pton/ntop for ipv6 encoding support in x509v3 subject alternative names

Browse Source
This commit is contained in:
metaclassing 2016-01-26 17:23:14 -06:00
parent bdc28b9453
commit 4735751bf5
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
phpseclib/File/X509.php
View File

@ -2198,9 +2198,7 @@ class X509
*/ */
function _decodeIP($ip) function _decodeIP($ip)
{ {
$ip = base64_decode($ip); return inet_ntop(base64_decode($ip));
list(, $ip) = unpack('N', $ip);
return long2ip($ip);
} }
/** /**
@ -2214,7 +2212,7 @@ class X509
*/ */
function _encodeIP($ip) function _encodeIP($ip)
{ {
return base64_encode(pack('N', ip2long($ip))); return base64_encode(inet_pton($ip));
} }
/** /**