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

Diff for /src/usr.bin/ssh/sshkey.h between version 1.32 and 1.33

version 1.32, 2019/06/21 04:21:05 version 1.33, 2019/07/15 13:16:29
Line 82 
Line 82 
         SSHKEY_SERIALIZE_INFO = 254,          SSHKEY_SERIALIZE_INFO = 254,
 };  };
   
   /* Private key disk formats */
   enum sshkey_private_format {
           SSHKEY_PRIVATE_OPENSSH = 0,
           SSHKEY_PRIVATE_PEM = 1,
           SSHKEY_PRIVATE_PKCS8 = 2,
   };
   
 /* key is stored in external hardware */  /* key is stored in external hardware */
 #define SSHKEY_FLAG_EXT         0x0001  #define SSHKEY_FLAG_EXT         0x0001
   
Line 215 
Line 222 
 /* private key file format parsing and serialisation */  /* private key file format parsing and serialisation */
 int     sshkey_private_to_fileblob(struct sshkey *key, struct sshbuf *blob,  int     sshkey_private_to_fileblob(struct sshkey *key, struct sshbuf *blob,
     const char *passphrase, const char *comment,      const char *passphrase, const char *comment,
     int force_new_format, const char *new_format_cipher, int new_format_rounds);      int format, const char *openssh_format_cipher, int openssh_format_rounds);
 int     sshkey_parse_private_fileblob(struct sshbuf *buffer,  int     sshkey_parse_private_fileblob(struct sshbuf *buffer,
     const char *passphrase, struct sshkey **keyp, char **commentp);      const char *passphrase, struct sshkey **keyp, char **commentp);
 int     sshkey_parse_private_fileblob_type(struct sshbuf *blob, int type,  int     sshkey_parse_private_fileblob_type(struct sshbuf *blob, int type,
Legend:
Removed from v.1.32  
changed lines
  Added in v.1.33