Merge branch 'raphael'
authorPeter Palfrader <peter@palfrader.org>
Sat, 23 May 2015 08:19:46 +0000 (10:19 +0200)
committerPeter Palfrader <peter@palfrader.org>
Sat, 23 May 2015 08:19:46 +0000 (10:19 +0200)
commit7a692d8d2ba0aec4d991f8a2e2db8f332090f460
tree92c246c04127143ae975e5b77813ad3b2747f6b2
parent5bce520a48128cd5d150c850ab3e843d9835c2d3
parentf8181b0dfa59390433a8329e61f0cfbc2f720644
Merge branch 'raphael'

* raphael:
  Try to make key acceptance logic clearer
  Bump the minimum key size to 2048
  Authorize ed25519 keys, which have a fixed size of 256 bits
  Recognise ecdsa and ed25519 ssh keys