[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.31 and 1.32

version 1.31, 2019/01/20 22:51:37 version 1.32, 2019/06/21 04:21:05
Line 117 
Line 117 
         u_char  *xmss_sk;          u_char  *xmss_sk;
         u_char  *xmss_pk;          u_char  *xmss_pk;
         struct sshkey_cert *cert;          struct sshkey_cert *cert;
           u_char  *shielded_private;
           size_t  shielded_len;
           u_char  *shield_prekey;
           size_t  shield_prekey_len;
 };  };
   
 #define ED25519_SK_SZ   crypto_sign_ed25519_SECRETKEYBYTES  #define ED25519_SK_SZ   crypto_sign_ed25519_SECRETKEYBYTES
Line 140 
Line 144 
   
 int              sshkey_generate(int type, u_int bits, struct sshkey **keyp);  int              sshkey_generate(int type, u_int bits, struct sshkey **keyp);
 int              sshkey_from_private(const struct sshkey *, struct sshkey **);  int              sshkey_from_private(const struct sshkey *, struct sshkey **);
   
   int              sshkey_is_shielded(struct sshkey *);
   int              sshkey_shield_private(struct sshkey *);
   int              sshkey_unshield_private(struct sshkey *);
   
 int      sshkey_type_from_name(const char *);  int      sshkey_type_from_name(const char *);
 int      sshkey_is_cert(const struct sshkey *);  int      sshkey_is_cert(const struct sshkey *);
 int      sshkey_type_is_cert(int);  int      sshkey_type_is_cert(int);
Line 155 
Line 164 
   
 int      sshkey_certify(struct sshkey *, struct sshkey *, const char *);  int      sshkey_certify(struct sshkey *, struct sshkey *, const char *);
 /* Variant allowing use of a custom signature function (e.g. for ssh-agent) */  /* Variant allowing use of a custom signature function (e.g. for ssh-agent) */
 typedef int sshkey_certify_signer(const struct sshkey *, u_char **, size_t *,  typedef int sshkey_certify_signer(struct sshkey *, u_char **, size_t *,
     const u_char *, size_t, const char *, u_int, void *);      const u_char *, size_t, const char *, u_int, void *);
 int      sshkey_certify_custom(struct sshkey *, struct sshkey *, const char *,  int      sshkey_certify_custom(struct sshkey *, struct sshkey *, const char *,
     sshkey_certify_signer *, void *);      sshkey_certify_signer *, void *);
Line 186 
Line 195 
 int      sshkey_plain_to_blob(const struct sshkey *, u_char **, size_t *);  int      sshkey_plain_to_blob(const struct sshkey *, u_char **, size_t *);
 int      sshkey_putb_plain(const struct sshkey *, struct sshbuf *);  int      sshkey_putb_plain(const struct sshkey *, struct sshbuf *);
   
 int      sshkey_sign(const struct sshkey *, u_char **, size_t *,  int      sshkey_sign(struct sshkey *, u_char **, size_t *,
     const u_char *, size_t, const char *, u_int);      const u_char *, size_t, const char *, u_int);
 int      sshkey_verify(const struct sshkey *, const u_char *, size_t,  int      sshkey_verify(const struct sshkey *, const u_char *, size_t,
     const u_char *, size_t, const char *, u_int);      const u_char *, size_t, const char *, u_int);
Line 198 
Line 207 
 void    sshkey_dump_ec_key(const EC_KEY *);  void    sshkey_dump_ec_key(const EC_KEY *);
   
 /* private key parsing and serialisation */  /* private key parsing and serialisation */
 int     sshkey_private_serialize(const struct sshkey *key, struct sshbuf *buf);  int     sshkey_private_serialize(struct sshkey *key, struct sshbuf *buf);
 int     sshkey_private_serialize_opt(const struct sshkey *key, struct sshbuf *buf,  int     sshkey_private_serialize_opt(struct sshkey *key, struct sshbuf *buf,
     enum sshkey_serialize_rep);      enum sshkey_serialize_rep);
 int     sshkey_private_deserialize(struct sshbuf *buf,  struct sshkey **keyp);  int     sshkey_private_deserialize(struct sshbuf *buf,  struct sshkey **keyp);
   
Line 221 
Line 230 
 int      sshkey_enable_maxsign(struct sshkey *, u_int32_t);  int      sshkey_enable_maxsign(struct sshkey *, u_int32_t);
 u_int32_t sshkey_signatures_left(const struct sshkey *);  u_int32_t sshkey_signatures_left(const struct sshkey *);
 int      sshkey_forward_state(const struct sshkey *, u_int32_t, sshkey_printfn *);  int      sshkey_forward_state(const struct sshkey *, u_int32_t, sshkey_printfn *);
 int      sshkey_private_serialize_maxsign(const struct sshkey *key, struct sshbuf *buf,  int      sshkey_private_serialize_maxsign(struct sshkey *key, struct sshbuf *buf,
     u_int32_t maxsign, sshkey_printfn *pr);      u_int32_t maxsign, sshkey_printfn *pr);
   
 #ifdef SSHKEY_INTERNAL  #ifdef SSHKEY_INTERNAL

Legend:
Removed from v.1.31  
changed lines
  Added in v.1.32