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

Annotation of src/usr.bin/ssh/authfd.c, Revision 1.73

1.73    ! deraadt     1: /* $OpenBSD: authfd.c,v 1.72 2006/03/25 13:17:01 djm Exp $ */
1.1       deraadt     2: /*
1.13      deraadt     3:  * Author: Tatu Ylonen <ylo@cs.hut.fi>
                      4:  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
                      5:  *                    All rights reserved
1.27      deraadt     6:  * Functions for connecting the local authentication agent.
1.18      markus      7:  *
1.27      deraadt     8:  * As far as I am concerned, the code I have written for this software
                      9:  * can be used freely for any purpose.  Any derived versions of this
                     10:  * software must be clearly marked as such, and if the derived work is
                     11:  * incompatible with the protocol description in the RFC file, it must be
                     12:  * called by a name other than "ssh" or "Secure Shell".
1.18      markus     13:  *
1.25      markus     14:  * SSH2 implementation,
1.27      deraadt    15:  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
1.25      markus     16:  *
1.27      deraadt    17:  * Redistribution and use in source and binary forms, with or without
                     18:  * modification, are permitted provided that the following conditions
                     19:  * are met:
                     20:  * 1. Redistributions of source code must retain the above copyright
                     21:  *    notice, this list of conditions and the following disclaimer.
                     22:  * 2. Redistributions in binary form must reproduce the above copyright
                     23:  *    notice, this list of conditions and the following disclaimer in the
                     24:  *    documentation and/or other materials provided with the distribution.
                     25:  *
                     26:  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
                     27:  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
                     28:  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
                     29:  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
                     30:  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
                     31:  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
                     32:  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
                     33:  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
                     34:  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
                     35:  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1.13      deraadt    36:  */
1.1       deraadt    37:
                     38: #include "includes.h"
1.67      stevesk    39:
                     40: #include <sys/types.h>
                     41: #include <sys/un.h>
1.33      markus     42:
                     43: #include <openssl/evp.h>
1.1       deraadt    44:
                     45: #include "ssh.h"
                     46: #include "rsa.h"
                     47: #include "buffer.h"
                     48: #include "bufaux.h"
                     49: #include "xmalloc.h"
                     50: #include "getput.h"
1.22      markus     51: #include "key.h"
                     52: #include "authfd.h"
1.33      markus     53: #include "cipher.h"
1.22      markus     54: #include "kex.h"
1.28      markus     55: #include "compat.h"
1.33      markus     56: #include "log.h"
                     57: #include "atomicio.h"
1.2       provos     58:
1.57      stevesk    59: static int agent_present = 0;
                     60:
1.21      markus     61: /* helper */
1.24      markus     62: int    decode_reply(int type);
1.21      markus     63:
1.29      markus     64: /* macro to check for "agent failure" message */
                     65: #define agent_failed(x) \
1.44      markus     66:     ((x == SSH_AGENT_FAILURE) || (x == SSH_COM_AGENT2_FAILURE) || \
1.55      deraadt    67:     (x == SSH2_AGENT_FAILURE))
1.29      markus     68:
1.57      stevesk    69: int
                     70: ssh_agent_present(void)
                     71: {
                     72:        int authfd;
                     73:
                     74:        if (agent_present)
                     75:                return 1;
                     76:        if ((authfd = ssh_get_authentication_socket()) == -1)
                     77:                return 0;
                     78:        else {
                     79:                ssh_close_authentication_socket(authfd);
                     80:                return 1;
                     81:        }
                     82: }
                     83:
1.1       deraadt    84: /* Returns the number of the authentication fd, or -1 if there is none. */
                     85:
1.2       provos     86: int
1.32      markus     87: ssh_get_authentication_socket(void)
1.1       deraadt    88: {
1.12      markus     89:        const char *authsocket;
1.45      stevesk    90:        int sock;
1.12      markus     91:        struct sockaddr_un sunaddr;
                     92:
                     93:        authsocket = getenv(SSH_AUTHSOCKET_ENV_NAME);
                     94:        if (!authsocket)
                     95:                return -1;
                     96:
                     97:        sunaddr.sun_family = AF_UNIX;
                     98:        strlcpy(sunaddr.sun_path, authsocket, sizeof(sunaddr.sun_path));
                     99:
                    100:        sock = socket(AF_UNIX, SOCK_STREAM, 0);
                    101:        if (sock < 0)
                    102:                return -1;
                    103:
                    104:        /* close on exec */
                    105:        if (fcntl(sock, F_SETFD, 1) == -1) {
                    106:                close(sock);
                    107:                return -1;
                    108:        }
1.71      deraadt   109:        if (connect(sock, (struct sockaddr *)&sunaddr, sizeof sunaddr) < 0) {
1.12      markus    110:                close(sock);
                    111:                return -1;
                    112:        }
1.57      stevesk   113:        agent_present = 1;
1.12      markus    114:        return sock;
1.1       deraadt   115: }
                    116:
1.41      itojun    117: static int
1.25      markus    118: ssh_request_reply(AuthenticationConnection *auth, Buffer *request, Buffer *reply)
1.24      markus    119: {
1.66      djm       120:        u_int l, len;
1.24      markus    121:        char buf[1024];
                    122:
                    123:        /* Get the length of the message, and format it in the buffer. */
                    124:        len = buffer_len(request);
                    125:        PUT_32BIT(buf, len);
                    126:
                    127:        /* Send the length and then the packet to the agent. */
1.61      deraadt   128:        if (atomicio(vwrite, auth->fd, buf, 4) != 4 ||
                    129:            atomicio(vwrite, auth->fd, buffer_ptr(request),
1.24      markus    130:            buffer_len(request)) != buffer_len(request)) {
                    131:                error("Error writing to authentication socket.");
                    132:                return 0;
                    133:        }
                    134:        /*
                    135:         * Wait for response from the agent.  First read the length of the
                    136:         * response packet.
                    137:         */
1.64      avsm      138:        if (atomicio(read, auth->fd, buf, 4) != 4) {
                    139:            error("Error reading response length from authentication socket.");
                    140:            return 0;
1.24      markus    141:        }
                    142:
                    143:        /* Extract the length, and check it for sanity. */
                    144:        len = GET_32BIT(buf);
                    145:        if (len > 256 * 1024)
1.62      miod      146:                fatal("Authentication response too long: %u", len);
1.24      markus    147:
                    148:        /* Read the rest of the response in to the buffer. */
                    149:        buffer_clear(reply);
                    150:        while (len > 0) {
                    151:                l = len;
                    152:                if (l > sizeof(buf))
                    153:                        l = sizeof(buf);
1.65      avsm      154:                if (atomicio(read, auth->fd, buf, l) != l) {
1.24      markus    155:                        error("Error reading response from authentication socket.");
                    156:                        return 0;
                    157:                }
1.56      markus    158:                buffer_append(reply, buf, l);
1.24      markus    159:                len -= l;
                    160:        }
                    161:        return 1;
                    162: }
                    163:
1.14      markus    164: /*
                    165:  * Closes the agent socket if it should be closed (depends on how it was
                    166:  * obtained).  The argument must have been returned by
                    167:  * ssh_get_authentication_socket().
                    168:  */
1.1       deraadt   169:
1.18      markus    170: void
1.12      markus    171: ssh_close_authentication_socket(int sock)
1.1       deraadt   172: {
1.12      markus    173:        if (getenv(SSH_AUTHSOCKET_ENV_NAME))
                    174:                close(sock);
1.1       deraadt   175: }
                    176:
1.14      markus    177: /*
                    178:  * Opens and connects a private socket for communication with the
                    179:  * authentication agent.  Returns the file descriptor (which must be
                    180:  * shut down and closed by the caller when no longer needed).
                    181:  * Returns NULL if an error occurred and the connection could not be
                    182:  * opened.
                    183:  */
1.1       deraadt   184:
1.12      markus    185: AuthenticationConnection *
1.32      markus    186: ssh_get_authentication_connection(void)
1.1       deraadt   187: {
1.12      markus    188:        AuthenticationConnection *auth;
                    189:        int sock;
1.1       deraadt   190:
1.12      markus    191:        sock = ssh_get_authentication_socket();
                    192:
1.14      markus    193:        /*
                    194:         * Fail if we couldn't obtain a connection.  This happens if we
                    195:         * exited due to a timeout.
                    196:         */
1.12      markus    197:        if (sock < 0)
                    198:                return NULL;
                    199:
                    200:        auth = xmalloc(sizeof(*auth));
                    201:        auth->fd = sock;
                    202:        buffer_init(&auth->identities);
                    203:        auth->howmany = 0;
                    204:
                    205:        return auth;
1.1       deraadt   206: }
                    207:
1.14      markus    208: /*
                    209:  * Closes the connection to the authentication agent and frees any associated
                    210:  * memory.
                    211:  */
1.1       deraadt   212:
1.18      markus    213: void
1.25      markus    214: ssh_close_authentication_connection(AuthenticationConnection *auth)
1.1       deraadt   215: {
1.25      markus    216:        buffer_free(&auth->identities);
                    217:        close(auth->fd);
                    218:        xfree(auth);
1.50      markus    219: }
                    220:
                    221: /* Lock/unlock agent */
                    222: int
                    223: ssh_lock_agent(AuthenticationConnection *auth, int lock, const char *password)
                    224: {
                    225:        int type;
                    226:        Buffer msg;
                    227:
                    228:        buffer_init(&msg);
                    229:        buffer_put_char(&msg, lock ? SSH_AGENTC_LOCK : SSH_AGENTC_UNLOCK);
                    230:        buffer_put_cstring(&msg, password);
                    231:
                    232:        if (ssh_request_reply(auth, &msg, &msg) == 0) {
                    233:                buffer_free(&msg);
                    234:                return 0;
                    235:        }
                    236:        type = buffer_get_char(&msg);
                    237:        buffer_free(&msg);
                    238:        return decode_reply(type);
1.1       deraadt   239: }
                    240:
1.14      markus    241: /*
                    242:  * Returns the first authentication identity held by the agent.
                    243:  */
1.1       deraadt   244:
1.30      markus    245: int
                    246: ssh_get_num_identities(AuthenticationConnection *auth, int version)
1.1       deraadt   247: {
1.25      markus    248:        int type, code1 = 0, code2 = 0;
1.24      markus    249:        Buffer request;
1.25      markus    250:
1.46      deraadt   251:        switch (version) {
1.25      markus    252:        case 1:
                    253:                code1 = SSH_AGENTC_REQUEST_RSA_IDENTITIES;
                    254:                code2 = SSH_AGENT_RSA_IDENTITIES_ANSWER;
                    255:                break;
                    256:        case 2:
                    257:                code1 = SSH2_AGENTC_REQUEST_IDENTITIES;
                    258:                code2 = SSH2_AGENT_IDENTITIES_ANSWER;
                    259:                break;
                    260:        default:
1.30      markus    261:                return 0;
1.25      markus    262:        }
1.1       deraadt   263:
1.14      markus    264:        /*
                    265:         * Send a message to the agent requesting for a list of the
                    266:         * identities it can represent.
                    267:         */
1.24      markus    268:        buffer_init(&request);
1.25      markus    269:        buffer_put_char(&request, code1);
1.12      markus    270:
                    271:        buffer_clear(&auth->identities);
1.24      markus    272:        if (ssh_request_reply(auth, &request, &auth->identities) == 0) {
                    273:                buffer_free(&request);
1.30      markus    274:                return 0;
1.12      markus    275:        }
1.24      markus    276:        buffer_free(&request);
1.1       deraadt   277:
1.12      markus    278:        /* Get message type, and verify that we got a proper answer. */
1.24      markus    279:        type = buffer_get_char(&auth->identities);
1.29      markus    280:        if (agent_failed(type)) {
1.30      markus    281:                return 0;
1.25      markus    282:        } else if (type != code2) {
1.24      markus    283:                fatal("Bad authentication reply message type: %d", type);
1.25      markus    284:        }
1.12      markus    285:
                    286:        /* Get the number of entries in the response and check it for sanity. */
                    287:        auth->howmany = buffer_get_int(&auth->identities);
1.62      miod      288:        if ((u_int)auth->howmany > 1024)
1.37      millert   289:                fatal("Too many identities in authentication reply: %d",
1.24      markus    290:                    auth->howmany);
1.12      markus    291:
1.30      markus    292:        return auth->howmany;
                    293: }
                    294:
                    295: Key *
                    296: ssh_get_first_identity(AuthenticationConnection *auth, char **comment, int version)
                    297: {
                    298:        /* get number of identities and return the first entry (if any). */
                    299:        if (ssh_get_num_identities(auth, version) > 0)
                    300:                return ssh_get_next_identity(auth, comment, version);
                    301:        return NULL;
1.1       deraadt   302: }
                    303:
1.25      markus    304: Key *
                    305: ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int version)
1.1       deraadt   306: {
1.66      djm       307:        int keybits;
1.31      markus    308:        u_int bits;
                    309:        u_char *blob;
                    310:        u_int blen;
1.25      markus    311:        Key *key = NULL;
1.9       markus    312:
1.12      markus    313:        /* Return failure if no more entries. */
                    314:        if (auth->howmany <= 0)
1.25      markus    315:                return NULL;
1.12      markus    316:
1.14      markus    317:        /*
                    318:         * Get the next entry from the packet.  These will abort with a fatal
                    319:         * error if the packet is too short or contains corrupt data.
                    320:         */
1.46      deraadt   321:        switch (version) {
1.25      markus    322:        case 1:
1.30      markus    323:                key = key_new(KEY_RSA1);
1.25      markus    324:                bits = buffer_get_int(&auth->identities);
                    325:                buffer_get_bignum(&auth->identities, key->rsa->e);
                    326:                buffer_get_bignum(&auth->identities, key->rsa->n);
                    327:                *comment = buffer_get_string(&auth->identities, NULL);
1.66      djm       328:                keybits = BN_num_bits(key->rsa->n);
                    329:                if (keybits < 0 || bits != (u_int)keybits)
1.59      itojun    330:                        logit("Warning: identity keysize mismatch: actual %d, announced %u",
1.25      markus    331:                            BN_num_bits(key->rsa->n), bits);
                    332:                break;
                    333:        case 2:
                    334:                blob = buffer_get_string(&auth->identities, &blen);
                    335:                *comment = buffer_get_string(&auth->identities, NULL);
1.30      markus    336:                key = key_from_blob(blob, blen);
1.25      markus    337:                xfree(blob);
                    338:                break;
                    339:        default:
                    340:                return NULL;
                    341:        }
1.12      markus    342:        /* Decrement the number of remaining entries. */
                    343:        auth->howmany--;
1.25      markus    344:        return key;
1.1       deraadt   345: }
                    346:
1.14      markus    347: /*
                    348:  * Generates a random challenge, sends it to the agent, and waits for
                    349:  * response from the agent.  Returns true (non-zero) if the agent gave the
                    350:  * correct answer, zero otherwise.  Response type selects the style of
                    351:  * response desired, with 0 corresponding to protocol version 1.0 (no longer
                    352:  * supported) and 1 corresponding to protocol version 1.1.
                    353:  */
1.1       deraadt   354:
1.2       provos    355: int
                    356: ssh_decrypt_challenge(AuthenticationConnection *auth,
1.25      markus    357:     Key* key, BIGNUM *challenge,
1.31      markus    358:     u_char session_id[16],
                    359:     u_int response_type,
                    360:     u_char response[16])
1.1       deraadt   361: {
1.12      markus    362:        Buffer buffer;
1.24      markus    363:        int success = 0;
                    364:        int i;
                    365:        int type;
1.12      markus    366:
1.30      markus    367:        if (key->type != KEY_RSA1)
1.25      markus    368:                return 0;
                    369:        if (response_type == 0) {
1.59      itojun    370:                logit("Compatibility with ssh protocol version 1.0 no longer supported.");
1.25      markus    371:                return 0;
                    372:        }
1.12      markus    373:        buffer_init(&buffer);
1.24      markus    374:        buffer_put_char(&buffer, SSH_AGENTC_RSA_CHALLENGE);
1.25      markus    375:        buffer_put_int(&buffer, BN_num_bits(key->rsa->n));
                    376:        buffer_put_bignum(&buffer, key->rsa->e);
                    377:        buffer_put_bignum(&buffer, key->rsa->n);
1.12      markus    378:        buffer_put_bignum(&buffer, challenge);
1.47      stevesk   379:        buffer_append(&buffer, session_id, 16);
1.12      markus    380:        buffer_put_int(&buffer, response_type);
                    381:
1.24      markus    382:        if (ssh_request_reply(auth, &buffer, &buffer) == 0) {
1.12      markus    383:                buffer_free(&buffer);
                    384:                return 0;
                    385:        }
1.24      markus    386:        type = buffer_get_char(&buffer);
1.12      markus    387:
1.29      markus    388:        if (agent_failed(type)) {
1.59      itojun    389:                logit("Agent admitted failure to authenticate using the key.");
1.24      markus    390:        } else if (type != SSH_AGENT_RSA_RESPONSE) {
                    391:                fatal("Bad authentication response: %d", type);
                    392:        } else {
                    393:                success = 1;
                    394:                /*
                    395:                 * Get the response from the packet.  This will abort with a
                    396:                 * fatal error if the packet is corrupt.
                    397:                 */
                    398:                for (i = 0; i < 16; i++)
1.73    ! deraadt   399:                        response[i] = (u_char)buffer_get_char(&buffer);
1.12      markus    400:        }
                    401:        buffer_free(&buffer);
1.24      markus    402:        return success;
1.12      markus    403: }
1.1       deraadt   404:
1.25      markus    405: /* ask agent to sign data, returns -1 on error, 0 on success */
                    406: int
                    407: ssh_agent_sign(AuthenticationConnection *auth,
                    408:     Key *key,
1.48      markus    409:     u_char **sigp, u_int *lenp,
                    410:     u_char *data, u_int datalen)
1.25      markus    411: {
1.28      markus    412:        extern int datafellows;
1.25      markus    413:        Buffer msg;
1.31      markus    414:        u_char *blob;
                    415:        u_int blen;
1.28      markus    416:        int type, flags = 0;
1.25      markus    417:        int ret = -1;
                    418:
1.30      markus    419:        if (key_to_blob(key, &blob, &blen) == 0)
1.25      markus    420:                return -1;
                    421:
1.28      markus    422:        if (datafellows & SSH_BUG_SIGBLOB)
                    423:                flags = SSH_AGENT_OLD_SIGNATURE;
                    424:
1.25      markus    425:        buffer_init(&msg);
                    426:        buffer_put_char(&msg, SSH2_AGENTC_SIGN_REQUEST);
                    427:        buffer_put_string(&msg, blob, blen);
                    428:        buffer_put_string(&msg, data, datalen);
1.28      markus    429:        buffer_put_int(&msg, flags);
1.25      markus    430:        xfree(blob);
                    431:
                    432:        if (ssh_request_reply(auth, &msg, &msg) == 0) {
                    433:                buffer_free(&msg);
                    434:                return -1;
                    435:        }
                    436:        type = buffer_get_char(&msg);
1.29      markus    437:        if (agent_failed(type)) {
1.59      itojun    438:                logit("Agent admitted failure to sign using the key.");
1.25      markus    439:        } else if (type != SSH2_AGENT_SIGN_RESPONSE) {
                    440:                fatal("Bad authentication response: %d", type);
                    441:        } else {
                    442:                ret = 0;
                    443:                *sigp = buffer_get_string(&msg, lenp);
                    444:        }
                    445:        buffer_free(&msg);
                    446:        return ret;
                    447: }
                    448:
1.22      markus    449: /* Encode key for a message to the agent. */
                    450:
1.41      itojun    451: static void
1.30      markus    452: ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
1.22      markus    453: {
                    454:        buffer_put_int(b, BN_num_bits(key->n));
                    455:        buffer_put_bignum(b, key->n);
                    456:        buffer_put_bignum(b, key->e);
                    457:        buffer_put_bignum(b, key->d);
                    458:        /* To keep within the protocol: p < q for ssh. in SSL p > q */
                    459:        buffer_put_bignum(b, key->iqmp);        /* ssh key->u */
                    460:        buffer_put_bignum(b, key->q);   /* ssh key->p, SSL key->q */
                    461:        buffer_put_bignum(b, key->p);   /* ssh key->q, SSL key->p */
1.40      markus    462:        buffer_put_cstring(b, comment);
1.22      markus    463: }
                    464:
1.41      itojun    465: static void
1.30      markus    466: ssh_encode_identity_ssh2(Buffer *b, Key *key, const char *comment)
1.22      markus    467: {
1.30      markus    468:        buffer_put_cstring(b, key_ssh_name(key));
1.46      deraadt   469:        switch (key->type) {
1.30      markus    470:        case KEY_RSA:
                    471:                buffer_put_bignum2(b, key->rsa->n);
                    472:                buffer_put_bignum2(b, key->rsa->e);
                    473:                buffer_put_bignum2(b, key->rsa->d);
                    474:                buffer_put_bignum2(b, key->rsa->iqmp);
                    475:                buffer_put_bignum2(b, key->rsa->p);
                    476:                buffer_put_bignum2(b, key->rsa->q);
                    477:                break;
                    478:        case KEY_DSA:
                    479:                buffer_put_bignum2(b, key->dsa->p);
                    480:                buffer_put_bignum2(b, key->dsa->q);
                    481:                buffer_put_bignum2(b, key->dsa->g);
                    482:                buffer_put_bignum2(b, key->dsa->pub_key);
                    483:                buffer_put_bignum2(b, key->dsa->priv_key);
                    484:                break;
                    485:        }
                    486:        buffer_put_cstring(b, comment);
1.22      markus    487: }
                    488:
1.14      markus    489: /*
                    490:  * Adds an identity to the authentication server.  This call is not meant to
                    491:  * be used by normal applications.
                    492:  */
1.1       deraadt   493:
1.18      markus    494: int
1.54      markus    495: ssh_add_identity_constrained(AuthenticationConnection *auth, Key *key,
1.58      markus    496:     const char *comment, u_int life, u_int confirm)
1.1       deraadt   497: {
1.25      markus    498:        Buffer msg;
1.58      markus    499:        int type, constrained = (life || confirm);
1.12      markus    500:
1.25      markus    501:        buffer_init(&msg);
1.22      markus    502:
                    503:        switch (key->type) {
1.30      markus    504:        case KEY_RSA1:
1.54      markus    505:                type = constrained ?
                    506:                    SSH_AGENTC_ADD_RSA_ID_CONSTRAINED :
                    507:                    SSH_AGENTC_ADD_RSA_IDENTITY;
                    508:                buffer_put_char(&msg, type);
1.30      markus    509:                ssh_encode_identity_rsa1(&msg, key->rsa, comment);
                    510:                break;
1.22      markus    511:        case KEY_RSA:
                    512:        case KEY_DSA:
1.54      markus    513:                type = constrained ?
                    514:                    SSH2_AGENTC_ADD_ID_CONSTRAINED :
                    515:                    SSH2_AGENTC_ADD_IDENTITY;
                    516:                buffer_put_char(&msg, type);
1.30      markus    517:                ssh_encode_identity_ssh2(&msg, key, comment);
1.22      markus    518:                break;
                    519:        default:
1.25      markus    520:                buffer_free(&msg);
1.22      markus    521:                return 0;
                    522:        }
1.54      markus    523:        if (constrained) {
                    524:                if (life != 0) {
                    525:                        buffer_put_char(&msg, SSH_AGENT_CONSTRAIN_LIFETIME);
                    526:                        buffer_put_int(&msg, life);
                    527:                }
1.58      markus    528:                if (confirm != 0)
                    529:                        buffer_put_char(&msg, SSH_AGENT_CONSTRAIN_CONFIRM);
1.54      markus    530:        }
1.25      markus    531:        if (ssh_request_reply(auth, &msg, &msg) == 0) {
                    532:                buffer_free(&msg);
1.12      markus    533:                return 0;
                    534:        }
1.25      markus    535:        type = buffer_get_char(&msg);
                    536:        buffer_free(&msg);
1.24      markus    537:        return decode_reply(type);
1.12      markus    538: }
1.1       deraadt   539:
1.54      markus    540: int
                    541: ssh_add_identity(AuthenticationConnection *auth, Key *key, const char *comment)
                    542: {
1.58      markus    543:        return ssh_add_identity_constrained(auth, key, comment, 0, 0);
1.54      markus    544: }
                    545:
1.14      markus    546: /*
                    547:  * Removes an identity from the authentication server.  This call is not
                    548:  * meant to be used by normal applications.
                    549:  */
1.1       deraadt   550:
1.18      markus    551: int
1.25      markus    552: ssh_remove_identity(AuthenticationConnection *auth, Key *key)
1.1       deraadt   553: {
1.25      markus    554:        Buffer msg;
1.24      markus    555:        int type;
1.31      markus    556:        u_char *blob;
                    557:        u_int blen;
1.12      markus    558:
1.25      markus    559:        buffer_init(&msg);
1.12      markus    560:
1.30      markus    561:        if (key->type == KEY_RSA1) {
1.25      markus    562:                buffer_put_char(&msg, SSH_AGENTC_REMOVE_RSA_IDENTITY);
                    563:                buffer_put_int(&msg, BN_num_bits(key->rsa->n));
                    564:                buffer_put_bignum(&msg, key->rsa->e);
                    565:                buffer_put_bignum(&msg, key->rsa->n);
1.30      markus    566:        } else if (key->type == KEY_DSA || key->type == KEY_RSA) {
                    567:                key_to_blob(key, &blob, &blen);
1.25      markus    568:                buffer_put_char(&msg, SSH2_AGENTC_REMOVE_IDENTITY);
1.51      markus    569:                buffer_put_string(&msg, blob, blen);
                    570:                xfree(blob);
                    571:        } else {
                    572:                buffer_free(&msg);
                    573:                return 0;
                    574:        }
1.42      markus    575:        if (ssh_request_reply(auth, &msg, &msg) == 0) {
                    576:                buffer_free(&msg);
                    577:                return 0;
                    578:        }
                    579:        type = buffer_get_char(&msg);
                    580:        buffer_free(&msg);
                    581:        return decode_reply(type);
                    582: }
                    583:
                    584: int
1.63      djm       585: ssh_update_card(AuthenticationConnection *auth, int add,
1.60      djm       586:     const char *reader_id, const char *pin, u_int life, u_int confirm)
1.42      markus    587: {
                    588:        Buffer msg;
1.60      djm       589:        int type, constrained = (life || confirm);
                    590:
                    591:        if (add) {
                    592:                type = constrained ?
                    593:                    SSH_AGENTC_ADD_SMARTCARD_KEY_CONSTRAINED :
                    594:                    SSH_AGENTC_ADD_SMARTCARD_KEY;
                    595:        } else
                    596:                type = SSH_AGENTC_REMOVE_SMARTCARD_KEY;
1.42      markus    597:
                    598:        buffer_init(&msg);
1.60      djm       599:        buffer_put_char(&msg, type);
1.43      markus    600:        buffer_put_cstring(&msg, reader_id);
1.49      rees      601:        buffer_put_cstring(&msg, pin);
1.63      djm       602:
1.60      djm       603:        if (constrained) {
                    604:                if (life != 0) {
                    605:                        buffer_put_char(&msg, SSH_AGENT_CONSTRAIN_LIFETIME);
                    606:                        buffer_put_int(&msg, life);
                    607:                }
                    608:                if (confirm != 0)
                    609:                        buffer_put_char(&msg, SSH_AGENT_CONSTRAIN_CONFIRM);
                    610:        }
                    611:
1.25      markus    612:        if (ssh_request_reply(auth, &msg, &msg) == 0) {
                    613:                buffer_free(&msg);
1.12      markus    614:                return 0;
                    615:        }
1.25      markus    616:        type = buffer_get_char(&msg);
                    617:        buffer_free(&msg);
1.24      markus    618:        return decode_reply(type);
1.12      markus    619: }
                    620:
1.14      markus    621: /*
                    622:  * Removes all identities from the agent.  This call is not meant to be used
                    623:  * by normal applications.
                    624:  */
1.1       deraadt   625:
1.18      markus    626: int
1.25      markus    627: ssh_remove_all_identities(AuthenticationConnection *auth, int version)
1.1       deraadt   628: {
1.25      markus    629:        Buffer msg;
1.24      markus    630:        int type;
1.25      markus    631:        int code = (version==1) ?
                    632:                SSH_AGENTC_REMOVE_ALL_RSA_IDENTITIES :
                    633:                SSH2_AGENTC_REMOVE_ALL_IDENTITIES;
1.12      markus    634:
1.25      markus    635:        buffer_init(&msg);
                    636:        buffer_put_char(&msg, code);
1.12      markus    637:
1.25      markus    638:        if (ssh_request_reply(auth, &msg, &msg) == 0) {
                    639:                buffer_free(&msg);
1.12      markus    640:                return 0;
                    641:        }
1.25      markus    642:        type = buffer_get_char(&msg);
                    643:        buffer_free(&msg);
1.24      markus    644:        return decode_reply(type);
1.21      markus    645: }
                    646:
1.35      stevesk   647: int
1.24      markus    648: decode_reply(int type)
1.21      markus    649: {
1.12      markus    650:        switch (type) {
                    651:        case SSH_AGENT_FAILURE:
1.29      markus    652:        case SSH_COM_AGENT2_FAILURE:
1.44      markus    653:        case SSH2_AGENT_FAILURE:
1.59      itojun    654:                logit("SSH_AGENT_FAILURE");
1.12      markus    655:                return 0;
                    656:        case SSH_AGENT_SUCCESS:
                    657:                return 1;
                    658:        default:
1.21      markus    659:                fatal("Bad response from authentication agent: %d", type);
1.12      markus    660:        }
                    661:        /* NOTREACHED */
                    662:        return 0;
                    663: }