xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

rsa2ssh: drop support for version 1 key format

Browse source
This commit is contained in:
cinap_lenrek 2017-04-17 05:13:46 +02:00
parent ddc6c16515
commit 242274f733
2 changed files with 9 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sys/man/8/rsa
View file

@ -33,9 +33,6 @@ rsagen, rsafill, asn12rsa, rsa2pub, rsa2ssh, rsa2x509, rsa2csr \- generate and f
.PP .PP
.B rsa2ssh .B rsa2ssh
[ [
.B -2
]
[
.B -c .B -c
.I comment .I comment
] ]

26
sys/src/cmd/auth/rsa2ssh.c
View file

@ -8,7 +8,7 @@
void void
usage(void) usage(void)
{ {
fprint(2, "usage: auth/rsa2ssh [-2] [-c comment] [file]\n"); fprint(2, "usage: auth/rsa2ssh [-c comment] [file]\n");
exits("usage"); exits("usage");
} }
@ -16,21 +16,19 @@ void
main(int argc, char **argv) main(int argc, char **argv)
{ {
RSApriv *k; RSApriv *k;
int ssh2;
char *comment; char *comment;
uchar buf[8192], *p;
fmtinstall('B', mpfmt); fmtinstall('B', mpfmt);
fmtinstall('[', encodefmt); fmtinstall('[', encodefmt);
ssh2 = 0;
comment = ""; comment = "";
ARGBEGIN{ ARGBEGIN{
case 'c': case 'c':
comment = EARGF(usage()); comment = EARGF(usage());
break; break;
case '2': case '2': /* backwards compatibility */
ssh2 = 1;
break; break;
default: default:
usage(); usage();
@ -42,19 +40,13 @@ main(int argc, char **argv)
if((k = getrsakey(argc, argv, 0, nil)) == nil) if((k = getrsakey(argc, argv, 0, nil)) == nil)
sysfatal("%r"); sysfatal("%r");
if(ssh2) { p = buf;
uchar buf[8192], *p; p = put4(p, 7);
p = putn(p, "ssh-rsa", 7);
p = putmp2(p, k->pub.ek);
p = putmp2(p, k->pub.n);
p = buf; print("ssh-rsa %.*[ %s\n", (int)(p-buf), buf, comment);
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);
}
exits(nil); exits(nil);
} }