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

Diff for /src/usr.bin/ssh/ssh-keygen.c between version 1.407 and 1.408

version 1.407, 2020/04/20 04:43:57 version 1.408, 2020/05/01 04:23:11
Line 653 
Line 653 
                 encoded[len-3] = '\0';                  encoded[len-3] = '\0';
         if ((r = sshbuf_b64tod(buf, encoded)) != 0)          if ((r = sshbuf_b64tod(buf, encoded)) != 0)
                 fatal("%s: base64 decoding failed: %s", __func__, ssh_err(r));                  fatal("%s: base64 decoding failed: %s", __func__, ssh_err(r));
         if (*private)          if (*private) {
                 *k = do_convert_private_ssh2(buf);                  if ((*k = do_convert_private_ssh2(buf)) == NULL)
         else if ((r = sshkey_fromb(buf, k)) != 0)                          fatal("%s: private key conversion failed", __func__);
           } else if ((r = sshkey_fromb(buf, k)) != 0)
                 fatal("decode blob failed: %s", ssh_err(r));                  fatal("decode blob failed: %s", ssh_err(r));
         sshbuf_free(buf);          sshbuf_free(buf);
         fclose(fp);          fclose(fp);
Legend:
Removed from v.1.407  
changed lines
  Added in v.1.408