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