diff options
| author | cinap_lenrek <cinap_lenrek@felloff.net> | 2017-04-17 05:13:46 +0200 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@felloff.net> | 2017-04-17 05:13:46 +0200 |
| commit | 242274f7331436241464dcf26d2105b0f9aa9bbe (patch) | |
| tree | d67eb0f7a2fc92d6c2dfada0c8398e6f373e986e /sys/src | |
| parent | ddc6c1651574ca04fa73984452cdcc3dddb08256 (diff) | |
rsa2ssh: drop support for version 1 key format
Diffstat (limited to 'sys/src')
| -rw-r--r-- | sys/src/cmd/auth/rsa2ssh.c | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/sys/src/cmd/auth/rsa2ssh.c b/sys/src/cmd/auth/rsa2ssh.c index 6c06af6b4..a008dfd0f 100644 --- 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,21 +16,19 @@ void main(int argc, char **argv) { RSApriv *k; - int ssh2; char *comment; + uchar buf[8192], *p; fmtinstall('B', mpfmt); fmtinstall('[', encodefmt); - ssh2 = 0; comment = ""; ARGBEGIN{ case 'c': comment = EARGF(usage()); break; - case '2': - ssh2 = 1; + case '2': /* backwards compatibility */ break; default: usage(); @@ -42,19 +40,13 @@ main(int argc, char **argv) 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); } |