diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2009-02-18 21:32:21 -0500 |
|---|---|---|
| committer | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2009-02-18 21:32:21 -0500 |
| commit | e2b547631eae05103fe3219f4e2c7a4f618ef5d0 (patch) | |
| tree | c829d34e9c7fe6ccc69fbe08bb0ca5436ede6288 /src/share/m | |
| parent | 41b38ace2b23bebf61fbf63cda8d3be005d28385 (diff) | |
| parent | 62374dd1c16a2719202955ad3fe878be5cc14dba (diff) | |
Merge commit 'jrollins/master'
Diffstat (limited to 'src/share/m')
| -rw-r--r-- | src/share/m/gen_subkey | 2 | ||||
| -rw-r--r-- | src/share/m/import_subkey | 2 | ||||
| -rw-r--r-- | src/share/m/subkey_to_ssh_agent | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/share/m/gen_subkey b/src/share/m/gen_subkey index cbefaa3..19d384d 100644 --- a/src/share/m/gen_subkey +++ b/src/share/m/gen_subkey @@ -114,7 +114,7 @@ EOF ) log verbose "generating subkey..." - fifoDir=$(mktemp -d ${TMPDIR:-/tmp}/tmp.XXXXXXXXXX) + fifoDir=$(msmktempdir) (umask 077 && mkfifo "$fifoDir/pass") echo "$editCommands" | gpg --passphrase-fd 3 3< "$fifoDir/pass" --expert --command-fd 0 --edit-key "$keyID" & diff --git a/src/share/m/import_subkey b/src/share/m/import_subkey index aa89958..8b04456 100644 --- a/src/share/m/import_subkey +++ b/src/share/m/import_subkey @@ -42,7 +42,7 @@ Type '$PGRM help' for usage." done log verbose "importing ssh key..." - fifoDir=$(mktemp -d ${TMPDIR:-/tmp}/tmp.XXXXXXXXXX) + fifoDir=$(msmktempdir) (umask 077 && mkfifo "$fifoDir/pass") ssh2openpgp | gpg --passphrase-fd 3 3< "$fifoDir/pass" --expert --command-fd 0 --import & diff --git a/src/share/m/subkey_to_ssh_agent b/src/share/m/subkey_to_ssh_agent index 012c95f..a92718e 100644 --- a/src/share/m/subkey_to_ssh_agent +++ b/src/share/m/subkey_to_ssh_agent @@ -64,7 +64,7 @@ You might want to run 'gpg --gen-key'." You might want to 'monkeysphere gen-subkey'" fi - workingdir=$(mktemp -d ${TMPDIR:-/tmp}/tmp.XXXXXXXXXX) + workingdir=$(msmktempdir) umask 077 mkfifo "$workingdir/passphrase" keysuccess=1 |