diff options
author | markus@openbsd.org <markus@openbsd.org> | 2020-03-06 18:15:04 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2020-03-13 13:13:30 +1100 |
commit | ff2acca039aef16a15fce409163df404858f7aa5 (patch) | |
tree | 144e993f37c97249efd61d3ffa10400df1a1f5e9 /ssh-keygen.c | |
parent | 31c860a0212af2d5b6a129e3e8fcead51392ee1d (diff) |
upstream: exit if ssh_krl_revoke_key_sha256 fails; ok djm
OpenBSD-Commit-ID: 0864ad4fe8bf28ab21fd1df766e0365c11bbc0dc
Diffstat (limited to 'ssh-keygen.c')
-rw-r--r-- | ssh-keygen.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c index b652bbbfc..3c6c9a18c 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-keygen.c,v 1.400 2020/02/28 01:07:28 djm Exp $ */ | 1 | /* $OpenBSD: ssh-keygen.c,v 1.401 2020/03/06 18:15:04 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * 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, | |||
2322 | cp = cp + strspn(cp, " \t"); | 2322 | cp = cp + strspn(cp, " \t"); |
2323 | hash_to_blob(cp, &blob, &blen, file, lnum); | 2323 | hash_to_blob(cp, &blob, &blen, file, lnum); |
2324 | r = ssh_krl_revoke_key_sha256(krl, blob, blen); | 2324 | r = ssh_krl_revoke_key_sha256(krl, blob, blen); |
2325 | if (r != 0) | ||
2326 | fatal("%s: revoke key failed: %s", | ||
2327 | __func__, ssh_err(r)); | ||
2325 | } else { | 2328 | } else { |
2326 | if (strncasecmp(cp, "key:", 4) == 0) { | 2329 | if (strncasecmp(cp, "key:", 4) == 0) { |
2327 | cp += 4; | 2330 | cp += 4; |