diff options
author | djm@openbsd.org <djm@openbsd.org> | 2022-09-17 10:34:29 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2022-09-17 20:39:02 +1000 |
commit | 1875042c52a3b950ae5963c9ca3774a4cc7f0380 (patch) | |
tree | 565cb2e51ec10a389be85eab619cd379d83545ea /sshd.c | |
parent | 54b333d12e55e6560b328c737d514ff3511f1afd (diff) | |
download | openssh-git-1875042c52a3b950ae5963c9ca3774a4cc7f0380.tar.gz |
upstream: Add RequiredRSASize for sshd(8); RSA keys that fall
beneath this limit will be ignored for user and host-based authentication.
Feedback deraadt@ ok markus@
OpenBSD-Commit-ID: 187931dfc19d51873df5930a04f2d972adf1f7f1
Diffstat (limited to 'sshd.c')
-rw-r--r-- | sshd.c | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: sshd.c,v 1.590 2022/07/01 05:08:23 dtucker Exp $ */ +/* $OpenBSD: sshd.c,v 1.591 2022/09/17 10:34:29 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1870,6 +1870,13 @@ main(int ac, char **av) fatal_r(r, "Could not demote key: \"%s\"", options.host_key_files[i]); } + if (pubkey != NULL && (r = sshkey_check_rsa_length(pubkey, + options.required_rsa_size)) != 0) { + error_fr(r, "Host key %s", options.host_key_files[i]); + sshkey_free(pubkey); + sshkey_free(key); + continue; + } sensitive_data.host_keys[i] = key; sensitive_data.host_pubkeys[i] = pubkey; |