Jeroen van Erp
bf34072c3a
Reading first part of the new openssh key format
2016-10-24 09:49:45 +02:00
Jeroen van Erp
771751ca4c
Fixed license header
2016-10-19 14:48:06 +01:00
Jeroen van Erp
968d4284a0
Extracted common key file methods into an abstract base class
2016-10-19 12:08:51 +01:00
Jeroen van Erp
63927a3e2b
Setting version to 0.18.0
2016-09-30 11:43:02 +02:00
Jeroen van Erp
ac262f8086
Updated README for 0.17.3
2016-09-30 11:26:01 +02:00
Jeroen van Erp
6e56cd9d0a
Changed release process to bintray
2016-09-30 11:03:22 +02:00
Jeroen van Erp
2f6025d9ba
Merge branch 'CherifGh-gcif-patch-android-compat'
2016-09-30 10:38:22 +02:00
Jeroen van Erp
275e98e55b
Refactored SecurityUtils a bit
2016-09-30 10:37:55 +02:00
Ghozzi Cherif
655d070571
Update AndroidConfig.java
2016-09-25 15:28:59 +02:00
Jeroen van Erp
c9775ca2c7
Fixed formatting warnings of Codacy
2016-09-13 15:34:08 +02:00
Jeroen van Erp
a2fb4fbd98
Merge pull request #271 from joval/master
...
Gracefully load OpenSSH known_hosts without requiring BouncyCastle
2016-09-13 15:21:09 +02:00
David Solin
6185ac4db8
Improvements per JVE.
2016-09-13 08:04:15 -05:00
David Solin
e420593fa9
Okay, more spaces Codacy, you win!
2016-09-09 16:03:45 -05:00
David Solin
68b924863e
Fail gracefully when reading an OpenSSH Known Hosts file that uses key types requiring BouncyCastle, but we're not including BouncyCastle.
2016-09-09 14:39:21 -05:00
Jeroen van Erp
613ace1864
Upgrade to gradle 3.0
2016-09-05 11:32:59 +02:00
Jeroen van Erp
78e0ecd264
Merge pull request #270 from hierynomus/java6
...
Java6 re-enabled
2016-09-05 11:29:02 +02:00
Jeroen van Erp
64085e62f4
Removed openJDK6 as release plugin is incompatible
2016-09-05 09:54:15 +02:00
Jeroen van Erp
8c7d2fa8d0
Java6 re-enabled
2016-09-02 16:54:21 +02:00
Jeroen van Erp
766d292bad
Merge pull request #269 from joval/master
...
Compatibility features
2016-09-02 16:46:56 +02:00
David Solin
a40957fffc
Merge remote-tracking branch 'upstream/master'
2016-09-02 09:24:18 -05:00
David Solin
8ffd852e67
SPACES NOT TABS (like in Silicon Valley).
2016-09-02 09:16:26 -05:00
Jeroen van Erp
b90be512e7
REformatted
2016-09-02 16:08:26 +02:00
Jeroen van Erp
c0d49cf6b3
Removed dependency on VRallev ECC25519 library
2016-09-02 16:05:18 +02:00
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
