[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.65

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