summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2019-10-02 08:05:50 +0000
committerDamien Miller <djm@mindrot.org>2019-10-02 18:08:17 +1000
commitdc6f81ee94995deb11bbf7e19801022c5f6fd90a (patch)
tree9994ca6ee4d3e6f64de00d8c53ad9a01d2d60737
parentfa5bd8107e0e2b3e1e184f55d0f9320c119f65f0 (diff)
upstream: ban empty namespace strings for s
=?UTF-8?q?shsig;=20spotted=20by=20Mantas=20Mikul=C4=97nas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OpenBSD-Commit-ID: 7c5bcf40bed8f4e826230176f4aa353c52aeb698
-rw-r--r--ssh-keygen.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 4ec479de..7a6afa3c 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.352 2019/09/29 16:31:57 jmc Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.353 2019/10/02 08:05:50 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -3030,7 +3030,7 @@ main(int argc, char **argv)
argc -= optind;
if (sign_op != NULL) {
- if (cert_principals == NULL) {
+ if (cert_principals == NULL && *cert_principals == '\0') {
error("Too few arguments for sign/verify: "
"missing namespace");
exit(1);