Changeset 85

Show
Ignore:
Timestamp:
06/30/07 07:54:03 (2 years ago)
Author:
pdingle
Message:

fixed bug where X509 certs with newlines were not having the newlines removed

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-infocard/infocard.css

    r78 r85  
    351351        border:none; 
    352352} 
     353 

  • trunk/wp-infocard/pwlib/processing/infocard-post-get-claims.php

    r72 r85  
    379379            $localNode = $X509Certificates->item(0); 
    380380            $X509Certificate = $localNode->nodeValue; 
    381             pw_utils::printDebug("X509Certificate: " . pw_utils::printBinary("X509Certificate", $X509Certificate) . "<br/>"); 
     381            $escapedcert = ""; 
     382           $tok = strtok($X509Certificate, "\n"); 
     383           while ($tok !== false) { 
     384                //pw_utils::printDebug("TOK: " . $tok . "<br/>"); 
     385                $escapedcert .= $tok; 
     386                   $tok = strtok("\n"); 
     387                   } 
     388            if ( $X509Certificate !== $escapedcert)      
     389            { 
     390                pw_utils::printDebug("Warning! newlines returned from X509 Certificate <br/>"); 
     391                $X509Certificate = $escapedcert;         
     392            } 
     393            //pw_utils::printDebug("X509Certificate: " . pw_utils::printBinary("X509Certificate", $X509Certificate) . "<br/>"); 
    382394 
    383395            // We need PEM encoding to satisfy openssl 
    …… 
    402414 
    403415        // Pause for more debugging and pedagogy 
    404         //if (array_key_exists("parsedVariables", $_POST)){ 
    405             pw_utils::printDebug("<br/>&nbsp;CalculatedDigest:$locallyCalculatedDigest <br/>" 
    406             . "&nbsp;Modulus:$modulus <br/>" 
    407             . "&nbsp;Exponent: " . pw_utils::printBinary("Exponent",$exponent)." <br/>" 
    408             . "&nbsp;Signature: ".pw_utils::printBinary("Signature",$SignatureValue)." <br/>"); 
    409  
    410             pw_utils::printDebug("&nbsp;X509 Certificate: " . pw_utils::printBinary('X509 Cert', $X509Certificate)." <br/><br/>"); 
    411         //} 
     416            pw_utils::printDebug("CalculatedDigest: " . htmlspecialchars($locallyCalculatedDigest) . "<br />"); 
     417            pw_utils::printDebug( pw_utils::printBinary( "Modulus", $modulus )  
     418            .  pw_utils::printBinary( "Exponent", $exponent )  
     419            .  pw_utils::printBinary( "Signature", $SignatureValue )); 
     420 
     421            pw_utils::printDebug(pw_utils::printBinary('X509 Certificate', $X509Certificate)); 
    412422 
    413423        if (array_key_exists("canonicalSignedInfo", $_POST)){