upstream: exit if ssh_krl_revoke_key_sha256 fails; ok djm

OpenBSD-Commit-ID: 0864ad4fe8bf28ab21fd1df766e0365c11bbc0dc

diff --git a/ssh-keygen.c b/ssh-keygen.c
index b652bbbfc4f25accf7f8a4ebc826f7cf3aa58902..3c6c9a18c40165d1f9a4f507ec491030174f3789 100644 (file)
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.400 2020/02/28 01:07:28 djm Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.401 2020/03/06 18:15:04 markus Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2322,6 +2322,9 @@ update_krl_from_file(struct passwd *pw, const char *file, int wild_ca,
                        cp = cp + strspn(cp, " \t");
                        hash_to_blob(cp, &blob, &blen, file, lnum);
                        r = ssh_krl_revoke_key_sha256(krl, blob, blen);
+                       if (r != 0)
+                               fatal("%s: revoke key failed: %s",
+                                   __func__, ssh_err(r));
                } else {
                        if (strncasecmp(cp, "key:", 4) == 0) {
                                cp += 4;