diff options
Diffstat (limited to 'krl.c')
-rw-r--r-- | krl.c | 8 |
1 files changed, 4 insertions, 4 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.16 2014/06/24 00:52:02 djm Exp $ */ | 17 | /* $OpenBSD: krl.c,v 1.17 2014/06/24 01:13:21 djm Exp $ */ |
18 | 18 | ||
19 | #include "includes.h" | 19 | #include "includes.h" |
20 | 20 | ||
@@ -366,7 +366,7 @@ plain_key_blob(const Key *key, u_char **blob, u_int *blen) | |||
366 | } | 366 | } |
367 | r = key_to_blob(kcopy, blob, blen); | 367 | r = key_to_blob(kcopy, blob, blen); |
368 | free(kcopy); | 368 | free(kcopy); |
369 | return r == 0 ? -1 : 0; | 369 | return r; |
370 | } | 370 | } |
371 | 371 | ||
372 | /* Revoke a key blob. Ownership of blob is transferred to the tree */ | 372 | /* Revoke a key blob. Ownership of blob is transferred to the tree */ |
@@ -394,7 +394,7 @@ ssh_krl_revoke_key_explicit(struct ssh_krl *krl, const Key *key) | |||
394 | u_int len; | 394 | u_int len; |
395 | 395 | ||
396 | debug3("%s: revoke type %s", __func__, key_type(key)); | 396 | debug3("%s: revoke type %s", __func__, key_type(key)); |
397 | if (plain_key_blob(key, &blob, &len) != 0) | 397 | if (plain_key_blob(key, &blob, &len) < 0) |
398 | return -1; | 398 | return -1; |
399 | return revoke_blob(&krl->revoked_keys, blob, len); | 399 | return revoke_blob(&krl->revoked_keys, blob, len); |
400 | } | 400 | } |
@@ -1130,7 +1130,7 @@ is_key_revoked(struct ssh_krl *krl, const Key *key) | |||
1130 | 1130 | ||
1131 | /* Next, explicit keys */ | 1131 | /* Next, explicit keys */ |
1132 | memset(&rb, 0, sizeof(rb)); | 1132 | memset(&rb, 0, sizeof(rb)); |
1133 | if (plain_key_blob(key, &rb.blob, &rb.len) != 0) | 1133 | if (plain_key_blob(key, &rb.blob, &rb.len) < 0) |
1134 | return -1; | 1134 | return -1; |
1135 | erb = RB_FIND(revoked_blob_tree, &krl->revoked_keys, &rb); | 1135 | erb = RB_FIND(revoked_blob_tree, &krl->revoked_keys, &rb); |
1136 | free(rb.blob); | 1136 | free(rb.blob); |