1 files changed, 9 insertions, 14 deletions

diff --git a/krl.c b/krl.c
index 4075df853..fff1a3f7c 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.33 2015/07/03 03:43:18 djm Exp $ */
+/* $OpenBSD: krl.c,v 1.37 2015/12/31 00:33:52 djm Exp $ */
 
 #include "includes.h"
 
@@ -723,7 +723,7 @@ ssh_krl_to_blob(struct ssh_krl *krl, struct sshbuf *buf,
         if ((r = sshbuf_put(buf, KRL_MAGIC, sizeof(KRL_MAGIC) - 1)) != 0 ||
             (r = sshbuf_put_u32(buf, KRL_FORMAT_VERSION)) != 0 ||
             (r = sshbuf_put_u64(buf, krl->krl_version)) != 0 ||
-            (r = sshbuf_put_u64(buf, krl->generated_date) != 0) ||
+            (r = sshbuf_put_u64(buf, krl->generated_date)) != 0 ||
             (r = sshbuf_put_u64(buf, krl->flags)) != 0 ||
             (r = sshbuf_put_string(buf, NULL, 0)) != 0 ||
             (r = sshbuf_put_cstring(buf, krl->comment)) != 0)
@@ -772,7 +772,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), 0)) != 0)
+                    sshbuf_ptr(buf), sshbuf_len(buf), NULL, 0)) != 0)
                         goto out;
                 KRL_DBG(("%s: signature sig len %zu", __func__, slen));
                 if ((r = sshbuf_put_string(buf, sblob, slen)) != 0)
@@ -826,10 +826,8 @@ parse_revoked_certs(struct sshbuf *buf, struct ssh_krl *krl)
                 goto out;
 
         while (sshbuf_len(buf) > 0) {
-                if (subsect != NULL) {
-                        sshbuf_free(subsect);
-                        subsect = NULL;
-                }
+                sshbuf_free(subsect);
+                subsect = NULL;
                 if ((r = sshbuf_get_u8(buf, &type)) != 0 ||
                     (r = sshbuf_froms(buf, &subsect)) != 0)
                         goto out;
@@ -1017,7 +1015,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), sshbuf_len(buf) - sig_off, 0)) != 0)
+                    sshbuf_ptr(buf), sig_off, 0)) != 0)
                         goto out;
                 /* Check if this key has already signed this KRL */
                 for (i = 0; i < nca_used; i++) {
@@ -1038,7 +1036,6 @@ ssh_krl_from_blob(struct sshbuf *buf, struct ssh_krl **krlp,
                 ca_used = tmp_ca_used;
                 ca_used[nca_used++] = key;
                 key = NULL;
-                break;
         }
 
         if (sshbuf_len(copy) != 0) {
@@ -1059,10 +1056,8 @@ ssh_krl_from_blob(struct sshbuf *buf, struct ssh_krl **krlp,
         if ((r = sshbuf_consume(copy, sects_off)) != 0)
                 goto out;
         while (sshbuf_len(copy) > 0) {
-                if (sect != NULL) {
-                        sshbuf_free(sect);
-                        sect = NULL;
-                }
+                sshbuf_free(sect);
+                sect = NULL;
                 if ((r = sshbuf_get_u8(copy, &type)) != 0 ||
                     (r = sshbuf_froms(copy, &sect)) != 0)
                         goto out;
@@ -1105,7 +1100,7 @@ ssh_krl_from_blob(struct sshbuf *buf, struct ssh_krl **krlp,
                         r = SSH_ERR_INVALID_FORMAT;
                         goto out;
                 }
-                if (sshbuf_len(sect) > 0) {
+                if (sect != NULL && sshbuf_len(sect) > 0) {
                         error("KRL section contains unparsed data");
                         r = SSH_ERR_INVALID_FORMAT;
                         goto out;