From aa03928a5317996d9d87ba733048b2c010641a3b Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Sun, 1 Mar 2009 22:23:40 -0500 Subject: [PATCH] syntactic cleanup of keytrans-related man pages. --- man/man1/openpgp2ssh.1 | 21 ++++++++++++--------- man/man1/pem2openpgp.1 | 10 +++++----- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/man/man1/openpgp2ssh.1 b/man/man1/openpgp2ssh.1 index 9b0d1a4..304a442 100644 --- a/man/man1/openpgp2ssh.1 +++ b/man/man1/openpgp2ssh.1 @@ -1,5 +1,5 @@ .\" -*- nroff -*- -.Dd $Mdocdate: June 11, 2008 $ +.Dd $Mdocdate: March 1, 2009 $ .Dt OPENPGP2SSH 1 .Os .Sh NAME @@ -8,9 +8,9 @@ openpgp2ssh .Sh SYNOPSIS .Nm openpgp2ssh < mykey.gpg .Pp -.Nm gpg --export $KEYID | openpgp2ssh $KEYID +.Nm gpg \-\-export $KEYID | openpgp2ssh $KEYID .Pp -.Nm gpg --export-secret-key $KEYID | openpgp2ssh $KEYID +.Nm gpg \-\-export\-secret\-key $KEYID | openpgp2ssh $KEYID .Sh DESCRIPTION .Nm takes an OpenPGP-formatted primary key and associated @@ -30,7 +30,7 @@ ID. .Pp If the input contains an OpenPGP RSA public key, it will be converted to the OpenSSH-style single-line keystring, prefixed with the key type -(ssh-rsa). This format is suitable (with minor alterations) for +(`ssh\-rsa'). This format is suitable (with minor alterations) for insertion into known_hosts files and authorized_keys files. .Pp If the input contains an OpenPGP RSA secret key, it will be converted @@ -52,14 +52,14 @@ other things, that it will happily export revoked keys, unverifiable keys, expired keys, etc. Make sure you do your own key validation before using this tool! .Sh EXAMPLES -.Nm gpg --export-secret-key $KEYID | openpgp2ssh $KEYID | ssh-add -c /dev/stdin +.Nm gpg \-\-export\-secret\-key $KEYID | openpgp2ssh $KEYID | ssh\-add \-c /dev/stdin .Pp This pushes the secret key into the active -.Xr ssh-agent 1 . +.Xr ssh\-agent 1 . Tools such as .Xr ssh 1 which know how to talk to the -.Xr ssh-agent 1 +.Xr ssh\-agent 1 can now rely on the key. .Sh AUTHOR .Nm @@ -77,7 +77,9 @@ accept ASCII-armored input. .Nm Currently only exports into formats used by the OpenSSH. It should support other key output formats, such as those used by -lsh(1) and putty(1). +.Xr lsh 1 +and +.Xr putty 1 . .Pp Secret key output is currently not passphrase-protected. .Pp @@ -88,4 +90,5 @@ currently cannot handle passphrase-protected secret keys on input. .Xr monkeysphere 1 , .Xr monkeysphere 7 , .Xr ssh 1 , -.Xr monkeysphere-server 8 +.Xr monkeysphere-authentication 8 , +.Xr monkeysphere-host 8 diff --git a/man/man1/pem2openpgp.1 b/man/man1/pem2openpgp.1 index ae75b11..45fd1ee 100644 --- a/man/man1/pem2openpgp.1 +++ b/man/man1/pem2openpgp.1 @@ -1,12 +1,12 @@ .\" -*- nroff -*- -.Dd $Mdocdate: January 25, 2009 $ +.Dd $Mdocdate: March 1, 2009 $ .Dt PEM2OPENPGP 1 .Os .Sh NAME pem2openpgp .Nd translate PEM-encoded RSA keys to OpenPGP certificates .Sh SYNOPSIS -.Nm pem2openpgp "$USERID" < mykey.pem | gpg --import +.Nm pem2openpgp "$USERID" < mykey.pem | gpg \-\-import .Pp .Nm PEM2OPENPGP_EXPIRATION=$((86400 * $DAYS)) PEM2OPENPGP_USAGE_FLAGS=authentication,certify pem2openpgp "$USERID" . .Sh BUGS -Only handles RSA keys at the moment. It would be nice to handle DSA +Only handles RSA keys at the moment. It might be nice to handle DSA keys as well. .Pp Currently only creates certificates with a single User ID. Should be @@ -81,5 +81,5 @@ https://labs.riseup.net/code/projects/show/monkeysphere .Xr monkeysphere 1 , .Xr monkeysphere 7 , .Xr ssh 1 , -.Xr monkeysphere-host 8 , -.Xr monkeysphere-authentication 8 +.Xr monkeysphere\-host 8 , +.Xr monkeysphere\-authentication 8 -- 2.26.2