-
Notifications
You must be signed in to change notification settings - Fork 146
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add support for various algorithms with older Java releases by using …
…Bouncy Castle: - ssh-ed25519 - ssh-ed448 - curve25519-sha256 - [email protected] - curve448-sha512 - [email protected]
- Loading branch information
1 parent
702b145
commit a45f0ac
Showing
20 changed files
with
668 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -106,13 +106,9 @@ public class JSch{ | |
|
|
||
| config.put("ecdh-sha2-nistp", "com.jcraft.jsch.jce.ECDHN"); | ||
|
|
||
| config.put("ssh-ed25519", "com.jcraft.jsch.jce.SignatureEd25519"); | ||
| config.put("ssh-ed448", "com.jcraft.jsch.jce.SignatureEd448"); | ||
|
|
||
| config.put("curve25519-sha256", "com.jcraft.jsch.DH25519"); | ||
| config.put("[email protected]", "com.jcraft.jsch.DH25519"); | ||
| config.put("curve448-sha512", "com.jcraft.jsch.DH448"); | ||
| config.put("xdh", "com.jcraft.jsch.jce.XDH"); | ||
|
|
||
| config.put("dh", "com.jcraft.jsch.jce.DH"); | ||
| config.put("3des-cbc", "com.jcraft.jsch.jce.TripleDESCBC"); | ||
|
|
@@ -156,12 +152,10 @@ public class JSch{ | |
| config.put("keypairgen.dsa", "com.jcraft.jsch.jce.KeyPairGenDSA"); | ||
| config.put("keypairgen.rsa", "com.jcraft.jsch.jce.KeyPairGenRSA"); | ||
| config.put("keypairgen.ecdsa", "com.jcraft.jsch.jce.KeyPairGenECDSA"); | ||
| config.put("keypairgen.eddsa", "com.jcraft.jsch.jce.KeyPairGenEdDSA"); | ||
| config.put("random", "com.jcraft.jsch.jce.Random"); | ||
|
|
||
| config.put("none", "com.jcraft.jsch.CipherNone"); | ||
|
|
||
| config.put("[email protected]", "com.jcraft.jsch.jce.ChaCha20Poly1305"); | ||
| config.put("[email protected]", "com.jcraft.jsch.jce.AES128GCM"); | ||
| config.put("[email protected]", "com.jcraft.jsch.jce.AES256GCM"); | ||
|
|
||
|
|
@@ -189,6 +183,26 @@ public class JSch{ | |
|
|
||
| config.put("pbkdf", "com.jcraft.jsch.jce.PBKDF"); | ||
|
|
||
| if(JavaVersion.getVersion()>=11){ | ||
| config.put("[email protected]", "com.jcraft.jsch.jce.ChaCha20Poly1305"); | ||
| config.put("xdh", "com.jcraft.jsch.jce.XDH"); | ||
| } | ||
| else{ | ||
| config.put("[email protected]", "com.jcraft.jsch.bc.ChaCha20Poly1305"); | ||
| config.put("xdh", "com.jcraft.jsch.bc.XDH"); | ||
| } | ||
|
|
||
| if(JavaVersion.getVersion()>=15){ | ||
| config.put("keypairgen.eddsa", "com.jcraft.jsch.jce.KeyPairGenEdDSA"); | ||
| config.put("ssh-ed25519", "com.jcraft.jsch.jce.SignatureEd25519"); | ||
| config.put("ssh-ed448", "com.jcraft.jsch.jce.SignatureEd448"); | ||
| } | ||
| else{ | ||
| config.put("keypairgen.eddsa", "com.jcraft.jsch.bc.KeyPairGenEdDSA"); | ||
| config.put("ssh-ed25519", "com.jcraft.jsch.bc.SignatureEd25519"); | ||
| config.put("ssh-ed448", "com.jcraft.jsch.bc.SignatureEd448"); | ||
| } | ||
|
|
||
| config.put("StrictHostKeyChecking", "ask"); | ||
| config.put("HashKnownHosts", "no"); | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| package com.jcraft.jsch; | ||
|
|
||
| final class JavaVersion { | ||
|
|
||
| static int getVersion() { | ||
| return 8; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,138 @@ | ||
| /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ | ||
| /* | ||
| Copyright (c) 2008-2018 ymnk, JCraft,Inc. All rights reserved. | ||
| Redistribution and use in source and binary forms, with or without | ||
| modification, are permitted provided that the following conditions are met: | ||
| 1. Redistributions of source code must retain the above copyright notice, | ||
| this list of conditions and the following disclaimer. | ||
| 2. Redistributions in binary form must reproduce the above copyright | ||
| notice, this list of conditions and the following disclaimer in | ||
| the documentation and/or other materials provided with the distribution. | ||
| 3. The names of the authors may not be used to endorse or promote products | ||
| derived from this software without specific prior written permission. | ||
| THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, | ||
| INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND | ||
| FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT, | ||
| INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
| INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
| LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, | ||
| OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF | ||
| LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING | ||
| NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, | ||
| EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
|
|
||
| package com.jcraft.jsch.bc; | ||
|
|
||
| import com.jcraft.jsch.Cipher; | ||
| import com.jcraft.jsch.openjax.Poly1305; | ||
| import java.nio.ByteBuffer; | ||
| import javax.crypto.AEADBadTagException; | ||
| import org.bouncycastle.crypto.engines.ChaChaEngine; | ||
| import org.bouncycastle.crypto.params.*; | ||
|
|
||
| public class ChaCha20Poly1305 implements Cipher{ | ||
| //Actually the block size, not IV size | ||
| private static final int ivsize=8; | ||
| //Actually the key size, not block size | ||
| private static final int bsize=64; | ||
| private static final int tagsize=16; | ||
| private ChaChaEngine header_cipher; | ||
| private ChaChaEngine main_cipher; | ||
| private KeyParameter K_1_spec; | ||
| private KeyParameter K_2_spec; | ||
| private int mode; | ||
| private Poly1305 poly1305; | ||
| @Override | ||
| public int getIVSize(){return ivsize;} | ||
| @Override | ||
| public int getBlockSize(){return bsize;} | ||
| @Override | ||
| public int getTagSize(){return tagsize;} | ||
| @Override | ||
| public void init(int mode, byte[] key, byte[] iv) throws Exception{ | ||
| byte[] tmp; | ||
| if(key.length>bsize){ | ||
| tmp=new byte[bsize]; | ||
| System.arraycopy(key, 0, tmp, 0, tmp.length); | ||
| key=tmp; | ||
| } | ||
| byte[] K_1=new byte[bsize/2]; | ||
| byte[] K_2=new byte[bsize/2]; | ||
| System.arraycopy(key, bsize/2, K_1, 0, bsize/2); | ||
| System.arraycopy(key, 0, K_2, 0, bsize/2); | ||
| this.mode=mode; | ||
| try{ | ||
| K_1_spec=new KeyParameter(K_1); | ||
| K_2_spec=new KeyParameter(K_2); | ||
| header_cipher=new ChaChaEngine(); | ||
| main_cipher=new ChaChaEngine(); | ||
| } | ||
| catch(Exception e){ | ||
| header_cipher=null; | ||
| main_cipher=null; | ||
| K_1_spec=null; | ||
| K_2_spec=null; | ||
| throw e; | ||
| } | ||
| } | ||
| @Override | ||
| public void update(int foo) throws Exception{ | ||
| ByteBuffer nonce=ByteBuffer.allocate(8); | ||
| nonce.putLong(0, foo); | ||
| header_cipher.init(this.mode==ENCRYPT_MODE, new ParametersWithIV(K_1_spec, nonce.array())); | ||
| main_cipher.init(this.mode==ENCRYPT_MODE, new ParametersWithIV(K_2_spec, nonce.array())); | ||
| // Trying to reinit the cipher again with same nonce results in InvalidKeyException | ||
| // So just read entire first 64-byte block, which should increment global counter from 0->1 | ||
| byte[] poly_key = new byte[32]; | ||
| byte[] discard = new byte[32]; | ||
| main_cipher.processBytes(poly_key, 0, 32, poly_key, 0); | ||
| main_cipher.processBytes(discard, 0, 32, discard, 0); | ||
| poly1305 = new Poly1305(poly_key); | ||
| } | ||
| @Override | ||
| public void update(byte[] foo, int s1, int len, byte[] bar, int s2) throws Exception{ | ||
| header_cipher.processBytes(foo, s1, len, bar, s2); | ||
| } | ||
| @Override | ||
| public void updateAAD(byte[] foo, int s1, int len) throws Exception{ | ||
| } | ||
| @Override | ||
| public void doFinal(byte[] foo, int s1, int len, byte[] bar, int s2) throws Exception{ | ||
| if(this.mode==DECRYPT_MODE){ | ||
| byte[] actual_tag = new byte[tagsize]; | ||
| System.arraycopy(foo, len, actual_tag, 0, tagsize); | ||
| byte[] expected_tag = new byte[tagsize]; | ||
| poly1305.update(foo, s1, len).finish(expected_tag, 0); | ||
| if(!arraysequals(actual_tag, expected_tag)){ | ||
| throw new AEADBadTagException("Tag mismatch"); | ||
| } | ||
| } | ||
|
|
||
| main_cipher.processBytes(foo, s1+4, len-4, bar, s2+4); | ||
|
|
||
| if(this.mode==ENCRYPT_MODE){ | ||
| poly1305.update(bar, s2, len).finish(bar, len); | ||
| } | ||
| } | ||
| @Override | ||
| public boolean isCBC(){return false; } | ||
| @Override | ||
| public boolean isAEAD(){return true; } | ||
| @Override | ||
| public boolean isChaCha20(){return true; } | ||
|
|
||
| private static boolean arraysequals(byte[] a, byte[] b){ | ||
| if(a.length!=b.length) return false; | ||
| int res=0; | ||
| for(int i=0; i<a.length; i++){ | ||
| res|=a[i]^b[i]; | ||
| } | ||
| return res==0; | ||
| } | ||
| } |
Oops, something went wrong.