shithub: riscv

Info  •  Files  •  Log  •  Branches

rsa2ssh: drop support for version 1 key format

--- a/sys/man/8/rsa

+++ b/sys/man/8/rsa

@@ -33,9 +33,6 @@

 .PP

 .B rsa2ssh

 [

-.B -2

-]

-[

 .B -c

 .I comment

 ]

--- a/sys/src/cmd/auth/rsa2ssh.c

+++ b/sys/src/cmd/auth/rsa2ssh.c

@@ -8,7 +8,7 @@

 void

 usage(void)

 {

-	fprint(2, "usage: auth/rsa2ssh [-2] [-c comment] [file]\n");

+	fprint(2, "usage: auth/rsa2ssh [-c comment] [file]\n");

 	exits("usage");

 }

@@ -16,13 +16,12 @@

 main(int argc, char **argv)

 {

 	RSApriv *k;

-	int ssh2;

 	char *comment;

+	uchar buf[8192], *p;

 	fmtinstall('B', mpfmt);

 	fmtinstall('[', encodefmt);

-	ssh2 = 0;

 	comment = "";

 	ARGBEGIN{

@@ -29,8 +28,7 @@

 	case 'c':

 		comment = EARGF(usage());

 		break;

-	case '2':

-		ssh2 = 1;

+	case '2':	/* backwards compatibility */

 		break;

 	default:

 		usage();

@@ -42,19 +40,13 @@

 	if((k = getrsakey(argc, argv, 0, nil)) == nil)

 		sysfatal("%r");

-	if(ssh2) {

-		uchar buf[8192], *p;

+	p = buf;

+	p = put4(p, 7);

+	p = putn(p, "ssh-rsa", 7);

+	p = putmp2(p, k->pub.ek);

+	p = putmp2(p, k->pub.n);

-		p = buf;

-		p = put4(p, 7);

-		p = putn(p, "ssh-rsa", 7);

-		p = putmp2(p, k->pub.ek);

-		p = putmp2(p, k->pub.n);

-

-		print("ssh-rsa %.*[ %s\n", (int)(p-buf), buf, comment);

-	} else {

-		print("%d %.10B %.10B %s\n", mpsignif(k->pub.n), k->pub.ek, k->pub.n, comment);

-	}

+	print("ssh-rsa %.*[ %s\n", (int)(p-buf), buf, comment);

 	exits(nil);

 }