New upstream release (8.2p1)

1 files changed, 5 insertions, 15 deletions

diff --git a/krl.c b/krl.c
index a7f690955..03476dedd 100644
--- a/krl.c
+++ b/krl.c
@@ -14,7 +14,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $OpenBSD: krl.c,v 1.44 2019/09/06 04:53:27 djm Exp $ */
+/* $OpenBSD: krl.c,v 1.47 2020/01/25 23:02:13 djm Exp $ */
 
 #include "includes.h"
 
@@ -813,7 +813,7 @@ ssh_krl_to_blob(struct ssh_krl *krl, struct sshbuf *buf,
                         goto out;
 
                 if ((r = sshkey_sign(sign_keys[i], &sblob, &slen,
-                    sshbuf_ptr(buf), sshbuf_len(buf), NULL, 0)) != 0)
+                    sshbuf_ptr(buf), sshbuf_len(buf), NULL, NULL, 0)) != 0)
                         goto out;
                 KRL_DBG(("%s: signature sig len %zu", __func__, slen));
                 if ((r = sshbuf_put_string(buf, sblob, slen)) != 0)
@@ -1079,7 +1079,7 @@ ssh_krl_from_blob(struct sshbuf *buf, struct ssh_krl **krlp,
                 }
                 /* Check signature over entire KRL up to this point */
                 if ((r = sshkey_verify(key, blob, blen,
-                    sshbuf_ptr(buf), sig_off, NULL, 0)) != 0)
+                    sshbuf_ptr(buf), sig_off, NULL, 0, NULL)) != 0)
                         goto out;
                 /* Check if this key has already signed this KRL */
                 for (i = 0; i < nca_used; i++) {
@@ -1336,19 +1336,11 @@ ssh_krl_file_contains_key(const char *path, const struct sshkey *key)
 {
         struct sshbuf *krlbuf = NULL;
         struct ssh_krl *krl = NULL;
-        int oerrno = 0, r, fd;
+        int oerrno = 0, r;
 
         if (path == NULL)
                 return 0;
-
-        if ((krlbuf = sshbuf_new()) == NULL)
-                return SSH_ERR_ALLOC_FAIL;
-        if ((fd = open(path, O_RDONLY)) == -1) {
-                r = SSH_ERR_SYSTEM_ERROR;
-                oerrno = errno;
-                goto out;
-        }
-        if ((r = sshkey_load_file(fd, krlbuf)) != 0) {
+        if ((r = sshbuf_load_file(path, &krlbuf)) != 0) {
                 oerrno = errno;
                 goto out;
         }
@@ -1357,8 +1349,6 @@ ssh_krl_file_contains_key(const char *path, const struct sshkey *key)
         debug2("%s: checking KRL %s", __func__, path);
         r = ssh_krl_check_key(krl, key);
  out:
-        if (fd != -1)
-                close(fd);
         sshbuf_free(krlbuf);
         ssh_krl_free(krl);
         if (r != 0)