- (bal) Missed msg.[ch] in merge. Required for ssh-keysign.

[openssh.git] / authfd.c

diff --git a/authfd.c b/authfd.c
index 9f47b0ae8e77b659e5cfc9bc47d561470ede1b2d..0f84e321cf96c45ea642b081affad5383de74c0c 100644 (file)
--- a/authfd.c
+++ b/authfd.c
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: authfd.c,v 1.40 2001/06/07 20:23:03 markus Exp $");
+RCSID("$OpenBSD: authfd.c,v 1.51 2002/06/05 21:55:44 markus Exp $");
 
 #include <openssl/evp.h>
 
@@ -58,7 +58,8 @@ int   decode_reply(int type);
 
 /* macro to check for "agent failure" message */
 #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. */
 
@@ -66,7 +67,7 @@ int
 ssh_get_authentication_socket(void)
 {
        const char *authsocket;
-       int sock, len;
+       int sock;
        struct sockaddr_un sunaddr;
 
        authsocket = getenv(SSH_AUTHSOCKET_ENV_NAME);
@@ -75,10 +76,6 @@ ssh_get_authentication_socket(void)
 
        sunaddr.sun_family = AF_UNIX;
        strlcpy(sunaddr.sun_path, authsocket, sizeof(sunaddr.sun_path));
-       len = SUN_LEN(&sunaddr)+1;
-#ifdef HAVE_SUN_LEN_IN_SOCKADDR_UN
-       sunaddr.sun_len = len;
-#endif /* HAVE_SUN_LEN_IN_SOCKADDR_UN */
 
        sock = socket(AF_UNIX, SOCK_STREAM, 0);
        if (sock < 0)
@@ -89,14 +86,14 @@ ssh_get_authentication_socket(void)
                close(sock);
                return -1;
        }
-       if (connect(sock, (struct sockaddr *) & sunaddr, len) < 0) {
+       if (connect(sock, (struct sockaddr *) &sunaddr, sizeof sunaddr) < 0) {
                close(sock);
                return -1;
        }
        return sock;
 }
 
-int
+static int
 ssh_request_reply(AuthenticationConnection *auth, Buffer *request, Buffer *reply)
 {
        int l, len;
@@ -210,6 +207,26 @@ ssh_close_authentication_connection(AuthenticationConnection *auth)
        xfree(auth);
 }
 
+/* Lock/unlock agent */
+int
+ssh_lock_agent(AuthenticationConnection *auth, int lock, const char *password)
+{
+       int type;
+       Buffer msg;
+
+       buffer_init(&msg);
+       buffer_put_char(&msg, lock ? SSH_AGENTC_LOCK : SSH_AGENTC_UNLOCK);
+       buffer_put_cstring(&msg, password);
+
+       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);
+}
+
 /*
  * Returns the first authentication identity held by the agent.
  */
@@ -220,7 +237,7 @@ ssh_get_num_identities(AuthenticationConnection *auth, int version)
        int type, code1 = 0, code2 = 0;
        Buffer request;
 
-       switch(version){
+       switch (version) {
        case 1:
                code1 = SSH_AGENTC_REQUEST_RSA_IDENTITIES;
                code2 = SSH_AGENT_RSA_IDENTITIES_ANSWER;
@@ -289,7 +306,7 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
         * Get the next entry from the packet.  These will abort with a fatal
         * error if the packet is too short or contains corrupt data.
         */
-       switch(version){
+       switch (version) {
        case 1:
                key = key_new(KEY_RSA1);
                bits = buffer_get_int(&auth->identities);
@@ -347,7 +364,7 @@ ssh_decrypt_challenge(AuthenticationConnection *auth,
        buffer_put_bignum(&buffer, key->rsa->e);
        buffer_put_bignum(&buffer, key->rsa->n);
        buffer_put_bignum(&buffer, challenge);
-       buffer_append(&buffer, (char *) session_id, 16);
+       buffer_append(&buffer, session_id, 16);
        buffer_put_int(&buffer, response_type);
 
        if (ssh_request_reply(auth, &buffer, &buffer) == 0) {
@@ -377,8 +394,8 @@ ssh_decrypt_challenge(AuthenticationConnection *auth,
 int
 ssh_agent_sign(AuthenticationConnection *auth,
     Key *key,
-    u_char **sigp, int *lenp,
-    u_char *data, int datalen)
+    u_char **sigp, u_int *lenp,
+    u_char *data, u_int datalen)
 {
        extern int datafellows;
        Buffer msg;
@@ -419,7 +436,7 @@ ssh_agent_sign(AuthenticationConnection *auth,
 
 /* Encode key for a message to the agent. */
 
-void
+static void
 ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
 {
        buffer_clear(b);
@@ -435,13 +452,13 @@ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
        buffer_put_cstring(b, comment);
 }
 
-void
+static void
 ssh_encode_identity_ssh2(Buffer *b, Key *key, const char *comment)
 {
        buffer_clear(b);
        buffer_put_char(b, SSH2_AGENTC_ADD_IDENTITY);
        buffer_put_cstring(b, key_ssh_name(key));
-       switch(key->type){
+       switch (key->type) {
        case KEY_RSA:
                buffer_put_bignum2(b, key->rsa->n);
                buffer_put_bignum2(b, key->rsa->e);
@@ -534,6 +551,61 @@ ssh_remove_identity(AuthenticationConnection *auth, Key *key)
        return decode_reply(type);
 }
 
+int
+ssh_lifetime_identity(AuthenticationConnection *auth, Key *key, u_int life)
+{
+       Buffer msg;
+       int type;
+       u_char *blob;
+       u_int blen;
+
+       buffer_init(&msg);
+
+       if (key->type == KEY_RSA1) {
+               buffer_put_char(&msg, SSH_AGENTC_LIFETIME_IDENTITY1);
+               buffer_put_int(&msg, life);
+               buffer_put_int(&msg, BN_num_bits(key->rsa->n));
+               buffer_put_bignum(&msg, key->rsa->e);
+               buffer_put_bignum(&msg, key->rsa->n);
+       } else if (key->type == KEY_DSA || key->type == KEY_RSA) {
+               key_to_blob(key, &blob, &blen);
+               buffer_put_char(&msg, SSH_AGENTC_LIFETIME_IDENTITY);
+               buffer_put_int(&msg, life);
+               buffer_put_string(&msg, blob, blen);
+               xfree(blob);
+       } else {
+               buffer_free(&msg);
+               return 0;
+       }
+       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);
+}
+
+int
+ssh_update_card(AuthenticationConnection *auth, int add, const char *reader_id, const char *pin)
+{
+       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);
+       buffer_put_cstring(&msg, pin);
+       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
  * by normal applications.
@@ -566,6 +638,7 @@ decode_reply(int type)
        switch (type) {
        case SSH_AGENT_FAILURE:
        case SSH_COM_AGENT2_FAILURE:
+       case SSH2_AGENT_FAILURE:
                log("SSH_AGENT_FAILURE");
                return 0;
        case SSH_AGENT_SUCCESS: