Repository: mina-sshd Updated Branches: refs/heads/master 2fba44306 -> b8301774d
[SSHD-805] RFC 8268 support Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/b8301774 Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/b8301774 Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/b8301774 Branch: refs/heads/master Commit: b8301774da5eb933fc297e5172579b53d2204a57 Parents: 2fba443 Author: Guillaume Nodet <gno...@apache.org> Authored: Mon Mar 5 10:50:34 2018 +0100 Committer: Guillaume Nodet <gno...@apache.org> Committed: Mon Mar 5 11:25:29 2018 +0100 ---------------------------------------------------------------------- .../org/apache/sshd/common/kex/group1.prime | 22 ++++++ .../org/apache/sshd/common/kex/group14.prime | 29 ++++++++ .../org/apache/sshd/common/kex/group15.prime | 34 +++++++++ .../org/apache/sshd/common/kex/group16.prime | 40 +++++++++++ .../org/apache/sshd/common/kex/group17.prime | 46 ++++++++++++ .../org/apache/sshd/common/kex/group18.prime | 61 ++++++++++++++++ .../org/apache/sshd/common/kex/group2.prime | 24 +++++++ .../org/apache/sshd/common/kex/group5.prime | 26 +++++++ .../org/apache/sshd/common/BaseBuilder.java | 5 ++ .../sshd/common/kex/BuiltinDHFactories.java | 75 ++++++++++++++++++++ .../org/apache/sshd/common/kex/DHGroupData.java | 52 ++++++++++++++ .../sshd/common/kex/BuiltinDHFactoriesTest.java | 17 +++++ 12 files changed, 431 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/b8301774/sshd-core/src/main/filtered-resources/org/apache/sshd/common/kex/group1.prime ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/filtered-resources/org/apache/sshd/common/kex/group1.prime b/sshd-core/src/main/filtered-resources/org/apache/sshd/common/kex/group1.prime new file mode 100644 index 0000000..357d741 --- /dev/null +++ b/sshd-core/src/main/filtered-resources/org/apache/sshd/common/kex/group1.prime @@ -0,0 +1,22 @@ +## +## Licensed to the Apache Software Foundation (ASF) under one +## or more contributor license agreements. See the NOTICE file +## distributed with this work for additional information +## regarding copyright ownership. The ASF licenses this file +## to you under the Apache License, Version 2.0 (the +## "License"); you may not use this file except in compliance +## with the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, +## software distributed under the License is distributed on an +## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +## KIND, either express or implied. See the License for the +## specific language governing permissions and limitations +## under the License. +## +FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1 +29024E08 8A67CC74 020BBEA6 3B139B22 514A0879 8E3404DD +EF9519B3 CD3A431B 302B0A6D F25F1437 4FE1356D 6D51C245 +E485B576 625E7EC6 F44C42E9 A63A3620 FFFFFFFF FFFFFFFF http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/b8301774/sshd-core/src/main/filtered-resources/org/apache/sshd/common/kex/group14.prime ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/filtered-resources/org/apache/sshd/common/kex/group14.prime b/sshd-core/src/main/filtered-resources/org/apache/sshd/common/kex/group14.prime new file mode 100644 index 0000000..568dce4 --- /dev/null +++ b/sshd-core/src/main/filtered-resources/org/apache/sshd/common/kex/group14.prime @@ -0,0 +1,29 @@ +## +## Licensed to the Apache Software Foundation (ASF) under one +## or more contributor license agreements. See the NOTICE file +## distributed with this work for additional information +## regarding copyright ownership. The ASF licenses this file +## to you under the Apache License, Version 2.0 (the +## "License"); you may not use this file except in compliance +## with the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, +## software distributed under the License is distributed on an +## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +## KIND, either express or implied. See the License for the +## specific language governing permissions and limitations +## under the License. +## +FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1 +29024E08 8A67CC74 020BBEA6 3B139B22 514A0879 8E3404DD +EF9519B3 CD3A431B 302B0A6D F25F1437 4FE1356D 6D51C245 +E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED +EE386BFB 5A899FA5 AE9F2411 7C4B1FE6 49286651 ECE45B3D +C2007CB8 A163BF05 98DA4836 1C55D39A 69163FA8 FD24CF5F +83655D23 DCA3AD96 1C62F356 208552BB 9ED52907 7096966D +670C354E 4ABC9804 F1746C08 CA18217C 32905E46 2E36CE3B +E39E772C 180E8603 9B2783A2 EC07A28F B5C55DF0 6F4C52C9 +DE2BCBF6 95581718 3995497C EA956AE5 15D22618 98FA0510 +15728E5A 8AACAA68 FFFFFFFF FFFFFFFF http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/b8301774/sshd-core/src/main/filtered-resources/org/apache/sshd/common/kex/group15.prime ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/filtered-resources/org/apache/sshd/common/kex/group15.prime b/sshd-core/src/main/filtered-resources/org/apache/sshd/common/kex/group15.prime new file mode 100644 index 0000000..404b368 --- /dev/null +++ b/sshd-core/src/main/filtered-resources/org/apache/sshd/common/kex/group15.prime @@ -0,0 +1,34 @@ +## +## Licensed to the Apache Software Foundation (ASF) under one +## or more contributor license agreements. See the NOTICE file +## distributed with this work for additional information +## regarding copyright ownership. The ASF licenses this file +## to you under the Apache License, Version 2.0 (the +## "License"); you may not use this file except in compliance +## with the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, +## software distributed under the License is distributed on an +## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +## KIND, either express or implied. See the License for the +## specific language governing permissions and limitations +## under the License. +## +FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1 +29024E08 8A67CC74 020BBEA6 3B139B22 514A0879 8E3404DD +EF9519B3 CD3A431B 302B0A6D F25F1437 4FE1356D 6D51C245 +E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED +EE386BFB 5A899FA5 AE9F2411 7C4B1FE6 49286651 ECE45B3D +C2007CB8 A163BF05 98DA4836 1C55D39A 69163FA8 FD24CF5F +83655D23 DCA3AD96 1C62F356 208552BB 9ED52907 7096966D +670C354E 4ABC9804 F1746C08 CA18217C 32905E46 2E36CE3B +E39E772C 180E8603 9B2783A2 EC07A28F B5C55DF0 6F4C52C9 +DE2BCBF6 95581718 3995497C EA956AE5 15D22618 98FA0510 +15728E5A 8AAAC42D AD33170D 04507A33 A85521AB DF1CBA64 +ECFB8504 58DBEF0A 8AEA7157 5D060C7D B3970F85 A6E1E4C7 +ABF5AE8C DB0933D7 1E8C94E0 4A25619D CEE3D226 1AD2EE6B +F12FFA06 D98A0864 D8760273 3EC86A64 521F2B18 177B200C +BBE11757 7A615D6C 770988C0 BAD946E2 08E24FA0 74E5AB31 +43DB5BFC E0FD108E 4B82D120 A93AD2CA FFFFFFFF FFFFFFFF http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/b8301774/sshd-core/src/main/filtered-resources/org/apache/sshd/common/kex/group16.prime ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/filtered-resources/org/apache/sshd/common/kex/group16.prime b/sshd-core/src/main/filtered-resources/org/apache/sshd/common/kex/group16.prime new file mode 100644 index 0000000..f6cf553 --- /dev/null +++ b/sshd-core/src/main/filtered-resources/org/apache/sshd/common/kex/group16.prime @@ -0,0 +1,40 @@ +FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1 +29024E08 8A67CC74 020BBEA6 3B139B22 514A0879 8E3404DD +EF9519B3 CD3A431B 302B0A6D F25F1437 4FE1356D 6D51C245 +## +## Licensed to the Apache Software Foundation (ASF) under one +## or more contributor license agreements. See the NOTICE file +## distributed with this work for additional information +## regarding copyright ownership. The ASF licenses this file +## to you under the Apache License, Version 2.0 (the +## "License"); you may not use this file except in compliance +## with the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, +## software distributed under the License is distributed on an +## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +## KIND, either express or implied. See the License for the +## specific language governing permissions and limitations +## under the License. +## +E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED +EE386BFB 5A899FA5 AE9F2411 7C4B1FE6 49286651 ECE45B3D +C2007CB8 A163BF05 98DA4836 1C55D39A 69163FA8 FD24CF5F +83655D23 DCA3AD96 1C62F356 208552BB 9ED52907 7096966D +670C354E 4ABC9804 F1746C08 CA18217C 32905E46 2E36CE3B +E39E772C 180E8603 9B2783A2 EC07A28F B5C55DF0 6F4C52C9 +DE2BCBF6 95581718 3995497C EA956AE5 15D22618 98FA0510 +15728E5A 8AAAC42D AD33170D 04507A33 A85521AB DF1CBA64 +ECFB8504 58DBEF0A 8AEA7157 5D060C7D B3970F85 A6E1E4C7 +ABF5AE8C DB0933D7 1E8C94E0 4A25619D CEE3D226 1AD2EE6B +F12FFA06 D98A0864 D8760273 3EC86A64 521F2B18 177B200C +BBE11757 7A615D6C 770988C0 BAD946E2 08E24FA0 74E5AB31 +43DB5BFC E0FD108E 4B82D120 A9210801 1A723C12 A787E6D7 +88719A10 BDBA5B26 99C32718 6AF4E23C 1A946834 B6150BDA +2583E9CA 2AD44CE8 DBBBC2DB 04DE8EF9 2E8EFC14 1FBECAA6 +287C5947 4E6BC05D 99B2964F A090C3A2 233BA186 515BE7ED +1F612970 CEE2D7AF B81BDD76 2170481C D0069127 D5B05AA9 +93B4EA98 8D8FDDC1 86FFB7DC 90A6C08F 4DF435C9 34063199 +FFFFFFFF FFFFFFFF http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/b8301774/sshd-core/src/main/filtered-resources/org/apache/sshd/common/kex/group17.prime ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/filtered-resources/org/apache/sshd/common/kex/group17.prime b/sshd-core/src/main/filtered-resources/org/apache/sshd/common/kex/group17.prime new file mode 100644 index 0000000..66cfdc7 --- /dev/null +++ b/sshd-core/src/main/filtered-resources/org/apache/sshd/common/kex/group17.prime @@ -0,0 +1,46 @@ +FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1 29024E08 +8A67CC74 020BBEA6 3B139B22 514A0879 8E3404DD EF9519B3 CD3A431B +302B0A6D F25F1437 4FE1356D 6D51C245 E485B576 625E7EC6 F44C42E9 +A637ED6B 0BFF5CB6 F406B7ED EE386BFB 5A899FA5 AE9F2411 7C4B1FE6 +49286651 ECE45B3D C2007CB8 A163BF05 98DA4836 1C55D39A 69163FA8 +FD24CF5F 83655D23 DCA3AD96 1C62F356 208552BB 9ED52907 7096966D +670C354E 4ABC9804 F1746C08 CA18217C 32905E46 2E36CE3B E39E772C +180E8603 9B2783A2 EC07A28F B5C55DF0 6F4C52C9 DE2BCBF6 95581718 +3995497C EA956AE5 15D22618 98FA0510 15728E5A 8AAAC42D AD33170D +## +## Licensed to the Apache Software Foundation (ASF) under one +## or more contributor license agreements. See the NOTICE file +## distributed with this work for additional information +## regarding copyright ownership. The ASF licenses this file +## to you under the Apache License, Version 2.0 (the +## "License"); you may not use this file except in compliance +## with the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, +## software distributed under the License is distributed on an +## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +## KIND, either express or implied. See the License for the +## specific language governing permissions and limitations +## under the License. +## +04507A33 A85521AB DF1CBA64 ECFB8504 58DBEF0A 8AEA7157 5D060C7D +B3970F85 A6E1E4C7 ABF5AE8C DB0933D7 1E8C94E0 4A25619D CEE3D226 +1AD2EE6B F12FFA06 D98A0864 D8760273 3EC86A64 521F2B18 177B200C +BBE11757 7A615D6C 770988C0 BAD946E2 08E24FA0 74E5AB31 43DB5BFC +E0FD108E 4B82D120 A9210801 1A723C12 A787E6D7 88719A10 BDBA5B26 +99C32718 6AF4E23C 1A946834 B6150BDA 2583E9CA 2AD44CE8 DBBBC2DB +04DE8EF9 2E8EFC14 1FBECAA6 287C5947 4E6BC05D 99B2964F A090C3A2 +233BA186 515BE7ED 1F612970 CEE2D7AF B81BDD76 2170481C D0069127 +D5B05AA9 93B4EA98 8D8FDDC1 86FFB7DC 90A6C08F 4DF435C9 34028492 +36C3FAB4 D27C7026 C1D4DCB2 602646DE C9751E76 3DBA37BD F8FF9406 +AD9E530E E5DB382F 413001AE B06A53ED 9027D831 179727B0 865A8918 +DA3EDBEB CF9B14ED 44CE6CBA CED4BB1B DB7F1447 E6CC254B 33205151 +2BD7AF42 6FB8F401 378CD2BF 5983CA01 C64B92EC F032EA15 D1721D03 +F482D7CE 6E74FEF6 D55E702F 46980C82 B5A84031 900B1C9E 59E7C97F +BEC7E8F3 23A97A7E 36CC88BE 0F1D45B7 FF585AC5 4BD407B2 2B4154AA +CC8F6D7E BF48E1D8 14CC5ED2 0F8037E0 A79715EE F29BE328 06A1D58B +B7C5DA76 F550AA3D 8A1FBFF0 EB19CCB1 A313D55C DA56C9EC 2EF29632 +387FE8D7 6E3C0468 043E8F66 3F4860EE 12BF2D5B 0B7474D6 E694F91E +6DCC4024 FFFFFFFF FFFFFFFF http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/b8301774/sshd-core/src/main/filtered-resources/org/apache/sshd/common/kex/group18.prime ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/filtered-resources/org/apache/sshd/common/kex/group18.prime b/sshd-core/src/main/filtered-resources/org/apache/sshd/common/kex/group18.prime new file mode 100644 index 0000000..7ff5192 --- /dev/null +++ b/sshd-core/src/main/filtered-resources/org/apache/sshd/common/kex/group18.prime @@ -0,0 +1,61 @@ +FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1 +29024E08 8A67CC74 020BBEA6 3B139B22 514A0879 8E3404DD +EF9519B3 CD3A431B 302B0A6D F25F1437 4FE1356D 6D51C245 +E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED +EE386BFB 5A899FA5 AE9F2411 7C4B1FE6 49286651 ECE45B3D +C2007CB8 A163BF05 98DA4836 1C55D39A 69163FA8 FD24CF5F +83655D23 DCA3AD96 1C62F356 208552BB 9ED52907 7096966D +670C354E 4ABC9804 F1746C08 CA18217C 32905E46 2E36CE3B +E39E772C 180E8603 9B2783A2 EC07A28F B5C55DF0 6F4C52C9 +DE2BCBF6 95581718 3995497C EA956AE5 15D22618 98FA0510 +15728E5A 8AAAC42D AD33170D 04507A33 A85521AB DF1CBA64 +ECFB8504 58DBEF0A 8AEA7157 5D060C7D B3970F85 A6E1E4C7 +ABF5AE8C DB0933D7 1E8C94E0 4A25619D CEE3D226 1AD2EE6B +F12FFA06 D98A0864 D8760273 3EC86A64 521F2B18 177B200C +BBE11757 7A615D6C 770988C0 BAD946E2 08E24FA0 74E5AB31 +43DB5BFC E0FD108E 4B82D120 A9210801 1A723C12 A787E6D7 +88719A10 BDBA5B26 99C32718 6AF4E23C 1A946834 B6150BDA +2583E9CA 2AD44CE8 DBBBC2DB 04DE8EF9 2E8EFC14 1FBECAA6 +287C5947 4E6BC05D 99B2964F A090C3A2 233BA186 515BE7ED +1F612970 CEE2D7AF B81BDD76 2170481C D0069127 D5B05AA9 +93B4EA98 8D8FDDC1 86FFB7DC 90A6C08F 4DF435C9 34028492 +36C3FAB4 D27C7026 C1D4DCB2 602646DE C9751E76 3DBA37BD +F8FF9406 AD9E530E E5DB382F 413001AE B06A53ED 9027D831 +179727B0 865A8918 DA3EDBEB CF9B14ED 44CE6CBA CED4BB1B +## +## Licensed to the Apache Software Foundation (ASF) under one +## or more contributor license agreements. See the NOTICE file +## distributed with this work for additional information +## regarding copyright ownership. The ASF licenses this file +## to you under the Apache License, Version 2.0 (the +## "License"); you may not use this file except in compliance +## with the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, +## software distributed under the License is distributed on an +## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +## KIND, either express or implied. See the License for the +## specific language governing permissions and limitations +## under the License. +## +DB7F1447 E6CC254B 33205151 2BD7AF42 6FB8F401 378CD2BF +5983CA01 C64B92EC F032EA15 D1721D03 F482D7CE 6E74FEF6 +D55E702F 46980C82 B5A84031 900B1C9E 59E7C97F BEC7E8F3 +23A97A7E 36CC88BE 0F1D45B7 FF585AC5 4BD407B2 2B4154AA +CC8F6D7E BF48E1D8 14CC5ED2 0F8037E0 A79715EE F29BE328 +06A1D58B B7C5DA76 F550AA3D 8A1FBFF0 EB19CCB1 A313D55C +DA56C9EC 2EF29632 387FE8D7 6E3C0468 043E8F66 3F4860EE +12BF2D5B 0B7474D6 E694F91E 6DBE1159 74A3926F 12FEE5E4 +38777CB6 A932DF8C D8BEC4D0 73B931BA 3BC832B6 8D9DD300 +741FA7BF 8AFC47ED 2576F693 6BA42466 3AAB639C 5AE4F568 +3423B474 2BF1C978 238F16CB E39D652D E3FDB8BE FC848AD9 +22222E04 A4037C07 13EB57A8 1A23F0C7 3473FC64 6CEA306B +4BCBC886 2F8385DD FA9D4B7F A2C087E8 79683303 ED5BDD3A +062B3CF5 B3A278A6 6D2A13F8 3F44F82D DF310EE0 74AB6A36 +4597E899 A0255DC1 64F31CC5 0846851D F9AB4819 5DED7EA1 +B1D510BD 7EE74D73 FAF36BC3 1ECFA268 359046F4 EB879F92 +4009438B 481C6CD7 889A002E D5EE382B C9190DA6 FC026E47 +9558E447 5677E9AA 9E3050E2 765694DF C81F56E8 80B96E71 +60C980DD 98EDD3DF FFFFFFFF FFFFFFFF http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/b8301774/sshd-core/src/main/filtered-resources/org/apache/sshd/common/kex/group2.prime ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/filtered-resources/org/apache/sshd/common/kex/group2.prime b/sshd-core/src/main/filtered-resources/org/apache/sshd/common/kex/group2.prime new file mode 100644 index 0000000..4afe342 --- /dev/null +++ b/sshd-core/src/main/filtered-resources/org/apache/sshd/common/kex/group2.prime @@ -0,0 +1,24 @@ +## +## Licensed to the Apache Software Foundation (ASF) under one +## or more contributor license agreements. See the NOTICE file +## distributed with this work for additional information +## regarding copyright ownership. The ASF licenses this file +## to you under the Apache License, Version 2.0 (the +## "License"); you may not use this file except in compliance +## with the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, +## software distributed under the License is distributed on an +## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +## KIND, either express or implied. See the License for the +## specific language governing permissions and limitations +## under the License. +## +FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1 +29024E08 8A67CC74 020BBEA6 3B139B22 514A0879 8E3404DD +EF9519B3 CD3A431B 302B0A6D F25F1437 4FE1356D 6D51C245 +E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED +EE386BFB 5A899FA5 AE9F2411 7C4B1FE6 49286651 ECE65381 +FFFFFFFF FFFFFFFF http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/b8301774/sshd-core/src/main/filtered-resources/org/apache/sshd/common/kex/group5.prime ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/filtered-resources/org/apache/sshd/common/kex/group5.prime b/sshd-core/src/main/filtered-resources/org/apache/sshd/common/kex/group5.prime new file mode 100644 index 0000000..87c69e6 --- /dev/null +++ b/sshd-core/src/main/filtered-resources/org/apache/sshd/common/kex/group5.prime @@ -0,0 +1,26 @@ +## +## Licensed to the Apache Software Foundation (ASF) under one +## or more contributor license agreements. See the NOTICE file +## distributed with this work for additional information +## regarding copyright ownership. The ASF licenses this file +## to you under the Apache License, Version 2.0 (the +## "License"); you may not use this file except in compliance +## with the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, +## software distributed under the License is distributed on an +## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +## KIND, either express or implied. See the License for the +## specific language governing permissions and limitations +## under the License. +## +FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1 +29024E08 8A67CC74 020BBEA6 3B139B22 514A0879 8E3404DD +EF9519B3 CD3A431B 302B0A6D F25F1437 4FE1356D 6D51C245 +E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED +EE386BFB 5A899FA5 AE9F2411 7C4B1FE6 49286651 ECE45B3D +C2007CB8 A163BF05 98DA4836 1C55D39A 69163FA8 FD24CF5F +83655D23 DCA3AD96 1C62F356 208552BB 9ED52907 7096966D +670C354E 4ABC9804 F1746C08 CA237327 FFFFFFFF FFFFFFFF http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/b8301774/sshd-core/src/main/java/org/apache/sshd/common/BaseBuilder.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/BaseBuilder.java b/sshd-core/src/main/java/org/apache/sshd/common/BaseBuilder.java index ed9f14d..0def8b4 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/BaseBuilder.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/BaseBuilder.java @@ -98,6 +98,11 @@ public class BaseBuilder<T extends AbstractFactoryManager, S extends BaseBuilder BuiltinDHFactories.dhgex256, BuiltinDHFactories.dhgex, + BuiltinDHFactories.dhg18_512, + BuiltinDHFactories.dhg17_512, + BuiltinDHFactories.dhg16_512, + BuiltinDHFactories.dhg15_512, + BuiltinDHFactories.dhg14_256, BuiltinDHFactories.dhg14, BuiltinDHFactories.dhg1 )); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/b8301774/sshd-core/src/main/java/org/apache/sshd/common/kex/BuiltinDHFactories.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/kex/BuiltinDHFactories.java b/sshd-core/src/main/java/org/apache/sshd/common/kex/BuiltinDHFactories.java index 068bd55..e919e6b 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/kex/BuiltinDHFactories.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/kex/BuiltinDHFactories.java @@ -72,6 +72,76 @@ public enum BuiltinDHFactories implements DHFactory { return SecurityUtils.isDHOakelyGroupSupported(2048) && BuiltinDigests.sha1.isSupported(); } }, + dhg14_256(Constants.DIFFIE_HELLMAN_GROUP14_SHA256) { + @Override + public DHG create(Object... params) throws Exception { + if (!GenericUtils.isEmpty(params)) { + throw new IllegalArgumentException("No accepted parameters for " + getName()); + } + return new DHG(BuiltinDigests.sha256, new BigInteger(DHGroupData.getP14()), new BigInteger(DHGroupData.getG())); + } + + @Override // see https://tools.ietf.org/html/rfc4253#page-23 + public boolean isSupported() { + return SecurityUtils.isDHOakelyGroupSupported(2048) && BuiltinDigests.sha256.isSupported(); + } + }, + dhg15_512(Constants.DIFFIE_HELLMAN_GROUP15_SHA512) { + @Override + public DHG create(Object... params) throws Exception { + if (!GenericUtils.isEmpty(params)) { + throw new IllegalArgumentException("No accepted parameters for " + getName()); + } + return new DHG(BuiltinDigests.sha512, new BigInteger(DHGroupData.getP15()), new BigInteger(DHGroupData.getG())); + } + + @Override // see https://tools.ietf.org/html/rfc4253#page-23 + public boolean isSupported() { + return SecurityUtils.isDHOakelyGroupSupported(3072) && BuiltinDigests.sha512.isSupported(); + } + }, + dhg16_512(Constants.DIFFIE_HELLMAN_GROUP16_SHA512) { + @Override + public DHG create(Object... params) throws Exception { + if (!GenericUtils.isEmpty(params)) { + throw new IllegalArgumentException("No accepted parameters for " + getName()); + } + return new DHG(BuiltinDigests.sha512, new BigInteger(DHGroupData.getP16()), new BigInteger(DHGroupData.getG())); + } + + @Override // see https://tools.ietf.org/html/rfc4253#page-23 + public boolean isSupported() { + return SecurityUtils.isDHOakelyGroupSupported(4096) && BuiltinDigests.sha512.isSupported(); + } + }, + dhg17_512(Constants.DIFFIE_HELLMAN_GROUP17_SHA512) { + @Override + public DHG create(Object... params) throws Exception { + if (!GenericUtils.isEmpty(params)) { + throw new IllegalArgumentException("No accepted parameters for " + getName()); + } + return new DHG(BuiltinDigests.sha512, new BigInteger(DHGroupData.getP17()), new BigInteger(DHGroupData.getG())); + } + + @Override // see https://tools.ietf.org/html/rfc4253#page-23 + public boolean isSupported() { + return SecurityUtils.isDHOakelyGroupSupported(6144) && BuiltinDigests.sha512.isSupported(); + } + }, + dhg18_512(Constants.DIFFIE_HELLMAN_GROUP18_SHA512) { + @Override + public DHG create(Object... params) throws Exception { + if (!GenericUtils.isEmpty(params)) { + throw new IllegalArgumentException("No accepted parameters for " + getName()); + } + return new DHG(BuiltinDigests.sha512, new BigInteger(DHGroupData.getP18()), new BigInteger(DHGroupData.getG())); + } + + @Override // see https://tools.ietf.org/html/rfc4253#page-23 + public boolean isSupported() { + return SecurityUtils.isDHOakelyGroupSupported(8192) && BuiltinDigests.sha512.isSupported(); + } + }, dhgex(Constants.DIFFIE_HELLMAN_GROUP_EXCHANGE_SHA1) { @Override public DHG create(Object... params) throws Exception { @@ -328,6 +398,11 @@ public enum BuiltinDHFactories implements DHFactory { public static final class Constants { public static final String DIFFIE_HELLMAN_GROUP1_SHA1 = "diffie-hellman-group1-sha1"; public static final String DIFFIE_HELLMAN_GROUP14_SHA1 = "diffie-hellman-group14-sha1"; + public static final String DIFFIE_HELLMAN_GROUP14_SHA256 = "diffie-hellman-group14-sha256"; + public static final String DIFFIE_HELLMAN_GROUP15_SHA512 = "diffie-hellman-group15-sha512"; + public static final String DIFFIE_HELLMAN_GROUP16_SHA512 = "diffie-hellman-group16-sha512"; + public static final String DIFFIE_HELLMAN_GROUP17_SHA512 = "diffie-hellman-group17-sha512"; + public static final String DIFFIE_HELLMAN_GROUP18_SHA512 = "diffie-hellman-group18-sha512"; public static final String DIFFIE_HELLMAN_GROUP_EXCHANGE_SHA1 = "diffie-hellman-group-exchange-sha1"; public static final String DIFFIE_HELLMAN_GROUP_EXCHANGE_SHA256 = "diffie-hellman-group-exchange-sha256"; public static final String ECDH_SHA2_NISTP256 = "ecdh-sha2-nistp256"; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/b8301774/sshd-core/src/main/java/org/apache/sshd/common/kex/DHGroupData.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/kex/DHGroupData.java b/sshd-core/src/main/java/org/apache/sshd/common/kex/DHGroupData.java index 09626a7..2b584af 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/kex/DHGroupData.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/kex/DHGroupData.java @@ -18,6 +18,14 @@ */ package org.apache.sshd.common.kex; +import java.io.BufferedReader; +import java.io.IOError; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.concurrent.ConcurrentHashMap; +import java.util.stream.Collectors; + /** * Simple class holding the data for DH group key exchanges. * @@ -25,6 +33,8 @@ package org.apache.sshd.common.kex; */ public final class DHGroupData { + private static final ConcurrentHashMap<String, byte[]> OAKLEY_GROUPS = new ConcurrentHashMap<>(); + private DHGroupData() { throw new UnsupportedOperationException("No instance allowed"); } @@ -95,4 +105,46 @@ public final class DHGroupData { }; } + public static byte[] getP15() { + return readOakleyGroup("group15.prime"); + } + + public static byte[] getP16() { + return readOakleyGroup("group16.prime"); + } + + public static byte[] getP17() { + return readOakleyGroup("group17.prime"); + } + + public static byte[] getP18() { + return readOakleyGroup("group18.prime"); + } + + static byte[] readOakleyGroup(String name) { + return OAKLEY_GROUPS.computeIfAbsent(name, DHGroupData::doReadOakleyGroup); + } + + private static byte[] doReadOakleyGroup(String name) { + try (InputStream is = DHGroupData.class.getResourceAsStream(name)) { + if (is == null) { + throw new IOException("Resource not found: " + name); + } + try (BufferedReader br = new BufferedReader(new InputStreamReader(is))) { + String str = br.lines() + .filter(s -> !s.startsWith("#")) + .map(s -> s.replaceAll("\\s", "")) + .collect(Collectors.joining()); + byte[] group = new byte[str.length() / 2 + 1]; + group[0] = 0; + for (int l = 1; l < group.length; l++) { + group[l] = (byte) Integer.parseInt(str.substring(l * 2 - 2, l * 2), 16); + } + return group; + } + } catch (IOException e) { + throw new IOError(e); + } + } + } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/b8301774/sshd-core/src/test/java/org/apache/sshd/common/kex/BuiltinDHFactoriesTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/kex/BuiltinDHFactoriesTest.java b/sshd-core/src/test/java/org/apache/sshd/common/kex/BuiltinDHFactoriesTest.java index a8a8b66..989968a 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/kex/BuiltinDHFactoriesTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/kex/BuiltinDHFactoriesTest.java @@ -160,4 +160,21 @@ public class BuiltinDHFactoriesTest extends BaseTestSupport { assertNull("Extension not un-registered", BuiltinDHFactories.resolveFactory(name)); } } + + @Test + public void testDHG() throws Exception { + for (DHFactory expected : BuiltinDHFactories.VALUES) { + if (!expected.isGroupExchange()) { + if (expected.isSupported()) { + assertNotNull("Null DH created", expected.create()); + } + } + } + } + + @Test + public void testDHGRead() throws Exception { + assertArrayEquals(DHGroupData.getP1(), DHGroupData.readOakleyGroup("group2.prime")); + assertArrayEquals(DHGroupData.getP14(), DHGroupData.readOakleyGroup("group14.prime")); + } }
