David Solin
1b5b2b25b7
Merge branch 'master' into post-logging-factory
2016-09-02 06:45:58 -05:00
Jeroen van Erp
1dad19ca6e
Merge pull request #267 from joval/logging-factory
...
Logging factory
2016-09-02 10:55:43 +02:00
David Solin
90fa26925d
Merge branch 'logging-factory' into post-logging-factory
2016-08-29 15:19:57 -05:00
David Solin
9425300262
Better argument order for IdentificationStringParser constructor.
2016-08-29 15:19:06 -05:00
David A. Solin
f2bfe9bfcf
Make Java-6 compatible.
2016-08-26 13:26:01 -05:00
David Solin
71498ad961
Added some features required to integrate sshj with Joval's remote jSAF provider.
...
1) Added boolean Channel.isEOF() method, for checking whether the server has sent EOF.
2) Added SFTP response constants to the Response enumeration
3) Spelling correction for the SYMLINK FileMode enum constant
2016-08-26 13:02:16 -05:00
David Solin
7b8b1cfdf5
Merge branch 'master' into logging-factory
2016-08-24 08:37:24 -05:00
David Solin
3f29879eca
Test fixes
2016-08-24 08:35:08 -05:00
David Solin
79c1ae2bb0
Re-add public constructor used by Groovy
2016-08-24 08:08:33 -05:00
David Solin
819d411cf1
Merge branch 'master' of github.com:joval/sshj into logging-factory
2016-08-24 07:57:22 -05:00
David Solin
6579f6f710
Removed unnecessary DefaultLoggerFactory inner class from DefaultConfig
...
Fixed license header in LoggerFactory.java (via gradle licenseForamat)
2016-08-24 07:34:01 -05:00
David Solin
cf5830eda5
Indentation fixes.
2016-08-24 06:23:45 -05:00
Jeroen van Erp
36ad389ccf
Merge pull request #266 from joval/master
...
Decryption fix and junit test updates for PKCS5
2016-08-24 13:04:36 +02:00
David Solin
f63a88ec9f
Removed unnecessary import statements.
2016-08-23 19:24:11 -05:00
David Solin
7379a89268
Inadvertently added this class to a PR where it's not in-scope.
2016-08-23 19:18:51 -05:00
David Solin
219901211e
Changes for injecting a LoggingFactory.
2016-08-23 19:13:43 -05:00
David Solin
8c1329036a
Updated test case for PKCS5 over-"simplification", to prevent regression.
2016-08-23 19:08:03 -05:00
David Solin
733c19350c
Un-break PKCS5 (I inadvertently over-simplified setting the salt length).
2016-08-23 17:40:00 -05:00
Jeroen van Erp
e5ec84c06a
Merge pull request #265 from joval/master
...
Minor modifications to PKCS5KeyFile
2016-08-19 23:35:03 +02:00
David Solin
ed0156c985
Forgot to move 2 fields to the top of the file.
2016-08-19 15:54:48 -05:00
David Solin
6321685881
Moved constant declarations per codacy.
2016-08-19 15:51:07 -05:00
David Solin
f6b4d47945
Another missing import. This should be it.
2016-08-19 15:09:50 -05:00
David Solin
d198ef121c
Missing import in test.
2016-08-19 15:04:55 -05:00
David Solin
7786468875
Simplification?
2016-08-19 15:00:12 -05:00
David Solin
0847e8460a
Merge remote-tracking branch 'upstream/master'
2016-08-19 12:24:14 -05:00
David Solin
62b8726807
Fixed bug wherein PKCS5KeyFile messed up the data if a bad passphrase was used, which prevented decryption with a subsequent correct passphrase.
...
Also, made it possible for subclasses of PKCS5KeyFile to access the decrypted ASN.1 data directly (useful if you want to decrypt then store a PKCS5 key for later use elsewhere).
And I think I made the code a little prettier.
2016-08-19 12:18:49 -05:00
Jeroen van Erp
a6af27ae91
Added Codacy badge
2016-08-19 13:02:55 +02:00
Jeroen van Erp
628cbf5eba
Organized imports
2016-08-19 12:57:37 +02:00
Jeroen van Erp
e134e00574
Merge pull request #263 from joval/master
...
Modifications for working with SSH gateways
2016-08-17 08:41:33 +02:00
David Solin
1caa7ac722
For null hostnames, use the loopback InetAddress (for backward-compatibility).
2016-08-16 10:26:57 -05:00
David Solin
4183776adb
Updates per Jeroen van Erp.
2016-08-16 09:17:30 -05:00
David Solin
791f112752
Merge remote-tracking branch 'upstream/master'
2016-08-15 09:27:10 -05:00
Jeroen van Erp
233f3765c9
Added PKCS5 key file support ( #262 )
2016-08-15 15:49:47 +02:00
Jeroen van Erp
5f292d398f
Fixed toString of FileAttributes ( Fixes #258 )
2016-08-15 09:56:13 +02:00
David Solin
ba347f927d
Close any LocalPortForwarders with the SSHClient that produced them (assuming they're still open).
2016-08-15 00:17:48 -05:00
David Solin
6f9ecf69e4
Reordered connect methods so that the similar ones are grouped together.
...
Also, eliminated all use of InetAddress.getByName, because we'll want to be able to connect even when the target host is only visible to DNS from the Proxy, or the SocketFactory.
2016-08-14 14:06:40 -05:00
David Solin
e78ae4dbeb
4th time's the charm?
2016-08-13 15:11:20 -05:00
David Solin
618f2fd111
String.format error was causing tests to unexpectedly fail.
2016-08-13 14:45:00 -05:00
David Solin
8503046302
Made the pkcs8-blanks file an actual pkcs8 file (so it doesn't fail the test).
2016-08-13 14:21:59 -05:00
David Solin
c6cde27e4b
Oops, I shouldn't have encrypted the pkcs8 key file.
2016-08-13 11:00:00 -05:00
David Solin
113aa0aebd
Updated KeyProviderUtil, KeyFormat, KeyProviderUtilTest and test resources to properly differentiate between PKCS5 and PKCS8 file formats.
2016-08-13 10:24:05 -05:00
David Solin
e7c50165c7
Removed GNUmake-related files from source control
...
Removed 3rd-party JARs from source control
Re-introduced original BouncyCastle-dependent PKCS5KeyFile class
Re-named non-BouncyCastle-dependent PKCS8KeyFile class to PKCS5KeyFile, since it really only supports PKCS5 formats anyway
2016-08-13 10:03:52 -05:00
David Solin
09616c4834
Tweaks
2016-08-12 20:03:08 -05:00
David Solin
df710d8dc9
Added getFingerprint method to SSH Known Host entry API.
...
Removed BouncyCastle dependency for public key authentication.
2016-08-12 19:58:09 -05:00
David Solin
df82774ea3
Added resources and GNUmake files.
...
Updated StreamCopier class to make it compatible with older SLF4J versions.
2016-08-10 21:45:30 -05:00
Jeroen van Erp
caa6cca665
Updated README for 0.17.2 and upcoming 0.17.3 release
2016-07-19 11:36:03 +02:00
Jeroen van Erp
9a5ccefb5d
Removed dependency on net.i2p.crypto.eddsa.math classes ( Fixes #255 )
2016-07-19 11:22:13 +02:00
Jeroen van Erp
90f8c592b0
Prepped for v0.17.2 release
2016-07-07 11:03:05 +02:00
Jeroen van Erp
f491e8d101
Fixed bug that crept in 0edc4a5
2016-07-07 11:01:43 +02:00
Jeroen van Erp
77c10334f1
Updated for 0.17.1 release
2016-07-06 16:23:12 +02:00
