[pius-commit] pius Changelog,1.4,1.5 pius,1.10,1.11

[Phil D. <ja...@us...>]

Update of /cvsroot/pgpius/pius
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15174

Modified Files:
	Changelog pius 
Log Message:
pius:
- Specify the key to sign with incase there are two private keys and both of
  them happen to be on the public ring as well. (reported by phil.pennock at
  spodhuis.org)

Signed-off-by: Phil Dibowitz <ph...@ip...>



Index: pius
===================================================================
RCS file: /cvsroot/pgpius/pius/pius,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- pius	22 Mar 2009 12:32:44 -0000	1.10
+++ pius	22 Mar 2009 13:44:59 -0000	1.11
@@ -607,11 +607,12 @@
     agent = ''
     if self.mode == MODE_AGENT:
       agent = '--use-agent'
+    keyring = '--no-default-keyring --keyring %s' % self.tmp_keyring
     # Note that if passphrase-fd is different from command-fd, nothing works.
-    cmd = ('%s %s %s --no-default-keyring --keyring %s %s'
-           ' --default-cert-level %s --no-ask-cert-level --edit-key %s' %
-           (self.gpg, self.gpg_quiet_opts, self.gpg_fd_opts, self.tmp_keyring,
-            agent, self.sign_level, key))
+    cmd = ('%s %s %s %s -u %s %s --default-cert-level %s --no-ask-cert-level'
+           ' --edit-key %s' %
+           (self.gpg, self.gpg_quiet_opts, self.gpg_fd_opts, keyring,
+            self.signer, agent, self.sign_level, key))
 
     debug(cmd)
     gpg = subprocess.Popen(cmd, shell=True, stdin=subprocess.PIPE,
@@ -822,9 +823,9 @@
     if self.mode == MODE_AGENT:
       agent = '--use-agent'
     keyring = '--no-default-keyring --keyring %s' % self.tmp_keyring
-    cmd = ('%s %s %s %s %s --always-trust -aes -r %s -r %s --output %s %s' %
-           (self.gpg, self.gpg_quiet_opts, self.gpg_fd_opts, keyring,
-           agent, keyid, self.signer, outfile, infile))
+    cmd = ('%s %s %s %s %s --always-trust -u %s -aes -r %s -r %s --output %s %s'
+           % (self.gpg, self.gpg_quiet_opts, self.gpg_fd_opts, keyring,
+              agent, self.signer, keyid, self.signer, outfile, infile))
 
     debug(cmd)
     gpg = subprocess.Popen(cmd, shell=True, stdin=subprocess.PIPE,

Index: Changelog
===================================================================
RCS file: /cvsroot/pgpius/pius/Changelog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Changelog	22 Mar 2009 12:34:30 -0000	1.4
+++ Changelog	22 Mar 2009 13:44:59 -0000	1.5
@@ -2,8 +2,12 @@
 Released:
 ph...@ip...
 - Catch the case where a users' public key isn't on the keyring and report it
-  to the user instead of just failing
-- Handle expired subkeys on the _signers'_ key
+  to the user instead of just failing (reported by phil.pennock at spodhuis.org)
+- Handle expired subkeys on the _signers'_ key (reported by phil.pennock at
+  spodhuis.org)
+- Specify the key to sign with incase there are two private keys and both of
+  them happen to be on the public ring as well. (reported by phil.pennock at
+  spodhuis.org)
 
 2.0.1
 Released: 02/28/09