projects
/
mirror
/
userdir-ldap.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5bce520
f8181b0
)
Merge branch 'raphael'
author
Peter Palfrader
<peter@palfrader.org>
Sat, 23 May 2015 08:19:46 +0000
(10:19 +0200)
committer
Peter Palfrader
<peter@palfrader.org>
Sat, 23 May 2015 08:19:46 +0000
(10:19 +0200)
* 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
Trivial merge