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

Diff for /src/usr.bin/ssh/authfd.c between version 1.29.2.4 and 1.29.2.5

version 1.29.2.4, 2001/05/07 21:09:26 version 1.29.2.5, 2001/09/27 00:15:41
Line 58 
Line 58 
   
 /* macro to check for "agent failure" message */  /* macro to check for "agent failure" message */
 #define agent_failed(x) \  #define agent_failed(x) \
     ((x == SSH_AGENT_FAILURE) || (x == SSH_COM_AGENT2_FAILURE))      ((x == SSH_AGENT_FAILURE) || (x == SSH_COM_AGENT2_FAILURE) || \
        (x == SSH2_AGENT_FAILURE))
   
 /* Returns the number of the authentication fd, or -1 if there is none. */  /* Returns the number of the authentication fd, or -1 if there is none. */
   
Line 66 
Line 67 
 ssh_get_authentication_socket(void)  ssh_get_authentication_socket(void)
 {  {
         const char *authsocket;          const char *authsocket;
         int sock, len;          int sock;
         struct sockaddr_un sunaddr;          struct sockaddr_un sunaddr;
   
         authsocket = getenv(SSH_AUTHSOCKET_ENV_NAME);          authsocket = getenv(SSH_AUTHSOCKET_ENV_NAME);
Line 75 
Line 76 
   
         sunaddr.sun_family = AF_UNIX;          sunaddr.sun_family = AF_UNIX;
         strlcpy(sunaddr.sun_path, authsocket, sizeof(sunaddr.sun_path));          strlcpy(sunaddr.sun_path, authsocket, sizeof(sunaddr.sun_path));
         len = SUN_LEN(&sunaddr)+1;  
         sunaddr.sun_len = len;  
   
         sock = socket(AF_UNIX, SOCK_STREAM, 0);          sock = socket(AF_UNIX, SOCK_STREAM, 0);
         if (sock < 0)          if (sock < 0)
Line 87 
Line 86 
                 close(sock);                  close(sock);
                 return -1;                  return -1;
         }          }
         if (connect(sock, (struct sockaddr *) & sunaddr, len) < 0) {          if (connect(sock, (struct sockaddr *) &sunaddr, sizeof sunaddr) < 0) {
                 close(sock);                  close(sock);
                 return -1;                  return -1;
         }          }
         return sock;          return sock;
 }  }
   
 int  static int
 ssh_request_reply(AuthenticationConnection *auth, Buffer *request, Buffer *reply)  ssh_request_reply(AuthenticationConnection *auth, Buffer *request, Buffer *reply)
 {  {
         int l, len;          int l, len;
Line 417 
Line 416 
   
 /* Encode key for a message to the agent. */  /* Encode key for a message to the agent. */
   
 void  static void
 ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)  ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
 {  {
         buffer_clear(b);          buffer_clear(b);
Line 430 
Line 429 
         buffer_put_bignum(b, key->iqmp);        /* ssh key->u */          buffer_put_bignum(b, key->iqmp);        /* ssh key->u */
         buffer_put_bignum(b, key->q);   /* ssh key->p, SSL key->q */          buffer_put_bignum(b, key->q);   /* ssh key->p, SSL key->q */
         buffer_put_bignum(b, key->p);   /* ssh key->q, SSL key->p */          buffer_put_bignum(b, key->p);   /* ssh key->q, SSL key->p */
         buffer_put_string(b, comment, strlen(comment));          buffer_put_cstring(b, comment);
 }  }
   
 void  static void
 ssh_encode_identity_ssh2(Buffer *b, Key *key, const char *comment)  ssh_encode_identity_ssh2(Buffer *b, Key *key, const char *comment)
 {  {
         buffer_clear(b);          buffer_clear(b);
Line 532 
Line 531 
         return decode_reply(type);          return decode_reply(type);
 }  }
   
   int
   ssh_update_card(AuthenticationConnection *auth, int add, const char *reader_id)
   {
           Buffer msg;
           int type;
   
           buffer_init(&msg);
           buffer_put_char(&msg, add ? SSH_AGENTC_ADD_SMARTCARD_KEY :
               SSH_AGENTC_REMOVE_SMARTCARD_KEY);
           buffer_put_cstring(&msg, reader_id);
           if (ssh_request_reply(auth, &msg, &msg) == 0) {
                   buffer_free(&msg);
                   return 0;
           }
           type = buffer_get_char(&msg);
           buffer_free(&msg);
           return decode_reply(type);
   }
   
 /*  /*
  * Removes all identities from the agent.  This call is not meant to be used   * Removes all identities from the agent.  This call is not meant to be used
  * by normal applications.   * by normal applications.
Line 564 
Line 582 
         switch (type) {          switch (type) {
         case SSH_AGENT_FAILURE:          case SSH_AGENT_FAILURE:
         case SSH_COM_AGENT2_FAILURE:          case SSH_COM_AGENT2_FAILURE:
           case SSH2_AGENT_FAILURE:
                 log("SSH_AGENT_FAILURE");                  log("SSH_AGENT_FAILURE");
                 return 0;                  return 0;
         case SSH_AGENT_SUCCESS:          case SSH_AGENT_SUCCESS:
Legend:
Removed from v.1.29.2.4  
changed lines
  Added in v.1.29.2.5