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

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