diff options
| author | Bob Van Zant <bvanzant@brkt.com> | 2014-01-21 09:56:09 -0800 |
|---|---|---|
| committer | Bob Van Zant <bvanzant@brkt.com> | 2014-01-21 09:56:09 -0800 |
| commit | 0c272c3c3027f3ed7661dcdf427d9056c29bac5f (patch) | |
| tree | fde7b3684e8d74803acead496dc9f6121cb3ac58 /lib/net/ssh/buffer.rb | |
| parent | bd61eeab4927e9a68a5217ad9d8c04a99156efb2 (diff) | |
| download | net-ssh-0c272c3c3027f3ed7661dcdf427d9056c29bac5f.tar.gz | |
Handle ssh-rsa and ssh-dss certificate filesbobveznat-master
This does not implement certificate based authentication (described here
http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/ssh/PROTOCOL.certkeys?rev=HEAD)
but instead makes it so that if the certificate is not needed for
authentication net-ssh doesn't cause the entire application to die.
The net-ssh test suite continues to pass. On my own machine I did tests
with certificates loaded and verified that although authentication could
not proceed to a host requiring a certificate it at least did not die.
I also verified that I can continue to use normal rsa and dsa keys to
ssh to hosts that do not require certificates even when the certificates
are loaded into my ssh-agent instance.
This is a potential solution to issue #124 and an alternative to the one
presented in pull request #134.
Diffstat (limited to 'lib/net/ssh/buffer.rb')
| -rw-r--r-- | lib/net/ssh/buffer.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/net/ssh/buffer.rb b/lib/net/ssh/buffer.rb index d3fb788..c17da78 100644 --- a/lib/net/ssh/buffer.rb +++ b/lib/net/ssh/buffer.rb @@ -243,14 +243,14 @@ module Net; module SSH # a key. Only RSA, DSA, and ECDSA keys are supported. def read_keyblob(type) case type - when "ssh-dss" + when /^ssh-dss(-cert-v01@openssh\.com)?$/ key = OpenSSL::PKey::DSA.new key.p = read_bignum key.q = read_bignum key.g = read_bignum key.pub_key = read_bignum - when "ssh-rsa" + when /^ssh-rsa(-cert-v01@openssh\.com)?$/ key = OpenSSL::PKey::RSA.new key.e = read_bignum key.n = read_bignum |