From d0b48313deacade1373b0aa395dbbaba74524190 Mon Sep 17 00:00:00 2001
From: Philip C Monk <philip.monk@tlon.io>
Date: Fri, 9 Jan 2015 17:11:43 -0500
Subject: [PATCH 01/24] waypoint

---
 j/e/lore.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/j/e/lore.c b/j/e/lore.c
index 5d4270cfe..a609ac561 100644
--- a/j/e/lore.c
+++ b/j/e/lore.c
@@ -20,7 +20,7 @@
       } else {
         meg_w = 0;
 
-	c3_y byt_y;
+        c3_y byt_y;
         while ( 1 ) {
           byt_y = u3r_byte(pos_w + meg_w, lub);
 
@@ -30,8 +30,8 @@
         }
 
         if ((byt_y == 0) && ((pos_w + meg_w + 1) < len_w)) {
-	  return u3m_bail(c3__exit);
-	}
+          return u3m_bail(c3__exit);
+        }
 
         {
           c3_y* byts_y = alloca(meg_w);

From 94138294d03b5492b11d564f6b2fdf2f685ec377 Mon Sep 17 00:00:00 2001
From: Philip C Monk <philip.monk@tlon.io>
Date: Tue, 13 Jan 2015 20:58:25 -0500
Subject: [PATCH 02/24] boots now (sort of)

---
 i/c/motes.h |  2 ++
 v/unix.c    | 25 +++++++++++++++++++++----
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/i/c/motes.h b/i/c/motes.h
index 5c86c8e81..f88680ea9 100644
--- a/i/c/motes.h
+++ b/i/c/motes.h
@@ -666,6 +666,7 @@
 #   define c3__met    c3_s3('m','e','t')
 #   define c3__meta   c3_s4('m','e','t','a')
 #   define c3__mill   c3_s4('m','i','l','l')
+#   define c3__mime   c3_s4('m','i','m','e')
 #   define c3__mine   c3_s4('m','i','n','e')
 #   define c3__mint   c3_s4('m','i','n','t')
 #   define c3__mirt   c3_s4('m','i','r','t')
@@ -1005,6 +1006,7 @@
 #   define c3__tank   c3_s4('t','a','n','k')
 #   define c3__tap    c3_s3('t','a','p')
 #   define c3__tarn   c3_s4('t','a','r','n')
+#   define c3__tas    c3_s3('t','a','s')
 #   define c3__tash   c3_s4('t','a','s','h')
 #   define c3__teal   c3_s4('t','e','a','l')
 #   define c3__teck   c3_s4('t','e','c','k')
diff --git a/v/unix.c b/v/unix.c
index a66ed8e6e..cb0c5a5b8 100644
--- a/v/unix.c
+++ b/v/unix.c
@@ -631,7 +631,7 @@ _unix_load(c3_c* pax_c)
     return 0;
   }
   fln_w = buf_u.st_size;
-  pad_y = c3_malloc(buf_u.st_size);
+  pad_y = c3_malloc(fln_w);
 
   red_w = read(fid_i, pad_y, fln_w);
   close(fid_i);
@@ -642,10 +642,24 @@ _unix_load(c3_c* pax_c)
     return 0;
   }
   else {
-    u3_noun pad = u3i_bytes(fln_w, (c3_y *)pad_y);
+    //  -:!>(*[[@tas @tas ~] @ud @])
+    u3_noun typ = u3nt(c3__cell,
+                      u3nt(c3__cell,
+                           u3nc(c3__atom, c3__tas),
+                           u3nt(c3__cell,
+                                u3nc(c3__atom, c3__tas),
+                                u3nt(c3__cube,
+                                     u3_nul,
+                                     u3nc(c3__atom, 'n')))),
+                      u3nt(c3__cell,
+                           u3nc(c3__atom, c3__ud),
+                           u3nc(c3__atom, u3_nul)));
+    u3_noun nam = u3nt(c3__text, u3i_string("plain"), u3_nul);
+    u3_noun pad = u3nt(nam, fln_w, u3i_bytes(fln_w, (c3_y *)pad_y));
+    u3_noun cay = u3nt(c3__mime, typ, pad);
     free(pad_y);
 
-    return pad;
+    return cay;
   }
 }
 
@@ -683,12 +697,15 @@ _unix_save(c3_c* pax_c, u3_atom oat)
 static u3_noun
 _unix_file_load(u3_ufil* fil_u)
 {
-  u3_noun raw = _unix_load(fil_u->pax_c);
+  return _unix_load(fil_u->pax_c);
 
+#if 0
   if ( (0 == raw) || ('^' != fil_u->dot_c[1]) ) {
     return raw;
   }
+
   else return u3ke_cue(raw);
+#endif
 }
 
 

From ba4f951dfd8632831d7d6f079061b906b6287151 Mon Sep 17 00:00:00 2001
From: Philip C Monk <philip.monk@tlon.io>
Date: Wed, 14 Jan 2015 19:01:59 -0500
Subject: [PATCH 03/24] boots to terminal, then hangs

---
 v/unix.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/v/unix.c b/v/unix.c
index cb0c5a5b8..762758eaa 100644
--- a/v/unix.c
+++ b/v/unix.c
@@ -1005,9 +1005,9 @@ _unix_desk_sync_into(u3_noun  who,
   xun = _unix_dir_ankh(dir_u);
   bur = _unix_desk_peek(hox, u3k(syd), u3k(u3A->wen));
 
-  if ( (c3n == u3r_sing(u3h(xun), u3h(bur))))
+  if ( (c3n == u3r_sing(u3h(xun), u3h(u3t(bur)))))
   {
-    doz = u3dc("cost", xun, bur);
+    doz = u3dc("cost", xun, u3t(bur));
 
     pax = u3nq(u3_blip, c3__sync, u3k(u3A->sen), u3_nul);
     fav = u3nq(c3__into, who, syd, u3nc(c3y, doz));

From 938e01bc000f7faba4a23abd31ea9efa35d3d027 Mon Sep 17 00:00:00 2001
From: Philip C Monk <philip.monk@tlon.io>
Date: Thu, 15 Jan 2015 15:57:13 -0500
Subject: [PATCH 04/24] waypoint

---
 v/unix.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/v/unix.c b/v/unix.c
index 762758eaa..d9461da8e 100644
--- a/v/unix.c
+++ b/v/unix.c
@@ -856,7 +856,7 @@ _unix_dir_ankh(u3_udir* dir_u)
         continue;
       }
       u3_noun baw = _unix_file_load(fil_u);
-      u3_noun woz = u3nt(u3_nul, u3do("sham", u3k(baw)), baw);
+      u3_noun woz = u3nt(u3_nul, u3do("sham", u3k(u3t(u3t(baw)))), baw);
       u3z(dur);
       pam = _unix_dir_ankh_file(pam, u3k(u3t(wib)), baw, woz);
       u3z(wib);
@@ -866,7 +866,7 @@ _unix_dir_ankh(u3_udir* dir_u)
   for ( fil_u = dir_u->fil_u; fil_u; fil_u = fil_u->nex_u ) {
     u3_noun wib = _unix_file_name(fil_u);
     u3_noun baw = _unix_file_load(fil_u);
-    u3_noun woz = u3nt(u3_nul, u3do("sham", u3k(baw)), baw);
+    u3_noun woz = u3nt(u3_nul, u3do("sham", u3k(u3t(u3t(baw)))), baw);
     pam = _unix_dir_ankh_file(pam, wib, baw, woz);
   }
   return u3do("cosh", u3nt(0, u3_nul, pam));

From 75c66474757b94d6704995f9a907a12e6b03816c Mon Sep 17 00:00:00 2001
From: Philip C Monk <philip.monk@tlon.io>
Date: Wed, 21 Jan 2015 20:47:49 -0500
Subject: [PATCH 05/24] boots again

---
 v/unix.c | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/v/unix.c b/v/unix.c
index d9461da8e..5c7343e0f 100644
--- a/v/unix.c
+++ b/v/unix.c
@@ -1000,23 +1000,14 @@ _unix_desk_sync_into(u3_noun  who,
                      u3_noun  syd,
                      u3_udir* dir_u)
 {
-  u3_noun xun, bur, doz, fav, pax;
+  u3_noun xun, fav, pax;
 
   xun = _unix_dir_ankh(dir_u);
-  bur = _unix_desk_peek(hox, u3k(syd), u3k(u3A->wen));
 
-  if ( (c3n == u3r_sing(u3h(xun), u3h(u3t(bur)))))
-  {
-    doz = u3dc("cost", xun, u3t(bur));
+  pax = u3nq(u3_blip, c3__sync, u3k(u3A->sen), u3_nul);
+  fav = u3nq(c3__into, who, syd, xun);
 
-    pax = u3nq(u3_blip, c3__sync, u3k(u3A->sen), u3_nul);
-    fav = u3nq(c3__into, who, syd, u3nc(c3y, doz));
-
-    u3v_plan(pax, fav);
-  }
-  else {
-    u3z(who); u3z(syd); u3z(xun); u3z(bur);
-  }
+  u3v_plan(pax, fav);
 }
 
 /* _unix_ship_update(): update top level ship.

From a1ef36e02dd061896253b2bf2b25c196fd4906ae Mon Sep 17 00:00:00 2001
From: Philip C Monk <philip.monk@tlon.io>
Date: Fri, 23 Jan 2015 19:13:29 -0500
Subject: [PATCH 06/24] start in/out split

---
 i/v/vere.h |  9 +++++----
 v/sist.c   | 10 +++++++++-
 v/unix.c   | 34 +++++++++++++++++++++++++++++++---
 3 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/i/v/vere.h b/i/v/vere.h
index c43e60bc1..d707b9cc5 100644
--- a/i/v/vere.h
+++ b/i/v/vere.h
@@ -294,7 +294,7 @@
       struct _u3_udir;
       struct _u3_ufil;
 
-    /* u3_unod: file or directory.
+    /* u3_unod: in-file or in-directory.
     */
       typedef struct _u3_unod {
         uv_fs_event_t    was_u;             //  stat watcher
@@ -304,7 +304,7 @@
         struct _u3_udir* par_u;             //  in directory
       } u3_unod;
 
-    /* u3_ufil: synchronized file.
+    /* u3_ufil: synchronized in-file.
     */
       typedef struct _u3_ufil {
         uv_fs_event_t    was_u;             //  stat watcher
@@ -317,7 +317,7 @@
         struct _u3_ufil* nex_u;             //  internal list
       } u3_ufil;
 
-    /* u3_udir: synchronized directory.
+    /* u3_udir: synchronized in-directory.
     */
       typedef struct _u3_udir {
         uv_fs_event_t    was_u;             //  stat watcher
@@ -333,7 +333,8 @@
     /* u3_uhot: synchronized host.
     */
       typedef struct _u3_uhot {
-        u3_udir          dir_u;             //  root directory
+        u3_udir          dir_u;             //  in directory
+        c3_c*            dot_u;             //  out directory
         c3_w             who_w[4];          //  owner as words
         struct _u3_uhot* nex_u;             //  internal list
       } u3_uhot;
diff --git a/v/sist.c b/v/sist.c
index 54beee180..481861dd1 100644
--- a/v/sist.c
+++ b/v/sist.c
@@ -276,6 +276,7 @@ _sist_sing(u3_noun ovo)
 static void
 _sist_home()
 {
+  c3_c    mak_c[2048];
   c3_c    ful_c[2048];
 
   //  Create subdirectories.
@@ -321,7 +322,14 @@ _sist_home()
   //  Copy zod files, if we're generating a carrier.
   //
   if ( u3_Host.ops_u.imp_c ) {
-    snprintf(ful_c, 2048, "cp -r %s/zod %s/%s",
+    snprintf(mak_c, 2048, "mkdir %s/%s",
+                    u3_Host.dir_c, u3_Host.ops_u.imp_c+1);
+    printf("%s\r\n", mak_c);
+    if ( 0 != system(mak_c) ) {
+      uL(fprintf(uH, "could not %s\n", mak_c));
+      u3_lo_bail();
+    }
+    snprintf(ful_c, 2048, "cp -r %s/zod %s/%s/in",
                     U3_LIB, u3_Host.dir_c, u3_Host.ops_u.imp_c+1);
     printf("%s\r\n", ful_c);
     if ( 0 != system(ful_c) ) {
diff --git a/v/unix.c b/v/unix.c
index 5c7343e0f..495ced8f8 100644
--- a/v/unix.c
+++ b/v/unix.c
@@ -1046,7 +1046,13 @@ _unix_hot_gain(u3_noun who, u3_noun mek)
   u3_noun hox = u3dc("scot", 'p', u3k(who));
   c3_c*   hox_c = u3r_string(hox);
   c3_c*   pax_c = _unix_down(u3_Host.dir_c, hox_c + 1);
+  c3_c*   pin_c = _unix_down(pax_c, "in");
+  c3_c*   pot_c = _unix_down(pax_c, "out");
   DIR*    rid_u = opendir(pax_c);
+  DIR*    rin_u = opendir(pin_c);
+  DIR*    rot_u = opendir(pot_c);
+
+  free(pax_c);
 
   if ( !rid_u ) {
     if ( c3y == mek ) {
@@ -1057,17 +1063,38 @@ _unix_hot_gain(u3_noun who, u3_noun mek)
       return;
     }
   } else closedir(rid_u);
+  if ( !rin_u ) {
+    if ( c3y == mek ) {
+      _unix_mkdir(pin_c);
+    } else {
+      u3z(who);
+      u3z(hox);
+      return;
+    }
+  } else closedir(rin_u);
+  if ( !rot_u ) {
+    if ( c3y == mek ) {
+      _unix_mkdir(pot_c);
+    } else {
+      u3z(who);
+      u3z(hox);
+      return;
+    }
+  } else closedir(rot_u);
 
   // uL(fprintf(uH, "GAIN %s\n", pax_c));
 
   free(hox_c);
   u3z(hox);
-  u3_unix_acquire(pax_c);
+  u3_unix_acquire(pin_c);
 
   {
     u3_uhot* hot_u = c3_malloc(sizeof(u3_uhot));
 
-    _unix_dir_watch(&hot_u->dir_u, 0, pax_c);
+    _unix_dir_watch(&hot_u->dir_u, 0, pin_c);
+
+    hot_u->dot_u = pot_c;
+
     _unix_ship_out(who, hot_u->who_w);
     u3z(who);
 
@@ -1334,7 +1361,7 @@ u3_unix_ef_init(u3_noun who)
   u3v_plan(u3nq(u3_blip, c3__sync, u3k(u3A->sen), u3_nul),
              u3nq(c3__into, who,
                             u3_blip,
-                            u3nt(c3y, u3nc(0, 0), u3_nul)));
+                            u3nt(u3_nul, u3_nul, u3_nul)));
 }
 
 /* u3_unix_ef_ergo(): update filesystem, outbound.
@@ -1411,6 +1438,7 @@ u3_unix_ef_look(void)
         // uL(fprintf(uH, "sync: lose %s\n", hot_u->dir_u.pax_c));
         _unix_hot_lose(hot_u);
 
+        free(hot_u->dot_u);
         free(hot_u);
         continue;
       }

From ab09e78a11a47fc41e5c956460fbb86fe268d1c1 Mon Sep 17 00:00:00 2001
From: Philip C Monk <philip.monk@tlon.io>
Date: Tue, 27 Jan 2015 19:57:24 -0500
Subject: [PATCH 07/24] waypoint

---
 i/v/vere.h | 14 ++++++------
 v/unix.c   | 63 +++++++++++++++++++++++++++++++++++-------------------
 2 files changed, 49 insertions(+), 28 deletions(-)

diff --git a/i/v/vere.h b/i/v/vere.h
index d707b9cc5..b3f85096f 100644
--- a/i/v/vere.h
+++ b/i/v/vere.h
@@ -300,8 +300,9 @@
         uv_fs_event_t    was_u;             //  stat watcher
         c3_o             dir;               //  always
         c3_o             dry;               //  ie, unmodified
-        c3_c*            pax_c;             //  absolute path
-        struct _u3_udir* par_u;             //  in directory
+        c3_c*            pax_c;             //  in absolute path
+        c3_c*            pot_c;             //  out absolute path
+        struct _u3_udir* par_u;             //  directory
       } u3_unod;
 
     /* u3_ufil: synchronized in-file.
@@ -310,8 +311,9 @@
         uv_fs_event_t    was_u;             //  stat watcher
         c3_o             non;               //  always u3_no
         c3_o             dry;               //  ie, unmodified
-        c3_c*            pax_c;             //  absolute path
-        struct _u3_udir* par_u;             //  in directory
+        c3_c*            pax_c;             //  in absolute path
+        c3_c*            pot_c;             //  out absolute path
+        struct _u3_udir* par_u;             //  directory
         c3_c*            dot_c;             //  extension point or 0
         c3_w             mod_w[4];          //  mtime
         struct _u3_ufil* nex_u;             //  internal list
@@ -323,7 +325,8 @@
         uv_fs_event_t    was_u;             //  stat watcher
         c3_o             yes;               //  always u3_yes
         c3_o             dry;               //  ie, unmodified
-        c3_c*            pax_c;             //  absolute path
+        c3_c*            pax_c;             //  in absolute path
+        c3_c*            pot_c;             //  out absolute path
         struct _u3_udir* par_u;             //  parent directory
         struct _u3_udir* dis_u;             //  subdirectories
         struct _u3_ufil* fil_u;             //  files
@@ -334,7 +337,6 @@
     */
       typedef struct _u3_uhot {
         u3_udir          dir_u;             //  in directory
-        c3_c*            dot_u;             //  out directory
         c3_w             who_w[4];          //  owner as words
         struct _u3_uhot* nex_u;             //  internal list
       } u3_uhot;
diff --git a/v/unix.c b/v/unix.c
index 495ced8f8..99fc2edb7 100644
--- a/v/unix.c
+++ b/v/unix.c
@@ -249,6 +249,7 @@ static void
 _unix_file_watch(u3_ufil* fil_u,
                  u3_udir* dir_u,
                  c3_c*    pax_c,
+                 c3_c*    pot_c,
                  c3_w*    mod_w)
 {
   // (1) build data structure
@@ -256,6 +257,7 @@ _unix_file_watch(u3_ufil* fil_u,
   fil_u->non = c3n;
   fil_u->dry = c3n;
   fil_u->pax_c = pax_c;
+  fil_u->pot_c = pot_c;
   {
     c3_c* dot_c = strrchr(pax_c, '.');
     c3_c* fas_c = strrchr(pax_c, '/');
@@ -297,45 +299,46 @@ _unix_file_watch(u3_ufil* fil_u,
 /* _unix_file_form(): form a filename path downward.
 */
 static c3_c*
-_unix_file_form(u3_udir* dir_u,
+_unix_file_form(c3_c* pax_c,
                 u3_noun  pre,
                 u3_noun  ket,
                 u3_noun  ext)
 {
   c3_c* pre_c = u3r_string(pre);
   c3_c* ext_c = u3r_string(ext);
-  c3_w  pax_w = strlen(dir_u->pax_c);
+  c3_w  pax_w = strlen(pax_c);
   c3_w  pre_w = strlen(pre_c);
   c3_w  ext_w = strlen(ext_c);
   c3_w  ket_w = (c3y == ket) ? 1 : 0;
-  c3_c* pax_c = c3_malloc(pax_w + 1 + pre_w + 1 + ket_w + ext_w + 1);
+  c3_c* pox_c = c3_malloc(pax_w + 1 + pre_w + 1 + ket_w + ext_w + 1);
 
-  strncpy(pax_c, dir_u->pax_c, pax_w);
-  pax_c[pax_w] = '/';
-  strncpy(pax_c + pax_w + 1, pre_c, pre_w);
-  pax_c[pax_w + 1 + pre_w] = '.';
+  strncpy(pox_c, pax_c, pax_w);
+  pox_c[pax_w] = '/';
+  strncpy(pox_c + pax_w + 1, pre_c, pre_w);
+  pox_c[pax_w + 1 + pre_w] = '.';
   if ( c3y == ket ) {
-    pax_c[pax_w + 1 + pre_w + 1] = '^';
+    pox_c[pax_w + 1 + pre_w + 1] = '^';
   }
-  strncpy(pax_c + pax_w + 1 + pre_w + 1 + ket_w, ext_c, ext_w);
-  pax_c[pax_w + 1 + pre_w + 1 + ket_w + ext_w] = '\0';
+  strncpy(pox_c + pax_w + 1 + pre_w + 1 + ket_w, ext_c, ext_w);
+  pox_c[pax_w + 1 + pre_w + 1 + ket_w + ext_w] = '\0';
 
   free(pre_c); free(ext_c);
   u3z(pre); u3z(ext);
 
-  return pax_c;
+  return pox_c;
 }
 
 /* _unix_dir_watch(): instantiate directory tracker.
 */
 static void
-_unix_dir_watch(u3_udir* dir_u, u3_udir* par_u, c3_c* pax_c)
+_unix_dir_watch(u3_udir* dir_u, u3_udir* par_u, c3_c* pax_c, c3_c* pot_c)
 {
   // (1) build data structure
   //
   dir_u->yes = c3y;
   dir_u->dry = c3n;
   dir_u->pax_c = pax_c;
+  dir_u->pot_c = pot_c;
   dir_u->par_u = par_u;
   dir_u->dis_u = 0;
   dir_u->fil_u = 0;
@@ -372,17 +375,24 @@ _unix_dir_forge(u3_udir* dir_u, u3_udir* par_u, u3_noun tet)
   c3_w  pax_w = strlen(par_u->pax_c);
   c3_w  tet_w = strlen(tet_c);
   c3_c* pax_c = c3_malloc(pax_w + 1 + tet_w + 1);
+  c3_c* pot_c = c3_malloc(pax_w + 1 + 1 + tet_w + 1);
 
   strncpy(pax_c, par_u->pax_c, pax_w + 1);
   pax_c[pax_w] = '/';
   strncpy(pax_c + pax_w + 1, tet_c, tet_w + 1);
   pax_c[pax_w + tet_w + 1] = '\0';
 
+  strncpy(pot_c, par_u->pot_c, pax_w + 1 + 1);
+  pot_c[pax_w + 1] = '/';
+  strncpy(pot_c + pax_w + 1 + 1, tet_c, tet_w + 1);
+  pot_c[pax_w + 1 + tet_w + 1] = '\0';
+
   free(tet_c);
   u3z(tet);
 
   _unix_mkdir(pax_c);
-  _unix_dir_watch(dir_u, par_u, pax_c);
+  _unix_mkdir(pot_c);
+  _unix_dir_watch(dir_u, par_u, pax_c, pot_c);
 }
 
 /* _unix_file_done(): finish freeing file.
@@ -544,11 +554,13 @@ _unix_dir_update(u3_udir* dir_u, DIR* rid_u)
       }
       else {
         c3_c* pax_c = _unix_down(dir_u->pax_c, out_u->d_name);
+        c3_c* pot_c = _unix_down(dir_u->pot_c, out_u->d_name);
         struct stat buf_u;
 
         // uL(fprintf(uH, "  in %s\n", pax_c));
         if ( 0 != stat(pax_c, &buf_u) ) {
           free(pax_c);
+          free(pot_c);
           continue;
         }
         else {
@@ -577,7 +589,7 @@ _unix_dir_update(u3_udir* dir_u, DIR* rid_u)
               fil_u = c3_malloc(sizeof(u3_ufil));
 
               // uL(fprintf(uH, "found file %s\n", pax_c));
-              _unix_file_watch(fil_u, dir_u, pax_c, mod_w);
+              _unix_file_watch(fil_u, dir_u, pax_c, pot_c, mod_w);
 
               fil_u->nex_u = dir_u->fil_u;
               dir_u->fil_u = fil_u;
@@ -596,7 +608,7 @@ _unix_dir_update(u3_udir* dir_u, DIR* rid_u)
               dis_u = c3_malloc(sizeof(u3_udir));
 
               // uL(fprintf(uH, "found directory %s\n", pax_c));
-              _unix_dir_watch(dis_u, dir_u, pax_c);
+              _unix_dir_watch(dis_u, dir_u, pax_c, pot_c);
               _unix_dir_update(dis_u, red_u);
 
               dis_u->nex_u = dir_u->dis_u;
@@ -605,6 +617,7 @@ _unix_dir_update(u3_udir* dir_u, DIR* rid_u)
               closedir(red_u);
             } else {
               free(pax_c);
+              free(pot_c);
             }
           }
         }
@@ -1091,9 +1104,7 @@ _unix_hot_gain(u3_noun who, u3_noun mek)
   {
     u3_uhot* hot_u = c3_malloc(sizeof(u3_uhot));
 
-    _unix_dir_watch(&hot_u->dir_u, 0, pin_c);
-
-    hot_u->dot_u = pot_c;
+    _unix_dir_watch(&hot_u->dir_u, 0, pin_c, pot_c);
 
     _unix_ship_out(who, hot_u->who_w);
     u3z(who);
@@ -1165,8 +1176,10 @@ _unix_desk_sync_tofu(u3_udir* dir_u,
                      u3_noun  ext,
                      u3_noun  mis)
 {
-  c3_c*     pox_c = _unix_file_form(dir_u, u3k(pre), c3n, u3k(ext));
-  c3_c*     pux_c = _unix_file_form(dir_u, u3k(pre), c3y, u3k(ext));
+  c3_c*     pox_c = _unix_file_form(dir_u->pax_c, u3k(pre), c3n, u3k(ext));
+  c3_c*     pot_c = _unix_file_form(dir_u->pot_c, u3k(pre), c3n, u3k(ext));
+  c3_c*     pux_c = _unix_file_form(dir_u->pax_c, u3k(pre), c3y, u3k(ext));
+  c3_c*     put_c = _unix_file_form(dir_u->pot_c, u3k(pre), c3y, u3k(ext));
   u3_ufil** fil_u;
 
   // uL(fprintf(uH, "tofu pox_c %s op %s\n", pox_c, u3r_string(u3h(mis))));
@@ -1203,11 +1216,14 @@ _unix_desk_sync_tofu(u3_udir* dir_u,
     _unix_file_free(ded_u);
 
     free(pox_c);
+    free(pot_c);
     free(pux_c);
+    free(put_c);
   }
   else {
     u3_noun god, oat;
     c3_c*   pax_c;
+    c3_c*   pat_c;
 
     if ( *fil_u ) {
       u3_noun old = _unix_file_load(*fil_u);
@@ -1225,9 +1241,11 @@ _unix_desk_sync_tofu(u3_udir* dir_u,
     if ( c3y == u3du(god) ) {
       oat = u3ke_jam(god);
       pax_c = pux_c; free(pox_c);
+      pat_c = put_c; free(pot_c);
     } else {
       oat = god;
       pax_c = pox_c; free(pux_c);
+      pat_c = pot_c; free(put_c);
     }
 
 #ifdef SYNCLOG
@@ -1238,10 +1256,12 @@ _unix_desk_sync_tofu(u3_udir* dir_u,
 #endif
 
     _unix_save(pax_c, oat);
+    _unix_save(pat_c, oat);
 
     if ( *fil_u ) {
       (*fil_u)->dot_c = (pax_c + ((*fil_u)->dot_c - (*fil_u)->pax_c));
       (*fil_u)->pax_c = pax_c;
+      (*fil_u)->pot_c = pat_c;
 
       u3r_words(0, 4, (*fil_u)->mod_w, u3A->now);
     }
@@ -1251,7 +1271,7 @@ _unix_desk_sync_tofu(u3_udir* dir_u,
       u3r_words(0, 4, mod_w, u3A->now);
       *fil_u = c3_malloc(sizeof(u3_ufil));
 
-      _unix_file_watch(*fil_u, dir_u, pax_c, mod_w);
+      _unix_file_watch(*fil_u, dir_u, pax_c, pat_c, mod_w);
     }
   }
   u3z(pre); u3z(ext); u3z(mis);
@@ -1438,7 +1458,6 @@ u3_unix_ef_look(void)
         // uL(fprintf(uH, "sync: lose %s\n", hot_u->dir_u.pax_c));
         _unix_hot_lose(hot_u);
 
-        free(hot_u->dot_u);
         free(hot_u);
         continue;
       }

From f86e6c4d351c9934f4ec8dc007e133b9a9d5d3ee Mon Sep 17 00:00:00 2001
From: Philip C Monk <philip.monk@tlon.io>
Date: Wed, 28 Jan 2015 20:28:10 -0500
Subject: [PATCH 08/24] waypoint

---
 Makefile   |  2 +-
 i/v/vere.h |  3 +-
 v/reck.c   |  5 +--
 v/sist.c   |  8 +++++
 v/unix.c   | 91 ++++++++++++++++++++++++------------------------------
 5 files changed, 54 insertions(+), 55 deletions(-)

diff --git a/Makefile b/Makefile
index e1e95c43c..138aae7f3 100644
--- a/Makefile
+++ b/Makefile
@@ -64,7 +64,7 @@ INCLUDE=i
 MDEFINES=-DU3_OS_$(OS) -DU3_OS_ENDIAN_$(ENDIAN) -D U3_LIB=\"$(LIB)\"
 
 # NOTFORCHECKIN - restore -O3
-CFLAGS= $(COSFLAGS) -O3 -msse3 -ffast-math \
+CFLAGS= $(COSFLAGS) -g -msse3 -ffast-math \
 	-funsigned-char \
 	-I/usr/local/include \
 	-I/opt/local/include \
diff --git a/i/v/vere.h b/i/v/vere.h
index b3f85096f..bb1a2c518 100644
--- a/i/v/vere.h
+++ b/i/v/vere.h
@@ -929,7 +929,8 @@
         void
         u3_unix_ef_ergo(u3_noun who,
                         u3_noun syd,
-                        u3_noun rel);
+                        u3_noun rel,
+                        u3_noun can);
 
       /* u3_unix_io_init(): initialize storage.
       */
diff --git a/v/reck.c b/v/reck.c
index 32366d8a7..e751653b8 100644
--- a/v/reck.c
+++ b/v/reck.c
@@ -156,9 +156,10 @@ _reck_kick_sync(u3_noun pox, u3_noun fav)
     case c3__ergo: {
       u3_noun who = u3k(u3h(u3t(fav)));
       u3_noun syd = u3k(u3h(u3t(u3t(fav))));
-      u3_noun rel = u3k(u3t(u3t(u3t(fav))));
+      u3_noun rel = u3k(u3h(u3t(u3t(u3t(fav)))));
+      u3_noun can = u3k(u3t(u3t(u3t(u3t(fav)))));
 
-      u3_unix_ef_ergo(who, syd, rel);
+      u3_unix_ef_ergo(who, syd, rel, can);
       u3z(pox); u3z(fav); return c3y;
     } break;
   }
diff --git a/v/sist.c b/v/sist.c
index 481861dd1..ee5265647 100644
--- a/v/sist.c
+++ b/v/sist.c
@@ -278,6 +278,7 @@ _sist_home()
 {
   c3_c    mak_c[2048];
   c3_c    ful_c[2048];
+  c3_c    fut_c[2048];
 
   //  Create subdirectories.
   //
@@ -336,6 +337,13 @@ _sist_home()
       uL(fprintf(uH, "could not %s\n", ful_c));
       u3_lo_bail();
     }
+    snprintf(fut_c, 2048, "cp -r %s/zod %s/%s/out",
+                    U3_LIB, u3_Host.dir_c, u3_Host.ops_u.imp_c+1);
+    printf("%s\r\n", fut_c);
+    if ( 0 != system(fut_c) ) {
+      uL(fprintf(uH, "could not %s\n", fut_c));
+      u3_lo_bail();
+    }
   }
 #endif
 }
diff --git a/v/unix.c b/v/unix.c
index 99fc2edb7..6b1628212 100644
--- a/v/unix.c
+++ b/v/unix.c
@@ -682,7 +682,7 @@ static void
 _unix_save(c3_c* pax_c, u3_atom oat)
 {
   c3_i  fid_i = open(pax_c, O_WRONLY | O_CREAT | O_TRUNC, 0666);
-  c3_w  fln_w, rit_w;
+  c3_w  fln_w, rit_w, siz_w;
   c3_y* oat_y;
 
   if ( fid_i < 0 ) {
@@ -690,12 +690,15 @@ _unix_save(c3_c* pax_c, u3_atom oat)
     u3m_bail(c3__fail);
   }
 
-  fln_w = u3r_met(3, oat);
-  oat_y = c3_malloc(fln_w);
-  u3r_bytes(0, fln_w, oat_y, oat);
+  siz_w = u3h(u3t(oat));
+  fln_w = u3r_met(3, u3t(u3t(oat)));
+  oat_y = c3_malloc(siz_w);
+  memset(oat_y, 0, siz_w);
+
+  u3r_bytes(0, fln_w, oat_y, u3t(u3t(oat)));
   u3z(oat);
 
-  rit_w = write(fid_i, oat_y, fln_w);
+  rit_w = write(fid_i, oat_y, siz_w);
   if ( rit_w != fln_w ) {
     uL(fprintf(uH, "%s: %s\n", pax_c, strerror(errno)));
     c3_assert(0);
@@ -908,6 +911,7 @@ _find_mug(u3_noun som, c3_l mug_l)
 }
 #endif
 
+#if 0
 /* _unix_desk_peek(): peek for ankh.
 */
 static u3_noun
@@ -930,6 +934,7 @@ _unix_desk_peek(u3_noun hox,
     u3z(cay); return ank;
   }
 }
+#endif
 
 #if 0 
 /* _unix_ankh_sing_map(): compare ankh maps for u3_ankh_sing().
@@ -1160,6 +1165,7 @@ _unix_home(u3_noun who)
   return hot_u;
 }
 
+#if 0
 /* _unix_desk_sync_udon(): apply udon to existing value.
 */
 static u3_noun
@@ -1167,6 +1173,7 @@ _unix_desk_sync_udon(u3_noun don, u3_noun old)
 {
   return u3dc("lump", don, old);
 }
+#endif
 
 /* _unix_desk_sync_tofu(): sync out file install.
 */
@@ -1174,7 +1181,7 @@ static void
 _unix_desk_sync_tofu(u3_udir* dir_u,
                      u3_noun  pre,
                      u3_noun  ext,
-                     u3_noun  mis)
+                     u3_noun  mim)
 {
   c3_c*     pox_c = _unix_file_form(dir_u->pax_c, u3k(pre), c3n, u3k(ext));
   c3_c*     pot_c = _unix_file_form(dir_u->pot_c, u3k(pre), c3n, u3k(ext));
@@ -1201,6 +1208,7 @@ _unix_desk_sync_tofu(u3_udir* dir_u,
     else fil_u = &((*fil_u)->nex_u);
   }
 
+#if 0
   if ( *fil_u && (c3__del == u3h(mis)) ) {
     u3_ufil* ded_u = *fil_u;
 
@@ -1221,32 +1229,26 @@ _unix_desk_sync_tofu(u3_udir* dir_u,
     free(put_c);
   }
   else {
-    u3_noun god, oat;
+#endif
     c3_c*   pax_c;
     c3_c*   pat_c;
 
     if ( *fil_u ) {
-      u3_noun old = _unix_file_load(*fil_u);
-      c3_assert(c3__mut == u3h(mis));
-
-      god = _unix_desk_sync_udon(u3k(u3t(mis)), old);
       _unix_unlink((*fil_u)->pax_c);
       free((*fil_u)->pax_c);
     }
-    else {
-      c3_assert(c3__ins == u3h(mis));
-      god = u3k(u3t(mis));
-    }
 
+#if 0
     if ( c3y == u3du(god) ) {
-      oat = u3ke_jam(god);
       pax_c = pux_c; free(pox_c);
       pat_c = put_c; free(pot_c);
     } else {
-      oat = god;
+#endif
       pax_c = pox_c; free(pux_c);
       pat_c = pot_c; free(put_c);
+#if 0
     }
+#endif
 
 #ifdef SYNCLOG
     u3_Host.unx_u.sylo[slot].unx   = c3n;
@@ -1255,8 +1257,8 @@ _unix_desk_sync_tofu(u3_udir* dir_u,
     u3_Host.unx_u.sylo[slot].pax_c = strdup(pax_c);
 #endif
 
-    _unix_save(pax_c, oat);
-    _unix_save(pat_c, oat);
+    _unix_save(pax_c, mim);
+    _unix_save(pat_c, mim);
 
     if ( *fil_u ) {
       (*fil_u)->dot_c = (pax_c + ((*fil_u)->dot_c - (*fil_u)->pax_c));
@@ -1273,14 +1275,16 @@ _unix_desk_sync_tofu(u3_udir* dir_u,
 
       _unix_file_watch(*fil_u, dir_u, pax_c, pat_c, mod_w);
     }
+#if 0
   }
-  u3z(pre); u3z(ext); u3z(mis);
+#endif
+  u3z(pre); u3z(ext); u3z(mim);
 }
 
 /* _unix_desk_sync_tako(): sync out change.
 */
 static void
-_unix_desk_sync_tako(u3_udir* dir_u, u3_noun pax, u3_noun mis)
+_unix_desk_sync_tako(u3_udir* dir_u, u3_noun pax, u3_noun mim)
 {
   if ( (c3n == u3du(pax)) ) {
     c3_assert(!"tack");
@@ -1292,7 +1296,7 @@ _unix_desk_sync_tako(u3_udir* dir_u, u3_noun pax, u3_noun mis)
     u3_noun pem = u3i_string(par_u);
     c3_assert( u3_nul == t_pax );                      //  XX ugly, wrong
 
-    _unix_desk_sync_tofu(dir_u->par_u, pem, u3k(i_pax), mis);
+    _unix_desk_sync_tofu(dir_u->par_u, pem, u3k(i_pax), mim);
   }
   else {
     u3_noun i_pax = u3h(pax);
@@ -1301,7 +1305,7 @@ _unix_desk_sync_tako(u3_udir* dir_u, u3_noun pax, u3_noun mis)
     u3_noun tt_pax = u3t(t_pax);
 
     if ( u3_nul == tt_pax ) {
-      _unix_desk_sync_tofu(dir_u, u3k(i_pax), u3k(it_pax), mis);
+      _unix_desk_sync_tofu(dir_u, u3k(i_pax), u3k(it_pax), mim);
     }
     else {
       u3_udir** dis_u = _unix_pdir(dir_u, u3k(i_pax));
@@ -1311,7 +1315,7 @@ _unix_desk_sync_tako(u3_udir* dir_u, u3_noun pax, u3_noun mis)
 
         _unix_dir_forge(*dis_u, dir_u, u3k(i_pax));
       }
-      _unix_desk_sync_tako(*dis_u, u3k(t_pax), mis);
+      _unix_desk_sync_tako(*dis_u, u3k(t_pax), mim);
     }
   }
   u3z(pax);
@@ -1320,15 +1324,13 @@ _unix_desk_sync_tako(u3_udir* dir_u, u3_noun pax, u3_noun mis)
 /* _unix_desk_sync_soba(): sync computed changes.
 */
 static void
-_unix_desk_sync_soba(u3_udir* dir_u, u3_noun doz)
+_unix_desk_sync_list(u3_udir* dir_u, u3_noun can)
 {
-  u3_noun zod = u3t(doz);
-
-  while ( u3_nul != zod ) {
-    _unix_desk_sync_tako(dir_u, u3k(u3h(u3h(zod))), u3k(u3t(u3h(zod))));
-    zod = u3t(zod);
+  while ( u3_nul != can ) {
+    _unix_desk_sync_tako(dir_u, u3k(u3h(u3h(can))), u3k(u3t(u3h(can))));
+    can = u3t(can);
   }
-  u3z(doz);
+  u3z(can);
 }
 
 /* _unix_desk_sync_ergo(): sync desk changes to unix.
@@ -1337,10 +1339,10 @@ static void
 _unix_desk_sync_ergo(u3_noun  hox,
                      u3_noun  syd,
                      u3_noun  lok,
+                     u3_noun  can,
                      u3_uhot* hot_u)
 {
   u3_udir** dir_u = _unix_pdir(&(hot_u->dir_u), syd);
-  u3_noun   xun;
 
 #if 0
   uL(fprintf(uH, "ergo %s %s %s\n", u3r_string(hox),
@@ -1351,24 +1353,10 @@ _unix_desk_sync_ergo(u3_noun  hox,
   if ( !*dir_u ) {
     *dir_u = c3_malloc(sizeof(u3_udir));
 
-    xun = u3nt(0, u3_nul, u3_nul);
     _unix_dir_forge(*dir_u, &(hot_u->dir_u), u3k(syd));
-  } else {
-    xun = _unix_dir_ankh(*dir_u);
   }
 
-  {
-    u3_noun bur = _unix_desk_peek(hox, syd, lok);
-
-    if ( c3n == u3r_sing(xun, bur) ) {
-      u3_noun doz = u3dc("cost", bur, xun);
-
-      _unix_desk_sync_soba(*dir_u, doz);
-    }
-    else {
-      u3z(xun); u3z(bur);
-    }
-  }
+  _unix_desk_sync_list(*dir_u, can);
 }
 
 /* u3_unix_ef_init(): update filesystem for new acquisition.
@@ -1389,16 +1377,17 @@ u3_unix_ef_init(u3_noun who)
 void
 u3_unix_ef_ergo(u3_noun who,
                 u3_noun syd,
-                u3_noun rel)
+                u3_noun rel,
+                u3_noun can)
 {
-  u3_noun  hox = u3dc("scot", 'p', u3k(who));
-  u3_noun  lok = u3dc("scot", c3__ud, rel);
+  u3_noun  hox = u3dc("scot", 'p', u3k(who));           // XXX unnecessary?
+  u3_noun  lok = u3dc("scot", c3__ud, rel);             // XXX unnecessary?
   u3_uhot* hot_u;
 
   hot_u = _unix_home(who);
 
   if ( 0 != hot_u ) {
-    _unix_desk_sync_ergo(hox, syd, lok, hot_u);
+    _unix_desk_sync_ergo(hox, syd, lok, can, hot_u);
   }
 }
 

From 1b5c21f4f43c1b7922aee0e0460f093f42f03d9e Mon Sep 17 00:00:00 2001
From: Philip C Monk <philip.monk@tlon.io>
Date: Thu, 29 Jan 2015 14:47:51 -0500
Subject: [PATCH 09/24] working in/out

---
 v/unix.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/v/unix.c b/v/unix.c
index 6b1628212..b698f99af 100644
--- a/v/unix.c
+++ b/v/unix.c
@@ -105,8 +105,8 @@ _unix_opendir(c3_c* pax_c)
 static void
 _unix_unlink(c3_c* pax_c)
 {
-  if ( 0 != unlink(pax_c) && ENOENT != errno) {
-    uL(fprintf(uH, "%s: %s\n", pax_c, strerror(errno)));
+  if ( 0 != unlink(pax_c) /* && ENOENT != errno */) {
+    uL(fprintf(uH, "error unlinking %s: %s\n", pax_c, strerror(errno)));
     c3_assert(0);
   }
 }
@@ -686,7 +686,7 @@ _unix_save(c3_c* pax_c, u3_atom oat)
   c3_y* oat_y;
 
   if ( fid_i < 0 ) {
-    uL(fprintf(uH, "%s: %s\n", pax_c, strerror(errno)));
+    uL(fprintf(uH, "error opening %s: %s\n", pax_c, strerror(errno)));
     u3m_bail(c3__fail);
   }
 
@@ -699,8 +699,8 @@ _unix_save(c3_c* pax_c, u3_atom oat)
   u3z(oat);
 
   rit_w = write(fid_i, oat_y, siz_w);
-  if ( rit_w != fln_w ) {
-    uL(fprintf(uH, "%s: %s\n", pax_c, strerror(errno)));
+  if ( rit_w != siz_w ) {
+    uL(fprintf(uH, "error writing %s: %s\n", pax_c, strerror(errno)));
     c3_assert(0);
   }
 
@@ -1200,8 +1200,8 @@ _unix_desk_sync_tofu(u3_udir* dir_u,
   fil_u = &(dir_u->fil_u);
   while ( 1 ) {                               //  XX crude!
     if ( !*fil_u ||
-         !strcmp((*fil_u)->pax_c, pox_c) ||
-         !strcmp((*fil_u)->pax_c, pux_c) )
+         !strcmp((*fil_u)->pax_c, pox_c) /* ||
+         !strcmp((*fil_u)->pax_c, pux_c) */ )
     {
       break;
     }
@@ -1236,6 +1236,8 @@ _unix_desk_sync_tofu(u3_udir* dir_u,
     if ( *fil_u ) {
       _unix_unlink((*fil_u)->pax_c);
       free((*fil_u)->pax_c);
+      _unix_unlink((*fil_u)->pot_c);
+      free((*fil_u)->pot_c);
     }
 
 #if 0
@@ -1257,7 +1259,7 @@ _unix_desk_sync_tofu(u3_udir* dir_u,
     u3_Host.unx_u.sylo[slot].pax_c = strdup(pax_c);
 #endif
 
-    _unix_save(pax_c, mim);
+    _unix_save(pax_c, u3k(mim));
     _unix_save(pat_c, mim);
 
     if ( *fil_u ) {

From 28841a3e74e8782ae8cae83e6459b3e4b3b8b78a Mon Sep 17 00:00:00 2001
From: Philip C Monk <philip.monk@tlon.io>
Date: Thu, 29 Jan 2015 20:06:02 -0500
Subject: [PATCH 10/24] waypoint

---
 v/unix.c | 45 +++++++++++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/v/unix.c b/v/unix.c
index b698f99af..0dfdd94ac 100644
--- a/v/unix.c
+++ b/v/unix.c
@@ -626,7 +626,7 @@ _unix_dir_update(u3_udir* dir_u, DIR* rid_u)
   }
 }
 
-/* unix_load(): load a file.
+/* unix_load(): load a file as a cage
 */
 static u3_noun
 _unix_load(c3_c* pax_c)
@@ -657,16 +657,16 @@ _unix_load(c3_c* pax_c)
   else {
     //  -:!>(*[[@tas @tas ~] @ud @])
     u3_noun typ = u3nt(c3__cell,
-                      u3nt(c3__cell,
-                           u3nc(c3__atom, c3__tas),
-                           u3nt(c3__cell,
-                                u3nc(c3__atom, c3__tas),
-                                u3nt(c3__cube,
-                                     u3_nul,
-                                     u3nc(c3__atom, 'n')))),
-                      u3nt(c3__cell,
-                           u3nc(c3__atom, c3__ud),
-                           u3nc(c3__atom, u3_nul)));
+                       u3nt(c3__cell,
+                            u3nc(c3__atom, c3__tas),
+                            u3nt(c3__cell,
+                                 u3nc(c3__atom, c3__tas),
+                                 u3nt(c3__cube,
+                                      u3_nul,
+                                      u3nc(c3__atom, 'n')))),
+                       u3nt(c3__cell,
+                            u3nc(c3__atom, c3__ud),
+                            u3nc(c3__atom, u3_nul)));
     u3_noun nam = u3nt(c3__text, u3i_string("plain"), u3_nul);
     u3_noun pad = u3nt(nam, fln_w, u3i_bytes(fln_w, (c3_y *)pad_y));
     u3_noun cay = u3nt(c3__mime, typ, pad);
@@ -882,6 +882,7 @@ _unix_dir_ankh(u3_udir* dir_u)
   for ( fil_u = dir_u->fil_u; fil_u; fil_u = fil_u->nex_u ) {
     u3_noun wib = _unix_file_name(fil_u);
     u3_noun baw = _unix_file_load(fil_u);
+    if (0 == baw) continue;
     u3_noun woz = u3nt(u3_nul, u3do("sham", u3k(u3t(u3t(baw)))), baw);
     pam = _unix_dir_ankh_file(pam, wib, baw, woz);
   }
@@ -1208,8 +1209,8 @@ _unix_desk_sync_tofu(u3_udir* dir_u,
     else fil_u = &((*fil_u)->nex_u);
   }
 
-#if 0
-  if ( *fil_u && (c3__del == u3h(mis)) ) {
+  if ( *fil_u && u3_nul == mim ) {
+    uL(fprintf(uH, "file goning: %s\n", pox_c));
     u3_ufil* ded_u = *fil_u;
 
 #ifdef SYNCLOG
@@ -1221,7 +1222,17 @@ _unix_desk_sync_tofu(u3_udir* dir_u,
 
     *fil_u = ded_u->nex_u;
     _unix_unlink(ded_u->pax_c);
+    _unix_unlink(ded_u->pot_c);
     _unix_file_free(ded_u);
+    free(ded_u->pot_c);
+
+    free(pox_c);
+    free(pot_c);
+    free(pux_c);
+    free(put_c);
+  }
+  else if (u3_nul == mim) {
+    uL(fprintf(uH, "file already gone: %s\n", pox_c));
 
     free(pox_c);
     free(pot_c);
@@ -1229,7 +1240,6 @@ _unix_desk_sync_tofu(u3_udir* dir_u,
     free(put_c);
   }
   else {
-#endif
     c3_c*   pax_c;
     c3_c*   pat_c;
 
@@ -1259,8 +1269,8 @@ _unix_desk_sync_tofu(u3_udir* dir_u,
     u3_Host.unx_u.sylo[slot].pax_c = strdup(pax_c);
 #endif
 
-    _unix_save(pax_c, u3k(mim));
-    _unix_save(pat_c, mim);
+    _unix_save(pax_c, u3k(u3t(mim)));
+    _unix_save(pat_c, u3t(mim));
 
     if ( *fil_u ) {
       (*fil_u)->dot_c = (pax_c + ((*fil_u)->dot_c - (*fil_u)->pax_c));
@@ -1277,9 +1287,8 @@ _unix_desk_sync_tofu(u3_udir* dir_u,
 
       _unix_file_watch(*fil_u, dir_u, pax_c, pat_c, mod_w);
     }
-#if 0
   }
-#endif
+
   u3z(pre); u3z(ext); u3z(mim);
 }
 

From f7455b7db81a476202e631b2ac5b24cb7db1b72d Mon Sep 17 00:00:00 2001
From: Philip C Monk <philip.monk@tlon.io>
Date: Fri, 30 Jan 2015 19:40:07 -0500
Subject: [PATCH 11/24] deletion works

---
 v/unix.c | 55 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/v/unix.c b/v/unix.c
index 0dfdd94ac..fe0527610 100644
--- a/v/unix.c
+++ b/v/unix.c
@@ -105,7 +105,7 @@ _unix_opendir(c3_c* pax_c)
 static void
 _unix_unlink(c3_c* pax_c)
 {
-  if ( 0 != unlink(pax_c) /* && ENOENT != errno */) {
+  if ( 0 != unlink(pax_c) && ENOENT != errno ) {
     uL(fprintf(uH, "error unlinking %s: %s\n", pax_c, strerror(errno)));
     c3_assert(0);
   }
@@ -778,21 +778,21 @@ _unix_file_name(u3_ufil* fil_u)
   }
 }
 
-/* _unix_dir_ankh_file(): process a file for ankh.
+/* _unix_dir_khan_file(): process a file for khan.
 */
 static u3_noun
-_unix_dir_ankh_file(u3_noun pam, u3_noun wib, u3_noun baw, u3_noun woz)
+_unix_dir_khan_file(u3_noun pam, u3_noun wib, u3_noun baw, u3_noun woz)
 {
   u3_weak ole;
   if ( c3n == u3du(wib) ) {
     ole = u3kdb_get(u3k(pam), u3k(wib));
 
     if ( u3_none == ole ) {
-      ole = u3do("cosh", u3nt(0, woz, u3_nul));
+      ole = u3nc(woz, u3_nul);
     } else {
       u3_noun elo;
 
-      elo = u3do("cosh", u3nt(0, woz, u3k(u3t(u3t(ole)))));
+      elo = u3nc(woz, u3k(u3t(ole)));
       u3z(ole);
 
       ole = elo;
@@ -806,29 +806,28 @@ _unix_dir_ankh_file(u3_noun pam, u3_noun wib, u3_noun baw, u3_noun woz)
     ole = u3kdb_get(u3k(pam), u3k(fid));
 
     if ( u3_none == ole ) {
-      ole = u3nt
-        (0, u3_nul, u3kdb_put(u3_nul,
-                                  u3k(har),
-                                  u3do("cosh", u3nt(0, woz, u3_nul))));
-      ole = u3do("cosh", ole);
+      ole = u3nc(u3_nul,
+                 u3kdb_put(u3_nul,
+                           u3k(har),
+                           u3nc(woz, u3_nul)));
     }
     else {
-      u3_noun roo = u3t(u3t(ole));
+      u3_noun roo = u3t(ole);
       u3_weak tup = u3kdb_get(u3k(roo), u3k(har));
       u3_noun oor, elo;
 
       if ( u3_none == tup ) {
-        tup = u3do("cosh", u3nt(0, woz, u3_nul));
+        tup = u3nc(woz, u3_nul);
       } else {
         u3_noun upt;
 
-        upt = u3do("cosh", u3nt(0, woz, u3k(u3t(u3t(tup)))));
+        upt = u3nc(woz, u3k(u3t(tup)));
         u3z(tup);
 
         tup = upt;
       }
       oor = u3kdb_put(u3k(roo), u3k(har), tup);
-      elo = u3do("cosh", u3nt(0, u3k(u3h(u3t(ole))), oor));
+      elo = u3nc(u3k(u3h(ole)), oor);
 
       u3z(ole); ole = elo;
     }
@@ -838,10 +837,10 @@ _unix_dir_ankh_file(u3_noun pam, u3_noun wib, u3_noun baw, u3_noun woz)
   return pam;
 }
 
-/* _unix_dir_ankh(): resolve directory to new style ankh.
+/* _unix_dir_khan(): resolve directory to khan.
 */
 static u3_noun
-_unix_dir_ankh(u3_udir* dir_u)
+_unix_dir_khan(u3_udir* dir_u)
 {
   u3_udir* dis_u;
   u3_ufil* fil_u;
@@ -849,15 +848,15 @@ _unix_dir_ankh(u3_udir* dir_u)
 
   for ( dis_u = dir_u->dis_u; dis_u; dis_u = dis_u->nex_u ) {
     u3_noun pre = _unix_dir_name(dis_u);
-    u3_noun ank = _unix_dir_ankh(dis_u);
+    u3_noun kan = _unix_dir_khan(dis_u);
 
     // uL(fprintf(uH, "dir %s\n", u3r_string(pre)));
-    if ( 0 != u3h(ank) ) {
-      pam = u3kdb_put(pam, pre, ank);
+    if ( u3_nul != u3h(kan) || u3_nul != u3t(kan) ) {
+      pam = u3kdb_put(pam, pre, kan);
     }
     else
     {
-      u3z(ank);
+      u3z(kan);
     }
   }
 
@@ -874,7 +873,7 @@ _unix_dir_ankh(u3_udir* dir_u)
       u3_noun baw = _unix_file_load(fil_u);
       u3_noun woz = u3nt(u3_nul, u3do("sham", u3k(u3t(u3t(baw)))), baw);
       u3z(dur);
-      pam = _unix_dir_ankh_file(pam, u3k(u3t(wib)), baw, woz);
+      pam = _unix_dir_khan_file(pam, u3k(u3t(wib)), baw, woz);
       u3z(wib);
     }
   }
@@ -882,11 +881,13 @@ _unix_dir_ankh(u3_udir* dir_u)
   for ( fil_u = dir_u->fil_u; fil_u; fil_u = fil_u->nex_u ) {
     u3_noun wib = _unix_file_name(fil_u);
     u3_noun baw = _unix_file_load(fil_u);
-    if (0 == baw) continue;
-    u3_noun woz = u3nt(u3_nul, u3do("sham", u3k(u3t(u3t(baw)))), baw);
-    pam = _unix_dir_ankh_file(pam, wib, baw, woz);
+    if (0 == baw) {
+      pam = _unix_dir_khan_file(pam, wib, baw, u3nc(u3_nul, u3_nul));
+    } else {
+      pam = _unix_dir_khan_file(pam, wib, baw, u3nt(u3_nul, u3_nul, baw));
+    }
   }
-  return u3do("cosh", u3nt(0, u3_nul, pam));
+  return u3nc(u3_nul, pam);
 }
 
 /* _find_mug(): find a noun with a given mug.  retain. DELETEME
@@ -1021,7 +1022,7 @@ _unix_desk_sync_into(u3_noun  who,
 {
   u3_noun xun, fav, pax;
 
-  xun = _unix_dir_ankh(dir_u);
+  xun = _unix_dir_khan(dir_u);
 
   pax = u3nq(u3_blip, c3__sync, u3k(u3A->sen), u3_nul);
   fav = u3nq(c3__into, who, syd, xun);
@@ -1380,7 +1381,7 @@ u3_unix_ef_init(u3_noun who)
   u3v_plan(u3nq(u3_blip, c3__sync, u3k(u3A->sen), u3_nul),
              u3nq(c3__into, who,
                             u3_blip,
-                            u3nt(u3_nul, u3_nul, u3_nul)));
+                            u3nc(u3_nul, u3_nul)));
 }
 
 /* u3_unix_ef_ergo(): update filesystem, outbound.

From 6888ba9f95ed53374deedc8802556be37aceae94 Mon Sep 17 00:00:00 2001
From: Philip C Monk <philip.monk@tlon.io>
Date: Mon, 2 Feb 2015 19:50:45 -0500
Subject: [PATCH 12/24] performance

---
 v/sist.c |  16 ++++-----
 v/unix.c | 106 ++++++++++++++++++++++++++++++++++++++++++-------------
 2 files changed, 90 insertions(+), 32 deletions(-)

diff --git a/v/sist.c b/v/sist.c
index ee5265647..8223ae45d 100644
--- a/v/sist.c
+++ b/v/sist.c
@@ -278,7 +278,7 @@ _sist_home()
 {
   c3_c    mak_c[2048];
   c3_c    ful_c[2048];
-  c3_c    fut_c[2048];
+  //  c3_c    fut_c[2048];
 
   //  Create subdirectories.
   //
@@ -337,13 +337,13 @@ _sist_home()
       uL(fprintf(uH, "could not %s\n", ful_c));
       u3_lo_bail();
     }
-    snprintf(fut_c, 2048, "cp -r %s/zod %s/%s/out",
-                    U3_LIB, u3_Host.dir_c, u3_Host.ops_u.imp_c+1);
-    printf("%s\r\n", fut_c);
-    if ( 0 != system(fut_c) ) {
-      uL(fprintf(uH, "could not %s\n", fut_c));
-      u3_lo_bail();
-    }
+    //  snprintf(fut_c, 2048, "cp -r %s/zod %s/%s/out",
+    //                  U3_LIB, u3_Host.dir_c, u3_Host.ops_u.imp_c+1);
+    //  printf("%s\r\n", fut_c);
+    //  if ( 0 != system(fut_c) ) {
+    //    uL(fprintf(uH, "could not %s\n", fut_c));
+    //    u3_lo_bail();
+    //  }
   }
 #endif
 }
diff --git a/v/unix.c b/v/unix.c
index fe0527610..4418e8738 100644
--- a/v/unix.c
+++ b/v/unix.c
@@ -16,13 +16,14 @@
 #include <termios.h>
 #include <term.h>
 #include <errno.h>
+#include <libgen.h>
 
 #include "all.h"
 #include "v/vere.h"
 
 /* _unix_ship_in(): c3_w[4] to ship.
 */
-static u3_noun 
+static u3_noun
 _unix_ship_in(c3_w* who_w)
 {
   return u3i_words(4, who_w);
@@ -81,6 +82,42 @@ _unix_mkdir(c3_c* pax_c)
   }
 }
 
+/* _unix_mkpath(): mkdir -p, asserting
+ *
+ * adapted from
+ * http://niallohiggins.com/2009/01/08/mkpath-mkdir-p-alike-in-c-for-unix/
+ */
+static void
+_unix_mkpath(const char *s)
+{
+  char *q, *r = NULL, *path = NULL, *up = NULL;
+
+  if (strcmp(s, ".") == 0 || strcmp(s, "/") == 0)
+    return;
+
+  if ((path = strdup(s)) == NULL)
+    c3_assert(0);
+
+  if ((q = strdup(s)) == NULL)
+    c3_assert(0);
+
+  if ((r = dirname(q)) == NULL)
+    goto out;
+
+  if ((up = strdup(r)) == NULL)
+    exit(1);
+
+  _unix_mkpath(up);
+
+  _unix_mkdir(path);
+
+out:
+  if (up != NULL)
+    free(up);
+  free(q);
+  free(path);
+}
+
 /* _unix_opendir(): opendir, recreating if nonexistent.
 */
 static DIR*
@@ -213,7 +250,7 @@ _unix_fs_event_cb(uv_fs_event_t* was_u,
                   c3_i           evt_i,
                   c3_i           sas_i)
 {
-  
+
   // note that we're doing something tricky and weird here.
   //
   // * libuv passes around a pointer to a uv_fs_event_t
@@ -277,7 +314,7 @@ _unix_file_watch(u3_ufil* fil_u,
   // (2) stuff data structure into libuv
   //
   c3_w ret_w = uv_fs_event_init(u3L,          // loop
-                                &fil_u->was_u // uv_fs_event_t 
+                                &fil_u->was_u // uv_fs_event_t
                                 );
   if (0 != ret_w){
     uL(fprintf(uH, "event init: %s\n", strerror(ret_w)));
@@ -576,7 +613,7 @@ _unix_dir_update(u3_udir* dir_u, DIR* rid_u)
 
             {
               u3_noun mod = c3_stat_mtime(&buf_u);
-              
+
               u3r_words(0, 4, mod_w, mod);
               u3z(mod);
             }
@@ -586,6 +623,7 @@ _unix_dir_update(u3_udir* dir_u, DIR* rid_u)
               }
             }
             if ( !fil_u ) {
+              fprintf(stderr, "new filez!\r\n");
               fil_u = c3_malloc(sizeof(u3_ufil));
 
               // uL(fprintf(uH, "found file %s\n", pax_c));
@@ -627,21 +665,26 @@ _unix_dir_update(u3_udir* dir_u, DIR* rid_u)
 }
 
 /* unix_load(): load a file as a cage
+ *
+ * return value of c3__none means delete, u3_nul means no change
 */
 static u3_noun
-_unix_load(c3_c* pax_c)
+_unix_load(u3_ufil* fil_u)
 {
   struct stat buf_u;
-  c3_i        fid_i = open(pax_c, O_RDONLY, 0644);
+  c3_i        fid_i = open(fil_u->pax_c, O_RDONLY, 0644);
   c3_w        fln_w, red_w;
   c3_y*       pad_y;
+  c3_i        fit_i = open(fil_u->pot_c, O_RDONLY, 0644);
+  c3_w        flt_w, ret_w;
+  c3_y*       pat_y;
 
   if ( (fid_i < 0) || (fstat(fid_i, &buf_u) < 0) ) {
     //  ignore if the file disappeared between getting the sync event and now
     if ( ENOENT != errno ) {
-      uL(fprintf(uH, "%s: %s\n", pax_c, strerror(errno)));
+      uL(fprintf(uH, "error loading %s: %s\n", fil_u->pax_c, strerror(errno)));
     }
-    return 0;
+    return c3__none;
   }
   fln_w = buf_u.st_size;
   pad_y = c3_malloc(fln_w);
@@ -655,6 +698,27 @@ _unix_load(c3_c* pax_c)
     return 0;
   }
   else {
+    if ( !(fit_i < 0 || fstat(fit_i, &buf_u) < 0) ) {
+      flt_w = buf_u.st_size;
+      pat_y = c3_malloc(flt_w);
+
+      ret_w = read(fit_i, pat_y, flt_w);
+      close(fit_i);
+
+      if ( flt_w != ret_w ) {
+        free(pad_y);
+        c3_assert(0);
+        return 0;
+      }
+
+      if ( fln_w == flt_w && 0 == memcmp(pad_y, pat_y, fln_w) ) {
+        free(pat_y);
+        return u3_nul;
+      }
+
+      free(pat_y);
+    }
+
     //  -:!>(*[[@tas @tas ~] @ud @])
     u3_noun typ = u3nt(c3__cell,
                        u3nt(c3__cell,
@@ -681,6 +745,10 @@ _unix_load(c3_c* pax_c)
 static void
 _unix_save(c3_c* pax_c, u3_atom oat)
 {
+  c3_c* dir = strdup(pax_c);
+  _unix_mkpath(dirname(dir));
+  free(dir);
+
   c3_i  fid_i = open(pax_c, O_WRONLY | O_CREAT | O_TRUNC, 0666);
   c3_w  fln_w, rit_w, siz_w;
   c3_y* oat_y;
@@ -713,18 +781,9 @@ _unix_save(c3_c* pax_c, u3_atom oat)
 static u3_noun
 _unix_file_load(u3_ufil* fil_u)
 {
-  return _unix_load(fil_u->pax_c);
-
-#if 0
-  if ( (0 == raw) || ('^' != fil_u->dot_c[1]) ) {
-    return raw;
-  }
-
-  else return u3ke_cue(raw);
-#endif
+  return _unix_load(fil_u);
 }
 
-
 /* _unix_dir_name(): directory name.
 */
 static u3_noun
@@ -871,7 +930,7 @@ _unix_dir_khan(u3_udir* dir_u)
         continue;
       }
       u3_noun baw = _unix_file_load(fil_u);
-      u3_noun woz = u3nt(u3_nul, u3do("sham", u3k(u3t(u3t(baw)))), baw);
+      u3_noun woz = u3nt(u3_nul, u3_nul, baw);
       u3z(dur);
       pam = _unix_dir_khan_file(pam, u3k(u3t(wib)), baw, woz);
       u3z(wib);
@@ -881,11 +940,10 @@ _unix_dir_khan(u3_udir* dir_u)
   for ( fil_u = dir_u->fil_u; fil_u; fil_u = fil_u->nex_u ) {
     u3_noun wib = _unix_file_name(fil_u);
     u3_noun baw = _unix_file_load(fil_u);
-    if (0 == baw) {
-      pam = _unix_dir_khan_file(pam, wib, baw, u3nc(u3_nul, u3_nul));
-    } else {
-      pam = _unix_dir_khan_file(pam, wib, baw, u3nt(u3_nul, u3_nul, baw));
-    }
+    u3_noun wol = (c3__none == baw ? u3nc(u3_nul, u3_nul) :
+                   u3_nul == baw   ? u3_nul :
+                                     u3nt(u3_nul, u3_nul, baw));
+    pam = _unix_dir_khan_file(pam, wib, baw, wol);
   }
   return u3nc(u3_nul, pam);
 }

From 66662f2b41671f37a56f22f9710a8cc432e247f1 Mon Sep 17 00:00:00 2001
From: Philip C Monk <philip.monk@tlon.io>
Date: Wed, 18 Feb 2015 19:53:28 -0500
Subject: [PATCH 13/24] ford %join

---
 v/unix.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v/unix.c b/v/unix.c
index 4418e8738..c8e44410d 100644
--- a/v/unix.c
+++ b/v/unix.c
@@ -1291,7 +1291,7 @@ _unix_desk_sync_tofu(u3_udir* dir_u,
     free(put_c);
   }
   else if (u3_nul == mim) {
-    uL(fprintf(uH, "file already gone: %s\n", pox_c));
+    uL(fprintf(uH, "file already gone: %s\n", pox_c));  //  fires too often
 
     free(pox_c);
     free(pot_c);

From ff7904904dbcc788432078361d1671840410314e Mon Sep 17 00:00:00 2001
From: "C. Guy Yarvin" <cgyarvin@gmail.com>
Date: Wed, 8 Apr 2015 17:29:19 -0700
Subject: [PATCH 14/24] Fix ^F bug.

---
 v/term.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/v/term.c b/v/term.c
index ecd33d705..199243edb 100644
--- a/v/term.c
+++ b/v/term.c
@@ -832,9 +832,11 @@ _term_io_suck_char(u3_utty* uty_u, c3_y cay_y)
     else if ( 13 == cay_y ) {
       _term_io_belt(uty_u, u3nc(c3__ret, u3_nul));
     }
+#if 0
     else if ( 6 == cay_y ) {
       _term_io_flow(uty_u);   // XX hack
     }
+#endif
     else if ( cay_y <= 26 ) {
       _term_io_belt(uty_u, u3nc(c3__ctl, ('a' + (cay_y - 1))));
     }

From c1617611eda85e347d4d827e4f58d21df2b5ec6a Mon Sep 17 00:00:00 2001
From: "C. Guy Yarvin" <cgyarvin@gmail.com>
Date: Thu, 30 Apr 2015 15:58:34 -0700
Subject: [PATCH 15/24] Remove debug hack.

---
 v/term.c | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/v/term.c b/v/term.c
index 199243edb..7934df5b4 100644
--- a/v/term.c
+++ b/v/term.c
@@ -668,20 +668,6 @@ _term_it_save(u3_noun pax, u3_noun pad)
   free(pax_c);
 }
 
-/* _term_io_flow(): send flow.
-*/
-static void
-_term_io_flow(u3_utty* uty_u)
-{
-  u3_noun tid = u3dc("scot", c3__ud, uty_u->tid_l);
-  u3_noun pax = u3nq(u3_blip, c3__term, tid, u3_nul);
-
-  u3v_plan(pax, u3nq(c3__flow, c3__seat, c3__talk, u3_nul));
-  // u3v_plan(pax, u3nt(c3__flow, c3__seat, u3_nul));
-  // u3v_plan(pax, u3nq(c3__flow, c3__seat, c3__dojo, u3_nul));
-  // u3v_plan(pax, u3nq(c3__flow, c3__seat, c3__helm, u3_nul));
-}
-
 /* _term_io_belt(): send belt.
 */
 static void

From 8f23a0f9437ccbbb5302ab4803103f11b6a105a6 Mon Sep 17 00:00:00 2001
From: "C. Guy Yarvin" <cgyarvin@gmail.com>
Date: Thu, 30 Apr 2015 17:13:23 -0700
Subject: [PATCH 16/24] Reenable optimization in master.

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index f6042e2e0..c83c8a0d7 100644
--- a/Makefile
+++ b/Makefile
@@ -65,7 +65,7 @@ MDEFINES=-DU3_OS_$(OS) -DU3_OS_ENDIAN_$(ENDIAN) -D U3_LIB=\"$(LIB)\"
 
 # NOTFORCHECKIN - restore -O3
 # 	-DGHETTO
-CFLAGS= $(COSFLAGS) -g -msse3 -ffast-math \
+CFLAGS= $(COSFLAGS) -O3 -msse3 -ffast-math \
 	-funsigned-char \
 	-I/usr/local/include \
 	-I/opt/local/include \

From 0385e3a701e2aca5986f97d60b9ae489edeb2072 Mon Sep 17 00:00:00 2001
From: Max G <Hmmm-Max@users.noreply.github.com>
Date: Sun, 3 May 2015 15:26:42 +0300
Subject: [PATCH 17/24] Jetted scrypt

---
 Makefile                           |  22 +-
 i/j/q.h                            |   6 +
 i/j/w.h                            |   5 +
 j/e/scr.c                          | 232 ++++++++++++++++
 j/tree.c                           |  14 +
 outside/scrypt/Makefile            |  16 ++
 outside/scrypt/crypto_scrypt-sse.c | 357 +++++++++++++++++++++++++
 outside/scrypt/crypto_scrypt.h     |  51 ++++
 outside/scrypt/scrypt.a            | Bin 0 -> 82332 bytes
 outside/scrypt/sha256.c            | 411 +++++++++++++++++++++++++++++
 outside/scrypt/sha256.h            |  62 +++++
 outside/scrypt/sysendian.h         | 129 +++++++++
 12 files changed, 1298 insertions(+), 7 deletions(-)
 create mode 100644 j/e/scr.c
 create mode 100644 outside/scrypt/Makefile
 create mode 100644 outside/scrypt/crypto_scrypt-sse.c
 create mode 100644 outside/scrypt/crypto_scrypt.h
 create mode 100644 outside/scrypt/scrypt.a
 create mode 100644 outside/scrypt/sha256.c
 create mode 100644 outside/scrypt/sha256.h
 create mode 100644 outside/scrypt/sysendian.h

diff --git a/Makefile b/Makefile
index c83c8a0d7..5b94668d0 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ RM=rm -f
 CC=gcc
 CXX=g++
 CXXFLAGS=$(CFLAGS)
-CLD=g++ -g -L/usr/local/lib -L/opt/local/lib
+CLD=g++ -L/usr/local/lib -L/opt/local/lib
 
 ifeq ($(OS),osx)
   COSFLAGS=-fno-diagnostics-fixit-info
@@ -78,6 +78,7 @@ CFLAGS= $(COSFLAGS) -O3 -msse3 -ffast-math \
 	-Ioutside/ed25519/src \
 	-Ioutside/commonmark/src \
 	-Ioutside/commonmark/build/src \
+	-Ioutside/scrypt \
 	$(DEFINES) \
 	$(MDEFINES)
 
@@ -201,6 +202,7 @@ J_E_OFILES=\
        j/e/repg.o \
        j/e/rexp.o \
        j/e/rub.o \
+       j/e/scr.o \
        j/e/shax.o \
        j/e/lore.o \
        j/e/loss.o \
@@ -350,6 +352,8 @@ LIBANACHRONISM=outside/anachronism/build/libanachronism.a
 
 LIBCOMMONMARK=outside/commonmark/build/src/libcmark.a
 
+LIBSCRYPT=outside/scrypt/scrypt.a
+
 all: vere
 
 .MAKEFILE-VERSION: Makefile .make.conf
@@ -380,25 +384,28 @@ $(LIBANACHRONISM):
 $(LIBCOMMONMARK):
 	$(MAKE) -C outside/commonmark
 
+$(LIBSCRYPT):
+	$(MAKE) -C outside/scrypt MDEFINES="$(MDEFINES)"
+
 $(CRE2_OFILES): outside/cre2/src/src/cre2.cpp outside/cre2/src/src/cre2.h $(LIBRE2)
 	$(CXX) $(CXXFLAGS) -c $< -o $@
 
 $(V_OFILES): i/v/vere.h
 
 ifdef NO_SILENT_RULES
-$(BIN)/vere: $(LIBCRE) $(LIBCOMMONMARK) $(VERE_OFILES) $(LIBUV) $(LIBRE2) $(LIBED25519) $(LIBANACHRONISM)
+$(BIN)/vere: $(LIBCRE) $(LIBCOMMONMARK) $(VERE_OFILES) $(LIBUV) $(LIBRE2) $(LIBED25519) $(LIBANACHRONISM) $(LIBSCRYPT)
 	mkdir -p $(BIN)
-	$(CLD) $(CLDOSFLAGS) -o $(BIN)/vere $(VERE_OFILES) $(LIBUV) $(LIBCRE) $(LIBRE2) $(LIBED25519) $(LIBANACHRONISM) $(LIBS) $(LIBCOMMONMARK)
+	$(CLD) $(CLDOSFLAGS) -o $(BIN)/vere $(VERE_OFILES) $(LIBUV) $(LIBCRE) $(LIBRE2) $(LIBED25519) $(LIBANACHRONISM) $(LIBS) $(LIBCOMMONMARK) $(LIBSCRYPT)
 else
-$(BIN)/vere: $(LIBCRE) $(LIBCOMMONMARK) $(VERE_OFILES) $(LIBUV) $(LIBRE2) $(LIBED25519) $(LIBANACHRONISM)
+$(BIN)/vere: $(LIBCRE) $(LIBCOMMONMARK) $(VERE_OFILES) $(LIBUV) $(LIBRE2) $(LIBED25519) $(LIBANACHRONISM) $(LIBSCRYPT)
 	@echo "    CCLD  $(BIN)/vere"
 	@mkdir -p $(BIN)
-	@$(CLD) $(CLDOSFLAGS) -o $(BIN)/vere $(VERE_OFILES) $(LIBUV) $(LIBCRE) $(LIBRE2) $(LIBED25519) $(LIBANACHRONISM) $(LIBS) $(LIBCOMMONMARK)
+	@$(CLD) $(CLDOSFLAGS) -o $(BIN)/vere $(VERE_OFILES) $(LIBUV) $(LIBCRE) $(LIBRE2) $(LIBED25519) $(LIBANACHRONISM) $(LIBS) $(LIBCOMMONMARK) $(LIBSCRYPT)
 endif
 
-$(BIN)/meme: $(LIBCRE) $(LIBCOMMONMARK) $(MEME_OFILES) $(LIBUV) $(LIBRE2) $(LIBED25519) $(LIBANACHRONISM)
+$(BIN)/meme: $(LIBCRE) $(LIBCOMMONMARK) $(MEME_OFILES) $(LIBUV) $(LIBRE2) $(LIBED25519) $(LIBANACHRONISM) $(LIBSCRYPT)
 	mkdir -p $(BIN)
-	$(CLD) $(CLDOSFLAGS) -o $(BIN)/meme $(MEME_OFILES) $(LIBUV) $(LIBCRE) $(LIBRE2) $(LIBED25519) $(LIBANACHRONISM) $(LIBS) $(LIBCOMMONMARK)
+	$(CLD) $(CLDOSFLAGS) -o $(BIN)/meme $(MEME_OFILES) $(LIBUV) $(LIBCRE) $(LIBRE2) $(LIBED25519) $(LIBANACHRONISM) $(LIBS) $(LIBCOMMONMARK) $(LIBSCRYPT)
 
 tags:
 	ctags -R -f .tags --exclude=root
@@ -433,5 +440,6 @@ distclean: clean $(LIBUV_MAKEFILE)
 	$(MAKE) -C outside/re2 clean
 	$(MAKE) -C outside/ed25519 clean
 	$(MAKE) -C outside/anachronism clean
+	$(MAKE) -C outside/scrypt clean
 
 .PHONY: clean debbuild debinstalldistclean etags osxpackage tags
diff --git a/i/j/q.h b/i/j/q.h
index 9d490f6d2..04a636295 100644
--- a/i/j/q.h
+++ b/i/j/q.h
@@ -93,6 +93,12 @@
     u3_noun u3qea_de(u3_atom, u3_atom);
     u3_noun u3qea_en(u3_atom, u3_atom);
 
+    u3_noun u3qes_hsh(u3_atom, u3_atom, u3_atom, u3_atom, u3_atom, u3_atom);
+    u3_noun u3qes_hsl(u3_atom, u3_atom, u3_atom, u3_atom, u3_atom,
+                      u3_atom, u3_atom, u3_atom);
+    u3_noun u3qes_pbk(u3_atom, u3_atom, u3_atom, u3_atom);
+    u3_noun u3qes_pbl(u3_atom, u3_atom, u3_atom, u3_atom, u3_atom, u3_atom);
+
     u3_noun u3qe_shax(u3_atom);
     u3_noun u3qe_shay(u3_atom, u3_atom);
     u3_noun u3qe_shas(u3_atom, u3_atom);
diff --git a/i/j/w.h b/i/j/w.h
index 615f237c9..1ebb5f286 100644
--- a/i/j/w.h
+++ b/i/j/w.h
@@ -105,6 +105,11 @@
     u3_noun u3wea_de(u3_noun);
     u3_noun u3wea_en(u3_noun);
 
+    u3_noun u3wes_hsh(u3_noun);
+    u3_noun u3wes_hsl(u3_noun);
+    u3_noun u3wes_pbk(u3_noun);
+    u3_noun u3wes_pbl(u3_noun);
+
     u3_noun u3we_shax(u3_noun);
     u3_noun u3we_shay(u3_noun);
     u3_noun u3we_shas(u3_noun);
diff --git a/j/e/scr.c b/j/e/scr.c
new file mode 100644
index 000000000..3d6a87978
--- /dev/null
+++ b/j/e/scr.c
@@ -0,0 +1,232 @@
+/* j/5/scr.c
+**
+*/
+#include "all.h"
+
+#include <stdint.h>
+#include <errno.h>
+#include <crypto_scrypt.h>
+
+int _crypto_scrypt(const uint8_t *, size_t, const uint8_t *, size_t,
+    uint64_t, uint32_t, uint32_t, uint8_t *, size_t);
+
+/* functions
+*/
+
+  u3_noun
+  u3qes_hsl(u3_atom p, u3_atom pl, u3_atom s, u3_atom sl, u3_atom n,
+            u3_atom r, u3_atom  z, u3_atom d)
+  {
+    c3_assert(_(u3a_is_atom(p)) && _(u3a_is_atom(s)) &&
+              _(u3a_is_cat(pl)) && _(u3a_is_cat(sl)) &&
+              _(u3a_is_cat(n))  && _(u3a_is_cat(r))  &&
+              _(u3a_is_cat(z))  && _(u3a_is_cat(d))  &&
+               (r * z) < 1073741824);
+
+    c3_y* b_p = u3a_malloc(pl + 1); c3_y* b_s= u3a_malloc(sl + 1);    
+    u3r_bytes(0, pl, b_p, p);       u3r_bytes(0, sl, b_s, s);
+    b_p[pl] = 0; b_s[sl]=0;
+    c3_y* buf = u3a_malloc(d);
+
+    _crypto_scrypt(b_p, pl, b_s, sl, n, r, z, buf, d);
+
+    u3_noun res = u3i_bytes(d, buf);
+    u3a_free(b_p); u3a_free(b_s); u3a_free(buf);
+
+    return res;
+  }
+
+  u3_noun
+  u3wes_hsl(u3_noun cor)
+  {
+    u3_noun p, pl, s, sl, n, r, z, d;
+    u3_noun q;
+
+    u3x_quil(u3r_at(u3x_sam, cor), &p, &pl, &s, &sl, &q);
+    u3x_qual(q, &n, &r, &z, &d);
+
+    return u3qes_hsl(p, pl, s, sl, n, r, z, d);
+  }
+
+  u3_noun
+  u3qes_hsh(u3_atom p, u3_atom s, u3_atom n, u3_atom r, u3_atom  z, u3_atom d)
+  {
+    c3_assert(_(u3a_is_atom(p)) && _(u3a_is_atom(s)) &&
+              _(u3a_is_cat(n))  && _(u3a_is_cat(r))  &&
+              _(u3a_is_cat(z))  && _(u3a_is_cat(d))  &&
+               (r * z) < 1073741824);
+
+    c3_w   pl = u3r_met(3, p);      c3_w   sl = u3r_met(3, s);
+    c3_y* b_p = u3a_malloc(pl + 1); c3_y* b_s= u3a_malloc(sl + 1);    
+    u3r_bytes(0, pl, b_p, p);       u3r_bytes(0, sl, b_s, s);
+    b_p[pl] = 0; b_s[sl]=0;
+    c3_y* buf = u3a_malloc(d);
+
+    _crypto_scrypt(b_p, pl, b_s, sl, n, r, z, buf, d);
+
+    u3_noun res = u3i_bytes(d, buf);
+    u3a_free(b_p); u3a_free(b_s); u3a_free(buf);
+
+    return res;
+  }
+
+  u3_noun
+  u3wes_hsh(u3_noun cor)
+  {
+    u3_noun p, s, n, r, z, d;
+    u3_noun q;
+
+    u3x_quil(u3r_at(u3x_sam, cor), &p, &s, &n, &r, &q);
+    u3x_cell(q, &z, &d);
+
+    return u3qes_hsh(p, s, n, r, z, d);
+  }
+
+  u3_noun
+  u3qes_pbl(u3_atom p, u3_atom pl, u3_atom s, u3_atom sl,
+            u3_atom c, u3_atom d)
+  {
+    c3_assert(_(u3a_is_atom(p)) && _(u3a_is_atom(s)) &&
+              _(u3a_is_cat(pl)) && _(u3a_is_cat(sl)) &&
+              _(u3a_is_cat(c))  && _(u3a_is_cat(d)));
+
+    c3_y* b_p = u3a_malloc(pl + 1); c3_y* b_s= u3a_malloc(pl + 1);    
+    u3r_bytes(0, pl, b_p, p);       u3r_bytes(0, sl, b_s, s);
+    b_p[pl] = 0; b_s[sl]=0;
+    c3_y* buf = u3a_malloc(d);
+
+    PBKDF2_SHA256(b_p, pl, b_s, sl, c, buf, d);
+
+    u3_noun res = u3i_bytes(d, buf);
+    u3a_free(b_p); u3a_free(b_s); u3a_free(buf);
+
+    return res;
+  }
+
+  u3_noun
+  u3wes_pbl(u3_noun cor)
+  {
+    u3_noun p, pl, s, sl, c, d;
+    u3_noun q;
+
+    u3x_quil(u3r_at(u3x_sam, cor), &p, &pl, &s, &sl, &q);
+    u3x_cell(q, &c, &d);
+
+    return u3qes_pbl(p, pl, s, sl, c, d);
+  }
+
+  u3_noun
+  u3qes_pbk(u3_atom p, u3_atom s, u3_atom c, u3_atom d)
+  {
+    c3_assert(_(u3a_is_atom(p)) && _(u3a_is_atom(s)) &&
+              _(u3a_is_cat(c))  && _(u3a_is_cat(d)));
+
+    c3_w   pl = u3r_met(3, p);      c3_w   sl = u3r_met(3, s);
+    c3_y* b_p = u3a_malloc(pl + 1); c3_y* b_s= u3a_malloc(pl + 1);    
+    u3r_bytes(0, pl, b_p, p);       u3r_bytes(0, sl, b_s, s);
+    b_p[pl] = 0; b_s[sl]=0;
+    c3_y* buf = u3a_malloc(d);
+
+    PBKDF2_SHA256(b_p, pl, b_s, sl, c, buf, d);
+
+    u3_noun res = u3i_bytes(d, buf);
+    u3a_free(b_p); u3a_free(b_s); u3a_free(buf);
+
+    return res;
+  }
+
+  u3_noun
+  u3wes_pbk(u3_noun cor)
+  {
+    u3_noun p, s, c, d;
+
+    u3x_qual(u3r_at(u3x_sam, cor), &p, &s, &c, &d);
+
+    return u3qes_pbk(p, s, c, d);
+  }
+
+
+/**
+ * crypto_scrypt(passwd, passwdlen, salt, saltlen, N, r, p, buf, buflen):
+ * Compute scrypt(passwd[0 .. passwdlen - 1], salt[0 .. saltlen - 1], N, r,
+ * p, buflen) and write the result into buf.  The parameters r, p, and buflen
+ * must satisfy r * p < 2^30 and buflen <= (2^32 - 1) * 32.  The parameter N
+ * must be a power of 2 greater than 1.
+ *
+ * Return 0 on success; or -1 on error.
+ */
+int
+_crypto_scrypt(const uint8_t * passwd, size_t passwdlen,
+    const uint8_t * salt, size_t saltlen, uint64_t N, uint32_t r, uint32_t p,
+    uint8_t * buf, size_t buflen)
+{
+	void * B0, * V0, * XY0;
+	uint8_t * B;
+	uint32_t * V;
+	uint32_t * XY;
+	uint32_t i;
+
+	/* Sanity-check parameters. */
+#if SIZE_MAX > UINT32_MAX
+	if (buflen > (((uint64_t)(1) << 32) - 1) * 32) {
+		errno = EFBIG;
+		goto err0;
+	}
+#endif
+	if ((uint64_t)(r) * (uint64_t)(p) >= (1 << 30)) {
+		errno = EFBIG;
+		goto err0;
+	}
+	if (((N & (N - 1)) != 0) || (N == 0)) {
+		errno = EINVAL;
+		goto err0;
+	}
+	if ((r > SIZE_MAX / 128 / p) ||
+#if SIZE_MAX / 256 <= UINT32_MAX
+	    (r > (SIZE_MAX - 64) / 256) ||
+#endif
+	    (N > SIZE_MAX / 128 / r)) {
+		errno = ENOMEM;
+		goto err0;
+	}
+
+	/* Allocate memory. */
+	if ((B0 = u3a_malloc(128 * r * p + 63)) == NULL)
+		goto err0;
+	B = (uint8_t *)(((uintptr_t)(B0) + 63) & ~ (uintptr_t)(63));
+	if ((XY0 = u3a_malloc(256 * r + 64 + 63)) == NULL)
+		goto err1;
+	XY = (uint32_t *)(((uintptr_t)(XY0) + 63) & ~ (uintptr_t)(63));
+	if ((V0 = u3a_malloc(128 * r * N + 63)) == NULL)
+		goto err2;
+	V = (uint32_t *)(((uintptr_t)(V0) + 63) & ~ (uintptr_t)(63));
+
+	/* 1: (B_0 ... B_{p-1}) <-- PBKDF2(P, S, 1, p * MFLen) */
+	PBKDF2_SHA256(passwd, passwdlen, salt, saltlen, 1, B, p * 128 * r);
+
+	/* 2: for i = 0 to p - 1 do */
+	for (i = 0; i < p; i++) {
+		/* 3: B_i <-- MF(B_i, N) */
+		smix(&B[i * 128 * r], r, N, V, XY);
+	}
+
+	/* 5: DK <-- PBKDF2(P, B, 1, dkLen) */
+	PBKDF2_SHA256(passwd, passwdlen, B, p * 128 * r, 1, buf, buflen);
+
+	/* Free memory. */
+
+	u3a_free(V0);
+	u3a_free(XY0);
+	u3a_free(B0);
+
+	/* Success! */
+	return (0);
+
+err2:
+	u3a_free(XY0);
+err1:
+	u3a_free(B0);
+err0:
+	/* Failure! */
+	return (-1);
+}
diff --git a/j/tree.c b/j/tree.c
index ae778d98c..6c0ff2b46 100644
--- a/j/tree.c
+++ b/j/tree.c
@@ -231,6 +231,18 @@ static u3j_core _mood__hoon__coed_d[] =
     {}
   };
 
+static u3j_harm _mood__hoon__scr_hsh_a[] = {{".2", u3wes_hsh}, {}};
+static u3j_harm _mood__hoon__scr_hsl_a[] = {{".2", u3wes_hsl}, {}};
+static u3j_harm _mood__hoon__scr_pbk_a[] = {{".2", u3wes_pbk}, {}};
+static u3j_harm _mood__hoon__scr_pbl_a[] = {{".2", u3wes_pbl}, {}};
+static u3j_core _mood__hoon__scr_d[] =
+  {  { "hsh", _mood__hoon__scr_hsh_a },
+     { "hsl", _mood__hoon__scr_hsl_a },
+     { "pbk", _mood__hoon__scr_pbk_a },
+     { "pbl", _mood__hoon__scr_pbl_a },
+     {}
+  };
+
 static u3j_harm _mood__hoon_pfix_a[] = {{".2", u3we_pfix}, {}};
 static u3j_harm _mood__hoon_plug_a[] = {{".2", u3we_plug}, {}};
 static u3j_harm _mood__hoon_pose_a[] = {{".2", u3we_pose}, {}};
@@ -449,6 +461,8 @@ static u3j_core _mood__hoon_d[] =
     { "rd", 0, _mood__hoon__rd_d },
     { "coed", 0, _mood__hoon__coed_d },
 
+    { "scr", 0, _mood__hoon__scr_d },
+
     { "pfix", _mood__hoon_pfix_a },
     { "plug", _mood__hoon_plug_a },
     { "pose", _mood__hoon_pose_a },
diff --git a/outside/scrypt/Makefile b/outside/scrypt/Makefile
new file mode 100644
index 000000000..f3ac5acb9
--- /dev/null
+++ b/outside/scrypt/Makefile
@@ -0,0 +1,16 @@
+default: all
+
+CC?=gcc
+CFLAGS?=-O2 -msse3 -ffast-math \
+	-Wall -g -D_FORTIFY_SOURCE=2 -fPIC
+CFLAGS_EXTRA?=-Wl,-rpath=.
+
+all: scrypt.a
+
+OBJS= crypto_scrypt-sse.o sha256.o
+
+scrypt.a: $(OBJS)
+	ar rcs scrypt.a  $(OBJS)
+
+clean:
+	rm -f *.o scrypt.a
diff --git a/outside/scrypt/crypto_scrypt-sse.c b/outside/scrypt/crypto_scrypt-sse.c
new file mode 100644
index 000000000..d7b33c078
--- /dev/null
+++ b/outside/scrypt/crypto_scrypt-sse.c
@@ -0,0 +1,357 @@
+/*-
+ * Copyright 2009 Colin Percival
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * This file was originally written by Colin Percival as part of the Tarsnap
+ * online backup system.
+ */
+#include <sys/types.h>
+#include <sys/mman.h>
+
+#include <emmintrin.h>
+#include <errno.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "sha256.h"
+#include "sysendian.h"
+
+#include "crypto_scrypt.h"
+
+static void
+blkcpy(void * dest, void * src, size_t len)
+{
+	__m128i * D = dest;
+	__m128i * S = src;
+	size_t L = len / 16;
+	size_t i;
+
+	for (i = 0; i < L; i++)
+		D[i] = S[i];
+}
+
+static void
+blkxor(void * dest, void * src, size_t len)
+{
+	__m128i * D = dest;
+	__m128i * S = src;
+	size_t L = len / 16;
+	size_t i;
+
+	for (i = 0; i < L; i++)
+		D[i] = _mm_xor_si128(D[i], S[i]);
+}
+
+/**
+ * salsa20_8(B):
+ * Apply the salsa20/8 core to the provided block.
+ */
+static void
+salsa20_8(__m128i B[4])
+{
+	__m128i X0, X1, X2, X3;
+	__m128i T;
+	size_t i;
+
+	X0 = B[0];
+	X1 = B[1];
+	X2 = B[2];
+	X3 = B[3];
+
+	for (i = 0; i < 8; i += 2) {
+		/* Operate on "columns". */
+		T = _mm_add_epi32(X0, X3);
+		X1 = _mm_xor_si128(X1, _mm_slli_epi32(T, 7));
+		X1 = _mm_xor_si128(X1, _mm_srli_epi32(T, 25));
+		T = _mm_add_epi32(X1, X0);
+		X2 = _mm_xor_si128(X2, _mm_slli_epi32(T, 9));
+		X2 = _mm_xor_si128(X2, _mm_srli_epi32(T, 23));
+		T = _mm_add_epi32(X2, X1);
+		X3 = _mm_xor_si128(X3, _mm_slli_epi32(T, 13));
+		X3 = _mm_xor_si128(X3, _mm_srli_epi32(T, 19));
+		T = _mm_add_epi32(X3, X2);
+		X0 = _mm_xor_si128(X0, _mm_slli_epi32(T, 18));
+		X0 = _mm_xor_si128(X0, _mm_srli_epi32(T, 14));
+
+		/* Rearrange data. */
+		X1 = _mm_shuffle_epi32(X1, 0x93);
+		X2 = _mm_shuffle_epi32(X2, 0x4E);
+		X3 = _mm_shuffle_epi32(X3, 0x39);
+
+		/* Operate on "rows". */
+		T = _mm_add_epi32(X0, X1);
+		X3 = _mm_xor_si128(X3, _mm_slli_epi32(T, 7));
+		X3 = _mm_xor_si128(X3, _mm_srli_epi32(T, 25));
+		T = _mm_add_epi32(X3, X0);
+		X2 = _mm_xor_si128(X2, _mm_slli_epi32(T, 9));
+		X2 = _mm_xor_si128(X2, _mm_srli_epi32(T, 23));
+		T = _mm_add_epi32(X2, X3);
+		X1 = _mm_xor_si128(X1, _mm_slli_epi32(T, 13));
+		X1 = _mm_xor_si128(X1, _mm_srli_epi32(T, 19));
+		T = _mm_add_epi32(X1, X2);
+		X0 = _mm_xor_si128(X0, _mm_slli_epi32(T, 18));
+		X0 = _mm_xor_si128(X0, _mm_srli_epi32(T, 14));
+
+		/* Rearrange data. */
+		X1 = _mm_shuffle_epi32(X1, 0x39);
+		X2 = _mm_shuffle_epi32(X2, 0x4E);
+		X3 = _mm_shuffle_epi32(X3, 0x93);
+	}
+
+	B[0] = _mm_add_epi32(B[0], X0);
+	B[1] = _mm_add_epi32(B[1], X1);
+	B[2] = _mm_add_epi32(B[2], X2);
+	B[3] = _mm_add_epi32(B[3], X3);
+}
+
+/**
+ * blockmix_salsa8(Bin, Bout, X, r):
+ * Compute Bout = BlockMix_{salsa20/8, r}(Bin).  The input Bin must be 128r
+ * bytes in length; the output Bout must also be the same size.  The
+ * temporary space X must be 64 bytes.
+ */
+static void
+blockmix_salsa8(__m128i * Bin, __m128i * Bout, __m128i * X, size_t r)
+{
+	size_t i;
+
+	/* 1: X <-- B_{2r - 1} */
+	blkcpy(X, &Bin[8 * r - 4], 64);
+
+	/* 2: for i = 0 to 2r - 1 do */
+	for (i = 0; i < r; i++) {
+		/* 3: X <-- H(X \xor B_i) */
+		blkxor(X, &Bin[i * 8], 64);
+		salsa20_8(X);
+
+		/* 4: Y_i <-- X */
+		/* 6: B' <-- (Y_0, Y_2 ... Y_{2r-2}, Y_1, Y_3 ... Y_{2r-1}) */
+		blkcpy(&Bout[i * 4], X, 64);
+
+		/* 3: X <-- H(X \xor B_i) */
+		blkxor(X, &Bin[i * 8 + 4], 64);
+		salsa20_8(X);
+
+		/* 4: Y_i <-- X */
+		/* 6: B' <-- (Y_0, Y_2 ... Y_{2r-2}, Y_1, Y_3 ... Y_{2r-1}) */
+		blkcpy(&Bout[(r + i) * 4], X, 64);
+	}
+}
+
+/**
+ * integerify(B, r):
+ * Return the result of parsing B_{2r-1} as a little-endian integer.
+ */
+static uint64_t
+integerify(void * B, size_t r)
+{
+	uint32_t * X = (void *)((uintptr_t)(B) + (2 * r - 1) * 64);
+
+	return (((uint64_t)(X[13]) << 32) + X[0]);
+}
+
+/**
+ * smix(B, r, N, V, XY):
+ * Compute B = SMix_r(B, N).  The input B must be 128r bytes in length;
+ * the temporary storage V must be 128rN bytes in length; the temporary
+ * storage XY must be 256r + 64 bytes in length.  The value N must be a
+ * power of 2 greater than 1.  The arrays B, V, and XY must be aligned to a
+ * multiple of 64 bytes.
+ */
+void
+smix(uint8_t * B, size_t r, uint64_t N, void * V, void * XY)
+{
+	__m128i * X = XY;
+	__m128i * Y = (void *)((uintptr_t)(XY) + 128 * r);
+	__m128i * Z = (void *)((uintptr_t)(XY) + 256 * r);
+	uint32_t * X32 = (void *)X;
+	uint64_t i, j;
+	size_t k;
+
+	/* 1: X <-- B */
+	for (k = 0; k < 2 * r; k++) {
+		for (i = 0; i < 16; i++) {
+			X32[k * 16 + i] =
+			    le32dec(&B[(k * 16 + (i * 5 % 16)) * 4]);
+		}
+	}
+
+	/* 2: for i = 0 to N - 1 do */
+	for (i = 0; i < N; i += 2) {
+		/* 3: V_i <-- X */
+		blkcpy((void *)((uintptr_t)(V) + i * 128 * r), X, 128 * r);
+
+		/* 4: X <-- H(X) */
+		blockmix_salsa8(X, Y, Z, r);
+
+		/* 3: V_i <-- X */
+		blkcpy((void *)((uintptr_t)(V) + (i + 1) * 128 * r),
+		    Y, 128 * r);
+
+		/* 4: X <-- H(X) */
+		blockmix_salsa8(Y, X, Z, r);
+	}
+
+	/* 6: for i = 0 to N - 1 do */
+	for (i = 0; i < N; i += 2) {
+		/* 7: j <-- Integerify(X) mod N */
+		j = integerify(X, r) & (N - 1);
+
+		/* 8: X <-- H(X \xor V_j) */
+		blkxor(X, (void *)((uintptr_t)(V) + j * 128 * r), 128 * r);
+		blockmix_salsa8(X, Y, Z, r);
+
+		/* 7: j <-- Integerify(X) mod N */
+		j = integerify(Y, r) & (N - 1);
+
+		/* 8: X <-- H(X \xor V_j) */
+		blkxor(Y, (void *)((uintptr_t)(V) + j * 128 * r), 128 * r);
+		blockmix_salsa8(Y, X, Z, r);
+	}
+
+	/* 10: B' <-- X */
+	for (k = 0; k < 2 * r; k++) {
+		for (i = 0; i < 16; i++) {
+			le32enc(&B[(k * 16 + (i * 5 % 16)) * 4],
+			    X32[k * 16 + i]);
+		}
+	}
+}
+
+/**
+ * crypto_scrypt(passwd, passwdlen, salt, saltlen, N, r, p, buf, buflen):
+ * Compute scrypt(passwd[0 .. passwdlen - 1], salt[0 .. saltlen - 1], N, r,
+ * p, buflen) and write the result into buf.  The parameters r, p, and buflen
+ * must satisfy r * p < 2^30 and buflen <= (2^32 - 1) * 32.  The parameter N
+ * must be a power of 2 greater than 1.
+ *
+ * Return 0 on success; or -1 on error.
+ */
+int
+crypto_scrypt(const uint8_t * passwd, size_t passwdlen,
+    const uint8_t * salt, size_t saltlen, uint64_t N, uint32_t r, uint32_t p,
+    uint8_t * buf, size_t buflen)
+{
+	void * B0, * V0, * XY0;
+	uint8_t * B;
+	uint32_t * V;
+	uint32_t * XY;
+	uint32_t i;
+
+	/* Sanity-check parameters. */
+#if SIZE_MAX > UINT32_MAX
+	if (buflen > (((uint64_t)(1) << 32) - 1) * 32) {
+		errno = EFBIG;
+		goto err0;
+	}
+#endif
+	if ((uint64_t)(r) * (uint64_t)(p) >= (1 << 30)) {
+		errno = EFBIG;
+		goto err0;
+	}
+	if (((N & (N - 1)) != 0) || (N == 0)) {
+		errno = EINVAL;
+		goto err0;
+	}
+	if ((r > SIZE_MAX / 128 / p) ||
+#if SIZE_MAX / 256 <= UINT32_MAX
+	    (r > (SIZE_MAX - 64) / 256) ||
+#endif
+	    (N > SIZE_MAX / 128 / r)) {
+		errno = ENOMEM;
+		goto err0;
+	}
+
+	/* Allocate memory. */
+#ifdef HAVE_POSIX_MEMALIGN
+	if ((errno = posix_memalign(&B0, 64, 128 * r * p)) != 0)
+		goto err0;
+	B = (uint8_t *)(B0);
+	if ((errno = posix_memalign(&XY0, 64, 256 * r + 64)) != 0)
+		goto err1;
+	XY = (uint32_t *)(XY0);
+#ifndef MAP_ANON
+	if ((errno = posix_memalign(&V0, 64, 128 * r * N)) != 0)
+		goto err2;
+	V = (uint32_t *)(V0);
+#endif
+#else
+	if ((B0 = malloc(128 * r * p + 63)) == NULL)
+		goto err0;
+	B = (uint8_t *)(((uintptr_t)(B0) + 63) & ~ (uintptr_t)(63));
+	if ((XY0 = malloc(256 * r + 64 + 63)) == NULL)
+		goto err1;
+	XY = (uint32_t *)(((uintptr_t)(XY0) + 63) & ~ (uintptr_t)(63));
+#ifndef MAP_ANON
+	if ((V0 = malloc(128 * r * N + 63)) == NULL)
+		goto err2;
+	V = (uint32_t *)(((uintptr_t)(V0) + 63) & ~ (uintptr_t)(63));
+#endif
+#endif
+#ifdef MAP_ANON
+	if ((V0 = mmap(NULL, 128 * r * N, PROT_READ | PROT_WRITE,
+#ifdef MAP_NOCORE
+	    MAP_ANON | MAP_PRIVATE | MAP_NOCORE,
+#else
+	    MAP_ANON | MAP_PRIVATE,
+#endif
+	    -1, 0)) == MAP_FAILED)
+		goto err2;
+	V = (uint32_t *)(V0);
+#endif
+
+	/* 1: (B_0 ... B_{p-1}) <-- PBKDF2(P, S, 1, p * MFLen) */
+	PBKDF2_SHA256(passwd, passwdlen, salt, saltlen, 1, B, p * 128 * r);
+
+	/* 2: for i = 0 to p - 1 do */
+	for (i = 0; i < p; i++) {
+		/* 3: B_i <-- MF(B_i, N) */
+		smix(&B[i * 128 * r], r, N, V, XY);
+	}
+
+	/* 5: DK <-- PBKDF2(P, B, 1, dkLen) */
+	PBKDF2_SHA256(passwd, passwdlen, B, p * 128 * r, 1, buf, buflen);
+
+	/* Free memory. */
+#ifdef MAP_ANON
+	if (munmap(V0, 128 * r * N))
+		goto err2;
+#else
+	free(V0);
+#endif
+	free(XY0);
+	free(B0);
+
+	/* Success! */
+	return (0);
+
+err2:
+	free(XY0);
+err1:
+	free(B0);
+err0:
+	/* Failure! */
+	return (-1);
+}
diff --git a/outside/scrypt/crypto_scrypt.h b/outside/scrypt/crypto_scrypt.h
new file mode 100644
index 000000000..b88be09d8
--- /dev/null
+++ b/outside/scrypt/crypto_scrypt.h
@@ -0,0 +1,51 @@
+/*-
+ * Copyright 2009 Colin Percival
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * This file was originally written by Colin Percival as part of the Tarsnap
+ * online backup system.
+ */
+#ifndef _CRYPTO_SCRYPT_H_
+#define _CRYPTO_SCRYPT_H_
+
+#include <stdint.h>
+#include <emmintrin.h>
+
+void smix(uint8_t *, size_t, uint64_t, void *, void *);
+void PBKDF2_SHA256(const uint8_t *, size_t, const uint8_t *, size_t,
+    uint64_t, uint8_t *, size_t);
+
+/**
+ * crypto_scrypt(passwd, passwdlen, salt, saltlen, N, r, p, buf, buflen):
+ * Compute scrypt(passwd[0 .. passwdlen - 1], salt[0 .. saltlen - 1], N, r,
+ * p, buflen) and write the result into buf.  The parameters r, p, and buflen
+ * must satisfy r * p < 2^30 and buflen <= (2^32 - 1) * 32.  The parameter N
+ * must be a power of 2 greater than 1.
+ *
+ * Return 0 on success; or -1 on error.
+ */
+int crypto_scrypt(const uint8_t *, size_t, const uint8_t *, size_t, uint64_t,
+    uint32_t, uint32_t, uint8_t *, size_t);
+
+#endif /* !_CRYPTO_SCRYPT_H_ */
diff --git a/outside/scrypt/scrypt.a b/outside/scrypt/scrypt.a
new file mode 100644
index 0000000000000000000000000000000000000000..94106a866015690695216eabe99dd40198d7363f
GIT binary patch
literal 82332
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
N$$1^D7Cq1Z{{a2a0Hgo_

literal 0
HcmV?d00001

diff --git a/outside/scrypt/sha256.c b/outside/scrypt/sha256.c
new file mode 100644
index 000000000..d2f915f1a
--- /dev/null
+++ b/outside/scrypt/sha256.c
@@ -0,0 +1,411 @@
+/*-
+ * Copyright 2005,2007,2009 Colin Percival
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/types.h>
+
+#include <stdint.h>
+#include <string.h>
+
+#include "sysendian.h"
+
+#include "sha256.h"
+
+/*
+ * Encode a length len/4 vector of (uint32_t) into a length len vector of
+ * (unsigned char) in big-endian form.  Assumes len is a multiple of 4.
+ */
+static void
+be32enc_vect(unsigned char *dst, const uint32_t *src, size_t len)
+{
+	size_t i;
+
+	for (i = 0; i < len / 4; i++)
+		be32enc(dst + i * 4, src[i]);
+}
+
+/*
+ * Decode a big-endian length len vector of (unsigned char) into a length
+ * len/4 vector of (uint32_t).  Assumes len is a multiple of 4.
+ */
+static void
+be32dec_vect(uint32_t *dst, const unsigned char *src, size_t len)
+{
+	size_t i;
+
+	for (i = 0; i < len / 4; i++)
+		dst[i] = be32dec(src + i * 4);
+}
+
+/* Elementary functions used by SHA256 */
+#define Ch(x, y, z)	((x & (y ^ z)) ^ z)
+#define Maj(x, y, z)	((x & (y | z)) | (y & z))
+#define SHR(x, n)	(x >> n)
+#define ROTR(x, n)	((x >> n) | (x << (32 - n)))
+#define S0(x)		(ROTR(x, 2) ^ ROTR(x, 13) ^ ROTR(x, 22))
+#define S1(x)		(ROTR(x, 6) ^ ROTR(x, 11) ^ ROTR(x, 25))
+#define s0(x)		(ROTR(x, 7) ^ ROTR(x, 18) ^ SHR(x, 3))
+#define s1(x)		(ROTR(x, 17) ^ ROTR(x, 19) ^ SHR(x, 10))
+
+/* SHA256 round function */
+#define RND(a, b, c, d, e, f, g, h, k)			\
+	t0 = h + S1(e) + Ch(e, f, g) + k;		\
+	t1 = S0(a) + Maj(a, b, c);			\
+	d += t0;					\
+	h  = t0 + t1;
+
+/* Adjusted round function for rotating state */
+#define RNDr(S, W, i, k)			\
+	RND(S[(64 - i) % 8], S[(65 - i) % 8],	\
+	    S[(66 - i) % 8], S[(67 - i) % 8],	\
+	    S[(68 - i) % 8], S[(69 - i) % 8],	\
+	    S[(70 - i) % 8], S[(71 - i) % 8],	\
+	    W[i] + k)
+
+/*
+ * SHA256 block compression function.  The 256-bit state is transformed via
+ * the 512-bit input block to produce a new state.
+ */
+static void
+SHA256_Transform(uint32_t * state, const unsigned char block[64])
+{
+	uint32_t W[64];
+	uint32_t S[8];
+	uint32_t t0, t1;
+	int i;
+
+	/* 1. Prepare message schedule W. */
+	be32dec_vect(W, block, 64);
+	for (i = 16; i < 64; i++)
+		W[i] = s1(W[i - 2]) + W[i - 7] + s0(W[i - 15]) + W[i - 16];
+
+	/* 2. Initialize working variables. */
+	memcpy(S, state, 32);
+
+	/* 3. Mix. */
+	RNDr(S, W, 0, 0x428a2f98);
+	RNDr(S, W, 1, 0x71374491);
+	RNDr(S, W, 2, 0xb5c0fbcf);
+	RNDr(S, W, 3, 0xe9b5dba5);
+	RNDr(S, W, 4, 0x3956c25b);
+	RNDr(S, W, 5, 0x59f111f1);
+	RNDr(S, W, 6, 0x923f82a4);
+	RNDr(S, W, 7, 0xab1c5ed5);
+	RNDr(S, W, 8, 0xd807aa98);
+	RNDr(S, W, 9, 0x12835b01);
+	RNDr(S, W, 10, 0x243185be);
+	RNDr(S, W, 11, 0x550c7dc3);
+	RNDr(S, W, 12, 0x72be5d74);
+	RNDr(S, W, 13, 0x80deb1fe);
+	RNDr(S, W, 14, 0x9bdc06a7);
+	RNDr(S, W, 15, 0xc19bf174);
+	RNDr(S, W, 16, 0xe49b69c1);
+	RNDr(S, W, 17, 0xefbe4786);
+	RNDr(S, W, 18, 0x0fc19dc6);
+	RNDr(S, W, 19, 0x240ca1cc);
+	RNDr(S, W, 20, 0x2de92c6f);
+	RNDr(S, W, 21, 0x4a7484aa);
+	RNDr(S, W, 22, 0x5cb0a9dc);
+	RNDr(S, W, 23, 0x76f988da);
+	RNDr(S, W, 24, 0x983e5152);
+	RNDr(S, W, 25, 0xa831c66d);
+	RNDr(S, W, 26, 0xb00327c8);
+	RNDr(S, W, 27, 0xbf597fc7);
+	RNDr(S, W, 28, 0xc6e00bf3);
+	RNDr(S, W, 29, 0xd5a79147);
+	RNDr(S, W, 30, 0x06ca6351);
+	RNDr(S, W, 31, 0x14292967);
+	RNDr(S, W, 32, 0x27b70a85);
+	RNDr(S, W, 33, 0x2e1b2138);
+	RNDr(S, W, 34, 0x4d2c6dfc);
+	RNDr(S, W, 35, 0x53380d13);
+	RNDr(S, W, 36, 0x650a7354);
+	RNDr(S, W, 37, 0x766a0abb);
+	RNDr(S, W, 38, 0x81c2c92e);
+	RNDr(S, W, 39, 0x92722c85);
+	RNDr(S, W, 40, 0xa2bfe8a1);
+	RNDr(S, W, 41, 0xa81a664b);
+	RNDr(S, W, 42, 0xc24b8b70);
+	RNDr(S, W, 43, 0xc76c51a3);
+	RNDr(S, W, 44, 0xd192e819);
+	RNDr(S, W, 45, 0xd6990624);
+	RNDr(S, W, 46, 0xf40e3585);
+	RNDr(S, W, 47, 0x106aa070);
+	RNDr(S, W, 48, 0x19a4c116);
+	RNDr(S, W, 49, 0x1e376c08);
+	RNDr(S, W, 50, 0x2748774c);
+	RNDr(S, W, 51, 0x34b0bcb5);
+	RNDr(S, W, 52, 0x391c0cb3);
+	RNDr(S, W, 53, 0x4ed8aa4a);
+	RNDr(S, W, 54, 0x5b9cca4f);
+	RNDr(S, W, 55, 0x682e6ff3);
+	RNDr(S, W, 56, 0x748f82ee);
+	RNDr(S, W, 57, 0x78a5636f);
+	RNDr(S, W, 58, 0x84c87814);
+	RNDr(S, W, 59, 0x8cc70208);
+	RNDr(S, W, 60, 0x90befffa);
+	RNDr(S, W, 61, 0xa4506ceb);
+	RNDr(S, W, 62, 0xbef9a3f7);
+	RNDr(S, W, 63, 0xc67178f2);
+
+	/* 4. Mix local working variables into global state */
+	for (i = 0; i < 8; i++)
+		state[i] += S[i];
+
+	/* Clean the stack. */
+	memset(W, 0, 256);
+	memset(S, 0, 32);
+	t0 = t1 = 0;
+}
+
+static unsigned char PAD[64] = {
+	0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+};
+
+/* Add padding and terminating bit-count. */
+static void
+SHA256_Pad(SHA256_CTX * ctx)
+{
+	unsigned char len[8];
+	uint32_t r, plen;
+
+	/*
+	 * Convert length to a vector of bytes -- we do this now rather
+	 * than later because the length will change after we pad.
+	 */
+	be32enc_vect(len, ctx->count, 8);
+
+	/* Add 1--64 bytes so that the resulting length is 56 mod 64 */
+	r = (ctx->count[1] >> 3) & 0x3f;
+	plen = (r < 56) ? (56 - r) : (120 - r);
+	SHA256_Update(ctx, PAD, (size_t)plen);
+
+	/* Add the terminating bit-count */
+	SHA256_Update(ctx, len, 8);
+}
+
+/* SHA-256 initialization.  Begins a SHA-256 operation. */
+void
+SHA256_Init(SHA256_CTX * ctx)
+{
+
+	/* Zero bits processed so far */
+	ctx->count[0] = ctx->count[1] = 0;
+
+	/* Magic initialization constants */
+	ctx->state[0] = 0x6A09E667;
+	ctx->state[1] = 0xBB67AE85;
+	ctx->state[2] = 0x3C6EF372;
+	ctx->state[3] = 0xA54FF53A;
+	ctx->state[4] = 0x510E527F;
+	ctx->state[5] = 0x9B05688C;
+	ctx->state[6] = 0x1F83D9AB;
+	ctx->state[7] = 0x5BE0CD19;
+}
+
+/* Add bytes into the hash */
+void
+SHA256_Update(SHA256_CTX * ctx, const void *in, size_t len)
+{
+	uint32_t bitlen[2];
+	uint32_t r;
+	const unsigned char *src = in;
+
+	/* Number of bytes left in the buffer from previous updates */
+	r = (ctx->count[1] >> 3) & 0x3f;
+
+	/* Convert the length into a number of bits */
+	bitlen[1] = ((uint32_t)len) << 3;
+	bitlen[0] = (uint32_t)(len >> 29);
+
+	/* Update number of bits */
+	if ((ctx->count[1] += bitlen[1]) < bitlen[1])
+		ctx->count[0]++;
+	ctx->count[0] += bitlen[0];
+
+	/* Handle the case where we don't need to perform any transforms */
+	if (len < 64 - r) {
+		memcpy(&ctx->buf[r], src, len);
+		return;
+	}
+
+	/* Finish the current block */
+	memcpy(&ctx->buf[r], src, 64 - r);
+	SHA256_Transform(ctx->state, ctx->buf);
+	src += 64 - r;
+	len -= 64 - r;
+
+	/* Perform complete blocks */
+	while (len >= 64) {
+		SHA256_Transform(ctx->state, src);
+		src += 64;
+		len -= 64;
+	}
+
+	/* Copy left over data into buffer */
+	memcpy(ctx->buf, src, len);
+}
+
+/*
+ * SHA-256 finalization.  Pads the input data, exports the hash value,
+ * and clears the context state.
+ */
+void
+SHA256_Final(unsigned char digest[32], SHA256_CTX * ctx)
+{
+
+	/* Add padding */
+	SHA256_Pad(ctx);
+
+	/* Write the hash */
+	be32enc_vect(digest, ctx->state, 32);
+
+	/* Clear the context state */
+	memset((void *)ctx, 0, sizeof(*ctx));
+}
+
+/* Initialize an HMAC-SHA256 operation with the given key. */
+void
+HMAC_SHA256_Init(HMAC_SHA256_CTX * ctx, const void * _K, size_t Klen)
+{
+	unsigned char pad[64];
+	unsigned char khash[32];
+	const unsigned char * K = _K;
+	size_t i;
+
+	/* If Klen > 64, the key is really SHA256(K). */
+	if (Klen > 64) {
+		SHA256_Init(&ctx->ictx);
+		SHA256_Update(&ctx->ictx, K, Klen);
+		SHA256_Final(khash, &ctx->ictx);
+		K = khash;
+		Klen = 32;
+	}
+
+	/* Inner SHA256 operation is SHA256(K xor [block of 0x36] || data). */
+	SHA256_Init(&ctx->ictx);
+	memset(pad, 0x36, 64);
+	for (i = 0; i < Klen; i++)
+		pad[i] ^= K[i];
+	SHA256_Update(&ctx->ictx, pad, 64);
+
+	/* Outer SHA256 operation is SHA256(K xor [block of 0x5c] || hash). */
+	SHA256_Init(&ctx->octx);
+	memset(pad, 0x5c, 64);
+	for (i = 0; i < Klen; i++)
+		pad[i] ^= K[i];
+	SHA256_Update(&ctx->octx, pad, 64);
+
+	/* Clean the stack. */
+	memset(khash, 0, 32);
+}
+
+/* Add bytes to the HMAC-SHA256 operation. */
+void
+HMAC_SHA256_Update(HMAC_SHA256_CTX * ctx, const void *in, size_t len)
+{
+
+	/* Feed data to the inner SHA256 operation. */
+	SHA256_Update(&ctx->ictx, in, len);
+}
+
+/* Finish an HMAC-SHA256 operation. */
+void
+HMAC_SHA256_Final(unsigned char digest[32], HMAC_SHA256_CTX * ctx)
+{
+	unsigned char ihash[32];
+
+	/* Finish the inner SHA256 operation. */
+	SHA256_Final(ihash, &ctx->ictx);
+
+	/* Feed the inner hash to the outer SHA256 operation. */
+	SHA256_Update(&ctx->octx, ihash, 32);
+
+	/* Finish the outer SHA256 operation. */
+	SHA256_Final(digest, &ctx->octx);
+
+	/* Clean the stack. */
+	memset(ihash, 0, 32);
+}
+
+/**
+ * PBKDF2_SHA256(passwd, passwdlen, salt, saltlen, c, buf, dkLen):
+ * Compute PBKDF2(passwd, salt, c, dkLen) using HMAC-SHA256 as the PRF, and
+ * write the output to buf.  The value dkLen must be at most 32 * (2^32 - 1).
+ */
+void
+PBKDF2_SHA256(const uint8_t * passwd, size_t passwdlen, const uint8_t * salt,
+    size_t saltlen, uint64_t c, uint8_t * buf, size_t dkLen)
+{
+	HMAC_SHA256_CTX PShctx, hctx;
+	size_t i;
+	uint8_t ivec[4];
+	uint8_t U[32];
+	uint8_t T[32];
+	uint64_t j;
+	int k;
+	size_t clen;
+
+	/* Compute HMAC state after processing P and S. */
+	HMAC_SHA256_Init(&PShctx, passwd, passwdlen);
+	HMAC_SHA256_Update(&PShctx, salt, saltlen);
+
+	/* Iterate through the blocks. */
+	for (i = 0; i * 32 < dkLen; i++) {
+		/* Generate INT(i + 1). */
+		be32enc(ivec, (uint32_t)(i + 1));
+
+		/* Compute U_1 = PRF(P, S || INT(i)). */
+		memcpy(&hctx, &PShctx, sizeof(HMAC_SHA256_CTX));
+		HMAC_SHA256_Update(&hctx, ivec, 4);
+		HMAC_SHA256_Final(U, &hctx);
+
+		/* T_i = U_1 ... */
+		memcpy(T, U, 32);
+
+		for (j = 2; j <= c; j++) {
+			/* Compute U_j. */
+			HMAC_SHA256_Init(&hctx, passwd, passwdlen);
+			HMAC_SHA256_Update(&hctx, U, 32);
+			HMAC_SHA256_Final(U, &hctx);
+
+			/* ... xor U_j ... */
+			for (k = 0; k < 32; k++)
+				T[k] ^= U[k];
+		}
+
+		/* Copy as many bytes as necessary into buf. */
+		clen = dkLen - i * 32;
+		if (clen > 32)
+			clen = 32;
+		memcpy(&buf[i * 32], T, clen);
+	}
+
+	/* Clean PShctx, since we never called _Final on it. */
+	memset(&PShctx, 0, sizeof(HMAC_SHA256_CTX));
+}
diff --git a/outside/scrypt/sha256.h b/outside/scrypt/sha256.h
new file mode 100644
index 000000000..289a5232f
--- /dev/null
+++ b/outside/scrypt/sha256.h
@@ -0,0 +1,62 @@
+/*-
+ * Copyright 2005,2007,2009 Colin Percival
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD: src/lib/libmd/sha256.h,v 1.2 2006/01/17 15:35:56 phk Exp $
+ */
+
+#ifndef _SHA256_H_
+#define _SHA256_H_
+
+#include <sys/types.h>
+
+#include <stdint.h>
+
+typedef struct SHA256Context {
+	uint32_t state[8];
+	uint32_t count[2];
+	unsigned char buf[64];
+} SHA256_CTX;
+
+typedef struct HMAC_SHA256Context {
+	SHA256_CTX ictx;
+	SHA256_CTX octx;
+} HMAC_SHA256_CTX;
+
+void	SHA256_Init(SHA256_CTX *);
+void	SHA256_Update(SHA256_CTX *, const void *, size_t);
+void	SHA256_Final(unsigned char [32], SHA256_CTX *);
+void	HMAC_SHA256_Init(HMAC_SHA256_CTX *, const void *, size_t);
+void	HMAC_SHA256_Update(HMAC_SHA256_CTX *, const void *, size_t);
+void	HMAC_SHA256_Final(unsigned char [32], HMAC_SHA256_CTX *);
+
+/**
+ * PBKDF2_SHA256(passwd, passwdlen, salt, saltlen, c, buf, dkLen):
+ * Compute PBKDF2(passwd, salt, c, dkLen) using HMAC-SHA256 as the PRF, and
+ * write the output to buf.  The value dkLen must be at most 32 * (2^32 - 1).
+ */
+void	PBKDF2_SHA256(const uint8_t *, size_t, const uint8_t *, size_t,
+    uint64_t, uint8_t *, size_t);
+
+#endif /* !_SHA256_H_ */
diff --git a/outside/scrypt/sysendian.h b/outside/scrypt/sysendian.h
new file mode 100644
index 000000000..207fb0693
--- /dev/null
+++ b/outside/scrypt/sysendian.h
@@ -0,0 +1,129 @@
+/*-
+ * Copyright 2007-2009 Colin Percival
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * This file was originally written by Colin Percival as part of the Tarsnap
+ * online backup system.
+ */
+#ifndef _SYSENDIAN_H_
+#define _SYSENDIAN_H_
+
+#if defined(U3_OS_bsd)
+#include <sys/endian.h>
+#else
+#include <stdint.h>
+
+static inline uint32_t
+be32dec(const void *pp)
+{
+	const uint8_t *p = (uint8_t const *)pp;
+
+	return ((uint32_t)(p[3]) + ((uint32_t)(p[2]) << 8) +
+	    ((uint32_t)(p[1]) << 16) + ((uint32_t)(p[0]) << 24));
+}
+
+static inline void
+be32enc(void *pp, uint32_t x)
+{
+	uint8_t * p = (uint8_t *)pp;
+
+	p[3] = x & 0xff;
+	p[2] = (x >> 8) & 0xff;
+	p[1] = (x >> 16) & 0xff;
+	p[0] = (x >> 24) & 0xff;
+}
+
+static inline uint64_t
+be64dec(const void *pp)
+{
+	const uint8_t *p = (uint8_t const *)pp;
+
+	return ((uint64_t)(p[7]) + ((uint64_t)(p[6]) << 8) +
+	    ((uint64_t)(p[5]) << 16) + ((uint64_t)(p[4]) << 24) +
+	    ((uint64_t)(p[3]) << 32) + ((uint64_t)(p[2]) << 40) +
+	    ((uint64_t)(p[1]) << 48) + ((uint64_t)(p[0]) << 56));
+}
+
+static inline void
+be64enc(void *pp, uint64_t x)
+{
+	uint8_t * p = (uint8_t *)pp;
+
+	p[7] = x & 0xff;
+	p[6] = (x >> 8) & 0xff;
+	p[5] = (x >> 16) & 0xff;
+	p[4] = (x >> 24) & 0xff;
+	p[3] = (x >> 32) & 0xff;
+	p[2] = (x >> 40) & 0xff;
+	p[1] = (x >> 48) & 0xff;
+	p[0] = (x >> 56) & 0xff;
+}
+
+static inline uint32_t
+le32dec(const void *pp)
+{
+	const uint8_t *p = (uint8_t const *)pp;
+
+	return ((uint32_t)(p[0]) + ((uint32_t)(p[1]) << 8) +
+	    ((uint32_t)(p[2]) << 16) + ((uint32_t)(p[3]) << 24));
+}
+
+static inline void
+le32enc(void *pp, uint32_t x)
+{
+	uint8_t * p = (uint8_t *)pp;
+
+	p[0] = x & 0xff;
+	p[1] = (x >> 8) & 0xff;
+	p[2] = (x >> 16) & 0xff;
+	p[3] = (x >> 24) & 0xff;
+}
+
+static inline uint64_t
+le64dec(const void *pp)
+{
+	const uint8_t *p = (uint8_t const *)pp;
+
+	return ((uint64_t)(p[0]) + ((uint64_t)(p[1]) << 8) +
+	    ((uint64_t)(p[2]) << 16) + ((uint64_t)(p[3]) << 24) +
+	    ((uint64_t)(p[4]) << 32) + ((uint64_t)(p[5]) << 40) +
+	    ((uint64_t)(p[6]) << 48) + ((uint64_t)(p[7]) << 56));
+}
+
+static inline void
+le64enc(void *pp, uint64_t x)
+{
+	uint8_t * p = (uint8_t *)pp;
+
+	p[0] = x & 0xff;
+	p[1] = (x >> 8) & 0xff;
+	p[2] = (x >> 16) & 0xff;
+	p[3] = (x >> 24) & 0xff;
+	p[4] = (x >> 32) & 0xff;
+	p[5] = (x >> 40) & 0xff;
+	p[6] = (x >> 48) & 0xff;
+	p[7] = (x >> 56) & 0xff;
+}
+#endif
+#endif /* !_SYSENDIAN_H_ */

From 97d679ee69a626f9837f071d37b0aef5f927152f Mon Sep 17 00:00:00 2001
From: Max G <Hmmm-Max@users.noreply.github.com>
Date: Sun, 3 May 2015 15:50:28 +0300
Subject: [PATCH 18/24] fixed jet discrepancy

---
 Makefile  | 2 +-
 j/e/scr.c | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 5b94668d0..c001315d2 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ RM=rm -f
 CC=gcc
 CXX=g++
 CXXFLAGS=$(CFLAGS)
-CLD=g++ -L/usr/local/lib -L/opt/local/lib
+CLD=g++ -g -L/usr/local/lib -L/opt/local/lib
 
 ifeq ($(OS),osx)
   COSFLAGS=-fno-diagnostics-fixit-info
diff --git a/j/e/scr.c b/j/e/scr.c
index 3d6a87978..a9cf5380d 100644
--- a/j/e/scr.c
+++ b/j/e/scr.c
@@ -28,7 +28,8 @@ int _crypto_scrypt(const uint8_t *, size_t, const uint8_t *, size_t,
     b_p[pl] = 0; b_s[sl]=0;
     c3_y* buf = u3a_malloc(d);
 
-    _crypto_scrypt(b_p, pl, b_s, sl, n, r, z, buf, d);
+    if (_crypto_scrypt(b_p, pl, b_s, sl, n, r, z, buf, d) != 0)
+        return u3m_bail(c3__exit);
 
     u3_noun res = u3i_bytes(d, buf);
     u3a_free(b_p); u3a_free(b_s); u3a_free(buf);
@@ -62,7 +63,8 @@ int _crypto_scrypt(const uint8_t *, size_t, const uint8_t *, size_t,
     b_p[pl] = 0; b_s[sl]=0;
     c3_y* buf = u3a_malloc(d);
 
-    _crypto_scrypt(b_p, pl, b_s, sl, n, r, z, buf, d);
+    if (_crypto_scrypt(b_p, pl, b_s, sl, n, r, z, buf, d) != 0)
+        return u3m_bail(c3__exit);
 
     u3_noun res = u3i_bytes(d, buf);
     u3a_free(b_p); u3a_free(b_s); u3a_free(buf);
@@ -166,6 +168,9 @@ _crypto_scrypt(const uint8_t * passwd, size_t passwdlen,
 	uint32_t * XY;
 	uint32_t i;
 
+	if (((N & (N-1)) != 0) || N == 0)
+		goto err0;
+
 	/* Sanity-check parameters. */
 #if SIZE_MAX > UINT32_MAX
 	if (buflen > (((uint64_t)(1) << 32) - 1) * 32) {

From 7443c352e13dab7cad6cb765cd47aec925c179b7 Mon Sep 17 00:00:00 2001
From: Max G <Hmmm-Max@users.noreply.github.com>
Date: Sun, 3 May 2015 23:45:41 +0300
Subject: [PATCH 19/24] new bounds

---
 j/e/scr.c | 68 +++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 54 insertions(+), 14 deletions(-)

diff --git a/j/e/scr.c b/j/e/scr.c
index a9cf5380d..141667af1 100644
--- a/j/e/scr.c
+++ b/j/e/scr.c
@@ -17,11 +17,14 @@ int _crypto_scrypt(const uint8_t *, size_t, const uint8_t *, size_t,
   u3qes_hsl(u3_atom p, u3_atom pl, u3_atom s, u3_atom sl, u3_atom n,
             u3_atom r, u3_atom  z, u3_atom d)
   {
-    c3_assert(_(u3a_is_atom(p)) && _(u3a_is_atom(s)) &&
-              _(u3a_is_cat(pl)) && _(u3a_is_cat(sl)) &&
-              _(u3a_is_cat(n))  && _(u3a_is_cat(r))  &&
-              _(u3a_is_cat(z))  && _(u3a_is_cat(d))  &&
-               (r * z) < 1073741824);
+    // asserting that n is power of 2 in _crypto_scrypt
+    if (!(_(u3a_is_atom(p)) && _(u3a_is_atom(s)) &&
+          _(u3a_is_cat(pl)) && _(u3a_is_cat(sl)) &&
+          _(u3a_is_cat(n))  && _(u3a_is_cat(r))  &&
+          _(u3a_is_cat(z))  && _(u3a_is_cat(d))  &&
+           (r != 0)         &&  (z != 0)         &&
+           (((c3_d)r * 128 * ((c3_d)n + z - 1)) <= (1 << 30))))
+        return u3m_bail(c3__exit);
 
     c3_y* b_p = u3a_malloc(pl + 1); c3_y* b_s= u3a_malloc(sl + 1);    
     u3r_bytes(0, pl, b_p, p);       u3r_bytes(0, sl, b_s, s);
@@ -52,10 +55,13 @@ int _crypto_scrypt(const uint8_t *, size_t, const uint8_t *, size_t,
   u3_noun
   u3qes_hsh(u3_atom p, u3_atom s, u3_atom n, u3_atom r, u3_atom  z, u3_atom d)
   {
-    c3_assert(_(u3a_is_atom(p)) && _(u3a_is_atom(s)) &&
-              _(u3a_is_cat(n))  && _(u3a_is_cat(r))  &&
-              _(u3a_is_cat(z))  && _(u3a_is_cat(d))  &&
-               (r * z) < 1073741824);
+    // asserting that n is power of 2 in _crypto_scrypt
+    if (!(_(u3a_is_atom(p)) && _(u3a_is_atom(s)) &&
+          _(u3a_is_cat(n))  && _(u3a_is_cat(r))  &&
+          _(u3a_is_cat(z))  && _(u3a_is_cat(d))  &&
+           (r != 0)         &&  (z != 0)         &&
+           (((c3_d)r * 128 * ((c3_d)n + z - 1)) <= (1 << 30))))
+        return u3m_bail(c3__exit);
 
     c3_w   pl = u3r_met(3, p);      c3_w   sl = u3r_met(3, s);
     c3_y* b_p = u3a_malloc(pl + 1); c3_y* b_s= u3a_malloc(sl + 1);    
@@ -88,9 +94,12 @@ int _crypto_scrypt(const uint8_t *, size_t, const uint8_t *, size_t,
   u3qes_pbl(u3_atom p, u3_atom pl, u3_atom s, u3_atom sl,
             u3_atom c, u3_atom d)
   {
-    c3_assert(_(u3a_is_atom(p)) && _(u3a_is_atom(s)) &&
-              _(u3a_is_cat(pl)) && _(u3a_is_cat(sl)) &&
-              _(u3a_is_cat(c))  && _(u3a_is_cat(d)));
+    if (!(_(u3a_is_atom(p)) && _(u3a_is_atom(s)) &&
+          _(u3a_is_cat(pl)) && _(u3a_is_cat(sl)) &&
+          _(u3a_is_cat(c))  && _(u3a_is_cat(d))  &&
+           (d <= (1 << 30)) &&  (c <= (1 << 28)) &&
+           (c != 0)))
+        return u3m_bail(c3__exit);
 
     c3_y* b_p = u3a_malloc(pl + 1); c3_y* b_s= u3a_malloc(pl + 1);    
     u3r_bytes(0, pl, b_p, p);       u3r_bytes(0, sl, b_s, s);
@@ -120,8 +129,11 @@ int _crypto_scrypt(const uint8_t *, size_t, const uint8_t *, size_t,
   u3_noun
   u3qes_pbk(u3_atom p, u3_atom s, u3_atom c, u3_atom d)
   {
-    c3_assert(_(u3a_is_atom(p)) && _(u3a_is_atom(s)) &&
-              _(u3a_is_cat(c))  && _(u3a_is_cat(d)));
+    if (!(_(u3a_is_atom(p)) && _(u3a_is_atom(s)) &&
+          _(u3a_is_cat(c))  && _(u3a_is_cat(d))  &&
+           (d <= (1 << 30)) &&  (c <= (1 << 28)) &&
+           (c != 0)))
+        return u3m_bail(c3__exit);
 
     c3_w   pl = u3r_met(3, p);      c3_w   sl = u3r_met(3, s);
     c3_y* b_p = u3a_malloc(pl + 1); c3_y* b_s= u3a_malloc(pl + 1);    
@@ -147,6 +159,34 @@ int _crypto_scrypt(const uint8_t *, size_t, const uint8_t *, size_t,
     return u3qes_pbk(p, s, c, d);
   }
 
+/*-
+ * Copyright 2009 Colin Percival
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * This file was originally written by Colin Percival as part of the Tarsnap
+ * online backup system.
+ */
 
 /**
  * crypto_scrypt(passwd, passwdlen, salt, saltlen, N, r, p, buf, buflen):

From 88ffabf9515e92bd638edc68f8a602337e4de078 Mon Sep 17 00:00:00 2001
From: "C. Guy Yarvin" <cgyarvin@gmail.com>
Date: Sun, 3 May 2015 16:24:09 -0700
Subject: [PATCH 20/24] Binary accidentally checked into GH.

---
 outside/scrypt/scrypt.a | Bin 82332 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 outside/scrypt/scrypt.a

diff --git a/outside/scrypt/scrypt.a b/outside/scrypt/scrypt.a
deleted file mode 100644
index 94106a866015690695216eabe99dd40198d7363f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 82332
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
N$$1^D7Cq1Z{{a2a0Hgo_


From ca99ef63e79f10420af58c5d27ebadabd5062e91 Mon Sep 17 00:00:00 2001
From: cgyarvin <curtis.yarvin@gmail.com>
Date: Sun, 3 May 2015 16:28:51 -0700
Subject: [PATCH 21/24] Revert "Jetted scrypt"

---
 Makefile                           |  20 +-
 i/j/q.h                            |   6 -
 i/j/w.h                            |   5 -
 j/e/scr.c                          | 277 -------------------
 j/tree.c                           |  14 -
 outside/scrypt/Makefile            |  16 --
 outside/scrypt/crypto_scrypt-sse.c | 357 -------------------------
 outside/scrypt/crypto_scrypt.h     |  51 ----
 outside/scrypt/sha256.c            | 411 -----------------------------
 outside/scrypt/sha256.h            |  62 -----
 outside/scrypt/sysendian.h         | 129 ---------
 11 files changed, 6 insertions(+), 1342 deletions(-)
 delete mode 100644 j/e/scr.c
 delete mode 100644 outside/scrypt/Makefile
 delete mode 100644 outside/scrypt/crypto_scrypt-sse.c
 delete mode 100644 outside/scrypt/crypto_scrypt.h
 delete mode 100644 outside/scrypt/sha256.c
 delete mode 100644 outside/scrypt/sha256.h
 delete mode 100644 outside/scrypt/sysendian.h

diff --git a/Makefile b/Makefile
index c001315d2..c83c8a0d7 100644
--- a/Makefile
+++ b/Makefile
@@ -78,7 +78,6 @@ CFLAGS= $(COSFLAGS) -O3 -msse3 -ffast-math \
 	-Ioutside/ed25519/src \
 	-Ioutside/commonmark/src \
 	-Ioutside/commonmark/build/src \
-	-Ioutside/scrypt \
 	$(DEFINES) \
 	$(MDEFINES)
 
@@ -202,7 +201,6 @@ J_E_OFILES=\
        j/e/repg.o \
        j/e/rexp.o \
        j/e/rub.o \
-       j/e/scr.o \
        j/e/shax.o \
        j/e/lore.o \
        j/e/loss.o \
@@ -352,8 +350,6 @@ LIBANACHRONISM=outside/anachronism/build/libanachronism.a
 
 LIBCOMMONMARK=outside/commonmark/build/src/libcmark.a
 
-LIBSCRYPT=outside/scrypt/scrypt.a
-
 all: vere
 
 .MAKEFILE-VERSION: Makefile .make.conf
@@ -384,28 +380,25 @@ $(LIBANACHRONISM):
 $(LIBCOMMONMARK):
 	$(MAKE) -C outside/commonmark
 
-$(LIBSCRYPT):
-	$(MAKE) -C outside/scrypt MDEFINES="$(MDEFINES)"
-
 $(CRE2_OFILES): outside/cre2/src/src/cre2.cpp outside/cre2/src/src/cre2.h $(LIBRE2)
 	$(CXX) $(CXXFLAGS) -c $< -o $@
 
 $(V_OFILES): i/v/vere.h
 
 ifdef NO_SILENT_RULES
-$(BIN)/vere: $(LIBCRE) $(LIBCOMMONMARK) $(VERE_OFILES) $(LIBUV) $(LIBRE2) $(LIBED25519) $(LIBANACHRONISM) $(LIBSCRYPT)
+$(BIN)/vere: $(LIBCRE) $(LIBCOMMONMARK) $(VERE_OFILES) $(LIBUV) $(LIBRE2) $(LIBED25519) $(LIBANACHRONISM)
 	mkdir -p $(BIN)
-	$(CLD) $(CLDOSFLAGS) -o $(BIN)/vere $(VERE_OFILES) $(LIBUV) $(LIBCRE) $(LIBRE2) $(LIBED25519) $(LIBANACHRONISM) $(LIBS) $(LIBCOMMONMARK) $(LIBSCRYPT)
+	$(CLD) $(CLDOSFLAGS) -o $(BIN)/vere $(VERE_OFILES) $(LIBUV) $(LIBCRE) $(LIBRE2) $(LIBED25519) $(LIBANACHRONISM) $(LIBS) $(LIBCOMMONMARK)
 else
-$(BIN)/vere: $(LIBCRE) $(LIBCOMMONMARK) $(VERE_OFILES) $(LIBUV) $(LIBRE2) $(LIBED25519) $(LIBANACHRONISM) $(LIBSCRYPT)
+$(BIN)/vere: $(LIBCRE) $(LIBCOMMONMARK) $(VERE_OFILES) $(LIBUV) $(LIBRE2) $(LIBED25519) $(LIBANACHRONISM)
 	@echo "    CCLD  $(BIN)/vere"
 	@mkdir -p $(BIN)
-	@$(CLD) $(CLDOSFLAGS) -o $(BIN)/vere $(VERE_OFILES) $(LIBUV) $(LIBCRE) $(LIBRE2) $(LIBED25519) $(LIBANACHRONISM) $(LIBS) $(LIBCOMMONMARK) $(LIBSCRYPT)
+	@$(CLD) $(CLDOSFLAGS) -o $(BIN)/vere $(VERE_OFILES) $(LIBUV) $(LIBCRE) $(LIBRE2) $(LIBED25519) $(LIBANACHRONISM) $(LIBS) $(LIBCOMMONMARK)
 endif
 
-$(BIN)/meme: $(LIBCRE) $(LIBCOMMONMARK) $(MEME_OFILES) $(LIBUV) $(LIBRE2) $(LIBED25519) $(LIBANACHRONISM) $(LIBSCRYPT)
+$(BIN)/meme: $(LIBCRE) $(LIBCOMMONMARK) $(MEME_OFILES) $(LIBUV) $(LIBRE2) $(LIBED25519) $(LIBANACHRONISM)
 	mkdir -p $(BIN)
-	$(CLD) $(CLDOSFLAGS) -o $(BIN)/meme $(MEME_OFILES) $(LIBUV) $(LIBCRE) $(LIBRE2) $(LIBED25519) $(LIBANACHRONISM) $(LIBS) $(LIBCOMMONMARK) $(LIBSCRYPT)
+	$(CLD) $(CLDOSFLAGS) -o $(BIN)/meme $(MEME_OFILES) $(LIBUV) $(LIBCRE) $(LIBRE2) $(LIBED25519) $(LIBANACHRONISM) $(LIBS) $(LIBCOMMONMARK)
 
 tags:
 	ctags -R -f .tags --exclude=root
@@ -440,6 +433,5 @@ distclean: clean $(LIBUV_MAKEFILE)
 	$(MAKE) -C outside/re2 clean
 	$(MAKE) -C outside/ed25519 clean
 	$(MAKE) -C outside/anachronism clean
-	$(MAKE) -C outside/scrypt clean
 
 .PHONY: clean debbuild debinstalldistclean etags osxpackage tags
diff --git a/i/j/q.h b/i/j/q.h
index 04a636295..9d490f6d2 100644
--- a/i/j/q.h
+++ b/i/j/q.h
@@ -93,12 +93,6 @@
     u3_noun u3qea_de(u3_atom, u3_atom);
     u3_noun u3qea_en(u3_atom, u3_atom);
 
-    u3_noun u3qes_hsh(u3_atom, u3_atom, u3_atom, u3_atom, u3_atom, u3_atom);
-    u3_noun u3qes_hsl(u3_atom, u3_atom, u3_atom, u3_atom, u3_atom,
-                      u3_atom, u3_atom, u3_atom);
-    u3_noun u3qes_pbk(u3_atom, u3_atom, u3_atom, u3_atom);
-    u3_noun u3qes_pbl(u3_atom, u3_atom, u3_atom, u3_atom, u3_atom, u3_atom);
-
     u3_noun u3qe_shax(u3_atom);
     u3_noun u3qe_shay(u3_atom, u3_atom);
     u3_noun u3qe_shas(u3_atom, u3_atom);
diff --git a/i/j/w.h b/i/j/w.h
index 1ebb5f286..615f237c9 100644
--- a/i/j/w.h
+++ b/i/j/w.h
@@ -105,11 +105,6 @@
     u3_noun u3wea_de(u3_noun);
     u3_noun u3wea_en(u3_noun);
 
-    u3_noun u3wes_hsh(u3_noun);
-    u3_noun u3wes_hsl(u3_noun);
-    u3_noun u3wes_pbk(u3_noun);
-    u3_noun u3wes_pbl(u3_noun);
-
     u3_noun u3we_shax(u3_noun);
     u3_noun u3we_shay(u3_noun);
     u3_noun u3we_shas(u3_noun);
diff --git a/j/e/scr.c b/j/e/scr.c
deleted file mode 100644
index 141667af1..000000000
--- a/j/e/scr.c
+++ /dev/null
@@ -1,277 +0,0 @@
-/* j/5/scr.c
-**
-*/
-#include "all.h"
-
-#include <stdint.h>
-#include <errno.h>
-#include <crypto_scrypt.h>
-
-int _crypto_scrypt(const uint8_t *, size_t, const uint8_t *, size_t,
-    uint64_t, uint32_t, uint32_t, uint8_t *, size_t);
-
-/* functions
-*/
-
-  u3_noun
-  u3qes_hsl(u3_atom p, u3_atom pl, u3_atom s, u3_atom sl, u3_atom n,
-            u3_atom r, u3_atom  z, u3_atom d)
-  {
-    // asserting that n is power of 2 in _crypto_scrypt
-    if (!(_(u3a_is_atom(p)) && _(u3a_is_atom(s)) &&
-          _(u3a_is_cat(pl)) && _(u3a_is_cat(sl)) &&
-          _(u3a_is_cat(n))  && _(u3a_is_cat(r))  &&
-          _(u3a_is_cat(z))  && _(u3a_is_cat(d))  &&
-           (r != 0)         &&  (z != 0)         &&
-           (((c3_d)r * 128 * ((c3_d)n + z - 1)) <= (1 << 30))))
-        return u3m_bail(c3__exit);
-
-    c3_y* b_p = u3a_malloc(pl + 1); c3_y* b_s= u3a_malloc(sl + 1);    
-    u3r_bytes(0, pl, b_p, p);       u3r_bytes(0, sl, b_s, s);
-    b_p[pl] = 0; b_s[sl]=0;
-    c3_y* buf = u3a_malloc(d);
-
-    if (_crypto_scrypt(b_p, pl, b_s, sl, n, r, z, buf, d) != 0)
-        return u3m_bail(c3__exit);
-
-    u3_noun res = u3i_bytes(d, buf);
-    u3a_free(b_p); u3a_free(b_s); u3a_free(buf);
-
-    return res;
-  }
-
-  u3_noun
-  u3wes_hsl(u3_noun cor)
-  {
-    u3_noun p, pl, s, sl, n, r, z, d;
-    u3_noun q;
-
-    u3x_quil(u3r_at(u3x_sam, cor), &p, &pl, &s, &sl, &q);
-    u3x_qual(q, &n, &r, &z, &d);
-
-    return u3qes_hsl(p, pl, s, sl, n, r, z, d);
-  }
-
-  u3_noun
-  u3qes_hsh(u3_atom p, u3_atom s, u3_atom n, u3_atom r, u3_atom  z, u3_atom d)
-  {
-    // asserting that n is power of 2 in _crypto_scrypt
-    if (!(_(u3a_is_atom(p)) && _(u3a_is_atom(s)) &&
-          _(u3a_is_cat(n))  && _(u3a_is_cat(r))  &&
-          _(u3a_is_cat(z))  && _(u3a_is_cat(d))  &&
-           (r != 0)         &&  (z != 0)         &&
-           (((c3_d)r * 128 * ((c3_d)n + z - 1)) <= (1 << 30))))
-        return u3m_bail(c3__exit);
-
-    c3_w   pl = u3r_met(3, p);      c3_w   sl = u3r_met(3, s);
-    c3_y* b_p = u3a_malloc(pl + 1); c3_y* b_s= u3a_malloc(sl + 1);    
-    u3r_bytes(0, pl, b_p, p);       u3r_bytes(0, sl, b_s, s);
-    b_p[pl] = 0; b_s[sl]=0;
-    c3_y* buf = u3a_malloc(d);
-
-    if (_crypto_scrypt(b_p, pl, b_s, sl, n, r, z, buf, d) != 0)
-        return u3m_bail(c3__exit);
-
-    u3_noun res = u3i_bytes(d, buf);
-    u3a_free(b_p); u3a_free(b_s); u3a_free(buf);
-
-    return res;
-  }
-
-  u3_noun
-  u3wes_hsh(u3_noun cor)
-  {
-    u3_noun p, s, n, r, z, d;
-    u3_noun q;
-
-    u3x_quil(u3r_at(u3x_sam, cor), &p, &s, &n, &r, &q);
-    u3x_cell(q, &z, &d);
-
-    return u3qes_hsh(p, s, n, r, z, d);
-  }
-
-  u3_noun
-  u3qes_pbl(u3_atom p, u3_atom pl, u3_atom s, u3_atom sl,
-            u3_atom c, u3_atom d)
-  {
-    if (!(_(u3a_is_atom(p)) && _(u3a_is_atom(s)) &&
-          _(u3a_is_cat(pl)) && _(u3a_is_cat(sl)) &&
-          _(u3a_is_cat(c))  && _(u3a_is_cat(d))  &&
-           (d <= (1 << 30)) &&  (c <= (1 << 28)) &&
-           (c != 0)))
-        return u3m_bail(c3__exit);
-
-    c3_y* b_p = u3a_malloc(pl + 1); c3_y* b_s= u3a_malloc(pl + 1);    
-    u3r_bytes(0, pl, b_p, p);       u3r_bytes(0, sl, b_s, s);
-    b_p[pl] = 0; b_s[sl]=0;
-    c3_y* buf = u3a_malloc(d);
-
-    PBKDF2_SHA256(b_p, pl, b_s, sl, c, buf, d);
-
-    u3_noun res = u3i_bytes(d, buf);
-    u3a_free(b_p); u3a_free(b_s); u3a_free(buf);
-
-    return res;
-  }
-
-  u3_noun
-  u3wes_pbl(u3_noun cor)
-  {
-    u3_noun p, pl, s, sl, c, d;
-    u3_noun q;
-
-    u3x_quil(u3r_at(u3x_sam, cor), &p, &pl, &s, &sl, &q);
-    u3x_cell(q, &c, &d);
-
-    return u3qes_pbl(p, pl, s, sl, c, d);
-  }
-
-  u3_noun
-  u3qes_pbk(u3_atom p, u3_atom s, u3_atom c, u3_atom d)
-  {
-    if (!(_(u3a_is_atom(p)) && _(u3a_is_atom(s)) &&
-          _(u3a_is_cat(c))  && _(u3a_is_cat(d))  &&
-           (d <= (1 << 30)) &&  (c <= (1 << 28)) &&
-           (c != 0)))
-        return u3m_bail(c3__exit);
-
-    c3_w   pl = u3r_met(3, p);      c3_w   sl = u3r_met(3, s);
-    c3_y* b_p = u3a_malloc(pl + 1); c3_y* b_s= u3a_malloc(pl + 1);    
-    u3r_bytes(0, pl, b_p, p);       u3r_bytes(0, sl, b_s, s);
-    b_p[pl] = 0; b_s[sl]=0;
-    c3_y* buf = u3a_malloc(d);
-
-    PBKDF2_SHA256(b_p, pl, b_s, sl, c, buf, d);
-
-    u3_noun res = u3i_bytes(d, buf);
-    u3a_free(b_p); u3a_free(b_s); u3a_free(buf);
-
-    return res;
-  }
-
-  u3_noun
-  u3wes_pbk(u3_noun cor)
-  {
-    u3_noun p, s, c, d;
-
-    u3x_qual(u3r_at(u3x_sam, cor), &p, &s, &c, &d);
-
-    return u3qes_pbk(p, s, c, d);
-  }
-
-/*-
- * Copyright 2009 Colin Percival
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * This file was originally written by Colin Percival as part of the Tarsnap
- * online backup system.
- */
-
-/**
- * crypto_scrypt(passwd, passwdlen, salt, saltlen, N, r, p, buf, buflen):
- * Compute scrypt(passwd[0 .. passwdlen - 1], salt[0 .. saltlen - 1], N, r,
- * p, buflen) and write the result into buf.  The parameters r, p, and buflen
- * must satisfy r * p < 2^30 and buflen <= (2^32 - 1) * 32.  The parameter N
- * must be a power of 2 greater than 1.
- *
- * Return 0 on success; or -1 on error.
- */
-int
-_crypto_scrypt(const uint8_t * passwd, size_t passwdlen,
-    const uint8_t * salt, size_t saltlen, uint64_t N, uint32_t r, uint32_t p,
-    uint8_t * buf, size_t buflen)
-{
-	void * B0, * V0, * XY0;
-	uint8_t * B;
-	uint32_t * V;
-	uint32_t * XY;
-	uint32_t i;
-
-	if (((N & (N-1)) != 0) || N == 0)
-		goto err0;
-
-	/* Sanity-check parameters. */
-#if SIZE_MAX > UINT32_MAX
-	if (buflen > (((uint64_t)(1) << 32) - 1) * 32) {
-		errno = EFBIG;
-		goto err0;
-	}
-#endif
-	if ((uint64_t)(r) * (uint64_t)(p) >= (1 << 30)) {
-		errno = EFBIG;
-		goto err0;
-	}
-	if (((N & (N - 1)) != 0) || (N == 0)) {
-		errno = EINVAL;
-		goto err0;
-	}
-	if ((r > SIZE_MAX / 128 / p) ||
-#if SIZE_MAX / 256 <= UINT32_MAX
-	    (r > (SIZE_MAX - 64) / 256) ||
-#endif
-	    (N > SIZE_MAX / 128 / r)) {
-		errno = ENOMEM;
-		goto err0;
-	}
-
-	/* Allocate memory. */
-	if ((B0 = u3a_malloc(128 * r * p + 63)) == NULL)
-		goto err0;
-	B = (uint8_t *)(((uintptr_t)(B0) + 63) & ~ (uintptr_t)(63));
-	if ((XY0 = u3a_malloc(256 * r + 64 + 63)) == NULL)
-		goto err1;
-	XY = (uint32_t *)(((uintptr_t)(XY0) + 63) & ~ (uintptr_t)(63));
-	if ((V0 = u3a_malloc(128 * r * N + 63)) == NULL)
-		goto err2;
-	V = (uint32_t *)(((uintptr_t)(V0) + 63) & ~ (uintptr_t)(63));
-
-	/* 1: (B_0 ... B_{p-1}) <-- PBKDF2(P, S, 1, p * MFLen) */
-	PBKDF2_SHA256(passwd, passwdlen, salt, saltlen, 1, B, p * 128 * r);
-
-	/* 2: for i = 0 to p - 1 do */
-	for (i = 0; i < p; i++) {
-		/* 3: B_i <-- MF(B_i, N) */
-		smix(&B[i * 128 * r], r, N, V, XY);
-	}
-
-	/* 5: DK <-- PBKDF2(P, B, 1, dkLen) */
-	PBKDF2_SHA256(passwd, passwdlen, B, p * 128 * r, 1, buf, buflen);
-
-	/* Free memory. */
-
-	u3a_free(V0);
-	u3a_free(XY0);
-	u3a_free(B0);
-
-	/* Success! */
-	return (0);
-
-err2:
-	u3a_free(XY0);
-err1:
-	u3a_free(B0);
-err0:
-	/* Failure! */
-	return (-1);
-}
diff --git a/j/tree.c b/j/tree.c
index 6c0ff2b46..ae778d98c 100644
--- a/j/tree.c
+++ b/j/tree.c
@@ -231,18 +231,6 @@ static u3j_core _mood__hoon__coed_d[] =
     {}
   };
 
-static u3j_harm _mood__hoon__scr_hsh_a[] = {{".2", u3wes_hsh}, {}};
-static u3j_harm _mood__hoon__scr_hsl_a[] = {{".2", u3wes_hsl}, {}};
-static u3j_harm _mood__hoon__scr_pbk_a[] = {{".2", u3wes_pbk}, {}};
-static u3j_harm _mood__hoon__scr_pbl_a[] = {{".2", u3wes_pbl}, {}};
-static u3j_core _mood__hoon__scr_d[] =
-  {  { "hsh", _mood__hoon__scr_hsh_a },
-     { "hsl", _mood__hoon__scr_hsl_a },
-     { "pbk", _mood__hoon__scr_pbk_a },
-     { "pbl", _mood__hoon__scr_pbl_a },
-     {}
-  };
-
 static u3j_harm _mood__hoon_pfix_a[] = {{".2", u3we_pfix}, {}};
 static u3j_harm _mood__hoon_plug_a[] = {{".2", u3we_plug}, {}};
 static u3j_harm _mood__hoon_pose_a[] = {{".2", u3we_pose}, {}};
@@ -461,8 +449,6 @@ static u3j_core _mood__hoon_d[] =
     { "rd", 0, _mood__hoon__rd_d },
     { "coed", 0, _mood__hoon__coed_d },
 
-    { "scr", 0, _mood__hoon__scr_d },
-
     { "pfix", _mood__hoon_pfix_a },
     { "plug", _mood__hoon_plug_a },
     { "pose", _mood__hoon_pose_a },
diff --git a/outside/scrypt/Makefile b/outside/scrypt/Makefile
deleted file mode 100644
index f3ac5acb9..000000000
--- a/outside/scrypt/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-default: all
-
-CC?=gcc
-CFLAGS?=-O2 -msse3 -ffast-math \
-	-Wall -g -D_FORTIFY_SOURCE=2 -fPIC
-CFLAGS_EXTRA?=-Wl,-rpath=.
-
-all: scrypt.a
-
-OBJS= crypto_scrypt-sse.o sha256.o
-
-scrypt.a: $(OBJS)
-	ar rcs scrypt.a  $(OBJS)
-
-clean:
-	rm -f *.o scrypt.a
diff --git a/outside/scrypt/crypto_scrypt-sse.c b/outside/scrypt/crypto_scrypt-sse.c
deleted file mode 100644
index d7b33c078..000000000
--- a/outside/scrypt/crypto_scrypt-sse.c
+++ /dev/null
@@ -1,357 +0,0 @@
-/*-
- * Copyright 2009 Colin Percival
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * This file was originally written by Colin Percival as part of the Tarsnap
- * online backup system.
- */
-#include <sys/types.h>
-#include <sys/mman.h>
-
-#include <emmintrin.h>
-#include <errno.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "sha256.h"
-#include "sysendian.h"
-
-#include "crypto_scrypt.h"
-
-static void
-blkcpy(void * dest, void * src, size_t len)
-{
-	__m128i * D = dest;
-	__m128i * S = src;
-	size_t L = len / 16;
-	size_t i;
-
-	for (i = 0; i < L; i++)
-		D[i] = S[i];
-}
-
-static void
-blkxor(void * dest, void * src, size_t len)
-{
-	__m128i * D = dest;
-	__m128i * S = src;
-	size_t L = len / 16;
-	size_t i;
-
-	for (i = 0; i < L; i++)
-		D[i] = _mm_xor_si128(D[i], S[i]);
-}
-
-/**
- * salsa20_8(B):
- * Apply the salsa20/8 core to the provided block.
- */
-static void
-salsa20_8(__m128i B[4])
-{
-	__m128i X0, X1, X2, X3;
-	__m128i T;
-	size_t i;
-
-	X0 = B[0];
-	X1 = B[1];
-	X2 = B[2];
-	X3 = B[3];
-
-	for (i = 0; i < 8; i += 2) {
-		/* Operate on "columns". */
-		T = _mm_add_epi32(X0, X3);
-		X1 = _mm_xor_si128(X1, _mm_slli_epi32(T, 7));
-		X1 = _mm_xor_si128(X1, _mm_srli_epi32(T, 25));
-		T = _mm_add_epi32(X1, X0);
-		X2 = _mm_xor_si128(X2, _mm_slli_epi32(T, 9));
-		X2 = _mm_xor_si128(X2, _mm_srli_epi32(T, 23));
-		T = _mm_add_epi32(X2, X1);
-		X3 = _mm_xor_si128(X3, _mm_slli_epi32(T, 13));
-		X3 = _mm_xor_si128(X3, _mm_srli_epi32(T, 19));
-		T = _mm_add_epi32(X3, X2);
-		X0 = _mm_xor_si128(X0, _mm_slli_epi32(T, 18));
-		X0 = _mm_xor_si128(X0, _mm_srli_epi32(T, 14));
-
-		/* Rearrange data. */
-		X1 = _mm_shuffle_epi32(X1, 0x93);
-		X2 = _mm_shuffle_epi32(X2, 0x4E);
-		X3 = _mm_shuffle_epi32(X3, 0x39);
-
-		/* Operate on "rows". */
-		T = _mm_add_epi32(X0, X1);
-		X3 = _mm_xor_si128(X3, _mm_slli_epi32(T, 7));
-		X3 = _mm_xor_si128(X3, _mm_srli_epi32(T, 25));
-		T = _mm_add_epi32(X3, X0);
-		X2 = _mm_xor_si128(X2, _mm_slli_epi32(T, 9));
-		X2 = _mm_xor_si128(X2, _mm_srli_epi32(T, 23));
-		T = _mm_add_epi32(X2, X3);
-		X1 = _mm_xor_si128(X1, _mm_slli_epi32(T, 13));
-		X1 = _mm_xor_si128(X1, _mm_srli_epi32(T, 19));
-		T = _mm_add_epi32(X1, X2);
-		X0 = _mm_xor_si128(X0, _mm_slli_epi32(T, 18));
-		X0 = _mm_xor_si128(X0, _mm_srli_epi32(T, 14));
-
-		/* Rearrange data. */
-		X1 = _mm_shuffle_epi32(X1, 0x39);
-		X2 = _mm_shuffle_epi32(X2, 0x4E);
-		X3 = _mm_shuffle_epi32(X3, 0x93);
-	}
-
-	B[0] = _mm_add_epi32(B[0], X0);
-	B[1] = _mm_add_epi32(B[1], X1);
-	B[2] = _mm_add_epi32(B[2], X2);
-	B[3] = _mm_add_epi32(B[3], X3);
-}
-
-/**
- * blockmix_salsa8(Bin, Bout, X, r):
- * Compute Bout = BlockMix_{salsa20/8, r}(Bin).  The input Bin must be 128r
- * bytes in length; the output Bout must also be the same size.  The
- * temporary space X must be 64 bytes.
- */
-static void
-blockmix_salsa8(__m128i * Bin, __m128i * Bout, __m128i * X, size_t r)
-{
-	size_t i;
-
-	/* 1: X <-- B_{2r - 1} */
-	blkcpy(X, &Bin[8 * r - 4], 64);
-
-	/* 2: for i = 0 to 2r - 1 do */
-	for (i = 0; i < r; i++) {
-		/* 3: X <-- H(X \xor B_i) */
-		blkxor(X, &Bin[i * 8], 64);
-		salsa20_8(X);
-
-		/* 4: Y_i <-- X */
-		/* 6: B' <-- (Y_0, Y_2 ... Y_{2r-2}, Y_1, Y_3 ... Y_{2r-1}) */
-		blkcpy(&Bout[i * 4], X, 64);
-
-		/* 3: X <-- H(X \xor B_i) */
-		blkxor(X, &Bin[i * 8 + 4], 64);
-		salsa20_8(X);
-
-		/* 4: Y_i <-- X */
-		/* 6: B' <-- (Y_0, Y_2 ... Y_{2r-2}, Y_1, Y_3 ... Y_{2r-1}) */
-		blkcpy(&Bout[(r + i) * 4], X, 64);
-	}
-}
-
-/**
- * integerify(B, r):
- * Return the result of parsing B_{2r-1} as a little-endian integer.
- */
-static uint64_t
-integerify(void * B, size_t r)
-{
-	uint32_t * X = (void *)((uintptr_t)(B) + (2 * r - 1) * 64);
-
-	return (((uint64_t)(X[13]) << 32) + X[0]);
-}
-
-/**
- * smix(B, r, N, V, XY):
- * Compute B = SMix_r(B, N).  The input B must be 128r bytes in length;
- * the temporary storage V must be 128rN bytes in length; the temporary
- * storage XY must be 256r + 64 bytes in length.  The value N must be a
- * power of 2 greater than 1.  The arrays B, V, and XY must be aligned to a
- * multiple of 64 bytes.
- */
-void
-smix(uint8_t * B, size_t r, uint64_t N, void * V, void * XY)
-{
-	__m128i * X = XY;
-	__m128i * Y = (void *)((uintptr_t)(XY) + 128 * r);
-	__m128i * Z = (void *)((uintptr_t)(XY) + 256 * r);
-	uint32_t * X32 = (void *)X;
-	uint64_t i, j;
-	size_t k;
-
-	/* 1: X <-- B */
-	for (k = 0; k < 2 * r; k++) {
-		for (i = 0; i < 16; i++) {
-			X32[k * 16 + i] =
-			    le32dec(&B[(k * 16 + (i * 5 % 16)) * 4]);
-		}
-	}
-
-	/* 2: for i = 0 to N - 1 do */
-	for (i = 0; i < N; i += 2) {
-		/* 3: V_i <-- X */
-		blkcpy((void *)((uintptr_t)(V) + i * 128 * r), X, 128 * r);
-
-		/* 4: X <-- H(X) */
-		blockmix_salsa8(X, Y, Z, r);
-
-		/* 3: V_i <-- X */
-		blkcpy((void *)((uintptr_t)(V) + (i + 1) * 128 * r),
-		    Y, 128 * r);
-
-		/* 4: X <-- H(X) */
-		blockmix_salsa8(Y, X, Z, r);
-	}
-
-	/* 6: for i = 0 to N - 1 do */
-	for (i = 0; i < N; i += 2) {
-		/* 7: j <-- Integerify(X) mod N */
-		j = integerify(X, r) & (N - 1);
-
-		/* 8: X <-- H(X \xor V_j) */
-		blkxor(X, (void *)((uintptr_t)(V) + j * 128 * r), 128 * r);
-		blockmix_salsa8(X, Y, Z, r);
-
-		/* 7: j <-- Integerify(X) mod N */
-		j = integerify(Y, r) & (N - 1);
-
-		/* 8: X <-- H(X \xor V_j) */
-		blkxor(Y, (void *)((uintptr_t)(V) + j * 128 * r), 128 * r);
-		blockmix_salsa8(Y, X, Z, r);
-	}
-
-	/* 10: B' <-- X */
-	for (k = 0; k < 2 * r; k++) {
-		for (i = 0; i < 16; i++) {
-			le32enc(&B[(k * 16 + (i * 5 % 16)) * 4],
-			    X32[k * 16 + i]);
-		}
-	}
-}
-
-/**
- * crypto_scrypt(passwd, passwdlen, salt, saltlen, N, r, p, buf, buflen):
- * Compute scrypt(passwd[0 .. passwdlen - 1], salt[0 .. saltlen - 1], N, r,
- * p, buflen) and write the result into buf.  The parameters r, p, and buflen
- * must satisfy r * p < 2^30 and buflen <= (2^32 - 1) * 32.  The parameter N
- * must be a power of 2 greater than 1.
- *
- * Return 0 on success; or -1 on error.
- */
-int
-crypto_scrypt(const uint8_t * passwd, size_t passwdlen,
-    const uint8_t * salt, size_t saltlen, uint64_t N, uint32_t r, uint32_t p,
-    uint8_t * buf, size_t buflen)
-{
-	void * B0, * V0, * XY0;
-	uint8_t * B;
-	uint32_t * V;
-	uint32_t * XY;
-	uint32_t i;
-
-	/* Sanity-check parameters. */
-#if SIZE_MAX > UINT32_MAX
-	if (buflen > (((uint64_t)(1) << 32) - 1) * 32) {
-		errno = EFBIG;
-		goto err0;
-	}
-#endif
-	if ((uint64_t)(r) * (uint64_t)(p) >= (1 << 30)) {
-		errno = EFBIG;
-		goto err0;
-	}
-	if (((N & (N - 1)) != 0) || (N == 0)) {
-		errno = EINVAL;
-		goto err0;
-	}
-	if ((r > SIZE_MAX / 128 / p) ||
-#if SIZE_MAX / 256 <= UINT32_MAX
-	    (r > (SIZE_MAX - 64) / 256) ||
-#endif
-	    (N > SIZE_MAX / 128 / r)) {
-		errno = ENOMEM;
-		goto err0;
-	}
-
-	/* Allocate memory. */
-#ifdef HAVE_POSIX_MEMALIGN
-	if ((errno = posix_memalign(&B0, 64, 128 * r * p)) != 0)
-		goto err0;
-	B = (uint8_t *)(B0);
-	if ((errno = posix_memalign(&XY0, 64, 256 * r + 64)) != 0)
-		goto err1;
-	XY = (uint32_t *)(XY0);
-#ifndef MAP_ANON
-	if ((errno = posix_memalign(&V0, 64, 128 * r * N)) != 0)
-		goto err2;
-	V = (uint32_t *)(V0);
-#endif
-#else
-	if ((B0 = malloc(128 * r * p + 63)) == NULL)
-		goto err0;
-	B = (uint8_t *)(((uintptr_t)(B0) + 63) & ~ (uintptr_t)(63));
-	if ((XY0 = malloc(256 * r + 64 + 63)) == NULL)
-		goto err1;
-	XY = (uint32_t *)(((uintptr_t)(XY0) + 63) & ~ (uintptr_t)(63));
-#ifndef MAP_ANON
-	if ((V0 = malloc(128 * r * N + 63)) == NULL)
-		goto err2;
-	V = (uint32_t *)(((uintptr_t)(V0) + 63) & ~ (uintptr_t)(63));
-#endif
-#endif
-#ifdef MAP_ANON
-	if ((V0 = mmap(NULL, 128 * r * N, PROT_READ | PROT_WRITE,
-#ifdef MAP_NOCORE
-	    MAP_ANON | MAP_PRIVATE | MAP_NOCORE,
-#else
-	    MAP_ANON | MAP_PRIVATE,
-#endif
-	    -1, 0)) == MAP_FAILED)
-		goto err2;
-	V = (uint32_t *)(V0);
-#endif
-
-	/* 1: (B_0 ... B_{p-1}) <-- PBKDF2(P, S, 1, p * MFLen) */
-	PBKDF2_SHA256(passwd, passwdlen, salt, saltlen, 1, B, p * 128 * r);
-
-	/* 2: for i = 0 to p - 1 do */
-	for (i = 0; i < p; i++) {
-		/* 3: B_i <-- MF(B_i, N) */
-		smix(&B[i * 128 * r], r, N, V, XY);
-	}
-
-	/* 5: DK <-- PBKDF2(P, B, 1, dkLen) */
-	PBKDF2_SHA256(passwd, passwdlen, B, p * 128 * r, 1, buf, buflen);
-
-	/* Free memory. */
-#ifdef MAP_ANON
-	if (munmap(V0, 128 * r * N))
-		goto err2;
-#else
-	free(V0);
-#endif
-	free(XY0);
-	free(B0);
-
-	/* Success! */
-	return (0);
-
-err2:
-	free(XY0);
-err1:
-	free(B0);
-err0:
-	/* Failure! */
-	return (-1);
-}
diff --git a/outside/scrypt/crypto_scrypt.h b/outside/scrypt/crypto_scrypt.h
deleted file mode 100644
index b88be09d8..000000000
--- a/outside/scrypt/crypto_scrypt.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-
- * Copyright 2009 Colin Percival
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * This file was originally written by Colin Percival as part of the Tarsnap
- * online backup system.
- */
-#ifndef _CRYPTO_SCRYPT_H_
-#define _CRYPTO_SCRYPT_H_
-
-#include <stdint.h>
-#include <emmintrin.h>
-
-void smix(uint8_t *, size_t, uint64_t, void *, void *);
-void PBKDF2_SHA256(const uint8_t *, size_t, const uint8_t *, size_t,
-    uint64_t, uint8_t *, size_t);
-
-/**
- * crypto_scrypt(passwd, passwdlen, salt, saltlen, N, r, p, buf, buflen):
- * Compute scrypt(passwd[0 .. passwdlen - 1], salt[0 .. saltlen - 1], N, r,
- * p, buflen) and write the result into buf.  The parameters r, p, and buflen
- * must satisfy r * p < 2^30 and buflen <= (2^32 - 1) * 32.  The parameter N
- * must be a power of 2 greater than 1.
- *
- * Return 0 on success; or -1 on error.
- */
-int crypto_scrypt(const uint8_t *, size_t, const uint8_t *, size_t, uint64_t,
-    uint32_t, uint32_t, uint8_t *, size_t);
-
-#endif /* !_CRYPTO_SCRYPT_H_ */
diff --git a/outside/scrypt/sha256.c b/outside/scrypt/sha256.c
deleted file mode 100644
index d2f915f1a..000000000
--- a/outside/scrypt/sha256.c
+++ /dev/null
@@ -1,411 +0,0 @@
-/*-
- * Copyright 2005,2007,2009 Colin Percival
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/types.h>
-
-#include <stdint.h>
-#include <string.h>
-
-#include "sysendian.h"
-
-#include "sha256.h"
-
-/*
- * Encode a length len/4 vector of (uint32_t) into a length len vector of
- * (unsigned char) in big-endian form.  Assumes len is a multiple of 4.
- */
-static void
-be32enc_vect(unsigned char *dst, const uint32_t *src, size_t len)
-{
-	size_t i;
-
-	for (i = 0; i < len / 4; i++)
-		be32enc(dst + i * 4, src[i]);
-}
-
-/*
- * Decode a big-endian length len vector of (unsigned char) into a length
- * len/4 vector of (uint32_t).  Assumes len is a multiple of 4.
- */
-static void
-be32dec_vect(uint32_t *dst, const unsigned char *src, size_t len)
-{
-	size_t i;
-
-	for (i = 0; i < len / 4; i++)
-		dst[i] = be32dec(src + i * 4);
-}
-
-/* Elementary functions used by SHA256 */
-#define Ch(x, y, z)	((x & (y ^ z)) ^ z)
-#define Maj(x, y, z)	((x & (y | z)) | (y & z))
-#define SHR(x, n)	(x >> n)
-#define ROTR(x, n)	((x >> n) | (x << (32 - n)))
-#define S0(x)		(ROTR(x, 2) ^ ROTR(x, 13) ^ ROTR(x, 22))
-#define S1(x)		(ROTR(x, 6) ^ ROTR(x, 11) ^ ROTR(x, 25))
-#define s0(x)		(ROTR(x, 7) ^ ROTR(x, 18) ^ SHR(x, 3))
-#define s1(x)		(ROTR(x, 17) ^ ROTR(x, 19) ^ SHR(x, 10))
-
-/* SHA256 round function */
-#define RND(a, b, c, d, e, f, g, h, k)			\
-	t0 = h + S1(e) + Ch(e, f, g) + k;		\
-	t1 = S0(a) + Maj(a, b, c);			\
-	d += t0;					\
-	h  = t0 + t1;
-
-/* Adjusted round function for rotating state */
-#define RNDr(S, W, i, k)			\
-	RND(S[(64 - i) % 8], S[(65 - i) % 8],	\
-	    S[(66 - i) % 8], S[(67 - i) % 8],	\
-	    S[(68 - i) % 8], S[(69 - i) % 8],	\
-	    S[(70 - i) % 8], S[(71 - i) % 8],	\
-	    W[i] + k)
-
-/*
- * SHA256 block compression function.  The 256-bit state is transformed via
- * the 512-bit input block to produce a new state.
- */
-static void
-SHA256_Transform(uint32_t * state, const unsigned char block[64])
-{
-	uint32_t W[64];
-	uint32_t S[8];
-	uint32_t t0, t1;
-	int i;
-
-	/* 1. Prepare message schedule W. */
-	be32dec_vect(W, block, 64);
-	for (i = 16; i < 64; i++)
-		W[i] = s1(W[i - 2]) + W[i - 7] + s0(W[i - 15]) + W[i - 16];
-
-	/* 2. Initialize working variables. */
-	memcpy(S, state, 32);
-
-	/* 3. Mix. */
-	RNDr(S, W, 0, 0x428a2f98);
-	RNDr(S, W, 1, 0x71374491);
-	RNDr(S, W, 2, 0xb5c0fbcf);
-	RNDr(S, W, 3, 0xe9b5dba5);
-	RNDr(S, W, 4, 0x3956c25b);
-	RNDr(S, W, 5, 0x59f111f1);
-	RNDr(S, W, 6, 0x923f82a4);
-	RNDr(S, W, 7, 0xab1c5ed5);
-	RNDr(S, W, 8, 0xd807aa98);
-	RNDr(S, W, 9, 0x12835b01);
-	RNDr(S, W, 10, 0x243185be);
-	RNDr(S, W, 11, 0x550c7dc3);
-	RNDr(S, W, 12, 0x72be5d74);
-	RNDr(S, W, 13, 0x80deb1fe);
-	RNDr(S, W, 14, 0x9bdc06a7);
-	RNDr(S, W, 15, 0xc19bf174);
-	RNDr(S, W, 16, 0xe49b69c1);
-	RNDr(S, W, 17, 0xefbe4786);
-	RNDr(S, W, 18, 0x0fc19dc6);
-	RNDr(S, W, 19, 0x240ca1cc);
-	RNDr(S, W, 20, 0x2de92c6f);
-	RNDr(S, W, 21, 0x4a7484aa);
-	RNDr(S, W, 22, 0x5cb0a9dc);
-	RNDr(S, W, 23, 0x76f988da);
-	RNDr(S, W, 24, 0x983e5152);
-	RNDr(S, W, 25, 0xa831c66d);
-	RNDr(S, W, 26, 0xb00327c8);
-	RNDr(S, W, 27, 0xbf597fc7);
-	RNDr(S, W, 28, 0xc6e00bf3);
-	RNDr(S, W, 29, 0xd5a79147);
-	RNDr(S, W, 30, 0x06ca6351);
-	RNDr(S, W, 31, 0x14292967);
-	RNDr(S, W, 32, 0x27b70a85);
-	RNDr(S, W, 33, 0x2e1b2138);
-	RNDr(S, W, 34, 0x4d2c6dfc);
-	RNDr(S, W, 35, 0x53380d13);
-	RNDr(S, W, 36, 0x650a7354);
-	RNDr(S, W, 37, 0x766a0abb);
-	RNDr(S, W, 38, 0x81c2c92e);
-	RNDr(S, W, 39, 0x92722c85);
-	RNDr(S, W, 40, 0xa2bfe8a1);
-	RNDr(S, W, 41, 0xa81a664b);
-	RNDr(S, W, 42, 0xc24b8b70);
-	RNDr(S, W, 43, 0xc76c51a3);
-	RNDr(S, W, 44, 0xd192e819);
-	RNDr(S, W, 45, 0xd6990624);
-	RNDr(S, W, 46, 0xf40e3585);
-	RNDr(S, W, 47, 0x106aa070);
-	RNDr(S, W, 48, 0x19a4c116);
-	RNDr(S, W, 49, 0x1e376c08);
-	RNDr(S, W, 50, 0x2748774c);
-	RNDr(S, W, 51, 0x34b0bcb5);
-	RNDr(S, W, 52, 0x391c0cb3);
-	RNDr(S, W, 53, 0x4ed8aa4a);
-	RNDr(S, W, 54, 0x5b9cca4f);
-	RNDr(S, W, 55, 0x682e6ff3);
-	RNDr(S, W, 56, 0x748f82ee);
-	RNDr(S, W, 57, 0x78a5636f);
-	RNDr(S, W, 58, 0x84c87814);
-	RNDr(S, W, 59, 0x8cc70208);
-	RNDr(S, W, 60, 0x90befffa);
-	RNDr(S, W, 61, 0xa4506ceb);
-	RNDr(S, W, 62, 0xbef9a3f7);
-	RNDr(S, W, 63, 0xc67178f2);
-
-	/* 4. Mix local working variables into global state */
-	for (i = 0; i < 8; i++)
-		state[i] += S[i];
-
-	/* Clean the stack. */
-	memset(W, 0, 256);
-	memset(S, 0, 32);
-	t0 = t1 = 0;
-}
-
-static unsigned char PAD[64] = {
-	0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-
-/* Add padding and terminating bit-count. */
-static void
-SHA256_Pad(SHA256_CTX * ctx)
-{
-	unsigned char len[8];
-	uint32_t r, plen;
-
-	/*
-	 * Convert length to a vector of bytes -- we do this now rather
-	 * than later because the length will change after we pad.
-	 */
-	be32enc_vect(len, ctx->count, 8);
-
-	/* Add 1--64 bytes so that the resulting length is 56 mod 64 */
-	r = (ctx->count[1] >> 3) & 0x3f;
-	plen = (r < 56) ? (56 - r) : (120 - r);
-	SHA256_Update(ctx, PAD, (size_t)plen);
-
-	/* Add the terminating bit-count */
-	SHA256_Update(ctx, len, 8);
-}
-
-/* SHA-256 initialization.  Begins a SHA-256 operation. */
-void
-SHA256_Init(SHA256_CTX * ctx)
-{
-
-	/* Zero bits processed so far */
-	ctx->count[0] = ctx->count[1] = 0;
-
-	/* Magic initialization constants */
-	ctx->state[0] = 0x6A09E667;
-	ctx->state[1] = 0xBB67AE85;
-	ctx->state[2] = 0x3C6EF372;
-	ctx->state[3] = 0xA54FF53A;
-	ctx->state[4] = 0x510E527F;
-	ctx->state[5] = 0x9B05688C;
-	ctx->state[6] = 0x1F83D9AB;
-	ctx->state[7] = 0x5BE0CD19;
-}
-
-/* Add bytes into the hash */
-void
-SHA256_Update(SHA256_CTX * ctx, const void *in, size_t len)
-{
-	uint32_t bitlen[2];
-	uint32_t r;
-	const unsigned char *src = in;
-
-	/* Number of bytes left in the buffer from previous updates */
-	r = (ctx->count[1] >> 3) & 0x3f;
-
-	/* Convert the length into a number of bits */
-	bitlen[1] = ((uint32_t)len) << 3;
-	bitlen[0] = (uint32_t)(len >> 29);
-
-	/* Update number of bits */
-	if ((ctx->count[1] += bitlen[1]) < bitlen[1])
-		ctx->count[0]++;
-	ctx->count[0] += bitlen[0];
-
-	/* Handle the case where we don't need to perform any transforms */
-	if (len < 64 - r) {
-		memcpy(&ctx->buf[r], src, len);
-		return;
-	}
-
-	/* Finish the current block */
-	memcpy(&ctx->buf[r], src, 64 - r);
-	SHA256_Transform(ctx->state, ctx->buf);
-	src += 64 - r;
-	len -= 64 - r;
-
-	/* Perform complete blocks */
-	while (len >= 64) {
-		SHA256_Transform(ctx->state, src);
-		src += 64;
-		len -= 64;
-	}
-
-	/* Copy left over data into buffer */
-	memcpy(ctx->buf, src, len);
-}
-
-/*
- * SHA-256 finalization.  Pads the input data, exports the hash value,
- * and clears the context state.
- */
-void
-SHA256_Final(unsigned char digest[32], SHA256_CTX * ctx)
-{
-
-	/* Add padding */
-	SHA256_Pad(ctx);
-
-	/* Write the hash */
-	be32enc_vect(digest, ctx->state, 32);
-
-	/* Clear the context state */
-	memset((void *)ctx, 0, sizeof(*ctx));
-}
-
-/* Initialize an HMAC-SHA256 operation with the given key. */
-void
-HMAC_SHA256_Init(HMAC_SHA256_CTX * ctx, const void * _K, size_t Klen)
-{
-	unsigned char pad[64];
-	unsigned char khash[32];
-	const unsigned char * K = _K;
-	size_t i;
-
-	/* If Klen > 64, the key is really SHA256(K). */
-	if (Klen > 64) {
-		SHA256_Init(&ctx->ictx);
-		SHA256_Update(&ctx->ictx, K, Klen);
-		SHA256_Final(khash, &ctx->ictx);
-		K = khash;
-		Klen = 32;
-	}
-
-	/* Inner SHA256 operation is SHA256(K xor [block of 0x36] || data). */
-	SHA256_Init(&ctx->ictx);
-	memset(pad, 0x36, 64);
-	for (i = 0; i < Klen; i++)
-		pad[i] ^= K[i];
-	SHA256_Update(&ctx->ictx, pad, 64);
-
-	/* Outer SHA256 operation is SHA256(K xor [block of 0x5c] || hash). */
-	SHA256_Init(&ctx->octx);
-	memset(pad, 0x5c, 64);
-	for (i = 0; i < Klen; i++)
-		pad[i] ^= K[i];
-	SHA256_Update(&ctx->octx, pad, 64);
-
-	/* Clean the stack. */
-	memset(khash, 0, 32);
-}
-
-/* Add bytes to the HMAC-SHA256 operation. */
-void
-HMAC_SHA256_Update(HMAC_SHA256_CTX * ctx, const void *in, size_t len)
-{
-
-	/* Feed data to the inner SHA256 operation. */
-	SHA256_Update(&ctx->ictx, in, len);
-}
-
-/* Finish an HMAC-SHA256 operation. */
-void
-HMAC_SHA256_Final(unsigned char digest[32], HMAC_SHA256_CTX * ctx)
-{
-	unsigned char ihash[32];
-
-	/* Finish the inner SHA256 operation. */
-	SHA256_Final(ihash, &ctx->ictx);
-
-	/* Feed the inner hash to the outer SHA256 operation. */
-	SHA256_Update(&ctx->octx, ihash, 32);
-
-	/* Finish the outer SHA256 operation. */
-	SHA256_Final(digest, &ctx->octx);
-
-	/* Clean the stack. */
-	memset(ihash, 0, 32);
-}
-
-/**
- * PBKDF2_SHA256(passwd, passwdlen, salt, saltlen, c, buf, dkLen):
- * Compute PBKDF2(passwd, salt, c, dkLen) using HMAC-SHA256 as the PRF, and
- * write the output to buf.  The value dkLen must be at most 32 * (2^32 - 1).
- */
-void
-PBKDF2_SHA256(const uint8_t * passwd, size_t passwdlen, const uint8_t * salt,
-    size_t saltlen, uint64_t c, uint8_t * buf, size_t dkLen)
-{
-	HMAC_SHA256_CTX PShctx, hctx;
-	size_t i;
-	uint8_t ivec[4];
-	uint8_t U[32];
-	uint8_t T[32];
-	uint64_t j;
-	int k;
-	size_t clen;
-
-	/* Compute HMAC state after processing P and S. */
-	HMAC_SHA256_Init(&PShctx, passwd, passwdlen);
-	HMAC_SHA256_Update(&PShctx, salt, saltlen);
-
-	/* Iterate through the blocks. */
-	for (i = 0; i * 32 < dkLen; i++) {
-		/* Generate INT(i + 1). */
-		be32enc(ivec, (uint32_t)(i + 1));
-
-		/* Compute U_1 = PRF(P, S || INT(i)). */
-		memcpy(&hctx, &PShctx, sizeof(HMAC_SHA256_CTX));
-		HMAC_SHA256_Update(&hctx, ivec, 4);
-		HMAC_SHA256_Final(U, &hctx);
-
-		/* T_i = U_1 ... */
-		memcpy(T, U, 32);
-
-		for (j = 2; j <= c; j++) {
-			/* Compute U_j. */
-			HMAC_SHA256_Init(&hctx, passwd, passwdlen);
-			HMAC_SHA256_Update(&hctx, U, 32);
-			HMAC_SHA256_Final(U, &hctx);
-
-			/* ... xor U_j ... */
-			for (k = 0; k < 32; k++)
-				T[k] ^= U[k];
-		}
-
-		/* Copy as many bytes as necessary into buf. */
-		clen = dkLen - i * 32;
-		if (clen > 32)
-			clen = 32;
-		memcpy(&buf[i * 32], T, clen);
-	}
-
-	/* Clean PShctx, since we never called _Final on it. */
-	memset(&PShctx, 0, sizeof(HMAC_SHA256_CTX));
-}
diff --git a/outside/scrypt/sha256.h b/outside/scrypt/sha256.h
deleted file mode 100644
index 289a5232f..000000000
--- a/outside/scrypt/sha256.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*-
- * Copyright 2005,2007,2009 Colin Percival
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD: src/lib/libmd/sha256.h,v 1.2 2006/01/17 15:35:56 phk Exp $
- */
-
-#ifndef _SHA256_H_
-#define _SHA256_H_
-
-#include <sys/types.h>
-
-#include <stdint.h>
-
-typedef struct SHA256Context {
-	uint32_t state[8];
-	uint32_t count[2];
-	unsigned char buf[64];
-} SHA256_CTX;
-
-typedef struct HMAC_SHA256Context {
-	SHA256_CTX ictx;
-	SHA256_CTX octx;
-} HMAC_SHA256_CTX;
-
-void	SHA256_Init(SHA256_CTX *);
-void	SHA256_Update(SHA256_CTX *, const void *, size_t);
-void	SHA256_Final(unsigned char [32], SHA256_CTX *);
-void	HMAC_SHA256_Init(HMAC_SHA256_CTX *, const void *, size_t);
-void	HMAC_SHA256_Update(HMAC_SHA256_CTX *, const void *, size_t);
-void	HMAC_SHA256_Final(unsigned char [32], HMAC_SHA256_CTX *);
-
-/**
- * PBKDF2_SHA256(passwd, passwdlen, salt, saltlen, c, buf, dkLen):
- * Compute PBKDF2(passwd, salt, c, dkLen) using HMAC-SHA256 as the PRF, and
- * write the output to buf.  The value dkLen must be at most 32 * (2^32 - 1).
- */
-void	PBKDF2_SHA256(const uint8_t *, size_t, const uint8_t *, size_t,
-    uint64_t, uint8_t *, size_t);
-
-#endif /* !_SHA256_H_ */
diff --git a/outside/scrypt/sysendian.h b/outside/scrypt/sysendian.h
deleted file mode 100644
index 207fb0693..000000000
--- a/outside/scrypt/sysendian.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/*-
- * Copyright 2007-2009 Colin Percival
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * This file was originally written by Colin Percival as part of the Tarsnap
- * online backup system.
- */
-#ifndef _SYSENDIAN_H_
-#define _SYSENDIAN_H_
-
-#if defined(U3_OS_bsd)
-#include <sys/endian.h>
-#else
-#include <stdint.h>
-
-static inline uint32_t
-be32dec(const void *pp)
-{
-	const uint8_t *p = (uint8_t const *)pp;
-
-	return ((uint32_t)(p[3]) + ((uint32_t)(p[2]) << 8) +
-	    ((uint32_t)(p[1]) << 16) + ((uint32_t)(p[0]) << 24));
-}
-
-static inline void
-be32enc(void *pp, uint32_t x)
-{
-	uint8_t * p = (uint8_t *)pp;
-
-	p[3] = x & 0xff;
-	p[2] = (x >> 8) & 0xff;
-	p[1] = (x >> 16) & 0xff;
-	p[0] = (x >> 24) & 0xff;
-}
-
-static inline uint64_t
-be64dec(const void *pp)
-{
-	const uint8_t *p = (uint8_t const *)pp;
-
-	return ((uint64_t)(p[7]) + ((uint64_t)(p[6]) << 8) +
-	    ((uint64_t)(p[5]) << 16) + ((uint64_t)(p[4]) << 24) +
-	    ((uint64_t)(p[3]) << 32) + ((uint64_t)(p[2]) << 40) +
-	    ((uint64_t)(p[1]) << 48) + ((uint64_t)(p[0]) << 56));
-}
-
-static inline void
-be64enc(void *pp, uint64_t x)
-{
-	uint8_t * p = (uint8_t *)pp;
-
-	p[7] = x & 0xff;
-	p[6] = (x >> 8) & 0xff;
-	p[5] = (x >> 16) & 0xff;
-	p[4] = (x >> 24) & 0xff;
-	p[3] = (x >> 32) & 0xff;
-	p[2] = (x >> 40) & 0xff;
-	p[1] = (x >> 48) & 0xff;
-	p[0] = (x >> 56) & 0xff;
-}
-
-static inline uint32_t
-le32dec(const void *pp)
-{
-	const uint8_t *p = (uint8_t const *)pp;
-
-	return ((uint32_t)(p[0]) + ((uint32_t)(p[1]) << 8) +
-	    ((uint32_t)(p[2]) << 16) + ((uint32_t)(p[3]) << 24));
-}
-
-static inline void
-le32enc(void *pp, uint32_t x)
-{
-	uint8_t * p = (uint8_t *)pp;
-
-	p[0] = x & 0xff;
-	p[1] = (x >> 8) & 0xff;
-	p[2] = (x >> 16) & 0xff;
-	p[3] = (x >> 24) & 0xff;
-}
-
-static inline uint64_t
-le64dec(const void *pp)
-{
-	const uint8_t *p = (uint8_t const *)pp;
-
-	return ((uint64_t)(p[0]) + ((uint64_t)(p[1]) << 8) +
-	    ((uint64_t)(p[2]) << 16) + ((uint64_t)(p[3]) << 24) +
-	    ((uint64_t)(p[4]) << 32) + ((uint64_t)(p[5]) << 40) +
-	    ((uint64_t)(p[6]) << 48) + ((uint64_t)(p[7]) << 56));
-}
-
-static inline void
-le64enc(void *pp, uint64_t x)
-{
-	uint8_t * p = (uint8_t *)pp;
-
-	p[0] = x & 0xff;
-	p[1] = (x >> 8) & 0xff;
-	p[2] = (x >> 16) & 0xff;
-	p[3] = (x >> 24) & 0xff;
-	p[4] = (x >> 32) & 0xff;
-	p[5] = (x >> 40) & 0xff;
-	p[6] = (x >> 48) & 0xff;
-	p[7] = (x >> 56) & 0xff;
-}
-#endif
-#endif /* !_SYSENDIAN_H_ */

From b812d16b0aff755289ff7399e7ecbf94fc4eb8cd Mon Sep 17 00:00:00 2001
From: cgyarvin <curtis.yarvin@gmail.com>
Date: Sun, 3 May 2015 16:31:45 -0700
Subject: [PATCH 22/24] Revert "Revert "Jetted scrypt""

---
 Makefile                           |  20 +-
 i/j/q.h                            |   6 +
 i/j/w.h                            |   5 +
 j/e/scr.c                          | 277 +++++++++++++++++++
 j/tree.c                           |  14 +
 outside/scrypt/Makefile            |  16 ++
 outside/scrypt/crypto_scrypt-sse.c | 357 +++++++++++++++++++++++++
 outside/scrypt/crypto_scrypt.h     |  51 ++++
 outside/scrypt/sha256.c            | 411 +++++++++++++++++++++++++++++
 outside/scrypt/sha256.h            |  62 +++++
 outside/scrypt/sysendian.h         | 129 +++++++++
 11 files changed, 1342 insertions(+), 6 deletions(-)
 create mode 100644 j/e/scr.c
 create mode 100644 outside/scrypt/Makefile
 create mode 100644 outside/scrypt/crypto_scrypt-sse.c
 create mode 100644 outside/scrypt/crypto_scrypt.h
 create mode 100644 outside/scrypt/sha256.c
 create mode 100644 outside/scrypt/sha256.h
 create mode 100644 outside/scrypt/sysendian.h

diff --git a/Makefile b/Makefile
index c83c8a0d7..c001315d2 100644
--- a/Makefile
+++ b/Makefile
@@ -78,6 +78,7 @@ CFLAGS= $(COSFLAGS) -O3 -msse3 -ffast-math \
 	-Ioutside/ed25519/src \
 	-Ioutside/commonmark/src \
 	-Ioutside/commonmark/build/src \
+	-Ioutside/scrypt \
 	$(DEFINES) \
 	$(MDEFINES)
 
@@ -201,6 +202,7 @@ J_E_OFILES=\
        j/e/repg.o \
        j/e/rexp.o \
        j/e/rub.o \
+       j/e/scr.o \
        j/e/shax.o \
        j/e/lore.o \
        j/e/loss.o \
@@ -350,6 +352,8 @@ LIBANACHRONISM=outside/anachronism/build/libanachronism.a
 
 LIBCOMMONMARK=outside/commonmark/build/src/libcmark.a
 
+LIBSCRYPT=outside/scrypt/scrypt.a
+
 all: vere
 
 .MAKEFILE-VERSION: Makefile .make.conf
@@ -380,25 +384,28 @@ $(LIBANACHRONISM):
 $(LIBCOMMONMARK):
 	$(MAKE) -C outside/commonmark
 
+$(LIBSCRYPT):
+	$(MAKE) -C outside/scrypt MDEFINES="$(MDEFINES)"
+
 $(CRE2_OFILES): outside/cre2/src/src/cre2.cpp outside/cre2/src/src/cre2.h $(LIBRE2)
 	$(CXX) $(CXXFLAGS) -c $< -o $@
 
 $(V_OFILES): i/v/vere.h
 
 ifdef NO_SILENT_RULES
-$(BIN)/vere: $(LIBCRE) $(LIBCOMMONMARK) $(VERE_OFILES) $(LIBUV) $(LIBRE2) $(LIBED25519) $(LIBANACHRONISM)
+$(BIN)/vere: $(LIBCRE) $(LIBCOMMONMARK) $(VERE_OFILES) $(LIBUV) $(LIBRE2) $(LIBED25519) $(LIBANACHRONISM) $(LIBSCRYPT)
 	mkdir -p $(BIN)
-	$(CLD) $(CLDOSFLAGS) -o $(BIN)/vere $(VERE_OFILES) $(LIBUV) $(LIBCRE) $(LIBRE2) $(LIBED25519) $(LIBANACHRONISM) $(LIBS) $(LIBCOMMONMARK)
+	$(CLD) $(CLDOSFLAGS) -o $(BIN)/vere $(VERE_OFILES) $(LIBUV) $(LIBCRE) $(LIBRE2) $(LIBED25519) $(LIBANACHRONISM) $(LIBS) $(LIBCOMMONMARK) $(LIBSCRYPT)
 else
-$(BIN)/vere: $(LIBCRE) $(LIBCOMMONMARK) $(VERE_OFILES) $(LIBUV) $(LIBRE2) $(LIBED25519) $(LIBANACHRONISM)
+$(BIN)/vere: $(LIBCRE) $(LIBCOMMONMARK) $(VERE_OFILES) $(LIBUV) $(LIBRE2) $(LIBED25519) $(LIBANACHRONISM) $(LIBSCRYPT)
 	@echo "    CCLD  $(BIN)/vere"
 	@mkdir -p $(BIN)
-	@$(CLD) $(CLDOSFLAGS) -o $(BIN)/vere $(VERE_OFILES) $(LIBUV) $(LIBCRE) $(LIBRE2) $(LIBED25519) $(LIBANACHRONISM) $(LIBS) $(LIBCOMMONMARK)
+	@$(CLD) $(CLDOSFLAGS) -o $(BIN)/vere $(VERE_OFILES) $(LIBUV) $(LIBCRE) $(LIBRE2) $(LIBED25519) $(LIBANACHRONISM) $(LIBS) $(LIBCOMMONMARK) $(LIBSCRYPT)
 endif
 
-$(BIN)/meme: $(LIBCRE) $(LIBCOMMONMARK) $(MEME_OFILES) $(LIBUV) $(LIBRE2) $(LIBED25519) $(LIBANACHRONISM)
+$(BIN)/meme: $(LIBCRE) $(LIBCOMMONMARK) $(MEME_OFILES) $(LIBUV) $(LIBRE2) $(LIBED25519) $(LIBANACHRONISM) $(LIBSCRYPT)
 	mkdir -p $(BIN)
-	$(CLD) $(CLDOSFLAGS) -o $(BIN)/meme $(MEME_OFILES) $(LIBUV) $(LIBCRE) $(LIBRE2) $(LIBED25519) $(LIBANACHRONISM) $(LIBS) $(LIBCOMMONMARK)
+	$(CLD) $(CLDOSFLAGS) -o $(BIN)/meme $(MEME_OFILES) $(LIBUV) $(LIBCRE) $(LIBRE2) $(LIBED25519) $(LIBANACHRONISM) $(LIBS) $(LIBCOMMONMARK) $(LIBSCRYPT)
 
 tags:
 	ctags -R -f .tags --exclude=root
@@ -433,5 +440,6 @@ distclean: clean $(LIBUV_MAKEFILE)
 	$(MAKE) -C outside/re2 clean
 	$(MAKE) -C outside/ed25519 clean
 	$(MAKE) -C outside/anachronism clean
+	$(MAKE) -C outside/scrypt clean
 
 .PHONY: clean debbuild debinstalldistclean etags osxpackage tags
diff --git a/i/j/q.h b/i/j/q.h
index 9d490f6d2..04a636295 100644
--- a/i/j/q.h
+++ b/i/j/q.h
@@ -93,6 +93,12 @@
     u3_noun u3qea_de(u3_atom, u3_atom);
     u3_noun u3qea_en(u3_atom, u3_atom);
 
+    u3_noun u3qes_hsh(u3_atom, u3_atom, u3_atom, u3_atom, u3_atom, u3_atom);
+    u3_noun u3qes_hsl(u3_atom, u3_atom, u3_atom, u3_atom, u3_atom,
+                      u3_atom, u3_atom, u3_atom);
+    u3_noun u3qes_pbk(u3_atom, u3_atom, u3_atom, u3_atom);
+    u3_noun u3qes_pbl(u3_atom, u3_atom, u3_atom, u3_atom, u3_atom, u3_atom);
+
     u3_noun u3qe_shax(u3_atom);
     u3_noun u3qe_shay(u3_atom, u3_atom);
     u3_noun u3qe_shas(u3_atom, u3_atom);
diff --git a/i/j/w.h b/i/j/w.h
index 615f237c9..1ebb5f286 100644
--- a/i/j/w.h
+++ b/i/j/w.h
@@ -105,6 +105,11 @@
     u3_noun u3wea_de(u3_noun);
     u3_noun u3wea_en(u3_noun);
 
+    u3_noun u3wes_hsh(u3_noun);
+    u3_noun u3wes_hsl(u3_noun);
+    u3_noun u3wes_pbk(u3_noun);
+    u3_noun u3wes_pbl(u3_noun);
+
     u3_noun u3we_shax(u3_noun);
     u3_noun u3we_shay(u3_noun);
     u3_noun u3we_shas(u3_noun);
diff --git a/j/e/scr.c b/j/e/scr.c
new file mode 100644
index 000000000..141667af1
--- /dev/null
+++ b/j/e/scr.c
@@ -0,0 +1,277 @@
+/* j/5/scr.c
+**
+*/
+#include "all.h"
+
+#include <stdint.h>
+#include <errno.h>
+#include <crypto_scrypt.h>
+
+int _crypto_scrypt(const uint8_t *, size_t, const uint8_t *, size_t,
+    uint64_t, uint32_t, uint32_t, uint8_t *, size_t);
+
+/* functions
+*/
+
+  u3_noun
+  u3qes_hsl(u3_atom p, u3_atom pl, u3_atom s, u3_atom sl, u3_atom n,
+            u3_atom r, u3_atom  z, u3_atom d)
+  {
+    // asserting that n is power of 2 in _crypto_scrypt
+    if (!(_(u3a_is_atom(p)) && _(u3a_is_atom(s)) &&
+          _(u3a_is_cat(pl)) && _(u3a_is_cat(sl)) &&
+          _(u3a_is_cat(n))  && _(u3a_is_cat(r))  &&
+          _(u3a_is_cat(z))  && _(u3a_is_cat(d))  &&
+           (r != 0)         &&  (z != 0)         &&
+           (((c3_d)r * 128 * ((c3_d)n + z - 1)) <= (1 << 30))))
+        return u3m_bail(c3__exit);
+
+    c3_y* b_p = u3a_malloc(pl + 1); c3_y* b_s= u3a_malloc(sl + 1);    
+    u3r_bytes(0, pl, b_p, p);       u3r_bytes(0, sl, b_s, s);
+    b_p[pl] = 0; b_s[sl]=0;
+    c3_y* buf = u3a_malloc(d);
+
+    if (_crypto_scrypt(b_p, pl, b_s, sl, n, r, z, buf, d) != 0)
+        return u3m_bail(c3__exit);
+
+    u3_noun res = u3i_bytes(d, buf);
+    u3a_free(b_p); u3a_free(b_s); u3a_free(buf);
+
+    return res;
+  }
+
+  u3_noun
+  u3wes_hsl(u3_noun cor)
+  {
+    u3_noun p, pl, s, sl, n, r, z, d;
+    u3_noun q;
+
+    u3x_quil(u3r_at(u3x_sam, cor), &p, &pl, &s, &sl, &q);
+    u3x_qual(q, &n, &r, &z, &d);
+
+    return u3qes_hsl(p, pl, s, sl, n, r, z, d);
+  }
+
+  u3_noun
+  u3qes_hsh(u3_atom p, u3_atom s, u3_atom n, u3_atom r, u3_atom  z, u3_atom d)
+  {
+    // asserting that n is power of 2 in _crypto_scrypt
+    if (!(_(u3a_is_atom(p)) && _(u3a_is_atom(s)) &&
+          _(u3a_is_cat(n))  && _(u3a_is_cat(r))  &&
+          _(u3a_is_cat(z))  && _(u3a_is_cat(d))  &&
+           (r != 0)         &&  (z != 0)         &&
+           (((c3_d)r * 128 * ((c3_d)n + z - 1)) <= (1 << 30))))
+        return u3m_bail(c3__exit);
+
+    c3_w   pl = u3r_met(3, p);      c3_w   sl = u3r_met(3, s);
+    c3_y* b_p = u3a_malloc(pl + 1); c3_y* b_s= u3a_malloc(sl + 1);    
+    u3r_bytes(0, pl, b_p, p);       u3r_bytes(0, sl, b_s, s);
+    b_p[pl] = 0; b_s[sl]=0;
+    c3_y* buf = u3a_malloc(d);
+
+    if (_crypto_scrypt(b_p, pl, b_s, sl, n, r, z, buf, d) != 0)
+        return u3m_bail(c3__exit);
+
+    u3_noun res = u3i_bytes(d, buf);
+    u3a_free(b_p); u3a_free(b_s); u3a_free(buf);
+
+    return res;
+  }
+
+  u3_noun
+  u3wes_hsh(u3_noun cor)
+  {
+    u3_noun p, s, n, r, z, d;
+    u3_noun q;
+
+    u3x_quil(u3r_at(u3x_sam, cor), &p, &s, &n, &r, &q);
+    u3x_cell(q, &z, &d);
+
+    return u3qes_hsh(p, s, n, r, z, d);
+  }
+
+  u3_noun
+  u3qes_pbl(u3_atom p, u3_atom pl, u3_atom s, u3_atom sl,
+            u3_atom c, u3_atom d)
+  {
+    if (!(_(u3a_is_atom(p)) && _(u3a_is_atom(s)) &&
+          _(u3a_is_cat(pl)) && _(u3a_is_cat(sl)) &&
+          _(u3a_is_cat(c))  && _(u3a_is_cat(d))  &&
+           (d <= (1 << 30)) &&  (c <= (1 << 28)) &&
+           (c != 0)))
+        return u3m_bail(c3__exit);
+
+    c3_y* b_p = u3a_malloc(pl + 1); c3_y* b_s= u3a_malloc(pl + 1);    
+    u3r_bytes(0, pl, b_p, p);       u3r_bytes(0, sl, b_s, s);
+    b_p[pl] = 0; b_s[sl]=0;
+    c3_y* buf = u3a_malloc(d);
+
+    PBKDF2_SHA256(b_p, pl, b_s, sl, c, buf, d);
+
+    u3_noun res = u3i_bytes(d, buf);
+    u3a_free(b_p); u3a_free(b_s); u3a_free(buf);
+
+    return res;
+  }
+
+  u3_noun
+  u3wes_pbl(u3_noun cor)
+  {
+    u3_noun p, pl, s, sl, c, d;
+    u3_noun q;
+
+    u3x_quil(u3r_at(u3x_sam, cor), &p, &pl, &s, &sl, &q);
+    u3x_cell(q, &c, &d);
+
+    return u3qes_pbl(p, pl, s, sl, c, d);
+  }
+
+  u3_noun
+  u3qes_pbk(u3_atom p, u3_atom s, u3_atom c, u3_atom d)
+  {
+    if (!(_(u3a_is_atom(p)) && _(u3a_is_atom(s)) &&
+          _(u3a_is_cat(c))  && _(u3a_is_cat(d))  &&
+           (d <= (1 << 30)) &&  (c <= (1 << 28)) &&
+           (c != 0)))
+        return u3m_bail(c3__exit);
+
+    c3_w   pl = u3r_met(3, p);      c3_w   sl = u3r_met(3, s);
+    c3_y* b_p = u3a_malloc(pl + 1); c3_y* b_s= u3a_malloc(pl + 1);    
+    u3r_bytes(0, pl, b_p, p);       u3r_bytes(0, sl, b_s, s);
+    b_p[pl] = 0; b_s[sl]=0;
+    c3_y* buf = u3a_malloc(d);
+
+    PBKDF2_SHA256(b_p, pl, b_s, sl, c, buf, d);
+
+    u3_noun res = u3i_bytes(d, buf);
+    u3a_free(b_p); u3a_free(b_s); u3a_free(buf);
+
+    return res;
+  }
+
+  u3_noun
+  u3wes_pbk(u3_noun cor)
+  {
+    u3_noun p, s, c, d;
+
+    u3x_qual(u3r_at(u3x_sam, cor), &p, &s, &c, &d);
+
+    return u3qes_pbk(p, s, c, d);
+  }
+
+/*-
+ * Copyright 2009 Colin Percival
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * This file was originally written by Colin Percival as part of the Tarsnap
+ * online backup system.
+ */
+
+/**
+ * crypto_scrypt(passwd, passwdlen, salt, saltlen, N, r, p, buf, buflen):
+ * Compute scrypt(passwd[0 .. passwdlen - 1], salt[0 .. saltlen - 1], N, r,
+ * p, buflen) and write the result into buf.  The parameters r, p, and buflen
+ * must satisfy r * p < 2^30 and buflen <= (2^32 - 1) * 32.  The parameter N
+ * must be a power of 2 greater than 1.
+ *
+ * Return 0 on success; or -1 on error.
+ */
+int
+_crypto_scrypt(const uint8_t * passwd, size_t passwdlen,
+    const uint8_t * salt, size_t saltlen, uint64_t N, uint32_t r, uint32_t p,
+    uint8_t * buf, size_t buflen)
+{
+	void * B0, * V0, * XY0;
+	uint8_t * B;
+	uint32_t * V;
+	uint32_t * XY;
+	uint32_t i;
+
+	if (((N & (N-1)) != 0) || N == 0)
+		goto err0;
+
+	/* Sanity-check parameters. */
+#if SIZE_MAX > UINT32_MAX
+	if (buflen > (((uint64_t)(1) << 32) - 1) * 32) {
+		errno = EFBIG;
+		goto err0;
+	}
+#endif
+	if ((uint64_t)(r) * (uint64_t)(p) >= (1 << 30)) {
+		errno = EFBIG;
+		goto err0;
+	}
+	if (((N & (N - 1)) != 0) || (N == 0)) {
+		errno = EINVAL;
+		goto err0;
+	}
+	if ((r > SIZE_MAX / 128 / p) ||
+#if SIZE_MAX / 256 <= UINT32_MAX
+	    (r > (SIZE_MAX - 64) / 256) ||
+#endif
+	    (N > SIZE_MAX / 128 / r)) {
+		errno = ENOMEM;
+		goto err0;
+	}
+
+	/* Allocate memory. */
+	if ((B0 = u3a_malloc(128 * r * p + 63)) == NULL)
+		goto err0;
+	B = (uint8_t *)(((uintptr_t)(B0) + 63) & ~ (uintptr_t)(63));
+	if ((XY0 = u3a_malloc(256 * r + 64 + 63)) == NULL)
+		goto err1;
+	XY = (uint32_t *)(((uintptr_t)(XY0) + 63) & ~ (uintptr_t)(63));
+	if ((V0 = u3a_malloc(128 * r * N + 63)) == NULL)
+		goto err2;
+	V = (uint32_t *)(((uintptr_t)(V0) + 63) & ~ (uintptr_t)(63));
+
+	/* 1: (B_0 ... B_{p-1}) <-- PBKDF2(P, S, 1, p * MFLen) */
+	PBKDF2_SHA256(passwd, passwdlen, salt, saltlen, 1, B, p * 128 * r);
+
+	/* 2: for i = 0 to p - 1 do */
+	for (i = 0; i < p; i++) {
+		/* 3: B_i <-- MF(B_i, N) */
+		smix(&B[i * 128 * r], r, N, V, XY);
+	}
+
+	/* 5: DK <-- PBKDF2(P, B, 1, dkLen) */
+	PBKDF2_SHA256(passwd, passwdlen, B, p * 128 * r, 1, buf, buflen);
+
+	/* Free memory. */
+
+	u3a_free(V0);
+	u3a_free(XY0);
+	u3a_free(B0);
+
+	/* Success! */
+	return (0);
+
+err2:
+	u3a_free(XY0);
+err1:
+	u3a_free(B0);
+err0:
+	/* Failure! */
+	return (-1);
+}
diff --git a/j/tree.c b/j/tree.c
index ae778d98c..6c0ff2b46 100644
--- a/j/tree.c
+++ b/j/tree.c
@@ -231,6 +231,18 @@ static u3j_core _mood__hoon__coed_d[] =
     {}
   };
 
+static u3j_harm _mood__hoon__scr_hsh_a[] = {{".2", u3wes_hsh}, {}};
+static u3j_harm _mood__hoon__scr_hsl_a[] = {{".2", u3wes_hsl}, {}};
+static u3j_harm _mood__hoon__scr_pbk_a[] = {{".2", u3wes_pbk}, {}};
+static u3j_harm _mood__hoon__scr_pbl_a[] = {{".2", u3wes_pbl}, {}};
+static u3j_core _mood__hoon__scr_d[] =
+  {  { "hsh", _mood__hoon__scr_hsh_a },
+     { "hsl", _mood__hoon__scr_hsl_a },
+     { "pbk", _mood__hoon__scr_pbk_a },
+     { "pbl", _mood__hoon__scr_pbl_a },
+     {}
+  };
+
 static u3j_harm _mood__hoon_pfix_a[] = {{".2", u3we_pfix}, {}};
 static u3j_harm _mood__hoon_plug_a[] = {{".2", u3we_plug}, {}};
 static u3j_harm _mood__hoon_pose_a[] = {{".2", u3we_pose}, {}};
@@ -449,6 +461,8 @@ static u3j_core _mood__hoon_d[] =
     { "rd", 0, _mood__hoon__rd_d },
     { "coed", 0, _mood__hoon__coed_d },
 
+    { "scr", 0, _mood__hoon__scr_d },
+
     { "pfix", _mood__hoon_pfix_a },
     { "plug", _mood__hoon_plug_a },
     { "pose", _mood__hoon_pose_a },
diff --git a/outside/scrypt/Makefile b/outside/scrypt/Makefile
new file mode 100644
index 000000000..f3ac5acb9
--- /dev/null
+++ b/outside/scrypt/Makefile
@@ -0,0 +1,16 @@
+default: all
+
+CC?=gcc
+CFLAGS?=-O2 -msse3 -ffast-math \
+	-Wall -g -D_FORTIFY_SOURCE=2 -fPIC
+CFLAGS_EXTRA?=-Wl,-rpath=.
+
+all: scrypt.a
+
+OBJS= crypto_scrypt-sse.o sha256.o
+
+scrypt.a: $(OBJS)
+	ar rcs scrypt.a  $(OBJS)
+
+clean:
+	rm -f *.o scrypt.a
diff --git a/outside/scrypt/crypto_scrypt-sse.c b/outside/scrypt/crypto_scrypt-sse.c
new file mode 100644
index 000000000..d7b33c078
--- /dev/null
+++ b/outside/scrypt/crypto_scrypt-sse.c
@@ -0,0 +1,357 @@
+/*-
+ * Copyright 2009 Colin Percival
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * This file was originally written by Colin Percival as part of the Tarsnap
+ * online backup system.
+ */
+#include <sys/types.h>
+#include <sys/mman.h>
+
+#include <emmintrin.h>
+#include <errno.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "sha256.h"
+#include "sysendian.h"
+
+#include "crypto_scrypt.h"
+
+static void
+blkcpy(void * dest, void * src, size_t len)
+{
+	__m128i * D = dest;
+	__m128i * S = src;
+	size_t L = len / 16;
+	size_t i;
+
+	for (i = 0; i < L; i++)
+		D[i] = S[i];
+}
+
+static void
+blkxor(void * dest, void * src, size_t len)
+{
+	__m128i * D = dest;
+	__m128i * S = src;
+	size_t L = len / 16;
+	size_t i;
+
+	for (i = 0; i < L; i++)
+		D[i] = _mm_xor_si128(D[i], S[i]);
+}
+
+/**
+ * salsa20_8(B):
+ * Apply the salsa20/8 core to the provided block.
+ */
+static void
+salsa20_8(__m128i B[4])
+{
+	__m128i X0, X1, X2, X3;
+	__m128i T;
+	size_t i;
+
+	X0 = B[0];
+	X1 = B[1];
+	X2 = B[2];
+	X3 = B[3];
+
+	for (i = 0; i < 8; i += 2) {
+		/* Operate on "columns". */
+		T = _mm_add_epi32(X0, X3);
+		X1 = _mm_xor_si128(X1, _mm_slli_epi32(T, 7));
+		X1 = _mm_xor_si128(X1, _mm_srli_epi32(T, 25));
+		T = _mm_add_epi32(X1, X0);
+		X2 = _mm_xor_si128(X2, _mm_slli_epi32(T, 9));
+		X2 = _mm_xor_si128(X2, _mm_srli_epi32(T, 23));
+		T = _mm_add_epi32(X2, X1);
+		X3 = _mm_xor_si128(X3, _mm_slli_epi32(T, 13));
+		X3 = _mm_xor_si128(X3, _mm_srli_epi32(T, 19));
+		T = _mm_add_epi32(X3, X2);
+		X0 = _mm_xor_si128(X0, _mm_slli_epi32(T, 18));
+		X0 = _mm_xor_si128(X0, _mm_srli_epi32(T, 14));
+
+		/* Rearrange data. */
+		X1 = _mm_shuffle_epi32(X1, 0x93);
+		X2 = _mm_shuffle_epi32(X2, 0x4E);
+		X3 = _mm_shuffle_epi32(X3, 0x39);
+
+		/* Operate on "rows". */
+		T = _mm_add_epi32(X0, X1);
+		X3 = _mm_xor_si128(X3, _mm_slli_epi32(T, 7));
+		X3 = _mm_xor_si128(X3, _mm_srli_epi32(T, 25));
+		T = _mm_add_epi32(X3, X0);
+		X2 = _mm_xor_si128(X2, _mm_slli_epi32(T, 9));
+		X2 = _mm_xor_si128(X2, _mm_srli_epi32(T, 23));
+		T = _mm_add_epi32(X2, X3);
+		X1 = _mm_xor_si128(X1, _mm_slli_epi32(T, 13));
+		X1 = _mm_xor_si128(X1, _mm_srli_epi32(T, 19));
+		T = _mm_add_epi32(X1, X2);
+		X0 = _mm_xor_si128(X0, _mm_slli_epi32(T, 18));
+		X0 = _mm_xor_si128(X0, _mm_srli_epi32(T, 14));
+
+		/* Rearrange data. */
+		X1 = _mm_shuffle_epi32(X1, 0x39);
+		X2 = _mm_shuffle_epi32(X2, 0x4E);
+		X3 = _mm_shuffle_epi32(X3, 0x93);
+	}
+
+	B[0] = _mm_add_epi32(B[0], X0);
+	B[1] = _mm_add_epi32(B[1], X1);
+	B[2] = _mm_add_epi32(B[2], X2);
+	B[3] = _mm_add_epi32(B[3], X3);
+}
+
+/**
+ * blockmix_salsa8(Bin, Bout, X, r):
+ * Compute Bout = BlockMix_{salsa20/8, r}(Bin).  The input Bin must be 128r
+ * bytes in length; the output Bout must also be the same size.  The
+ * temporary space X must be 64 bytes.
+ */
+static void
+blockmix_salsa8(__m128i * Bin, __m128i * Bout, __m128i * X, size_t r)
+{
+	size_t i;
+
+	/* 1: X <-- B_{2r - 1} */
+	blkcpy(X, &Bin[8 * r - 4], 64);
+
+	/* 2: for i = 0 to 2r - 1 do */
+	for (i = 0; i < r; i++) {
+		/* 3: X <-- H(X \xor B_i) */
+		blkxor(X, &Bin[i * 8], 64);
+		salsa20_8(X);
+
+		/* 4: Y_i <-- X */
+		/* 6: B' <-- (Y_0, Y_2 ... Y_{2r-2}, Y_1, Y_3 ... Y_{2r-1}) */
+		blkcpy(&Bout[i * 4], X, 64);
+
+		/* 3: X <-- H(X \xor B_i) */
+		blkxor(X, &Bin[i * 8 + 4], 64);
+		salsa20_8(X);
+
+		/* 4: Y_i <-- X */
+		/* 6: B' <-- (Y_0, Y_2 ... Y_{2r-2}, Y_1, Y_3 ... Y_{2r-1}) */
+		blkcpy(&Bout[(r + i) * 4], X, 64);
+	}
+}
+
+/**
+ * integerify(B, r):
+ * Return the result of parsing B_{2r-1} as a little-endian integer.
+ */
+static uint64_t
+integerify(void * B, size_t r)
+{
+	uint32_t * X = (void *)((uintptr_t)(B) + (2 * r - 1) * 64);
+
+	return (((uint64_t)(X[13]) << 32) + X[0]);
+}
+
+/**
+ * smix(B, r, N, V, XY):
+ * Compute B = SMix_r(B, N).  The input B must be 128r bytes in length;
+ * the temporary storage V must be 128rN bytes in length; the temporary
+ * storage XY must be 256r + 64 bytes in length.  The value N must be a
+ * power of 2 greater than 1.  The arrays B, V, and XY must be aligned to a
+ * multiple of 64 bytes.
+ */
+void
+smix(uint8_t * B, size_t r, uint64_t N, void * V, void * XY)
+{
+	__m128i * X = XY;
+	__m128i * Y = (void *)((uintptr_t)(XY) + 128 * r);
+	__m128i * Z = (void *)((uintptr_t)(XY) + 256 * r);
+	uint32_t * X32 = (void *)X;
+	uint64_t i, j;
+	size_t k;
+
+	/* 1: X <-- B */
+	for (k = 0; k < 2 * r; k++) {
+		for (i = 0; i < 16; i++) {
+			X32[k * 16 + i] =
+			    le32dec(&B[(k * 16 + (i * 5 % 16)) * 4]);
+		}
+	}
+
+	/* 2: for i = 0 to N - 1 do */
+	for (i = 0; i < N; i += 2) {
+		/* 3: V_i <-- X */
+		blkcpy((void *)((uintptr_t)(V) + i * 128 * r), X, 128 * r);
+
+		/* 4: X <-- H(X) */
+		blockmix_salsa8(X, Y, Z, r);
+
+		/* 3: V_i <-- X */
+		blkcpy((void *)((uintptr_t)(V) + (i + 1) * 128 * r),
+		    Y, 128 * r);
+
+		/* 4: X <-- H(X) */
+		blockmix_salsa8(Y, X, Z, r);
+	}
+
+	/* 6: for i = 0 to N - 1 do */
+	for (i = 0; i < N; i += 2) {
+		/* 7: j <-- Integerify(X) mod N */
+		j = integerify(X, r) & (N - 1);
+
+		/* 8: X <-- H(X \xor V_j) */
+		blkxor(X, (void *)((uintptr_t)(V) + j * 128 * r), 128 * r);
+		blockmix_salsa8(X, Y, Z, r);
+
+		/* 7: j <-- Integerify(X) mod N */
+		j = integerify(Y, r) & (N - 1);
+
+		/* 8: X <-- H(X \xor V_j) */
+		blkxor(Y, (void *)((uintptr_t)(V) + j * 128 * r), 128 * r);
+		blockmix_salsa8(Y, X, Z, r);
+	}
+
+	/* 10: B' <-- X */
+	for (k = 0; k < 2 * r; k++) {
+		for (i = 0; i < 16; i++) {
+			le32enc(&B[(k * 16 + (i * 5 % 16)) * 4],
+			    X32[k * 16 + i]);
+		}
+	}
+}
+
+/**
+ * crypto_scrypt(passwd, passwdlen, salt, saltlen, N, r, p, buf, buflen):
+ * Compute scrypt(passwd[0 .. passwdlen - 1], salt[0 .. saltlen - 1], N, r,
+ * p, buflen) and write the result into buf.  The parameters r, p, and buflen
+ * must satisfy r * p < 2^30 and buflen <= (2^32 - 1) * 32.  The parameter N
+ * must be a power of 2 greater than 1.
+ *
+ * Return 0 on success; or -1 on error.
+ */
+int
+crypto_scrypt(const uint8_t * passwd, size_t passwdlen,
+    const uint8_t * salt, size_t saltlen, uint64_t N, uint32_t r, uint32_t p,
+    uint8_t * buf, size_t buflen)
+{
+	void * B0, * V0, * XY0;
+	uint8_t * B;
+	uint32_t * V;
+	uint32_t * XY;
+	uint32_t i;
+
+	/* Sanity-check parameters. */
+#if SIZE_MAX > UINT32_MAX
+	if (buflen > (((uint64_t)(1) << 32) - 1) * 32) {
+		errno = EFBIG;
+		goto err0;
+	}
+#endif
+	if ((uint64_t)(r) * (uint64_t)(p) >= (1 << 30)) {
+		errno = EFBIG;
+		goto err0;
+	}
+	if (((N & (N - 1)) != 0) || (N == 0)) {
+		errno = EINVAL;
+		goto err0;
+	}
+	if ((r > SIZE_MAX / 128 / p) ||
+#if SIZE_MAX / 256 <= UINT32_MAX
+	    (r > (SIZE_MAX - 64) / 256) ||
+#endif
+	    (N > SIZE_MAX / 128 / r)) {
+		errno = ENOMEM;
+		goto err0;
+	}
+
+	/* Allocate memory. */
+#ifdef HAVE_POSIX_MEMALIGN
+	if ((errno = posix_memalign(&B0, 64, 128 * r * p)) != 0)
+		goto err0;
+	B = (uint8_t *)(B0);
+	if ((errno = posix_memalign(&XY0, 64, 256 * r + 64)) != 0)
+		goto err1;
+	XY = (uint32_t *)(XY0);
+#ifndef MAP_ANON
+	if ((errno = posix_memalign(&V0, 64, 128 * r * N)) != 0)
+		goto err2;
+	V = (uint32_t *)(V0);
+#endif
+#else
+	if ((B0 = malloc(128 * r * p + 63)) == NULL)
+		goto err0;
+	B = (uint8_t *)(((uintptr_t)(B0) + 63) & ~ (uintptr_t)(63));
+	if ((XY0 = malloc(256 * r + 64 + 63)) == NULL)
+		goto err1;
+	XY = (uint32_t *)(((uintptr_t)(XY0) + 63) & ~ (uintptr_t)(63));
+#ifndef MAP_ANON
+	if ((V0 = malloc(128 * r * N + 63)) == NULL)
+		goto err2;
+	V = (uint32_t *)(((uintptr_t)(V0) + 63) & ~ (uintptr_t)(63));
+#endif
+#endif
+#ifdef MAP_ANON
+	if ((V0 = mmap(NULL, 128 * r * N, PROT_READ | PROT_WRITE,
+#ifdef MAP_NOCORE
+	    MAP_ANON | MAP_PRIVATE | MAP_NOCORE,
+#else
+	    MAP_ANON | MAP_PRIVATE,
+#endif
+	    -1, 0)) == MAP_FAILED)
+		goto err2;
+	V = (uint32_t *)(V0);
+#endif
+
+	/* 1: (B_0 ... B_{p-1}) <-- PBKDF2(P, S, 1, p * MFLen) */
+	PBKDF2_SHA256(passwd, passwdlen, salt, saltlen, 1, B, p * 128 * r);
+
+	/* 2: for i = 0 to p - 1 do */
+	for (i = 0; i < p; i++) {
+		/* 3: B_i <-- MF(B_i, N) */
+		smix(&B[i * 128 * r], r, N, V, XY);
+	}
+
+	/* 5: DK <-- PBKDF2(P, B, 1, dkLen) */
+	PBKDF2_SHA256(passwd, passwdlen, B, p * 128 * r, 1, buf, buflen);
+
+	/* Free memory. */
+#ifdef MAP_ANON
+	if (munmap(V0, 128 * r * N))
+		goto err2;
+#else
+	free(V0);
+#endif
+	free(XY0);
+	free(B0);
+
+	/* Success! */
+	return (0);
+
+err2:
+	free(XY0);
+err1:
+	free(B0);
+err0:
+	/* Failure! */
+	return (-1);
+}
diff --git a/outside/scrypt/crypto_scrypt.h b/outside/scrypt/crypto_scrypt.h
new file mode 100644
index 000000000..b88be09d8
--- /dev/null
+++ b/outside/scrypt/crypto_scrypt.h
@@ -0,0 +1,51 @@
+/*-
+ * Copyright 2009 Colin Percival
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * This file was originally written by Colin Percival as part of the Tarsnap
+ * online backup system.
+ */
+#ifndef _CRYPTO_SCRYPT_H_
+#define _CRYPTO_SCRYPT_H_
+
+#include <stdint.h>
+#include <emmintrin.h>
+
+void smix(uint8_t *, size_t, uint64_t, void *, void *);
+void PBKDF2_SHA256(const uint8_t *, size_t, const uint8_t *, size_t,
+    uint64_t, uint8_t *, size_t);
+
+/**
+ * crypto_scrypt(passwd, passwdlen, salt, saltlen, N, r, p, buf, buflen):
+ * Compute scrypt(passwd[0 .. passwdlen - 1], salt[0 .. saltlen - 1], N, r,
+ * p, buflen) and write the result into buf.  The parameters r, p, and buflen
+ * must satisfy r * p < 2^30 and buflen <= (2^32 - 1) * 32.  The parameter N
+ * must be a power of 2 greater than 1.
+ *
+ * Return 0 on success; or -1 on error.
+ */
+int crypto_scrypt(const uint8_t *, size_t, const uint8_t *, size_t, uint64_t,
+    uint32_t, uint32_t, uint8_t *, size_t);
+
+#endif /* !_CRYPTO_SCRYPT_H_ */
diff --git a/outside/scrypt/sha256.c b/outside/scrypt/sha256.c
new file mode 100644
index 000000000..d2f915f1a
--- /dev/null
+++ b/outside/scrypt/sha256.c
@@ -0,0 +1,411 @@
+/*-
+ * Copyright 2005,2007,2009 Colin Percival
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/types.h>
+
+#include <stdint.h>
+#include <string.h>
+
+#include "sysendian.h"
+
+#include "sha256.h"
+
+/*
+ * Encode a length len/4 vector of (uint32_t) into a length len vector of
+ * (unsigned char) in big-endian form.  Assumes len is a multiple of 4.
+ */
+static void
+be32enc_vect(unsigned char *dst, const uint32_t *src, size_t len)
+{
+	size_t i;
+
+	for (i = 0; i < len / 4; i++)
+		be32enc(dst + i * 4, src[i]);
+}
+
+/*
+ * Decode a big-endian length len vector of (unsigned char) into a length
+ * len/4 vector of (uint32_t).  Assumes len is a multiple of 4.
+ */
+static void
+be32dec_vect(uint32_t *dst, const unsigned char *src, size_t len)
+{
+	size_t i;
+
+	for (i = 0; i < len / 4; i++)
+		dst[i] = be32dec(src + i * 4);
+}
+
+/* Elementary functions used by SHA256 */
+#define Ch(x, y, z)	((x & (y ^ z)) ^ z)
+#define Maj(x, y, z)	((x & (y | z)) | (y & z))
+#define SHR(x, n)	(x >> n)
+#define ROTR(x, n)	((x >> n) | (x << (32 - n)))
+#define S0(x)		(ROTR(x, 2) ^ ROTR(x, 13) ^ ROTR(x, 22))
+#define S1(x)		(ROTR(x, 6) ^ ROTR(x, 11) ^ ROTR(x, 25))
+#define s0(x)		(ROTR(x, 7) ^ ROTR(x, 18) ^ SHR(x, 3))
+#define s1(x)		(ROTR(x, 17) ^ ROTR(x, 19) ^ SHR(x, 10))
+
+/* SHA256 round function */
+#define RND(a, b, c, d, e, f, g, h, k)			\
+	t0 = h + S1(e) + Ch(e, f, g) + k;		\
+	t1 = S0(a) + Maj(a, b, c);			\
+	d += t0;					\
+	h  = t0 + t1;
+
+/* Adjusted round function for rotating state */
+#define RNDr(S, W, i, k)			\
+	RND(S[(64 - i) % 8], S[(65 - i) % 8],	\
+	    S[(66 - i) % 8], S[(67 - i) % 8],	\
+	    S[(68 - i) % 8], S[(69 - i) % 8],	\
+	    S[(70 - i) % 8], S[(71 - i) % 8],	\
+	    W[i] + k)
+
+/*
+ * SHA256 block compression function.  The 256-bit state is transformed via
+ * the 512-bit input block to produce a new state.
+ */
+static void
+SHA256_Transform(uint32_t * state, const unsigned char block[64])
+{
+	uint32_t W[64];
+	uint32_t S[8];
+	uint32_t t0, t1;
+	int i;
+
+	/* 1. Prepare message schedule W. */
+	be32dec_vect(W, block, 64);
+	for (i = 16; i < 64; i++)
+		W[i] = s1(W[i - 2]) + W[i - 7] + s0(W[i - 15]) + W[i - 16];
+
+	/* 2. Initialize working variables. */
+	memcpy(S, state, 32);
+
+	/* 3. Mix. */
+	RNDr(S, W, 0, 0x428a2f98);
+	RNDr(S, W, 1, 0x71374491);
+	RNDr(S, W, 2, 0xb5c0fbcf);
+	RNDr(S, W, 3, 0xe9b5dba5);
+	RNDr(S, W, 4, 0x3956c25b);
+	RNDr(S, W, 5, 0x59f111f1);
+	RNDr(S, W, 6, 0x923f82a4);
+	RNDr(S, W, 7, 0xab1c5ed5);
+	RNDr(S, W, 8, 0xd807aa98);
+	RNDr(S, W, 9, 0x12835b01);
+	RNDr(S, W, 10, 0x243185be);
+	RNDr(S, W, 11, 0x550c7dc3);
+	RNDr(S, W, 12, 0x72be5d74);
+	RNDr(S, W, 13, 0x80deb1fe);
+	RNDr(S, W, 14, 0x9bdc06a7);
+	RNDr(S, W, 15, 0xc19bf174);
+	RNDr(S, W, 16, 0xe49b69c1);
+	RNDr(S, W, 17, 0xefbe4786);
+	RNDr(S, W, 18, 0x0fc19dc6);
+	RNDr(S, W, 19, 0x240ca1cc);
+	RNDr(S, W, 20, 0x2de92c6f);
+	RNDr(S, W, 21, 0x4a7484aa);
+	RNDr(S, W, 22, 0x5cb0a9dc);
+	RNDr(S, W, 23, 0x76f988da);
+	RNDr(S, W, 24, 0x983e5152);
+	RNDr(S, W, 25, 0xa831c66d);
+	RNDr(S, W, 26, 0xb00327c8);
+	RNDr(S, W, 27, 0xbf597fc7);
+	RNDr(S, W, 28, 0xc6e00bf3);
+	RNDr(S, W, 29, 0xd5a79147);
+	RNDr(S, W, 30, 0x06ca6351);
+	RNDr(S, W, 31, 0x14292967);
+	RNDr(S, W, 32, 0x27b70a85);
+	RNDr(S, W, 33, 0x2e1b2138);
+	RNDr(S, W, 34, 0x4d2c6dfc);
+	RNDr(S, W, 35, 0x53380d13);
+	RNDr(S, W, 36, 0x650a7354);
+	RNDr(S, W, 37, 0x766a0abb);
+	RNDr(S, W, 38, 0x81c2c92e);
+	RNDr(S, W, 39, 0x92722c85);
+	RNDr(S, W, 40, 0xa2bfe8a1);
+	RNDr(S, W, 41, 0xa81a664b);
+	RNDr(S, W, 42, 0xc24b8b70);
+	RNDr(S, W, 43, 0xc76c51a3);
+	RNDr(S, W, 44, 0xd192e819);
+	RNDr(S, W, 45, 0xd6990624);
+	RNDr(S, W, 46, 0xf40e3585);
+	RNDr(S, W, 47, 0x106aa070);
+	RNDr(S, W, 48, 0x19a4c116);
+	RNDr(S, W, 49, 0x1e376c08);
+	RNDr(S, W, 50, 0x2748774c);
+	RNDr(S, W, 51, 0x34b0bcb5);
+	RNDr(S, W, 52, 0x391c0cb3);
+	RNDr(S, W, 53, 0x4ed8aa4a);
+	RNDr(S, W, 54, 0x5b9cca4f);
+	RNDr(S, W, 55, 0x682e6ff3);
+	RNDr(S, W, 56, 0x748f82ee);
+	RNDr(S, W, 57, 0x78a5636f);
+	RNDr(S, W, 58, 0x84c87814);
+	RNDr(S, W, 59, 0x8cc70208);
+	RNDr(S, W, 60, 0x90befffa);
+	RNDr(S, W, 61, 0xa4506ceb);
+	RNDr(S, W, 62, 0xbef9a3f7);
+	RNDr(S, W, 63, 0xc67178f2);
+
+	/* 4. Mix local working variables into global state */
+	for (i = 0; i < 8; i++)
+		state[i] += S[i];
+
+	/* Clean the stack. */
+	memset(W, 0, 256);
+	memset(S, 0, 32);
+	t0 = t1 = 0;
+}
+
+static unsigned char PAD[64] = {
+	0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+};
+
+/* Add padding and terminating bit-count. */
+static void
+SHA256_Pad(SHA256_CTX * ctx)
+{
+	unsigned char len[8];
+	uint32_t r, plen;
+
+	/*
+	 * Convert length to a vector of bytes -- we do this now rather
+	 * than later because the length will change after we pad.
+	 */
+	be32enc_vect(len, ctx->count, 8);
+
+	/* Add 1--64 bytes so that the resulting length is 56 mod 64 */
+	r = (ctx->count[1] >> 3) & 0x3f;
+	plen = (r < 56) ? (56 - r) : (120 - r);
+	SHA256_Update(ctx, PAD, (size_t)plen);
+
+	/* Add the terminating bit-count */
+	SHA256_Update(ctx, len, 8);
+}
+
+/* SHA-256 initialization.  Begins a SHA-256 operation. */
+void
+SHA256_Init(SHA256_CTX * ctx)
+{
+
+	/* Zero bits processed so far */
+	ctx->count[0] = ctx->count[1] = 0;
+
+	/* Magic initialization constants */
+	ctx->state[0] = 0x6A09E667;
+	ctx->state[1] = 0xBB67AE85;
+	ctx->state[2] = 0x3C6EF372;
+	ctx->state[3] = 0xA54FF53A;
+	ctx->state[4] = 0x510E527F;
+	ctx->state[5] = 0x9B05688C;
+	ctx->state[6] = 0x1F83D9AB;
+	ctx->state[7] = 0x5BE0CD19;
+}
+
+/* Add bytes into the hash */
+void
+SHA256_Update(SHA256_CTX * ctx, const void *in, size_t len)
+{
+	uint32_t bitlen[2];
+	uint32_t r;
+	const unsigned char *src = in;
+
+	/* Number of bytes left in the buffer from previous updates */
+	r = (ctx->count[1] >> 3) & 0x3f;
+
+	/* Convert the length into a number of bits */
+	bitlen[1] = ((uint32_t)len) << 3;
+	bitlen[0] = (uint32_t)(len >> 29);
+
+	/* Update number of bits */
+	if ((ctx->count[1] += bitlen[1]) < bitlen[1])
+		ctx->count[0]++;
+	ctx->count[0] += bitlen[0];
+
+	/* Handle the case where we don't need to perform any transforms */
+	if (len < 64 - r) {
+		memcpy(&ctx->buf[r], src, len);
+		return;
+	}
+
+	/* Finish the current block */
+	memcpy(&ctx->buf[r], src, 64 - r);
+	SHA256_Transform(ctx->state, ctx->buf);
+	src += 64 - r;
+	len -= 64 - r;
+
+	/* Perform complete blocks */
+	while (len >= 64) {
+		SHA256_Transform(ctx->state, src);
+		src += 64;
+		len -= 64;
+	}
+
+	/* Copy left over data into buffer */
+	memcpy(ctx->buf, src, len);
+}
+
+/*
+ * SHA-256 finalization.  Pads the input data, exports the hash value,
+ * and clears the context state.
+ */
+void
+SHA256_Final(unsigned char digest[32], SHA256_CTX * ctx)
+{
+
+	/* Add padding */
+	SHA256_Pad(ctx);
+
+	/* Write the hash */
+	be32enc_vect(digest, ctx->state, 32);
+
+	/* Clear the context state */
+	memset((void *)ctx, 0, sizeof(*ctx));
+}
+
+/* Initialize an HMAC-SHA256 operation with the given key. */
+void
+HMAC_SHA256_Init(HMAC_SHA256_CTX * ctx, const void * _K, size_t Klen)
+{
+	unsigned char pad[64];
+	unsigned char khash[32];
+	const unsigned char * K = _K;
+	size_t i;
+
+	/* If Klen > 64, the key is really SHA256(K). */
+	if (Klen > 64) {
+		SHA256_Init(&ctx->ictx);
+		SHA256_Update(&ctx->ictx, K, Klen);
+		SHA256_Final(khash, &ctx->ictx);
+		K = khash;
+		Klen = 32;
+	}
+
+	/* Inner SHA256 operation is SHA256(K xor [block of 0x36] || data). */
+	SHA256_Init(&ctx->ictx);
+	memset(pad, 0x36, 64);
+	for (i = 0; i < Klen; i++)
+		pad[i] ^= K[i];
+	SHA256_Update(&ctx->ictx, pad, 64);
+
+	/* Outer SHA256 operation is SHA256(K xor [block of 0x5c] || hash). */
+	SHA256_Init(&ctx->octx);
+	memset(pad, 0x5c, 64);
+	for (i = 0; i < Klen; i++)
+		pad[i] ^= K[i];
+	SHA256_Update(&ctx->octx, pad, 64);
+
+	/* Clean the stack. */
+	memset(khash, 0, 32);
+}
+
+/* Add bytes to the HMAC-SHA256 operation. */
+void
+HMAC_SHA256_Update(HMAC_SHA256_CTX * ctx, const void *in, size_t len)
+{
+
+	/* Feed data to the inner SHA256 operation. */
+	SHA256_Update(&ctx->ictx, in, len);
+}
+
+/* Finish an HMAC-SHA256 operation. */
+void
+HMAC_SHA256_Final(unsigned char digest[32], HMAC_SHA256_CTX * ctx)
+{
+	unsigned char ihash[32];
+
+	/* Finish the inner SHA256 operation. */
+	SHA256_Final(ihash, &ctx->ictx);
+
+	/* Feed the inner hash to the outer SHA256 operation. */
+	SHA256_Update(&ctx->octx, ihash, 32);
+
+	/* Finish the outer SHA256 operation. */
+	SHA256_Final(digest, &ctx->octx);
+
+	/* Clean the stack. */
+	memset(ihash, 0, 32);
+}
+
+/**
+ * PBKDF2_SHA256(passwd, passwdlen, salt, saltlen, c, buf, dkLen):
+ * Compute PBKDF2(passwd, salt, c, dkLen) using HMAC-SHA256 as the PRF, and
+ * write the output to buf.  The value dkLen must be at most 32 * (2^32 - 1).
+ */
+void
+PBKDF2_SHA256(const uint8_t * passwd, size_t passwdlen, const uint8_t * salt,
+    size_t saltlen, uint64_t c, uint8_t * buf, size_t dkLen)
+{
+	HMAC_SHA256_CTX PShctx, hctx;
+	size_t i;
+	uint8_t ivec[4];
+	uint8_t U[32];
+	uint8_t T[32];
+	uint64_t j;
+	int k;
+	size_t clen;
+
+	/* Compute HMAC state after processing P and S. */
+	HMAC_SHA256_Init(&PShctx, passwd, passwdlen);
+	HMAC_SHA256_Update(&PShctx, salt, saltlen);
+
+	/* Iterate through the blocks. */
+	for (i = 0; i * 32 < dkLen; i++) {
+		/* Generate INT(i + 1). */
+		be32enc(ivec, (uint32_t)(i + 1));
+
+		/* Compute U_1 = PRF(P, S || INT(i)). */
+		memcpy(&hctx, &PShctx, sizeof(HMAC_SHA256_CTX));
+		HMAC_SHA256_Update(&hctx, ivec, 4);
+		HMAC_SHA256_Final(U, &hctx);
+
+		/* T_i = U_1 ... */
+		memcpy(T, U, 32);
+
+		for (j = 2; j <= c; j++) {
+			/* Compute U_j. */
+			HMAC_SHA256_Init(&hctx, passwd, passwdlen);
+			HMAC_SHA256_Update(&hctx, U, 32);
+			HMAC_SHA256_Final(U, &hctx);
+
+			/* ... xor U_j ... */
+			for (k = 0; k < 32; k++)
+				T[k] ^= U[k];
+		}
+
+		/* Copy as many bytes as necessary into buf. */
+		clen = dkLen - i * 32;
+		if (clen > 32)
+			clen = 32;
+		memcpy(&buf[i * 32], T, clen);
+	}
+
+	/* Clean PShctx, since we never called _Final on it. */
+	memset(&PShctx, 0, sizeof(HMAC_SHA256_CTX));
+}
diff --git a/outside/scrypt/sha256.h b/outside/scrypt/sha256.h
new file mode 100644
index 000000000..289a5232f
--- /dev/null
+++ b/outside/scrypt/sha256.h
@@ -0,0 +1,62 @@
+/*-
+ * Copyright 2005,2007,2009 Colin Percival
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD: src/lib/libmd/sha256.h,v 1.2 2006/01/17 15:35:56 phk Exp $
+ */
+
+#ifndef _SHA256_H_
+#define _SHA256_H_
+
+#include <sys/types.h>
+
+#include <stdint.h>
+
+typedef struct SHA256Context {
+	uint32_t state[8];
+	uint32_t count[2];
+	unsigned char buf[64];
+} SHA256_CTX;
+
+typedef struct HMAC_SHA256Context {
+	SHA256_CTX ictx;
+	SHA256_CTX octx;
+} HMAC_SHA256_CTX;
+
+void	SHA256_Init(SHA256_CTX *);
+void	SHA256_Update(SHA256_CTX *, const void *, size_t);
+void	SHA256_Final(unsigned char [32], SHA256_CTX *);
+void	HMAC_SHA256_Init(HMAC_SHA256_CTX *, const void *, size_t);
+void	HMAC_SHA256_Update(HMAC_SHA256_CTX *, const void *, size_t);
+void	HMAC_SHA256_Final(unsigned char [32], HMAC_SHA256_CTX *);
+
+/**
+ * PBKDF2_SHA256(passwd, passwdlen, salt, saltlen, c, buf, dkLen):
+ * Compute PBKDF2(passwd, salt, c, dkLen) using HMAC-SHA256 as the PRF, and
+ * write the output to buf.  The value dkLen must be at most 32 * (2^32 - 1).
+ */
+void	PBKDF2_SHA256(const uint8_t *, size_t, const uint8_t *, size_t,
+    uint64_t, uint8_t *, size_t);
+
+#endif /* !_SHA256_H_ */
diff --git a/outside/scrypt/sysendian.h b/outside/scrypt/sysendian.h
new file mode 100644
index 000000000..207fb0693
--- /dev/null
+++ b/outside/scrypt/sysendian.h
@@ -0,0 +1,129 @@
+/*-
+ * Copyright 2007-2009 Colin Percival
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * This file was originally written by Colin Percival as part of the Tarsnap
+ * online backup system.
+ */
+#ifndef _SYSENDIAN_H_
+#define _SYSENDIAN_H_
+
+#if defined(U3_OS_bsd)
+#include <sys/endian.h>
+#else
+#include <stdint.h>
+
+static inline uint32_t
+be32dec(const void *pp)
+{
+	const uint8_t *p = (uint8_t const *)pp;
+
+	return ((uint32_t)(p[3]) + ((uint32_t)(p[2]) << 8) +
+	    ((uint32_t)(p[1]) << 16) + ((uint32_t)(p[0]) << 24));
+}
+
+static inline void
+be32enc(void *pp, uint32_t x)
+{
+	uint8_t * p = (uint8_t *)pp;
+
+	p[3] = x & 0xff;
+	p[2] = (x >> 8) & 0xff;
+	p[1] = (x >> 16) & 0xff;
+	p[0] = (x >> 24) & 0xff;
+}
+
+static inline uint64_t
+be64dec(const void *pp)
+{
+	const uint8_t *p = (uint8_t const *)pp;
+
+	return ((uint64_t)(p[7]) + ((uint64_t)(p[6]) << 8) +
+	    ((uint64_t)(p[5]) << 16) + ((uint64_t)(p[4]) << 24) +
+	    ((uint64_t)(p[3]) << 32) + ((uint64_t)(p[2]) << 40) +
+	    ((uint64_t)(p[1]) << 48) + ((uint64_t)(p[0]) << 56));
+}
+
+static inline void
+be64enc(void *pp, uint64_t x)
+{
+	uint8_t * p = (uint8_t *)pp;
+
+	p[7] = x & 0xff;
+	p[6] = (x >> 8) & 0xff;
+	p[5] = (x >> 16) & 0xff;
+	p[4] = (x >> 24) & 0xff;
+	p[3] = (x >> 32) & 0xff;
+	p[2] = (x >> 40) & 0xff;
+	p[1] = (x >> 48) & 0xff;
+	p[0] = (x >> 56) & 0xff;
+}
+
+static inline uint32_t
+le32dec(const void *pp)
+{
+	const uint8_t *p = (uint8_t const *)pp;
+
+	return ((uint32_t)(p[0]) + ((uint32_t)(p[1]) << 8) +
+	    ((uint32_t)(p[2]) << 16) + ((uint32_t)(p[3]) << 24));
+}
+
+static inline void
+le32enc(void *pp, uint32_t x)
+{
+	uint8_t * p = (uint8_t *)pp;
+
+	p[0] = x & 0xff;
+	p[1] = (x >> 8) & 0xff;
+	p[2] = (x >> 16) & 0xff;
+	p[3] = (x >> 24) & 0xff;
+}
+
+static inline uint64_t
+le64dec(const void *pp)
+{
+	const uint8_t *p = (uint8_t const *)pp;
+
+	return ((uint64_t)(p[0]) + ((uint64_t)(p[1]) << 8) +
+	    ((uint64_t)(p[2]) << 16) + ((uint64_t)(p[3]) << 24) +
+	    ((uint64_t)(p[4]) << 32) + ((uint64_t)(p[5]) << 40) +
+	    ((uint64_t)(p[6]) << 48) + ((uint64_t)(p[7]) << 56));
+}
+
+static inline void
+le64enc(void *pp, uint64_t x)
+{
+	uint8_t * p = (uint8_t *)pp;
+
+	p[0] = x & 0xff;
+	p[1] = (x >> 8) & 0xff;
+	p[2] = (x >> 16) & 0xff;
+	p[3] = (x >> 24) & 0xff;
+	p[4] = (x >> 32) & 0xff;
+	p[5] = (x >> 40) & 0xff;
+	p[6] = (x >> 48) & 0xff;
+	p[7] = (x >> 56) & 0xff;
+}
+#endif
+#endif /* !_SYSENDIAN_H_ */

From 7fb84652e888255a070396fafe6e3744fc9179fa Mon Sep 17 00:00:00 2001
From: "C. Guy Yarvin" <cgyarvin@gmail.com>
Date: Wed, 6 May 2015 18:25:58 -0700
Subject: [PATCH 23/24] Run test in optimized.

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index f6042e2e0..c83c8a0d7 100644
--- a/Makefile
+++ b/Makefile
@@ -65,7 +65,7 @@ MDEFINES=-DU3_OS_$(OS) -DU3_OS_ENDIAN_$(ENDIAN) -D U3_LIB=\"$(LIB)\"
 
 # NOTFORCHECKIN - restore -O3
 # 	-DGHETTO
-CFLAGS= $(COSFLAGS) -g -msse3 -ffast-math \
+CFLAGS= $(COSFLAGS) -O3 -msse3 -ffast-math \
 	-funsigned-char \
 	-I/usr/local/include \
 	-I/opt/local/include \

From 0ca2fc94de56cf6b9c8f961ebf750af5d256cf7b Mon Sep 17 00:00:00 2001
From: Philip C Monk <philip.monk@tlon.io>
Date: Wed, 6 May 2015 22:25:41 -0400
Subject: [PATCH 24/24] added space profiling tools

---
 i/c/motes.h |   1 +
 v/reck.c    | 127 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 v/unix.c    |  12 ++---
 3 files changed, 134 insertions(+), 6 deletions(-)

diff --git a/i/c/motes.h b/i/c/motes.h
index 5642ef9de..e67ce0b21 100644
--- a/i/c/motes.h
+++ b/i/c/motes.h
@@ -652,6 +652,7 @@
 #   define c3__map    c3_s3('m','a','p')
 #   define c3__marg   c3_s4('m','a','r','g')
 #   define c3__mark   c3_s4('m','a','r','k')
+#   define c3__mass   c3_s4('m','a','s','s')
 #   define c3__marn   c3_s4('m','a','r','n')
 #   define c3__mash   c3_s4('m','a','s','h')
 #   define c3__mast   c3_s4('m','a','s','t')
diff --git a/v/reck.c b/v/reck.c
index dea25c83e..7d4a6eac4 100644
--- a/v/reck.c
+++ b/v/reck.c
@@ -66,6 +66,120 @@ _reck_lily(u3_noun fot, u3_noun txt, c3_l* tid_l)
   }
 }
 
+/* _reck_spac(): print n spaces.
+*/
+void _reck_spac(c3_w n)
+{
+  for (; n > 0; n--)
+    uL(fprintf(uH," "));
+}
+
+/* _reck_print_memory: print memory amount. cf u3a_print_memory().
+*/
+void
+_reck_print_memory(c3_w wor_w)
+{
+  c3_w byt_w = (wor_w * 4);
+  c3_w gib_w = (byt_w / 1000000000);
+  c3_w mib_w = (byt_w % 1000000000) / 1000000;
+  c3_w kib_w = (byt_w % 1000000) / 1000;
+  c3_w bib_w = (byt_w % 1000);
+
+  if ( gib_w ) {
+    uL(fprintf(uH, "GB/%d.%03d.%03d.%03d\r\n", 
+        gib_w, mib_w, kib_w, bib_w));
+  }
+  else if ( mib_w ) {
+    uL(fprintf(uH, "MB/%d.%03d.%03d\r\n", mib_w, kib_w, bib_w));
+  }
+  else if ( kib_w ) {
+    uL(fprintf(uH, "KB/%d.%03d\r\n", kib_w, bib_w));
+  }
+  else {
+    uL(fprintf(uH, "B/%d\r\n", bib_w));
+  }
+}
+
+/*  _reck_meme_noun(): get memory usage, in words, of noun. RETAIN.
+*/
+c3_w
+_reck_meme_noun(u3p(u3h_root) hax, u3_noun non, c3_t dud)
+{
+  u3_weak got = u3h_git(hax, dud ? non & 0x7fffffff : non);
+
+  if (u3_none != got) {
+    return 0;                                           //  I think? maybe 1
+  }
+  else {
+    c3_w res;
+
+    if (!(non & 0x80000000)) {
+      res = 1;
+    }
+    if (_(u3ud(non))) {
+      res = 2 + u3r_met(5, non);
+    }
+    else {
+      res = 1
+            + _reck_meme_noun(hax, u3h(non), dud)
+            + _reck_meme_noun(hax, u3t(non), dud);
+    }
+
+    u3h_put(hax, dud ? non & 0x7fffffff : non, res);
+
+    return res;
+  }
+}
+
+/* _reck_meme_prof(): print memory profile. RETAIN.
+*/
+void
+_reck_meme_prof(u3p(u3h_root) hax, c3_w den, u3_noun mas)
+{
+  u3_noun h_mas, t_mas;
+
+  if (c3n == u3r_cell(mas, &h_mas, &t_mas)) {
+    _reck_spac(den);
+    uL(fprintf(uH, "mistyped mass\r\n"));
+    return;
+  }
+  if (c3y == h_mas) {
+    _reck_spac(den);
+    _reck_print_memory(_reck_meme_noun(hax, t_mas, false));
+    _reck_spac(den);
+    _reck_print_memory(_reck_meme_noun(hax, t_mas, true));
+  }
+  else if (c3n == h_mas) {
+    u3_noun it_mas, tt_mas, pit_mas, qit_mas;
+    while (u3_nul != t_mas)
+    {
+      _reck_spac(den);
+      if (c3n == u3r_cell(t_mas, &it_mas, &tt_mas)) {
+        uL(fprintf(uH, "mistyped mass list\r\n"));
+        return;
+      }
+      else if (c3n == u3r_cell(it_mas, &pit_mas, &qit_mas)) {
+        uL(fprintf(uH, "mistyped mass list element\r\n"));
+        return;
+      }
+      else {
+        c3_c* pit_c = u3m_pretty(pit_mas);
+        uL(fprintf(uH, "%s\r\n", pit_c));
+        free(pit_c);
+
+        _reck_meme_prof(hax, den+2, qit_mas);
+
+        t_mas = tt_mas;
+      }
+    }
+  }
+  else {
+    _reck_spac(den);
+    uL(fprintf(uH, "mistyped mass head\r\n"));
+    return;
+  }
+}
+
 /* _reck_kick_term(): apply terminal outputs.
 */
 static u3_noun
@@ -110,6 +224,19 @@ _reck_kick_term(u3_noun pox, c3_l tid_l, u3_noun fav)
       uL(fprintf(uH, "kick: init: %s\n", nam_c));
       free(nam_c); u3z(pox); u3z(hox); u3z(fav); return c3y;
     } break;
+
+    case c3__mass: p_fav = u3t(fav);
+    {
+      uL(fprintf(uH, "memory profile:\r\n"));
+
+      u3p(u3h_root) hax = u3h_new();
+
+      _reck_meme_prof(hax, 0, p_fav);
+
+      u3h_free(hax);
+
+      u3z(pox); u3z(fav); return c3y;
+    } break;
   }
   c3_assert(!"not reached"); return 0;
 }
diff --git a/v/unix.c b/v/unix.c
index b67fdd6cf..f411838d1 100644
--- a/v/unix.c
+++ b/v/unix.c
@@ -666,9 +666,9 @@ _unix_dir_update(u3_udir* dir_u, DIR* rid_u)
 
 /* unix_load(): load a file as a cage
  *
- * return value of c3__none means delete, u3_nul means no change
+ * return value of u3_none means delete, u3_nul means no change
 */
-static u3_noun
+static u3_weak
 _unix_load(u3_ufil* fil_u)
 {
   struct stat buf_u;
@@ -684,7 +684,7 @@ _unix_load(u3_ufil* fil_u)
     if ( ENOENT != errno ) {
       uL(fprintf(uH, "error loading %s: %s\n", fil_u->pax_c, strerror(errno)));
     }
-    return c3__none;
+    return u3_none;
   }
   fln_w = buf_u.st_size;
   pad_y = c3_malloc(fln_w);
@@ -779,7 +779,7 @@ _unix_save(c3_c* pax_c, u3_atom oat)
 
 /* _unix_file_load(): load a file by watcher.
 */
-static u3_noun
+static u3_weak
 _unix_file_load(u3_ufil* fil_u)
 {
   return _unix_load(fil_u);
@@ -938,8 +938,8 @@ _unix_dir_khan(u3_udir* dir_u)
 
   for ( fil_u = dir_u->fil_u; fil_u; fil_u = fil_u->nex_u ) {
     u3_noun wib = _unix_file_name(fil_u);
-    u3_noun baw = _unix_file_load(fil_u);
-    u3_noun wol = (c3__none == baw ? u3nc(u3_nul, u3_nul) :
+    u3_weak baw = _unix_file_load(fil_u);
+    u3_noun wol = (u3_none == baw ? u3nc(u3_nul, u3_nul) :
                    u3_nul == baw   ? u3_nul :
                                      u3nt(u3_nul, u3_nul, baw));
     pam = _unix_dir_khan_file(pam, wib, wol);