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

Diff for /src/usr.bin/ssh/misc.h between version 1.25.2.1 and 1.25.2.2

version 1.25.2.1, 2006/02/03 03:01:56 version 1.25.2.2, 2006/10/06 03:19:32
Line 1 
Line 1 
 /*      $OpenBSD$       */  /* $OpenBSD$ */
   
 /*  /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>   * Author: Tatu Ylonen <ylo@cs.hut.fi>
Line 12 
Line 12 
  * called by a name other than "ssh" or "Secure Shell".   * called by a name other than "ssh" or "Secure Shell".
  */   */
   
   #ifndef _MISC_H
   #define _MISC_H
   
 /* misc.c */  /* misc.c */
   
 char    *chop(char *);  char    *chop(char *);
Line 21 
Line 24 
 void     set_nodelay(int);  void     set_nodelay(int);
 int      a2port(const char *);  int      a2port(const char *);
 int      a2tun(const char *, int *);  int      a2tun(const char *, int *);
   char    *put_host_port(const char *, u_short);
 char    *hpdelim(char **);  char    *hpdelim(char **);
 char    *cleanhostname(char *);  char    *cleanhostname(char *);
 char    *colon(char *);  char    *colon(char *);
 long     convtime(const char *);  long     convtime(const char *);
 char    *tilde_expand_filename(const char *, uid_t);  char    *tilde_expand_filename(const char *, uid_t);
 char    *percent_expand(const char *, ...) __attribute__((__sentinel__));  char    *percent_expand(const char *, ...) __attribute__((__sentinel__));
 char    *tohex(const u_char *, u_int);  char    *tohex(const void *, size_t);
 void     sanitise_stdfd(void);  void     sanitise_stdfd(void);
   
 struct passwd *pwcopy(struct passwd *);  struct passwd *pwcopy(struct passwd *);
Line 44 
Line 48 
              __attribute__((format(printf, 3, 4)));               __attribute__((format(printf, 3, 4)));
 void     freeargs(arglist *);  void     freeargs(arglist *);
   
 /* readpass.c */  
   
 #define RP_ECHO                 0x0001  
 #define RP_ALLOW_STDIN          0x0002  
 #define RP_ALLOW_EOF            0x0004  
 #define RP_USE_ASKPASS          0x0008  
   
 char    *read_passphrase(const char *, int);  
 int      ask_permission(const char *, ...) __attribute__((format(printf, 1, 2)));  
 int      read_keyfile_line(FILE *, const char *, char *, size_t, u_long *);  
   
 int      tun_open(int, int);  int      tun_open(int, int);
   
 /* Common definitions for ssh tunnel device forwarding */  /* Common definitions for ssh tunnel device forwarding */
Line 67 
Line 60 
 #define SSH_TUNID_ANY           0x7fffffff  #define SSH_TUNID_ANY           0x7fffffff
 #define SSH_TUNID_ERR           (SSH_TUNID_ANY - 1)  #define SSH_TUNID_ERR           (SSH_TUNID_ANY - 1)
 #define SSH_TUNID_MAX           (SSH_TUNID_ANY - 2)  #define SSH_TUNID_MAX           (SSH_TUNID_ANY - 2)
   
   /* Functions to extract or store big-endian words of various sizes */
   u_int64_t       get_u64(const void *)
       __attribute__((__bounded__( __minbytes__, 1, 8)));
   u_int32_t       get_u32(const void *)
       __attribute__((__bounded__( __minbytes__, 1, 4)));
   u_int16_t       get_u16(const void *)
       __attribute__((__bounded__( __minbytes__, 1, 2)));
   void            put_u64(void *, u_int64_t)
       __attribute__((__bounded__( __minbytes__, 1, 8)));
   void            put_u32(void *, u_int32_t)
       __attribute__((__bounded__( __minbytes__, 1, 4)));
   void            put_u16(void *, u_int16_t)
       __attribute__((__bounded__( __minbytes__, 1, 2)));
   
   
   /* readpass.c */
   
   #define RP_ECHO                 0x0001
   #define RP_ALLOW_STDIN          0x0002
   #define RP_ALLOW_EOF            0x0004
   #define RP_USE_ASKPASS          0x0008
   
   char    *read_passphrase(const char *, int);
   int      ask_permission(const char *, ...) __attribute__((format(printf, 1, 2)));
   int      read_keyfile_line(FILE *, const char *, char *, size_t, u_long *);
   
   #endif /* _MISC_H */

Legend:
Removed from v.1.25.2.1  
changed lines
  Added in v.1.25.2.2