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

Diff for /src/usr.bin/ssh/sshkey.c between version 1.111 and 1.112

version 1.111, 2020/08/27 01:06:19 version 1.112, 2020/10/19 22:49:23
Line 4627 
Line 4627 
  */   */
 int  int
 sshkey_private_serialize_maxsign(struct sshkey *k, struct sshbuf *b,  sshkey_private_serialize_maxsign(struct sshkey *k, struct sshbuf *b,
     u_int32_t maxsign, sshkey_printfn *pr)      u_int32_t maxsign, int printerror)
 {  {
         int r, rupdate;          int r, rupdate;
   
Line 4635 
Line 4635 
             sshkey_type_plain(k->type) != KEY_XMSS)              sshkey_type_plain(k->type) != KEY_XMSS)
                 return sshkey_private_serialize_opt(k, b,                  return sshkey_private_serialize_opt(k, b,
                     SSHKEY_SERIALIZE_DEFAULT);                      SSHKEY_SERIALIZE_DEFAULT);
         if ((r = sshkey_xmss_get_state(k, pr)) != 0 ||          if ((r = sshkey_xmss_get_state(k, printerror)) != 0 ||
             (r = sshkey_private_serialize_opt(k, b,              (r = sshkey_private_serialize_opt(k, b,
             SSHKEY_SERIALIZE_STATE)) != 0 ||              SSHKEY_SERIALIZE_STATE)) != 0 ||
             (r = sshkey_xmss_forward_state(k, maxsign)) != 0)              (r = sshkey_xmss_forward_state(k, maxsign)) != 0)
                 goto out;                  goto out;
         r = 0;          r = 0;
 out:  out:
         if ((rupdate = sshkey_xmss_update_state(k, pr)) != 0) {          if ((rupdate = sshkey_xmss_update_state(k, printerror)) != 0) {
                 if (r == 0)                  if (r == 0)
                         r = rupdate;                          r = rupdate;
         }          }
Line 4681 
Line 4681 
 #else  #else
 int  int
 sshkey_private_serialize_maxsign(struct sshkey *k, struct sshbuf *b,  sshkey_private_serialize_maxsign(struct sshkey *k, struct sshbuf *b,
     u_int32_t maxsign, sshkey_printfn *pr)      u_int32_t maxsign, int printerror)
 {  {
         return sshkey_private_serialize_opt(k, b, SSHKEY_SERIALIZE_DEFAULT);          return sshkey_private_serialize_opt(k, b, SSHKEY_SERIALIZE_DEFAULT);
 }  }
Legend:
Removed from v.1.111  
changed lines
  Added in v.1.112