- (bal) removed GNUism for getops in ssh-agent since glibc lacks optreset.

[openssh.git] / ssh-agent.c

diff --git a/ssh-agent.c b/ssh-agent.c
index 06e4d231655c8ebe7d9769b46cde98299877dfa9..72adf686c557f25589f45a8d2ca17a71e2a75ba0 100644 (file)
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -35,7 +35,7 @@
 
 #include "includes.h"
 #include "openbsd-compat/fake-queue.h"
-RCSID("$OpenBSD: ssh-agent.c,v 1.89 2002/06/05 21:55:44 markus Exp $");
+RCSID("$OpenBSD: ssh-agent.c,v 1.95 2002/06/19 00:27:55 deraadt Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/md5.h>
@@ -365,7 +365,6 @@ process_remove_all_identities(SocketEntry *e, int version)
        /* Send success. */
        buffer_put_int(&e->output, 1);
        buffer_put_char(&e->output, SSH_AGENT_SUCCESS);
-       return;
 }
 
 static void
@@ -395,7 +394,7 @@ process_add_identity(SocketEntry *e, int version)
        Key *k = NULL;
        char *type_name;
        char *comment;
-       int type, success = 0;
+       int type, success = 0, death = 0;
        Idtab *tab = idtab_lookup(version);
 
        switch (version) {
@@ -451,11 +450,20 @@ process_add_identity(SocketEntry *e, int version)
                goto send;
        }
        success = 1;
+       while (buffer_len(&e->request)) {
+               switch (buffer_get_char(&e->request)) {
+               case SSH_AGENT_CONSTRAIN_LIFETIME:
+                       death = time(NULL) + buffer_get_int(&e->request);
+                       break;
+               default:
+                       break;
+               }
+       }
        if (lookup_identity(k, version) == NULL) {
                Identity *id = xmalloc(sizeof(Identity));
                id->key = k;
                id->comment = comment;
-               id->death = 0;
+               id->death = death;
                TAILQ_INSERT_TAIL(&tab->idlist, id, next);
                /* Increment the number of identities. */
                tab->nentries++;
@@ -469,43 +477,6 @@ send:
            success ? SSH_AGENT_SUCCESS : SSH_AGENT_FAILURE);
 }
 
-static void
-process_lifetime_identity(SocketEntry *e, int version)
-{
-       Key *key = NULL;
-       u_char *blob;
-       u_int blen, bits, death;
-       int success = 0;
-
-       death = time(NULL) + buffer_get_int(&e->request);
-
-       switch (version) {
-       case 1:
-               key = key_new(KEY_RSA1);
-               bits = buffer_get_int(&e->request);
-               buffer_get_bignum(&e->request, key->rsa->e);
-               buffer_get_bignum(&e->request, key->rsa->n);
-
-               break;
-       case 2:
-               blob = buffer_get_string(&e->request, &blen);
-               key = key_from_blob(blob, blen);
-               xfree(blob);
-               break;
-       }
-       if (key != NULL) {
-               Identity *id = lookup_identity(key, version);
-               if (id != NULL && id->death == 0) {
-                       id->death = death;
-                       success = 1;
-               }
-               key_free(key);
-       }
-       buffer_put_int(&e->output, 1);
-       buffer_put_char(&e->output,
-           success ? SSH_AGENT_SUCCESS : SSH_AGENT_FAILURE);
-}
-
 /* XXX todo: encrypt sensitive data with passphrase */
 static void
 process_lock_agent(SocketEntry *e, int lock)
@@ -527,11 +498,10 @@ process_lock_agent(SocketEntry *e, int lock)
        }
        memset(passwd, 0, strlen(passwd));
        xfree(passwd);
- 
+
        buffer_put_int(&e->output, 1);
        buffer_put_char(&e->output,
            success ? SSH_AGENT_SUCCESS : SSH_AGENT_FAILURE);
-       return;
 }
 
 static void
@@ -699,6 +669,7 @@ process_message(SocketEntry *e)
                process_request_identities(e, 1);
                break;
        case SSH_AGENTC_ADD_RSA_IDENTITY:
+       case SSH_AGENTC_ADD_RSA_ID_CONSTRAINED:
                process_add_identity(e, 1);
                break;
        case SSH_AGENTC_REMOVE_RSA_IDENTITY:
@@ -707,9 +678,6 @@ process_message(SocketEntry *e)
        case SSH_AGENTC_REMOVE_ALL_RSA_IDENTITIES:
                process_remove_all_identities(e, 1);
                break;
-       case SSH_AGENTC_LIFETIME_IDENTITY1:
-               process_lifetime_identity(e, 1);
-               break;
        /* ssh2 */
        case SSH2_AGENTC_SIGN_REQUEST:
                process_sign_request2(e);
@@ -718,6 +686,7 @@ process_message(SocketEntry *e)
                process_request_identities(e, 2);
                break;
        case SSH2_AGENTC_ADD_IDENTITY:
+       case SSH2_AGENTC_ADD_ID_CONSTRAINED:
                process_add_identity(e, 2);
                break;
        case SSH2_AGENTC_REMOVE_IDENTITY:
@@ -726,9 +695,6 @@ process_message(SocketEntry *e)
        case SSH2_AGENTC_REMOVE_ALL_IDENTITIES:
                process_remove_all_identities(e, 2);
                break;
-       case SSH_AGENTC_LIFETIME_IDENTITY:
-               process_lifetime_identity(e, 2);
-               break;
 #ifdef SMARTCARD
        case SSH_AGENTC_ADD_SMARTCARD_KEY:
                process_add_smartcard_key(e);
@@ -981,11 +947,7 @@ main(int ac, char **av)
        init_rng();
        seed_rng();
 
-#ifdef __GNU_LIBRARY__
-       while ((ch = getopt(ac, av, "+cdksa:")) != -1) {
-#else /* __GNU_LIBRARY__ */
        while ((ch = getopt(ac, av, "cdksa:")) != -1) {
-#endif /* __GNU_LIBRARY__ */
                switch (ch) {
                case 'c':
                        if (s_flag)
@@ -1043,7 +1005,7 @@ main(int ac, char **av)
                format = c_flag ? "unsetenv %s;\n" : "unset %s;\n";
                printf(format, SSH_AUTHSOCKET_ENV_NAME);
                printf(format, SSH_AGENTPID_ENV_NAME);
-               printf("echo Agent pid %d killed;\n", pid);
+               printf("echo Agent pid %ld killed;\n", (long)pid);
                exit(0);
        }
        parent_pid = getpid();
@@ -1055,8 +1017,8 @@ main(int ac, char **av)
                        perror("mkdtemp: private socket dir");
                        exit(1);
                }
-               snprintf(socket_name, sizeof socket_name, "%s/agent.%d", socket_dir,
-                   parent_pid);
+               snprintf(socket_name, sizeof socket_name, "%s/agent.%ld", socket_dir,
+                   (long)parent_pid);
        } else {
                /* Try to use specified agent socket */
                socket_dir[0] = '\0';
@@ -1102,7 +1064,7 @@ main(int ac, char **av)
                format = c_flag ? "setenv %s %s;\n" : "%s=%s; export %s;\n";
                printf(format, SSH_AUTHSOCKET_ENV_NAME, socket_name,
                    SSH_AUTHSOCKET_ENV_NAME);
-               printf("echo Agent pid %d;\n", parent_pid);
+               printf("echo Agent pid %ld;\n", (long)parent_pid);
                goto skip;
        }
        pid = fork();
@@ -1112,14 +1074,14 @@ main(int ac, char **av)
        }
        if (pid != 0) {         /* Parent - execute the given command. */
                close(sock);
-               snprintf(pidstrbuf, sizeof pidstrbuf, "%d", pid);
+               snprintf(pidstrbuf, sizeof pidstrbuf, "%ld", (long)pid);
                if (ac == 0) {
                        format = c_flag ? "setenv %s %s;\n" : "%s=%s; export %s;\n";
                        printf(format, SSH_AUTHSOCKET_ENV_NAME, socket_name,
                            SSH_AUTHSOCKET_ENV_NAME);
                        printf(format, SSH_AGENTPID_ENV_NAME, pidstrbuf,
                            SSH_AGENTPID_ENV_NAME);
-                       printf("echo Agent pid %d;\n", pid);
+                       printf("echo Agent pid %ld;\n", (long)pid);
                        exit(0);
                }
                if (setenv(SSH_AUTHSOCKET_ENV_NAME, socket_name, 1) == -1 ||