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