From: djm@openbsd.org <djm@openbsd.org>
Date: Wed, 2 Oct 2019 08:05:50 +0000 (+0000)
Subject: upstream: ban empty namespace strings for s
X-Git-Tag: V_8_1_P1~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc6f81ee94995deb11bbf7e19801022c5f6fd90a;p=thirdparty%2Fopenssh-portable.git

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

diff --git a/ssh-keygen.c b/ssh-keygen.c
index 4ec479de7..7a6afa3c4 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);