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-alicia-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: Alicia
           Mail: alicia@local
-        Key-ID: 0x244407F39FFA0333
-    Public-Key: 0$V[6<mc=m[dKuF8s9&RBd#W/(KA/%zRZr./5.1Ef-RgN
- Creation Time: 2013-11-08T12:21:02
-      Checksum: 54:43:8B:3B:C3:65:21:9F:A5:EB:19:24:07:AB:D3:94
-                55:31:97:EC:0C:09:81:5C:C6:C9:EE:C4:A8:41:25:06
- Serial Number: 0x0C8363E0
+        Key-ID: 0xD5F2E247E527F925
+    Public-Key: 1dO5d*+#bkj0vJNuNQxo&T}daphtuDw^?27XbA02z2:Lo
+ Creation Time: 2013-11-10T14:24:46
+      Checksum: 51:A1:DA:B4:3C:47:6E:4B:58:8A:44:69:53:38:A3:43
+                1A:C1:C6:A1:64:89:ED:0E:AF:C7:7A:E5:C7:FB:85:EF
+ Serial Number: 0xF7C8BC9E
    Key Version: 0x00000002
  Random Art ID: +----------------+
-                |      ..        |
-                |    . *.        |
-                |     +.B .      |
-                |      o.+ +     |
-                |        .o .    |
                 |                |
                 |                |
                 |                |
+                |                |
+                |    .   .       |
+                |     o . = .    |
+                |    o . *.=     |
+                |     . .o=..    |
                 +----------------+
 
-0$V[6<mc=m[dKuF8s9&RBd#W/(KA/%zRZr./5.1Eg01WH@(Mc=uV-!$kxB/j+yM?O^EvfwN
-R@+wyWB3sJ6Rn]v}/uKwGw=UC5ymsefA3:oG}4RdJ^tzaZ4H=ZK(g&+=K4(y$}52S+AX6dC
-8KlJrjE!(=b*w=v63F{d?iz6zdzm)D>fC^ReqE.x^boltZnM&lG{$nzLg+<Q1%tV?n@V6h.
-/vl{cxH4m%bVcBD.QL8#kO4vRta(@lJV=!cYjc&rr/a@*ve4=:I5btckwNiyE<qv)OP6]L.
-{5Rigem^seRXp>j*9V6KOz!oMpTbZWvu+((u^kOw!r!op(7HzqmM1zdKJ=t5}unHbEB8.1X
-cqgBIm3u)<LpZQR)vU+(5=&+XIr4])mz3OQ/4)[jpHiB:vqGT/x<<nyz!0i(0f.*Ix2i<T5
--Tm!<>V+dlI:yGMkn-oD30u299n<msI%q4PVdUu6+(!.*{S.(?*Gi:Yj?9S8m>sVFpg91.*
-IWdE>]^h[fvo@Xhva&MYwdct02wrdA[xJn6h]m<CZNDM9v0j=M3?3gqIbGqgEJCJg74NZ96
-<tP{A%eJ0)k@BFU98iPd639c$cF=Fphs5V^}q0e6omVTZS^@8CG{($#Un@m&g1+wj@E}[5S
-%/S=i4=pQ4[:^IxknCKUQC.>xlmxUiofNKt-osOtoE@*A3CF1z&VnAeu(7d7I>{R>Vu8YRE
-xP2X4au{F]g=d3yh+2O-mN/V$gCZ/!WeZgb08!i^9SMfu0T%Y>?#+!4q)TCm:w?gthgI#C*
-uAwuou4r<pq5sbrgrIcA*<FgGl!q&da4$6)EKB}RV[u-V9(W1^t(+*airR1i@/lX
+1dO5d*+#bkj0vJNuNQxo&T}daphtuDw^?27XbA02zqh<9Otx^7nQ)i?^}@>>O7va7zVWbC]
+==4ds.SPlT3HMov}/uKjG(9PFKZ#0bxXY9ikVC1Vj=rJ2x]WB=FVbYKaI$ZqR)W$MFrUgYB
+nTZ[eMC!NPQcYtZQpVSfRMBgY>2dZAL?[rMVVKuOj+tF5=bOEpR=<@dV<Qur.h4++rU%i6O
+1^s!g0FT^3z>ls=Nvu.GxAEi%cjEK2d*^w=dN:?/!Z{b(bCuB@!U8pDs-[zxTCcjM:9=1VP
+2BR@6ZIuv)v!=FH*!vh1Xu82c?UDR]nIrYi-<OD)$AnoSJ(rlqvm^{k=vl!7&:KK+g3i6v0
+CrEd$2E>Y{>.9vt](x^P}q(bf&em34)TYgBacIl4oA8n6vqGT/x<<nyz!0i(0oH+e*@g3/-
+GE(M[rzo4-{cl9^uI7uH-rIt4jB+/]&AcFa*qn}s-W/AA*h(bI9=:wjjA{N()UPzE755CCa
+-qNUY4j?3%yo+-k^<5f<Ta%vcxO?}bX0T&wG89]JaTaFe&njD^(tU5G4N}tpf>$zUOv>G2E
+]Ls})!aN47]1tg=>$N)+=4TrMAicEk)bS5ARyrD6[oIwc6:?^^kNMwE[sMAI^k7ZM[P0Ru0
+m:})s*:3)=.XTGv22aW-04j?-.evZd%j:gd8n$hQPRstGfr^S+)^2s(?S[AR7.zBP7[>]18
+rQ{C3/oEZKhaxt&gbH{Uh8m9WiwJC(aohxw08!r69SMfu0@6^GO=!+-*en&SNdU3QP<ipTQ
+er*oE#7r@u34s@tdu+%r6aR+FN5{$JL3ppBGaL^t+0oKC[w#mY[erBP$M1A3&*nc
 ------ END PCP PUBLICKEY ------