diff options
author | Mike Crute <mcrute@gmail.com> | 2010-05-06 00:19:50 -0400 |
---|---|---|
committer | Mike Crute <mcrute@gmail.com> | 2010-05-06 00:19:50 -0400 |
commit | bc0d65b71946dceabac263e3b8f64b9c2164ad53 (patch) | |
tree | 0e61a32e1a7212c7f74bf4b814500dbb90e3a106 | |
parent | ef76b13694d797b6df6e5866b3671cfca8d22563 (diff) | |
download | hg_sshsign-bc0d65b71946dceabac263e3b8f64b9c2164ad53.tar.bz2 hg_sshsign-bc0d65b71946dceabac263e3b8f64b9c2164ad53.tar.xz hg_sshsign-bc0d65b71946dceabac263e3b8f64b9c2164ad53.zip |
Fixing bug with non-agent signing
-rw-r--r-- | hgsshsign/__init__.py | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/hgsshsign/__init__.py b/hgsshsign/__init__.py index 7b3f488..7134ca9 100644 --- a/hgsshsign/__init__.py +++ b/hgsshsign/__init__.py | |||
@@ -5,27 +5,21 @@ SSH Key Signing | |||
5 | @author: Mike Crute (mcrute@ag.com) | 5 | @author: Mike Crute (mcrute@ag.com) |
6 | @organization: American Greetings Interactive | 6 | @organization: American Greetings Interactive |
7 | @date: May 03, 2010 | 7 | @date: May 03, 2010 |
8 | |||
9 | Commands to sign and verify revisions with your | ||
10 | ssh key. | ||
11 | |||
12 | Ponder this, bitches: | ||
13 | http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/ssh/ssh-rsa.c | ||
14 | http://svn.osafoundation.org/m2crypto/trunk/SWIG/_rsa.i | ||
15 | """ | 8 | """ |
16 | 9 | ||
17 | __version__ = "0.0.1dev" | 10 | __version__ = "0.0.1dev" |
18 | 11 | ||
19 | 12 | ||
13 | import os | ||
14 | import binascii | ||
15 | |||
20 | import keys | 16 | import keys |
21 | from keymanifest import KeyManifest | 17 | from keymanifest import KeyManifest |
22 | from structutils import bytes_to_int | ||
23 | from sshagent import SSHAgent | 18 | from sshagent import SSHAgent |
24 | 19 | ||
25 | import os, tempfile, binascii | 20 | from mercurial.i18n import _ |
26 | from mercurial import util, commands, match | 21 | from mercurial import util, commands, match |
27 | from mercurial import node as hgnode | 22 | from mercurial import node as hgnode |
28 | from mercurial.i18n import _ | ||
29 | 23 | ||
30 | 24 | ||
31 | class SSHAuthority(object): | 25 | class SSHAuthority(object): |
@@ -68,7 +62,7 @@ class SSHAuthority(object): | |||
68 | return key.verify(data, signature) | 62 | return key.verify(data, signature) |
69 | 63 | ||
70 | def sign(self, data): | 64 | def sign(self, data): |
71 | return self.private_key.sign(data) | 65 | return keys.sign_like_agent(data, self.private_key) |
72 | 66 | ||
73 | 67 | ||
74 | def node2txt(repo, node, ver): | 68 | def node2txt(repo, node, ver): |
@@ -167,4 +161,3 @@ cmdtable = { | |||
167 | ] + commands.commitopts2, | 161 | ] + commands.commitopts2, |
168 | _('hg sign [OPTION]... [REVISION]...')), | 162 | _('hg sign [OPTION]... [REVISION]...')), |
169 | } | 163 | } |
170 | |||