RSA: PKCS8 constant fix for 2.0 branch #866
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…antsFix Refactor defined MATH_BIGINTEGER_ constants into class constants. * bantu/cnelissen-BigIntegerConstantsFix: Add #@+ block for properties used by internal implementation. Move in-code comments to property doc blocks. Refactor defined MATH_BIGINTEGER_ constants into class constants.
…tPackageConstantsFix Conflicts: phpseclib/Net/SSH2.php
* master: SCP: Allow for null byte in tests as long as phpseclib#146 is under investigation. Some SCP tests. Infrastructure for obtaining temporary files.
Net package constants fix * cnelissen/NetPackageConstantsFix: Moved global constants to class constants
…Fix2 Crypt package constants fix #2 * cnelissen/CryptPackageConstantsFix2: Moved globally defined constants to class constants
Change copyright years from roman numeral to decimal numbers. * bantu/fix-547: Change copyright years from roman numeral to decimal numbers. Conflicts: phpseclib/System/SSH_Agent.php
Change copyright years from roman numeral to decimal numbers for php5. * bantu/fix-547-php5: Change copyright years from roman numeral to decimal numbers for php5. Change copyright years from roman numeral to decimal numbers.
* master:
* master: Allow SCP test to run on 5.2 by not depending on GMP, but also allowing bcmath. Conflicts: tests/PhpseclibFunctionalTestCase.php
* master: Setup SSH key and agent for travis user. Add a functional test case for SSH2 login using Agent.
* master: SFTP: Add test for put() from local file.
Namespace file package * cnelissen/NamespaceFilePackage: Namespaced classes
Partially reverts 0305a48.
* master: Update Code Sniffer to version 1.5.6
* master: Properly skip SFTPLargeFileTest when environment variables not defined.
Use _MODE instead of the incorrect _ENGINE. * bantu/engine-back-to-mode: Use _MODE instead of the incorrect _ENGINE.
* master: Run HHVM tests in parallel.
Namespace system package #2 * cnelissen/NamespaceSystemPackage: Namespaced classes
Namespace net package * cnelissen/NamespaceNetPackage: Rebased Temporary constant fix Updated unit tests Namespaced classes
* 1.0: Composer: add GrahamCampbell to composer.json AUTHORS: add GrahamCampbell Conflicts: composer.lock
[2.0 Fixed phpdoc * GrahamForks/phpdoc: Fixed phpdoc
* 1.0: Fixed readme links Conflicts: README.md
[2.0] Fixed readme links * GrahamForks/readme-2: Fixed readme
Conflicts: phpseclib/Crypt/Blowfish.php phpseclib/Crypt/DES.php phpseclib/Crypt/RC2.php phpseclib/Crypt/RC4.php phpseclib/Crypt/Rijndael.php phpseclib/Crypt/TripleDES.php phpseclib/Crypt/Twofish.php
Conflicts: phpseclib/Net/SFTP.php
Conflicts: phpseclib/Net/SFTP.php tests/Functional/Net/SFTPUserStoryTest.php
SFTP.php : prevent endless loop when upload completed with non-zero $start or $local_start for 2.0 * terrafrost/sftp-endless-loop-v2: SFTP: don't start in local file middle when uploading to middle of the remote file Tests/SFTP: updates to newly added unit test SFTP: backport DavidAnderson684's changes to 1.0 branch add unit test demo'ing issue # 830
Conflicts: phpseclib/Crypt/RC2.php phpseclib/Crypt/TripleDES.php
Conflicts: phpseclib/Crypt/Base.php phpseclib/Crypt/Blowfish.php phpseclib/Crypt/DES.php phpseclib/Crypt/Rijndael.php
Conflicts: phpseclib/Crypt/AES.php phpseclib/Crypt/Base.php phpseclib/Crypt/Blowfish.php phpseclib/Crypt/DES.php phpseclib/Crypt/Hash.php phpseclib/Crypt/RC2.php phpseclib/Crypt/RC4.php phpseclib/Crypt/RSA.php phpseclib/Crypt/Rijndael.php phpseclib/Crypt/TripleDES.php phpseclib/Crypt/Twofish.php phpseclib/File/ASN1.php phpseclib/File/X509.php phpseclib/Math/BigInteger.php phpseclib/Net/SCP.php phpseclib/Net/SFTP.php phpseclib/Net/SSH1.php phpseclib/Net/SSH2.php phpseclib/System/SSH/Agent.php
Conflicts: phpseclib/Crypt/Base.php phpseclib/Crypt/DES.php phpseclib/Crypt/Rijndael.php
Conflicts: phpseclib/Crypt/DES.php phpseclib/Crypt/Rijndael.php
* 1.0: Add test case for GitHub Issue 850: Realpath in SFTP chmod(). Fixed a bug in SFTP::chmod not using realpath on the filepath
Conflicts: phpseclib/File/X509.php
Conflicts: phpseclib/Crypt/RSA.php
bantu
added a commit
to bantu/phpseclib
that referenced
this pull request
Nov 10, 2015
RSA: PKCS8 constant fix for 2.0 branch * terrafrost/rsa-pkcs8-fix-2.0: RSA: fix issue with loading PKCS8 specific keys Tests/RSA: add unit test for loading PKCS8 specific keys
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Replaces #861 for 2.0 branch