diff options
| author | Jameson Graef Rollins <jrollins@finestructure.net> | 2009-02-19 12:29:47 -0500 |
|---|---|---|
| committer | Jameson Graef Rollins <jrollins@finestructure.net> | 2009-02-19 12:29:47 -0500 |
| commit | c073811aa573d0e3486c39ed9514c46e0a7a077f (patch) | |
| tree | cde598b94365bbe697d85ac6ca418cb94f2b4d26 /src/share/mh | |
| parent | 930822a6e672c28c06f78e9d8250cda07248f129 (diff) | |
modify import_key to take the key file to import as an argument. can be '-' to import from stdin. modify man page and test accordingly.
Diffstat (limited to 'src/share/mh')
| -rw-r--r-- | src/share/mh/import_key | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/src/share/mh/import_key b/src/share/mh/import_key index bca7319..6394ad7 100644 --- a/src/share/mh/import_key +++ b/src/share/mh/import_key @@ -13,11 +13,13 @@ import_key() { +local sshKeyFile local hostName local domain local userID -hostName="$1" +sshKeyFile="$1" +hostName="$2" # use the default hostname if not specified if [ -z "$hostName" ] ; then @@ -42,10 +44,19 @@ mkdir -p "${MHDATADIR}" mkdir -p "${GNUPGHOME_HOST}" chmod 700 "${GNUPGHOME_HOST}" -log verbose "importing ssh key..." -# translate ssh key to a private key -PEM2OPENPGP_USAGE_FLAGS=authenticate pem2openpgp "$userID" \ - | gpg_host --import +# import ssh key to a private key +if [ -z "$sshKeyFile" ] ; then + failure "Must specify ssh key file to import, or specify '-' for stdin." +elif [ "$sshKeyFile" = '-' ] ; then + log verbose "importing ssh key from stdin..." + PEM2OPENPGP_USAGE_FLAGS=authenticate pem2openpgp "$userID" \ + | gpg_host --import +else + log verbose "importing ssh key from file '$sshKeyFile'..." + PEM2OPENPGP_USAGE_FLAGS=authenticate pem2openpgp "$userID" \ + <"$sshKeyFile" \ + | gpg_host --import +fi # load the new host fpr into the fpr variable. this is so we can # create the gpg pub key file. we have to do this from the secret key |