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

1.117   ! djm         1: /* $OpenBSD: authfd.c,v 1.116 2019/09/03 08:28:30 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:
1.67      stevesk    38:
                     39: #include <sys/types.h>
                     40: #include <sys/un.h>
1.75      stevesk    41: #include <sys/socket.h>
1.33      markus     42:
1.76      stevesk    43: #include <fcntl.h>
1.79      stevesk    44: #include <stdlib.h>
1.80      deraadt    45: #include <signal.h>
1.78      stevesk    46: #include <string.h>
1.77      stevesk    47: #include <unistd.h>
1.94      djm        48: #include <errno.h>
1.1       deraadt    49:
1.80      deraadt    50: #include "xmalloc.h"
1.1       deraadt    51: #include "ssh.h"
1.94      djm        52: #include "sshbuf.h"
                     53: #include "sshkey.h"
1.22      markus     54: #include "authfd.h"
1.33      markus     55: #include "cipher.h"
1.28      markus     56: #include "compat.h"
1.33      markus     57: #include "log.h"
                     58: #include "atomicio.h"
1.74      djm        59: #include "misc.h"
1.94      djm        60: #include "ssherr.h"
1.2       provos     61:
1.94      djm        62: #define MAX_AGENT_IDENTITIES   2048            /* Max keys in agent reply */
                     63: #define MAX_AGENT_REPLY_LEN    (256 * 1024)    /* Max bytes in agent reply */
1.21      markus     64:
1.29      markus     65: /* macro to check for "agent failure" message */
                     66: #define agent_failed(x) \
1.94      djm        67:     ((x == SSH_AGENT_FAILURE) || \
                     68:     (x == SSH_COM_AGENT2_FAILURE) || \
1.55      deraadt    69:     (x == SSH2_AGENT_FAILURE))
1.29      markus     70:
1.94      djm        71: /* Convert success/failure response from agent to a err.h status */
                     72: static int
                     73: decode_reply(u_char type)
1.57      stevesk    74: {
1.94      djm        75:        if (agent_failed(type))
                     76:                return SSH_ERR_AGENT_FAILURE;
                     77:        else if (type == SSH_AGENT_SUCCESS)
1.57      stevesk    78:                return 0;
1.94      djm        79:        else
                     80:                return SSH_ERR_INVALID_FORMAT;
1.57      stevesk    81: }
                     82:
1.1       deraadt    83: /* Returns the number of the authentication fd, or -1 if there is none. */
1.2       provos     84: int
1.94      djm        85: ssh_get_authentication_socket(int *fdp)
1.1       deraadt    86: {
1.12      markus     87:        const char *authsocket;
1.94      djm        88:        int sock, oerrno;
1.12      markus     89:        struct sockaddr_un sunaddr;
                     90:
1.94      djm        91:        if (fdp != NULL)
                     92:                *fdp = -1;
                     93:
1.12      markus     94:        authsocket = getenv(SSH_AUTHSOCKET_ENV_NAME);
1.112     djm        95:        if (authsocket == NULL || *authsocket == '\0')
1.94      djm        96:                return SSH_ERR_AGENT_NOT_PRESENT;
1.12      markus     97:
1.92      tedu       98:        memset(&sunaddr, 0, sizeof(sunaddr));
1.12      markus     99:        sunaddr.sun_family = AF_UNIX;
                    100:        strlcpy(sunaddr.sun_path, authsocket, sizeof(sunaddr.sun_path));
                    101:
1.115     deraadt   102:        if ((sock = socket(AF_UNIX, SOCK_STREAM, 0)) == -1)
1.94      djm       103:                return SSH_ERR_SYSTEM_ERROR;
1.12      markus    104:
                    105:        /* close on exec */
1.94      djm       106:        if (fcntl(sock, F_SETFD, FD_CLOEXEC) == -1 ||
1.115     deraadt   107:            connect(sock, (struct sockaddr *)&sunaddr, sizeof(sunaddr)) == -1) {
1.94      djm       108:                oerrno = errno;
1.12      markus    109:                close(sock);
1.94      djm       110:                errno = oerrno;
                    111:                return SSH_ERR_SYSTEM_ERROR;
1.12      markus    112:        }
1.94      djm       113:        if (fdp != NULL)
                    114:                *fdp = sock;
                    115:        else
1.12      markus    116:                close(sock);
1.94      djm       117:        return 0;
1.1       deraadt   118: }
                    119:
1.94      djm       120: /* Communicate with agent: send request and read reply */
1.41      itojun    121: static int
1.94      djm       122: ssh_request_reply(int sock, struct sshbuf *request, struct sshbuf *reply)
1.24      markus    123: {
1.94      djm       124:        int r;
                    125:        size_t l, len;
1.24      markus    126:        char buf[1024];
                    127:
                    128:        /* Get the length of the message, and format it in the buffer. */
1.94      djm       129:        len = sshbuf_len(request);
1.108     markus    130:        POKE_U32(buf, len);
1.24      markus    131:
                    132:        /* Send the length and then the packet to the agent. */
1.94      djm       133:        if (atomicio(vwrite, sock, buf, 4) != 4 ||
1.111     markus    134:            atomicio(vwrite, sock, sshbuf_mutable_ptr(request),
1.94      djm       135:            sshbuf_len(request)) != sshbuf_len(request))
                    136:                return SSH_ERR_AGENT_COMMUNICATION;
1.24      markus    137:        /*
                    138:         * Wait for response from the agent.  First read the length of the
                    139:         * response packet.
                    140:         */
1.94      djm       141:        if (atomicio(read, sock, buf, 4) != 4)
                    142:            return SSH_ERR_AGENT_COMMUNICATION;
1.24      markus    143:
                    144:        /* Extract the length, and check it for sanity. */
1.108     markus    145:        len = PEEK_U32(buf);
1.94      djm       146:        if (len > MAX_AGENT_REPLY_LEN)
                    147:                return SSH_ERR_INVALID_FORMAT;
1.24      markus    148:
                    149:        /* Read the rest of the response in to the buffer. */
1.94      djm       150:        sshbuf_reset(reply);
1.24      markus    151:        while (len > 0) {
                    152:                l = len;
                    153:                if (l > sizeof(buf))
                    154:                        l = sizeof(buf);
1.94      djm       155:                if (atomicio(read, sock, buf, l) != l)
                    156:                        return SSH_ERR_AGENT_COMMUNICATION;
                    157:                if ((r = sshbuf_put(reply, buf, l)) != 0)
                    158:                        return r;
1.24      markus    159:                len -= l;
                    160:        }
1.94      djm       161:        return 0;
1.24      markus    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.18      markus    169: void
1.12      markus    170: ssh_close_authentication_socket(int sock)
1.1       deraadt   171: {
1.12      markus    172:        if (getenv(SSH_AUTHSOCKET_ENV_NAME))
                    173:                close(sock);
1.1       deraadt   174: }
                    175:
1.94      djm       176: /* Lock/unlock agent */
                    177: int
                    178: ssh_lock_agent(int sock, int lock, const char *password)
1.1       deraadt   179: {
1.94      djm       180:        int r;
                    181:        u_char type = lock ? SSH_AGENTC_LOCK : SSH_AGENTC_UNLOCK;
                    182:        struct sshbuf *msg;
                    183:
                    184:        if ((msg = sshbuf_new()) == NULL)
                    185:                return SSH_ERR_ALLOC_FAIL;
                    186:        if ((r = sshbuf_put_u8(msg, type)) != 0 ||
                    187:            (r = sshbuf_put_cstring(msg, password)) != 0)
                    188:                goto out;
                    189:        if ((r = ssh_request_reply(sock, msg, msg)) != 0)
                    190:                goto out;
                    191:        if ((r = sshbuf_get_u8(msg, &type)) != 0)
                    192:                goto out;
                    193:        r = decode_reply(type);
                    194:  out:
                    195:        sshbuf_free(msg);
                    196:        return r;
1.1       deraadt   197: }
                    198:
1.50      markus    199:
1.94      djm       200: static int
                    201: deserialise_identity2(struct sshbuf *ids, struct sshkey **keyp, char **commentp)
1.50      markus    202: {
1.94      djm       203:        int r;
                    204:        char *comment = NULL;
                    205:        const u_char *blob;
                    206:        size_t blen;
                    207:
                    208:        if ((r = sshbuf_get_string_direct(ids, &blob, &blen)) != 0 ||
                    209:            (r = sshbuf_get_cstring(ids, &comment, NULL)) != 0)
                    210:                goto out;
                    211:        if ((r = sshkey_from_blob(blob, blen, keyp)) != 0)
                    212:                goto out;
                    213:        if (commentp != NULL) {
                    214:                *commentp = comment;
                    215:                comment = NULL;
                    216:        }
                    217:        r = 0;
                    218:  out:
                    219:        free(comment);
                    220:        return r;
1.1       deraadt   221: }
                    222:
1.14      markus    223: /*
1.94      djm       224:  * Fetch list of identities held by the agent.
1.14      markus    225:  */
1.30      markus    226: int
1.103     naddy     227: ssh_fetch_identitylist(int sock, struct ssh_identitylist **idlp)
1.1       deraadt   228: {
1.103     naddy     229:        u_char type;
1.94      djm       230:        u_int32_t num, i;
                    231:        struct sshbuf *msg;
                    232:        struct ssh_identitylist *idl = NULL;
                    233:        int r;
1.25      markus    234:
1.14      markus    235:        /*
                    236:         * Send a message to the agent requesting for a list of the
                    237:         * identities it can represent.
                    238:         */
1.94      djm       239:        if ((msg = sshbuf_new()) == NULL)
                    240:                return SSH_ERR_ALLOC_FAIL;
1.103     naddy     241:        if ((r = sshbuf_put_u8(msg, SSH2_AGENTC_REQUEST_IDENTITIES)) != 0)
1.94      djm       242:                goto out;
1.12      markus    243:
1.94      djm       244:        if ((r = ssh_request_reply(sock, msg, msg)) != 0)
                    245:                goto out;
1.1       deraadt   246:
1.12      markus    247:        /* Get message type, and verify that we got a proper answer. */
1.94      djm       248:        if ((r = sshbuf_get_u8(msg, &type)) != 0)
                    249:                goto out;
1.29      markus    250:        if (agent_failed(type)) {
1.94      djm       251:                r = SSH_ERR_AGENT_FAILURE;
                    252:                goto out;
1.103     naddy     253:        } else if (type != SSH2_AGENT_IDENTITIES_ANSWER) {
1.94      djm       254:                r = SSH_ERR_INVALID_FORMAT;
                    255:                goto out;
1.25      markus    256:        }
1.12      markus    257:
                    258:        /* Get the number of entries in the response and check it for sanity. */
1.94      djm       259:        if ((r = sshbuf_get_u32(msg, &num)) != 0)
                    260:                goto out;
                    261:        if (num > MAX_AGENT_IDENTITIES) {
                    262:                r = SSH_ERR_INVALID_FORMAT;
                    263:                goto out;
                    264:        }
                    265:        if (num == 0) {
                    266:                r = SSH_ERR_AGENT_NO_IDENTITIES;
                    267:                goto out;
                    268:        }
                    269:
                    270:        /* Deserialise the response into a list of keys/comments */
                    271:        if ((idl = calloc(1, sizeof(*idl))) == NULL ||
                    272:            (idl->keys = calloc(num, sizeof(*idl->keys))) == NULL ||
                    273:            (idl->comments = calloc(num, sizeof(*idl->comments))) == NULL) {
                    274:                r = SSH_ERR_ALLOC_FAIL;
                    275:                goto out;
                    276:        }
                    277:        for (i = 0; i < num;) {
1.103     naddy     278:                if ((r = deserialise_identity2(msg, &(idl->keys[i]),
                    279:                    &(idl->comments[i]))) != 0) {
                    280:                        if (r == SSH_ERR_KEY_TYPE_UNKNOWN) {
                    281:                                /* Gracefully skip unknown key types */
                    282:                                num--;
                    283:                                continue;
                    284:                        } else
                    285:                                goto out;
1.94      djm       286:                }
                    287:                i++;
                    288:        }
                    289:        idl->nkeys = num;
                    290:        *idlp = idl;
                    291:        idl = NULL;
                    292:        r = 0;
                    293:  out:
                    294:        sshbuf_free(msg);
                    295:        if (idl != NULL)
                    296:                ssh_free_identitylist(idl);
                    297:        return r;
1.30      markus    298: }
                    299:
1.94      djm       300: void
                    301: ssh_free_identitylist(struct ssh_identitylist *idl)
1.30      markus    302: {
1.94      djm       303:        size_t i;
1.1       deraadt   304:
1.94      djm       305:        if (idl == NULL)
                    306:                return;
                    307:        for (i = 0; i < idl->nkeys; i++) {
                    308:                if (idl->keys != NULL)
                    309:                        sshkey_free(idl->keys[i]);
                    310:                if (idl->comments != NULL)
                    311:                        free(idl->comments[i]);
1.25      markus    312:        }
1.116     djm       313:        free(idl->keys);
                    314:        free(idl->comments);
1.94      djm       315:        free(idl);
1.117   ! djm       316: }
        !           317:
        !           318: /*
        !           319:  * Check if the ssh agent has a given key.
        !           320:  * Returns 0 if found, or a negative SSH_ERR_* error code on failure.
        !           321:  */
        !           322: int
        !           323: ssh_agent_has_key(int sock, struct sshkey *key)
        !           324: {
        !           325:        int r, ret = SSH_ERR_KEY_NOT_FOUND;
        !           326:        size_t i;
        !           327:        struct ssh_identitylist *idlist = NULL;
        !           328:
        !           329:        if ((r = ssh_fetch_identitylist(sock, &idlist)) < 0) {
        !           330:                return r;
        !           331:        }
        !           332:
        !           333:        for (i = 0; i < idlist->nkeys; i++) {
        !           334:                if (sshkey_equal_public(idlist->keys[i], key)) {
        !           335:                        ret = 0;
        !           336:                        break;
        !           337:                }
        !           338:        }
        !           339:
        !           340:        ssh_free_identitylist(idlist);
        !           341:        return ret;
1.1       deraadt   342: }
                    343:
1.14      markus    344: /*
1.94      djm       345:  * Sends a challenge (typically from a server via ssh(1)) to the agent,
                    346:  * and waits for a response from the agent.
                    347:  * Returns true (non-zero) if the agent gave the correct answer, zero
                    348:  * otherwise.
1.14      markus    349:  */
1.1       deraadt   350:
                    351:
1.109     djm       352: /* encode signature algorithm in flag bits, so we can keep the msg format */
1.100     markus    353: static u_int
1.104     djm       354: agent_encode_alg(const struct sshkey *key, const char *alg)
1.100     markus    355: {
1.113     djm       356:        if (alg != NULL && sshkey_type_plain(key->type) == KEY_RSA) {
                    357:                if (strcmp(alg, "rsa-sha2-256") == 0 ||
                    358:                    strcmp(alg, "rsa-sha2-256-cert-v01@openssh.com") == 0)
1.100     markus    359:                        return SSH_AGENT_RSA_SHA2_256;
1.113     djm       360:                if (strcmp(alg, "rsa-sha2-512") == 0 ||
                    361:                    strcmp(alg, "rsa-sha2-512-cert-v01@openssh.com") == 0)
1.100     markus    362:                        return SSH_AGENT_RSA_SHA2_512;
                    363:        }
                    364:        return 0;
                    365: }
                    366:
1.94      djm       367: /* ask agent to sign data, returns err.h code on error, 0 on success */
1.25      markus    368: int
1.104     djm       369: ssh_agent_sign(int sock, const struct sshkey *key,
1.94      djm       370:     u_char **sigp, size_t *lenp,
1.100     markus    371:     const u_char *data, size_t datalen, const char *alg, u_int compat)
1.94      djm       372: {
                    373:        struct sshbuf *msg;
1.110     djm       374:        u_char *sig = NULL, type = 0;
                    375:        size_t len = 0;
1.94      djm       376:        u_int flags = 0;
                    377:        int r = SSH_ERR_INTERNAL_ERROR;
                    378:
1.97      markus    379:        *sigp = NULL;
                    380:        *lenp = 0;
1.94      djm       381:
                    382:        if (datalen > SSH_KEY_MAX_SIGN_DATA_SIZE)
                    383:                return SSH_ERR_INVALID_ARGUMENT;
                    384:        if ((msg = sshbuf_new()) == NULL)
                    385:                return SSH_ERR_ALLOC_FAIL;
1.100     markus    386:        flags |= agent_encode_alg(key, alg);
1.94      djm       387:        if ((r = sshbuf_put_u8(msg, SSH2_AGENTC_SIGN_REQUEST)) != 0 ||
1.110     djm       388:            (r = sshkey_puts(key, msg)) != 0 ||
1.94      djm       389:            (r = sshbuf_put_string(msg, data, datalen)) != 0 ||
                    390:            (r = sshbuf_put_u32(msg, flags)) != 0)
                    391:                goto out;
1.99      jsg       392:        if ((r = ssh_request_reply(sock, msg, msg)) != 0)
1.94      djm       393:                goto out;
                    394:        if ((r = sshbuf_get_u8(msg, &type)) != 0)
                    395:                goto out;
1.29      markus    396:        if (agent_failed(type)) {
1.94      djm       397:                r = SSH_ERR_AGENT_FAILURE;
                    398:                goto out;
1.25      markus    399:        } else if (type != SSH2_AGENT_SIGN_RESPONSE) {
1.94      djm       400:                r = SSH_ERR_INVALID_FORMAT;
                    401:                goto out;
                    402:        }
1.110     djm       403:        if ((r = sshbuf_get_string(msg, &sig, &len)) != 0)
                    404:                goto out;
                    405:        /* Check what we actually got back from the agent. */
                    406:        if ((r = sshkey_check_sigtype(sig, len, alg)) != 0)
1.94      djm       407:                goto out;
1.110     djm       408:        /* success */
                    409:        *sigp = sig;
1.97      markus    410:        *lenp = len;
1.110     djm       411:        sig = NULL;
                    412:        len = 0;
1.94      djm       413:        r = 0;
                    414:  out:
1.110     djm       415:        freezero(sig, len);
1.94      djm       416:        sshbuf_free(msg);
                    417:        return r;
1.25      markus    418: }
                    419:
1.22      markus    420: /* Encode key for a message to the agent. */
                    421:
                    422:
1.94      djm       423: static int
1.108     markus    424: encode_constraints(struct sshbuf *m, u_int life, u_int confirm, u_int maxsign)
1.94      djm       425: {
                    426:        int r;
                    427:
                    428:        if (life != 0) {
                    429:                if ((r = sshbuf_put_u8(m, SSH_AGENT_CONSTRAIN_LIFETIME)) != 0 ||
                    430:                    (r = sshbuf_put_u32(m, life)) != 0)
                    431:                        goto out;
                    432:        }
                    433:        if (confirm != 0) {
                    434:                if ((r = sshbuf_put_u8(m, SSH_AGENT_CONSTRAIN_CONFIRM)) != 0)
                    435:                        goto out;
                    436:        }
1.108     markus    437:        if (maxsign != 0) {
                    438:                if ((r = sshbuf_put_u8(m, SSH_AGENT_CONSTRAIN_MAXSIGN)) != 0 ||
                    439:                    (r = sshbuf_put_u32(m, maxsign)) != 0)
                    440:                        goto out;
                    441:        }
1.94      djm       442:        r = 0;
                    443:  out:
                    444:        return r;
1.22      markus    445: }
                    446:
1.14      markus    447: /*
1.94      djm       448:  * Adds an identity to the authentication server.
                    449:  * This call is intended only for use by ssh-add(1) and like applications.
1.14      markus    450:  */
1.18      markus    451: int
1.114     djm       452: ssh_add_identity_constrained(int sock, struct sshkey *key,
1.108     markus    453:     const char *comment, u_int life, u_int confirm, u_int maxsign)
1.1       deraadt   454: {
1.94      djm       455:        struct sshbuf *msg;
1.108     markus    456:        int r, constrained = (life || confirm || maxsign);
1.94      djm       457:        u_char type;
1.12      markus    458:
1.94      djm       459:        if ((msg = sshbuf_new()) == NULL)
                    460:                return SSH_ERR_ALLOC_FAIL;
1.22      markus    461:
                    462:        switch (key->type) {
1.93      markus    463: #ifdef WITH_OPENSSL
1.22      markus    464:        case KEY_RSA:
1.82      djm       465:        case KEY_RSA_CERT:
1.22      markus    466:        case KEY_DSA:
1.82      djm       467:        case KEY_DSA_CERT:
1.84      djm       468:        case KEY_ECDSA:
                    469:        case KEY_ECDSA_CERT:
1.93      markus    470: #endif
1.90      markus    471:        case KEY_ED25519:
                    472:        case KEY_ED25519_CERT:
1.108     markus    473:        case KEY_XMSS:
                    474:        case KEY_XMSS_CERT:
1.54      markus    475:                type = constrained ?
                    476:                    SSH2_AGENTC_ADD_ID_CONSTRAINED :
                    477:                    SSH2_AGENTC_ADD_IDENTITY;
1.94      djm       478:                if ((r = sshbuf_put_u8(msg, type)) != 0 ||
1.108     markus    479:                    (r = sshkey_private_serialize_maxsign(key, msg, maxsign,
                    480:                    NULL)) != 0 ||
                    481:                    (r = sshbuf_put_cstring(msg, comment)) != 0)
1.94      djm       482:                        goto out;
1.22      markus    483:                break;
                    484:        default:
1.94      djm       485:                r = SSH_ERR_INVALID_ARGUMENT;
                    486:                goto out;
1.12      markus    487:        }
1.94      djm       488:        if (constrained &&
1.108     markus    489:            (r = encode_constraints(msg, life, confirm, maxsign)) != 0)
1.94      djm       490:                goto out;
                    491:        if ((r = ssh_request_reply(sock, msg, msg)) != 0)
                    492:                goto out;
                    493:        if ((r = sshbuf_get_u8(msg, &type)) != 0)
                    494:                goto out;
                    495:        r = decode_reply(type);
                    496:  out:
                    497:        sshbuf_free(msg);
                    498:        return r;
1.54      markus    499: }
                    500:
1.14      markus    501: /*
1.94      djm       502:  * Removes an identity from the authentication server.
                    503:  * This call is intended only for use by ssh-add(1) and like applications.
1.14      markus    504:  */
1.18      markus    505: int
1.94      djm       506: ssh_remove_identity(int sock, struct sshkey *key)
1.1       deraadt   507: {
1.94      djm       508:        struct sshbuf *msg;
                    509:        int r;
                    510:        u_char type, *blob = NULL;
                    511:        size_t blen;
1.12      markus    512:
1.94      djm       513:        if ((msg = sshbuf_new()) == NULL)
                    514:                return SSH_ERR_ALLOC_FAIL;
1.12      markus    515:
1.93      markus    516:        if (key->type != KEY_UNSPEC) {
1.94      djm       517:                if ((r = sshkey_to_blob(key, &blob, &blen)) != 0)
                    518:                        goto out;
                    519:                if ((r = sshbuf_put_u8(msg,
                    520:                    SSH2_AGENTC_REMOVE_IDENTITY)) != 0 ||
                    521:                    (r = sshbuf_put_string(msg, blob, blen)) != 0)
                    522:                        goto out;
1.51      markus    523:        } else {
1.94      djm       524:                r = SSH_ERR_INVALID_ARGUMENT;
                    525:                goto out;
1.51      markus    526:        }
1.94      djm       527:        if ((r = ssh_request_reply(sock, msg, msg)) != 0)
                    528:                goto out;
                    529:        if ((r = sshbuf_get_u8(msg, &type)) != 0)
                    530:                goto out;
                    531:        r = decode_reply(type);
                    532:  out:
                    533:        if (blob != NULL) {
                    534:                explicit_bzero(blob, blen);
                    535:                free(blob);
1.42      markus    536:        }
1.94      djm       537:        sshbuf_free(msg);
                    538:        return r;
1.42      markus    539: }
                    540:
1.94      djm       541: /*
                    542:  * Add/remove an token-based identity from the authentication server.
                    543:  * This call is intended only for use by ssh-add(1) and like applications.
                    544:  */
1.42      markus    545: int
1.94      djm       546: ssh_update_card(int sock, int add, const char *reader_id, const char *pin,
                    547:     u_int life, u_int confirm)
1.42      markus    548: {
1.94      djm       549:        struct sshbuf *msg;
                    550:        int r, constrained = (life || confirm);
                    551:        u_char type;
1.60      djm       552:
                    553:        if (add) {
                    554:                type = constrained ?
                    555:                    SSH_AGENTC_ADD_SMARTCARD_KEY_CONSTRAINED :
                    556:                    SSH_AGENTC_ADD_SMARTCARD_KEY;
                    557:        } else
                    558:                type = SSH_AGENTC_REMOVE_SMARTCARD_KEY;
1.42      markus    559:
1.94      djm       560:        if ((msg = sshbuf_new()) == NULL)
                    561:                return SSH_ERR_ALLOC_FAIL;
                    562:        if ((r = sshbuf_put_u8(msg, type)) != 0 ||
                    563:            (r = sshbuf_put_cstring(msg, reader_id)) != 0 ||
                    564:            (r = sshbuf_put_cstring(msg, pin)) != 0)
                    565:                goto out;
                    566:        if (constrained &&
1.108     markus    567:            (r = encode_constraints(msg, life, confirm, 0)) != 0)
1.94      djm       568:                goto out;
                    569:        if ((r = ssh_request_reply(sock, msg, msg)) != 0)
                    570:                goto out;
                    571:        if ((r = sshbuf_get_u8(msg, &type)) != 0)
                    572:                goto out;
                    573:        r = decode_reply(type);
                    574:  out:
                    575:        sshbuf_free(msg);
                    576:        return r;
1.12      markus    577: }
                    578:
1.14      markus    579: /*
1.94      djm       580:  * Removes all identities from the agent.
                    581:  * This call is intended only for use by ssh-add(1) and like applications.
1.102     djm       582:  *
                    583:  * This supports the SSH protocol 1 message to because, when clearing all
                    584:  * keys from an agent, we generally want to clear both protocol v1 and v2
                    585:  * keys.
1.14      markus    586:  */
1.18      markus    587: int
1.94      djm       588: ssh_remove_all_identities(int sock, int version)
1.1       deraadt   589: {
1.94      djm       590:        struct sshbuf *msg;
                    591:        u_char type = (version == 1) ?
                    592:            SSH_AGENTC_REMOVE_ALL_RSA_IDENTITIES :
                    593:            SSH2_AGENTC_REMOVE_ALL_IDENTITIES;
                    594:        int r;
                    595:
                    596:        if ((msg = sshbuf_new()) == NULL)
                    597:                return SSH_ERR_ALLOC_FAIL;
                    598:        if ((r = sshbuf_put_u8(msg, type)) != 0)
                    599:                goto out;
                    600:        if ((r = ssh_request_reply(sock, msg, msg)) != 0)
                    601:                goto out;
                    602:        if ((r = sshbuf_get_u8(msg, &type)) != 0)
                    603:                goto out;
                    604:        r = decode_reply(type);
                    605:  out:
                    606:        sshbuf_free(msg);
                    607:        return r;
1.12      markus    608: }