Merge pull request #32 from github/update-ruby-tests

Support Ruby 3.1 and fix Q size to 160 bits

Author: vcsjones

.github/workflows/ruby.yml

@@ -8,12 +8,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [ '2.6', '2.7', '3.0' ]
+        ruby: [ '2.6', '2.7', '3.0', '3.1' ]
 
     steps:
     - uses: actions/checkout@master
     - name: Set up Ruby ${{ matrix.ruby }}
-      uses: ruby/setup-ruby@fdcfbcf14ec9672f6f615cb9589a1bc5dd69d262
+      uses: ruby/setup-ruby@f0971f0dd45a5cbb3f119f7db77cc58057c53530
       with:
         ruby-version: ${{ matrix.ruby }}
     - name: Build and test

lib/ssh_data/private_key/dsa.rb

@@ -7,7 +7,19 @@ class DSA < Base
       #
       # Returns a PublicKey::Base subclass instance.
       def self.generate
-        from_openssl(OpenSSL::PKey::DSA.generate(1024))
+        openssl_key =
+          if defined?(OpenSSL::PKey.generate_parameters)
+            dsa_parameters = OpenSSL::PKey.generate_parameters("DSA", {
+              dsa_paramgen_bits: 1024,
+              dsa_paramgen_q_bits: 160
+            })
+
+            OpenSSL::PKey.generate_key(dsa_parameters)
+          else
+            OpenSSL::PKey::DSA.generate(1024)
+          end
+
+        from_openssl(openssl_key)
       end
 
       # Import an openssl private key.

spec/private_key/dsa_spec.rb

@@ -1,7 +1,7 @@
 require_relative "../spec_helper"
 
 describe SSHData::PrivateKey::DSA do
-  let(:private_key) { OpenSSL::PKey::DSA.generate(1024) }
+  let(:private_key) { SSHData::PrivateKey::DSA.generate.openssl }
   let(:public_key)  { private_key.public_key }
   let(:params)      { private_key.params }
   let(:message)     { "hello, world!" }
@@ -17,6 +17,12 @@
     }.not_to raise_error
   end
 
+  it "generates default parameters" do
+    key = described_class.generate
+    expect(key.q.num_bits).to eq(160)
+    expect(key.p.num_bits).to eq(1024)
+  end
+
   it "can sign messages" do
     expect(subject.public_key.verify(message, subject.sign(message))).to eq(true)
   end

spec/public_key/dsa_spec.rb

@@ -1,7 +1,7 @@
 require_relative "../spec_helper"
 
 describe SSHData::PublicKey::DSA do
-  let(:private_key) { OpenSSL::PKey::DSA.generate(1024) }
+  let(:private_key) { SSHData::PrivateKey::DSA.generate.openssl }
   let(:public_key)  { private_key.public_key }
   let(:params)      { public_key.params }