diff options
| -rw-r--r-- | src/share/m/gen_subkey | 7 | ||||
| -rw-r--r-- | src/share/m/ssh_proxycommand | 14 | ||||
| -rw-r--r-- | src/share/mh/set_expire | 2 |
3 files changed, 10 insertions, 13 deletions
diff --git a/src/share/m/gen_subkey b/src/share/m/gen_subkey index dbd9dd6..a0fa3ce 100644 --- a/src/share/m/gen_subkey +++ b/src/share/m/gen_subkey @@ -44,8 +44,7 @@ Type '$PGRM help' for usage." check_gpg_authentication_subkey "$keyID" # generate the list of commands that will be passed to edit-key - editCommands=$(cat <<EOF -addkey + editCommands="addkey 7 S E @@ -53,9 +52,7 @@ A Q $keyLength 0 -save -EOF -) +save" # setup the temp fifo dir for retrieving the key password log debug "creating password fifo..." diff --git a/src/share/m/ssh_proxycommand b/src/share/m/ssh_proxycommand index 2078445..77f9d24 100644 --- a/src/share/m/ssh_proxycommand +++ b/src/share/m/ssh_proxycommand @@ -46,7 +46,7 @@ output_no_valid_key() { ="$userID" 2>/dev/null) # output header - cat <<EOF | log info + log info <<EOF -------------------- Monkeysphere warning ------------------- Monkeysphere found OpenPGP keys for this hostname, but none had full validity. EOF @@ -66,7 +66,7 @@ EOF # if one of keys found matches the one offered by the # host, then output info if [ "$sshKeyGPG" = "$sshKeyOffered" ] ; then - cat <<EOF | log info + log info <<EOF An OpenPGP key matching the ssh key offered by the host was found: EOF @@ -96,7 +96,7 @@ if (ok) { if (match($0,"^sig")) { print; } } # output the other user IDs for reference if (echo "$gpgSigOut" | grep "^uid" | grep -v -q "$userID") ; then - cat <<EOF | log info + log info <<EOF Other user IDs on this key: EOF @@ -105,7 +105,7 @@ EOF fi # output ssh fingerprint - cat <<EOF | log info + log info <<EOF RSA key fingerprint is ${sshFingerprint}. EOF @@ -124,7 +124,7 @@ EOF # if no key match was made (and the "while read" subshell # returned 1) output how many keys were found if (( returnCode != 1 )) ; then - cat <<EOF | log info + log info <<EOF None of the found keys matched the key offered by the host. Run the following command for more info about the found keys: gpg --check-sigs --list-options show-uid-validity =${userID} @@ -138,13 +138,13 @@ EOF # if host key could not be retrieved from the host, output message else - cat <<EOF | log info + log info <<EOF Could not retrieve RSA host key from $HOST. EOF fi # output footer - cat <<EOF | log info + log info <<EOF -------------------- ssh continues below -------------------- EOF } diff --git a/src/share/mh/set_expire b/src/share/mh/set_expire index 63e5c55..a6bf1f1 100644 --- a/src/share/mh/set_expire +++ b/src/share/mh/set_expire @@ -40,7 +40,7 @@ EOF update_gpg_pub_file -cat <<EOF | log info +log info <<EOF NOTE: Host key expiration date adjusted, but not yet published. Run '$PGRM publish-key' to publish the new expiration date. EOF |