diff options
| author | Matt Goins <mjgoins@openflows.com> | 2009-04-08 00:43:05 -0400 |
|---|---|---|
| committer | Matt Goins <mjgoins@openflows.com> | 2009-04-08 00:43:05 -0400 |
| commit | dfd67a14003fbfb4b1ba2269e7d47f4d0c44fcf8 (patch) | |
| tree | 3372902f39b0995a39b62851671fe33e4ceeb56e /src/share/m/gen_subkey | |
| parent | f77a5d79b4a9b4b44cb3786237931458265e49ed (diff) | |
| parent | ee3872232ffc40ab0ae7ea823059806f839f2700 (diff) | |
Merge commit 'dkg/master'
Diffstat (limited to 'src/share/m/gen_subkey')
| -rw-r--r-- | src/share/m/gen_subkey | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/share/m/gen_subkey b/src/share/m/gen_subkey index a0fa3ce..05004f6 100644 --- a/src/share/m/gen_subkey +++ b/src/share/m/gen_subkey @@ -57,14 +57,16 @@ save" # setup the temp fifo dir for retrieving the key password log debug "creating password fifo..." fifoDir=$(msmktempdir) - trap "rm -rf $fifoDir" EXIT (umask 077 && mkfifo "$fifoDir/pass") - log verbose "generating subkey..." + # FIXME: are we adequately cleaning up any trailing gpg process here? + trap "rm -rf $fifoDir; kill %% || true" EXIT echo "$editCommands" | gpg_user --passphrase-fd 3 3< "$fifoDir/pass" --expert --command-fd 0 --edit-key "$keyID" & + log debug "Prompting for passphrase" # FIXME: this needs to fail more gracefully if the passphrase is incorrect passphrase_prompt "Please enter your passphrase for $keyID: " "$fifoDir/pass" + log info "Generating subkey. This may take a long time..." trap - EXIT rm -rf "$fifoDir" |