Skip to content

merge #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 51 commits into from
Jan 11, 2018
Merged

merge #1

merged 51 commits into from
Jan 11, 2018

Conversation

CCLiu
Copy link
Owner

@CCLiu CCLiu commented Jan 11, 2018

No description provided.

hierynomus and others added 30 commits August 22, 2017 19:32
@hierynomus
Check whether filename is a child of the current file (Fixes #341)
1f6615b
@hierynomus
Fixed codacy
8856aae
@hierynomus
Updated README release notes
eb1629f
@hierynomus
Removed oraclejdk7 as that is no longer supported on trusty, added op…
0b548d9 
…enjdk
@hierynomus
Added gradle caching to travis config
c58c7c7
@hierynomus
Removed use of DataTypeConverter as that is no longer in default JDK9
cf077e2
@hierynomus
Removed build of broken openJDK7 in favour of using animal-sniffer to…
aa77483 
… detect java 1.6 compatibility
@hierynomus
Improved test stability
0918bc6
@hierynomus
Correctly determine KeyType for ECDSA public key (Fixes #356)
c6c9a3f
@hierynomus
fixed build
a9928c2
@hierynomus
Fixed Java9 build?
9ac55de
@hierynomus
Disambiguated signature initialization
bdbd9d7
@hierynomus
Removed deprecated method
2984291
@hierynomus
Organised imports
28d5784
@hierynomus
Added 'out/' to gitignore
99c8567
@hierynomus
Added support for new-style fingerprints (#365)
762d088 
* Added support for new-style fingerprints

* Fixed codacy warnings
@hierynomus
Fix decoding signature bytes (Fixes #355, #354) (#361)
ec46a7a 
* Fix for signature verify in DSA

* Cleaned up signature verification

* Fixed import

* Ignored erroneous pmd warnings

* Updated JavaDoc
@hierynomus
Extracted ASN.1/DER encoding to method (#368)
c161fe2
@paladox @hierynomus
Update net.i2p.crypto:eddsa to 0.2.0 (#372)
f046a41 
* Update net.i2p.crypto:eddsa to 0.2.0

* Update net.i2p.crypto.eddsa to 0.2.0

* Update net.i2p.crypto.eddsa to 0.2.0

* Update net.i2p.crypto.eddsa to 0.2.0
@hierynomus
Log security provider registration failures (#374)
823f1e5
Migrate remaining block ciphers
c67ae24
@hierynomus
Merge pull request #369 from charlesrgould/migrate-block-ciphers
fef9cfa 
Migrate remaining block ciphers
@hierynomus
Updated README for v0.23.0 release
a1f501a
@hierynomus
Using new release plugin
b41f0ac
@hierynomus
Updated build plugins
d2e0f50
@hierynomus
Fix escaping in WildcardHostMatcher (#382)
a71a7d7 
* Escape '[' and ']' in WildcardHostMatcher

* Anchoring regex to match entire string (Fixes #381)
@hierynomus
Updated builds to include CodeCov
661f63e
- Experimenting with travis
7a884d0
- fix ip for online testing
c4552d5
- account for different working dir
47d73a9
Iger and others added 21 commits December 3, 2017 19:36
- yaml-yaml
663f118
- double before_install
8454cf1
- still -d
a014567
- try common format
0e981f7
- Fixed server keys
a0f1aa7 
- Use sshj branding
- grr, ip
2b62492
- minor improvements
9d697ed
- eh?
73bc785
- switch username back
7cb1f8b
- orly?
64a2a4f
- desperation
d0daa2c
- One more time
4045d5a
@hierynomus
Merge pull request #385 from Igerly/ssh-with-docker-tests
09fb2b9 
Integration test(s) with OpenSSH server in Docker
@hierynomus
Upgraded gradle to cope with java9
bc4da2e
@hierynomus
Separated out integration tests
5e1be8b
@hierynomus
Fixed length bug in putString (Fixes #187)
8ca6451
@hierynomus
Removed docker from travis yml as it is included in gradle build now
048f84b
@hierynomus
Added integration test to travis
ca81c2e
@eidottermihi @hierynomus
Update AndroidConfig (#389)
54018a4 
* Add EdDSA signature for AndroidConfig.

* Initialize KeyExchange- and FileKeyProviderFactories with registered "bouncyCastle" (in fact, SpongyCastle is registered).

See #308 for discussion.
@hierynomus
Added integration test for append scenario (Fixes #390)
0f67fa2
@hierynomus
Fixed headers
dabe43d
@CCLiu CCLiu merged commit b265cfd into CCLiu:master Jan 11, 2018
CCLiu added a commit that referenced this pull request Jan 11, 2018
@CCLiu
Revert "merge (#1)"
4edaf7b 
This reverts commit b265cfd.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@CCLiu @hierynomus @paladox @eidottermihi