[BACK]Return to krl.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/krl.c between version 1.16 and 1.17

version 1.16, 2014/06/24 00:52:02 version 1.17, 2014/06/24 01:13:21
Line 364 
Line 364 
         }          }
         r = key_to_blob(kcopy, blob, blen);          r = key_to_blob(kcopy, blob, blen);
         free(kcopy);          free(kcopy);
         return r == 0 ? -1 : 0;          return r;
 }  }
   
 /* Revoke a key blob. Ownership of blob is transferred to the tree */  /* Revoke a key blob. Ownership of blob is transferred to the tree */
Line 392 
Line 392 
         u_int len;          u_int len;
   
         debug3("%s: revoke type %s", __func__, key_type(key));          debug3("%s: revoke type %s", __func__, key_type(key));
         if (plain_key_blob(key, &blob, &len) != 0)          if (plain_key_blob(key, &blob, &len) < 0)
                 return -1;                  return -1;
         return revoke_blob(&krl->revoked_keys, blob, len);          return revoke_blob(&krl->revoked_keys, blob, len);
 }  }
Line 1128 
Line 1128 
   
         /* Next, explicit keys */          /* Next, explicit keys */
         memset(&rb, 0, sizeof(rb));          memset(&rb, 0, sizeof(rb));
         if (plain_key_blob(key, &rb.blob, &rb.len) != 0)          if (plain_key_blob(key, &rb.blob, &rb.len) < 0)
                 return -1;                  return -1;
         erb = RB_FIND(revoked_blob_tree, &krl->revoked_keys, &rb);          erb = RB_FIND(revoked_blob_tree, &krl->revoked_keys, &rb);
         free(rb.blob);          free(rb.blob);
Legend:
Removed from v.1.16  
changed lines
  Added in v.1.17