diff options
author | dtucker@openbsd.org <dtucker@openbsd.org> | 2017-03-10 07:18:32 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-03-12 10:50:18 +1100 |
commit | ef653dd5bd5777132d9f9ee356225f9ee3379504 (patch) | |
tree | 1da4f4804cdb7ba1e7702ebf0895ec704311f222 /krl.c | |
parent | d94c1dfef2ea30ca67b1204ada7c3b537c54f4d0 (diff) |
upstream commit
krl.c
Upstream-ID: fc5e695d5d107d730182e2da7b23f00b489e0ee1
Diffstat (limited to 'krl.c')
-rw-r--r-- | krl.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -14,7 +14,7 @@ | |||
14 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 14 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
15 | */ | 15 | */ |
16 | 16 | ||
17 | /* $OpenBSD: krl.c,v 1.38 2016/09/12 01:22:38 deraadt Exp $ */ | 17 | /* $OpenBSD: krl.c,v 1.39 2017/03/10 07:18:32 dtucker Exp $ */ |
18 | 18 | ||
19 | #include "includes.h" | 19 | #include "includes.h" |
20 | 20 | ||
@@ -1089,7 +1089,7 @@ ssh_krl_from_blob(struct sshbuf *buf, struct ssh_krl **krlp, | |||
1089 | break; | 1089 | break; |
1090 | case KRL_SECTION_SIGNATURE: | 1090 | case KRL_SECTION_SIGNATURE: |
1091 | /* Handled above, but still need to stay in synch */ | 1091 | /* Handled above, but still need to stay in synch */ |
1092 | sshbuf_reset(sect); | 1092 | sshbuf_free(sect); |
1093 | sect = NULL; | 1093 | sect = NULL; |
1094 | if ((r = sshbuf_skip_string(copy)) != 0) | 1094 | if ((r = sshbuf_skip_string(copy)) != 0) |
1095 | goto out; | 1095 | goto out; |
@@ -1288,7 +1288,8 @@ ssh_krl_file_contains_key(const char *path, const struct sshkey *key) | |||
1288 | debug2("%s: checking KRL %s", __func__, path); | 1288 | debug2("%s: checking KRL %s", __func__, path); |
1289 | r = ssh_krl_check_key(krl, key); | 1289 | r = ssh_krl_check_key(krl, key); |
1290 | out: | 1290 | out: |
1291 | close(fd); | 1291 | if (fd != -1) |
1292 | close(fd); | ||
1292 | sshbuf_free(krlbuf); | 1293 | sshbuf_free(krlbuf); |
1293 | ssh_krl_free(krl); | 1294 | ssh_krl_free(krl); |
1294 | if (r != 0) | 1295 | if (r != 0) |