Annotation of src/usr.bin/ssh/sshkey.c, Revision 1.53
1.53 ! djm 1: /* $OpenBSD: sshkey.c,v 1.52 2017/06/09 06:40:24 djm Exp $ */
1.1 djm 2: /*
3: * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
4: * Copyright (c) 2008 Alexander von Gernler. All rights reserved.
5: * Copyright (c) 2010,2011 Damien Miller. All rights reserved.
6: *
7: * Redistribution and use in source and binary forms, with or without
8: * modification, are permitted provided that the following conditions
9: * are met:
10: * 1. Redistributions of source code must retain the above copyright
11: * notice, this list of conditions and the following disclaimer.
12: * 2. Redistributions in binary form must reproduce the above copyright
13: * notice, this list of conditions and the following disclaimer in the
14: * documentation and/or other materials provided with the distribution.
15: *
16: * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
17: * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18: * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19: * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20: * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
21: * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22: * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23: * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24: * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25: * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26: */
27:
28: #include <sys/types.h>
1.7 djm 29: #include <netinet/in.h>
1.1 djm 30:
1.12 djm 31: #ifdef WITH_OPENSSL
1.1 djm 32: #include <openssl/evp.h>
33: #include <openssl/err.h>
34: #include <openssl/pem.h>
1.12 djm 35: #endif
1.1 djm 36:
37: #include "crypto_api.h"
38:
39: #include <errno.h>
40: #include <stdio.h>
41: #include <string.h>
42: #include <util.h>
1.13 deraadt 43: #include <limits.h>
1.7 djm 44: #include <resolv.h>
1.1 djm 45:
46: #include "ssh2.h"
47: #include "ssherr.h"
48: #include "misc.h"
49: #include "sshbuf.h"
50: #include "rsa.h"
51: #include "cipher.h"
52: #include "digest.h"
53: #define SSHKEY_INTERNAL
54: #include "sshkey.h"
1.11 djm 55: #include "match.h"
1.1 djm 56:
57: /* openssh private key file format */
58: #define MARK_BEGIN "-----BEGIN OPENSSH PRIVATE KEY-----\n"
59: #define MARK_END "-----END OPENSSH PRIVATE KEY-----\n"
60: #define MARK_BEGIN_LEN (sizeof(MARK_BEGIN) - 1)
61: #define MARK_END_LEN (sizeof(MARK_END) - 1)
62: #define KDFNAME "bcrypt"
63: #define AUTH_MAGIC "openssh-key-v1"
64: #define SALT_LEN 16
65: #define DEFAULT_CIPHERNAME "aes256-cbc"
66: #define DEFAULT_ROUNDS 16
67:
68: /* Version identification string for SSH v1 identity files. */
69: #define LEGACY_BEGIN "SSH PRIVATE KEY FILE FORMAT 1.1\n"
70:
1.14 djm 71: static int sshkey_from_blob_internal(struct sshbuf *buf,
1.1 djm 72: struct sshkey **keyp, int allow_cert);
73:
74: /* Supported key types */
75: struct keytype {
76: const char *name;
77: const char *shortname;
78: int type;
79: int nid;
80: int cert;
1.28 markus 81: int sigonly;
1.1 djm 82: };
83: static const struct keytype keytypes[] = {
1.28 markus 84: { "ssh-ed25519", "ED25519", KEY_ED25519, 0, 0, 0 },
1.1 djm 85: { "ssh-ed25519-cert-v01@openssh.com", "ED25519-CERT",
1.28 markus 86: KEY_ED25519_CERT, 0, 1, 0 },
1.1 djm 87: #ifdef WITH_OPENSSL
1.28 markus 88: { "ssh-rsa", "RSA", KEY_RSA, 0, 0, 0 },
89: { "rsa-sha2-256", "RSA", KEY_RSA, 0, 0, 1 },
90: { "rsa-sha2-512", "RSA", KEY_RSA, 0, 0, 1 },
91: { "ssh-dss", "DSA", KEY_DSA, 0, 0, 0 },
92: { "ecdsa-sha2-nistp256", "ECDSA", KEY_ECDSA, NID_X9_62_prime256v1, 0, 0 },
93: { "ecdsa-sha2-nistp384", "ECDSA", KEY_ECDSA, NID_secp384r1, 0, 0 },
94: { "ecdsa-sha2-nistp521", "ECDSA", KEY_ECDSA, NID_secp521r1, 0, 0 },
95: { "ssh-rsa-cert-v01@openssh.com", "RSA-CERT", KEY_RSA_CERT, 0, 1, 0 },
96: { "ssh-dss-cert-v01@openssh.com", "DSA-CERT", KEY_DSA_CERT, 0, 1, 0 },
1.1 djm 97: { "ecdsa-sha2-nistp256-cert-v01@openssh.com", "ECDSA-CERT",
1.28 markus 98: KEY_ECDSA_CERT, NID_X9_62_prime256v1, 1, 0 },
1.1 djm 99: { "ecdsa-sha2-nistp384-cert-v01@openssh.com", "ECDSA-CERT",
1.28 markus 100: KEY_ECDSA_CERT, NID_secp384r1, 1, 0 },
1.1 djm 101: { "ecdsa-sha2-nistp521-cert-v01@openssh.com", "ECDSA-CERT",
1.28 markus 102: KEY_ECDSA_CERT, NID_secp521r1, 1, 0 },
1.1 djm 103: #endif /* WITH_OPENSSL */
1.28 markus 104: { NULL, NULL, -1, -1, 0, 0 }
1.1 djm 105: };
106:
107: const char *
108: sshkey_type(const struct sshkey *k)
109: {
110: const struct keytype *kt;
111:
112: for (kt = keytypes; kt->type != -1; kt++) {
113: if (kt->type == k->type)
114: return kt->shortname;
115: }
116: return "unknown";
117: }
118:
119: static const char *
120: sshkey_ssh_name_from_type_nid(int type, int nid)
121: {
122: const struct keytype *kt;
123:
124: for (kt = keytypes; kt->type != -1; kt++) {
125: if (kt->type == type && (kt->nid == 0 || kt->nid == nid))
126: return kt->name;
127: }
128: return "ssh-unknown";
129: }
130:
131: int
132: sshkey_type_is_cert(int type)
133: {
134: const struct keytype *kt;
135:
136: for (kt = keytypes; kt->type != -1; kt++) {
137: if (kt->type == type)
138: return kt->cert;
139: }
140: return 0;
141: }
142:
143: const char *
144: sshkey_ssh_name(const struct sshkey *k)
145: {
146: return sshkey_ssh_name_from_type_nid(k->type, k->ecdsa_nid);
147: }
148:
149: const char *
150: sshkey_ssh_name_plain(const struct sshkey *k)
151: {
152: return sshkey_ssh_name_from_type_nid(sshkey_type_plain(k->type),
153: k->ecdsa_nid);
154: }
155:
156: int
157: sshkey_type_from_name(const char *name)
158: {
159: const struct keytype *kt;
160:
161: for (kt = keytypes; kt->type != -1; kt++) {
162: /* Only allow shortname matches for plain key types */
163: if ((kt->name != NULL && strcmp(name, kt->name) == 0) ||
164: (!kt->cert && strcasecmp(kt->shortname, name) == 0))
165: return kt->type;
166: }
167: return KEY_UNSPEC;
168: }
169:
170: int
171: sshkey_ecdsa_nid_from_name(const char *name)
172: {
173: const struct keytype *kt;
174:
1.4 djm 175: for (kt = keytypes; kt->type != -1; kt++) {
176: if (kt->type != KEY_ECDSA && kt->type != KEY_ECDSA_CERT)
177: continue;
178: if (kt->name != NULL && strcmp(name, kt->name) == 0)
179: return kt->nid;
180: }
1.1 djm 181: return -1;
182: }
183:
184: char *
1.45 djm 185: sshkey_alg_list(int certs_only, int plain_only, int include_sigonly, char sep)
1.1 djm 186: {
187: char *tmp, *ret = NULL;
188: size_t nlen, rlen = 0;
189: const struct keytype *kt;
190:
191: for (kt = keytypes; kt->type != -1; kt++) {
1.45 djm 192: if (kt->name == NULL)
193: continue;
194: if (!include_sigonly && kt->sigonly)
1.1 djm 195: continue;
196: if ((certs_only && !kt->cert) || (plain_only && kt->cert))
197: continue;
198: if (ret != NULL)
1.38 djm 199: ret[rlen++] = sep;
1.1 djm 200: nlen = strlen(kt->name);
201: if ((tmp = realloc(ret, rlen + nlen + 2)) == NULL) {
202: free(ret);
203: return NULL;
204: }
205: ret = tmp;
206: memcpy(ret + rlen, kt->name, nlen + 1);
207: rlen += nlen;
208: }
209: return ret;
210: }
211:
212: int
1.11 djm 213: sshkey_names_valid2(const char *names, int allow_wildcard)
1.1 djm 214: {
215: char *s, *cp, *p;
1.11 djm 216: const struct keytype *kt;
217: int type;
1.1 djm 218:
219: if (names == NULL || strcmp(names, "") == 0)
220: return 0;
221: if ((s = cp = strdup(names)) == NULL)
222: return 0;
223: for ((p = strsep(&cp, ",")); p && *p != '\0';
224: (p = strsep(&cp, ","))) {
1.11 djm 225: type = sshkey_type_from_name(p);
226: if (type == KEY_UNSPEC) {
227: if (allow_wildcard) {
228: /*
229: * Try matching key types against the string.
230: * If any has a positive or negative match then
231: * the component is accepted.
232: */
233: for (kt = keytypes; kt->type != -1; kt++) {
234: if (match_pattern_list(kt->name,
1.17 djm 235: p, 0) != 0)
1.11 djm 236: break;
237: }
238: if (kt->type != -1)
239: continue;
240: }
1.1 djm 241: free(s);
242: return 0;
243: }
244: }
245: free(s);
246: return 1;
247: }
248:
249: u_int
250: sshkey_size(const struct sshkey *k)
251: {
252: switch (k->type) {
253: #ifdef WITH_OPENSSL
254: case KEY_RSA:
255: case KEY_RSA_CERT:
256: return BN_num_bits(k->rsa->n);
257: case KEY_DSA:
258: case KEY_DSA_CERT:
259: return BN_num_bits(k->dsa->p);
260: case KEY_ECDSA:
261: case KEY_ECDSA_CERT:
262: return sshkey_curve_nid_to_bits(k->ecdsa_nid);
263: #endif /* WITH_OPENSSL */
264: case KEY_ED25519:
265: case KEY_ED25519_CERT:
266: return 256; /* XXX */
267: }
268: return 0;
269: }
270:
271: static int
272: sshkey_type_is_valid_ca(int type)
273: {
274: switch (type) {
275: case KEY_RSA:
276: case KEY_DSA:
277: case KEY_ECDSA:
278: case KEY_ED25519:
279: return 1;
280: default:
281: return 0;
282: }
283: }
284:
285: int
286: sshkey_is_cert(const struct sshkey *k)
287: {
288: if (k == NULL)
289: return 0;
290: return sshkey_type_is_cert(k->type);
291: }
292:
293: /* Return the cert-less equivalent to a certified key type */
294: int
295: sshkey_type_plain(int type)
296: {
297: switch (type) {
298: case KEY_RSA_CERT:
299: return KEY_RSA;
300: case KEY_DSA_CERT:
301: return KEY_DSA;
302: case KEY_ECDSA_CERT:
303: return KEY_ECDSA;
304: case KEY_ED25519_CERT:
305: return KEY_ED25519;
306: default:
307: return type;
308: }
309: }
310:
311: #ifdef WITH_OPENSSL
312: /* XXX: these are really begging for a table-driven approach */
313: int
314: sshkey_curve_name_to_nid(const char *name)
315: {
316: if (strcmp(name, "nistp256") == 0)
317: return NID_X9_62_prime256v1;
318: else if (strcmp(name, "nistp384") == 0)
319: return NID_secp384r1;
320: else if (strcmp(name, "nistp521") == 0)
321: return NID_secp521r1;
322: else
323: return -1;
324: }
325:
326: u_int
327: sshkey_curve_nid_to_bits(int nid)
328: {
329: switch (nid) {
330: case NID_X9_62_prime256v1:
331: return 256;
332: case NID_secp384r1:
333: return 384;
334: case NID_secp521r1:
335: return 521;
336: default:
337: return 0;
338: }
339: }
340:
341: int
342: sshkey_ecdsa_bits_to_nid(int bits)
343: {
344: switch (bits) {
345: case 256:
346: return NID_X9_62_prime256v1;
347: case 384:
348: return NID_secp384r1;
349: case 521:
350: return NID_secp521r1;
351: default:
352: return -1;
353: }
354: }
355:
356: const char *
357: sshkey_curve_nid_to_name(int nid)
358: {
359: switch (nid) {
360: case NID_X9_62_prime256v1:
361: return "nistp256";
362: case NID_secp384r1:
363: return "nistp384";
364: case NID_secp521r1:
365: return "nistp521";
366: default:
367: return NULL;
368: }
369: }
370:
371: int
372: sshkey_ec_nid_to_hash_alg(int nid)
373: {
374: int kbits = sshkey_curve_nid_to_bits(nid);
375:
376: if (kbits <= 0)
377: return -1;
378:
379: /* RFC5656 section 6.2.1 */
380: if (kbits <= 256)
381: return SSH_DIGEST_SHA256;
382: else if (kbits <= 384)
383: return SSH_DIGEST_SHA384;
384: else
385: return SSH_DIGEST_SHA512;
386: }
387: #endif /* WITH_OPENSSL */
388:
389: static void
390: cert_free(struct sshkey_cert *cert)
391: {
392: u_int i;
393:
394: if (cert == NULL)
395: return;
1.31 mmcc 396: sshbuf_free(cert->certblob);
397: sshbuf_free(cert->critical);
398: sshbuf_free(cert->extensions);
1.29 mmcc 399: free(cert->key_id);
1.1 djm 400: for (i = 0; i < cert->nprincipals; i++)
401: free(cert->principals[i]);
1.29 mmcc 402: free(cert->principals);
1.30 mmcc 403: sshkey_free(cert->signature_key);
1.1 djm 404: explicit_bzero(cert, sizeof(*cert));
405: free(cert);
406: }
407:
408: static struct sshkey_cert *
409: cert_new(void)
410: {
411: struct sshkey_cert *cert;
412:
413: if ((cert = calloc(1, sizeof(*cert))) == NULL)
414: return NULL;
415: if ((cert->certblob = sshbuf_new()) == NULL ||
416: (cert->critical = sshbuf_new()) == NULL ||
417: (cert->extensions = sshbuf_new()) == NULL) {
418: cert_free(cert);
419: return NULL;
420: }
421: cert->key_id = NULL;
422: cert->principals = NULL;
423: cert->signature_key = NULL;
424: return cert;
425: }
426:
427: struct sshkey *
428: sshkey_new(int type)
429: {
430: struct sshkey *k;
431: #ifdef WITH_OPENSSL
432: RSA *rsa;
433: DSA *dsa;
434: #endif /* WITH_OPENSSL */
435:
436: if ((k = calloc(1, sizeof(*k))) == NULL)
437: return NULL;
438: k->type = type;
439: k->ecdsa = NULL;
440: k->ecdsa_nid = -1;
441: k->dsa = NULL;
442: k->rsa = NULL;
443: k->cert = NULL;
444: k->ed25519_sk = NULL;
445: k->ed25519_pk = NULL;
446: switch (k->type) {
447: #ifdef WITH_OPENSSL
448: case KEY_RSA:
449: case KEY_RSA_CERT:
450: if ((rsa = RSA_new()) == NULL ||
451: (rsa->n = BN_new()) == NULL ||
452: (rsa->e = BN_new()) == NULL) {
453: if (rsa != NULL)
454: RSA_free(rsa);
455: free(k);
456: return NULL;
457: }
458: k->rsa = rsa;
459: break;
460: case KEY_DSA:
461: case KEY_DSA_CERT:
462: if ((dsa = DSA_new()) == NULL ||
463: (dsa->p = BN_new()) == NULL ||
464: (dsa->q = BN_new()) == NULL ||
465: (dsa->g = BN_new()) == NULL ||
466: (dsa->pub_key = BN_new()) == NULL) {
467: if (dsa != NULL)
468: DSA_free(dsa);
469: free(k);
470: return NULL;
471: }
472: k->dsa = dsa;
473: break;
474: case KEY_ECDSA:
475: case KEY_ECDSA_CERT:
476: /* Cannot do anything until we know the group */
477: break;
478: #endif /* WITH_OPENSSL */
479: case KEY_ED25519:
480: case KEY_ED25519_CERT:
481: /* no need to prealloc */
482: break;
483: case KEY_UNSPEC:
484: break;
485: default:
486: free(k);
487: return NULL;
488: }
489:
490: if (sshkey_is_cert(k)) {
491: if ((k->cert = cert_new()) == NULL) {
492: sshkey_free(k);
493: return NULL;
494: }
495: }
496:
497: return k;
498: }
499:
500: int
501: sshkey_add_private(struct sshkey *k)
502: {
503: switch (k->type) {
504: #ifdef WITH_OPENSSL
505: case KEY_RSA:
506: case KEY_RSA_CERT:
507: #define bn_maybe_alloc_failed(p) (p == NULL && (p = BN_new()) == NULL)
508: if (bn_maybe_alloc_failed(k->rsa->d) ||
509: bn_maybe_alloc_failed(k->rsa->iqmp) ||
510: bn_maybe_alloc_failed(k->rsa->q) ||
511: bn_maybe_alloc_failed(k->rsa->p) ||
512: bn_maybe_alloc_failed(k->rsa->dmq1) ||
513: bn_maybe_alloc_failed(k->rsa->dmp1))
514: return SSH_ERR_ALLOC_FAIL;
515: break;
516: case KEY_DSA:
517: case KEY_DSA_CERT:
518: if (bn_maybe_alloc_failed(k->dsa->priv_key))
519: return SSH_ERR_ALLOC_FAIL;
520: break;
521: #undef bn_maybe_alloc_failed
522: case KEY_ECDSA:
523: case KEY_ECDSA_CERT:
524: /* Cannot do anything until we know the group */
525: break;
526: #endif /* WITH_OPENSSL */
527: case KEY_ED25519:
528: case KEY_ED25519_CERT:
529: /* no need to prealloc */
530: break;
531: case KEY_UNSPEC:
532: break;
533: default:
534: return SSH_ERR_INVALID_ARGUMENT;
535: }
536: return 0;
537: }
538:
539: struct sshkey *
540: sshkey_new_private(int type)
541: {
542: struct sshkey *k = sshkey_new(type);
543:
544: if (k == NULL)
545: return NULL;
546: if (sshkey_add_private(k) != 0) {
547: sshkey_free(k);
548: return NULL;
549: }
550: return k;
551: }
552:
553: void
554: sshkey_free(struct sshkey *k)
555: {
556: if (k == NULL)
557: return;
558: switch (k->type) {
559: #ifdef WITH_OPENSSL
560: case KEY_RSA:
561: case KEY_RSA_CERT:
562: if (k->rsa != NULL)
563: RSA_free(k->rsa);
564: k->rsa = NULL;
565: break;
566: case KEY_DSA:
567: case KEY_DSA_CERT:
568: if (k->dsa != NULL)
569: DSA_free(k->dsa);
570: k->dsa = NULL;
571: break;
572: case KEY_ECDSA:
573: case KEY_ECDSA_CERT:
574: if (k->ecdsa != NULL)
575: EC_KEY_free(k->ecdsa);
576: k->ecdsa = NULL;
577: break;
578: #endif /* WITH_OPENSSL */
579: case KEY_ED25519:
580: case KEY_ED25519_CERT:
581: if (k->ed25519_pk) {
582: explicit_bzero(k->ed25519_pk, ED25519_PK_SZ);
583: free(k->ed25519_pk);
584: k->ed25519_pk = NULL;
585: }
586: if (k->ed25519_sk) {
587: explicit_bzero(k->ed25519_sk, ED25519_SK_SZ);
588: free(k->ed25519_sk);
589: k->ed25519_sk = NULL;
590: }
591: break;
592: case KEY_UNSPEC:
593: break;
594: default:
595: break;
596: }
597: if (sshkey_is_cert(k))
598: cert_free(k->cert);
599: explicit_bzero(k, sizeof(*k));
600: free(k);
601: }
602:
603: static int
604: cert_compare(struct sshkey_cert *a, struct sshkey_cert *b)
605: {
606: if (a == NULL && b == NULL)
607: return 1;
608: if (a == NULL || b == NULL)
609: return 0;
610: if (sshbuf_len(a->certblob) != sshbuf_len(b->certblob))
611: return 0;
612: if (timingsafe_bcmp(sshbuf_ptr(a->certblob), sshbuf_ptr(b->certblob),
613: sshbuf_len(a->certblob)) != 0)
614: return 0;
615: return 1;
616: }
617:
618: /*
619: * Compare public portions of key only, allowing comparisons between
620: * certificates and plain keys too.
621: */
622: int
623: sshkey_equal_public(const struct sshkey *a, const struct sshkey *b)
624: {
625: #ifdef WITH_OPENSSL
626: BN_CTX *bnctx;
627: #endif /* WITH_OPENSSL */
628:
629: if (a == NULL || b == NULL ||
630: sshkey_type_plain(a->type) != sshkey_type_plain(b->type))
631: return 0;
632:
633: switch (a->type) {
634: #ifdef WITH_OPENSSL
635: case KEY_RSA_CERT:
636: case KEY_RSA:
637: return a->rsa != NULL && b->rsa != NULL &&
638: BN_cmp(a->rsa->e, b->rsa->e) == 0 &&
639: BN_cmp(a->rsa->n, b->rsa->n) == 0;
640: case KEY_DSA_CERT:
641: case KEY_DSA:
642: return a->dsa != NULL && b->dsa != NULL &&
643: BN_cmp(a->dsa->p, b->dsa->p) == 0 &&
644: BN_cmp(a->dsa->q, b->dsa->q) == 0 &&
645: BN_cmp(a->dsa->g, b->dsa->g) == 0 &&
646: BN_cmp(a->dsa->pub_key, b->dsa->pub_key) == 0;
647: case KEY_ECDSA_CERT:
648: case KEY_ECDSA:
649: if (a->ecdsa == NULL || b->ecdsa == NULL ||
650: EC_KEY_get0_public_key(a->ecdsa) == NULL ||
651: EC_KEY_get0_public_key(b->ecdsa) == NULL)
652: return 0;
653: if ((bnctx = BN_CTX_new()) == NULL)
654: return 0;
655: if (EC_GROUP_cmp(EC_KEY_get0_group(a->ecdsa),
656: EC_KEY_get0_group(b->ecdsa), bnctx) != 0 ||
657: EC_POINT_cmp(EC_KEY_get0_group(a->ecdsa),
658: EC_KEY_get0_public_key(a->ecdsa),
659: EC_KEY_get0_public_key(b->ecdsa), bnctx) != 0) {
660: BN_CTX_free(bnctx);
661: return 0;
662: }
663: BN_CTX_free(bnctx);
664: return 1;
665: #endif /* WITH_OPENSSL */
666: case KEY_ED25519:
667: case KEY_ED25519_CERT:
668: return a->ed25519_pk != NULL && b->ed25519_pk != NULL &&
669: memcmp(a->ed25519_pk, b->ed25519_pk, ED25519_PK_SZ) == 0;
670: default:
671: return 0;
672: }
673: /* NOTREACHED */
674: }
675:
676: int
677: sshkey_equal(const struct sshkey *a, const struct sshkey *b)
678: {
679: if (a == NULL || b == NULL || a->type != b->type)
680: return 0;
681: if (sshkey_is_cert(a)) {
682: if (!cert_compare(a->cert, b->cert))
683: return 0;
684: }
685: return sshkey_equal_public(a, b);
686: }
687:
688: static int
689: to_blob_buf(const struct sshkey *key, struct sshbuf *b, int force_plain)
690: {
691: int type, ret = SSH_ERR_INTERNAL_ERROR;
692: const char *typename;
693:
694: if (key == NULL)
695: return SSH_ERR_INVALID_ARGUMENT;
696:
1.19 djm 697: if (sshkey_is_cert(key)) {
698: if (key->cert == NULL)
699: return SSH_ERR_EXPECTED_CERT;
700: if (sshbuf_len(key->cert->certblob) == 0)
701: return SSH_ERR_KEY_LACKS_CERTBLOB;
702: }
1.1 djm 703: type = force_plain ? sshkey_type_plain(key->type) : key->type;
704: typename = sshkey_ssh_name_from_type_nid(type, key->ecdsa_nid);
705:
706: switch (type) {
707: #ifdef WITH_OPENSSL
708: case KEY_DSA_CERT:
709: case KEY_ECDSA_CERT:
710: case KEY_RSA_CERT:
711: #endif /* WITH_OPENSSL */
712: case KEY_ED25519_CERT:
713: /* Use the existing blob */
714: /* XXX modified flag? */
715: if ((ret = sshbuf_putb(b, key->cert->certblob)) != 0)
716: return ret;
717: break;
718: #ifdef WITH_OPENSSL
719: case KEY_DSA:
720: if (key->dsa == NULL)
721: return SSH_ERR_INVALID_ARGUMENT;
722: if ((ret = sshbuf_put_cstring(b, typename)) != 0 ||
723: (ret = sshbuf_put_bignum2(b, key->dsa->p)) != 0 ||
724: (ret = sshbuf_put_bignum2(b, key->dsa->q)) != 0 ||
725: (ret = sshbuf_put_bignum2(b, key->dsa->g)) != 0 ||
726: (ret = sshbuf_put_bignum2(b, key->dsa->pub_key)) != 0)
727: return ret;
728: break;
729: case KEY_ECDSA:
730: if (key->ecdsa == NULL)
731: return SSH_ERR_INVALID_ARGUMENT;
732: if ((ret = sshbuf_put_cstring(b, typename)) != 0 ||
733: (ret = sshbuf_put_cstring(b,
734: sshkey_curve_nid_to_name(key->ecdsa_nid))) != 0 ||
735: (ret = sshbuf_put_eckey(b, key->ecdsa)) != 0)
736: return ret;
737: break;
738: case KEY_RSA:
739: if (key->rsa == NULL)
740: return SSH_ERR_INVALID_ARGUMENT;
741: if ((ret = sshbuf_put_cstring(b, typename)) != 0 ||
742: (ret = sshbuf_put_bignum2(b, key->rsa->e)) != 0 ||
743: (ret = sshbuf_put_bignum2(b, key->rsa->n)) != 0)
744: return ret;
745: break;
746: #endif /* WITH_OPENSSL */
747: case KEY_ED25519:
748: if (key->ed25519_pk == NULL)
749: return SSH_ERR_INVALID_ARGUMENT;
750: if ((ret = sshbuf_put_cstring(b, typename)) != 0 ||
751: (ret = sshbuf_put_string(b,
752: key->ed25519_pk, ED25519_PK_SZ)) != 0)
753: return ret;
754: break;
755: default:
756: return SSH_ERR_KEY_TYPE_UNKNOWN;
757: }
758: return 0;
759: }
760:
761: int
1.14 djm 762: sshkey_putb(const struct sshkey *key, struct sshbuf *b)
1.1 djm 763: {
764: return to_blob_buf(key, b, 0);
765: }
766:
767: int
1.14 djm 768: sshkey_puts(const struct sshkey *key, struct sshbuf *b)
769: {
770: struct sshbuf *tmp;
771: int r;
772:
773: if ((tmp = sshbuf_new()) == NULL)
774: return SSH_ERR_ALLOC_FAIL;
775: r = to_blob_buf(key, tmp, 0);
776: if (r == 0)
777: r = sshbuf_put_stringb(b, tmp);
778: sshbuf_free(tmp);
779: return r;
780: }
781:
782: int
783: sshkey_putb_plain(const struct sshkey *key, struct sshbuf *b)
1.1 djm 784: {
785: return to_blob_buf(key, b, 1);
786: }
787:
788: static int
789: to_blob(const struct sshkey *key, u_char **blobp, size_t *lenp, int force_plain)
790: {
791: int ret = SSH_ERR_INTERNAL_ERROR;
792: size_t len;
793: struct sshbuf *b = NULL;
794:
795: if (lenp != NULL)
796: *lenp = 0;
797: if (blobp != NULL)
798: *blobp = NULL;
799: if ((b = sshbuf_new()) == NULL)
800: return SSH_ERR_ALLOC_FAIL;
801: if ((ret = to_blob_buf(key, b, force_plain)) != 0)
802: goto out;
803: len = sshbuf_len(b);
804: if (lenp != NULL)
805: *lenp = len;
806: if (blobp != NULL) {
807: if ((*blobp = malloc(len)) == NULL) {
808: ret = SSH_ERR_ALLOC_FAIL;
809: goto out;
810: }
811: memcpy(*blobp, sshbuf_ptr(b), len);
812: }
813: ret = 0;
814: out:
815: sshbuf_free(b);
816: return ret;
817: }
818:
819: int
820: sshkey_to_blob(const struct sshkey *key, u_char **blobp, size_t *lenp)
821: {
822: return to_blob(key, blobp, lenp, 0);
823: }
824:
825: int
826: sshkey_plain_to_blob(const struct sshkey *key, u_char **blobp, size_t *lenp)
827: {
828: return to_blob(key, blobp, lenp, 1);
829: }
830:
831: int
1.7 djm 832: sshkey_fingerprint_raw(const struct sshkey *k, int dgst_alg,
1.1 djm 833: u_char **retp, size_t *lenp)
834: {
835: u_char *blob = NULL, *ret = NULL;
836: size_t blob_len = 0;
1.7 djm 837: int r = SSH_ERR_INTERNAL_ERROR;
1.1 djm 838:
839: if (retp != NULL)
840: *retp = NULL;
841: if (lenp != NULL)
842: *lenp = 0;
1.7 djm 843: if (ssh_digest_bytes(dgst_alg) == 0) {
1.1 djm 844: r = SSH_ERR_INVALID_ARGUMENT;
845: goto out;
846: }
1.48 djm 847: if ((r = to_blob(k, &blob, &blob_len, 1)) != 0)
1.1 djm 848: goto out;
849: if ((ret = calloc(1, SSH_DIGEST_MAX_LENGTH)) == NULL) {
850: r = SSH_ERR_ALLOC_FAIL;
851: goto out;
852: }
1.7 djm 853: if ((r = ssh_digest_memory(dgst_alg, blob, blob_len,
1.1 djm 854: ret, SSH_DIGEST_MAX_LENGTH)) != 0)
855: goto out;
856: /* success */
857: if (retp != NULL) {
858: *retp = ret;
859: ret = NULL;
860: }
861: if (lenp != NULL)
1.7 djm 862: *lenp = ssh_digest_bytes(dgst_alg);
1.1 djm 863: r = 0;
864: out:
865: free(ret);
866: if (blob != NULL) {
867: explicit_bzero(blob, blob_len);
868: free(blob);
869: }
870: return r;
871: }
872:
873: static char *
1.7 djm 874: fingerprint_b64(const char *alg, u_char *dgst_raw, size_t dgst_raw_len)
875: {
876: char *ret;
877: size_t plen = strlen(alg) + 1;
878: size_t rlen = ((dgst_raw_len + 2) / 3) * 4 + plen + 1;
879: int r;
880:
881: if (dgst_raw_len > 65536 || (ret = calloc(1, rlen)) == NULL)
882: return NULL;
883: strlcpy(ret, alg, rlen);
884: strlcat(ret, ":", rlen);
885: if (dgst_raw_len == 0)
886: return ret;
887: if ((r = b64_ntop(dgst_raw, dgst_raw_len,
888: ret + plen, rlen - plen)) == -1) {
889: explicit_bzero(ret, rlen);
890: free(ret);
891: return NULL;
892: }
893: /* Trim padding characters from end */
894: ret[strcspn(ret, "=")] = '\0';
895: return ret;
896: }
897:
898: static char *
899: fingerprint_hex(const char *alg, u_char *dgst_raw, size_t dgst_raw_len)
1.1 djm 900: {
1.7 djm 901: char *retval, hex[5];
902: size_t i, rlen = dgst_raw_len * 3 + strlen(alg) + 2;
1.1 djm 903:
1.7 djm 904: if (dgst_raw_len > 65536 || (retval = calloc(1, rlen)) == NULL)
1.1 djm 905: return NULL;
1.7 djm 906: strlcpy(retval, alg, rlen);
907: strlcat(retval, ":", rlen);
1.1 djm 908: for (i = 0; i < dgst_raw_len; i++) {
1.7 djm 909: snprintf(hex, sizeof(hex), "%s%02x",
910: i > 0 ? ":" : "", dgst_raw[i]);
911: strlcat(retval, hex, rlen);
1.1 djm 912: }
913: return retval;
914: }
915:
916: static char *
917: fingerprint_bubblebabble(u_char *dgst_raw, size_t dgst_raw_len)
918: {
919: char vowels[] = { 'a', 'e', 'i', 'o', 'u', 'y' };
920: char consonants[] = { 'b', 'c', 'd', 'f', 'g', 'h', 'k', 'l', 'm',
921: 'n', 'p', 'r', 's', 't', 'v', 'z', 'x' };
922: u_int i, j = 0, rounds, seed = 1;
923: char *retval;
924:
925: rounds = (dgst_raw_len / 2) + 1;
926: if ((retval = calloc(rounds, 6)) == NULL)
927: return NULL;
928: retval[j++] = 'x';
929: for (i = 0; i < rounds; i++) {
930: u_int idx0, idx1, idx2, idx3, idx4;
931: if ((i + 1 < rounds) || (dgst_raw_len % 2 != 0)) {
932: idx0 = (((((u_int)(dgst_raw[2 * i])) >> 6) & 3) +
933: seed) % 6;
934: idx1 = (((u_int)(dgst_raw[2 * i])) >> 2) & 15;
935: idx2 = ((((u_int)(dgst_raw[2 * i])) & 3) +
936: (seed / 6)) % 6;
937: retval[j++] = vowels[idx0];
938: retval[j++] = consonants[idx1];
939: retval[j++] = vowels[idx2];
940: if ((i + 1) < rounds) {
941: idx3 = (((u_int)(dgst_raw[(2 * i) + 1])) >> 4) & 15;
942: idx4 = (((u_int)(dgst_raw[(2 * i) + 1]))) & 15;
943: retval[j++] = consonants[idx3];
944: retval[j++] = '-';
945: retval[j++] = consonants[idx4];
946: seed = ((seed * 5) +
947: ((((u_int)(dgst_raw[2 * i])) * 7) +
948: ((u_int)(dgst_raw[(2 * i) + 1])))) % 36;
949: }
950: } else {
951: idx0 = seed % 6;
952: idx1 = 16;
953: idx2 = seed / 6;
954: retval[j++] = vowels[idx0];
955: retval[j++] = consonants[idx1];
956: retval[j++] = vowels[idx2];
957: }
958: }
959: retval[j++] = 'x';
960: retval[j++] = '\0';
961: return retval;
962: }
963:
964: /*
965: * Draw an ASCII-Art representing the fingerprint so human brain can
966: * profit from its built-in pattern recognition ability.
967: * This technique is called "random art" and can be found in some
968: * scientific publications like this original paper:
969: *
970: * "Hash Visualization: a New Technique to improve Real-World Security",
971: * Perrig A. and Song D., 1999, International Workshop on Cryptographic
972: * Techniques and E-Commerce (CrypTEC '99)
973: * sparrow.ece.cmu.edu/~adrian/projects/validation/validation.pdf
974: *
975: * The subject came up in a talk by Dan Kaminsky, too.
976: *
977: * If you see the picture is different, the key is different.
978: * If the picture looks the same, you still know nothing.
979: *
980: * The algorithm used here is a worm crawling over a discrete plane,
981: * leaving a trace (augmenting the field) everywhere it goes.
982: * Movement is taken from dgst_raw 2bit-wise. Bumping into walls
983: * makes the respective movement vector be ignored for this turn.
984: * Graphs are not unambiguous, because circles in graphs can be
985: * walked in either direction.
986: */
987:
988: /*
989: * Field sizes for the random art. Have to be odd, so the starting point
990: * can be in the exact middle of the picture, and FLDBASE should be >=8 .
991: * Else pictures would be too dense, and drawing the frame would
992: * fail, too, because the key type would not fit in anymore.
993: */
994: #define FLDBASE 8
995: #define FLDSIZE_Y (FLDBASE + 1)
996: #define FLDSIZE_X (FLDBASE * 2 + 1)
997: static char *
1.7 djm 998: fingerprint_randomart(const char *alg, u_char *dgst_raw, size_t dgst_raw_len,
1.1 djm 999: const struct sshkey *k)
1000: {
1001: /*
1002: * Chars to be used after each other every time the worm
1003: * intersects with itself. Matter of taste.
1004: */
1005: char *augmentation_string = " .o+=*BOX@%&#/^SE";
1.7 djm 1006: char *retval, *p, title[FLDSIZE_X], hash[FLDSIZE_X];
1.1 djm 1007: u_char field[FLDSIZE_X][FLDSIZE_Y];
1.7 djm 1008: size_t i, tlen, hlen;
1.1 djm 1009: u_int b;
1.3 djm 1010: int x, y, r;
1.1 djm 1011: size_t len = strlen(augmentation_string) - 1;
1012:
1013: if ((retval = calloc((FLDSIZE_X + 3), (FLDSIZE_Y + 2))) == NULL)
1014: return NULL;
1015:
1016: /* initialize field */
1017: memset(field, 0, FLDSIZE_X * FLDSIZE_Y * sizeof(char));
1018: x = FLDSIZE_X / 2;
1019: y = FLDSIZE_Y / 2;
1020:
1021: /* process raw key */
1022: for (i = 0; i < dgst_raw_len; i++) {
1023: int input;
1024: /* each byte conveys four 2-bit move commands */
1025: input = dgst_raw[i];
1026: for (b = 0; b < 4; b++) {
1027: /* evaluate 2 bit, rest is shifted later */
1028: x += (input & 0x1) ? 1 : -1;
1029: y += (input & 0x2) ? 1 : -1;
1030:
1031: /* assure we are still in bounds */
1.37 deraadt 1032: x = MAXIMUM(x, 0);
1033: y = MAXIMUM(y, 0);
1034: x = MINIMUM(x, FLDSIZE_X - 1);
1035: y = MINIMUM(y, FLDSIZE_Y - 1);
1.1 djm 1036:
1037: /* augment the field */
1038: if (field[x][y] < len - 2)
1039: field[x][y]++;
1040: input = input >> 2;
1041: }
1042: }
1043:
1044: /* mark starting point and end point*/
1045: field[FLDSIZE_X / 2][FLDSIZE_Y / 2] = len - 1;
1046: field[x][y] = len;
1047:
1.3 djm 1048: /* assemble title */
1049: r = snprintf(title, sizeof(title), "[%s %u]",
1050: sshkey_type(k), sshkey_size(k));
1051: /* If [type size] won't fit, then try [type]; fits "[ED25519-CERT]" */
1052: if (r < 0 || r > (int)sizeof(title))
1.7 djm 1053: r = snprintf(title, sizeof(title), "[%s]", sshkey_type(k));
1054: tlen = (r <= 0) ? 0 : strlen(title);
1055:
1056: /* assemble hash ID. */
1057: r = snprintf(hash, sizeof(hash), "[%s]", alg);
1058: hlen = (r <= 0) ? 0 : strlen(hash);
1.1 djm 1059:
1060: /* output upper border */
1.3 djm 1061: p = retval;
1062: *p++ = '+';
1063: for (i = 0; i < (FLDSIZE_X - tlen) / 2; i++)
1064: *p++ = '-';
1065: memcpy(p, title, tlen);
1066: p += tlen;
1.7 djm 1067: for (i += tlen; i < FLDSIZE_X; i++)
1.1 djm 1068: *p++ = '-';
1069: *p++ = '+';
1070: *p++ = '\n';
1071:
1072: /* output content */
1073: for (y = 0; y < FLDSIZE_Y; y++) {
1074: *p++ = '|';
1075: for (x = 0; x < FLDSIZE_X; x++)
1.37 deraadt 1076: *p++ = augmentation_string[MINIMUM(field[x][y], len)];
1.1 djm 1077: *p++ = '|';
1078: *p++ = '\n';
1079: }
1080:
1081: /* output lower border */
1082: *p++ = '+';
1.7 djm 1083: for (i = 0; i < (FLDSIZE_X - hlen) / 2; i++)
1084: *p++ = '-';
1085: memcpy(p, hash, hlen);
1086: p += hlen;
1087: for (i += hlen; i < FLDSIZE_X; i++)
1.1 djm 1088: *p++ = '-';
1089: *p++ = '+';
1090:
1091: return retval;
1092: }
1093:
1094: char *
1.7 djm 1095: sshkey_fingerprint(const struct sshkey *k, int dgst_alg,
1.1 djm 1096: enum sshkey_fp_rep dgst_rep)
1097: {
1098: char *retval = NULL;
1099: u_char *dgst_raw;
1100: size_t dgst_raw_len;
1101:
1.7 djm 1102: if (sshkey_fingerprint_raw(k, dgst_alg, &dgst_raw, &dgst_raw_len) != 0)
1.1 djm 1103: return NULL;
1104: switch (dgst_rep) {
1.7 djm 1105: case SSH_FP_DEFAULT:
1106: if (dgst_alg == SSH_DIGEST_MD5) {
1107: retval = fingerprint_hex(ssh_digest_alg_name(dgst_alg),
1108: dgst_raw, dgst_raw_len);
1109: } else {
1110: retval = fingerprint_b64(ssh_digest_alg_name(dgst_alg),
1111: dgst_raw, dgst_raw_len);
1112: }
1113: break;
1.1 djm 1114: case SSH_FP_HEX:
1.7 djm 1115: retval = fingerprint_hex(ssh_digest_alg_name(dgst_alg),
1116: dgst_raw, dgst_raw_len);
1117: break;
1118: case SSH_FP_BASE64:
1119: retval = fingerprint_b64(ssh_digest_alg_name(dgst_alg),
1120: dgst_raw, dgst_raw_len);
1.1 djm 1121: break;
1122: case SSH_FP_BUBBLEBABBLE:
1123: retval = fingerprint_bubblebabble(dgst_raw, dgst_raw_len);
1124: break;
1125: case SSH_FP_RANDOMART:
1.7 djm 1126: retval = fingerprint_randomart(ssh_digest_alg_name(dgst_alg),
1127: dgst_raw, dgst_raw_len, k);
1.1 djm 1128: break;
1129: default:
1130: explicit_bzero(dgst_raw, dgst_raw_len);
1131: free(dgst_raw);
1132: return NULL;
1133: }
1134: explicit_bzero(dgst_raw, dgst_raw_len);
1135: free(dgst_raw);
1136: return retval;
1137: }
1138:
1139:
1140: /* returns 0 ok, and < 0 error */
1141: int
1142: sshkey_read(struct sshkey *ret, char **cpp)
1143: {
1144: struct sshkey *k;
1145: int retval = SSH_ERR_INVALID_FORMAT;
1.25 djm 1146: char *ep, *cp, *space;
1.1 djm 1147: int r, type, curve_nid = -1;
1148: struct sshbuf *blob;
1.44 dtucker 1149:
1150: if (ret == NULL)
1151: return SSH_ERR_INVALID_ARGUMENT;
1.1 djm 1152:
1153: cp = *cpp;
1154:
1155: switch (ret->type) {
1156: case KEY_UNSPEC:
1157: case KEY_RSA:
1158: case KEY_DSA:
1159: case KEY_ECDSA:
1160: case KEY_ED25519:
1161: case KEY_DSA_CERT:
1162: case KEY_ECDSA_CERT:
1163: case KEY_RSA_CERT:
1164: case KEY_ED25519_CERT:
1165: space = strchr(cp, ' ');
1166: if (space == NULL)
1167: return SSH_ERR_INVALID_FORMAT;
1168: *space = '\0';
1169: type = sshkey_type_from_name(cp);
1170: if (sshkey_type_plain(type) == KEY_ECDSA &&
1171: (curve_nid = sshkey_ecdsa_nid_from_name(cp)) == -1)
1172: return SSH_ERR_EC_CURVE_INVALID;
1173: *space = ' ';
1174: if (type == KEY_UNSPEC)
1175: return SSH_ERR_INVALID_FORMAT;
1176: cp = space+1;
1177: if (*cp == '\0')
1178: return SSH_ERR_INVALID_FORMAT;
1.5 djm 1179: if (ret->type != KEY_UNSPEC && ret->type != type)
1.1 djm 1180: return SSH_ERR_KEY_TYPE_MISMATCH;
1181: if ((blob = sshbuf_new()) == NULL)
1182: return SSH_ERR_ALLOC_FAIL;
1183: /* trim comment */
1184: space = strchr(cp, ' ');
1.10 markus 1185: if (space) {
1186: /* advance 'space': skip whitespace */
1187: *space++ = '\0';
1188: while (*space == ' ' || *space == '\t')
1189: space++;
1.25 djm 1190: ep = space;
1.10 markus 1191: } else
1.25 djm 1192: ep = cp + strlen(cp);
1.1 djm 1193: if ((r = sshbuf_b64tod(blob, cp)) != 0) {
1194: sshbuf_free(blob);
1195: return r;
1196: }
1197: if ((r = sshkey_from_blob(sshbuf_ptr(blob),
1198: sshbuf_len(blob), &k)) != 0) {
1199: sshbuf_free(blob);
1200: return r;
1201: }
1202: sshbuf_free(blob);
1203: if (k->type != type) {
1204: sshkey_free(k);
1205: return SSH_ERR_KEY_TYPE_MISMATCH;
1206: }
1207: if (sshkey_type_plain(type) == KEY_ECDSA &&
1208: curve_nid != k->ecdsa_nid) {
1209: sshkey_free(k);
1210: return SSH_ERR_EC_CURVE_MISMATCH;
1211: }
1.5 djm 1212: ret->type = type;
1.1 djm 1213: if (sshkey_is_cert(ret)) {
1214: if (!sshkey_is_cert(k)) {
1215: sshkey_free(k);
1216: return SSH_ERR_EXPECTED_CERT;
1217: }
1218: if (ret->cert != NULL)
1219: cert_free(ret->cert);
1220: ret->cert = k->cert;
1221: k->cert = NULL;
1222: }
1.25 djm 1223: switch (sshkey_type_plain(ret->type)) {
1.1 djm 1224: #ifdef WITH_OPENSSL
1.25 djm 1225: case KEY_RSA:
1.1 djm 1226: if (ret->rsa != NULL)
1227: RSA_free(ret->rsa);
1228: ret->rsa = k->rsa;
1229: k->rsa = NULL;
1230: #ifdef DEBUG_PK
1231: RSA_print_fp(stderr, ret->rsa, 8);
1232: #endif
1.25 djm 1233: break;
1234: case KEY_DSA:
1.1 djm 1235: if (ret->dsa != NULL)
1236: DSA_free(ret->dsa);
1237: ret->dsa = k->dsa;
1238: k->dsa = NULL;
1239: #ifdef DEBUG_PK
1240: DSA_print_fp(stderr, ret->dsa, 8);
1241: #endif
1.25 djm 1242: break;
1243: case KEY_ECDSA:
1.1 djm 1244: if (ret->ecdsa != NULL)
1245: EC_KEY_free(ret->ecdsa);
1246: ret->ecdsa = k->ecdsa;
1247: ret->ecdsa_nid = k->ecdsa_nid;
1248: k->ecdsa = NULL;
1249: k->ecdsa_nid = -1;
1250: #ifdef DEBUG_PK
1251: sshkey_dump_ec_key(ret->ecdsa);
1252: #endif
1.25 djm 1253: break;
1.1 djm 1254: #endif /* WITH_OPENSSL */
1.25 djm 1255: case KEY_ED25519:
1.1 djm 1256: free(ret->ed25519_pk);
1257: ret->ed25519_pk = k->ed25519_pk;
1258: k->ed25519_pk = NULL;
1259: #ifdef DEBUG_PK
1260: /* XXX */
1261: #endif
1.25 djm 1262: break;
1.1 djm 1263: }
1.25 djm 1264: *cpp = ep;
1.1 djm 1265: retval = 0;
1266: /*XXXX*/
1267: sshkey_free(k);
1268: if (retval != 0)
1269: break;
1270: break;
1271: default:
1272: return SSH_ERR_INVALID_ARGUMENT;
1273: }
1274: return retval;
1275: }
1276:
1277: int
1.19 djm 1278: sshkey_to_base64(const struct sshkey *key, char **b64p)
1.1 djm 1279: {
1.19 djm 1280: int r = SSH_ERR_INTERNAL_ERROR;
1281: struct sshbuf *b = NULL;
1.1 djm 1282: char *uu = NULL;
1.19 djm 1283:
1284: if (b64p != NULL)
1285: *b64p = NULL;
1286: if ((b = sshbuf_new()) == NULL)
1287: return SSH_ERR_ALLOC_FAIL;
1288: if ((r = sshkey_putb(key, b)) != 0)
1289: goto out;
1290: if ((uu = sshbuf_dtob64(b)) == NULL) {
1291: r = SSH_ERR_ALLOC_FAIL;
1292: goto out;
1293: }
1294: /* Success */
1295: if (b64p != NULL) {
1296: *b64p = uu;
1297: uu = NULL;
1298: }
1299: r = 0;
1300: out:
1301: sshbuf_free(b);
1302: free(uu);
1303: return r;
1304: }
1305:
1.52 djm 1306: int
1.19 djm 1307: sshkey_format_text(const struct sshkey *key, struct sshbuf *b)
1308: {
1309: int r = SSH_ERR_INTERNAL_ERROR;
1310: char *uu = NULL;
1311:
1.48 djm 1312: if ((r = sshkey_to_base64(key, &uu)) != 0)
1313: goto out;
1314: if ((r = sshbuf_putf(b, "%s %s",
1315: sshkey_ssh_name(key), uu)) != 0)
1316: goto out;
1.19 djm 1317: r = 0;
1318: out:
1319: free(uu);
1320: return r;
1321: }
1322:
1323: int
1324: sshkey_write(const struct sshkey *key, FILE *f)
1325: {
1326: struct sshbuf *b = NULL;
1327: int r = SSH_ERR_INTERNAL_ERROR;
1328:
1329: if ((b = sshbuf_new()) == NULL)
1330: return SSH_ERR_ALLOC_FAIL;
1331: if ((r = sshkey_format_text(key, b)) != 0)
1.1 djm 1332: goto out;
1333: if (fwrite(sshbuf_ptr(b), sshbuf_len(b), 1, f) != 1) {
1334: if (feof(f))
1335: errno = EPIPE;
1.19 djm 1336: r = SSH_ERR_SYSTEM_ERROR;
1.1 djm 1337: goto out;
1338: }
1.19 djm 1339: /* Success */
1340: r = 0;
1.1 djm 1341: out:
1.19 djm 1342: sshbuf_free(b);
1343: return r;
1.1 djm 1344: }
1345:
1346: const char *
1347: sshkey_cert_type(const struct sshkey *k)
1348: {
1349: switch (k->cert->type) {
1350: case SSH2_CERT_TYPE_USER:
1351: return "user";
1352: case SSH2_CERT_TYPE_HOST:
1353: return "host";
1354: default:
1355: return "unknown";
1356: }
1357: }
1358:
1359: #ifdef WITH_OPENSSL
1360: static int
1361: rsa_generate_private_key(u_int bits, RSA **rsap)
1362: {
1363: RSA *private = NULL;
1364: BIGNUM *f4 = NULL;
1365: int ret = SSH_ERR_INTERNAL_ERROR;
1366:
1.49 djm 1367: if (rsap == NULL)
1368: return SSH_ERR_INVALID_ARGUMENT;
1369: if (bits < SSH_RSA_MINIMUM_MODULUS_SIZE ||
1.1 djm 1370: bits > SSHBUF_MAX_BIGNUM * 8)
1.49 djm 1371: return SSH_ERR_KEY_LENGTH;
1.1 djm 1372: *rsap = NULL;
1373: if ((private = RSA_new()) == NULL || (f4 = BN_new()) == NULL) {
1374: ret = SSH_ERR_ALLOC_FAIL;
1375: goto out;
1376: }
1377: if (!BN_set_word(f4, RSA_F4) ||
1378: !RSA_generate_key_ex(private, bits, f4, NULL)) {
1379: ret = SSH_ERR_LIBCRYPTO_ERROR;
1380: goto out;
1381: }
1382: *rsap = private;
1383: private = NULL;
1384: ret = 0;
1385: out:
1386: if (private != NULL)
1387: RSA_free(private);
1388: if (f4 != NULL)
1389: BN_free(f4);
1390: return ret;
1391: }
1392:
1393: static int
1394: dsa_generate_private_key(u_int bits, DSA **dsap)
1395: {
1396: DSA *private;
1397: int ret = SSH_ERR_INTERNAL_ERROR;
1398:
1.49 djm 1399: if (dsap == NULL)
1.1 djm 1400: return SSH_ERR_INVALID_ARGUMENT;
1.49 djm 1401: if (bits != 1024)
1402: return SSH_ERR_KEY_LENGTH;
1.1 djm 1403: if ((private = DSA_new()) == NULL) {
1404: ret = SSH_ERR_ALLOC_FAIL;
1405: goto out;
1406: }
1407: *dsap = NULL;
1408: if (!DSA_generate_parameters_ex(private, bits, NULL, 0, NULL,
1409: NULL, NULL) || !DSA_generate_key(private)) {
1410: ret = SSH_ERR_LIBCRYPTO_ERROR;
1411: goto out;
1412: }
1413: *dsap = private;
1414: private = NULL;
1415: ret = 0;
1416: out:
1417: if (private != NULL)
1418: DSA_free(private);
1419: return ret;
1420: }
1421:
1422: int
1423: sshkey_ecdsa_key_to_nid(EC_KEY *k)
1424: {
1425: EC_GROUP *eg;
1426: int nids[] = {
1427: NID_X9_62_prime256v1,
1428: NID_secp384r1,
1429: NID_secp521r1,
1430: -1
1431: };
1432: int nid;
1433: u_int i;
1434: BN_CTX *bnctx;
1435: const EC_GROUP *g = EC_KEY_get0_group(k);
1436:
1437: /*
1438: * The group may be stored in a ASN.1 encoded private key in one of two
1439: * ways: as a "named group", which is reconstituted by ASN.1 object ID
1440: * or explicit group parameters encoded into the key blob. Only the
1441: * "named group" case sets the group NID for us, but we can figure
1442: * it out for the other case by comparing against all the groups that
1443: * are supported.
1444: */
1445: if ((nid = EC_GROUP_get_curve_name(g)) > 0)
1446: return nid;
1447: if ((bnctx = BN_CTX_new()) == NULL)
1448: return -1;
1449: for (i = 0; nids[i] != -1; i++) {
1450: if ((eg = EC_GROUP_new_by_curve_name(nids[i])) == NULL) {
1451: BN_CTX_free(bnctx);
1452: return -1;
1453: }
1454: if (EC_GROUP_cmp(g, eg, bnctx) == 0)
1455: break;
1456: EC_GROUP_free(eg);
1457: }
1458: BN_CTX_free(bnctx);
1459: if (nids[i] != -1) {
1460: /* Use the group with the NID attached */
1461: EC_GROUP_set_asn1_flag(eg, OPENSSL_EC_NAMED_CURVE);
1462: if (EC_KEY_set_group(k, eg) != 1) {
1463: EC_GROUP_free(eg);
1464: return -1;
1465: }
1466: }
1467: return nids[i];
1468: }
1469:
1470: static int
1471: ecdsa_generate_private_key(u_int bits, int *nid, EC_KEY **ecdsap)
1472: {
1473: EC_KEY *private;
1474: int ret = SSH_ERR_INTERNAL_ERROR;
1475:
1.50 djm 1476: if (nid == NULL || ecdsap == NULL)
1.1 djm 1477: return SSH_ERR_INVALID_ARGUMENT;
1.50 djm 1478: if ((*nid = sshkey_ecdsa_bits_to_nid(bits)) == -1)
1479: return SSH_ERR_KEY_LENGTH;
1.1 djm 1480: *ecdsap = NULL;
1481: if ((private = EC_KEY_new_by_curve_name(*nid)) == NULL) {
1482: ret = SSH_ERR_ALLOC_FAIL;
1483: goto out;
1484: }
1485: if (EC_KEY_generate_key(private) != 1) {
1486: ret = SSH_ERR_LIBCRYPTO_ERROR;
1487: goto out;
1488: }
1489: EC_KEY_set_asn1_flag(private, OPENSSL_EC_NAMED_CURVE);
1490: *ecdsap = private;
1491: private = NULL;
1492: ret = 0;
1493: out:
1494: if (private != NULL)
1495: EC_KEY_free(private);
1496: return ret;
1497: }
1498: #endif /* WITH_OPENSSL */
1499:
1500: int
1501: sshkey_generate(int type, u_int bits, struct sshkey **keyp)
1502: {
1503: struct sshkey *k;
1504: int ret = SSH_ERR_INTERNAL_ERROR;
1505:
1506: if (keyp == NULL)
1507: return SSH_ERR_INVALID_ARGUMENT;
1508: *keyp = NULL;
1509: if ((k = sshkey_new(KEY_UNSPEC)) == NULL)
1510: return SSH_ERR_ALLOC_FAIL;
1511: switch (type) {
1512: case KEY_ED25519:
1513: if ((k->ed25519_pk = malloc(ED25519_PK_SZ)) == NULL ||
1514: (k->ed25519_sk = malloc(ED25519_SK_SZ)) == NULL) {
1515: ret = SSH_ERR_ALLOC_FAIL;
1516: break;
1517: }
1518: crypto_sign_ed25519_keypair(k->ed25519_pk, k->ed25519_sk);
1519: ret = 0;
1520: break;
1521: #ifdef WITH_OPENSSL
1522: case KEY_DSA:
1523: ret = dsa_generate_private_key(bits, &k->dsa);
1524: break;
1525: case KEY_ECDSA:
1526: ret = ecdsa_generate_private_key(bits, &k->ecdsa_nid,
1527: &k->ecdsa);
1528: break;
1529: case KEY_RSA:
1530: ret = rsa_generate_private_key(bits, &k->rsa);
1531: break;
1532: #endif /* WITH_OPENSSL */
1533: default:
1534: ret = SSH_ERR_INVALID_ARGUMENT;
1535: }
1536: if (ret == 0) {
1537: k->type = type;
1538: *keyp = k;
1539: } else
1540: sshkey_free(k);
1541: return ret;
1542: }
1543:
1544: int
1545: sshkey_cert_copy(const struct sshkey *from_key, struct sshkey *to_key)
1546: {
1547: u_int i;
1548: const struct sshkey_cert *from;
1549: struct sshkey_cert *to;
1550: int ret = SSH_ERR_INTERNAL_ERROR;
1551:
1552: if (to_key->cert != NULL) {
1553: cert_free(to_key->cert);
1554: to_key->cert = NULL;
1555: }
1556:
1557: if ((from = from_key->cert) == NULL)
1558: return SSH_ERR_INVALID_ARGUMENT;
1559:
1560: if ((to = to_key->cert = cert_new()) == NULL)
1561: return SSH_ERR_ALLOC_FAIL;
1562:
1563: if ((ret = sshbuf_putb(to->certblob, from->certblob)) != 0 ||
1564: (ret = sshbuf_putb(to->critical, from->critical)) != 0 ||
1.22 jsg 1565: (ret = sshbuf_putb(to->extensions, from->extensions)) != 0)
1.1 djm 1566: return ret;
1567:
1568: to->serial = from->serial;
1569: to->type = from->type;
1570: if (from->key_id == NULL)
1571: to->key_id = NULL;
1572: else if ((to->key_id = strdup(from->key_id)) == NULL)
1573: return SSH_ERR_ALLOC_FAIL;
1574: to->valid_after = from->valid_after;
1575: to->valid_before = from->valid_before;
1576: if (from->signature_key == NULL)
1577: to->signature_key = NULL;
1578: else if ((ret = sshkey_from_private(from->signature_key,
1579: &to->signature_key)) != 0)
1580: return ret;
1581:
1582: if (from->nprincipals > SSHKEY_CERT_MAX_PRINCIPALS)
1583: return SSH_ERR_INVALID_ARGUMENT;
1584: if (from->nprincipals > 0) {
1585: if ((to->principals = calloc(from->nprincipals,
1586: sizeof(*to->principals))) == NULL)
1587: return SSH_ERR_ALLOC_FAIL;
1588: for (i = 0; i < from->nprincipals; i++) {
1589: to->principals[i] = strdup(from->principals[i]);
1590: if (to->principals[i] == NULL) {
1591: to->nprincipals = i;
1592: return SSH_ERR_ALLOC_FAIL;
1593: }
1594: }
1595: }
1596: to->nprincipals = from->nprincipals;
1597: return 0;
1598: }
1599:
1600: int
1601: sshkey_from_private(const struct sshkey *k, struct sshkey **pkp)
1602: {
1603: struct sshkey *n = NULL;
1604: int ret = SSH_ERR_INTERNAL_ERROR;
1605:
1.24 djm 1606: *pkp = NULL;
1.1 djm 1607: switch (k->type) {
1608: #ifdef WITH_OPENSSL
1609: case KEY_DSA:
1610: case KEY_DSA_CERT:
1611: if ((n = sshkey_new(k->type)) == NULL)
1612: return SSH_ERR_ALLOC_FAIL;
1613: if ((BN_copy(n->dsa->p, k->dsa->p) == NULL) ||
1614: (BN_copy(n->dsa->q, k->dsa->q) == NULL) ||
1615: (BN_copy(n->dsa->g, k->dsa->g) == NULL) ||
1616: (BN_copy(n->dsa->pub_key, k->dsa->pub_key) == NULL)) {
1617: sshkey_free(n);
1618: return SSH_ERR_ALLOC_FAIL;
1619: }
1620: break;
1621: case KEY_ECDSA:
1622: case KEY_ECDSA_CERT:
1623: if ((n = sshkey_new(k->type)) == NULL)
1624: return SSH_ERR_ALLOC_FAIL;
1625: n->ecdsa_nid = k->ecdsa_nid;
1626: n->ecdsa = EC_KEY_new_by_curve_name(k->ecdsa_nid);
1627: if (n->ecdsa == NULL) {
1628: sshkey_free(n);
1629: return SSH_ERR_ALLOC_FAIL;
1630: }
1631: if (EC_KEY_set_public_key(n->ecdsa,
1632: EC_KEY_get0_public_key(k->ecdsa)) != 1) {
1633: sshkey_free(n);
1634: return SSH_ERR_LIBCRYPTO_ERROR;
1635: }
1636: break;
1637: case KEY_RSA:
1638: case KEY_RSA_CERT:
1639: if ((n = sshkey_new(k->type)) == NULL)
1640: return SSH_ERR_ALLOC_FAIL;
1641: if ((BN_copy(n->rsa->n, k->rsa->n) == NULL) ||
1642: (BN_copy(n->rsa->e, k->rsa->e) == NULL)) {
1643: sshkey_free(n);
1644: return SSH_ERR_ALLOC_FAIL;
1645: }
1646: break;
1647: #endif /* WITH_OPENSSL */
1648: case KEY_ED25519:
1649: case KEY_ED25519_CERT:
1650: if ((n = sshkey_new(k->type)) == NULL)
1651: return SSH_ERR_ALLOC_FAIL;
1652: if (k->ed25519_pk != NULL) {
1653: if ((n->ed25519_pk = malloc(ED25519_PK_SZ)) == NULL) {
1654: sshkey_free(n);
1655: return SSH_ERR_ALLOC_FAIL;
1656: }
1657: memcpy(n->ed25519_pk, k->ed25519_pk, ED25519_PK_SZ);
1658: }
1659: break;
1660: default:
1661: return SSH_ERR_KEY_TYPE_UNKNOWN;
1662: }
1663: if (sshkey_is_cert(k)) {
1664: if ((ret = sshkey_cert_copy(k, n)) != 0) {
1665: sshkey_free(n);
1666: return ret;
1667: }
1668: }
1669: *pkp = n;
1670: return 0;
1671: }
1672:
1673: static int
1.14 djm 1674: cert_parse(struct sshbuf *b, struct sshkey *key, struct sshbuf *certbuf)
1.1 djm 1675: {
1.14 djm 1676: struct sshbuf *principals = NULL, *crit = NULL;
1677: struct sshbuf *exts = NULL, *ca = NULL;
1678: u_char *sig = NULL;
1679: size_t signed_len = 0, slen = 0, kidlen = 0;
1.1 djm 1680: int ret = SSH_ERR_INTERNAL_ERROR;
1681:
1682: /* Copy the entire key blob for verification and later serialisation */
1.14 djm 1683: if ((ret = sshbuf_putb(key->cert->certblob, certbuf)) != 0)
1.1 djm 1684: return ret;
1685:
1.20 djm 1686: /* Parse body of certificate up to signature */
1687: if ((ret = sshbuf_get_u64(b, &key->cert->serial)) != 0 ||
1.1 djm 1688: (ret = sshbuf_get_u32(b, &key->cert->type)) != 0 ||
1689: (ret = sshbuf_get_cstring(b, &key->cert->key_id, &kidlen)) != 0 ||
1.4 djm 1690: (ret = sshbuf_froms(b, &principals)) != 0 ||
1.1 djm 1691: (ret = sshbuf_get_u64(b, &key->cert->valid_after)) != 0 ||
1692: (ret = sshbuf_get_u64(b, &key->cert->valid_before)) != 0 ||
1.4 djm 1693: (ret = sshbuf_froms(b, &crit)) != 0 ||
1.20 djm 1694: (ret = sshbuf_froms(b, &exts)) != 0 ||
1.1 djm 1695: (ret = sshbuf_get_string_direct(b, NULL, NULL)) != 0 ||
1.14 djm 1696: (ret = sshbuf_froms(b, &ca)) != 0) {
1.1 djm 1697: /* XXX debug print error for ret */
1698: ret = SSH_ERR_INVALID_FORMAT;
1699: goto out;
1700: }
1701:
1702: /* Signature is left in the buffer so we can calculate this length */
1703: signed_len = sshbuf_len(key->cert->certblob) - sshbuf_len(b);
1704:
1705: if ((ret = sshbuf_get_string(b, &sig, &slen)) != 0) {
1706: ret = SSH_ERR_INVALID_FORMAT;
1707: goto out;
1708: }
1709:
1710: if (key->cert->type != SSH2_CERT_TYPE_USER &&
1711: key->cert->type != SSH2_CERT_TYPE_HOST) {
1712: ret = SSH_ERR_KEY_CERT_UNKNOWN_TYPE;
1713: goto out;
1714: }
1715:
1.4 djm 1716: /* Parse principals section */
1717: while (sshbuf_len(principals) > 0) {
1718: char *principal = NULL;
1719: char **oprincipals = NULL;
1720:
1.1 djm 1721: if (key->cert->nprincipals >= SSHKEY_CERT_MAX_PRINCIPALS) {
1722: ret = SSH_ERR_INVALID_FORMAT;
1723: goto out;
1724: }
1.4 djm 1725: if ((ret = sshbuf_get_cstring(principals, &principal,
1726: NULL)) != 0) {
1.1 djm 1727: ret = SSH_ERR_INVALID_FORMAT;
1728: goto out;
1729: }
1730: oprincipals = key->cert->principals;
1.51 deraadt 1731: key->cert->principals = recallocarray(key->cert->principals,
1732: key->cert->nprincipals, key->cert->nprincipals + 1,
1733: sizeof(*key->cert->principals));
1.1 djm 1734: if (key->cert->principals == NULL) {
1735: free(principal);
1736: key->cert->principals = oprincipals;
1737: ret = SSH_ERR_ALLOC_FAIL;
1738: goto out;
1739: }
1740: key->cert->principals[key->cert->nprincipals++] = principal;
1741: }
1742:
1.4 djm 1743: /*
1744: * Stash a copies of the critical options and extensions sections
1745: * for later use.
1746: */
1747: if ((ret = sshbuf_putb(key->cert->critical, crit)) != 0 ||
1748: (exts != NULL &&
1749: (ret = sshbuf_putb(key->cert->extensions, exts)) != 0))
1.1 djm 1750: goto out;
1751:
1.4 djm 1752: /*
1753: * Validate critical options and extensions sections format.
1754: */
1755: while (sshbuf_len(crit) != 0) {
1756: if ((ret = sshbuf_get_string_direct(crit, NULL, NULL)) != 0 ||
1757: (ret = sshbuf_get_string_direct(crit, NULL, NULL)) != 0) {
1758: sshbuf_reset(key->cert->critical);
1.1 djm 1759: ret = SSH_ERR_INVALID_FORMAT;
1760: goto out;
1761: }
1762: }
1.4 djm 1763: while (exts != NULL && sshbuf_len(exts) != 0) {
1764: if ((ret = sshbuf_get_string_direct(exts, NULL, NULL)) != 0 ||
1765: (ret = sshbuf_get_string_direct(exts, NULL, NULL)) != 0) {
1766: sshbuf_reset(key->cert->extensions);
1.1 djm 1767: ret = SSH_ERR_INVALID_FORMAT;
1768: goto out;
1769: }
1770: }
1771:
1.4 djm 1772: /* Parse CA key and check signature */
1.14 djm 1773: if (sshkey_from_blob_internal(ca, &key->cert->signature_key, 0) != 0) {
1.1 djm 1774: ret = SSH_ERR_KEY_CERT_INVALID_SIGN_KEY;
1775: goto out;
1776: }
1777: if (!sshkey_type_is_valid_ca(key->cert->signature_key->type)) {
1778: ret = SSH_ERR_KEY_CERT_INVALID_SIGN_KEY;
1779: goto out;
1780: }
1781: if ((ret = sshkey_verify(key->cert->signature_key, sig, slen,
1782: sshbuf_ptr(key->cert->certblob), signed_len, 0)) != 0)
1783: goto out;
1.4 djm 1784:
1785: /* Success */
1.1 djm 1786: ret = 0;
1787: out:
1.14 djm 1788: sshbuf_free(ca);
1.4 djm 1789: sshbuf_free(crit);
1790: sshbuf_free(exts);
1791: sshbuf_free(principals);
1.1 djm 1792: free(sig);
1793: return ret;
1794: }
1795:
1796: static int
1.14 djm 1797: sshkey_from_blob_internal(struct sshbuf *b, struct sshkey **keyp,
1798: int allow_cert)
1.1 djm 1799: {
1.12 djm 1800: int type, ret = SSH_ERR_INTERNAL_ERROR;
1.1 djm 1801: char *ktype = NULL, *curve = NULL;
1802: struct sshkey *key = NULL;
1803: size_t len;
1804: u_char *pk = NULL;
1.14 djm 1805: struct sshbuf *copy;
1.1 djm 1806: #ifdef WITH_OPENSSL
1807: EC_POINT *q = NULL;
1808: #endif /* WITH_OPENSSL */
1809:
1810: #ifdef DEBUG_PK /* XXX */
1.14 djm 1811: sshbuf_dump(b, stderr);
1.1 djm 1812: #endif
1.32 djm 1813: if (keyp != NULL)
1814: *keyp = NULL;
1.14 djm 1815: if ((copy = sshbuf_fromb(b)) == NULL) {
1816: ret = SSH_ERR_ALLOC_FAIL;
1817: goto out;
1818: }
1.1 djm 1819: if (sshbuf_get_cstring(b, &ktype, NULL) != 0) {
1820: ret = SSH_ERR_INVALID_FORMAT;
1821: goto out;
1822: }
1823:
1824: type = sshkey_type_from_name(ktype);
1825: if (!allow_cert && sshkey_type_is_cert(type)) {
1826: ret = SSH_ERR_KEY_CERT_INVALID_SIGN_KEY;
1827: goto out;
1828: }
1829: switch (type) {
1830: #ifdef WITH_OPENSSL
1831: case KEY_RSA_CERT:
1.14 djm 1832: /* Skip nonce */
1.1 djm 1833: if (sshbuf_get_string_direct(b, NULL, NULL) != 0) {
1834: ret = SSH_ERR_INVALID_FORMAT;
1835: goto out;
1836: }
1837: /* FALLTHROUGH */
1838: case KEY_RSA:
1839: if ((key = sshkey_new(type)) == NULL) {
1840: ret = SSH_ERR_ALLOC_FAIL;
1841: goto out;
1842: }
1.16 djm 1843: if (sshbuf_get_bignum2(b, key->rsa->e) != 0 ||
1844: sshbuf_get_bignum2(b, key->rsa->n) != 0) {
1.1 djm 1845: ret = SSH_ERR_INVALID_FORMAT;
1846: goto out;
1847: }
1.49 djm 1848: if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
1849: ret = SSH_ERR_KEY_LENGTH;
1850: goto out;
1851: }
1.1 djm 1852: #ifdef DEBUG_PK
1853: RSA_print_fp(stderr, key->rsa, 8);
1854: #endif
1855: break;
1856: case KEY_DSA_CERT:
1.14 djm 1857: /* Skip nonce */
1.1 djm 1858: if (sshbuf_get_string_direct(b, NULL, NULL) != 0) {
1859: ret = SSH_ERR_INVALID_FORMAT;
1860: goto out;
1861: }
1862: /* FALLTHROUGH */
1863: case KEY_DSA:
1864: if ((key = sshkey_new(type)) == NULL) {
1865: ret = SSH_ERR_ALLOC_FAIL;
1866: goto out;
1867: }
1.16 djm 1868: if (sshbuf_get_bignum2(b, key->dsa->p) != 0 ||
1869: sshbuf_get_bignum2(b, key->dsa->q) != 0 ||
1870: sshbuf_get_bignum2(b, key->dsa->g) != 0 ||
1871: sshbuf_get_bignum2(b, key->dsa->pub_key) != 0) {
1.1 djm 1872: ret = SSH_ERR_INVALID_FORMAT;
1873: goto out;
1874: }
1875: #ifdef DEBUG_PK
1876: DSA_print_fp(stderr, key->dsa, 8);
1877: #endif
1878: break;
1879: case KEY_ECDSA_CERT:
1.14 djm 1880: /* Skip nonce */
1.1 djm 1881: if (sshbuf_get_string_direct(b, NULL, NULL) != 0) {
1882: ret = SSH_ERR_INVALID_FORMAT;
1883: goto out;
1884: }
1885: /* FALLTHROUGH */
1886: case KEY_ECDSA:
1887: if ((key = sshkey_new(type)) == NULL) {
1888: ret = SSH_ERR_ALLOC_FAIL;
1889: goto out;
1890: }
1.12 djm 1891: key->ecdsa_nid = sshkey_ecdsa_nid_from_name(ktype);
1.1 djm 1892: if (sshbuf_get_cstring(b, &curve, NULL) != 0) {
1893: ret = SSH_ERR_INVALID_FORMAT;
1894: goto out;
1895: }
1896: if (key->ecdsa_nid != sshkey_curve_name_to_nid(curve)) {
1897: ret = SSH_ERR_EC_CURVE_MISMATCH;
1898: goto out;
1899: }
1900: if (key->ecdsa != NULL)
1901: EC_KEY_free(key->ecdsa);
1902: if ((key->ecdsa = EC_KEY_new_by_curve_name(key->ecdsa_nid))
1903: == NULL) {
1904: ret = SSH_ERR_EC_CURVE_INVALID;
1905: goto out;
1906: }
1907: if ((q = EC_POINT_new(EC_KEY_get0_group(key->ecdsa))) == NULL) {
1908: ret = SSH_ERR_ALLOC_FAIL;
1909: goto out;
1910: }
1911: if (sshbuf_get_ec(b, q, EC_KEY_get0_group(key->ecdsa)) != 0) {
1912: ret = SSH_ERR_INVALID_FORMAT;
1913: goto out;
1914: }
1915: if (sshkey_ec_validate_public(EC_KEY_get0_group(key->ecdsa),
1916: q) != 0) {
1917: ret = SSH_ERR_KEY_INVALID_EC_VALUE;
1918: goto out;
1919: }
1920: if (EC_KEY_set_public_key(key->ecdsa, q) != 1) {
1921: /* XXX assume it is a allocation error */
1922: ret = SSH_ERR_ALLOC_FAIL;
1923: goto out;
1924: }
1925: #ifdef DEBUG_PK
1926: sshkey_dump_ec_point(EC_KEY_get0_group(key->ecdsa), q);
1927: #endif
1928: break;
1929: #endif /* WITH_OPENSSL */
1930: case KEY_ED25519_CERT:
1.14 djm 1931: /* Skip nonce */
1.1 djm 1932: if (sshbuf_get_string_direct(b, NULL, NULL) != 0) {
1933: ret = SSH_ERR_INVALID_FORMAT;
1934: goto out;
1935: }
1936: /* FALLTHROUGH */
1937: case KEY_ED25519:
1938: if ((ret = sshbuf_get_string(b, &pk, &len)) != 0)
1939: goto out;
1940: if (len != ED25519_PK_SZ) {
1941: ret = SSH_ERR_INVALID_FORMAT;
1942: goto out;
1943: }
1944: if ((key = sshkey_new(type)) == NULL) {
1945: ret = SSH_ERR_ALLOC_FAIL;
1946: goto out;
1947: }
1948: key->ed25519_pk = pk;
1949: pk = NULL;
1950: break;
1951: case KEY_UNSPEC:
1952: if ((key = sshkey_new(type)) == NULL) {
1953: ret = SSH_ERR_ALLOC_FAIL;
1954: goto out;
1955: }
1956: break;
1957: default:
1958: ret = SSH_ERR_KEY_TYPE_UNKNOWN;
1959: goto out;
1960: }
1961:
1962: /* Parse certificate potion */
1.14 djm 1963: if (sshkey_is_cert(key) && (ret = cert_parse(b, key, copy)) != 0)
1.1 djm 1964: goto out;
1965:
1966: if (key != NULL && sshbuf_len(b) != 0) {
1967: ret = SSH_ERR_INVALID_FORMAT;
1968: goto out;
1969: }
1970: ret = 0;
1.32 djm 1971: if (keyp != NULL) {
1972: *keyp = key;
1973: key = NULL;
1974: }
1.1 djm 1975: out:
1.14 djm 1976: sshbuf_free(copy);
1.1 djm 1977: sshkey_free(key);
1978: free(ktype);
1979: free(curve);
1980: free(pk);
1981: #ifdef WITH_OPENSSL
1982: if (q != NULL)
1983: EC_POINT_free(q);
1984: #endif /* WITH_OPENSSL */
1985: return ret;
1986: }
1987:
1988: int
1989: sshkey_from_blob(const u_char *blob, size_t blen, struct sshkey **keyp)
1990: {
1.14 djm 1991: struct sshbuf *b;
1992: int r;
1993:
1994: if ((b = sshbuf_from(blob, blen)) == NULL)
1995: return SSH_ERR_ALLOC_FAIL;
1996: r = sshkey_from_blob_internal(b, keyp, 1);
1997: sshbuf_free(b);
1998: return r;
1999: }
2000:
2001: int
2002: sshkey_fromb(struct sshbuf *b, struct sshkey **keyp)
2003: {
2004: return sshkey_from_blob_internal(b, keyp, 1);
2005: }
2006:
2007: int
2008: sshkey_froms(struct sshbuf *buf, struct sshkey **keyp)
2009: {
2010: struct sshbuf *b;
2011: int r;
2012:
2013: if ((r = sshbuf_froms(buf, &b)) != 0)
2014: return r;
2015: r = sshkey_from_blob_internal(b, keyp, 1);
2016: sshbuf_free(b);
2017: return r;
1.1 djm 2018: }
2019:
2020: int
2021: sshkey_sign(const struct sshkey *key,
2022: u_char **sigp, size_t *lenp,
1.28 markus 2023: const u_char *data, size_t datalen, const char *alg, u_int compat)
1.1 djm 2024: {
2025: if (sigp != NULL)
2026: *sigp = NULL;
2027: if (lenp != NULL)
2028: *lenp = 0;
2029: if (datalen > SSH_KEY_MAX_SIGN_DATA_SIZE)
2030: return SSH_ERR_INVALID_ARGUMENT;
2031: switch (key->type) {
2032: #ifdef WITH_OPENSSL
2033: case KEY_DSA_CERT:
2034: case KEY_DSA:
2035: return ssh_dss_sign(key, sigp, lenp, data, datalen, compat);
2036: case KEY_ECDSA_CERT:
2037: case KEY_ECDSA:
2038: return ssh_ecdsa_sign(key, sigp, lenp, data, datalen, compat);
2039: case KEY_RSA_CERT:
2040: case KEY_RSA:
1.28 markus 2041: return ssh_rsa_sign(key, sigp, lenp, data, datalen, alg);
1.1 djm 2042: #endif /* WITH_OPENSSL */
2043: case KEY_ED25519:
2044: case KEY_ED25519_CERT:
2045: return ssh_ed25519_sign(key, sigp, lenp, data, datalen, compat);
2046: default:
2047: return SSH_ERR_KEY_TYPE_UNKNOWN;
2048: }
2049: }
2050:
2051: /*
2052: * ssh_key_verify returns 0 for a correct signature and < 0 on error.
2053: */
2054: int
2055: sshkey_verify(const struct sshkey *key,
2056: const u_char *sig, size_t siglen,
2057: const u_char *data, size_t dlen, u_int compat)
2058: {
1.6 djm 2059: if (siglen == 0 || dlen > SSH_KEY_MAX_SIGN_DATA_SIZE)
1.1 djm 2060: return SSH_ERR_INVALID_ARGUMENT;
2061: switch (key->type) {
2062: #ifdef WITH_OPENSSL
2063: case KEY_DSA_CERT:
2064: case KEY_DSA:
2065: return ssh_dss_verify(key, sig, siglen, data, dlen, compat);
2066: case KEY_ECDSA_CERT:
2067: case KEY_ECDSA:
2068: return ssh_ecdsa_verify(key, sig, siglen, data, dlen, compat);
2069: case KEY_RSA_CERT:
2070: case KEY_RSA:
1.28 markus 2071: return ssh_rsa_verify(key, sig, siglen, data, dlen);
1.1 djm 2072: #endif /* WITH_OPENSSL */
2073: case KEY_ED25519:
2074: case KEY_ED25519_CERT:
2075: return ssh_ed25519_verify(key, sig, siglen, data, dlen, compat);
2076: default:
2077: return SSH_ERR_KEY_TYPE_UNKNOWN;
2078: }
2079: }
2080:
2081: /* Converts a private to a public key */
2082: int
2083: sshkey_demote(const struct sshkey *k, struct sshkey **dkp)
2084: {
2085: struct sshkey *pk;
2086: int ret = SSH_ERR_INTERNAL_ERROR;
2087:
1.24 djm 2088: *dkp = NULL;
1.1 djm 2089: if ((pk = calloc(1, sizeof(*pk))) == NULL)
2090: return SSH_ERR_ALLOC_FAIL;
2091: pk->type = k->type;
2092: pk->flags = k->flags;
2093: pk->ecdsa_nid = k->ecdsa_nid;
2094: pk->dsa = NULL;
2095: pk->ecdsa = NULL;
2096: pk->rsa = NULL;
2097: pk->ed25519_pk = NULL;
2098: pk->ed25519_sk = NULL;
2099:
2100: switch (k->type) {
2101: #ifdef WITH_OPENSSL
2102: case KEY_RSA_CERT:
2103: if ((ret = sshkey_cert_copy(k, pk)) != 0)
2104: goto fail;
2105: /* FALLTHROUGH */
2106: case KEY_RSA:
2107: if ((pk->rsa = RSA_new()) == NULL ||
2108: (pk->rsa->e = BN_dup(k->rsa->e)) == NULL ||
2109: (pk->rsa->n = BN_dup(k->rsa->n)) == NULL) {
2110: ret = SSH_ERR_ALLOC_FAIL;
2111: goto fail;
2112: }
2113: break;
2114: case KEY_DSA_CERT:
2115: if ((ret = sshkey_cert_copy(k, pk)) != 0)
2116: goto fail;
2117: /* FALLTHROUGH */
2118: case KEY_DSA:
2119: if ((pk->dsa = DSA_new()) == NULL ||
2120: (pk->dsa->p = BN_dup(k->dsa->p)) == NULL ||
2121: (pk->dsa->q = BN_dup(k->dsa->q)) == NULL ||
2122: (pk->dsa->g = BN_dup(k->dsa->g)) == NULL ||
2123: (pk->dsa->pub_key = BN_dup(k->dsa->pub_key)) == NULL) {
2124: ret = SSH_ERR_ALLOC_FAIL;
2125: goto fail;
2126: }
2127: break;
2128: case KEY_ECDSA_CERT:
2129: if ((ret = sshkey_cert_copy(k, pk)) != 0)
2130: goto fail;
2131: /* FALLTHROUGH */
2132: case KEY_ECDSA:
2133: pk->ecdsa = EC_KEY_new_by_curve_name(pk->ecdsa_nid);
2134: if (pk->ecdsa == NULL) {
2135: ret = SSH_ERR_ALLOC_FAIL;
2136: goto fail;
2137: }
2138: if (EC_KEY_set_public_key(pk->ecdsa,
2139: EC_KEY_get0_public_key(k->ecdsa)) != 1) {
2140: ret = SSH_ERR_LIBCRYPTO_ERROR;
2141: goto fail;
2142: }
2143: break;
2144: #endif /* WITH_OPENSSL */
2145: case KEY_ED25519_CERT:
2146: if ((ret = sshkey_cert_copy(k, pk)) != 0)
2147: goto fail;
2148: /* FALLTHROUGH */
2149: case KEY_ED25519:
2150: if (k->ed25519_pk != NULL) {
2151: if ((pk->ed25519_pk = malloc(ED25519_PK_SZ)) == NULL) {
2152: ret = SSH_ERR_ALLOC_FAIL;
2153: goto fail;
2154: }
2155: memcpy(pk->ed25519_pk, k->ed25519_pk, ED25519_PK_SZ);
2156: }
2157: break;
2158: default:
2159: ret = SSH_ERR_KEY_TYPE_UNKNOWN;
2160: fail:
2161: sshkey_free(pk);
2162: return ret;
2163: }
2164: *dkp = pk;
2165: return 0;
2166: }
2167:
2168: /* Convert a plain key to their _CERT equivalent */
2169: int
1.20 djm 2170: sshkey_to_certified(struct sshkey *k)
1.1 djm 2171: {
2172: int newtype;
2173:
2174: switch (k->type) {
2175: #ifdef WITH_OPENSSL
2176: case KEY_RSA:
1.20 djm 2177: newtype = KEY_RSA_CERT;
1.1 djm 2178: break;
2179: case KEY_DSA:
1.20 djm 2180: newtype = KEY_DSA_CERT;
1.1 djm 2181: break;
2182: case KEY_ECDSA:
2183: newtype = KEY_ECDSA_CERT;
2184: break;
2185: #endif /* WITH_OPENSSL */
2186: case KEY_ED25519:
2187: newtype = KEY_ED25519_CERT;
2188: break;
2189: default:
2190: return SSH_ERR_INVALID_ARGUMENT;
2191: }
2192: if ((k->cert = cert_new()) == NULL)
2193: return SSH_ERR_ALLOC_FAIL;
2194: k->type = newtype;
2195: return 0;
2196: }
2197:
2198: /* Convert a certificate to its raw key equivalent */
2199: int
2200: sshkey_drop_cert(struct sshkey *k)
2201: {
2202: if (!sshkey_type_is_cert(k->type))
2203: return SSH_ERR_KEY_TYPE_UNKNOWN;
2204: cert_free(k->cert);
2205: k->cert = NULL;
2206: k->type = sshkey_type_plain(k->type);
2207: return 0;
2208: }
2209:
2210: /* Sign a certified key, (re-)generating the signed certblob. */
2211: int
1.53 ! djm 2212: sshkey_certify_custom(struct sshkey *k, struct sshkey *ca, const char *alg,
! 2213: sshkey_certify_signer *signer, void *signer_ctx)
1.1 djm 2214: {
2215: struct sshbuf *principals = NULL;
2216: u_char *ca_blob = NULL, *sig_blob = NULL, nonce[32];
2217: size_t i, ca_len, sig_len;
2218: int ret = SSH_ERR_INTERNAL_ERROR;
2219: struct sshbuf *cert;
2220:
2221: if (k == NULL || k->cert == NULL ||
2222: k->cert->certblob == NULL || ca == NULL)
2223: return SSH_ERR_INVALID_ARGUMENT;
2224: if (!sshkey_is_cert(k))
2225: return SSH_ERR_KEY_TYPE_UNKNOWN;
2226: if (!sshkey_type_is_valid_ca(ca->type))
2227: return SSH_ERR_KEY_CERT_INVALID_SIGN_KEY;
2228:
2229: if ((ret = sshkey_to_blob(ca, &ca_blob, &ca_len)) != 0)
2230: return SSH_ERR_KEY_CERT_INVALID_SIGN_KEY;
2231:
2232: cert = k->cert->certblob; /* for readability */
2233: sshbuf_reset(cert);
2234: if ((ret = sshbuf_put_cstring(cert, sshkey_ssh_name(k))) != 0)
2235: goto out;
2236:
2237: /* -v01 certs put nonce first */
2238: arc4random_buf(&nonce, sizeof(nonce));
1.20 djm 2239: if ((ret = sshbuf_put_string(cert, nonce, sizeof(nonce))) != 0)
2240: goto out;
1.1 djm 2241:
2242: /* XXX this substantially duplicates to_blob(); refactor */
2243: switch (k->type) {
2244: #ifdef WITH_OPENSSL
2245: case KEY_DSA_CERT:
2246: if ((ret = sshbuf_put_bignum2(cert, k->dsa->p)) != 0 ||
2247: (ret = sshbuf_put_bignum2(cert, k->dsa->q)) != 0 ||
2248: (ret = sshbuf_put_bignum2(cert, k->dsa->g)) != 0 ||
2249: (ret = sshbuf_put_bignum2(cert, k->dsa->pub_key)) != 0)
2250: goto out;
2251: break;
2252: case KEY_ECDSA_CERT:
2253: if ((ret = sshbuf_put_cstring(cert,
2254: sshkey_curve_nid_to_name(k->ecdsa_nid))) != 0 ||
2255: (ret = sshbuf_put_ec(cert,
2256: EC_KEY_get0_public_key(k->ecdsa),
2257: EC_KEY_get0_group(k->ecdsa))) != 0)
2258: goto out;
2259: break;
2260: case KEY_RSA_CERT:
2261: if ((ret = sshbuf_put_bignum2(cert, k->rsa->e)) != 0 ||
2262: (ret = sshbuf_put_bignum2(cert, k->rsa->n)) != 0)
2263: goto out;
2264: break;
2265: #endif /* WITH_OPENSSL */
2266: case KEY_ED25519_CERT:
2267: if ((ret = sshbuf_put_string(cert,
2268: k->ed25519_pk, ED25519_PK_SZ)) != 0)
2269: goto out;
2270: break;
2271: default:
2272: ret = SSH_ERR_INVALID_ARGUMENT;
1.15 djm 2273: goto out;
1.1 djm 2274: }
2275:
1.20 djm 2276: if ((ret = sshbuf_put_u64(cert, k->cert->serial)) != 0 ||
2277: (ret = sshbuf_put_u32(cert, k->cert->type)) != 0 ||
1.1 djm 2278: (ret = sshbuf_put_cstring(cert, k->cert->key_id)) != 0)
2279: goto out;
2280:
2281: if ((principals = sshbuf_new()) == NULL) {
2282: ret = SSH_ERR_ALLOC_FAIL;
2283: goto out;
2284: }
2285: for (i = 0; i < k->cert->nprincipals; i++) {
2286: if ((ret = sshbuf_put_cstring(principals,
2287: k->cert->principals[i])) != 0)
2288: goto out;
2289: }
2290: if ((ret = sshbuf_put_stringb(cert, principals)) != 0 ||
2291: (ret = sshbuf_put_u64(cert, k->cert->valid_after)) != 0 ||
2292: (ret = sshbuf_put_u64(cert, k->cert->valid_before)) != 0 ||
1.20 djm 2293: (ret = sshbuf_put_stringb(cert, k->cert->critical)) != 0 ||
2294: (ret = sshbuf_put_stringb(cert, k->cert->extensions)) != 0 ||
2295: (ret = sshbuf_put_string(cert, NULL, 0)) != 0 || /* Reserved */
1.1 djm 2296: (ret = sshbuf_put_string(cert, ca_blob, ca_len)) != 0)
2297: goto out;
2298:
2299: /* Sign the whole mess */
1.53 ! djm 2300: if ((ret = signer(ca, &sig_blob, &sig_len, sshbuf_ptr(cert),
! 2301: sshbuf_len(cert), alg, 0, signer_ctx)) != 0)
1.1 djm 2302: goto out;
2303:
2304: /* Append signature and we are done */
2305: if ((ret = sshbuf_put_string(cert, sig_blob, sig_len)) != 0)
2306: goto out;
2307: ret = 0;
2308: out:
2309: if (ret != 0)
2310: sshbuf_reset(cert);
1.29 mmcc 2311: free(sig_blob);
2312: free(ca_blob);
1.31 mmcc 2313: sshbuf_free(principals);
1.1 djm 2314: return ret;
1.53 ! djm 2315: }
! 2316:
! 2317: static int
! 2318: default_key_sign(const struct sshkey *key, u_char **sigp, size_t *lenp,
! 2319: const u_char *data, size_t datalen,
! 2320: const char *alg, u_int compat, void *ctx)
! 2321: {
! 2322: if (ctx != NULL)
! 2323: return SSH_ERR_INVALID_ARGUMENT;
! 2324: return sshkey_sign(key, sigp, lenp, data, datalen, alg, compat);
! 2325: }
! 2326:
! 2327: int
! 2328: sshkey_certify(struct sshkey *k, struct sshkey *ca, const char *alg)
! 2329: {
! 2330: return sshkey_certify_custom(k, ca, alg, default_key_sign, NULL);
1.1 djm 2331: }
2332:
2333: int
2334: sshkey_cert_check_authority(const struct sshkey *k,
2335: int want_host, int require_principal,
2336: const char *name, const char **reason)
2337: {
2338: u_int i, principal_matches;
2339: time_t now = time(NULL);
2340:
2341: if (reason != NULL)
2342: *reason = NULL;
2343:
2344: if (want_host) {
2345: if (k->cert->type != SSH2_CERT_TYPE_HOST) {
2346: *reason = "Certificate invalid: not a host certificate";
2347: return SSH_ERR_KEY_CERT_INVALID;
2348: }
2349: } else {
2350: if (k->cert->type != SSH2_CERT_TYPE_USER) {
2351: *reason = "Certificate invalid: not a user certificate";
2352: return SSH_ERR_KEY_CERT_INVALID;
2353: }
2354: }
2355: if (now < 0) {
2356: /* yikes - system clock before epoch! */
2357: *reason = "Certificate invalid: not yet valid";
2358: return SSH_ERR_KEY_CERT_INVALID;
2359: }
2360: if ((u_int64_t)now < k->cert->valid_after) {
2361: *reason = "Certificate invalid: not yet valid";
2362: return SSH_ERR_KEY_CERT_INVALID;
2363: }
2364: if ((u_int64_t)now >= k->cert->valid_before) {
2365: *reason = "Certificate invalid: expired";
2366: return SSH_ERR_KEY_CERT_INVALID;
2367: }
2368: if (k->cert->nprincipals == 0) {
2369: if (require_principal) {
2370: *reason = "Certificate lacks principal list";
2371: return SSH_ERR_KEY_CERT_INVALID;
2372: }
2373: } else if (name != NULL) {
2374: principal_matches = 0;
2375: for (i = 0; i < k->cert->nprincipals; i++) {
2376: if (strcmp(name, k->cert->principals[i]) == 0) {
2377: principal_matches = 1;
2378: break;
2379: }
2380: }
2381: if (!principal_matches) {
2382: *reason = "Certificate invalid: name is not a listed "
2383: "principal";
2384: return SSH_ERR_KEY_CERT_INVALID;
2385: }
2386: }
2387: return 0;
1.27 djm 2388: }
2389:
2390: size_t
2391: sshkey_format_cert_validity(const struct sshkey_cert *cert, char *s, size_t l)
2392: {
2393: char from[32], to[32], ret[64];
2394: time_t tt;
2395: struct tm *tm;
2396:
2397: *from = *to = '\0';
2398: if (cert->valid_after == 0 &&
2399: cert->valid_before == 0xffffffffffffffffULL)
2400: return strlcpy(s, "forever", l);
2401:
2402: if (cert->valid_after != 0) {
2403: /* XXX revisit INT_MAX in 2038 :) */
2404: tt = cert->valid_after > INT_MAX ?
2405: INT_MAX : cert->valid_after;
2406: tm = localtime(&tt);
2407: strftime(from, sizeof(from), "%Y-%m-%dT%H:%M:%S", tm);
2408: }
2409: if (cert->valid_before != 0xffffffffffffffffULL) {
2410: /* XXX revisit INT_MAX in 2038 :) */
2411: tt = cert->valid_before > INT_MAX ?
2412: INT_MAX : cert->valid_before;
2413: tm = localtime(&tt);
2414: strftime(to, sizeof(to), "%Y-%m-%dT%H:%M:%S", tm);
2415: }
2416:
2417: if (cert->valid_after == 0)
2418: snprintf(ret, sizeof(ret), "before %s", to);
2419: else if (cert->valid_before == 0xffffffffffffffffULL)
2420: snprintf(ret, sizeof(ret), "after %s", from);
2421: else
2422: snprintf(ret, sizeof(ret), "from %s to %s", from, to);
2423:
2424: return strlcpy(s, ret, l);
1.1 djm 2425: }
2426:
2427: int
2428: sshkey_private_serialize(const struct sshkey *key, struct sshbuf *b)
2429: {
2430: int r = SSH_ERR_INTERNAL_ERROR;
2431:
2432: if ((r = sshbuf_put_cstring(b, sshkey_ssh_name(key))) != 0)
2433: goto out;
2434: switch (key->type) {
2435: #ifdef WITH_OPENSSL
2436: case KEY_RSA:
2437: if ((r = sshbuf_put_bignum2(b, key->rsa->n)) != 0 ||
2438: (r = sshbuf_put_bignum2(b, key->rsa->e)) != 0 ||
2439: (r = sshbuf_put_bignum2(b, key->rsa->d)) != 0 ||
2440: (r = sshbuf_put_bignum2(b, key->rsa->iqmp)) != 0 ||
2441: (r = sshbuf_put_bignum2(b, key->rsa->p)) != 0 ||
2442: (r = sshbuf_put_bignum2(b, key->rsa->q)) != 0)
2443: goto out;
2444: break;
2445: case KEY_RSA_CERT:
2446: if (key->cert == NULL || sshbuf_len(key->cert->certblob) == 0) {
2447: r = SSH_ERR_INVALID_ARGUMENT;
2448: goto out;
2449: }
2450: if ((r = sshbuf_put_stringb(b, key->cert->certblob)) != 0 ||
2451: (r = sshbuf_put_bignum2(b, key->rsa->d)) != 0 ||
2452: (r = sshbuf_put_bignum2(b, key->rsa->iqmp)) != 0 ||
2453: (r = sshbuf_put_bignum2(b, key->rsa->p)) != 0 ||
2454: (r = sshbuf_put_bignum2(b, key->rsa->q)) != 0)
2455: goto out;
2456: break;
2457: case KEY_DSA:
2458: if ((r = sshbuf_put_bignum2(b, key->dsa->p)) != 0 ||
2459: (r = sshbuf_put_bignum2(b, key->dsa->q)) != 0 ||
2460: (r = sshbuf_put_bignum2(b, key->dsa->g)) != 0 ||
2461: (r = sshbuf_put_bignum2(b, key->dsa->pub_key)) != 0 ||
2462: (r = sshbuf_put_bignum2(b, key->dsa->priv_key)) != 0)
2463: goto out;
2464: break;
2465: case KEY_DSA_CERT:
2466: if (key->cert == NULL || sshbuf_len(key->cert->certblob) == 0) {
2467: r = SSH_ERR_INVALID_ARGUMENT;
2468: goto out;
2469: }
2470: if ((r = sshbuf_put_stringb(b, key->cert->certblob)) != 0 ||
2471: (r = sshbuf_put_bignum2(b, key->dsa->priv_key)) != 0)
2472: goto out;
2473: break;
2474: case KEY_ECDSA:
2475: if ((r = sshbuf_put_cstring(b,
2476: sshkey_curve_nid_to_name(key->ecdsa_nid))) != 0 ||
2477: (r = sshbuf_put_eckey(b, key->ecdsa)) != 0 ||
2478: (r = sshbuf_put_bignum2(b,
2479: EC_KEY_get0_private_key(key->ecdsa))) != 0)
2480: goto out;
2481: break;
2482: case KEY_ECDSA_CERT:
2483: if (key->cert == NULL || sshbuf_len(key->cert->certblob) == 0) {
2484: r = SSH_ERR_INVALID_ARGUMENT;
2485: goto out;
2486: }
2487: if ((r = sshbuf_put_stringb(b, key->cert->certblob)) != 0 ||
2488: (r = sshbuf_put_bignum2(b,
2489: EC_KEY_get0_private_key(key->ecdsa))) != 0)
2490: goto out;
2491: break;
2492: #endif /* WITH_OPENSSL */
2493: case KEY_ED25519:
2494: if ((r = sshbuf_put_string(b, key->ed25519_pk,
2495: ED25519_PK_SZ)) != 0 ||
2496: (r = sshbuf_put_string(b, key->ed25519_sk,
2497: ED25519_SK_SZ)) != 0)
2498: goto out;
2499: break;
2500: case KEY_ED25519_CERT:
2501: if (key->cert == NULL || sshbuf_len(key->cert->certblob) == 0) {
2502: r = SSH_ERR_INVALID_ARGUMENT;
2503: goto out;
2504: }
2505: if ((r = sshbuf_put_stringb(b, key->cert->certblob)) != 0 ||
2506: (r = sshbuf_put_string(b, key->ed25519_pk,
2507: ED25519_PK_SZ)) != 0 ||
2508: (r = sshbuf_put_string(b, key->ed25519_sk,
2509: ED25519_SK_SZ)) != 0)
2510: goto out;
2511: break;
2512: default:
2513: r = SSH_ERR_INVALID_ARGUMENT;
2514: goto out;
2515: }
2516: /* success */
2517: r = 0;
2518: out:
2519: return r;
2520: }
2521:
2522: int
2523: sshkey_private_deserialize(struct sshbuf *buf, struct sshkey **kp)
2524: {
2525: char *tname = NULL, *curve = NULL;
2526: struct sshkey *k = NULL;
1.14 djm 2527: size_t pklen = 0, sklen = 0;
1.1 djm 2528: int type, r = SSH_ERR_INTERNAL_ERROR;
2529: u_char *ed25519_pk = NULL, *ed25519_sk = NULL;
2530: #ifdef WITH_OPENSSL
2531: BIGNUM *exponent = NULL;
2532: #endif /* WITH_OPENSSL */
2533:
2534: if (kp != NULL)
2535: *kp = NULL;
2536: if ((r = sshbuf_get_cstring(buf, &tname, NULL)) != 0)
2537: goto out;
2538: type = sshkey_type_from_name(tname);
2539: switch (type) {
2540: #ifdef WITH_OPENSSL
2541: case KEY_DSA:
2542: if ((k = sshkey_new_private(type)) == NULL) {
2543: r = SSH_ERR_ALLOC_FAIL;
2544: goto out;
2545: }
2546: if ((r = sshbuf_get_bignum2(buf, k->dsa->p)) != 0 ||
2547: (r = sshbuf_get_bignum2(buf, k->dsa->q)) != 0 ||
2548: (r = sshbuf_get_bignum2(buf, k->dsa->g)) != 0 ||
2549: (r = sshbuf_get_bignum2(buf, k->dsa->pub_key)) != 0 ||
2550: (r = sshbuf_get_bignum2(buf, k->dsa->priv_key)) != 0)
2551: goto out;
2552: break;
2553: case KEY_DSA_CERT:
1.14 djm 2554: if ((r = sshkey_froms(buf, &k)) != 0 ||
1.1 djm 2555: (r = sshkey_add_private(k)) != 0 ||
2556: (r = sshbuf_get_bignum2(buf, k->dsa->priv_key)) != 0)
2557: goto out;
2558: break;
2559: case KEY_ECDSA:
2560: if ((k = sshkey_new_private(type)) == NULL) {
2561: r = SSH_ERR_ALLOC_FAIL;
2562: goto out;
2563: }
2564: if ((k->ecdsa_nid = sshkey_ecdsa_nid_from_name(tname)) == -1) {
2565: r = SSH_ERR_INVALID_ARGUMENT;
2566: goto out;
2567: }
2568: if ((r = sshbuf_get_cstring(buf, &curve, NULL)) != 0)
2569: goto out;
2570: if (k->ecdsa_nid != sshkey_curve_name_to_nid(curve)) {
2571: r = SSH_ERR_EC_CURVE_MISMATCH;
2572: goto out;
2573: }
2574: k->ecdsa = EC_KEY_new_by_curve_name(k->ecdsa_nid);
2575: if (k->ecdsa == NULL || (exponent = BN_new()) == NULL) {
2576: r = SSH_ERR_LIBCRYPTO_ERROR;
2577: goto out;
2578: }
2579: if ((r = sshbuf_get_eckey(buf, k->ecdsa)) != 0 ||
2580: (r = sshbuf_get_bignum2(buf, exponent)))
2581: goto out;
2582: if (EC_KEY_set_private_key(k->ecdsa, exponent) != 1) {
2583: r = SSH_ERR_LIBCRYPTO_ERROR;
2584: goto out;
2585: }
2586: if ((r = sshkey_ec_validate_public(EC_KEY_get0_group(k->ecdsa),
1.22 jsg 2587: EC_KEY_get0_public_key(k->ecdsa))) != 0 ||
1.1 djm 2588: (r = sshkey_ec_validate_private(k->ecdsa)) != 0)
2589: goto out;
2590: break;
2591: case KEY_ECDSA_CERT:
2592: if ((exponent = BN_new()) == NULL) {
2593: r = SSH_ERR_LIBCRYPTO_ERROR;
2594: goto out;
2595: }
1.14 djm 2596: if ((r = sshkey_froms(buf, &k)) != 0 ||
1.1 djm 2597: (r = sshkey_add_private(k)) != 0 ||
2598: (r = sshbuf_get_bignum2(buf, exponent)) != 0)
2599: goto out;
2600: if (EC_KEY_set_private_key(k->ecdsa, exponent) != 1) {
2601: r = SSH_ERR_LIBCRYPTO_ERROR;
2602: goto out;
2603: }
2604: if ((r = sshkey_ec_validate_public(EC_KEY_get0_group(k->ecdsa),
1.22 jsg 2605: EC_KEY_get0_public_key(k->ecdsa))) != 0 ||
1.1 djm 2606: (r = sshkey_ec_validate_private(k->ecdsa)) != 0)
2607: goto out;
2608: break;
2609: case KEY_RSA:
2610: if ((k = sshkey_new_private(type)) == NULL) {
2611: r = SSH_ERR_ALLOC_FAIL;
2612: goto out;
2613: }
2614: if ((r = sshbuf_get_bignum2(buf, k->rsa->n)) != 0 ||
2615: (r = sshbuf_get_bignum2(buf, k->rsa->e)) != 0 ||
2616: (r = sshbuf_get_bignum2(buf, k->rsa->d)) != 0 ||
2617: (r = sshbuf_get_bignum2(buf, k->rsa->iqmp)) != 0 ||
2618: (r = sshbuf_get_bignum2(buf, k->rsa->p)) != 0 ||
2619: (r = sshbuf_get_bignum2(buf, k->rsa->q)) != 0 ||
2620: (r = rsa_generate_additional_parameters(k->rsa)) != 0)
2621: goto out;
1.49 djm 2622: if (BN_num_bits(k->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
2623: r = SSH_ERR_KEY_LENGTH;
2624: goto out;
2625: }
1.1 djm 2626: break;
2627: case KEY_RSA_CERT:
1.14 djm 2628: if ((r = sshkey_froms(buf, &k)) != 0 ||
1.1 djm 2629: (r = sshkey_add_private(k)) != 0 ||
1.22 jsg 2630: (r = sshbuf_get_bignum2(buf, k->rsa->d)) != 0 ||
2631: (r = sshbuf_get_bignum2(buf, k->rsa->iqmp)) != 0 ||
2632: (r = sshbuf_get_bignum2(buf, k->rsa->p)) != 0 ||
2633: (r = sshbuf_get_bignum2(buf, k->rsa->q)) != 0 ||
1.1 djm 2634: (r = rsa_generate_additional_parameters(k->rsa)) != 0)
2635: goto out;
1.49 djm 2636: if (BN_num_bits(k->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
2637: r = SSH_ERR_KEY_LENGTH;
2638: goto out;
2639: }
1.1 djm 2640: break;
2641: #endif /* WITH_OPENSSL */
2642: case KEY_ED25519:
2643: if ((k = sshkey_new_private(type)) == NULL) {
2644: r = SSH_ERR_ALLOC_FAIL;
2645: goto out;
2646: }
2647: if ((r = sshbuf_get_string(buf, &ed25519_pk, &pklen)) != 0 ||
2648: (r = sshbuf_get_string(buf, &ed25519_sk, &sklen)) != 0)
2649: goto out;
2650: if (pklen != ED25519_PK_SZ || sklen != ED25519_SK_SZ) {
2651: r = SSH_ERR_INVALID_FORMAT;
2652: goto out;
2653: }
2654: k->ed25519_pk = ed25519_pk;
2655: k->ed25519_sk = ed25519_sk;
2656: ed25519_pk = ed25519_sk = NULL;
2657: break;
2658: case KEY_ED25519_CERT:
1.14 djm 2659: if ((r = sshkey_froms(buf, &k)) != 0 ||
1.1 djm 2660: (r = sshkey_add_private(k)) != 0 ||
2661: (r = sshbuf_get_string(buf, &ed25519_pk, &pklen)) != 0 ||
2662: (r = sshbuf_get_string(buf, &ed25519_sk, &sklen)) != 0)
2663: goto out;
2664: if (pklen != ED25519_PK_SZ || sklen != ED25519_SK_SZ) {
2665: r = SSH_ERR_INVALID_FORMAT;
2666: goto out;
2667: }
2668: k->ed25519_pk = ed25519_pk;
2669: k->ed25519_sk = ed25519_sk;
2670: ed25519_pk = ed25519_sk = NULL;
2671: break;
2672: default:
2673: r = SSH_ERR_KEY_TYPE_UNKNOWN;
2674: goto out;
2675: }
2676: #ifdef WITH_OPENSSL
2677: /* enable blinding */
2678: switch (k->type) {
2679: case KEY_RSA:
2680: case KEY_RSA_CERT:
2681: if (RSA_blinding_on(k->rsa, NULL) != 1) {
2682: r = SSH_ERR_LIBCRYPTO_ERROR;
2683: goto out;
2684: }
2685: break;
2686: }
2687: #endif /* WITH_OPENSSL */
2688: /* success */
2689: r = 0;
2690: if (kp != NULL) {
2691: *kp = k;
2692: k = NULL;
2693: }
2694: out:
2695: free(tname);
2696: free(curve);
2697: #ifdef WITH_OPENSSL
2698: if (exponent != NULL)
2699: BN_clear_free(exponent);
2700: #endif /* WITH_OPENSSL */
2701: sshkey_free(k);
2702: if (ed25519_pk != NULL) {
2703: explicit_bzero(ed25519_pk, pklen);
2704: free(ed25519_pk);
2705: }
2706: if (ed25519_sk != NULL) {
2707: explicit_bzero(ed25519_sk, sklen);
2708: free(ed25519_sk);
2709: }
2710: return r;
2711: }
2712:
2713: #ifdef WITH_OPENSSL
2714: int
2715: sshkey_ec_validate_public(const EC_GROUP *group, const EC_POINT *public)
2716: {
2717: BN_CTX *bnctx;
2718: EC_POINT *nq = NULL;
2719: BIGNUM *order, *x, *y, *tmp;
2720: int ret = SSH_ERR_KEY_INVALID_EC_VALUE;
1.40 djm 2721:
2722: /*
2723: * NB. This assumes OpenSSL has already verified that the public
2724: * point lies on the curve. This is done by EC_POINT_oct2point()
2725: * implicitly calling EC_POINT_is_on_curve(). If this code is ever
2726: * reachable with public points not unmarshalled using
2727: * EC_POINT_oct2point then the caller will need to explicitly check.
2728: */
1.1 djm 2729:
2730: if ((bnctx = BN_CTX_new()) == NULL)
2731: return SSH_ERR_ALLOC_FAIL;
2732: BN_CTX_start(bnctx);
2733:
2734: /*
2735: * We shouldn't ever hit this case because bignum_get_ecpoint()
2736: * refuses to load GF2m points.
2737: */
2738: if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) !=
2739: NID_X9_62_prime_field)
2740: goto out;
2741:
2742: /* Q != infinity */
2743: if (EC_POINT_is_at_infinity(group, public))
2744: goto out;
2745:
2746: if ((x = BN_CTX_get(bnctx)) == NULL ||
2747: (y = BN_CTX_get(bnctx)) == NULL ||
2748: (order = BN_CTX_get(bnctx)) == NULL ||
2749: (tmp = BN_CTX_get(bnctx)) == NULL) {
2750: ret = SSH_ERR_ALLOC_FAIL;
2751: goto out;
2752: }
2753:
2754: /* log2(x) > log2(order)/2, log2(y) > log2(order)/2 */
2755: if (EC_GROUP_get_order(group, order, bnctx) != 1 ||
2756: EC_POINT_get_affine_coordinates_GFp(group, public,
2757: x, y, bnctx) != 1) {
2758: ret = SSH_ERR_LIBCRYPTO_ERROR;
2759: goto out;
2760: }
2761: if (BN_num_bits(x) <= BN_num_bits(order) / 2 ||
2762: BN_num_bits(y) <= BN_num_bits(order) / 2)
2763: goto out;
2764:
2765: /* nQ == infinity (n == order of subgroup) */
2766: if ((nq = EC_POINT_new(group)) == NULL) {
2767: ret = SSH_ERR_ALLOC_FAIL;
2768: goto out;
2769: }
2770: if (EC_POINT_mul(group, nq, NULL, public, order, bnctx) != 1) {
2771: ret = SSH_ERR_LIBCRYPTO_ERROR;
2772: goto out;
2773: }
2774: if (EC_POINT_is_at_infinity(group, nq) != 1)
2775: goto out;
2776:
2777: /* x < order - 1, y < order - 1 */
2778: if (!BN_sub(tmp, order, BN_value_one())) {
2779: ret = SSH_ERR_LIBCRYPTO_ERROR;
2780: goto out;
2781: }
2782: if (BN_cmp(x, tmp) >= 0 || BN_cmp(y, tmp) >= 0)
2783: goto out;
2784: ret = 0;
2785: out:
2786: BN_CTX_free(bnctx);
2787: if (nq != NULL)
2788: EC_POINT_free(nq);
2789: return ret;
2790: }
2791:
2792: int
2793: sshkey_ec_validate_private(const EC_KEY *key)
2794: {
2795: BN_CTX *bnctx;
2796: BIGNUM *order, *tmp;
2797: int ret = SSH_ERR_KEY_INVALID_EC_VALUE;
2798:
2799: if ((bnctx = BN_CTX_new()) == NULL)
2800: return SSH_ERR_ALLOC_FAIL;
2801: BN_CTX_start(bnctx);
2802:
2803: if ((order = BN_CTX_get(bnctx)) == NULL ||
2804: (tmp = BN_CTX_get(bnctx)) == NULL) {
2805: ret = SSH_ERR_ALLOC_FAIL;
2806: goto out;
2807: }
2808:
2809: /* log2(private) > log2(order)/2 */
2810: if (EC_GROUP_get_order(EC_KEY_get0_group(key), order, bnctx) != 1) {
2811: ret = SSH_ERR_LIBCRYPTO_ERROR;
2812: goto out;
2813: }
2814: if (BN_num_bits(EC_KEY_get0_private_key(key)) <=
2815: BN_num_bits(order) / 2)
2816: goto out;
2817:
2818: /* private < order - 1 */
2819: if (!BN_sub(tmp, order, BN_value_one())) {
2820: ret = SSH_ERR_LIBCRYPTO_ERROR;
2821: goto out;
2822: }
2823: if (BN_cmp(EC_KEY_get0_private_key(key), tmp) >= 0)
2824: goto out;
2825: ret = 0;
2826: out:
2827: BN_CTX_free(bnctx);
2828: return ret;
2829: }
2830:
2831: void
2832: sshkey_dump_ec_point(const EC_GROUP *group, const EC_POINT *point)
2833: {
2834: BIGNUM *x, *y;
2835: BN_CTX *bnctx;
2836:
2837: if (point == NULL) {
2838: fputs("point=(NULL)\n", stderr);
2839: return;
2840: }
2841: if ((bnctx = BN_CTX_new()) == NULL) {
2842: fprintf(stderr, "%s: BN_CTX_new failed\n", __func__);
2843: return;
2844: }
2845: BN_CTX_start(bnctx);
2846: if ((x = BN_CTX_get(bnctx)) == NULL ||
2847: (y = BN_CTX_get(bnctx)) == NULL) {
2848: fprintf(stderr, "%s: BN_CTX_get failed\n", __func__);
2849: return;
2850: }
2851: if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) !=
2852: NID_X9_62_prime_field) {
2853: fprintf(stderr, "%s: group is not a prime field\n", __func__);
2854: return;
2855: }
2856: if (EC_POINT_get_affine_coordinates_GFp(group, point, x, y,
2857: bnctx) != 1) {
2858: fprintf(stderr, "%s: EC_POINT_get_affine_coordinates_GFp\n",
2859: __func__);
2860: return;
2861: }
2862: fputs("x=", stderr);
2863: BN_print_fp(stderr, x);
2864: fputs("\ny=", stderr);
2865: BN_print_fp(stderr, y);
2866: fputs("\n", stderr);
2867: BN_CTX_free(bnctx);
2868: }
2869:
2870: void
2871: sshkey_dump_ec_key(const EC_KEY *key)
2872: {
2873: const BIGNUM *exponent;
2874:
2875: sshkey_dump_ec_point(EC_KEY_get0_group(key),
2876: EC_KEY_get0_public_key(key));
2877: fputs("exponent=", stderr);
2878: if ((exponent = EC_KEY_get0_private_key(key)) == NULL)
2879: fputs("(NULL)", stderr);
2880: else
2881: BN_print_fp(stderr, EC_KEY_get0_private_key(key));
2882: fputs("\n", stderr);
2883: }
2884: #endif /* WITH_OPENSSL */
2885:
2886: static int
2887: sshkey_private_to_blob2(const struct sshkey *prv, struct sshbuf *blob,
2888: const char *passphrase, const char *comment, const char *ciphername,
2889: int rounds)
2890: {
1.4 djm 2891: u_char *cp, *key = NULL, *pubkeyblob = NULL;
1.1 djm 2892: u_char salt[SALT_LEN];
1.4 djm 2893: char *b64 = NULL;
1.1 djm 2894: size_t i, pubkeylen, keylen, ivlen, blocksize, authlen;
2895: u_int check;
2896: int r = SSH_ERR_INTERNAL_ERROR;
1.36 djm 2897: struct sshcipher_ctx *ciphercontext = NULL;
1.1 djm 2898: const struct sshcipher *cipher;
2899: const char *kdfname = KDFNAME;
2900: struct sshbuf *encoded = NULL, *encrypted = NULL, *kdf = NULL;
2901:
2902: if (rounds <= 0)
2903: rounds = DEFAULT_ROUNDS;
2904: if (passphrase == NULL || !strlen(passphrase)) {
2905: ciphername = "none";
2906: kdfname = "none";
2907: } else if (ciphername == NULL)
2908: ciphername = DEFAULT_CIPHERNAME;
1.47 djm 2909: if ((cipher = cipher_by_name(ciphername)) == NULL) {
1.1 djm 2910: r = SSH_ERR_INVALID_ARGUMENT;
2911: goto out;
2912: }
2913:
2914: if ((kdf = sshbuf_new()) == NULL ||
2915: (encoded = sshbuf_new()) == NULL ||
2916: (encrypted = sshbuf_new()) == NULL) {
2917: r = SSH_ERR_ALLOC_FAIL;
2918: goto out;
2919: }
2920: blocksize = cipher_blocksize(cipher);
2921: keylen = cipher_keylen(cipher);
2922: ivlen = cipher_ivlen(cipher);
2923: authlen = cipher_authlen(cipher);
2924: if ((key = calloc(1, keylen + ivlen)) == NULL) {
2925: r = SSH_ERR_ALLOC_FAIL;
2926: goto out;
2927: }
2928: if (strcmp(kdfname, "bcrypt") == 0) {
2929: arc4random_buf(salt, SALT_LEN);
2930: if (bcrypt_pbkdf(passphrase, strlen(passphrase),
2931: salt, SALT_LEN, key, keylen + ivlen, rounds) < 0) {
2932: r = SSH_ERR_INVALID_ARGUMENT;
2933: goto out;
2934: }
2935: if ((r = sshbuf_put_string(kdf, salt, SALT_LEN)) != 0 ||
2936: (r = sshbuf_put_u32(kdf, rounds)) != 0)
2937: goto out;
2938: } else if (strcmp(kdfname, "none") != 0) {
2939: /* Unsupported KDF type */
2940: r = SSH_ERR_KEY_UNKNOWN_CIPHER;
2941: goto out;
2942: }
2943: if ((r = cipher_init(&ciphercontext, cipher, key, keylen,
2944: key + keylen, ivlen, 1)) != 0)
2945: goto out;
2946:
2947: if ((r = sshbuf_put(encoded, AUTH_MAGIC, sizeof(AUTH_MAGIC))) != 0 ||
2948: (r = sshbuf_put_cstring(encoded, ciphername)) != 0 ||
2949: (r = sshbuf_put_cstring(encoded, kdfname)) != 0 ||
2950: (r = sshbuf_put_stringb(encoded, kdf)) != 0 ||
2951: (r = sshbuf_put_u32(encoded, 1)) != 0 || /* number of keys */
2952: (r = sshkey_to_blob(prv, &pubkeyblob, &pubkeylen)) != 0 ||
2953: (r = sshbuf_put_string(encoded, pubkeyblob, pubkeylen)) != 0)
2954: goto out;
2955:
2956: /* set up the buffer that will be encrypted */
2957:
2958: /* Random check bytes */
2959: check = arc4random();
2960: if ((r = sshbuf_put_u32(encrypted, check)) != 0 ||
2961: (r = sshbuf_put_u32(encrypted, check)) != 0)
2962: goto out;
2963:
2964: /* append private key and comment*/
2965: if ((r = sshkey_private_serialize(prv, encrypted)) != 0 ||
2966: (r = sshbuf_put_cstring(encrypted, comment)) != 0)
2967: goto out;
2968:
2969: /* padding */
2970: i = 0;
2971: while (sshbuf_len(encrypted) % blocksize) {
2972: if ((r = sshbuf_put_u8(encrypted, ++i & 0xff)) != 0)
2973: goto out;
2974: }
2975:
2976: /* length in destination buffer */
2977: if ((r = sshbuf_put_u32(encoded, sshbuf_len(encrypted))) != 0)
2978: goto out;
2979:
2980: /* encrypt */
2981: if ((r = sshbuf_reserve(encoded,
2982: sshbuf_len(encrypted) + authlen, &cp)) != 0)
2983: goto out;
1.36 djm 2984: if ((r = cipher_crypt(ciphercontext, 0, cp,
1.1 djm 2985: sshbuf_ptr(encrypted), sshbuf_len(encrypted), 0, authlen)) != 0)
2986: goto out;
2987:
2988: /* uuencode */
2989: if ((b64 = sshbuf_dtob64(encoded)) == NULL) {
2990: r = SSH_ERR_ALLOC_FAIL;
2991: goto out;
2992: }
2993:
2994: sshbuf_reset(blob);
2995: if ((r = sshbuf_put(blob, MARK_BEGIN, MARK_BEGIN_LEN)) != 0)
2996: goto out;
2997: for (i = 0; i < strlen(b64); i++) {
2998: if ((r = sshbuf_put_u8(blob, b64[i])) != 0)
2999: goto out;
3000: /* insert line breaks */
3001: if (i % 70 == 69 && (r = sshbuf_put_u8(blob, '\n')) != 0)
3002: goto out;
3003: }
3004: if (i % 70 != 69 && (r = sshbuf_put_u8(blob, '\n')) != 0)
3005: goto out;
3006: if ((r = sshbuf_put(blob, MARK_END, MARK_END_LEN)) != 0)
3007: goto out;
3008:
3009: /* success */
3010: r = 0;
3011:
3012: out:
3013: sshbuf_free(kdf);
3014: sshbuf_free(encoded);
3015: sshbuf_free(encrypted);
1.36 djm 3016: cipher_free(ciphercontext);
1.1 djm 3017: explicit_bzero(salt, sizeof(salt));
3018: if (key != NULL) {
3019: explicit_bzero(key, keylen + ivlen);
3020: free(key);
3021: }
3022: if (pubkeyblob != NULL) {
3023: explicit_bzero(pubkeyblob, pubkeylen);
3024: free(pubkeyblob);
3025: }
3026: if (b64 != NULL) {
3027: explicit_bzero(b64, strlen(b64));
3028: free(b64);
3029: }
3030: return r;
3031: }
3032:
3033: static int
3034: sshkey_parse_private2(struct sshbuf *blob, int type, const char *passphrase,
3035: struct sshkey **keyp, char **commentp)
3036: {
3037: char *comment = NULL, *ciphername = NULL, *kdfname = NULL;
3038: const struct sshcipher *cipher = NULL;
3039: const u_char *cp;
3040: int r = SSH_ERR_INTERNAL_ERROR;
3041: size_t encoded_len;
1.18 djm 3042: size_t i, keylen = 0, ivlen = 0, authlen = 0, slen = 0;
1.1 djm 3043: struct sshbuf *encoded = NULL, *decoded = NULL;
3044: struct sshbuf *kdf = NULL, *decrypted = NULL;
1.36 djm 3045: struct sshcipher_ctx *ciphercontext = NULL;
1.1 djm 3046: struct sshkey *k = NULL;
3047: u_char *key = NULL, *salt = NULL, *dp, pad, last;
3048: u_int blocksize, rounds, nkeys, encrypted_len, check1, check2;
3049:
3050: if (keyp != NULL)
3051: *keyp = NULL;
3052: if (commentp != NULL)
3053: *commentp = NULL;
3054:
3055: if ((encoded = sshbuf_new()) == NULL ||
3056: (decoded = sshbuf_new()) == NULL ||
3057: (decrypted = sshbuf_new()) == NULL) {
3058: r = SSH_ERR_ALLOC_FAIL;
3059: goto out;
3060: }
3061:
3062: /* check preamble */
3063: cp = sshbuf_ptr(blob);
3064: encoded_len = sshbuf_len(blob);
3065: if (encoded_len < (MARK_BEGIN_LEN + MARK_END_LEN) ||
3066: memcmp(cp, MARK_BEGIN, MARK_BEGIN_LEN) != 0) {
3067: r = SSH_ERR_INVALID_FORMAT;
3068: goto out;
3069: }
3070: cp += MARK_BEGIN_LEN;
3071: encoded_len -= MARK_BEGIN_LEN;
3072:
3073: /* Look for end marker, removing whitespace as we go */
3074: while (encoded_len > 0) {
3075: if (*cp != '\n' && *cp != '\r') {
3076: if ((r = sshbuf_put_u8(encoded, *cp)) != 0)
3077: goto out;
3078: }
3079: last = *cp;
3080: encoded_len--;
3081: cp++;
3082: if (last == '\n') {
3083: if (encoded_len >= MARK_END_LEN &&
3084: memcmp(cp, MARK_END, MARK_END_LEN) == 0) {
3085: /* \0 terminate */
3086: if ((r = sshbuf_put_u8(encoded, 0)) != 0)
3087: goto out;
3088: break;
3089: }
3090: }
3091: }
3092: if (encoded_len == 0) {
3093: r = SSH_ERR_INVALID_FORMAT;
3094: goto out;
3095: }
3096:
3097: /* decode base64 */
1.4 djm 3098: if ((r = sshbuf_b64tod(decoded, (char *)sshbuf_ptr(encoded))) != 0)
1.1 djm 3099: goto out;
3100:
3101: /* check magic */
3102: if (sshbuf_len(decoded) < sizeof(AUTH_MAGIC) ||
3103: memcmp(sshbuf_ptr(decoded), AUTH_MAGIC, sizeof(AUTH_MAGIC))) {
3104: r = SSH_ERR_INVALID_FORMAT;
3105: goto out;
3106: }
3107: /* parse public portion of key */
3108: if ((r = sshbuf_consume(decoded, sizeof(AUTH_MAGIC))) != 0 ||
3109: (r = sshbuf_get_cstring(decoded, &ciphername, NULL)) != 0 ||
3110: (r = sshbuf_get_cstring(decoded, &kdfname, NULL)) != 0 ||
3111: (r = sshbuf_froms(decoded, &kdf)) != 0 ||
3112: (r = sshbuf_get_u32(decoded, &nkeys)) != 0 ||
3113: (r = sshbuf_skip_string(decoded)) != 0 || /* pubkey */
3114: (r = sshbuf_get_u32(decoded, &encrypted_len)) != 0)
3115: goto out;
3116:
3117: if ((cipher = cipher_by_name(ciphername)) == NULL) {
3118: r = SSH_ERR_KEY_UNKNOWN_CIPHER;
3119: goto out;
3120: }
3121: if ((passphrase == NULL || strlen(passphrase) == 0) &&
3122: strcmp(ciphername, "none") != 0) {
3123: /* passphrase required */
3124: r = SSH_ERR_KEY_WRONG_PASSPHRASE;
3125: goto out;
3126: }
3127: if (strcmp(kdfname, "none") != 0 && strcmp(kdfname, "bcrypt") != 0) {
3128: r = SSH_ERR_KEY_UNKNOWN_CIPHER;
3129: goto out;
3130: }
3131: if (!strcmp(kdfname, "none") && strcmp(ciphername, "none") != 0) {
3132: r = SSH_ERR_INVALID_FORMAT;
3133: goto out;
3134: }
3135: if (nkeys != 1) {
3136: /* XXX only one key supported */
3137: r = SSH_ERR_INVALID_FORMAT;
3138: goto out;
3139: }
3140:
3141: /* check size of encrypted key blob */
3142: blocksize = cipher_blocksize(cipher);
3143: if (encrypted_len < blocksize || (encrypted_len % blocksize) != 0) {
3144: r = SSH_ERR_INVALID_FORMAT;
3145: goto out;
3146: }
3147:
3148: /* setup key */
3149: keylen = cipher_keylen(cipher);
3150: ivlen = cipher_ivlen(cipher);
1.18 djm 3151: authlen = cipher_authlen(cipher);
1.1 djm 3152: if ((key = calloc(1, keylen + ivlen)) == NULL) {
3153: r = SSH_ERR_ALLOC_FAIL;
3154: goto out;
3155: }
3156: if (strcmp(kdfname, "bcrypt") == 0) {
3157: if ((r = sshbuf_get_string(kdf, &salt, &slen)) != 0 ||
3158: (r = sshbuf_get_u32(kdf, &rounds)) != 0)
3159: goto out;
3160: if (bcrypt_pbkdf(passphrase, strlen(passphrase), salt, slen,
3161: key, keylen + ivlen, rounds) < 0) {
3162: r = SSH_ERR_INVALID_FORMAT;
3163: goto out;
3164: }
3165: }
3166:
1.18 djm 3167: /* check that an appropriate amount of auth data is present */
3168: if (sshbuf_len(decoded) < encrypted_len + authlen) {
3169: r = SSH_ERR_INVALID_FORMAT;
3170: goto out;
3171: }
3172:
1.1 djm 3173: /* decrypt private portion of key */
3174: if ((r = sshbuf_reserve(decrypted, encrypted_len, &dp)) != 0 ||
3175: (r = cipher_init(&ciphercontext, cipher, key, keylen,
3176: key + keylen, ivlen, 0)) != 0)
3177: goto out;
1.36 djm 3178: if ((r = cipher_crypt(ciphercontext, 0, dp, sshbuf_ptr(decoded),
1.18 djm 3179: encrypted_len, 0, authlen)) != 0) {
1.1 djm 3180: /* an integrity error here indicates an incorrect passphrase */
3181: if (r == SSH_ERR_MAC_INVALID)
3182: r = SSH_ERR_KEY_WRONG_PASSPHRASE;
3183: goto out;
3184: }
1.18 djm 3185: if ((r = sshbuf_consume(decoded, encrypted_len + authlen)) != 0)
1.1 djm 3186: goto out;
3187: /* there should be no trailing data */
3188: if (sshbuf_len(decoded) != 0) {
3189: r = SSH_ERR_INVALID_FORMAT;
3190: goto out;
3191: }
3192:
3193: /* check check bytes */
3194: if ((r = sshbuf_get_u32(decrypted, &check1)) != 0 ||
3195: (r = sshbuf_get_u32(decrypted, &check2)) != 0)
3196: goto out;
3197: if (check1 != check2) {
3198: r = SSH_ERR_KEY_WRONG_PASSPHRASE;
3199: goto out;
3200: }
3201:
3202: /* Load the private key and comment */
3203: if ((r = sshkey_private_deserialize(decrypted, &k)) != 0 ||
3204: (r = sshbuf_get_cstring(decrypted, &comment, NULL)) != 0)
3205: goto out;
3206:
3207: /* Check deterministic padding */
3208: i = 0;
3209: while (sshbuf_len(decrypted)) {
3210: if ((r = sshbuf_get_u8(decrypted, &pad)) != 0)
3211: goto out;
3212: if (pad != (++i & 0xff)) {
3213: r = SSH_ERR_INVALID_FORMAT;
3214: goto out;
3215: }
3216: }
3217:
3218: /* XXX decode pubkey and check against private */
3219:
3220: /* success */
3221: r = 0;
3222: if (keyp != NULL) {
3223: *keyp = k;
3224: k = NULL;
3225: }
3226: if (commentp != NULL) {
3227: *commentp = comment;
3228: comment = NULL;
3229: }
3230: out:
3231: pad = 0;
1.36 djm 3232: cipher_free(ciphercontext);
1.1 djm 3233: free(ciphername);
3234: free(kdfname);
3235: free(comment);
3236: if (salt != NULL) {
3237: explicit_bzero(salt, slen);
3238: free(salt);
3239: }
3240: if (key != NULL) {
3241: explicit_bzero(key, keylen + ivlen);
3242: free(key);
3243: }
3244: sshbuf_free(encoded);
3245: sshbuf_free(decoded);
3246: sshbuf_free(kdf);
3247: sshbuf_free(decrypted);
3248: sshkey_free(k);
3249: return r;
3250: }
3251:
3252:
3253: #ifdef WITH_OPENSSL
3254: /* convert SSH v2 key in OpenSSL PEM format */
3255: static int
3256: sshkey_private_pem_to_blob(struct sshkey *key, struct sshbuf *blob,
3257: const char *_passphrase, const char *comment)
3258: {
3259: int success, r;
3260: int blen, len = strlen(_passphrase);
3261: u_char *passphrase = (len > 0) ? (u_char *)_passphrase : NULL;
3262: const EVP_CIPHER *cipher = (len > 0) ? EVP_aes_128_cbc() : NULL;
3263: const u_char *bptr;
3264: BIO *bio = NULL;
3265:
3266: if (len > 0 && len <= 4)
3267: return SSH_ERR_PASSPHRASE_TOO_SHORT;
3268: if ((bio = BIO_new(BIO_s_mem())) == NULL)
3269: return SSH_ERR_ALLOC_FAIL;
3270:
3271: switch (key->type) {
3272: case KEY_DSA:
3273: success = PEM_write_bio_DSAPrivateKey(bio, key->dsa,
3274: cipher, passphrase, len, NULL, NULL);
3275: break;
3276: case KEY_ECDSA:
3277: success = PEM_write_bio_ECPrivateKey(bio, key->ecdsa,
3278: cipher, passphrase, len, NULL, NULL);
3279: break;
3280: case KEY_RSA:
3281: success = PEM_write_bio_RSAPrivateKey(bio, key->rsa,
3282: cipher, passphrase, len, NULL, NULL);
3283: break;
3284: default:
3285: success = 0;
3286: break;
3287: }
3288: if (success == 0) {
3289: r = SSH_ERR_LIBCRYPTO_ERROR;
3290: goto out;
3291: }
3292: if ((blen = BIO_get_mem_data(bio, &bptr)) <= 0) {
3293: r = SSH_ERR_INTERNAL_ERROR;
3294: goto out;
3295: }
3296: if ((r = sshbuf_put(blob, bptr, blen)) != 0)
3297: goto out;
3298: r = 0;
3299: out:
3300: BIO_free(bio);
3301: return r;
3302: }
3303: #endif /* WITH_OPENSSL */
3304:
3305: /* Serialise "key" to buffer "blob" */
3306: int
3307: sshkey_private_to_fileblob(struct sshkey *key, struct sshbuf *blob,
3308: const char *passphrase, const char *comment,
3309: int force_new_format, const char *new_format_cipher, int new_format_rounds)
3310: {
3311: switch (key->type) {
1.9 markus 3312: #ifdef WITH_OPENSSL
1.1 djm 3313: case KEY_DSA:
3314: case KEY_ECDSA:
3315: case KEY_RSA:
3316: if (force_new_format) {
3317: return sshkey_private_to_blob2(key, blob, passphrase,
3318: comment, new_format_cipher, new_format_rounds);
3319: }
3320: return sshkey_private_pem_to_blob(key, blob,
3321: passphrase, comment);
3322: #endif /* WITH_OPENSSL */
3323: case KEY_ED25519:
3324: return sshkey_private_to_blob2(key, blob, passphrase,
3325: comment, new_format_cipher, new_format_rounds);
3326: default:
3327: return SSH_ERR_KEY_TYPE_UNKNOWN;
3328: }
3329: }
3330:
3331:
3332: #ifdef WITH_OPENSSL
1.8 djm 3333: static int
1.52 djm 3334: translate_libcrypto_error(unsigned long pem_err)
3335: {
3336: int pem_reason = ERR_GET_REASON(pem_err);
3337:
3338: switch (ERR_GET_LIB(pem_err)) {
3339: case ERR_LIB_PEM:
3340: switch (pem_reason) {
3341: case PEM_R_BAD_PASSWORD_READ:
3342: case PEM_R_PROBLEMS_GETTING_PASSWORD:
3343: case PEM_R_BAD_DECRYPT:
3344: return SSH_ERR_KEY_WRONG_PASSPHRASE;
3345: default:
3346: return SSH_ERR_INVALID_FORMAT;
3347: }
3348: case ERR_LIB_EVP:
3349: switch (pem_reason) {
3350: case EVP_R_BAD_DECRYPT:
3351: return SSH_ERR_KEY_WRONG_PASSPHRASE;
3352: case EVP_R_BN_DECODE_ERROR:
3353: case EVP_R_DECODE_ERROR:
3354: #ifdef EVP_R_PRIVATE_KEY_DECODE_ERROR
3355: case EVP_R_PRIVATE_KEY_DECODE_ERROR:
3356: #endif
3357: return SSH_ERR_INVALID_FORMAT;
3358: default:
3359: return SSH_ERR_LIBCRYPTO_ERROR;
3360: }
3361: case ERR_LIB_ASN1:
3362: return SSH_ERR_INVALID_FORMAT;
3363: }
3364: return SSH_ERR_LIBCRYPTO_ERROR;
3365: }
3366:
3367: static void
3368: clear_libcrypto_errors(void)
3369: {
3370: while (ERR_get_error() != 0)
3371: ;
3372: }
3373:
3374: /*
3375: * Translate OpenSSL error codes to determine whether
3376: * passphrase is required/incorrect.
3377: */
3378: static int
3379: convert_libcrypto_error(void)
3380: {
3381: /*
3382: * Some password errors are reported at the beginning
3383: * of the error queue.
3384: */
3385: if (translate_libcrypto_error(ERR_peek_error()) ==
3386: SSH_ERR_KEY_WRONG_PASSPHRASE)
3387: return SSH_ERR_KEY_WRONG_PASSPHRASE;
3388: return translate_libcrypto_error(ERR_peek_last_error());
3389: }
3390:
3391: static int
1.1 djm 3392: sshkey_parse_private_pem_fileblob(struct sshbuf *blob, int type,
1.8 djm 3393: const char *passphrase, struct sshkey **keyp)
1.1 djm 3394: {
3395: EVP_PKEY *pk = NULL;
3396: struct sshkey *prv = NULL;
3397: BIO *bio = NULL;
3398: int r;
3399:
1.32 djm 3400: if (keyp != NULL)
3401: *keyp = NULL;
1.1 djm 3402:
3403: if ((bio = BIO_new(BIO_s_mem())) == NULL || sshbuf_len(blob) > INT_MAX)
3404: return SSH_ERR_ALLOC_FAIL;
3405: if (BIO_write(bio, sshbuf_ptr(blob), sshbuf_len(blob)) !=
3406: (int)sshbuf_len(blob)) {
3407: r = SSH_ERR_ALLOC_FAIL;
3408: goto out;
3409: }
3410:
1.52 djm 3411: clear_libcrypto_errors();
1.1 djm 3412: if ((pk = PEM_read_bio_PrivateKey(bio, NULL, NULL,
3413: (char *)passphrase)) == NULL) {
1.52 djm 3414: r = convert_libcrypto_error();
1.1 djm 3415: goto out;
3416: }
3417: if (pk->type == EVP_PKEY_RSA &&
3418: (type == KEY_UNSPEC || type == KEY_RSA)) {
3419: if ((prv = sshkey_new(KEY_UNSPEC)) == NULL) {
3420: r = SSH_ERR_ALLOC_FAIL;
3421: goto out;
3422: }
3423: prv->rsa = EVP_PKEY_get1_RSA(pk);
3424: prv->type = KEY_RSA;
3425: #ifdef DEBUG_PK
3426: RSA_print_fp(stderr, prv->rsa, 8);
3427: #endif
3428: if (RSA_blinding_on(prv->rsa, NULL) != 1) {
3429: r = SSH_ERR_LIBCRYPTO_ERROR;
1.49 djm 3430: goto out;
3431: }
3432: if (BN_num_bits(prv->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
3433: r = SSH_ERR_KEY_LENGTH;
1.1 djm 3434: goto out;
3435: }
3436: } else if (pk->type == EVP_PKEY_DSA &&
3437: (type == KEY_UNSPEC || type == KEY_DSA)) {
3438: if ((prv = sshkey_new(KEY_UNSPEC)) == NULL) {
3439: r = SSH_ERR_ALLOC_FAIL;
3440: goto out;
3441: }
3442: prv->dsa = EVP_PKEY_get1_DSA(pk);
3443: prv->type = KEY_DSA;
3444: #ifdef DEBUG_PK
3445: DSA_print_fp(stderr, prv->dsa, 8);
3446: #endif
3447: } else if (pk->type == EVP_PKEY_EC &&
3448: (type == KEY_UNSPEC || type == KEY_ECDSA)) {
3449: if ((prv = sshkey_new(KEY_UNSPEC)) == NULL) {
3450: r = SSH_ERR_ALLOC_FAIL;
3451: goto out;
3452: }
3453: prv->ecdsa = EVP_PKEY_get1_EC_KEY(pk);
3454: prv->type = KEY_ECDSA;
3455: prv->ecdsa_nid = sshkey_ecdsa_key_to_nid(prv->ecdsa);
3456: if (prv->ecdsa_nid == -1 ||
3457: sshkey_curve_nid_to_name(prv->ecdsa_nid) == NULL ||
3458: sshkey_ec_validate_public(EC_KEY_get0_group(prv->ecdsa),
3459: EC_KEY_get0_public_key(prv->ecdsa)) != 0 ||
3460: sshkey_ec_validate_private(prv->ecdsa) != 0) {
3461: r = SSH_ERR_INVALID_FORMAT;
3462: goto out;
3463: }
3464: #ifdef DEBUG_PK
3465: if (prv != NULL && prv->ecdsa != NULL)
3466: sshkey_dump_ec_key(prv->ecdsa);
3467: #endif
3468: } else {
3469: r = SSH_ERR_INVALID_FORMAT;
3470: goto out;
3471: }
3472: r = 0;
1.32 djm 3473: if (keyp != NULL) {
3474: *keyp = prv;
3475: prv = NULL;
3476: }
1.1 djm 3477: out:
3478: BIO_free(bio);
3479: if (pk != NULL)
3480: EVP_PKEY_free(pk);
1.30 mmcc 3481: sshkey_free(prv);
1.1 djm 3482: return r;
3483: }
3484: #endif /* WITH_OPENSSL */
3485:
3486: int
3487: sshkey_parse_private_fileblob_type(struct sshbuf *blob, int type,
3488: const char *passphrase, struct sshkey **keyp, char **commentp)
3489: {
1.42 djm 3490: int r = SSH_ERR_INTERNAL_ERROR;
3491:
1.32 djm 3492: if (keyp != NULL)
3493: *keyp = NULL;
1.1 djm 3494: if (commentp != NULL)
3495: *commentp = NULL;
3496:
3497: switch (type) {
1.9 markus 3498: #ifdef WITH_OPENSSL
1.1 djm 3499: case KEY_DSA:
3500: case KEY_ECDSA:
3501: case KEY_RSA:
1.8 djm 3502: return sshkey_parse_private_pem_fileblob(blob, type,
3503: passphrase, keyp);
1.1 djm 3504: #endif /* WITH_OPENSSL */
3505: case KEY_ED25519:
3506: return sshkey_parse_private2(blob, type, passphrase,
3507: keyp, commentp);
3508: case KEY_UNSPEC:
1.42 djm 3509: r = sshkey_parse_private2(blob, type, passphrase, keyp,
3510: commentp);
3511: /* Do not fallback to PEM parser if only passphrase is wrong. */
3512: if (r == 0 || r == SSH_ERR_KEY_WRONG_PASSPHRASE)
3513: return r;
1.1 djm 3514: #ifdef WITH_OPENSSL
1.8 djm 3515: return sshkey_parse_private_pem_fileblob(blob, type,
3516: passphrase, keyp);
1.1 djm 3517: #else
3518: return SSH_ERR_INVALID_FORMAT;
3519: #endif /* WITH_OPENSSL */
3520: default:
3521: return SSH_ERR_KEY_TYPE_UNKNOWN;
3522: }
3523: }
3524:
3525: int
3526: sshkey_parse_private_fileblob(struct sshbuf *buffer, const char *passphrase,
1.23 tim 3527: struct sshkey **keyp, char **commentp)
1.1 djm 3528: {
3529: if (keyp != NULL)
3530: *keyp = NULL;
3531: if (commentp != NULL)
3532: *commentp = NULL;
3533:
1.23 tim 3534: return sshkey_parse_private_fileblob_type(buffer, KEY_UNSPEC,
3535: passphrase, keyp, commentp);
1.1 djm 3536: }