changed key derivation function, using scrypt (from tarsnap) now instead of my own derivation function

tests/key-alicia-pub

@@ -3,33 +3,33 @@
         Cipher: CURVE25519-ED25519-SALSA20-POLY1305
          Owner: Alicia
           Mail: alicia@local
-        Key-ID: 0x518602BB8F2D8C7F
-    Public-Key: 1eRhFt(S$Aj[MWvNqYUgL(Mfpe86usIa9bvMwFc/7YTKo
- Creation Time: 2013-11-24T19:38:59
-      Checksum: 12:FE:CA:AD:09:3E:9F:2D:3D:3A:E8:8C:86:D5:75:58
-                C3:9C:5C:51:96:F7:1E:FA:0F:6D:75:1C:20:87:53:2D
- Serial Number: 0x49B690C5
+        Key-ID: 0xD65571D97AD62340
+    Public-Key: 1l04k^wOno{Gb/vuQ@vq^q=3h<mkwPg6au>[0lL#CMmZz
+ Creation Time: 2014-01-16T15:23:17
+      Checksum: 74:02:7B:F0:14:A6:05:D4:01:C2:B1:65:8B:5A:97:97
+                CD:B6:8A:8F:32:A4:8C:40:B7:0C:28:C6:87:8D:28:F4
+ Serial Number: 0x8F3E4F43
    Key Version: 0x00000004
  Random Art ID: +----------------+
-                |        .       |
-                |     . . .      |
-                |      o   o     |
-                |     .   + .   .|
-                |      . =   . +o|
-                |       . .   o +|
-                |              . |
                 |                |
+                |                |
+                |        .       |
+                | .     + .      |
+                |. . . o + .     |
+                |.  . o o +      |
+                |. . . o . .     |
+                | . .            |
                 +----------------+
 
-1eRhFt(S$Aj[MWvNqYUgL(Mfpe86usIa9bvMwFc/7^R<>]u#!:jIb>^+HObot$n)mmc+r:n
-}14[Zcddn*^b:<v}/uKAjgTDFi}ApL/jtC[47Yg8Rx#$)%tEdZp-Utr0(jI[%%jWp)pt0u+
-ys-SF.j-oM(RKNiE:#[v*Bj+8&JH2rQ3EBCDs*J<U)sgcm[(7&=<3x/T:xEi6!Vz-#=C>:?
-%SZKTmRJYshko/&>x<*o77i[XM3W^-(OEt>6IvJkr]D<&D4cN?z.&Gl//X/D[KsAOUwlMLz
-fCSdcJ@a>wDHDFwj@M!RyQo.OT5jB0C5^&1J[>}d5bBR}lYwK+rlZfP&yme.D}}vxg6SW^U
-U$(/JeTC(w6t.*v9LxYl>7kQ^W)!sN5pBP+P(eVO)5Wu7vqGT/x<<nyz!0i(06bWS5^dXUT
-(DC.Y]e*d]r^yB>4zpJbh{}Smh5R?}42cWM@YOy+P2$/+Z#d=11b)8u]L[rh]7!DJglxt=-
-E=o)OI1s)g(rbpa8I{AJKG[nkxhVzf(j}!tgtaLm7t]B-<xSdHrqbQzOFJFhW%Y@^q-/})F
-iDJMM}@oSyNeIy=e#MrKPF-:M@TZ2D05hhG]LMB/p{h<E@UpM]]@>3=tBMsTL$Q27$%n+wm
-72<g62jV:ZR&Ry&IxL)P]zK?r%I@:${D<z>F):2ctn)*?IOe64&^>h={:UX7fKdj{myaS[o
-l>o*<]dLqBf/R6Bgd1q!mLWv>lPmEm0@@r308!$I.VfVp1wc4--q/(r
+1l04k^wOno{Gb/vuQ@vq^q=3h<mkwPg6au>[0lL#C*QCMc(0^V-{1V339HHb]:?T-F)}&&A
+n::om#4.IaWG{Uv}/uKG.c8VB$!TzGR$o(cxJ{Wd[.in&DkPZwBPVu>Yt>Q?TU0jq1P&y-K
+t/R).!(vf5jS6&8Vlf6*p7rKi767MvB=*-:sDy+NxI}(gG2=]pCV%d1$n.lFFa]t7J9PQ{3
+>nZHNW0l(Srib%(INR!w.l^?}r=cq3DHlTj-FmkGd67@S@!41d^bV1OE}FbEfz/@?r3-@.4
+=YJ!]6Tf6Vu@bJ{c@zCJje:(y<ZEZb7a@NQ+u]}5Ra?Ju]c&4F2&:wwK+J8nJB9jxeltbaO
+GdZ]3(nlOZHdz9(T6(c:qo*#Tptw}.g5vBdWEL^W!2TDGvqGT/x<<nyz!0i(05/!N67=rFb
+2b<&j{YVd=aOHgnOC:.>0a+@pZ{MOW<nj?(nu=<hYeeSCYhp7mC#a@omS.>[-CpCHShNBOA
+:PxEvD^xauUrzZ9QvB7Fl2OM1h&FzWJ9m&S$7!eNnfJO2>oBH7iua7k@EZ=.RqE3HV9BAc9
+v+0{hpfRAA8@K]nwPMhI}eVPa(fRtZ@3?ugeUfyRd]^bYQ[?n>HxuuKLJTVrxpuf*ARnTLd
+Zj[O(>.7/g*mhTAqV-waQ8OG*?xR7W#/-SU=Zr$E>R:!c%8i2qF0>k>:E{Pb1ekc3ABHu0q
+xN3y9/NdE5hz)uJf*[2Xk$0Q^gC*==0@@r308?Cmrr9101DL-xlJv8^
 ------ END PCP PUBLICKEY ------