summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Wininger <fw.centrale@gmail.com>2022-04-20 22:36:31 +0200
committerFlorian Wininger <fw.centrale@gmail.com>2022-04-29 14:42:49 +0200
commitb58014618c09968095655ebbd278e94fd81def73 (patch)
tree4a2f1e95f1ce35ce86dde32e268c2edae2cc06ea
parent8929562bec741086984abea71bd03c490f09ad70 (diff)
downloadnet-ssh-b58014618c09968095655ebbd278e94fd81def73.tar.gz
fix rubocop issues
-rw-r--r--Rakefile4
-rw-r--r--lib/net/ssh/buffer.rb38
-rw-r--r--lib/net/ssh/transport/openssl.rb18
-rw-r--r--test/test_buffer.rb38
-rw-r--r--test/test_known_hosts.rb10
5 files changed, 64 insertions, 44 deletions
diff --git a/Rakefile b/Rakefile
index 5f5925d..18eeca9 100644
--- a/Rakefile
+++ b/Rakefile
@@ -97,9 +97,7 @@ end
# We need to enable the OpenSSL 3.0 legacy providers for our test suite
require 'openssl'
-if OpenSSL::OPENSSL_LIBRARY_VERSION.start_with? "OpenSSL 3" then
- ENV['OPENSSL_CONF'] = 'test/openssl3.conf'
-end
+ENV['OPENSSL_CONF'] = 'test/openssl3.conf' if OpenSSL::OPENSSL_LIBRARY_VERSION.start_with? "OpenSSL 3"
desc "Run tests of Net::SSH:Test"
Rake::TestTask.new do |t|
diff --git a/lib/net/ssh/buffer.rb b/lib/net/ssh/buffer.rb
index 42cc892..58127b3 100644
--- a/lib/net/ssh/buffer.rb
+++ b/lib/net/ssh/buffer.rb
@@ -306,27 +306,35 @@ module Net
g = read_bignum
pub_key = read_bignum
- asn1 = OpenSSL::ASN1::Sequence.new([
- OpenSSL::ASN1::Sequence.new([
- OpenSSL::ASN1::ObjectId.new('DSA'),
- OpenSSL::ASN1::Sequence.new([
- OpenSSL::ASN1::Integer.new(p),
- OpenSSL::ASN1::Integer.new(q),
- OpenSSL::ASN1::Integer.new(g)
- ]),
- ]),
- OpenSSL::ASN1::BitString.new(OpenSSL::ASN1::Integer.new(pub_key).to_der)
- ])
+ asn1 = OpenSSL::ASN1::Sequence.new(
+ [
+ OpenSSL::ASN1::Sequence.new(
+ [
+ OpenSSL::ASN1::ObjectId.new('DSA'),
+ OpenSSL::ASN1::Sequence.new(
+ [
+ OpenSSL::ASN1::Integer.new(p),
+ OpenSSL::ASN1::Integer.new(q),
+ OpenSSL::ASN1::Integer.new(g)
+ ]
+ )
+ ]
+ ),
+ OpenSSL::ASN1::BitString.new(OpenSSL::ASN1::Integer.new(pub_key).to_der)
+ ]
+ )
key = OpenSSL::PKey::DSA.new(asn1.to_der)
when /^ssh-rsa$/
e = read_bignum
n = read_bignum
- asn1 = OpenSSL::ASN1::Sequence([
- OpenSSL::ASN1::Integer(n),
- OpenSSL::ASN1::Integer(e)
- ])
+ asn1 = OpenSSL::ASN1::Sequence(
+ [
+ OpenSSL::ASN1::Integer(n),
+ OpenSSL::ASN1::Integer(e)
+ ]
+ )
key = OpenSSL::PKey::RSA.new(asn1.to_der)
when /^ssh-ed25519$/
diff --git a/lib/net/ssh/transport/openssl.rb b/lib/net/ssh/transport/openssl.rb
index 40561fb..3a43abb 100644
--- a/lib/net/ssh/transport/openssl.rb
+++ b/lib/net/ssh/transport/openssl.rb
@@ -162,13 +162,17 @@ module OpenSSL
curvename = OpenSSL::PKey::EC::CurveNameAlias[curve_name_in_key]
group = OpenSSL::PKey::EC::Group.new(curvename)
point = OpenSSL::PKey::EC::Point.new(group, OpenSSL::BN.new(public_key_oct, 2))
- asn1 = OpenSSL::ASN1::Sequence([
- OpenSSL::ASN1::Sequence([
- OpenSSL::ASN1::ObjectId("id-ecPublicKey"),
- OpenSSL::ASN1::ObjectId(curvename)
- ]),
- OpenSSL::ASN1::BitString(point.to_octet_string(:uncompressed))
- ])
+ asn1 = OpenSSL::ASN1::Sequence(
+ [
+ OpenSSL::ASN1::Sequence(
+ [
+ OpenSSL::ASN1::ObjectId("id-ecPublicKey"),
+ OpenSSL::ASN1::ObjectId(curvename)
+ ]
+ ),
+ OpenSSL::ASN1::BitString(point.to_octet_string(:uncompressed))
+ ]
+ )
key = OpenSSL::PKey::EC.new(asn1.to_der)
diff --git a/test/test_buffer.rb b/test/test_buffer.rb
index 99fdb95..5aed7c1 100644
--- a/test/test_buffer.rb
+++ b/test/test_buffer.rb
@@ -324,17 +324,23 @@ class TestBuffer < NetSSHTest
g = 0xffddbb9977553311
pub_key = 0xeeccaa8866442200
- asn1 = OpenSSL::ASN1::Sequence.new([
- OpenSSL::ASN1::Sequence.new([
- OpenSSL::ASN1::ObjectId.new('DSA'),
- OpenSSL::ASN1::Sequence.new([
- OpenSSL::ASN1::Integer.new(p),
- OpenSSL::ASN1::Integer.new(q),
- OpenSSL::ASN1::Integer.new(g)
- ]),
- ]),
- OpenSSL::ASN1::BitString.new(OpenSSL::ASN1::Integer.new(pub_key).to_der)
- ])
+ asn1 = OpenSSL::ASN1::Sequence.new(
+ [
+ OpenSSL::ASN1::Sequence.new(
+ [
+ OpenSSL::ASN1::ObjectId.new('DSA'),
+ OpenSSL::ASN1::Sequence.new(
+ [
+ OpenSSL::ASN1::Integer.new(p),
+ OpenSSL::ASN1::Integer.new(q),
+ OpenSSL::ASN1::Integer.new(g)
+ ]
+ )
+ ]
+ ),
+ OpenSSL::ASN1::BitString.new(OpenSSL::ASN1::Integer.new(pub_key).to_der)
+ ]
+ )
key = OpenSSL::PKey::DSA.new(asn1.to_der)
@@ -348,10 +354,12 @@ class TestBuffer < NetSSHTest
n = 0x7766554433221100
e = 0xffeeddccbbaa9988
- asn1 = OpenSSL::ASN1::Sequence([
- OpenSSL::ASN1::Integer(n),
- OpenSSL::ASN1::Integer(e)
- ])
+ asn1 = OpenSSL::ASN1::Sequence(
+ [
+ OpenSSL::ASN1::Integer(n),
+ OpenSSL::ASN1::Integer(e)
+ ]
+ )
key = OpenSSL::PKey::RSA.new(asn1.to_der)
diff --git a/test/test_known_hosts.rb b/test/test_known_hosts.rb
index e47e75b..dad92dd 100644
--- a/test/test_known_hosts.rb
+++ b/test/test_known_hosts.rb
@@ -168,10 +168,12 @@ class TestKnownHosts < NetSSHTest
def rsa_key
n = 0x7766554433221100
e = 0xffeeddccbbaa9988
- asn1 = OpenSSL::ASN1::Sequence([
- OpenSSL::ASN1::Integer(n),
- OpenSSL::ASN1::Integer(e)
- ])
+ asn1 = OpenSSL::ASN1::Sequence(
+ [
+ OpenSSL::ASN1::Integer(n),
+ OpenSSL::ASN1::Integer(e)
+ ]
+ )
OpenSSL::PKey::RSA.new(asn1.to_der)
end
end