WIP: cv25519 & ed25519 support.

1 files changed, 10 insertions, 9 deletions

diff --git a/Data/OpenPGP.hs b/Data/OpenPGP.hs
index a297c34..35298c8 100644
--- a/Data/OpenPGP.hs
+++ b/Data/OpenPGP.hs
@@ -344,9 +344,9 @@ public_key_fields RSA_E   = public_key_fields RSA
 public_key_fields RSA_S   = public_key_fields RSA
 public_key_fields ELGAMAL = ['p', 'g', 'y']
 public_key_fields DSA     = ['p', 'q', 'g', 'y']
-public_key_fields ECDSA   = ['c','l','x', 'y'] -- TODO: These probably need special fingerprint handling.
-public_key_fields Ed25519 = ['c','l','x', 'y'] -- TODO: These probably need special fingerprint handling.
-public_key_fields ECC     = ['c','l','x', 'y'] -- TODO: These probably need special fingerprint handling.
+public_key_fields ECDSA   = ['c','l','x', 'y', 'f']
+public_key_fields Ed25519 = ['c','l','x', 'y', 'f']
+public_key_fields ECC     = ['c','l','x', 'y', 'f']
 public_key_fields alg     = error ("Unknown key fields for "++show alg) -- Nothing in the spec. Maybe empty
 
 -- http://tools.ietf.org/html/rfc4880#section-5.5.3
@@ -420,17 +420,18 @@ eccOID SecretKeyPacket { key = k } = lookup 'c' k >>= \(MPI oid) -> Just (snd $
 eccOID _ = Nothing
 
 encode_public_key_material :: Packet -> [B.ByteString]
-encode_public_key_material k | key_algorithm k == ECDSA  = do
+encode_public_key_material k | key_algorithm k `elem` [ECDSA,Ed25519]  = do
     -- http://tools.ietf.org/html/rfc6637
     c <- maybeToList $ lookup 'c' (key k)
     MPI l <- maybeToList $ lookup 'l' (key k)
     MPI x <- maybeToList $ lookup 'x' (key k)
     MPI y <- maybeToList $ lookup 'y' (key k)
+    MPI flag <- maybeToList $ lookup 'f' (key k)
     let (bitlen,oid) = B.splitAt 2 (encode c)
         len16 = decode bitlen :: Word16
         (fullbytes,rembits) = len16 `quotRem` 8
         len8 = fromIntegral (fullbytes + if rembits/=0 then 1 else 0) :: Word8
-        xy = 4*(4^l) + x*(2^l) + y
+        xy = flag*(4^l) + x*(2^l) + y -- flag could be 0x04 or 0x40
     [ len8 `B.cons` oid, encode (MPI xy) ]
 encode_public_key_material k = map (encode . (key k !)) (public_key_fields $ key_algorithm k)
 
@@ -445,9 +446,9 @@ decode_public_key_material algorithm | algorithm `elem` [ECDSA, Ed25519] = do
     let integerBytesize i = fromIntegral $ LZ.length (encode (MPI i)) - 2
         width = ( integerBytesize xy - 1 ) `div` 2
         (fx,y) = xy `quotRem` (256^width)
-        x = fx `rem` (256^width)
+        (flag,x) = fx `quotRem` (256^width)
         l = width*8
-    return [('c',oid), ('l',MPI l), ('x',MPI x), ('y',MPI y)]
+    return [('c',oid), ('l',MPI l), ('x',MPI x), ('y',MPI y), ('f',MPI flag)]
 decode_public_key_material ECC = do
     -- http://tools.ietf.org/html/rfc6637 (9) Algorithm-Specific Fields for ECDH keys:
     oidlen <- get :: Get Word8
@@ -462,9 +463,9 @@ decode_public_key_material ECC = do
     let integerBytesize i = fromIntegral $ LZ.length (encode (MPI i)) - 2
         width = ( integerBytesize xy - 1 ) `div` 2
         (fx,y) = xy `quotRem` (256^width)
-        x = fx `rem` (256^width)
+        (flag,x) = fx `quotRem` (256^width)
         l = width*8
-    return [('c',oid), ('l',MPI l), ('x',MPI x), ('y',MPI y)]
+    return [('c',oid), ('l',MPI l), ('x',MPI x), ('y',MPI y), ('f',MPI flag)]
 decode_public_key_material algorithm = mapM (\f -> fmap ((,)f) get) (public_key_fields algorithm)
 
 put_packet :: Packet -> (B.ByteString, Word8)