Expanding test cases trying to figure out why key agent signatures don't match command line sigs.

3 files changed, 27 insertions, 5 deletions

diff --git a/keys.py b/keys.py
index 9b6b837..8d3a5b2 100644
--- a/keys.py
+++ b/keys.py
@@ -24,7 +24,7 @@ def load_public_key(key):
 
     if ktype == 'ssh-rsa':
         e, n = get_packed_mp_ints(remainder, 2)
-        return hawt.new_pub_key((e, n))
+        return RSA.new_pub_key((e, n))
     elif ktype == 'ssh-dss':
         p, q, g, y = get_packed_mp_ints(remainder, 4)
         return DSA.set_params(p, q, g)
diff --git a/ssh.py b/ssh.py
index 4b7e94c..b308f5e 100644
--- a/ssh.py
+++ b/ssh.py
@@ -8,14 +8,36 @@ SSH Key Signing
 
 Commands to sign and verify revisions with your
 ssh key.
+
+Ponder this, bitches:
+    http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/ssh/ssh-rsa.c
+    http://svn.osafoundation.org/m2crypto/trunk/SWIG/_rsa.i
 """
 
+from M2Crypto.RSA import RSAError
+
 from structutils import bytes_to_int
 from sshagent import SSHAgent
+from keys import load_private_key, load_public_key
+
+test_data = "Hello world!"
+public_key = "/Users/mcrute/.ssh/id_rsa.ag.pub"
+private_key = "/Users/mcrute/.ssh/id_rsa.ag"
 
-key = open('/Users/mcrute/.ssh/id_rsa.ag.pub').read()
+key = open(public_key).read()
 key = key.split()[1].decode('base64')
 
 agent = SSHAgent()
-signature = agent.sign("Hello world!", key)
+signature = agent.sign(test_data, key)
 print bytes_to_int(signature)
+
+
+try:
+    pub_key = load_public_key(open(public_key).read())
+    pub_key.verify(test_data, signature)
+    print "Signature matches"
+except RSAError:
+    print "Signature doesn't match"
+
+priv_key = load_private_key(private_key)
+print bytes_to_int(priv_key.sign(test_data))
diff --git a/sshagent.py b/sshagent.py
index 32dc2f4..8c310f4 100644
--- a/sshagent.py
+++ b/sshagent.py
@@ -75,6 +75,6 @@ class SSHAgent(object):
 
         _, remainder = unpack_int(response[1:])
         _, remainder = unpack_string(remainder)
-        response, _ = unpack_mp_int(remainder)
+        response, _ = unpack_string(remainder)
 
-        return int_to_bytes(response)
+        return response