From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 23 May 2015 08:19:46 +0000 (+0200)
Subject: Merge branch 'raphael'
X-Git-Tag: userdir-ldap-0.3.88~31
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=7a692d8d2ba0aec4d991f8a2e2db8f332090f460

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
---

7a692d8d2ba0aec4d991f8a2e2db8f332090f460