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

Diff for /src/usr.bin/ssh/ssh.h between version 1.39 and 1.40

version 1.39, 2000/04/19 07:05:49 version 1.40, 2000/04/26 20:56:30
Line 71 
Line 71 
  * world-readable.   * world-readable.
  */   */
 #define SSH_SYSTEM_HOSTFILE     ETCDIR "/ssh_known_hosts"  #define SSH_SYSTEM_HOSTFILE     ETCDIR "/ssh_known_hosts"
   #define SSH_SYSTEM_HOSTFILE2    ETCDIR "/ssh_known_hosts2"
   
 /*  /*
  * Of these, ssh_host_key must be readable only by root, whereas ssh_config   * Of these, ssh_host_key must be readable only by root, whereas ssh_config
Line 101 
Line 102 
  * contain anything particularly secret.   * contain anything particularly secret.
  */   */
 #define SSH_USER_HOSTFILE       "~/.ssh/known_hosts"  #define SSH_USER_HOSTFILE       "~/.ssh/known_hosts"
   #define SSH_USER_HOSTFILE2      "~/.ssh/known_hosts2"
   
 /*  /*
  * Name of the default file containing client-side authentication key. This   * Name of the default file containing client-side authentication key. This
Line 125 
Line 127 
  * running as root.)   * running as root.)
  */   */
 #define SSH_USER_PERMITTED_KEYS ".ssh/authorized_keys"  #define SSH_USER_PERMITTED_KEYS ".ssh/authorized_keys"
   #define SSH_USER_PERMITTED_KEYS2        ".ssh/authorized_keys2"
   
 /*  /*
  * Per-user and system-wide ssh "rc" files.  These files are executed with   * Per-user and system-wide ssh "rc" files.  These files are executed with
Line 378 
Line 381 
  */   */
 char   *read_passphrase(const char *prompt, int from_stdin);  char   *read_passphrase(const char *prompt, int from_stdin);
   
 /*  
  * Saves the authentication (private) key in a file, encrypting it with  
  * passphrase.  The identification of the file (lowest 64 bits of n) will  
  * precede the key to provide identification of the key without needing a  
  * passphrase.  
  */  
 int  
 save_private_key(const char *filename, const char *passphrase,  
     RSA * private_key, const char *comment);  
   
 /*  
  * Loads the public part of the key file (public key and comment). Returns 0  
  * if an error occurred; zero if the public key was successfully read.  The  
  * comment of the key is returned in comment_return if it is non-NULL; the  
  * caller must free the value with xfree.  
  */  
 int  
 load_public_key(const char *filename, RSA * pub,  
     char **comment_return);  
   
 /*  
  * Loads the private key from the file.  Returns 0 if an error is encountered  
  * (file does not exist or is not readable, or passphrase is bad). This  
  * initializes the private key.  The comment of the key is returned in  
  * comment_return if it is non-NULL; the caller must free the value with  
  * xfree.  
  */  
 int  
 load_private_key(const char *filename, const char *passphrase,  
     RSA * private_key, char **comment_return);  
   
 /*------------ Definitions for logging. -----------------------*/  /*------------ Definitions for logging. -----------------------*/
   

Legend:
Removed from v.1.39  
changed lines
  Added in v.1.40