blob: 2eb4513d472d6f01c8b98c76b8dca9fca29a8c78 [file] [log] [blame]
Damien Millerd4a8b7e1999-10-27 13:42:43 +10001/*
Damien Miller95def091999-11-25 00:26:21 +11002 * Author: Tatu Ylonen <ylo@cs.hut.fi>
Damien Miller95def091999-11-25 00:26:21 +11003 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
4 * All rights reserved
Damien Miller95def091999-11-25 00:26:21 +11005 * Functions for connecting the local authentication agent.
Damien Miller4af51302000-04-16 11:18:38 +10006 *
Damien Millere4340be2000-09-16 13:29:08 +11007 * 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".
Damien Millerad833b32000-08-23 10:46:23 +100012 *
Damien Millere4340be2000-09-16 13:29:08 +110013 * SSH2 implementation,
14 * Copyright (c) 2000 Markus Friedl. All rights reserved.
15 *
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.
Damien Miller95def091999-11-25 00:26:21 +110035 */
Damien Millerd4a8b7e1999-10-27 13:42:43 +100036
37#include "includes.h"
Ben Lindstromc9a26362001-08-15 23:04:50 +000038RCSID("$OpenBSD: authfd.c,v 1.44 2001/08/07 10:37:46 markus Exp $");
Ben Lindstrom226cfa02001-01-22 05:34:40 +000039
40#include <openssl/evp.h>
Damien Millerd4a8b7e1999-10-27 13:42:43 +100041
42#include "ssh.h"
43#include "rsa.h"
Damien Millerd4a8b7e1999-10-27 13:42:43 +100044#include "buffer.h"
45#include "bufaux.h"
46#include "xmalloc.h"
47#include "getput.h"
Damien Miller994cf142000-07-21 10:19:44 +100048#include "key.h"
49#include "authfd.h"
Ben Lindstrom226cfa02001-01-22 05:34:40 +000050#include "cipher.h"
Damien Miller994cf142000-07-21 10:19:44 +100051#include "kex.h"
Damien Miller62cee002000-09-23 17:15:56 +110052#include "compat.h"
Ben Lindstrom226cfa02001-01-22 05:34:40 +000053#include "log.h"
54#include "atomicio.h"
Damien Millerd4a8b7e1999-10-27 13:42:43 +100055
Damien Miller37023962000-07-11 17:31:38 +100056/* helper */
Damien Miller942da032000-08-18 13:59:06 +100057int decode_reply(int type);
Damien Miller37023962000-07-11 17:31:38 +100058
Damien Miller874d77b2000-10-14 16:23:11 +110059/* macro to check for "agent failure" message */
60#define agent_failed(x) \
Ben Lindstromc9a26362001-08-15 23:04:50 +000061 ((x == SSH_AGENT_FAILURE) || (x == SSH_COM_AGENT2_FAILURE) || \
62 (x == SSH2_AGENT_FAILURE))
Damien Miller874d77b2000-10-14 16:23:11 +110063
Damien Millerd4a8b7e1999-10-27 13:42:43 +100064/* Returns the number of the authentication fd, or -1 if there is none. */
65
66int
Ben Lindstrom46c16222000-12-22 01:43:59 +000067ssh_get_authentication_socket(void)
Damien Millerd4a8b7e1999-10-27 13:42:43 +100068{
Damien Miller95def091999-11-25 00:26:21 +110069 const char *authsocket;
Damien Miller942da032000-08-18 13:59:06 +100070 int sock, len;
Damien Miller95def091999-11-25 00:26:21 +110071 struct sockaddr_un sunaddr;
Damien Millerd4a8b7e1999-10-27 13:42:43 +100072
Damien Miller95def091999-11-25 00:26:21 +110073 authsocket = getenv(SSH_AUTHSOCKET_ENV_NAME);
74 if (!authsocket)
75 return -1;
Damien Millerd4a8b7e1999-10-27 13:42:43 +100076
Damien Miller95def091999-11-25 00:26:21 +110077 sunaddr.sun_family = AF_UNIX;
78 strlcpy(sunaddr.sun_path, authsocket, sizeof(sunaddr.sun_path));
Damien Miller942da032000-08-18 13:59:06 +100079 len = SUN_LEN(&sunaddr)+1;
Ben Lindstromafd34752001-03-05 06:33:23 +000080#ifdef HAVE_SUN_LEN_IN_SOCKADDR_UN
81 sunaddr.sun_len = len;
Damien Miller942da032000-08-18 13:59:06 +100082#endif /* HAVE_SUN_LEN_IN_SOCKADDR_UN */
Damien Miller10f6f6b1999-11-17 17:29:08 +110083
Damien Miller95def091999-11-25 00:26:21 +110084 sock = socket(AF_UNIX, SOCK_STREAM, 0);
85 if (sock < 0)
86 return -1;
Damien Millerd4a8b7e1999-10-27 13:42:43 +100087
Damien Miller95def091999-11-25 00:26:21 +110088 /* close on exec */
89 if (fcntl(sock, F_SETFD, 1) == -1) {
90 close(sock);
91 return -1;
92 }
Damien Miller942da032000-08-18 13:59:06 +100093 if (connect(sock, (struct sockaddr *) & sunaddr, len) < 0) {
Damien Miller95def091999-11-25 00:26:21 +110094 close(sock);
95 return -1;
96 }
97 return sock;
Damien Millerd4a8b7e1999-10-27 13:42:43 +100098}
99
Ben Lindstrombba81212001-06-25 05:01:22 +0000100static int
Damien Millerad833b32000-08-23 10:46:23 +1000101ssh_request_reply(AuthenticationConnection *auth, Buffer *request, Buffer *reply)
Damien Miller942da032000-08-18 13:59:06 +1000102{
103 int l, len;
104 char buf[1024];
105
106 /* Get the length of the message, and format it in the buffer. */
107 len = buffer_len(request);
108 PUT_32BIT(buf, len);
109
110 /* Send the length and then the packet to the agent. */
111 if (atomicio(write, auth->fd, buf, 4) != 4 ||
112 atomicio(write, auth->fd, buffer_ptr(request),
113 buffer_len(request)) != buffer_len(request)) {
114 error("Error writing to authentication socket.");
115 return 0;
116 }
117 /*
118 * Wait for response from the agent. First read the length of the
119 * response packet.
120 */
121 len = 4;
122 while (len > 0) {
123 l = read(auth->fd, buf + 4 - len, len);
Ben Lindstromb3144e52001-03-06 03:31:34 +0000124 if (l == -1 && (errno == EAGAIN || errno == EINTR))
Ben Lindstroma3700052001-04-05 23:26:32 +0000125 continue;
Damien Miller942da032000-08-18 13:59:06 +1000126 if (l <= 0) {
127 error("Error reading response length from authentication socket.");
128 return 0;
129 }
130 len -= l;
131 }
132
133 /* Extract the length, and check it for sanity. */
134 len = GET_32BIT(buf);
135 if (len > 256 * 1024)
136 fatal("Authentication response too long: %d", len);
137
138 /* Read the rest of the response in to the buffer. */
139 buffer_clear(reply);
140 while (len > 0) {
141 l = len;
142 if (l > sizeof(buf))
143 l = sizeof(buf);
144 l = read(auth->fd, buf, l);
Ben Lindstromb3144e52001-03-06 03:31:34 +0000145 if (l == -1 && (errno == EAGAIN || errno == EINTR))
Ben Lindstroma3700052001-04-05 23:26:32 +0000146 continue;
Damien Miller942da032000-08-18 13:59:06 +1000147 if (l <= 0) {
148 error("Error reading response from authentication socket.");
149 return 0;
150 }
151 buffer_append(reply, (char *) buf, l);
152 len -= l;
153 }
154 return 1;
155}
156
Damien Miller5428f641999-11-25 11:54:57 +1100157/*
158 * Closes the agent socket if it should be closed (depends on how it was
159 * obtained). The argument must have been returned by
160 * ssh_get_authentication_socket().
161 */
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000162
Damien Miller4af51302000-04-16 11:18:38 +1000163void
Damien Miller95def091999-11-25 00:26:21 +1100164ssh_close_authentication_socket(int sock)
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000165{
Damien Miller95def091999-11-25 00:26:21 +1100166 if (getenv(SSH_AUTHSOCKET_ENV_NAME))
167 close(sock);
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000168}
169
Damien Miller5428f641999-11-25 11:54:57 +1100170/*
171 * Opens and connects a private socket for communication with the
172 * authentication agent. Returns the file descriptor (which must be
173 * shut down and closed by the caller when no longer needed).
174 * Returns NULL if an error occurred and the connection could not be
175 * opened.
176 */
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000177
Damien Miller95def091999-11-25 00:26:21 +1100178AuthenticationConnection *
Ben Lindstrom46c16222000-12-22 01:43:59 +0000179ssh_get_authentication_connection(void)
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000180{
Damien Miller95def091999-11-25 00:26:21 +1100181 AuthenticationConnection *auth;
182 int sock;
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000183
Damien Miller95def091999-11-25 00:26:21 +1100184 sock = ssh_get_authentication_socket();
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000185
Damien Miller5428f641999-11-25 11:54:57 +1100186 /*
187 * Fail if we couldn't obtain a connection. This happens if we
188 * exited due to a timeout.
189 */
Damien Miller95def091999-11-25 00:26:21 +1100190 if (sock < 0)
191 return NULL;
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000192
Damien Miller95def091999-11-25 00:26:21 +1100193 auth = xmalloc(sizeof(*auth));
194 auth->fd = sock;
Damien Miller95def091999-11-25 00:26:21 +1100195 buffer_init(&auth->identities);
196 auth->howmany = 0;
197
198 return auth;
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000199}
200
Damien Miller5428f641999-11-25 11:54:57 +1100201/*
202 * Closes the connection to the authentication agent and frees any associated
203 * memory.
204 */
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000205
Damien Miller4af51302000-04-16 11:18:38 +1000206void
Damien Millerad833b32000-08-23 10:46:23 +1000207ssh_close_authentication_connection(AuthenticationConnection *auth)
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000208{
Damien Millerad833b32000-08-23 10:46:23 +1000209 buffer_free(&auth->identities);
210 close(auth->fd);
211 xfree(auth);
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000212}
213
Damien Miller5428f641999-11-25 11:54:57 +1100214/*
215 * Returns the first authentication identity held by the agent.
Damien Miller5428f641999-11-25 11:54:57 +1100216 */
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000217
Damien Miller0bc1bd82000-11-13 22:57:25 +1100218int
219ssh_get_num_identities(AuthenticationConnection *auth, int version)
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000220{
Damien Millerad833b32000-08-23 10:46:23 +1000221 int type, code1 = 0, code2 = 0;
Damien Miller942da032000-08-18 13:59:06 +1000222 Buffer request;
Damien Millerad833b32000-08-23 10:46:23 +1000223
224 switch(version){
225 case 1:
226 code1 = SSH_AGENTC_REQUEST_RSA_IDENTITIES;
227 code2 = SSH_AGENT_RSA_IDENTITIES_ANSWER;
228 break;
229 case 2:
230 code1 = SSH2_AGENTC_REQUEST_IDENTITIES;
231 code2 = SSH2_AGENT_IDENTITIES_ANSWER;
232 break;
233 default:
Damien Miller0bc1bd82000-11-13 22:57:25 +1100234 return 0;
Damien Millerad833b32000-08-23 10:46:23 +1000235 }
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000236
Damien Miller5428f641999-11-25 11:54:57 +1100237 /*
238 * Send a message to the agent requesting for a list of the
239 * identities it can represent.
240 */
Damien Miller942da032000-08-18 13:59:06 +1000241 buffer_init(&request);
Damien Millerad833b32000-08-23 10:46:23 +1000242 buffer_put_char(&request, code1);
Damien Miller942da032000-08-18 13:59:06 +1000243
244 buffer_clear(&auth->identities);
245 if (ssh_request_reply(auth, &request, &auth->identities) == 0) {
246 buffer_free(&request);
Damien Miller0bc1bd82000-11-13 22:57:25 +1100247 return 0;
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000248 }
Damien Miller942da032000-08-18 13:59:06 +1000249 buffer_free(&request);
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000250
Damien Miller95def091999-11-25 00:26:21 +1100251 /* Get message type, and verify that we got a proper answer. */
Damien Miller942da032000-08-18 13:59:06 +1000252 type = buffer_get_char(&auth->identities);
Damien Miller874d77b2000-10-14 16:23:11 +1100253 if (agent_failed(type)) {
Damien Miller0bc1bd82000-11-13 22:57:25 +1100254 return 0;
Damien Millerad833b32000-08-23 10:46:23 +1000255 } else if (type != code2) {
Damien Miller942da032000-08-18 13:59:06 +1000256 fatal("Bad authentication reply message type: %d", type);
Damien Millerad833b32000-08-23 10:46:23 +1000257 }
Damien Miller95def091999-11-25 00:26:21 +1100258
259 /* Get the number of entries in the response and check it for sanity. */
260 auth->howmany = buffer_get_int(&auth->identities);
261 if (auth->howmany > 1024)
Ben Lindstrom6df8ef42001-03-05 07:47:23 +0000262 fatal("Too many identities in authentication reply: %d",
Damien Miller942da032000-08-18 13:59:06 +1000263 auth->howmany);
Damien Miller95def091999-11-25 00:26:21 +1100264
Damien Miller0bc1bd82000-11-13 22:57:25 +1100265 return auth->howmany;
266}
267
268Key *
269ssh_get_first_identity(AuthenticationConnection *auth, char **comment, int version)
270{
271 /* get number of identities and return the first entry (if any). */
272 if (ssh_get_num_identities(auth, version) > 0)
273 return ssh_get_next_identity(auth, comment, version);
274 return NULL;
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000275}
276
Damien Millerad833b32000-08-23 10:46:23 +1000277Key *
278ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int version)
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000279{
Ben Lindstrom46c16222000-12-22 01:43:59 +0000280 u_int bits;
281 u_char *blob;
282 u_int blen;
Damien Millerad833b32000-08-23 10:46:23 +1000283 Key *key = NULL;
Damien Miller7e8e8201999-11-16 13:37:16 +1100284
Damien Miller95def091999-11-25 00:26:21 +1100285 /* Return failure if no more entries. */
286 if (auth->howmany <= 0)
Damien Millerad833b32000-08-23 10:46:23 +1000287 return NULL;
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000288
Damien Miller5428f641999-11-25 11:54:57 +1100289 /*
290 * Get the next entry from the packet. These will abort with a fatal
291 * error if the packet is too short or contains corrupt data.
292 */
Damien Millerad833b32000-08-23 10:46:23 +1000293 switch(version){
294 case 1:
Damien Miller0bc1bd82000-11-13 22:57:25 +1100295 key = key_new(KEY_RSA1);
Damien Millerad833b32000-08-23 10:46:23 +1000296 bits = buffer_get_int(&auth->identities);
297 buffer_get_bignum(&auth->identities, key->rsa->e);
298 buffer_get_bignum(&auth->identities, key->rsa->n);
299 *comment = buffer_get_string(&auth->identities, NULL);
300 if (bits != BN_num_bits(key->rsa->n))
301 log("Warning: identity keysize mismatch: actual %d, announced %u",
302 BN_num_bits(key->rsa->n), bits);
303 break;
304 case 2:
305 blob = buffer_get_string(&auth->identities, &blen);
306 *comment = buffer_get_string(&auth->identities, NULL);
Damien Miller0bc1bd82000-11-13 22:57:25 +1100307 key = key_from_blob(blob, blen);
Damien Millerad833b32000-08-23 10:46:23 +1000308 xfree(blob);
309 break;
310 default:
311 return NULL;
312 break;
313 }
Damien Miller95def091999-11-25 00:26:21 +1100314 /* Decrement the number of remaining entries. */
315 auth->howmany--;
Damien Millerad833b32000-08-23 10:46:23 +1000316 return key;
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000317}
318
Damien Miller5428f641999-11-25 11:54:57 +1100319/*
320 * Generates a random challenge, sends it to the agent, and waits for
321 * response from the agent. Returns true (non-zero) if the agent gave the
322 * correct answer, zero otherwise. Response type selects the style of
323 * response desired, with 0 corresponding to protocol version 1.0 (no longer
324 * supported) and 1 corresponding to protocol version 1.1.
325 */
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000326
327int
328ssh_decrypt_challenge(AuthenticationConnection *auth,
Damien Millerad833b32000-08-23 10:46:23 +1000329 Key* key, BIGNUM *challenge,
Ben Lindstrom46c16222000-12-22 01:43:59 +0000330 u_char session_id[16],
331 u_int response_type,
332 u_char response[16])
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000333{
Damien Miller95def091999-11-25 00:26:21 +1100334 Buffer buffer;
Damien Miller942da032000-08-18 13:59:06 +1000335 int success = 0;
336 int i;
337 int type;
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000338
Damien Miller0bc1bd82000-11-13 22:57:25 +1100339 if (key->type != KEY_RSA1)
Damien Millerad833b32000-08-23 10:46:23 +1000340 return 0;
341 if (response_type == 0) {
342 log("Compatibility with ssh protocol version 1.0 no longer supported.");
343 return 0;
344 }
Damien Miller95def091999-11-25 00:26:21 +1100345 buffer_init(&buffer);
Damien Miller942da032000-08-18 13:59:06 +1000346 buffer_put_char(&buffer, SSH_AGENTC_RSA_CHALLENGE);
Damien Millerad833b32000-08-23 10:46:23 +1000347 buffer_put_int(&buffer, BN_num_bits(key->rsa->n));
348 buffer_put_bignum(&buffer, key->rsa->e);
349 buffer_put_bignum(&buffer, key->rsa->n);
Damien Miller95def091999-11-25 00:26:21 +1100350 buffer_put_bignum(&buffer, challenge);
351 buffer_append(&buffer, (char *) session_id, 16);
352 buffer_put_int(&buffer, response_type);
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000353
Damien Miller942da032000-08-18 13:59:06 +1000354 if (ssh_request_reply(auth, &buffer, &buffer) == 0) {
Damien Miller95def091999-11-25 00:26:21 +1100355 buffer_free(&buffer);
356 return 0;
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000357 }
Damien Miller942da032000-08-18 13:59:06 +1000358 type = buffer_get_char(&buffer);
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000359
Damien Miller874d77b2000-10-14 16:23:11 +1100360 if (agent_failed(type)) {
Damien Miller95def091999-11-25 00:26:21 +1100361 log("Agent admitted failure to authenticate using the key.");
Damien Miller942da032000-08-18 13:59:06 +1000362 } else if (type != SSH_AGENT_RSA_RESPONSE) {
363 fatal("Bad authentication response: %d", type);
364 } else {
365 success = 1;
366 /*
367 * Get the response from the packet. This will abort with a
368 * fatal error if the packet is corrupt.
369 */
370 for (i = 0; i < 16; i++)
371 response[i] = buffer_get_char(&buffer);
Damien Miller95def091999-11-25 00:26:21 +1100372 }
Damien Miller95def091999-11-25 00:26:21 +1100373 buffer_free(&buffer);
Damien Miller942da032000-08-18 13:59:06 +1000374 return success;
Damien Miller95def091999-11-25 00:26:21 +1100375}
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000376
Damien Millerad833b32000-08-23 10:46:23 +1000377/* ask agent to sign data, returns -1 on error, 0 on success */
378int
379ssh_agent_sign(AuthenticationConnection *auth,
380 Key *key,
Ben Lindstrom46c16222000-12-22 01:43:59 +0000381 u_char **sigp, int *lenp,
382 u_char *data, int datalen)
Damien Millerad833b32000-08-23 10:46:23 +1000383{
Damien Miller62cee002000-09-23 17:15:56 +1100384 extern int datafellows;
Damien Millerad833b32000-08-23 10:46:23 +1000385 Buffer msg;
Ben Lindstrom46c16222000-12-22 01:43:59 +0000386 u_char *blob;
387 u_int blen;
Damien Miller62cee002000-09-23 17:15:56 +1100388 int type, flags = 0;
Damien Millerad833b32000-08-23 10:46:23 +1000389 int ret = -1;
390
Damien Miller0bc1bd82000-11-13 22:57:25 +1100391 if (key_to_blob(key, &blob, &blen) == 0)
Damien Millerad833b32000-08-23 10:46:23 +1000392 return -1;
393
Damien Miller62cee002000-09-23 17:15:56 +1100394 if (datafellows & SSH_BUG_SIGBLOB)
395 flags = SSH_AGENT_OLD_SIGNATURE;
396
Damien Millerad833b32000-08-23 10:46:23 +1000397 buffer_init(&msg);
398 buffer_put_char(&msg, SSH2_AGENTC_SIGN_REQUEST);
399 buffer_put_string(&msg, blob, blen);
400 buffer_put_string(&msg, data, datalen);
Damien Miller62cee002000-09-23 17:15:56 +1100401 buffer_put_int(&msg, flags);
Damien Millerad833b32000-08-23 10:46:23 +1000402 xfree(blob);
403
404 if (ssh_request_reply(auth, &msg, &msg) == 0) {
405 buffer_free(&msg);
406 return -1;
407 }
408 type = buffer_get_char(&msg);
Damien Miller874d77b2000-10-14 16:23:11 +1100409 if (agent_failed(type)) {
Damien Millerad833b32000-08-23 10:46:23 +1000410 log("Agent admitted failure to sign using the key.");
411 } else if (type != SSH2_AGENT_SIGN_RESPONSE) {
412 fatal("Bad authentication response: %d", type);
413 } else {
414 ret = 0;
415 *sigp = buffer_get_string(&msg, lenp);
416 }
417 buffer_free(&msg);
418 return ret;
419}
420
Damien Miller994cf142000-07-21 10:19:44 +1000421/* Encode key for a message to the agent. */
422
Ben Lindstrombba81212001-06-25 05:01:22 +0000423static void
Damien Miller0bc1bd82000-11-13 22:57:25 +1100424ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
Damien Miller994cf142000-07-21 10:19:44 +1000425{
426 buffer_clear(b);
427 buffer_put_char(b, SSH_AGENTC_ADD_RSA_IDENTITY);
428 buffer_put_int(b, BN_num_bits(key->n));
429 buffer_put_bignum(b, key->n);
430 buffer_put_bignum(b, key->e);
431 buffer_put_bignum(b, key->d);
432 /* To keep within the protocol: p < q for ssh. in SSL p > q */
433 buffer_put_bignum(b, key->iqmp); /* ssh key->u */
434 buffer_put_bignum(b, key->q); /* ssh key->p, SSL key->q */
435 buffer_put_bignum(b, key->p); /* ssh key->q, SSL key->p */
Ben Lindstrom664408d2001-06-09 01:42:01 +0000436 buffer_put_cstring(b, comment);
Damien Miller994cf142000-07-21 10:19:44 +1000437}
438
Ben Lindstrombba81212001-06-25 05:01:22 +0000439static void
Damien Miller0bc1bd82000-11-13 22:57:25 +1100440ssh_encode_identity_ssh2(Buffer *b, Key *key, const char *comment)
Damien Miller994cf142000-07-21 10:19:44 +1000441{
442 buffer_clear(b);
443 buffer_put_char(b, SSH2_AGENTC_ADD_IDENTITY);
Damien Miller0bc1bd82000-11-13 22:57:25 +1100444 buffer_put_cstring(b, key_ssh_name(key));
445 switch(key->type){
446 case KEY_RSA:
447 buffer_put_bignum2(b, key->rsa->n);
448 buffer_put_bignum2(b, key->rsa->e);
449 buffer_put_bignum2(b, key->rsa->d);
450 buffer_put_bignum2(b, key->rsa->iqmp);
451 buffer_put_bignum2(b, key->rsa->p);
452 buffer_put_bignum2(b, key->rsa->q);
453 break;
454 case KEY_DSA:
455 buffer_put_bignum2(b, key->dsa->p);
456 buffer_put_bignum2(b, key->dsa->q);
457 buffer_put_bignum2(b, key->dsa->g);
458 buffer_put_bignum2(b, key->dsa->pub_key);
459 buffer_put_bignum2(b, key->dsa->priv_key);
460 break;
461 }
462 buffer_put_cstring(b, comment);
Damien Miller994cf142000-07-21 10:19:44 +1000463}
464
Damien Miller5428f641999-11-25 11:54:57 +1100465/*
466 * Adds an identity to the authentication server. This call is not meant to
467 * be used by normal applications.
468 */
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000469
Damien Miller4af51302000-04-16 11:18:38 +1000470int
Damien Miller994cf142000-07-21 10:19:44 +1000471ssh_add_identity(AuthenticationConnection *auth, Key *key, const char *comment)
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000472{
Damien Millerad833b32000-08-23 10:46:23 +1000473 Buffer msg;
Damien Miller942da032000-08-18 13:59:06 +1000474 int type;
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000475
Damien Millerad833b32000-08-23 10:46:23 +1000476 buffer_init(&msg);
Damien Miller994cf142000-07-21 10:19:44 +1000477
478 switch (key->type) {
Damien Miller0bc1bd82000-11-13 22:57:25 +1100479 case KEY_RSA1:
480 ssh_encode_identity_rsa1(&msg, key->rsa, comment);
Damien Miller994cf142000-07-21 10:19:44 +1000481 break;
Damien Miller0bc1bd82000-11-13 22:57:25 +1100482 case KEY_RSA:
Damien Miller994cf142000-07-21 10:19:44 +1000483 case KEY_DSA:
Damien Miller0bc1bd82000-11-13 22:57:25 +1100484 ssh_encode_identity_ssh2(&msg, key, comment);
Damien Miller994cf142000-07-21 10:19:44 +1000485 break;
486 default:
Damien Millerad833b32000-08-23 10:46:23 +1000487 buffer_free(&msg);
Damien Miller994cf142000-07-21 10:19:44 +1000488 return 0;
489 break;
490 }
Damien Millerad833b32000-08-23 10:46:23 +1000491 if (ssh_request_reply(auth, &msg, &msg) == 0) {
492 buffer_free(&msg);
Damien Miller95def091999-11-25 00:26:21 +1100493 return 0;
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000494 }
Damien Millerad833b32000-08-23 10:46:23 +1000495 type = buffer_get_char(&msg);
496 buffer_free(&msg);
Damien Miller942da032000-08-18 13:59:06 +1000497 return decode_reply(type);
Damien Miller95def091999-11-25 00:26:21 +1100498}
499
Damien Miller5428f641999-11-25 11:54:57 +1100500/*
501 * Removes an identity from the authentication server. This call is not
502 * meant to be used by normal applications.
503 */
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000504
Damien Miller4af51302000-04-16 11:18:38 +1000505int
Damien Millerad833b32000-08-23 10:46:23 +1000506ssh_remove_identity(AuthenticationConnection *auth, Key *key)
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000507{
Damien Millerad833b32000-08-23 10:46:23 +1000508 Buffer msg;
Damien Miller942da032000-08-18 13:59:06 +1000509 int type;
Ben Lindstrom46c16222000-12-22 01:43:59 +0000510 u_char *blob;
511 u_int blen;
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000512
Damien Millerad833b32000-08-23 10:46:23 +1000513 buffer_init(&msg);
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000514
Damien Miller0bc1bd82000-11-13 22:57:25 +1100515 if (key->type == KEY_RSA1) {
Damien Millerad833b32000-08-23 10:46:23 +1000516 buffer_put_char(&msg, SSH_AGENTC_REMOVE_RSA_IDENTITY);
517 buffer_put_int(&msg, BN_num_bits(key->rsa->n));
518 buffer_put_bignum(&msg, key->rsa->e);
519 buffer_put_bignum(&msg, key->rsa->n);
Damien Miller0bc1bd82000-11-13 22:57:25 +1100520 } else if (key->type == KEY_DSA || key->type == KEY_RSA) {
521 key_to_blob(key, &blob, &blen);
Damien Millerad833b32000-08-23 10:46:23 +1000522 buffer_put_char(&msg, SSH2_AGENTC_REMOVE_IDENTITY);
523 buffer_put_string(&msg, blob, blen);
524 xfree(blob);
525 } else {
526 buffer_free(&msg);
Damien Miller95def091999-11-25 00:26:21 +1100527 return 0;
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000528 }
Damien Millerad833b32000-08-23 10:46:23 +1000529 if (ssh_request_reply(auth, &msg, &msg) == 0) {
530 buffer_free(&msg);
531 return 0;
532 }
533 type = buffer_get_char(&msg);
534 buffer_free(&msg);
Damien Miller942da032000-08-18 13:59:06 +1000535 return decode_reply(type);
Damien Miller95def091999-11-25 00:26:21 +1100536}
537
Ben Lindstrom036a6b22001-07-04 03:50:02 +0000538int
Ben Lindstromf7db3bb2001-08-06 21:35:51 +0000539ssh_update_card(AuthenticationConnection *auth, int add, const char *reader_id)
Ben Lindstrom036a6b22001-07-04 03:50:02 +0000540{
541 Buffer msg;
542 int type;
543
544 buffer_init(&msg);
545 buffer_put_char(&msg, add ? SSH_AGENTC_ADD_SMARTCARD_KEY :
546 SSH_AGENTC_REMOVE_SMARTCARD_KEY);
Ben Lindstromf7db3bb2001-08-06 21:35:51 +0000547 buffer_put_cstring(&msg, reader_id);
Ben Lindstrom036a6b22001-07-04 03:50:02 +0000548 if (ssh_request_reply(auth, &msg, &msg) == 0) {
549 buffer_free(&msg);
550 return 0;
551 }
552 type = buffer_get_char(&msg);
553 buffer_free(&msg);
554 return decode_reply(type);
555}
556
Damien Miller5428f641999-11-25 11:54:57 +1100557/*
558 * Removes all identities from the agent. This call is not meant to be used
559 * by normal applications.
560 */
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000561
Damien Miller4af51302000-04-16 11:18:38 +1000562int
Damien Millerad833b32000-08-23 10:46:23 +1000563ssh_remove_all_identities(AuthenticationConnection *auth, int version)
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000564{
Damien Millerad833b32000-08-23 10:46:23 +1000565 Buffer msg;
Damien Miller942da032000-08-18 13:59:06 +1000566 int type;
Damien Millerad833b32000-08-23 10:46:23 +1000567 int code = (version==1) ?
568 SSH_AGENTC_REMOVE_ALL_RSA_IDENTITIES :
569 SSH2_AGENTC_REMOVE_ALL_IDENTITIES;
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000570
Damien Millerad833b32000-08-23 10:46:23 +1000571 buffer_init(&msg);
572 buffer_put_char(&msg, code);
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000573
Damien Millerad833b32000-08-23 10:46:23 +1000574 if (ssh_request_reply(auth, &msg, &msg) == 0) {
575 buffer_free(&msg);
Damien Miller95def091999-11-25 00:26:21 +1100576 return 0;
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000577 }
Damien Millerad833b32000-08-23 10:46:23 +1000578 type = buffer_get_char(&msg);
579 buffer_free(&msg);
Damien Miller942da032000-08-18 13:59:06 +1000580 return decode_reply(type);
581}
582
Kevin Stevesef4eea92001-02-05 12:42:17 +0000583int
Damien Miller942da032000-08-18 13:59:06 +1000584decode_reply(int type)
585{
Damien Miller95def091999-11-25 00:26:21 +1100586 switch (type) {
587 case SSH_AGENT_FAILURE:
Damien Miller874d77b2000-10-14 16:23:11 +1100588 case SSH_COM_AGENT2_FAILURE:
Ben Lindstromc9a26362001-08-15 23:04:50 +0000589 case SSH2_AGENT_FAILURE:
Damien Miller942da032000-08-18 13:59:06 +1000590 log("SSH_AGENT_FAILURE");
Damien Miller95def091999-11-25 00:26:21 +1100591 return 0;
592 case SSH_AGENT_SUCCESS:
Damien Miller95def091999-11-25 00:26:21 +1100593 return 1;
594 default:
Damien Miller37023962000-07-11 17:31:38 +1000595 fatal("Bad response from authentication agent: %d", type);
Damien Miller95def091999-11-25 00:26:21 +1100596 }
597 /* NOTREACHED */
598 return 0;
599}