summaryrefslogtreecommitdiff
path: root/usr.bin/ssh
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2018-02-10 05:48:47 +0000
committerDamien Miller <djm@cvs.openbsd.org>2018-02-10 05:48:47 +0000
commit248494399c176361309dd6387ca61e2d5b0c1307 (patch)
treeca9b5aa33a4a454f2a60895c1efc639d065533e8 /usr.bin/ssh
parentcca86384af8edc138ff9f84ab391729d57228f90 (diff)
Refuse to create a certificate with an unusable number of principals;
Prompted by gdestuynder via github
Diffstat (limited to 'usr.bin/ssh')
-rw-r--r--usr.bin/ssh/ssh-keygen.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.bin/ssh/ssh-keygen.c b/usr.bin/ssh/ssh-keygen.c
index 715025b3fb0..4e45d7d70aa 100644
--- a/usr.bin/ssh/ssh-keygen.c
+++ b/usr.bin/ssh/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.311 2018/02/10 05:43:26 djm Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.312 2018/02/10 05:48:46 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1681,6 +1681,8 @@ do_ca_sign(struct passwd *pw, int argc, char **argv)
}
free(otmp);
}
+ if (n > SSHKEY_CERT_MAX_PRINCIPALS)
+ fatal("Too many certificate principals specified");
tmp = tilde_expand_filename(argv[i], pw->pw_uid);
if ((r = sshkey_load_public(tmp, &public, &comment)) != 0)