Merge branch '2.0'

This commit is contained in:
terrafrost 2016-07-28 11:00:33 -05:00
commit caa7eed299
2 changed files with 3 additions and 3 deletions

View File

@ -162,7 +162,7 @@ class RSA
/** /**
* Precomputed Zero * Precomputed Zero
* *
* @var array * @var \phpseclib\Math\BigInteger
* @access private * @access private
*/ */
static $zero; static $zero;
@ -170,7 +170,7 @@ class RSA
/** /**
* Precomputed One * Precomputed One
* *
* @var array * @var \phpseclib\Math\BigInteger
* @access private * @access private
*/ */
static $one; static $one;

View File

@ -115,7 +115,7 @@ U9VQQSQzY1oZMVX8i1m5WUTLPz2yLJIBQVdXqhMCQBGoiuSoSjafUhV7i1cEGpb88h5NBYZzWXGZ
37sJ5QsW+sJyoNde3xH8vdXhzU7eT82D6X/scw9RZz+/6rCJ4p0= 37sJ5QsW+sJyoNde3xH8vdXhzU7eT82D6X/scw9RZz+/6rCJ4p0=
-----END RSA PRIVATE KEY-----'); -----END RSA PRIVATE KEY-----');
$x509->setPrivateKey($rsa); $x509->setPrivateKey($rsa);
$x509->setDN(array('cn' => 'ncgamers.org')); $x509->setDN(array('cn' => 'website.com'));
$x509->saveCSR($x509->signCSR('sha256WithRSAEncryption'), X509::FORMAT_DER); $x509->saveCSR($x509->signCSR('sha256WithRSAEncryption'), X509::FORMAT_DER);
} }
} }