diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2023-07-17 05:20:16 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2023-07-17 05:20:16 +0000 |
| commit | d18e5886aa86efb9f6c5de349270d30a87e6ef0e (patch) | |
| tree | f08eacac8f007a7bc6a30b8d29b36c1409f5580d | |
| parent | a9d2293d702d655948c70800366fb3aa15dcca65 (diff) | |
return SSH_ERR_KRL_BAD_MAGIC when a KRL doesn't contain a valid
magic number and not SSH_ERR_MESSAGE_INCOMPLETE; the former is
needed to fall back to text revocation lists in some cases;
fixes t-cert-hostkey.
| -rw-r--r-- | usr.bin/ssh/krl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/krl.c b/usr.bin/ssh/krl.c index 9e02cf63eeb..030be70c7d5 100644 --- a/usr.bin/ssh/krl.c +++ b/usr.bin/ssh/krl.c @@ -14,7 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $OpenBSD: krl.c,v 1.57 2023/07/17 04:01:10 djm Exp $ */ +/* $OpenBSD: krl.c,v 1.58 2023/07/17 05:20:15 djm Exp $ */ #include <sys/types.h> #include <sys/tree.h> @@ -1054,7 +1054,7 @@ ssh_krl_from_blob(struct sshbuf *buf, struct ssh_krl **krlp) /* KRL must begin with magic string */ if ((r = sshbuf_cmp(buf, 0, KRL_MAGIC, sizeof(KRL_MAGIC) - 1)) != 0) { debug2_f("bad KRL magic header"); - return r; + return SSH_ERR_KRL_BAD_MAGIC; } if ((krl = ssh_krl_init()) == NULL) { |