octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-11-17 10:45:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix bad merge

Browse Source
This commit is contained in:
terrafrost 2016-08-04 00:59:07 -05:00
parent c547ee16c7
commit 676c1982c7
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpseclib/Crypt/RSA.php
View File

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

6
phpseclib/File/X509.php
View File

@ -244,11 +244,7 @@ class X509
/** /**
* The signature subject * The signature subject
* *
<<<<<<< HEAD * There's no guarantee \phpseclib\File\X509 is going to re-encode an X.509 cert in the same way it was originally
* There's no guarantee \phpseclib\File\X509 is going to reencode an X.509 cert in the same way it was originally
=======
* There's no guarantee File_X509 is going to re-encode an X.509 cert in the same way it was originally
>>>>>>> 1.0
* encoded so we take save the portion of the original cert that the signature would have made for. * encoded so we take save the portion of the original cert that the signature would have made for.
* *
* @var string * @var string