Andreas Fischer
d38886c2a9
Always correctly link to the constructor of Crypt_Base.
2014-06-16 16:42:18 +02:00
terrafrost
638e6c78ec
Random: include the Crypt_* classes if they're available
...
also error out if none are available
2014-06-16 09:40:27 -05: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
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
4b9eb4af27
BigInteger: one more change to the comments
2014-06-16 09:23:34 -05: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
terrafrost
0eb0ae7ff7
BigInteger: update comments
2014-06-16 09:09:26 -05:00
terrafrost
92e6b23528
BigInteger: unit test update
2014-06-15 12:13:56 -05:00
terrafrost
34a971d317
BigInteger: change argument names for random / randomPrime
2014-06-14 23:49:57 -05:00
terrafrost
281a8c669e
BigInteger: fix unit tests
2014-06-14 20:47:57 -05:00
terrafrost
f8f0bd44b7
BigInteger: fix syntax error
2014-06-14 19:20:05 -05:00
terrafrost
46166c7351
BigInteger: make it so you can do $min->random($max)
...
...and $min->randomPrime($max) as well
2014-06-14 14:07:33 -05:00
Andreas Fischer
8e07ebfd51
Merge pull request #371 from terrafrost/rc2
...
RC2: speed-ups and CS changes
* terrafrost/rc2:
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
terrafrost
d8b235141e
RSA: CS adjustments
2014-06-13 13:17:37 -05:00
terrafrost
83301097ea
RSA: rename PUBLIC_FORMAT_PKCS1_RAW -> PUBLIC_FORMAT_PKCS8
...
also make CRYPT_RSA_PUBLIC_FORMAT_PKCS8 the default format
2014-06-13 13:11:59 -05:00
terrafrost
4878f2a99b
RSA: add PKCS8 unit tests
2014-06-13 12:39:12 -05:00
terrafrost
4434d91f25
RSA: add support for saving encrypted PKCS8 keys
2014-06-13 11:43:32 -05:00
terrafrost
d474f56f60
Crypt/Base: adjust default key size for pbkdf1
2014-06-13 10:39:57 -05:00
terrafrost
abae026264
RSA: add support for loading PKCS8 encrypted private keys
2014-06-13 08:56:00 -05:00
terrafrost
21c6a15df3
Crypt/Base: add support for pbkdf1
2014-06-13 08:54:30 -05:00
terrafrost
0a5e26a648
RSA: add support for saving to PKCS8 (unencrypted)
2014-06-12 22:03:00 -05:00
Andreas Fischer
90bc07e292
Merge pull request #366 from terrafrost/rsa-format-change
...
RSA: slight adjustment to CRYPT_RSA_PUBLIC_FORMAT_PKCS1_RAW format
* terrafrost/rsa-format-change:
RSA: slight adjustment to CRYPT_RSA_PUBLIC_FORMAT_PKCS1_RAW format
2014-06-11 08:05:48 +02:00
Andreas Fischer
a39da4dba3
Merge pull request #367 from terrafrost/ssh-mac-algo
...
SSH2: make $mac_algorithms non-static
* terrafrost/ssh-mac-algo:
SSH2: make $mac_algorithms non-static
2014-06-11 07:48:57 +02:00
terrafrost
246e9e154f
SSH2: make $mac_algorithms non-static
...
none of the other statically defined variables have the potential
to change as multiple Net_SSH2 objects are created but this one does.
ie. if you connect to one SSH-2.0-SSHD server then no subsequent server
will use hmac-sha1-96 even if it could
2014-06-10 23:08:56 -05: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
6e796d091a
Merge pull request #364 from terrafrost/sftp-sort2
...
SFTP: add the ability for nlist() and rawlist() to be sorted
* terrafrost/sftp-sort2:
SFTP: update one last comment
SFTP: update unit test comments
SFTP: add new line to end of unit test
SFTP: assertEquals -> assertSame
SFTP: reset sort options every time and update unit test
SFTP: rm whitespace
SFTP: define $sortOptions
SFTP: add the ability for nlist() and rawlist() to be sorted
2014-06-09 20:19:33 +02:00
terrafrost
3ded2d9f81
SFTP: update one last comment
2014-06-09 11:33:17 -05:00
terrafrost
0cb6fbc983
SFTP: update unit test comments
2014-06-09 09:46:31 -05:00
terrafrost
fb1dbbf75c
SFTP: add new line to end of unit test
2014-06-09 09:44:27 -05:00
terrafrost
c8343e77c7
SFTP: assertEquals -> assertSame
2014-06-09 09:42:07 -05:00
terrafrost
0e2b2a416b
SFTP: reset sort options every time and update unit test
2014-06-09 09:22:30 -05:00
terrafrost
8dff207ed3
SFTP: rm whitespace
2014-06-05 15:06:50 -05:00
terrafrost
8c0f710083
SFTP: define $sortOptions
2014-06-05 10:50:13 -05:00
terrafrost
b64573f4b5
SFTP: add the ability for nlist() and rawlist() to be sorted
2014-06-05 09:56:49 -05:00
Andreas Fischer
25d31e5867
Merge pull request #362 from terrafrost/spkac
...
X509: add signSPKAC() and saveSPKAC() methods
* terrafrost/spkac:
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:34 +02:00
terrafrost
231566c1fb
X509: Unit test CS changes
2014-06-05 09:23:22 -05:00
terrafrost
4a98679519
X509: move location of SPKAC unit test
2014-06-05 09:03:17 -05:00
terrafrost
daa466db94
Merge branch 'master' of https://github.com/phpseclib/phpseclib into spkac
2014-06-05 08:40:49 -05:00
terrafrost
b1ad911d20
X509: CS adjustments
2014-06-05 08:33:27 -05:00
terrafrost
aabc5cf822
X509: PHP4 compat changes
2014-06-05 08:10:52 -05:00
terrafrost
af0040b813
RSA: PHP4 compat changes
2014-06-05 08:10:20 -05:00
terrafrost
0cc6383c32
X509: rm trailing white space from unit test
2014-06-04 00:22:46 -05:00
terrafrost
75a045bec4
X509: add SPKAC unit test
2014-06-04 00:11:57 -05:00
terrafrost
dce03bb003
X509: add signSPKAC() and saveSPKAC() methods
2014-06-03 23:44:09 -05:00
Andreas Fischer
8b7a605c0f
Merge pull request #359 from bantu/ticket/301
...
Adjust documentation to coding guidelines: No () around include.
* bantu/ticket/301:
Adjust documentation to coding guidelines: No () around include.
2014-06-02 12:51:21 +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
Andreas Fischer
c7d4fd937e
Merge pull request #358 from bantu/ticket/321
...
Reimplement testGenerateIdentifier
* bantu/ticket/321:
Reimplement testGenerateIdentifier to fix #321
2014-06-01 22:00:08 +02:00