fixed key generation, now the ed25519 key is derived from a seed

and the curve25519 key is derived from the ed25519 key. the encrypted
part now contains the ed25519 secret.

tests/key-bobby-pub

@@ -1,36 +1,36 @@
 ----- BEGIN PCP PUBLIC KEY -----
-  Generated by: Pretty Curved Privacy Version 0.1.2
+  Generated by: Pretty Curved Privacy Version 0.1.3
         Cipher: CURVE25519-ED25519-SALSA20-POLY1305
          Owner: Bobby
           Mail: bobby@local
-        Key-ID: 0x26C77B2A1548F4AB
-    Public-Key: 1o5q3y.SNnO!odQ<U>Y^yOu:0>lJIWQ@*rFJ*QQuwDhYg
- Creation Time: 2013-11-08T12:21:02
-      Checksum: D0:21:AA:87:7E:24:F5:A6:8F:FC:2A:21:14:04:57:99
-                30:D9:BD:35:D4:AF:F4:20:50:7D:72:DB:6D:6B:6F:21
- Serial Number: 0xB4410F61
+        Key-ID: 0x80F52DB08164A533
+    Public-Key: 1ibutw@MLx1y%B6nt5N-j1p9RrIJA!5?aMj/NV/DjPCDZ
+ Creation Time: 2013-11-10T14:24:46
+      Checksum: 17:D9:B5:1E:2B:B5:1E:9A:EE:01:68:CB:5E:E5:80:F0
+                49:80:62:61:F4:DB:D4:7F:05:67:92:73:60:63:86:A5
+ Serial Number: 0xEC29D88E
    Key Version: 0x00000002
  Random Art ID: +----------------+
-                |    .           |
-                |   . .          |
-                | .. .           |
-                |o..  ..         |
-                |.o  .  o.       |
-                |   .  ...       |
-                |   ...  ..      |
-                |   .o    ..     |
+                |      .   .     |
+                |       . = .    |
+                |        = *     |
+                |       o B .    |
+                |        = o     |
+                |       .        |
+                |                |
+                |                |
                 +----------------+
 
-1o5q3y.SNnO!odQ<U>Y^yOu:0>lJIWQ@*rFJ*QQuw-NU)7*y@CnN%qTNwEsQ8UI0JFzL5N]
-:[U5Ya%?E3QO=vvTd$h22]DXl8f6>aEy/#}]4:xH{$1bZv[7@dMPmEr^w$rCwm+{WwmPlHp
-y!/SI&//[fhw%2scogf$RsnHNm6*-XlZpR1vg8XIm<mamGE{YfPuSiz}Yyq0UzBRq!JdD%G
-kf<)!6xraTlRYybc!l=lIcsYY3C==2<{X2BWGy]NlOi@4DIR8m(/-w*//nS>RSkaTz(DYg7
-oG8QKemj%)6k[ic:U8QD]y?CND}xFUzGZ=>8}hBJl4@>^r?^AY#t[5Qn9g##I{XpbF5C2h[
-pD$R!=wRs>:JLbed^]$FOZ>N40Awpyu.#%h:sug:@Y(2CvSbZ+C%Dg:v{%fNE?/hR3GG0J*
-7cO=UnJR[J18xFS5}AI/GCjw-9mQ)GJFCotP4.!5qxn810i]1i&9WQw#[9]tgB{kuzKIorx
-^[xc2zU>X)I&s/tYoEplQ0FJre*M.p![>HZ>YF3CfJ(Prp8m+IQIeJTs(?JI&7@F}c*#61b
-12v!ysq}6L-?26>zTbVb@OZG^oXfM&m8dAdl}Qk^i<I5V9VziPt#87PD*twr+W.{8?9^CuM
-NZy7H69@rulO]&EKqlOgP7?CzGt{h^L)j1L)2UV[5FM$DealB>]nxtvW!p(@rZY)M#uXcf8
-)]C-BF3eM4hBxzZlny?Yh8EoZg^KCdKPkvY08!i^9SMfu0<>l7vfo-E^5H8:rEPW}IWMM)n
-9O]:9.h#9eg#3N+Nwg=(FZ!o&vjwh*@-/k:pP+l3Gn(Gar.6q(jT9C=nq*9Ee<lE
+1ibutw@MLx1y%B6nt5N-j1p9RrIJA!5?aMj/NV/Dj(4dT!OMC={yChgS9Bm:p*{/RW@&mq4
+hPA1/hb&6<3EV[vTd@IEDCn1gh?O*AO]Pp]T[*2/n#SSc:SPVDlb$h(:z6cmqt0DUIc(hU)
+IfufJgG1em4]/KdB$SF$R1fu0Uyj:AiYb-ET]kItj[a^i94(:P$G<oU^Ns14-<7Ni@gLn9n
+Qlb8//T4AA5jq.nHU:/B]Xo.u:6vP$NZ8:}D?i@%I?M0})0weS1AaFZ&b@7^S9Hy2eSWZG)
+U^{1AvdLExP+6MH9HE<de}3Y3DR>Wj!s!h9$7ve^NBsb)415Dj^Z9//]G*z=pA))x+{zp4<
+V4R37FSAuNYF@L!50FILb.ikdYR9QjY#[SCLuE6:WvoI8vSbZ+C%Dg:v{%fN-Ev6Bg.s8Se
+L&x#naZ8r7R@zd5j2DFn<w$2HY*F}]}Y&Y?GZaVE0TMi=nC!.X{]I6YnIaXBYKIbP(-omT!
+(U(Ae*77C7C>^WcqCB(F&2[C8d^lKzsEhXnpTH-s[RUK-b-Z7DKC)rQ@8=w1VnxG$6=^C.h
+(U3>LYD!!H<lUK?dzs5rb#wlUknk4gU+ov-whNrEM02u!%@hZtF[eR7{<0CgeDg+SR2-?$e
+u7Cy#]:Vhu&{@}siUdO013&:8adw.@ex-R}pXYDj(/D%PG)g[jtyB#?tIM3xtzVnw:1>3s^
++(ZbyD3yO]fH^]Pl{-N!f/y<Oh8v2*k(Z(+08!r69SMfu0{?w*JSQptIgg:z2mt:erb<@UA
+=>25y?Q=(YO^sy=Rgk$+#[GxtS&GB/mTh$(@bereI-eo*2pGrbaTSZWR^fTOD5S&
 ------ END PCP PUBLICKEY ------