Andreas Fischer
c2a6667ed2
Merge branch 'master' into php5
...
* master:
Remove unnecessary constructors.
2014-06-16 16:29:29 +02:00
Andreas Fischer
c05cfe4c10
Merge pull request #376 from bantu/UselessOverridingMethod
...
Remove unnecessary constructors.
* bantu/UselessOverridingMethod:
Remove unnecessary constructors.
2014-06-16 16:29:28 +02:00
Andreas Fischer
635c524b6b
Merge branch 'master' into php5
...
* master:
RC4: speedups
2014-06-16 16:28:29 +02:00
Andreas Fischer
5cc024a3b5
Merge pull request #377 from terrafrost/rc4-changes
...
RC4: speedups
* terrafrost/rc4-changes:
RC4: speedups
2014-06-16 16:28:29 +02:00
terrafrost
0938cba3c3
RC4: speedups
2014-06-16 09:19:14 -05:00
Andreas Fischer
91e78c2106
Remove unnecessary constructors.
2014-06-16 16:14:35 +02:00
Andreas Fischer
6a8ac88a0c
Merge branch 'master' into php5
...
* master:
RC2: speed-ups and CS changes
2014-06-13 23:49:53 +02:00
terrafrost
04d66db309
RC2: speed-ups and CS changes
2014-06-13 16:30:12 -05:00
Andreas Fischer
76ac2a863d
Merge branch 'master' into php5
...
* master:
RSA: slight adjustment to CRYPT_RSA_PUBLIC_FORMAT_PKCS1_RAW format
2014-06-11 08:05:49 +02:00
terrafrost
72a0913d39
RSA: slight adjustment to CRYPT_RSA_PUBLIC_FORMAT_PKCS1_RAW format
...
CRYPT_RSA_PUBLIC_FORMAT_PKCS1_RAW and CRYPT_RSA_PUBLIC_FORMAT_PKCS1
produce two very similar looking keys but they are not the same.
As dissection OpenSSL's asn1parse would reveal CRYPT_RSA_PUBLIC_FORMAT_PKCS1
has the fact that it is an RSA key embedded within it whereas
CRYPT_RSA_PUBLIC_FORMAT_PKCS1_RAW does not. phpseclib now resolves
this ambiguity in the same way that OpenSSH's ssh-keygen does.
Despite this change CRYPT_RSA_PUBLIC_FORMAT_PKCS1_RAW is still incompatible
with OpenSSL's rsautl (CRYPT_RSA_PUBLIC_FORMAT_PKCS1 is compatible). I guess
this incompatibility isn't just due to the headers but is also due to the
overall structure of the format.
2014-06-10 22:16:59 -05:00
Andreas Fischer
2a9d7e5e03
Merge branch 'master' into php5
...
* master:
X509: Unit test CS changes
X509: move location of SPKAC unit test
X509: CS adjustments
X509: PHP4 compat changes
RSA: PHP4 compat changes
X509: rm trailing white space from unit test
X509: add SPKAC unit test
X509: add signSPKAC() and saveSPKAC() methods
2014-06-05 16:56:36 +02:00
terrafrost
daa466db94
Merge branch 'master' of https://github.com/phpseclib/phpseclib into spkac
2014-06-05 08:40:49 -05:00
terrafrost
af0040b813
RSA: PHP4 compat changes
2014-06-05 08:10:20 -05:00
Andreas Fischer
f2f5fcd70a
Update users of Math_BigInteger.
2014-06-02 20:19:00 +02:00
Andreas Fischer
e6f87318f5
Adjust documentation to coding guidelines: No () around include.
2014-06-01 23:28:49 +02:00
Andreas Fischer
07e1f954de
Merge pull request #325 from terrafrost/rsa-public-key
...
RSA: auto-detect public keys vs private keys
* terrafrost/rsa-public-key:
RSA: update unit test file
RSA: auto-detect public keys vs private keys
2014-06-01 22:17:38 +02:00
terrafrost
015d628183
Random: wrap crypt_random_string in a function_exists call
2014-05-26 18:32:36 -05:00
Andreas Fischer
c0bdf1bd90
CS: Fix "PEAR.Functions.FunctionCallSignature.Indent" sniff.
2014-04-24 00:26:02 +02:00
terrafrost
317efaf28a
RSA: auto-detect public keys vs private keys
2014-04-17 10:30:32 -05:00
terrafrost
a8c2ff0fb0
add error suppression to phpinfo()
...
bad timezone settings can make phpinfo() throw errors so we'll just
suppress them. if there are legit non-timezone errors with php install
those will probably be hit in other parts of the code
2014-03-30 10:15:08 -05:00
Andreas Fischer
fb1296bbec
Drop meaningless, outdated, inconsistent version tags in doc blocks.
...
find phpseclib -type f -name "*.php" -exec sed -i '/@version/d' {} \;
2014-03-11 15:58:33 +01:00
Veres Lajos
930a3fb4d2
typofixes - https://github.com/vlajos/misspell_fixer
2014-03-05 23:41:20 +00:00
Andreas Fischer
f744fbbcc9
Set permissions of phpseclib/Crypt/RC2.php to 644.
2014-03-01 00:56:08 +01:00
Andreas Fischer
56f1ada5c1
CS: Each file MUST end with exactly one newline character
2014-02-10 14:51:35 +01:00
Graham Campbell
1c2796e3eb
Cleaned up whitespace
2014-01-18 17:29:25 +00:00
terrafrost
d2c4ccfc28
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2013-12-27 10:24:47 -06:00
Andreas Fischer
0dd5a9ba9f
Merge pull request #228 from bantu/cs-whitespace
...
CS: Add useful whitespace CodeSniffer rules.
* bantu/cs-whitespace:
CS: Add useful whitespace CodeSniffer rules.
2013-12-26 11:38:17 +01:00
terrafrost
b23a693ae5
RSA: update comments for _extractBER
2013-12-26 01:46:58 -06:00
Andreas Fischer
8bb80b3df0
CS: Add useful whitespace CodeSniffer rules.
2013-12-26 00:33:08 +01:00
terrafrost
3a0193875a
RSA: more verbose RSA key handling
2013-12-24 18:37:43 -06:00
terrafrost
0f5b3ea416
Compatibility fixes
...
- PHP4 doesn't allow method chaining
- $_SESSION isn't always defined
- on PHP5.1 and earlier using 0x100000000 instead of 4294967296 gives E_NOTICE
- array('Net_SSH2', 'func_name') doesn't work so we fix this by passing $this to it.
to make that work on PHP4 pass by call-time reference. normally this would result
in a fatal error on PHP5.4+ but doesn't seem to in this case. the following URL
elaborates:
http://stackoverflow.com/q/20732563/569976
2013-12-22 18:14:49 -06:00
Andreas Fischer
f0f029b2c1
CS: Fix "PEAR.Commenting.ClassComment.WrongTagOrder" sniff.
2013-12-11 18:33:18 +01:00
Andreas Fischer
3db1fbb072
CS: Fix "PEAR.Commenting.FileComment.TagIndent" sniff.
2013-12-10 20:10:37 +01:00
Andreas Fischer
cee0f3343b
CS: Fix "PEAR.Formatting.MultiLineAssignment.EqualSignLine" sniff.
2013-12-07 20:47:30 +01:00
Andreas Fischer
6d1fb9f7db
CS: Fix "PEAR.Files.IncludingFile.UseIncludeOnce" sniff.
2013-12-06 01:03:34 +01:00
Andreas Fischer
bc6ff96292
Fix "PEAR.Files.IncludingFile.BracketsNotRequired" sniff.
2013-12-05 23:17:40 +01:00
Andreas Fischer
161bb7d362
CS: Fix PEAR.ControlStructures.ControlSignature sniff.
2013-12-03 21:04:13 +01:00
Andreas Fischer
e09f1b730e
CodeSniffer: Fix PEAR.Classes.ClassDeclaration.OpenBraceNewLine sniff.
2013-12-03 19:34:41 +01:00
Andreas Fischer
ca9c8b107b
CodeSniffer: Fix Generic.PHP.LowerCaseConstant.Found sniff.
2013-12-03 18:54:43 +01:00
Andreas Fischer
399308f98a
Merge pull request #180 from mpscholten/removed-vim-comments
...
Removed vim comments
* mpscholten/removed-vim-comments:
Removed vim comments
2013-11-23 21:16:25 +01:00
Marc Philip Scholten
3bfd884813
Removed vim comments
...
Reformated files
2013-11-23 19:42:26 +01:00
terrafrost
300a3afe8d
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2013-11-10 22:38:36 -06:00
terrafrost
755f0f17a5
RSA: putty keys weren't being formatted correctly
2013-11-10 22:27:48 -06:00
Andreas Fischer
2241d0e6f4
Partial revert of 9f1108e52e
.
...
This change should not be necessary.
2013-11-06 23:12:00 +01:00
Frank de Jonge
4976cd1622
Fixed coding style to comply with other not defined statements
2013-11-05 13:01:03 +01:00
Frank de Jonge
9f1108e52e
Check wether CRYPT_RANDOM_IS_WINDOWS is defined before defining it.
2013-11-05 11:27:16 +01:00
terrafrost
15677715e3
RSA: only set $this->current when it's already set
2013-10-24 15:48:15 -05:00
terrafrost
1e3ff81e7d
RSA: make RSA objects clonable
2013-10-18 13:24:06 -05:00
terrafrost
9c5563503e
RSA: public key was never getting set
2013-10-06 02:23:57 -05:00
terrafrost
402b7e8176
RSA: if setPublicKey is called unneccessarily return false
2013-10-05 21:30:57 -05:00