From 3dcb8ed32b28106334280c11ea45c78300532ed4 Mon Sep 17 00:00:00 2001 From: Philipp Crocoll Date: Mon, 30 Nov 2020 10:10:13 +0100 Subject: [PATCH] update JSch to version 0.1.55, closes #1478 --- .../src/main/java/com/jcraft/jsch/Buffer.java | 2 +- .../main/java/com/jcraft/jsch/Channel.java | 2 +- .../jcraft/jsch/ChannelAgentForwarding.java | 2 +- .../com/jcraft/jsch/ChannelDirectTCPIP.java | 2 +- .../java/com/jcraft/jsch/ChannelExec.java | 2 +- .../jcraft/jsch/ChannelForwardedTCPIP.java | 2 +- .../java/com/jcraft/jsch/ChannelSession.java | 2 +- .../java/com/jcraft/jsch/ChannelSftp.java | 2 +- .../java/com/jcraft/jsch/ChannelShell.java | 2 +- .../com/jcraft/jsch/ChannelSubsystem.java | 2 +- .../main/java/com/jcraft/jsch/ChannelX11.java | 2 +- .../src/main/java/com/jcraft/jsch/Cipher.java | 2 +- .../main/java/com/jcraft/jsch/CipherNone.java | 2 +- .../java/com/jcraft/jsch/Compression.java | 2 +- .../com/jcraft/jsch/ConfigRepository.java | 2 +- .../app/src/main/java/com/jcraft/jsch/DH.java | 2 +- .../main/java/com/jcraft/jsch/DHEC256.java | 2 +- .../main/java/com/jcraft/jsch/DHEC384.java | 2 +- .../main/java/com/jcraft/jsch/DHEC521.java | 2 +- .../src/main/java/com/jcraft/jsch/DHECN.java | 2 +- .../src/main/java/com/jcraft/jsch/DHG1.java | 2 +- .../src/main/java/com/jcraft/jsch/DHG14.java | 2 +- .../src/main/java/com/jcraft/jsch/DHGEX.java | 2 +- .../main/java/com/jcraft/jsch/DHGEX256.java | 2 +- .../src/main/java/com/jcraft/jsch/ECDH.java | 2 +- .../com/jcraft/jsch/ForwardedTCPIPDaemon.java | 2 +- .../main/java/com/jcraft/jsch/GSSContext.java | 2 +- .../src/main/java/com/jcraft/jsch/HASH.java | 2 +- .../main/java/com/jcraft/jsch/HostKey.java | 2 +- .../com/jcraft/jsch/HostKeyRepository.java | 2 +- .../app/src/main/java/com/jcraft/jsch/IO.java | 2 +- .../main/java/com/jcraft/jsch/Identity.java | 2 +- .../java/com/jcraft/jsch/IdentityFile.java | 10 ++- .../com/jcraft/jsch/IdentityRepository.java | 2 +- .../src/main/java/com/jcraft/jsch/JSch.java | 9 ++- .../jcraft/jsch/JSchAuthCancelException.java | 2 +- .../java/com/jcraft/jsch/JSchException.java | 2 +- .../jcraft/jsch/JSchPartialAuthException.java | 2 +- .../java/com/jcraft/jsch/KeyExchange.java | 4 +- .../main/java/com/jcraft/jsch/KeyPair.java | 6 +- .../main/java/com/jcraft/jsch/KeyPairDSA.java | 2 +- .../java/com/jcraft/jsch/KeyPairECDSA.java | 27 ++++++-- .../java/com/jcraft/jsch/KeyPairGenDSA.java | 2 +- .../java/com/jcraft/jsch/KeyPairGenECDSA.java | 2 +- .../java/com/jcraft/jsch/KeyPairGenRSA.java | 2 +- .../java/com/jcraft/jsch/KeyPairPKCS8.java | 2 +- .../main/java/com/jcraft/jsch/KeyPairRSA.java | 2 +- .../main/java/com/jcraft/jsch/KnownHosts.java | 2 +- .../jcraft/jsch/LocalIdentityRepository.java | 2 +- .../src/main/java/com/jcraft/jsch/Logger.java | 2 +- .../src/main/java/com/jcraft/jsch/MAC.java | 2 +- .../java/com/jcraft/jsch/OpenSSHConfig.java | 16 ++++- .../src/main/java/com/jcraft/jsch/PBKDF.java | 2 +- .../src/main/java/com/jcraft/jsch/Packet.java | 2 +- .../java/com/jcraft/jsch/PortWatcher.java | 2 +- .../src/main/java/com/jcraft/jsch/Proxy.java | 2 +- .../main/java/com/jcraft/jsch/ProxyHTTP.java | 2 +- .../java/com/jcraft/jsch/ProxySOCKS4.java | 2 +- .../java/com/jcraft/jsch/ProxySOCKS5.java | 2 +- .../src/main/java/com/jcraft/jsch/Random.java | 2 +- .../main/java/com/jcraft/jsch/Request.java | 2 +- .../jcraft/jsch/RequestAgentForwarding.java | 2 +- .../main/java/com/jcraft/jsch/RequestEnv.java | 2 +- .../java/com/jcraft/jsch/RequestExec.java | 2 +- .../java/com/jcraft/jsch/RequestPtyReq.java | 2 +- .../java/com/jcraft/jsch/RequestSftp.java | 2 +- .../java/com/jcraft/jsch/RequestShell.java | 2 +- .../java/com/jcraft/jsch/RequestSignal.java | 2 +- .../com/jcraft/jsch/RequestSubsystem.java | 2 +- .../com/jcraft/jsch/RequestWindowChange.java | 2 +- .../main/java/com/jcraft/jsch/RequestX11.java | 2 +- .../com/jcraft/jsch/ServerSocketFactory.java | 2 +- .../main/java/com/jcraft/jsch/Session.java | 10 +-- .../main/java/com/jcraft/jsch/SftpATTRS.java | 2 +- .../java/com/jcraft/jsch/SftpException.java | 2 +- .../com/jcraft/jsch/SftpProgressMonitor.java | 2 +- .../java/com/jcraft/jsch/SftpStatVFS.java | 2 +- .../main/java/com/jcraft/jsch/Signature.java | 2 +- .../java/com/jcraft/jsch/SignatureDSA.java | 2 +- .../java/com/jcraft/jsch/SignatureECDSA.java | 2 +- .../java/com/jcraft/jsch/SignatureRSA.java | 2 +- .../java/com/jcraft/jsch/SocketFactory.java | 2 +- .../jcraft/jsch/UIKeyboardInteractive.java | 2 +- .../main/java/com/jcraft/jsch/UserAuth.java | 2 +- .../jcraft/jsch/UserAuthGSSAPIWithMIC.java | 2 +- .../jsch/UserAuthKeyboardInteractive.java | 2 +- .../java/com/jcraft/jsch/UserAuthNone.java | 2 +- .../com/jcraft/jsch/UserAuthPassword.java | 2 +- .../com/jcraft/jsch/UserAuthPublicKey.java | 2 +- .../main/java/com/jcraft/jsch/UserInfo.java | 2 +- .../src/main/java/com/jcraft/jsch/Util.java | 2 +- .../java/com/jcraft/jsch/jce/AES128CBC.java | 2 +- .../java/com/jcraft/jsch/jce/AES128CTR.java | 2 +- .../java/com/jcraft/jsch/jce/AES192CBC.java | 2 +- .../java/com/jcraft/jsch/jce/AES192CTR.java | 2 +- .../java/com/jcraft/jsch/jce/AES256CBC.java | 2 +- .../java/com/jcraft/jsch/jce/AES256CTR.java | 2 +- .../java/com/jcraft/jsch/jce/ARCFOUR.java | 2 +- .../java/com/jcraft/jsch/jce/ARCFOUR128.java | 2 +- .../java/com/jcraft/jsch/jce/ARCFOUR256.java | 2 +- .../java/com/jcraft/jsch/jce/BlowfishCBC.java | 2 +- .../src/main/java/com/jcraft/jsch/jce/DH.java | 2 +- .../java/com/jcraft/jsch/jce/ECDH256.java | 2 +- .../java/com/jcraft/jsch/jce/ECDH384.java | 2 +- .../java/com/jcraft/jsch/jce/ECDH521.java | 2 +- .../main/java/com/jcraft/jsch/jce/ECDHN.java | 2 +- .../main/java/com/jcraft/jsch/jce/HMAC.java | 2 +- .../java/com/jcraft/jsch/jce/HMACMD5.java | 2 +- .../java/com/jcraft/jsch/jce/HMACMD596.java | 2 +- .../java/com/jcraft/jsch/jce/HMACSHA1.java | 2 +- .../java/com/jcraft/jsch/jce/HMACSHA196.java | 2 +- .../java/com/jcraft/jsch/jce/HMACSHA256.java | 2 +- .../java/com/jcraft/jsch/jce/HMACSHA512.java | 2 +- .../com/jcraft/jsch/jce/KeyPairGenDSA.java | 2 +- .../com/jcraft/jsch/jce/KeyPairGenECDSA.java | 2 +- .../com/jcraft/jsch/jce/KeyPairGenRSA.java | 2 +- .../main/java/com/jcraft/jsch/jce/MD5.java | 2 +- .../main/java/com/jcraft/jsch/jce/PBKDF.java | 2 +- .../main/java/com/jcraft/jsch/jce/Random.java | 2 +- .../main/java/com/jcraft/jsch/jce/SHA1.java | 2 +- .../main/java/com/jcraft/jsch/jce/SHA256.java | 2 +- .../main/java/com/jcraft/jsch/jce/SHA384.java | 2 +- .../main/java/com/jcraft/jsch/jce/SHA512.java | 2 +- .../com/jcraft/jsch/jce/SignatureDSA.java | 64 +++++++++++-------- .../jcraft/jsch/jce/SignatureECDSA256.java | 41 ++++++++++++ .../jcraft/jsch/jce/SignatureECDSA384.java | 41 ++++++++++++ .../jcraft/jsch/jce/SignatureECDSA521.java | 41 ++++++++++++ ...gnatureECDSA.java => SignatureECDSAN.java} | 18 ++++-- .../com/jcraft/jsch/jce/SignatureRSA.java | 19 +++--- .../com/jcraft/jsch/jce/TripleDESCBC.java | 2 +- .../com/jcraft/jsch/jce/TripleDESCTR.java | 2 +- .../com/jcraft/jsch/jcraft/Compression.java | 2 +- .../java/com/jcraft/jsch/jcraft/HMAC.java | 2 +- .../java/com/jcraft/jsch/jcraft/HMACMD5.java | 2 +- .../com/jcraft/jsch/jcraft/HMACMD596.java | 2 +- .../java/com/jcraft/jsch/jcraft/HMACSHA1.java | 2 +- .../com/jcraft/jsch/jcraft/HMACSHA196.java | 2 +- 137 files changed, 365 insertions(+), 189 deletions(-) create mode 100644 src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SignatureECDSA256.java create mode 100644 src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SignatureECDSA384.java create mode 100644 src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SignatureECDSA521.java rename src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/{SignatureECDSA.java => SignatureECDSAN.java} (93%) diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Buffer.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Buffer.java index 4db2e89e..ad1b2c08 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Buffer.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Buffer.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Channel.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Channel.java index c4c0fef8..2d94e5cb 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Channel.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Channel.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelAgentForwarding.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelAgentForwarding.java index d93a0058..3c1672b1 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelAgentForwarding.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelAgentForwarding.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2006-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2006-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelDirectTCPIP.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelDirectTCPIP.java index f5d8f4ab..70ddf429 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelDirectTCPIP.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelDirectTCPIP.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelExec.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelExec.java index 8f6be684..f8f3aee9 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelExec.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelExec.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelForwardedTCPIP.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelForwardedTCPIP.java index 32dcb5db..0a59b254 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelForwardedTCPIP.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelForwardedTCPIP.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelSession.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelSession.java index ce44f839..67988383 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelSession.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelSession.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelSftp.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelSftp.java index 0711f9e7..f76d1d5d 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelSftp.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelSftp.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelShell.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelShell.java index bafcc39a..5113c503 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelShell.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelShell.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelSubsystem.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelSubsystem.java index 697b9273..568b4910 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelSubsystem.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelSubsystem.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2005-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2005-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelX11.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelX11.java index c69121c6..5be9049f 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelX11.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ChannelX11.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Cipher.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Cipher.java index da1e9411..966ceb5b 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Cipher.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Cipher.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/CipherNone.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/CipherNone.java index 9d4e530f..917dd9fd 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/CipherNone.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/CipherNone.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Compression.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Compression.java index 96cf535c..3db3176b 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Compression.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Compression.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ConfigRepository.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ConfigRepository.java index ca799034..71338899 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ConfigRepository.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ConfigRepository.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2013-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2013-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/DH.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/DH.java index ce79791c..df4f9dbb 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/DH.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/DH.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/DHEC256.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/DHEC256.java index c2a7d054..50454bb1 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/DHEC256.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/DHEC256.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2015-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2015-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/DHEC384.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/DHEC384.java index 3fdcb78f..6438e71d 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/DHEC384.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/DHEC384.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2015-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2015-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/DHEC521.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/DHEC521.java index b9bb0910..7a9ac78a 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/DHEC521.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/DHEC521.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2015-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2015-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/DHECN.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/DHECN.java index ecfaa094..d8d2378a 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/DHECN.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/DHECN.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2015-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2015-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/DHG1.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/DHG1.java index 4829478b..c8596376 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/DHG1.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/DHG1.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/DHG14.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/DHG14.java index ef834085..47cb5e85 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/DHG14.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/DHG14.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/DHGEX.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/DHGEX.java index 8a6b2f82..f975e5f1 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/DHGEX.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/DHGEX.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/DHGEX256.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/DHGEX256.java index 3090f4af..6627aaa1 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/DHGEX256.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/DHGEX256.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ECDH.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ECDH.java index b1c6a34f..b92c31e5 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ECDH.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ECDH.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2015-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2015-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ForwardedTCPIPDaemon.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ForwardedTCPIPDaemon.java index c40e0307..2318c6c8 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ForwardedTCPIPDaemon.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ForwardedTCPIPDaemon.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/GSSContext.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/GSSContext.java index 9f4187fb..1c3864a5 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/GSSContext.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/GSSContext.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2004-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2004-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/HASH.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/HASH.java index 4edb56eb..bea8aa48 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/HASH.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/HASH.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/HostKey.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/HostKey.java index edba4e31..c90a6fd8 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/HostKey.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/HostKey.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/HostKeyRepository.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/HostKeyRepository.java index 92b236f7..17f9f695 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/HostKeyRepository.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/HostKeyRepository.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2004-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2004-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/IO.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/IO.java index a354bffb..0be3bf0f 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/IO.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/IO.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Identity.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Identity.java index 70005a89..4b2c1aa5 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Identity.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Identity.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/IdentityFile.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/IdentityFile.java index e3d5d7b1..fa41225e 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/IdentityFile.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/IdentityFile.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: @@ -93,7 +93,13 @@ class IdentityFile implements Identity{ * @return "ssh-rsa" or "ssh-dss" */ public String getAlgName(){ - return new String(kpair.getKeyTypeName()); + byte[] name = kpair.getKeyTypeName(); + try { + return new String(name, "UTF-8"); + } + catch (UnsupportedEncodingException e){ + return new String(name); + } } /** diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/IdentityRepository.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/IdentityRepository.java index a24bc421..d4f3f228 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/IdentityRepository.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/IdentityRepository.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2012-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2012-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/JSch.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/JSch.java index 3b3e7a1e..b93c2885 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/JSch.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/JSch.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: @@ -66,9 +66,9 @@ public class JSch{ config.put("diffie-hellman-group-exchange-sha256", "com.jcraft.jsch.DHGEX256"); // available since JDK1.4.2. // On JDK8, 2048bits will be used. - config.put("ecdsa-sha2-nistp256", "com.jcraft.jsch.jce.SignatureECDSA"); - config.put("ecdsa-sha2-nistp384", "com.jcraft.jsch.jce.SignatureECDSA"); - config.put("ecdsa-sha2-nistp521", "com.jcraft.jsch.jce.SignatureECDSA"); + config.put("ecdsa-sha2-nistp256", "com.jcraft.jsch.jce.SignatureECDSA256"); + config.put("ecdsa-sha2-nistp384", "com.jcraft.jsch.jce.SignatureECDSA384"); + config.put("ecdsa-sha2-nistp521", "com.jcraft.jsch.jce.SignatureECDSA521"); config.put("ecdh-sha2-nistp256", "com.jcraft.jsch.DHEC256"); config.put("ecdh-sha2-nistp384", "com.jcraft.jsch.DHEC384"); @@ -94,7 +94,6 @@ public class JSch{ config.put("md5", "com.jcraft.jsch.jce.MD5"); config.put("signature.dss", "com.jcraft.jsch.jce.SignatureDSA"); config.put("signature.rsa", "com.jcraft.jsch.jce.SignatureRSA"); - config.put("signature.ecdsa", "com.jcraft.jsch.jce.SignatureECDSA"); 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"); diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/JSchAuthCancelException.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/JSchAuthCancelException.java index 783577de..39450991 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/JSchAuthCancelException.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/JSchAuthCancelException.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/JSchException.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/JSchException.java index 1c8b7f1e..a8942277 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/JSchException.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/JSchException.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/JSchPartialAuthException.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/JSchPartialAuthException.java index 72794e8d..e6fb2770 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/JSchPartialAuthException.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/JSchPartialAuthException.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyExchange.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyExchange.java index 364cd9b4..2b5e544e 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyExchange.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyExchange.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: @@ -301,7 +301,7 @@ public abstract class KeyExchange{ SignatureECDSA sig=null; try{ - Class c=Class.forName(session.getConfig("signature.ecdsa")); + Class c=Class.forName(session.getConfig(alg)); sig=(SignatureECDSA)(c.newInstance()); sig.init(); } diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyPair.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyPair.java index 3e4e80ea..76b396ee 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyPair.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyPair.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: @@ -599,7 +599,7 @@ public abstract class KeyPair{ } else if(_type.equals("ecdsa-sha2-nistp256") || _type.equals("ecdsa-sha2-nistp384") || - _type.equals("ecdsa-sha2-nistp512")){ + _type.equals("ecdsa-sha2-nistp521")){ kpair=KeyPairECDSA.fromSSHAgent(jsch, buf); } else{ @@ -924,7 +924,7 @@ public abstract class KeyPair{ KeyPair kpair=null; if(type==DSA){ kpair=new KeyPairDSA(jsch); } else if(type==RSA){ kpair=new KeyPairRSA(jsch); } - else if(type==ECDSA){ kpair=new KeyPairECDSA(jsch); } + else if(type==ECDSA){ kpair=new KeyPairECDSA(jsch, pubkey); } else if(vendor==VENDOR_PKCS8){ kpair = new KeyPairPKCS8(jsch); } if(kpair!=null){ diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyPairDSA.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyPairDSA.java index 455d37db..a4c767f0 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyPairDSA.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyPairDSA.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyPairECDSA.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyPairECDSA.java index 21083883..e00c3ca0 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyPairECDSA.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyPairECDSA.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2015-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2015-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: @@ -55,6 +55,23 @@ public class KeyPairECDSA extends KeyPair{ this(jsch, null, null, null, null); } + public KeyPairECDSA(JSch jsch , byte[] pubkey){ + this(jsch, null, null, null, null); + + if(pubkey!=null){ + byte[] name = new byte[8]; + System.arraycopy(pubkey, 11, name, 0, 8); + if(Util.array_equals(name, Util.str2byte("nistp384"))){ + key_size=384; + this.name=name; + } + if(Util.array_equals(name, Util.str2byte("nistp521"))){ + key_size=521; + this.name=name; + } + } + } + public KeyPairECDSA(JSch jsch, byte[] name, byte[] r_array, @@ -283,8 +300,8 @@ public class KeyPairECDSA extends KeyPair{ } public byte[] getSignature(byte[] data){ - try{ - Class c=Class.forName((String)jsch.getConfig("signature.ecdsa")); + try{ + Class c=Class.forName((String)jsch.getConfig("ecdsa-sha2-"+new String(name))); SignatureECDSA ecdsa=(SignatureECDSA)(c.newInstance()); ecdsa.init(); ecdsa.setPrvKey(prv_array); @@ -304,8 +321,8 @@ public class KeyPairECDSA extends KeyPair{ } public Signature getVerifier(){ - try{ - Class c=Class.forName((String)jsch.getConfig("signature.ecdsa")); + try{ + Class c=Class.forName((String)jsch.getConfig("ecdsa-sha2-"+new String(name))); final SignatureECDSA ecdsa=(SignatureECDSA)(c.newInstance()); ecdsa.init(); diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyPairGenDSA.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyPairGenDSA.java index 2bd78b21..2c7ee097 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyPairGenDSA.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyPairGenDSA.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyPairGenECDSA.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyPairGenECDSA.java index 30f00c74..18369af5 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyPairGenECDSA.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyPairGenECDSA.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2015-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2015-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyPairGenRSA.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyPairGenRSA.java index 0d00eef9..78334f5a 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyPairGenRSA.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyPairGenRSA.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyPairPKCS8.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyPairPKCS8.java index d9a3da19..33f4b6f6 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyPairPKCS8.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyPairPKCS8.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2013-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2013-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyPairRSA.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyPairRSA.java index 2111cd3b..eb0d35b6 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyPairRSA.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KeyPairRSA.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KnownHosts.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KnownHosts.java index f9d1eae4..f6b7049b 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KnownHosts.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/KnownHosts.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/LocalIdentityRepository.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/LocalIdentityRepository.java index 01a37a4d..227995c4 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/LocalIdentityRepository.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/LocalIdentityRepository.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2012-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2012-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Logger.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Logger.java index e4b47ec3..4c5f5fcb 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Logger.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Logger.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2006-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2006-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/MAC.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/MAC.java index f45a5cc7..95abc170 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/MAC.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/MAC.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/OpenSSHConfig.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/OpenSSHConfig.java index 4b535cc2..8091f371 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/OpenSSHConfig.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/OpenSSHConfig.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2013-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2013-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: @@ -212,6 +212,20 @@ public class OpenSSHConfig implements ConfigRepository { if(value != null) break; } + // TODO: The following change should be applied, + // but it is breaking changes. + // The consensus is required to enable it. + /* + if(value!=null && + (key.equals("SERVERALIVEINTERVAL") || + key.equals("CONNECTTIMEOUT"))){ + try { + int timeout = Integer.parseInt(value); + value = Integer.toString(timeout*1000); + } catch (NumberFormatException e) { + } + } + */ return value; } diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/PBKDF.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/PBKDF.java index 6910b568..44619a37 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/PBKDF.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/PBKDF.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2013-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2013-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Packet.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Packet.java index 3b8c50de..0a9a5c13 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Packet.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Packet.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/PortWatcher.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/PortWatcher.java index 5f403fde..d59cbc27 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/PortWatcher.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/PortWatcher.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Proxy.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Proxy.java index 39b4bcb7..e2bd09db 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Proxy.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Proxy.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ProxyHTTP.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ProxyHTTP.java index 432e91ee..85b2be35 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ProxyHTTP.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ProxyHTTP.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ProxySOCKS4.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ProxySOCKS4.java index f0b059fa..76dcb04f 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ProxySOCKS4.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ProxySOCKS4.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2006-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2006-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ProxySOCKS5.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ProxySOCKS5.java index e37581b2..7c3f8e9a 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ProxySOCKS5.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ProxySOCKS5.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Random.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Random.java index 9d08767f..29e5fe5a 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Random.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Random.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Request.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Request.java index a158b769..a3bca8f8 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Request.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Request.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestAgentForwarding.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestAgentForwarding.java index 0c6edc7f..9528c19c 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestAgentForwarding.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestAgentForwarding.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2006-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2006-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestEnv.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestEnv.java index 6925a04f..afc4d702 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestEnv.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestEnv.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestExec.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestExec.java index 3787edbe..44e41a7d 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestExec.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestExec.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestPtyReq.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestPtyReq.java index b9a2622e..63b3125b 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestPtyReq.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestPtyReq.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestSftp.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestSftp.java index 10eab938..3ad5166b 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestSftp.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestSftp.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestShell.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestShell.java index 125b7fac..12ef31bf 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestShell.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestShell.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestSignal.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestSignal.java index 84efa8a0..a5146712 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestSignal.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestSignal.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestSubsystem.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestSubsystem.java index 9926bbf8..a3edeae4 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestSubsystem.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestSubsystem.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2005-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2005-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestWindowChange.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestWindowChange.java index 131c2bfd..d465f40c 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestWindowChange.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestWindowChange.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestX11.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestX11.java index 03ea7ede..3c87179a 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestX11.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/RequestX11.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ServerSocketFactory.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ServerSocketFactory.java index 4aaef2d8..7c0467ad 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ServerSocketFactory.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/ServerSocketFactory.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Session.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Session.java index a5f751dc..9f56c735 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Session.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Session.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: @@ -2677,9 +2677,11 @@ break; String value = null; - value = config.getUser(); - if(value != null) - username = value; + if(username==null){ + value = config.getUser(); + if(value != null) + username = value; + } value = config.getHostname(); if(value != null) diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/SftpATTRS.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/SftpATTRS.java index 96165d50..a871427e 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/SftpATTRS.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/SftpATTRS.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/SftpException.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/SftpException.java index 6f644750..20292652 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/SftpException.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/SftpException.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/SftpProgressMonitor.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/SftpProgressMonitor.java index 0fd124ad..85dfb839 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/SftpProgressMonitor.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/SftpProgressMonitor.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/SftpStatVFS.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/SftpStatVFS.java index 04dcd402..37b56e6e 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/SftpStatVFS.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/SftpStatVFS.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Signature.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Signature.java index 711f01d7..86938696 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Signature.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Signature.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2012-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2012-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/SignatureDSA.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/SignatureDSA.java index 2cbe0acf..8fa99198 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/SignatureDSA.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/SignatureDSA.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/SignatureECDSA.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/SignatureECDSA.java index 7e14d5d5..530966e5 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/SignatureECDSA.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/SignatureECDSA.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2015-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2015-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/SignatureRSA.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/SignatureRSA.java index e51d8a6d..8c2aabe4 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/SignatureRSA.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/SignatureRSA.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/SocketFactory.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/SocketFactory.java index d0519851..72a1dbb9 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/SocketFactory.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/SocketFactory.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UIKeyboardInteractive.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UIKeyboardInteractive.java index 8ada1a9a..2d23530e 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UIKeyboardInteractive.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UIKeyboardInteractive.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UserAuth.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UserAuth.java index 26836317..1d1c080b 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UserAuth.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UserAuth.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UserAuthGSSAPIWithMIC.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UserAuthGSSAPIWithMIC.java index 4325955b..7b9c1bc1 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UserAuthGSSAPIWithMIC.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UserAuthGSSAPIWithMIC.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2006-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2006-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UserAuthKeyboardInteractive.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UserAuthKeyboardInteractive.java index 8331b17e..2a3abb4d 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UserAuthKeyboardInteractive.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UserAuthKeyboardInteractive.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UserAuthNone.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UserAuthNone.java index a2bf63af..5b71a639 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UserAuthNone.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UserAuthNone.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UserAuthPassword.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UserAuthPassword.java index 7bc1a283..833d5510 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UserAuthPassword.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UserAuthPassword.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UserAuthPublicKey.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UserAuthPublicKey.java index 40c1fa0a..2f2ab4a6 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UserAuthPublicKey.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UserAuthPublicKey.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UserInfo.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UserInfo.java index e1b2a32a..73fe5612 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UserInfo.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/UserInfo.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Util.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Util.java index f990b5de..ef0700c2 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Util.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/Util.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/AES128CBC.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/AES128CBC.java index 93bf54bf..0fb4dfc0 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/AES128CBC.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/AES128CBC.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2005-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2005-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/AES128CTR.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/AES128CTR.java index 5dd2fcb3..a88b2d5c 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/AES128CTR.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/AES128CTR.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2008-2016 ymnk, JCraft,Inc. All rights reserved. +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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/AES192CBC.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/AES192CBC.java index f1e77ec9..e67535bf 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/AES192CBC.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/AES192CBC.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2005-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2005-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/AES192CTR.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/AES192CTR.java index 78148067..e99735e3 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/AES192CTR.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/AES192CTR.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2008-2016 ymnk, JCraft,Inc. All rights reserved. +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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/AES256CBC.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/AES256CBC.java index 9b72d2e4..cb6ac972 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/AES256CBC.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/AES256CBC.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2005-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2005-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/AES256CTR.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/AES256CTR.java index 30d933ec..2437703f 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/AES256CTR.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/AES256CTR.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2008-2016 ymnk, JCraft,Inc. All rights reserved. +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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/ARCFOUR.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/ARCFOUR.java index 6c5a09f2..dbe6bf9a 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/ARCFOUR.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/ARCFOUR.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2008-2016 ymnk, JCraft,Inc. All rights reserved. +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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/ARCFOUR128.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/ARCFOUR128.java index d7b6035a..b77b0c1f 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/ARCFOUR128.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/ARCFOUR128.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2008-2016 ymnk, JCraft,Inc. All rights reserved. +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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/ARCFOUR256.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/ARCFOUR256.java index 8103fbd3..f4af6223 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/ARCFOUR256.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/ARCFOUR256.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2008-2016 ymnk, JCraft,Inc. All rights reserved. +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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/BlowfishCBC.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/BlowfishCBC.java index c1b9c6b5..2ad9448c 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/BlowfishCBC.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/BlowfishCBC.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/DH.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/DH.java index a005b363..b8a4506f 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/DH.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/DH.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/ECDH256.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/ECDH256.java index 33da04de..29c37db6 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/ECDH256.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/ECDH256.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2015-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2015-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/ECDH384.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/ECDH384.java index 4612c2b1..2ced69b2 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/ECDH384.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/ECDH384.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2015-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2015-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/ECDH521.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/ECDH521.java index 4e051ed0..cd1c9fd0 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/ECDH521.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/ECDH521.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2015-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2015-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/ECDHN.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/ECDHN.java index 1efc10bd..07abe309 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/ECDHN.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/ECDHN.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2015-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2015-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/HMAC.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/HMAC.java index e578d595..e13d825b 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/HMAC.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/HMAC.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2012-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2012-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/HMACMD5.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/HMACMD5.java index df1d68a7..ca02c1cb 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/HMACMD5.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/HMACMD5.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/HMACMD596.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/HMACMD596.java index b6fc39ff..039c3712 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/HMACMD596.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/HMACMD596.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/HMACSHA1.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/HMACSHA1.java index eada19e7..eda37275 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/HMACSHA1.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/HMACSHA1.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/HMACSHA196.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/HMACSHA196.java index ca03c14c..247ecb2d 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/HMACSHA196.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/HMACSHA196.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/HMACSHA256.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/HMACSHA256.java index 444b6b45..0517438f 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/HMACSHA256.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/HMACSHA256.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2012-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2012-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/HMACSHA512.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/HMACSHA512.java index 3f5aeb6c..be0bc90e 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/HMACSHA512.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/HMACSHA512.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2012-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2012-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/KeyPairGenDSA.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/KeyPairGenDSA.java index 8b8a291d..d36848d7 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/KeyPairGenDSA.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/KeyPairGenDSA.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/KeyPairGenECDSA.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/KeyPairGenECDSA.java index e68705a8..82d62a14 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/KeyPairGenECDSA.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/KeyPairGenECDSA.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2015-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2015-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/KeyPairGenRSA.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/KeyPairGenRSA.java index 703d2f03..a15d1678 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/KeyPairGenRSA.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/KeyPairGenRSA.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/MD5.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/MD5.java index 253838d7..78e025f6 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/MD5.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/MD5.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/PBKDF.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/PBKDF.java index 7a6ff2b0..57433afb 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/PBKDF.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/PBKDF.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2013-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2013-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/Random.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/Random.java index d2a6630b..b77f22b3 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/Random.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/Random.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SHA1.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SHA1.java index 98c5e228..0d3997c2 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SHA1.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SHA1.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SHA256.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SHA256.java index 28b406a7..f2f90948 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SHA256.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SHA256.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SHA384.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SHA384.java index 962f1c89..976f9cc3 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SHA384.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SHA384.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2015-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2015-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SHA512.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SHA512.java index 139cfade..4c6b1949 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SHA512.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SHA512.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2015-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2015-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SignatureDSA.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SignatureDSA.java index 44bd0a54..94ba7dea 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SignatureDSA.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SignatureDSA.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: @@ -32,6 +32,7 @@ package com.jcraft.jsch.jce; import java.math.BigInteger; import java.security.*; import java.security.spec.*; +import com.jcraft.jsch.Buffer; public class SignatureDSA implements com.jcraft.jsch.SignatureDSA{ @@ -106,42 +107,51 @@ System.err.println(""); int i=0; int j=0; byte[] tmp; + Buffer buf=new Buffer(sig); - if(sig[0]==0 && sig[1]==0 && sig[2]==0){ - j=((sig[i++]<<24)&0xff000000)|((sig[i++]<<16)&0x00ff0000)| - ((sig[i++]<<8)&0x0000ff00)|((sig[i++])&0x000000ff); - i+=j; - j=((sig[i++]<<24)&0xff000000)|((sig[i++]<<16)&0x00ff0000)| - ((sig[i++]<<8)&0x0000ff00)|((sig[i++])&0x000000ff); - tmp=new byte[j]; - System.arraycopy(sig, i, tmp, 0, j); sig=tmp; + if(new String(buf.getString()).equals("ssh-dss")){ + j=buf.getInt(); + i=buf.getOffSet(); + tmp=new byte[j]; + System.arraycopy(sig, i, tmp, 0, j); sig=tmp; } - // ASN.1 - int frst=((sig[0]&0x80)!=0?1:0); - int scnd=((sig[20]&0x80)!=0?1:0); - //System.err.println("frst: "+frst+", scnd: "+scnd); + byte[] _frst=new byte[20]; + System.arraycopy(sig, 0, _frst, 0, 20); + _frst=normalize(_frst); - int length=sig.length+6+frst+scnd; + byte[] _scnd=new byte[20]; + System.arraycopy(sig, 20, _scnd, 0, 20); + _scnd=normalize(_scnd); + + // ASN.1 + int frst=((_frst[0]&0x80)!=0?1:0); + int scnd=((_scnd[0]&0x80)!=0?1:0); + + int length=_frst.length+_scnd.length+6+frst+scnd; tmp=new byte[length]; - tmp[0]=(byte)0x30; tmp[1]=(byte)0x2c; + tmp[0]=(byte)0x30; tmp[1]=(byte)(_frst.length+_scnd.length+4); tmp[1]+=frst; tmp[1]+=scnd; - tmp[2]=(byte)0x02; tmp[3]=(byte)0x14; + tmp[2]=(byte)0x02; tmp[3]=(byte)_frst.length; tmp[3]+=frst; - System.arraycopy(sig, 0, tmp, 4+frst, 20); - tmp[4+tmp[3]]=(byte)0x02; tmp[5+tmp[3]]=(byte)0x14; + System.arraycopy(_frst, 0, tmp, 4+frst, _frst.length); + tmp[4+tmp[3]]=(byte)0x02; tmp[5+tmp[3]]=(byte)_scnd.length; tmp[5+tmp[3]]+=scnd; - System.arraycopy(sig, 20, tmp, 6+tmp[3]+scnd, 20); + System.arraycopy(_scnd, 0, tmp, 6+tmp[3]+scnd, _scnd.length); sig=tmp; -/* - tmp=new byte[sig.length+6]; - tmp[0]=(byte)0x30; tmp[1]=(byte)0x2c; - tmp[2]=(byte)0x02; tmp[3]=(byte)0x14; - System.arraycopy(sig, 0, tmp, 4, 20); - tmp[24]=(byte)0x02; tmp[25]=(byte)0x14; - System.arraycopy(sig, 20, tmp, 26, 20); sig=tmp; -*/ return signature.verify(sig); } + + protected byte[] normalize(byte[] secret) { + if(secret.length > 1 && + secret[0] == 0 && (secret[1]&0x80) == 0) { + byte[] tmp=new byte[secret.length-1]; + System.arraycopy(secret, 1, tmp, 0, tmp.length); + return normalize(tmp); + } + else { + return secret; + } + } } diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SignatureECDSA256.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SignatureECDSA256.java new file mode 100644 index 00000000..3d36c841 --- /dev/null +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SignatureECDSA256.java @@ -0,0 +1,41 @@ +/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ +/* +Copyright (c) 2015-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.jce; + +import java.math.BigInteger; +import java.security.*; +import java.security.spec.*; +import com.jcraft.jsch.Buffer; + +public class SignatureECDSA256 extends SignatureECDSAN { + String getName() { + return "ecdsa-sha2-nistp256"; + } +} diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SignatureECDSA384.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SignatureECDSA384.java new file mode 100644 index 00000000..8055d447 --- /dev/null +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SignatureECDSA384.java @@ -0,0 +1,41 @@ +/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ +/* +Copyright (c) 2015-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.jce; + +import java.math.BigInteger; +import java.security.*; +import java.security.spec.*; +import com.jcraft.jsch.Buffer; + +public class SignatureECDSA384 extends SignatureECDSAN { + String getName() { + return "ecdsa-sha2-nistp384"; + } +} diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SignatureECDSA521.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SignatureECDSA521.java new file mode 100644 index 00000000..7cb03c02 --- /dev/null +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SignatureECDSA521.java @@ -0,0 +1,41 @@ +/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ +/* +Copyright (c) 2015-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.jce; + +import java.math.BigInteger; +import java.security.*; +import java.security.spec.*; +import com.jcraft.jsch.Buffer; + +public class SignatureECDSA521 extends SignatureECDSAN { + String getName() { + return "ecdsa-sha2-nistp521"; + } +} diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SignatureECDSA.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SignatureECDSAN.java similarity index 93% rename from src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SignatureECDSA.java rename to src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SignatureECDSAN.java index 3241bee6..8037eb20 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SignatureECDSA.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SignatureECDSAN.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2015-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2015-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: @@ -34,16 +34,22 @@ import java.security.*; import java.security.spec.*; import com.jcraft.jsch.Buffer; -public class SignatureECDSA implements com.jcraft.jsch.SignatureECDSA { +public abstract class SignatureECDSAN implements com.jcraft.jsch.SignatureECDSA { Signature signature; KeyFactory keyFactory; - public void init() throws Exception{ - signature=java.security.Signature.getInstance("SHA256withECDSA"); - keyFactory=KeyFactory.getInstance("EC"); - } + abstract String getName(); + public void init() throws Exception{ + String name = getName(); + String foo="SHA256withECDSA"; + if(name.equals("ecdsa-sha2-nistp384")) foo="SHA384withECDSA"; + else if(name.equals("ecdsa-sha2-nistp521")) foo="SHA512withECDSA"; + signature=java.security.Signature.getInstance(foo); + keyFactory=KeyFactory.getInstance("EC"); + } + public void setPubKey(byte[] r, byte[] s) throws Exception{ // r and s must be unsigned values. diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SignatureRSA.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SignatureRSA.java index 28f8c486..3ed4efae 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SignatureRSA.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/SignatureRSA.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: @@ -32,6 +32,7 @@ package com.jcraft.jsch.jce; import java.math.BigInteger; import java.security.*; import java.security.spec.*; +import com.jcraft.jsch.Buffer; public class SignatureRSA implements com.jcraft.jsch.SignatureRSA{ @@ -67,17 +68,15 @@ public class SignatureRSA implements com.jcraft.jsch.SignatureRSA{ int i=0; int j=0; byte[] tmp; + Buffer buf=new Buffer(sig); - if(sig[0]==0 && sig[1]==0 && sig[2]==0){ - j=((sig[i++]<<24)&0xff000000)|((sig[i++]<<16)&0x00ff0000)| - ((sig[i++]<<8)&0x0000ff00)|((sig[i++])&0x000000ff); - i+=j; - j=((sig[i++]<<24)&0xff000000)|((sig[i++]<<16)&0x00ff0000)| - ((sig[i++]<<8)&0x0000ff00)|((sig[i++])&0x000000ff); - tmp=new byte[j]; - System.arraycopy(sig, i, tmp, 0, j); sig=tmp; + if(new String(buf.getString()).equals("ssh-rsa")){ + j=buf.getInt(); + i=buf.getOffSet(); + tmp=new byte[j]; + System.arraycopy(sig, i, tmp, 0, j); sig=tmp; } -//System.err.println("j="+j+" "+Integer.toHexString(sig[0]&0xff)); + return signature.verify(sig); } } diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/TripleDESCBC.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/TripleDESCBC.java index ce4a075f..fbcb1662 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/TripleDESCBC.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/TripleDESCBC.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/TripleDESCTR.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/TripleDESCTR.java index 3e444e89..f8a98071 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/TripleDESCTR.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jce/TripleDESCTR.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2008-2016 ymnk, JCraft,Inc. All rights reserved. +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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jcraft/Compression.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jcraft/Compression.java index c838d9e9..a973fb9a 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jcraft/Compression.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jcraft/Compression.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2002-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2002-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jcraft/HMAC.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jcraft/HMAC.java index 3f6ba8d0..f5c5e14c 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jcraft/HMAC.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jcraft/HMAC.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2006-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2006-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jcraft/HMACMD5.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jcraft/HMACMD5.java index c4fcb48f..174a126e 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jcraft/HMACMD5.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jcraft/HMACMD5.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2006-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2006-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jcraft/HMACMD596.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jcraft/HMACMD596.java index f806962e..5fcc225e 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jcraft/HMACMD596.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jcraft/HMACMD596.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2006-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2006-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jcraft/HMACSHA1.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jcraft/HMACSHA1.java index 869c13c4..d750ed7a 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jcraft/HMACSHA1.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jcraft/HMACSHA1.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2006-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2006-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: diff --git a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jcraft/HMACSHA196.java b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jcraft/HMACSHA196.java index 8f8e3276..20d961b1 100644 --- a/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jcraft/HMACSHA196.java +++ b/src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/jcraft/HMACSHA196.java @@ -1,6 +1,6 @@ /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ /* -Copyright (c) 2006-2016 ymnk, JCraft,Inc. All rights reserved. +Copyright (c) 2006-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: