[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.1 and 1.2

version 1.1, 2014/06/24 01:16:58 version 1.2, 2014/12/21 22:27:55
Line 61 
Line 61 
         KEY_UNSPEC          KEY_UNSPEC
 };  };
   
 /* Fingerprint hash algorithms */  /* Default fingerprint hash */
 enum sshkey_fp_type {  #define SSH_FP_HASH_DEFAULT     SSH_DIGEST_SHA256
         SSH_FP_SHA1,  
         SSH_FP_MD5,  
         SSH_FP_SHA256  
 };  
   
 /* Fingerprint representation formats */  /* Fingerprint representation formats */
 enum sshkey_fp_rep {  enum sshkey_fp_rep {
           SSH_FP_DEFAULT = 0,
         SSH_FP_HEX,          SSH_FP_HEX,
           SSH_FP_BASE64,
         SSH_FP_BUBBLEBABBLE,          SSH_FP_BUBBLEBABBLE,
         SSH_FP_RANDOMART          SSH_FP_RANDOMART
 };  };
Line 118 
Line 116 
     const struct sshkey *);      const struct sshkey *);
 int              sshkey_equal(const struct sshkey *, const struct sshkey *);  int              sshkey_equal(const struct sshkey *, const struct sshkey *);
 char            *sshkey_fingerprint(const struct sshkey *,  char            *sshkey_fingerprint(const struct sshkey *,
     enum sshkey_fp_type, enum sshkey_fp_rep);      int, enum sshkey_fp_rep);
 int              sshkey_fingerprint_raw(const struct sshkey *k,  int              sshkey_fingerprint_raw(const struct sshkey *k,
     enum sshkey_fp_type dgst_type, u_char **retp, size_t *lenp);      int, u_char **retp, size_t *lenp);
 const char      *sshkey_type(const struct sshkey *);  const char      *sshkey_type(const struct sshkey *);
 const char      *sshkey_cert_type(const struct sshkey *);  const char      *sshkey_cert_type(const struct sshkey *);
 int              sshkey_write(const struct sshkey *, FILE *);  int              sshkey_write(const struct sshkey *, FILE *);

Legend:
Removed from v.1.1  
changed lines
  Added in v.1.2