[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.28 and 1.29

version 1.28, 2018/09/12 01:32:54 version 1.29, 2018/09/13 02:08:33
Line 33 
Line 33 
 #include <openssl/dsa.h>  #include <openssl/dsa.h>
 #include <openssl/ec.h>  #include <openssl/ec.h>
 #else /* OPENSSL */  #else /* OPENSSL */
   #define BIGNUM          void
 #define RSA             void  #define RSA             void
 #define DSA             void  #define DSA             void
 #define EC_KEY          void  #define EC_KEY          void
Line 121 
Line 122 
 #define ED25519_PK_SZ   crypto_sign_ed25519_PUBLICKEYBYTES  #define ED25519_PK_SZ   crypto_sign_ed25519_PUBLICKEYBYTES
   
 struct sshkey   *sshkey_new(int);  struct sshkey   *sshkey_new(int);
 int              sshkey_add_private(struct sshkey *);  struct sshkey   *sshkey_new_private(int); /* XXX garbage collect */
 struct sshkey   *sshkey_new_private(int);  
 void             sshkey_free(struct sshkey *);  void             sshkey_free(struct sshkey *);
 int              sshkey_demote(const struct sshkey *, struct sshkey **);  
 int              sshkey_equal_public(const struct sshkey *,  int              sshkey_equal_public(const struct sshkey *,
     const struct sshkey *);      const struct sshkey *);
 int              sshkey_equal(const struct sshkey *, const struct sshkey *);  int              sshkey_equal(const struct sshkey *, const struct sshkey *);
Line 214 
Line 213 
     const char *passphrase, struct sshkey **keyp, char **commentp);      const char *passphrase, struct sshkey **keyp, char **commentp);
   
 /* XXX should be internal, but used by ssh-keygen */  /* XXX should be internal, but used by ssh-keygen */
 int ssh_rsa_generate_additional_parameters(struct sshkey *);  int ssh_rsa_complete_crt_parameters(struct sshkey *, const BIGNUM *);
   
 /* stateful keys (e.g. XMSS) */  /* stateful keys (e.g. XMSS) */
 typedef void sshkey_printfn(const char *, ...) __attribute__((format(printf, 1, 2)));  typedef void sshkey_printfn(const char *, ...) __attribute__((format(printf, 1, 2)));

Legend:
Removed from v.1.28  
changed lines
  Added in v.1.29