djm@openbsd.org | 93f0210 | 2019-01-20 22:51:37 +0000 | [diff] [blame^] | 1 | /* $OpenBSD: ssh-pkcs11-client.c,v 1.12 2019/01/20 22:51:37 djm Exp $ */ |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 2 | /* |
| 3 | * Copyright (c) 2010 Markus Friedl. All rights reserved. |
djm@openbsd.org | 93f0210 | 2019-01-20 22:51:37 +0000 | [diff] [blame^] | 4 | * Copyright (c) 2014 Pedro Martelletto. All rights reserved. |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 5 | * |
| 6 | * Permission to use, copy, modify, and distribute this software for any |
| 7 | * purpose with or without fee is hereby granted, provided that the above |
| 8 | * copyright notice and this permission notice appear in all copies. |
| 9 | * |
| 10 | * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES |
| 11 | * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF |
| 12 | * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR |
| 13 | * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES |
| 14 | * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN |
| 15 | * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
| 16 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
| 17 | */ |
| 18 | |
Damien Miller | 8ad0fbd | 2010-02-12 09:49:06 +1100 | [diff] [blame] | 19 | #include "includes.h" |
| 20 | |
Damien Miller | dfa4156 | 2010-02-12 10:06:28 +1100 | [diff] [blame] | 21 | #ifdef ENABLE_PKCS11 |
| 22 | |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 23 | #include <sys/types.h> |
Damien Miller | 8ad0fbd | 2010-02-12 09:49:06 +1100 | [diff] [blame] | 24 | #ifdef HAVE_SYS_TIME_H |
| 25 | # include <sys/time.h> |
| 26 | #endif |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 27 | #include <sys/socket.h> |
| 28 | |
| 29 | #include <stdarg.h> |
| 30 | #include <string.h> |
| 31 | #include <unistd.h> |
| 32 | #include <errno.h> |
| 33 | |
djm@openbsd.org | 93f0210 | 2019-01-20 22:51:37 +0000 | [diff] [blame^] | 34 | #include <openssl/ecdsa.h> |
Damien Miller | 8668706 | 2014-07-02 15:28:02 +1000 | [diff] [blame] | 35 | #include <openssl/rsa.h> |
| 36 | |
Damien Miller | 48f54b9 | 2018-09-13 12:13:50 +1000 | [diff] [blame] | 37 | #include "openbsd-compat/openssl-compat.h" |
| 38 | |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 39 | #include "pathnames.h" |
| 40 | #include "xmalloc.h" |
markus@openbsd.org | ff55f4a | 2018-07-09 20:39:28 +0000 | [diff] [blame] | 41 | #include "sshbuf.h" |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 42 | #include "log.h" |
| 43 | #include "misc.h" |
markus@openbsd.org | ff55f4a | 2018-07-09 20:39:28 +0000 | [diff] [blame] | 44 | #include "sshkey.h" |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 45 | #include "authfd.h" |
| 46 | #include "atomicio.h" |
| 47 | #include "ssh-pkcs11.h" |
markus@openbsd.org | ff55f4a | 2018-07-09 20:39:28 +0000 | [diff] [blame] | 48 | #include "ssherr.h" |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 49 | |
| 50 | /* borrows code from sftp-server and ssh-agent */ |
| 51 | |
| 52 | int fd = -1; |
| 53 | pid_t pid = -1; |
| 54 | |
| 55 | static void |
markus@openbsd.org | ff55f4a | 2018-07-09 20:39:28 +0000 | [diff] [blame] | 56 | send_msg(struct sshbuf *m) |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 57 | { |
| 58 | u_char buf[4]; |
markus@openbsd.org | ff55f4a | 2018-07-09 20:39:28 +0000 | [diff] [blame] | 59 | size_t mlen = sshbuf_len(m); |
| 60 | int r; |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 61 | |
markus@openbsd.org | ff55f4a | 2018-07-09 20:39:28 +0000 | [diff] [blame] | 62 | POKE_U32(buf, mlen); |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 63 | if (atomicio(vwrite, fd, buf, 4) != 4 || |
markus@openbsd.org | 49f47e6 | 2018-07-09 21:59:10 +0000 | [diff] [blame] | 64 | atomicio(vwrite, fd, sshbuf_mutable_ptr(m), |
markus@openbsd.org | ff55f4a | 2018-07-09 20:39:28 +0000 | [diff] [blame] | 65 | sshbuf_len(m)) != sshbuf_len(m)) |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 66 | error("write to helper failed"); |
markus@openbsd.org | ff55f4a | 2018-07-09 20:39:28 +0000 | [diff] [blame] | 67 | if ((r = sshbuf_consume(m, mlen)) != 0) |
| 68 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 69 | } |
| 70 | |
| 71 | static int |
markus@openbsd.org | ff55f4a | 2018-07-09 20:39:28 +0000 | [diff] [blame] | 72 | recv_msg(struct sshbuf *m) |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 73 | { |
| 74 | u_int l, len; |
markus@openbsd.org | ff55f4a | 2018-07-09 20:39:28 +0000 | [diff] [blame] | 75 | u_char c, buf[1024]; |
| 76 | int r; |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 77 | |
| 78 | if ((len = atomicio(read, fd, buf, 4)) != 4) { |
| 79 | error("read from helper failed: %u", len); |
| 80 | return (0); /* XXX */ |
| 81 | } |
markus@openbsd.org | ff55f4a | 2018-07-09 20:39:28 +0000 | [diff] [blame] | 82 | len = PEEK_U32(buf); |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 83 | if (len > 256 * 1024) |
| 84 | fatal("response too long: %u", len); |
| 85 | /* read len bytes into m */ |
markus@openbsd.org | ff55f4a | 2018-07-09 20:39:28 +0000 | [diff] [blame] | 86 | sshbuf_reset(m); |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 87 | while (len > 0) { |
| 88 | l = len; |
| 89 | if (l > sizeof(buf)) |
| 90 | l = sizeof(buf); |
| 91 | if (atomicio(read, fd, buf, l) != l) { |
| 92 | error("response from helper failed."); |
| 93 | return (0); /* XXX */ |
| 94 | } |
markus@openbsd.org | ff55f4a | 2018-07-09 20:39:28 +0000 | [diff] [blame] | 95 | if ((r = sshbuf_put(m, buf, l)) != 0) |
| 96 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 97 | len -= l; |
| 98 | } |
markus@openbsd.org | ff55f4a | 2018-07-09 20:39:28 +0000 | [diff] [blame] | 99 | if ((r = sshbuf_get_u8(m, &c)) != 0) |
| 100 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); |
| 101 | return c; |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 102 | } |
| 103 | |
| 104 | int |
| 105 | pkcs11_init(int interactive) |
| 106 | { |
| 107 | return (0); |
| 108 | } |
| 109 | |
| 110 | void |
| 111 | pkcs11_terminate(void) |
| 112 | { |
tb@openbsd.org | 3484380 | 2018-02-05 05:37:46 +0000 | [diff] [blame] | 113 | if (fd >= 0) |
| 114 | close(fd); |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 115 | } |
| 116 | |
| 117 | static int |
djm@openbsd.org | 93f0210 | 2019-01-20 22:51:37 +0000 | [diff] [blame^] | 118 | rsa_encrypt(int flen, const u_char *from, u_char *to, RSA *rsa, int padding) |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 119 | { |
markus@openbsd.org | 54d90ac | 2017-05-30 08:52:19 +0000 | [diff] [blame] | 120 | struct sshkey key; /* XXX */ |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 121 | u_char *blob, *signature = NULL; |
markus@openbsd.org | ff55f4a | 2018-07-09 20:39:28 +0000 | [diff] [blame] | 122 | size_t blen, slen = 0; |
| 123 | int r, ret = -1; |
| 124 | struct sshbuf *msg; |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 125 | |
| 126 | if (padding != RSA_PKCS1_PADDING) |
| 127 | return (-1); |
| 128 | key.type = KEY_RSA; |
| 129 | key.rsa = rsa; |
markus@openbsd.org | ff55f4a | 2018-07-09 20:39:28 +0000 | [diff] [blame] | 130 | if ((r = sshkey_to_blob(&key, &blob, &blen)) != 0) { |
| 131 | error("%s: sshkey_to_blob: %s", __func__, ssh_err(r)); |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 132 | return -1; |
markus@openbsd.org | ff55f4a | 2018-07-09 20:39:28 +0000 | [diff] [blame] | 133 | } |
| 134 | if ((msg = sshbuf_new()) == NULL) |
| 135 | fatal("%s: sshbuf_new failed", __func__); |
| 136 | if ((r = sshbuf_put_u8(msg, SSH2_AGENTC_SIGN_REQUEST)) != 0 || |
| 137 | (r = sshbuf_put_string(msg, blob, blen)) != 0 || |
| 138 | (r = sshbuf_put_string(msg, from, flen)) != 0 || |
| 139 | (r = sshbuf_put_u32(msg, 0)) != 0) |
| 140 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); |
Darren Tucker | a627d42 | 2013-06-02 07:31:17 +1000 | [diff] [blame] | 141 | free(blob); |
markus@openbsd.org | ff55f4a | 2018-07-09 20:39:28 +0000 | [diff] [blame] | 142 | send_msg(msg); |
| 143 | sshbuf_reset(msg); |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 144 | |
markus@openbsd.org | ff55f4a | 2018-07-09 20:39:28 +0000 | [diff] [blame] | 145 | if (recv_msg(msg) == SSH2_AGENT_SIGN_RESPONSE) { |
| 146 | if ((r = sshbuf_get_string(msg, &signature, &slen)) != 0) |
| 147 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); |
| 148 | if (slen <= (size_t)RSA_size(rsa)) { |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 149 | memcpy(to, signature, slen); |
| 150 | ret = slen; |
| 151 | } |
Darren Tucker | a627d42 | 2013-06-02 07:31:17 +1000 | [diff] [blame] | 152 | free(signature); |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 153 | } |
markus@openbsd.org | ff55f4a | 2018-07-09 20:39:28 +0000 | [diff] [blame] | 154 | sshbuf_free(msg); |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 155 | return (ret); |
| 156 | } |
| 157 | |
djm@openbsd.org | 93f0210 | 2019-01-20 22:51:37 +0000 | [diff] [blame^] | 158 | static ECDSA_SIG * |
| 159 | ecdsa_do_sign(const unsigned char *dgst, int dgst_len, const BIGNUM *inv, |
| 160 | const BIGNUM *rp, EC_KEY *ec) |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 161 | { |
djm@openbsd.org | 93f0210 | 2019-01-20 22:51:37 +0000 | [diff] [blame^] | 162 | struct sshkey key; /* XXX */ |
| 163 | u_char *blob, *signature = NULL; |
| 164 | const u_char *cp; |
| 165 | size_t blen, slen = 0; |
| 166 | ECDSA_SIG *ret = NULL; |
| 167 | struct sshbuf *msg; |
| 168 | int r; |
| 169 | |
| 170 | key.type = KEY_ECDSA; |
| 171 | key.ecdsa = ec; |
| 172 | key.ecdsa_nid = sshkey_ecdsa_key_to_nid(ec); |
| 173 | if (key.ecdsa_nid < 0) { |
| 174 | error("%s: couldn't get curve nid", __func__); |
| 175 | return (NULL); |
| 176 | } |
| 177 | if ((r = sshkey_to_blob(&key, &blob, &blen)) != 0) { |
| 178 | error("%s: sshkey_to_blob: %s", __func__, ssh_err(r)); |
| 179 | return (NULL); |
| 180 | } |
| 181 | if ((msg = sshbuf_new()) == NULL) |
| 182 | fatal("%s: sshbuf_new failed", __func__); |
| 183 | if ((r = sshbuf_put_u8(msg, SSH2_AGENTC_SIGN_REQUEST)) != 0 || |
| 184 | (r = sshbuf_put_string(msg, blob, blen)) != 0 || |
| 185 | (r = sshbuf_put_string(msg, dgst, dgst_len)) != 0 || |
| 186 | (r = sshbuf_put_u32(msg, 0)) != 0) |
| 187 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); |
| 188 | free(blob); |
| 189 | send_msg(msg); |
| 190 | sshbuf_reset(msg); |
| 191 | |
| 192 | if (recv_msg(msg) == SSH2_AGENT_SIGN_RESPONSE) { |
| 193 | if ((r = sshbuf_get_string(msg, &signature, &slen)) != 0) |
| 194 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); |
| 195 | cp = signature; |
| 196 | ret = d2i_ECDSA_SIG(NULL, &cp, slen); |
| 197 | free(signature); |
| 198 | } |
| 199 | |
| 200 | sshbuf_free(msg); |
| 201 | return (ret); |
| 202 | } |
| 203 | |
| 204 | static RSA_METHOD *helper_rsa; |
| 205 | static EC_KEY_METHOD *helper_ecdsa; |
| 206 | |
| 207 | /* redirect private key crypto operations to the ssh-pkcs11-helper */ |
| 208 | static void |
| 209 | wrap_key(struct sshkey *k) |
| 210 | { |
| 211 | if (k->type == KEY_RSA) |
| 212 | RSA_set_method(k->rsa, helper_rsa); |
| 213 | else if (k->type == KEY_ECDSA) |
| 214 | EC_KEY_set_method(k->ecdsa, helper_ecdsa); |
| 215 | else |
| 216 | fatal("%s: unknown key type", __func__); |
| 217 | } |
| 218 | |
| 219 | static int |
| 220 | pkcs11_start_helper_methods(void) |
| 221 | { |
| 222 | if (helper_ecdsa != NULL) |
| 223 | return (0); |
| 224 | |
| 225 | int (*orig_sign)(int, const unsigned char *, int, unsigned char *, |
| 226 | unsigned int *, const BIGNUM *, const BIGNUM *, EC_KEY *) = NULL; |
| 227 | if (helper_ecdsa != NULL) |
| 228 | return (0); |
| 229 | helper_ecdsa = EC_KEY_METHOD_new(EC_KEY_OpenSSL()); |
| 230 | if (helper_ecdsa == NULL) |
| 231 | return (-1); |
| 232 | EC_KEY_METHOD_get_sign(helper_ecdsa, &orig_sign, NULL, NULL); |
| 233 | EC_KEY_METHOD_set_sign(helper_ecdsa, orig_sign, NULL, ecdsa_do_sign); |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 234 | |
djm@openbsd.org | 482d23b | 2018-09-13 02:08:33 +0000 | [diff] [blame] | 235 | if ((helper_rsa = RSA_meth_dup(RSA_get_default_method())) == NULL) |
| 236 | fatal("%s: RSA_meth_dup failed", __func__); |
| 237 | if (!RSA_meth_set1_name(helper_rsa, "ssh-pkcs11-helper") || |
djm@openbsd.org | 93f0210 | 2019-01-20 22:51:37 +0000 | [diff] [blame^] | 238 | !RSA_meth_set_priv_enc(helper_rsa, rsa_encrypt)) |
djm@openbsd.org | 482d23b | 2018-09-13 02:08:33 +0000 | [diff] [blame] | 239 | fatal("%s: failed to prepare method", __func__); |
djm@openbsd.org | 93f0210 | 2019-01-20 22:51:37 +0000 | [diff] [blame^] | 240 | |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 241 | return (0); |
| 242 | } |
| 243 | |
| 244 | static int |
| 245 | pkcs11_start_helper(void) |
| 246 | { |
| 247 | int pair[2]; |
| 248 | |
djm@openbsd.org | 93f0210 | 2019-01-20 22:51:37 +0000 | [diff] [blame^] | 249 | if (pkcs11_start_helper_methods() == -1) { |
| 250 | error("pkcs11_start_helper_methods failed"); |
| 251 | return (-1); |
| 252 | } |
| 253 | |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 254 | if (socketpair(AF_UNIX, SOCK_STREAM, 0, pair) == -1) { |
| 255 | error("socketpair: %s", strerror(errno)); |
| 256 | return (-1); |
| 257 | } |
| 258 | if ((pid = fork()) == -1) { |
| 259 | error("fork: %s", strerror(errno)); |
| 260 | return (-1); |
| 261 | } else if (pid == 0) { |
| 262 | if ((dup2(pair[1], STDIN_FILENO) == -1) || |
| 263 | (dup2(pair[1], STDOUT_FILENO) == -1)) { |
| 264 | fprintf(stderr, "dup2: %s\n", strerror(errno)); |
| 265 | _exit(1); |
| 266 | } |
| 267 | close(pair[0]); |
| 268 | close(pair[1]); |
| 269 | execlp(_PATH_SSH_PKCS11_HELPER, _PATH_SSH_PKCS11_HELPER, |
mmcc@openbsd.org | 94141b7 | 2015-12-11 00:20:04 +0000 | [diff] [blame] | 270 | (char *)NULL); |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 271 | fprintf(stderr, "exec: %s: %s\n", _PATH_SSH_PKCS11_HELPER, |
| 272 | strerror(errno)); |
| 273 | _exit(1); |
| 274 | } |
| 275 | close(pair[1]); |
| 276 | fd = pair[0]; |
| 277 | return (0); |
| 278 | } |
| 279 | |
| 280 | int |
markus@openbsd.org | ff55f4a | 2018-07-09 20:39:28 +0000 | [diff] [blame] | 281 | pkcs11_add_provider(char *name, char *pin, struct sshkey ***keysp) |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 282 | { |
markus@openbsd.org | 54d90ac | 2017-05-30 08:52:19 +0000 | [diff] [blame] | 283 | struct sshkey *k; |
djm@openbsd.org | 93f0210 | 2019-01-20 22:51:37 +0000 | [diff] [blame^] | 284 | int r, type; |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 285 | u_char *blob; |
markus@openbsd.org | ff55f4a | 2018-07-09 20:39:28 +0000 | [diff] [blame] | 286 | size_t blen; |
| 287 | u_int nkeys, i; |
| 288 | struct sshbuf *msg; |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 289 | |
| 290 | if (fd < 0 && pkcs11_start_helper() < 0) |
| 291 | return (-1); |
| 292 | |
markus@openbsd.org | ff55f4a | 2018-07-09 20:39:28 +0000 | [diff] [blame] | 293 | if ((msg = sshbuf_new()) == NULL) |
| 294 | fatal("%s: sshbuf_new failed", __func__); |
| 295 | if ((r = sshbuf_put_u8(msg, SSH_AGENTC_ADD_SMARTCARD_KEY)) != 0 || |
| 296 | (r = sshbuf_put_cstring(msg, name)) != 0 || |
| 297 | (r = sshbuf_put_cstring(msg, pin)) != 0) |
| 298 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); |
| 299 | send_msg(msg); |
| 300 | sshbuf_reset(msg); |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 301 | |
djm@openbsd.org | 93f0210 | 2019-01-20 22:51:37 +0000 | [diff] [blame^] | 302 | type = recv_msg(msg); |
| 303 | if (type == SSH2_AGENT_IDENTITIES_ANSWER) { |
markus@openbsd.org | ff55f4a | 2018-07-09 20:39:28 +0000 | [diff] [blame] | 304 | if ((r = sshbuf_get_u32(msg, &nkeys)) != 0) |
| 305 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); |
| 306 | *keysp = xcalloc(nkeys, sizeof(struct sshkey *)); |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 307 | for (i = 0; i < nkeys; i++) { |
markus@openbsd.org | ff55f4a | 2018-07-09 20:39:28 +0000 | [diff] [blame] | 308 | /* XXX clean up properly instead of fatal() */ |
| 309 | if ((r = sshbuf_get_string(msg, &blob, &blen)) != 0 || |
| 310 | (r = sshbuf_skip_string(msg)) != 0) |
| 311 | fatal("%s: buffer error: %s", |
| 312 | __func__, ssh_err(r)); |
| 313 | if ((r = sshkey_from_blob(blob, blen, &k)) != 0) |
| 314 | fatal("%s: bad key: %s", __func__, ssh_err(r)); |
djm@openbsd.org | 93f0210 | 2019-01-20 22:51:37 +0000 | [diff] [blame^] | 315 | wrap_key(k); |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 316 | (*keysp)[i] = k; |
Darren Tucker | a627d42 | 2013-06-02 07:31:17 +1000 | [diff] [blame] | 317 | free(blob); |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 318 | } |
djm@openbsd.org | 93f0210 | 2019-01-20 22:51:37 +0000 | [diff] [blame^] | 319 | } else if (type == SSH2_AGENT_FAILURE) { |
| 320 | if ((r = sshbuf_get_u32(msg, &nkeys)) != 0) |
| 321 | nkeys = -1; |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 322 | } else { |
| 323 | nkeys = -1; |
| 324 | } |
markus@openbsd.org | ff55f4a | 2018-07-09 20:39:28 +0000 | [diff] [blame] | 325 | sshbuf_free(msg); |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 326 | return (nkeys); |
| 327 | } |
| 328 | |
| 329 | int |
| 330 | pkcs11_del_provider(char *name) |
| 331 | { |
markus@openbsd.org | ff55f4a | 2018-07-09 20:39:28 +0000 | [diff] [blame] | 332 | int r, ret = -1; |
| 333 | struct sshbuf *msg; |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 334 | |
markus@openbsd.org | ff55f4a | 2018-07-09 20:39:28 +0000 | [diff] [blame] | 335 | if ((msg = sshbuf_new()) == NULL) |
| 336 | fatal("%s: sshbuf_new failed", __func__); |
| 337 | if ((r = sshbuf_put_u8(msg, SSH_AGENTC_REMOVE_SMARTCARD_KEY)) != 0 || |
| 338 | (r = sshbuf_put_cstring(msg, name)) != 0 || |
| 339 | (r = sshbuf_put_cstring(msg, "")) != 0) |
| 340 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); |
| 341 | send_msg(msg); |
| 342 | sshbuf_reset(msg); |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 343 | |
markus@openbsd.org | ff55f4a | 2018-07-09 20:39:28 +0000 | [diff] [blame] | 344 | if (recv_msg(msg) == SSH_AGENT_SUCCESS) |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 345 | ret = 0; |
markus@openbsd.org | ff55f4a | 2018-07-09 20:39:28 +0000 | [diff] [blame] | 346 | sshbuf_free(msg); |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 347 | return (ret); |
| 348 | } |
Damien Miller | dfa4156 | 2010-02-12 10:06:28 +1100 | [diff] [blame] | 349 | |
| 350 | #endif /* ENABLE_PKCS11 */ |