Skip to content

Also trim / cleanup PEM pubcert #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Also trim / cleanup PEM pubcert #46

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions lib/SecurityUtility.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,7 @@ public function generateSecurityToken($xmlDom, $certificateFilePath, $keyPass, &
// for PKCS12 files
openssl_pkcs12_read($certificate, $certs, $keyPass);
$privateKeyId = openssl_pkey_get_private($certs['pkey']);
$pubcert = explode("\n", $certs['cert']);
array_shift($pubcert);

while (!trim(array_pop($pubcert))) { /* Empty whlie loop */ }

array_walk($pubcert, 'trim');
$pubcert = implode('', $pubcert);
$pubcert = $certs['cert'];
unset($certs);
}
else
Expand All @@ -35,6 +29,16 @@ public function generateSecurityToken($xmlDom, $certificateFilePath, $keyPass, &
openssl_x509_export($tempcert, $pubcert);
}

// trim
$pubcert = explode("\n", $pubcert);
array_shift($pubcert);

while (!trim(array_pop($pubcert))) { /* Empty while loop */ }

array_walk($pubcert, 'trim');
$pubcert = implode('', $pubcert);


// add public key reference to the token
$tokenElement = $xmlDom->createElementNS(self::WSSE_NS, 'wsse:BinarySecurityToken', $pubcert);
$tokenElement->setAttribute('ValueType', 'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-x509-token-profile-1.0#X509v3');
Expand Down