blob: e2456e39eee3f0a794569983c5cd1b0e0684a104 [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 Lindstrom46c16222000-12-22 01:43:59 +000038RCSID("$OpenBSD: authfd.c,v 1.32 2000/12/20 19:37:21 markus Exp $");
Damien Millerd4a8b7e1999-10-27 13:42:43 +100039
40#include "ssh.h"
41#include "rsa.h"
Damien Millerd4a8b7e1999-10-27 13:42:43 +100042#include "buffer.h"
43#include "bufaux.h"
44#include "xmalloc.h"
45#include "getput.h"
46
47#include <openssl/rsa.h>
Damien Miller994cf142000-07-21 10:19:44 +100048#include <openssl/dsa.h>
49#include <openssl/evp.h>
50#include "key.h"
51#include "authfd.h"
52#include "kex.h"
Damien Miller62cee002000-09-23 17:15:56 +110053#include "compat.h"
Damien Millerd4a8b7e1999-10-27 13:42:43 +100054
Damien Miller37023962000-07-11 17:31:38 +100055/* helper */
Damien Miller942da032000-08-18 13:59:06 +100056int decode_reply(int type);
Damien Miller37023962000-07-11 17:31:38 +100057
Damien Miller874d77b2000-10-14 16:23:11 +110058/* macro to check for "agent failure" message */
59#define agent_failed(x) \
60 ((x == SSH_AGENT_FAILURE) || (x == SSH_COM_AGENT2_FAILURE))
61
Damien Millerd4a8b7e1999-10-27 13:42:43 +100062/* Returns the number of the authentication fd, or -1 if there is none. */
63
64int
Ben Lindstrom46c16222000-12-22 01:43:59 +000065ssh_get_authentication_socket(void)
Damien Millerd4a8b7e1999-10-27 13:42:43 +100066{
Damien Miller95def091999-11-25 00:26:21 +110067 const char *authsocket;
Damien Miller942da032000-08-18 13:59:06 +100068 int sock, len;
Damien Miller95def091999-11-25 00:26:21 +110069 struct sockaddr_un sunaddr;
Damien Millerd4a8b7e1999-10-27 13:42:43 +100070
Damien Miller95def091999-11-25 00:26:21 +110071 authsocket = getenv(SSH_AUTHSOCKET_ENV_NAME);
72 if (!authsocket)
73 return -1;
Damien Millerd4a8b7e1999-10-27 13:42:43 +100074
Damien Miller95def091999-11-25 00:26:21 +110075 sunaddr.sun_family = AF_UNIX;
76 strlcpy(sunaddr.sun_path, authsocket, sizeof(sunaddr.sun_path));
Damien Miller942da032000-08-18 13:59:06 +100077#ifdef HAVE_SUN_LEN_IN_SOCKADDR_UN
78 sunaddr.sun_len = len = SUN_LEN(&sunaddr)+1;
79#else /* HAVE_SUN_LEN_IN_SOCKADDR_UN */
80 len = SUN_LEN(&sunaddr)+1;
81#endif /* HAVE_SUN_LEN_IN_SOCKADDR_UN */
Damien Miller10f6f6b1999-11-17 17:29:08 +110082
Damien Miller95def091999-11-25 00:26:21 +110083 sock = socket(AF_UNIX, SOCK_STREAM, 0);
84 if (sock < 0)
85 return -1;
Damien Millerd4a8b7e1999-10-27 13:42:43 +100086
Damien Miller95def091999-11-25 00:26:21 +110087 /* close on exec */
88 if (fcntl(sock, F_SETFD, 1) == -1) {
89 close(sock);
90 return -1;
91 }
Damien Miller942da032000-08-18 13:59:06 +100092 if (connect(sock, (struct sockaddr *) & sunaddr, len) < 0) {
Damien Miller95def091999-11-25 00:26:21 +110093 close(sock);
94 return -1;
95 }
96 return sock;
Damien Millerd4a8b7e1999-10-27 13:42:43 +100097}
98
Damien Miller942da032000-08-18 13:59:06 +100099int
Damien Millerad833b32000-08-23 10:46:23 +1000100ssh_request_reply(AuthenticationConnection *auth, Buffer *request, Buffer *reply)
Damien Miller942da032000-08-18 13:59:06 +1000101{
102 int l, len;
103 char buf[1024];
104
105 /* Get the length of the message, and format it in the buffer. */
106 len = buffer_len(request);
107 PUT_32BIT(buf, len);
108
109 /* Send the length and then the packet to the agent. */
110 if (atomicio(write, auth->fd, buf, 4) != 4 ||
111 atomicio(write, auth->fd, buffer_ptr(request),
112 buffer_len(request)) != buffer_len(request)) {
113 error("Error writing to authentication socket.");
114 return 0;
115 }
116 /*
117 * Wait for response from the agent. First read the length of the
118 * response packet.
119 */
120 len = 4;
121 while (len > 0) {
122 l = read(auth->fd, buf + 4 - len, len);
123 if (l <= 0) {
124 error("Error reading response length from authentication socket.");
125 return 0;
126 }
127 len -= l;
128 }
129
130 /* Extract the length, and check it for sanity. */
131 len = GET_32BIT(buf);
132 if (len > 256 * 1024)
133 fatal("Authentication response too long: %d", len);
134
135 /* Read the rest of the response in to the buffer. */
136 buffer_clear(reply);
137 while (len > 0) {
138 l = len;
139 if (l > sizeof(buf))
140 l = sizeof(buf);
141 l = read(auth->fd, buf, l);
142 if (l <= 0) {
143 error("Error reading response from authentication socket.");
144 return 0;
145 }
146 buffer_append(reply, (char *) buf, l);
147 len -= l;
148 }
149 return 1;
150}
151
Damien Miller5428f641999-11-25 11:54:57 +1100152/*
153 * Closes the agent socket if it should be closed (depends on how it was
154 * obtained). The argument must have been returned by
155 * ssh_get_authentication_socket().
156 */
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000157
Damien Miller4af51302000-04-16 11:18:38 +1000158void
Damien Miller95def091999-11-25 00:26:21 +1100159ssh_close_authentication_socket(int sock)
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000160{
Damien Miller95def091999-11-25 00:26:21 +1100161 if (getenv(SSH_AUTHSOCKET_ENV_NAME))
162 close(sock);
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000163}
164
Damien Miller5428f641999-11-25 11:54:57 +1100165/*
166 * Opens and connects a private socket for communication with the
167 * authentication agent. Returns the file descriptor (which must be
168 * shut down and closed by the caller when no longer needed).
169 * Returns NULL if an error occurred and the connection could not be
170 * opened.
171 */
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000172
Damien Miller95def091999-11-25 00:26:21 +1100173AuthenticationConnection *
Ben Lindstrom46c16222000-12-22 01:43:59 +0000174ssh_get_authentication_connection(void)
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000175{
Damien Miller95def091999-11-25 00:26:21 +1100176 AuthenticationConnection *auth;
177 int sock;
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000178
Damien Miller95def091999-11-25 00:26:21 +1100179 sock = ssh_get_authentication_socket();
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000180
Damien Miller5428f641999-11-25 11:54:57 +1100181 /*
182 * Fail if we couldn't obtain a connection. This happens if we
183 * exited due to a timeout.
184 */
Damien Miller95def091999-11-25 00:26:21 +1100185 if (sock < 0)
186 return NULL;
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000187
Damien Miller95def091999-11-25 00:26:21 +1100188 auth = xmalloc(sizeof(*auth));
189 auth->fd = sock;
Damien Miller95def091999-11-25 00:26:21 +1100190 buffer_init(&auth->identities);
191 auth->howmany = 0;
192
193 return auth;
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000194}
195
Damien Miller5428f641999-11-25 11:54:57 +1100196/*
197 * Closes the connection to the authentication agent and frees any associated
198 * memory.
199 */
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000200
Damien Miller4af51302000-04-16 11:18:38 +1000201void
Damien Millerad833b32000-08-23 10:46:23 +1000202ssh_close_authentication_connection(AuthenticationConnection *auth)
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000203{
Damien Millerad833b32000-08-23 10:46:23 +1000204 buffer_free(&auth->identities);
205 close(auth->fd);
206 xfree(auth);
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000207}
208
Damien Miller5428f641999-11-25 11:54:57 +1100209/*
210 * Returns the first authentication identity held by the agent.
Damien Miller5428f641999-11-25 11:54:57 +1100211 */
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000212
Damien Miller0bc1bd82000-11-13 22:57:25 +1100213int
214ssh_get_num_identities(AuthenticationConnection *auth, int version)
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000215{
Damien Millerad833b32000-08-23 10:46:23 +1000216 int type, code1 = 0, code2 = 0;
Damien Miller942da032000-08-18 13:59:06 +1000217 Buffer request;
Damien Millerad833b32000-08-23 10:46:23 +1000218
219 switch(version){
220 case 1:
221 code1 = SSH_AGENTC_REQUEST_RSA_IDENTITIES;
222 code2 = SSH_AGENT_RSA_IDENTITIES_ANSWER;
223 break;
224 case 2:
225 code1 = SSH2_AGENTC_REQUEST_IDENTITIES;
226 code2 = SSH2_AGENT_IDENTITIES_ANSWER;
227 break;
228 default:
Damien Miller0bc1bd82000-11-13 22:57:25 +1100229 return 0;
Damien Millerad833b32000-08-23 10:46:23 +1000230 }
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000231
Damien Miller5428f641999-11-25 11:54:57 +1100232 /*
233 * Send a message to the agent requesting for a list of the
234 * identities it can represent.
235 */
Damien Miller942da032000-08-18 13:59:06 +1000236 buffer_init(&request);
Damien Millerad833b32000-08-23 10:46:23 +1000237 buffer_put_char(&request, code1);
Damien Miller942da032000-08-18 13:59:06 +1000238
239 buffer_clear(&auth->identities);
240 if (ssh_request_reply(auth, &request, &auth->identities) == 0) {
241 buffer_free(&request);
Damien Miller0bc1bd82000-11-13 22:57:25 +1100242 return 0;
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000243 }
Damien Miller942da032000-08-18 13:59:06 +1000244 buffer_free(&request);
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000245
Damien Miller95def091999-11-25 00:26:21 +1100246 /* Get message type, and verify that we got a proper answer. */
Damien Miller942da032000-08-18 13:59:06 +1000247 type = buffer_get_char(&auth->identities);
Damien Miller874d77b2000-10-14 16:23:11 +1100248 if (agent_failed(type)) {
Damien Miller0bc1bd82000-11-13 22:57:25 +1100249 return 0;
Damien Millerad833b32000-08-23 10:46:23 +1000250 } else if (type != code2) {
Damien Miller942da032000-08-18 13:59:06 +1000251 fatal("Bad authentication reply message type: %d", type);
Damien Millerad833b32000-08-23 10:46:23 +1000252 }
Damien Miller95def091999-11-25 00:26:21 +1100253
254 /* Get the number of entries in the response and check it for sanity. */
255 auth->howmany = buffer_get_int(&auth->identities);
256 if (auth->howmany > 1024)
Damien Miller942da032000-08-18 13:59:06 +1000257 fatal("Too many identities in authentication reply: %d\n",
258 auth->howmany);
Damien Miller95def091999-11-25 00:26:21 +1100259
Damien Miller0bc1bd82000-11-13 22:57:25 +1100260 return auth->howmany;
261}
262
263Key *
264ssh_get_first_identity(AuthenticationConnection *auth, char **comment, int version)
265{
266 /* get number of identities and return the first entry (if any). */
267 if (ssh_get_num_identities(auth, version) > 0)
268 return ssh_get_next_identity(auth, comment, version);
269 return NULL;
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000270}
271
Damien Millerad833b32000-08-23 10:46:23 +1000272Key *
273ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int version)
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000274{
Ben Lindstrom46c16222000-12-22 01:43:59 +0000275 u_int bits;
276 u_char *blob;
277 u_int blen;
Damien Millerad833b32000-08-23 10:46:23 +1000278 Key *key = NULL;
Damien Miller7e8e8201999-11-16 13:37:16 +1100279
Damien Miller95def091999-11-25 00:26:21 +1100280 /* Return failure if no more entries. */
281 if (auth->howmany <= 0)
Damien Millerad833b32000-08-23 10:46:23 +1000282 return NULL;
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000283
Damien Miller5428f641999-11-25 11:54:57 +1100284 /*
285 * Get the next entry from the packet. These will abort with a fatal
286 * error if the packet is too short or contains corrupt data.
287 */
Damien Millerad833b32000-08-23 10:46:23 +1000288 switch(version){
289 case 1:
Damien Miller0bc1bd82000-11-13 22:57:25 +1100290 key = key_new(KEY_RSA1);
Damien Millerad833b32000-08-23 10:46:23 +1000291 bits = buffer_get_int(&auth->identities);
292 buffer_get_bignum(&auth->identities, key->rsa->e);
293 buffer_get_bignum(&auth->identities, key->rsa->n);
294 *comment = buffer_get_string(&auth->identities, NULL);
295 if (bits != BN_num_bits(key->rsa->n))
296 log("Warning: identity keysize mismatch: actual %d, announced %u",
297 BN_num_bits(key->rsa->n), bits);
298 break;
299 case 2:
300 blob = buffer_get_string(&auth->identities, &blen);
301 *comment = buffer_get_string(&auth->identities, NULL);
Damien Miller0bc1bd82000-11-13 22:57:25 +1100302 key = key_from_blob(blob, blen);
Damien Millerad833b32000-08-23 10:46:23 +1000303 xfree(blob);
304 break;
305 default:
306 return NULL;
307 break;
308 }
Damien Miller95def091999-11-25 00:26:21 +1100309 /* Decrement the number of remaining entries. */
310 auth->howmany--;
Damien Millerad833b32000-08-23 10:46:23 +1000311 return key;
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000312}
313
Damien Miller5428f641999-11-25 11:54:57 +1100314/*
315 * Generates a random challenge, sends it to the agent, and waits for
316 * response from the agent. Returns true (non-zero) if the agent gave the
317 * correct answer, zero otherwise. Response type selects the style of
318 * response desired, with 0 corresponding to protocol version 1.0 (no longer
319 * supported) and 1 corresponding to protocol version 1.1.
320 */
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000321
322int
323ssh_decrypt_challenge(AuthenticationConnection *auth,
Damien Millerad833b32000-08-23 10:46:23 +1000324 Key* key, BIGNUM *challenge,
Ben Lindstrom46c16222000-12-22 01:43:59 +0000325 u_char session_id[16],
326 u_int response_type,
327 u_char response[16])
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000328{
Damien Miller95def091999-11-25 00:26:21 +1100329 Buffer buffer;
Damien Miller942da032000-08-18 13:59:06 +1000330 int success = 0;
331 int i;
332 int type;
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000333
Damien Miller0bc1bd82000-11-13 22:57:25 +1100334 if (key->type != KEY_RSA1)
Damien Millerad833b32000-08-23 10:46:23 +1000335 return 0;
336 if (response_type == 0) {
337 log("Compatibility with ssh protocol version 1.0 no longer supported.");
338 return 0;
339 }
Damien Miller95def091999-11-25 00:26:21 +1100340 buffer_init(&buffer);
Damien Miller942da032000-08-18 13:59:06 +1000341 buffer_put_char(&buffer, SSH_AGENTC_RSA_CHALLENGE);
Damien Millerad833b32000-08-23 10:46:23 +1000342 buffer_put_int(&buffer, BN_num_bits(key->rsa->n));
343 buffer_put_bignum(&buffer, key->rsa->e);
344 buffer_put_bignum(&buffer, key->rsa->n);
Damien Miller95def091999-11-25 00:26:21 +1100345 buffer_put_bignum(&buffer, challenge);
346 buffer_append(&buffer, (char *) session_id, 16);
347 buffer_put_int(&buffer, response_type);
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000348
Damien Miller942da032000-08-18 13:59:06 +1000349 if (ssh_request_reply(auth, &buffer, &buffer) == 0) {
Damien Miller95def091999-11-25 00:26:21 +1100350 buffer_free(&buffer);
351 return 0;
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000352 }
Damien Miller942da032000-08-18 13:59:06 +1000353 type = buffer_get_char(&buffer);
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000354
Damien Miller874d77b2000-10-14 16:23:11 +1100355 if (agent_failed(type)) {
Damien Miller95def091999-11-25 00:26:21 +1100356 log("Agent admitted failure to authenticate using the key.");
Damien Miller942da032000-08-18 13:59:06 +1000357 } else if (type != SSH_AGENT_RSA_RESPONSE) {
358 fatal("Bad authentication response: %d", type);
359 } else {
360 success = 1;
361 /*
362 * Get the response from the packet. This will abort with a
363 * fatal error if the packet is corrupt.
364 */
365 for (i = 0; i < 16; i++)
366 response[i] = buffer_get_char(&buffer);
Damien Miller95def091999-11-25 00:26:21 +1100367 }
Damien Miller95def091999-11-25 00:26:21 +1100368 buffer_free(&buffer);
Damien Miller942da032000-08-18 13:59:06 +1000369 return success;
Damien Miller95def091999-11-25 00:26:21 +1100370}
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000371
Damien Millerad833b32000-08-23 10:46:23 +1000372/* ask agent to sign data, returns -1 on error, 0 on success */
373int
374ssh_agent_sign(AuthenticationConnection *auth,
375 Key *key,
Ben Lindstrom46c16222000-12-22 01:43:59 +0000376 u_char **sigp, int *lenp,
377 u_char *data, int datalen)
Damien Millerad833b32000-08-23 10:46:23 +1000378{
Damien Miller62cee002000-09-23 17:15:56 +1100379 extern int datafellows;
Damien Millerad833b32000-08-23 10:46:23 +1000380 Buffer msg;
Ben Lindstrom46c16222000-12-22 01:43:59 +0000381 u_char *blob;
382 u_int blen;
Damien Miller62cee002000-09-23 17:15:56 +1100383 int type, flags = 0;
Damien Millerad833b32000-08-23 10:46:23 +1000384 int ret = -1;
385
Damien Miller0bc1bd82000-11-13 22:57:25 +1100386 if (key_to_blob(key, &blob, &blen) == 0)
Damien Millerad833b32000-08-23 10:46:23 +1000387 return -1;
388
Damien Miller62cee002000-09-23 17:15:56 +1100389 if (datafellows & SSH_BUG_SIGBLOB)
390 flags = SSH_AGENT_OLD_SIGNATURE;
391
Damien Millerad833b32000-08-23 10:46:23 +1000392 buffer_init(&msg);
393 buffer_put_char(&msg, SSH2_AGENTC_SIGN_REQUEST);
394 buffer_put_string(&msg, blob, blen);
395 buffer_put_string(&msg, data, datalen);
Damien Miller62cee002000-09-23 17:15:56 +1100396 buffer_put_int(&msg, flags);
Damien Millerad833b32000-08-23 10:46:23 +1000397 xfree(blob);
398
399 if (ssh_request_reply(auth, &msg, &msg) == 0) {
400 buffer_free(&msg);
401 return -1;
402 }
403 type = buffer_get_char(&msg);
Damien Miller874d77b2000-10-14 16:23:11 +1100404 if (agent_failed(type)) {
Damien Millerad833b32000-08-23 10:46:23 +1000405 log("Agent admitted failure to sign using the key.");
406 } else if (type != SSH2_AGENT_SIGN_RESPONSE) {
407 fatal("Bad authentication response: %d", type);
408 } else {
409 ret = 0;
410 *sigp = buffer_get_string(&msg, lenp);
411 }
412 buffer_free(&msg);
413 return ret;
414}
415
Damien Miller994cf142000-07-21 10:19:44 +1000416/* Encode key for a message to the agent. */
417
418void
Damien Miller0bc1bd82000-11-13 22:57:25 +1100419ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
Damien Miller994cf142000-07-21 10:19:44 +1000420{
421 buffer_clear(b);
422 buffer_put_char(b, SSH_AGENTC_ADD_RSA_IDENTITY);
423 buffer_put_int(b, BN_num_bits(key->n));
424 buffer_put_bignum(b, key->n);
425 buffer_put_bignum(b, key->e);
426 buffer_put_bignum(b, key->d);
427 /* To keep within the protocol: p < q for ssh. in SSL p > q */
428 buffer_put_bignum(b, key->iqmp); /* ssh key->u */
429 buffer_put_bignum(b, key->q); /* ssh key->p, SSL key->q */
430 buffer_put_bignum(b, key->p); /* ssh key->q, SSL key->p */
431 buffer_put_string(b, comment, strlen(comment));
432}
433
434void
Damien Miller0bc1bd82000-11-13 22:57:25 +1100435ssh_encode_identity_ssh2(Buffer *b, Key *key, const char *comment)
Damien Miller994cf142000-07-21 10:19:44 +1000436{
437 buffer_clear(b);
438 buffer_put_char(b, SSH2_AGENTC_ADD_IDENTITY);
Damien Miller0bc1bd82000-11-13 22:57:25 +1100439 buffer_put_cstring(b, key_ssh_name(key));
440 switch(key->type){
441 case KEY_RSA:
442 buffer_put_bignum2(b, key->rsa->n);
443 buffer_put_bignum2(b, key->rsa->e);
444 buffer_put_bignum2(b, key->rsa->d);
445 buffer_put_bignum2(b, key->rsa->iqmp);
446 buffer_put_bignum2(b, key->rsa->p);
447 buffer_put_bignum2(b, key->rsa->q);
448 break;
449 case KEY_DSA:
450 buffer_put_bignum2(b, key->dsa->p);
451 buffer_put_bignum2(b, key->dsa->q);
452 buffer_put_bignum2(b, key->dsa->g);
453 buffer_put_bignum2(b, key->dsa->pub_key);
454 buffer_put_bignum2(b, key->dsa->priv_key);
455 break;
456 }
457 buffer_put_cstring(b, comment);
Damien Miller994cf142000-07-21 10:19:44 +1000458}
459
Damien Miller5428f641999-11-25 11:54:57 +1100460/*
461 * Adds an identity to the authentication server. This call is not meant to
462 * be used by normal applications.
463 */
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000464
Damien Miller4af51302000-04-16 11:18:38 +1000465int
Damien Miller994cf142000-07-21 10:19:44 +1000466ssh_add_identity(AuthenticationConnection *auth, Key *key, const char *comment)
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000467{
Damien Millerad833b32000-08-23 10:46:23 +1000468 Buffer msg;
Damien Miller942da032000-08-18 13:59:06 +1000469 int type;
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000470
Damien Millerad833b32000-08-23 10:46:23 +1000471 buffer_init(&msg);
Damien Miller994cf142000-07-21 10:19:44 +1000472
473 switch (key->type) {
Damien Miller0bc1bd82000-11-13 22:57:25 +1100474 case KEY_RSA1:
475 ssh_encode_identity_rsa1(&msg, key->rsa, comment);
Damien Miller994cf142000-07-21 10:19:44 +1000476 break;
Damien Miller0bc1bd82000-11-13 22:57:25 +1100477 case KEY_RSA:
Damien Miller994cf142000-07-21 10:19:44 +1000478 case KEY_DSA:
Damien Miller0bc1bd82000-11-13 22:57:25 +1100479 ssh_encode_identity_ssh2(&msg, key, comment);
Damien Miller994cf142000-07-21 10:19:44 +1000480 break;
481 default:
Damien Millerad833b32000-08-23 10:46:23 +1000482 buffer_free(&msg);
Damien Miller994cf142000-07-21 10:19:44 +1000483 return 0;
484 break;
485 }
Damien Millerad833b32000-08-23 10:46:23 +1000486 if (ssh_request_reply(auth, &msg, &msg) == 0) {
487 buffer_free(&msg);
Damien Miller95def091999-11-25 00:26:21 +1100488 return 0;
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000489 }
Damien Millerad833b32000-08-23 10:46:23 +1000490 type = buffer_get_char(&msg);
491 buffer_free(&msg);
Damien Miller942da032000-08-18 13:59:06 +1000492 return decode_reply(type);
Damien Miller95def091999-11-25 00:26:21 +1100493}
494
Damien Miller5428f641999-11-25 11:54:57 +1100495/*
496 * Removes an identity from the authentication server. This call is not
497 * meant to be used by normal applications.
498 */
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000499
Damien Miller4af51302000-04-16 11:18:38 +1000500int
Damien Millerad833b32000-08-23 10:46:23 +1000501ssh_remove_identity(AuthenticationConnection *auth, Key *key)
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000502{
Damien Millerad833b32000-08-23 10:46:23 +1000503 Buffer msg;
Damien Miller942da032000-08-18 13:59:06 +1000504 int type;
Ben Lindstrom46c16222000-12-22 01:43:59 +0000505 u_char *blob;
506 u_int blen;
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000507
Damien Millerad833b32000-08-23 10:46:23 +1000508 buffer_init(&msg);
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000509
Damien Miller0bc1bd82000-11-13 22:57:25 +1100510 if (key->type == KEY_RSA1) {
Damien Millerad833b32000-08-23 10:46:23 +1000511 buffer_put_char(&msg, SSH_AGENTC_REMOVE_RSA_IDENTITY);
512 buffer_put_int(&msg, BN_num_bits(key->rsa->n));
513 buffer_put_bignum(&msg, key->rsa->e);
514 buffer_put_bignum(&msg, key->rsa->n);
Damien Miller0bc1bd82000-11-13 22:57:25 +1100515 } else if (key->type == KEY_DSA || key->type == KEY_RSA) {
516 key_to_blob(key, &blob, &blen);
Damien Millerad833b32000-08-23 10:46:23 +1000517 buffer_put_char(&msg, SSH2_AGENTC_REMOVE_IDENTITY);
518 buffer_put_string(&msg, blob, blen);
519 xfree(blob);
520 } else {
521 buffer_free(&msg);
Damien Miller95def091999-11-25 00:26:21 +1100522 return 0;
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000523 }
Damien Millerad833b32000-08-23 10:46:23 +1000524 if (ssh_request_reply(auth, &msg, &msg) == 0) {
525 buffer_free(&msg);
526 return 0;
527 }
528 type = buffer_get_char(&msg);
529 buffer_free(&msg);
Damien Miller942da032000-08-18 13:59:06 +1000530 return decode_reply(type);
Damien Miller95def091999-11-25 00:26:21 +1100531}
532
Damien Miller5428f641999-11-25 11:54:57 +1100533/*
534 * Removes all identities from the agent. This call is not meant to be used
535 * by normal applications.
536 */
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000537
Damien Miller4af51302000-04-16 11:18:38 +1000538int
Damien Millerad833b32000-08-23 10:46:23 +1000539ssh_remove_all_identities(AuthenticationConnection *auth, int version)
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000540{
Damien Millerad833b32000-08-23 10:46:23 +1000541 Buffer msg;
Damien Miller942da032000-08-18 13:59:06 +1000542 int type;
Damien Millerad833b32000-08-23 10:46:23 +1000543 int code = (version==1) ?
544 SSH_AGENTC_REMOVE_ALL_RSA_IDENTITIES :
545 SSH2_AGENTC_REMOVE_ALL_IDENTITIES;
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000546
Damien Millerad833b32000-08-23 10:46:23 +1000547 buffer_init(&msg);
548 buffer_put_char(&msg, code);
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000549
Damien Millerad833b32000-08-23 10:46:23 +1000550 if (ssh_request_reply(auth, &msg, &msg) == 0) {
551 buffer_free(&msg);
Damien Miller95def091999-11-25 00:26:21 +1100552 return 0;
Damien Millerd4a8b7e1999-10-27 13:42:43 +1000553 }
Damien Millerad833b32000-08-23 10:46:23 +1000554 type = buffer_get_char(&msg);
555 buffer_free(&msg);
Damien Miller942da032000-08-18 13:59:06 +1000556 return decode_reply(type);
557}
558
559int
560decode_reply(int type)
561{
Damien Miller95def091999-11-25 00:26:21 +1100562 switch (type) {
563 case SSH_AGENT_FAILURE:
Damien Miller874d77b2000-10-14 16:23:11 +1100564 case SSH_COM_AGENT2_FAILURE:
Damien Miller942da032000-08-18 13:59:06 +1000565 log("SSH_AGENT_FAILURE");
Damien Miller95def091999-11-25 00:26:21 +1100566 return 0;
567 case SSH_AGENT_SUCCESS:
Damien Miller95def091999-11-25 00:26:21 +1100568 return 1;
569 default:
Damien Miller37023962000-07-11 17:31:38 +1000570 fatal("Bad response from authentication agent: %d", type);
Damien Miller95def091999-11-25 00:26:21 +1100571 }
572 /* NOTREACHED */
573 return 0;
574}