Ticket #12365: scrypt_v5.patch

headers/posix/unistd.h

@@ -277 +277 @@
 extern int      ttyname_r(int fd, char *buffer, size_t bufferSize);
 
 /* misc */
+extern char     *crypt_gensalt(int hardness);
 extern char     *crypt(const char *key, const char *salt);
 extern void     encrypt(char block[64], int edflag);
 extern int      getopt(int argc, char *const *argv, const char *shortOpts);

src/apps/aboutsystem/AboutSystem.cpp

@@ -1420 +1420 @@
     _AddCopyrightsFromAttribute();
     _AddPackageCreditEntries();
 
+    // scrypt
+    _AddPackageCredit(PackageCredit("scrypt")
+        .SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "2009 Colin Percival"))
+        .SetLicense(kBSDTwoClause)
+        .SetURL("https://tarsnap.com/scrypt.html"));
+
+    _AddCopyrightsFromAttribute();
+    _AddPackageCreditEntries();
+
     return new CropView(creditsScroller, 0, 1, 1, 1);
 }
 

src/bin/multiuser/passwd.cpp

@@ -172 +172 @@
         memset(repeatedPassword, 0, sizeof(repeatedPassword));
 
         // crypt it
-        encryptedPassword = crypt(password, user);
+        char* salt = crypt_gensalt(-1);
+        if (salt == NULL) {
+            fprintf(stderr, "Error: Failed to generate salt: %s\n",
+                strerror(errno));
+            exit(1);
+        }
+        encryptedPassword = crypt(password, salt);
         memset(password, 0, sizeof(password));
     }
 
@@ -182 +188 @@
         || message.AddInt32("last changed", time(NULL)) != B_OK
         || message.AddString("password", "x") != B_OK
         || message.AddString("shadow password", encryptedPassword) != B_OK) {
-        fprintf(stderr, "Error: Out of memory!\n");
+        fprintf(stderr, "Error: Failed to construct message!\n");
         exit(1);
     }
 

src/preferences/screensaver/PasswordWindow.cpp

@@ -145 +145 @@
 }
 
 
-char*
-PasswordWindow::_SanitizeSalt(const char* password)
-{
-    char* salt;
-
-    uint8 length = strlen(password);
-
-    if (length < 2)
-        salt = new char[3];
-    else
-        salt = new char[length + 1];
-
-    uint8 i = 0;
-    uint8 j = 0;
-    for (; i < length; i++) {
-        if (isalnum(password[i]) || password[i] == '.' || password[i] == '/') {
-            salt[j] = password[i];
-            j++;
-        }
-    }
-
-    /*
-     *  We need to pad the salt.
-     */ 
-    while (j < 2) {
-        salt[j] = '.';
-        j++;
-    }
-
-    salt[j] = '\0';
-    
-    return salt;
-}
-
-
 void 
 PasswordWindow::MessageReceived(BMessage* message)
 {
@@ -196 +161 @@
                     alert->Go();
                     break;
                 }
-                const char* salt = _SanitizeSalt(fPasswordControl->Text());
+                char* salt = crypt_gensalt(-1);
                 fSettings.SetPassword(crypt(fPasswordControl->Text(), salt));
-                delete[] salt;
             } else
                 fSettings.SetPassword("");
 

src/preferences/screensaver/PasswordWindow.h

@@ -29 +29 @@
 
 private:
             void                _Setup();
-            char*               _SanitizeSalt(const char* password);
 
             BRadioButton*       fUseCustom;
             BRadioButton*       fUseNetwork;

src/system/libroot/Jamfile

@@ -85 +85 @@
             $(librootNoDebugObjects)
             [ TargetStaticLibsupc++ ]
             [ TargetLibgcc ]
+            shared
             ;
 
         # Use the standard libroot.so soname, so when the debug version is
@@ -99 +100 @@
             $(librootDebugObjects)
             [ TargetStaticLibsupc++ ]
             [ TargetLibgcc ]
+            shared
             ;
         
         StaticLibrary [ MultiArchDefaultGristFiles libm.a ] : empty.c ;

src/system/libroot/posix/crypt/Jamfile

@@ -1 +1 @@
 SubDir HAIKU_TOP src system libroot posix crypt ;
 
+UsePrivateHeaders shared ;
+UsePrivateSystemHeaders ;
+
 local architectureObject ;
 for architectureObject in [ MultiArchSubDirSetup ] {
     on $(architectureObject) {
@@ -11 +14 @@
                 : -Wall -Wmissing-prototypes -Wsign-compare ] ;
 
         MergeObject <$(architecture)>posix_crypt.o :
-            crypt.c
-            crypt_util.c
+            crypt_legacy.c
+            crypt_legacy_util.c
+            crypto_scrypt_smix.cpp
+            crypto_scrypt.cpp
+            crypt.cpp
+            pbkdf2.cpp
             ;
     }
 }

deleted file src/system/libroot/posix/crypt/crypt.c

@@ -1 @@
-/*
- * UFC-crypt: ultra fast crypt(3) implementation
- *
- * Copyright (C) 1991, 1992, Free Software Foundation, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- * 
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * @(#)crypt.c  2.19 5/28/92
- *
- * Semiportable C version
- *
- */
-
-#include "ufc-crypt.h"
-
-#ifdef _UFC_32_
-
-/*
- * 32 bit version
- */
-
-extern long32 _ufc_keytab[16][2];
-extern long32 _ufc_sb0[], _ufc_sb1[], _ufc_sb2[], _ufc_sb3[];
-
-#define SBA(sb, v) (*(long32*)((char*)(sb)+(v)))
-
-static ufc_long ary[4];
-
-ufc_long *_ufc_doit(l1, l2, r1, r2, itr)
-  ufc_long l1, l2, r1, r2, itr;
-  { int i;
-    long32 s, *k;
-    register long32 *sb0 = _ufc_sb0;
-    register long32 *sb1 = _ufc_sb1;
-    register long32 *sb2 = _ufc_sb2;
-    register long32 *sb3 = _ufc_sb3;
-
-    while(itr--) {
-      k = &_ufc_keytab[0][0];
-      for(i=8; i--; ) {
-    s = *k++ ^ r1;
-    l1 ^= SBA(sb1, s & 0xffff); l2 ^= SBA(sb1, (s & 0xffff)+4);  
-        l1 ^= SBA(sb0, s >>= 16);   l2 ^= SBA(sb0, (s)         +4); 
-        s = *k++ ^ r2; 
-        l1 ^= SBA(sb3, s & 0xffff); l2 ^= SBA(sb3, (s & 0xffff)+4);
-        l1 ^= SBA(sb2, s >>= 16);   l2 ^= SBA(sb2, (s)         +4);
-
-        s = *k++ ^ l1; 
-        r1 ^= SBA(sb1, s & 0xffff); r2 ^= SBA(sb1, (s & 0xffff)+4);  
-        r1 ^= SBA(sb0, s >>= 16);   r2 ^= SBA(sb0, (s)         +4); 
-        s = *k++ ^ l2; 
-        r1 ^= SBA(sb3, s & 0xffff); r2 ^= SBA(sb3, (s & 0xffff)+4);  
-        r1 ^= SBA(sb2, s >>= 16);   r2 ^= SBA(sb2, (s)         +4);
-      } 
-      s=l1; l1=r1; r1=s; s=l2; l2=r2; r2=s;
-    }
-    ary[0] = l1; ary[1] = l2; ary[2] = r1; ary[3] = r2;
-    return ary;
-  }
-
-#endif
-
-#ifdef _UFC_64_
-
-/*
- * 64 bit version
- */
-
-extern long64 _ufc_keytab[16];
-extern long64 _ufc_sb0[], _ufc_sb1[], _ufc_sb2[], _ufc_sb3[];
-
-#define SBA(sb, v) (*(long64*)((char*)(sb)+(v)))
-
-static ufc_long ary[4];
-
-ufc_long *_ufc_doit(l1, l2, r1, r2, itr)
-  ufc_long l1, l2, r1, r2, itr;
-  { int i;
-    long64 l, r, s, *k;
-    register long64 *sb0 = _ufc_sb0;
-    register long64 *sb1 = _ufc_sb1;
-    register long64 *sb2 = _ufc_sb2;
-    register long64 *sb3 = _ufc_sb3;
-
-    l = (((long64)l1) << 32) | ((long64)l2);
-    r = (((long64)r1) << 32) | ((long64)r2);
-
-    while(itr--) {
-      k = &_ufc_keytab[0];
-      for(i=8; i--; ) {
-    s = *k++ ^ r;
-    l ^= SBA(sb3, (s >>  0) & 0xffff);
-        l ^= SBA(sb2, (s >> 16) & 0xffff);
-        l ^= SBA(sb1, (s >> 32) & 0xffff);
-        l ^= SBA(sb0, (s >> 48) & 0xffff);
-
-    s = *k++ ^ l;
-    r ^= SBA(sb3, (s >>  0) & 0xffff);
-        r ^= SBA(sb2, (s >> 16) & 0xffff);
-        r ^= SBA(sb1, (s >> 32) & 0xffff);
-        r ^= SBA(sb0, (s >> 48) & 0xffff);
-      } 
-      s=l; l=r; r=s;
-    }
-
-    ary[0] = l >> 32; ary[1] = l & 0xffffffff;
-    ary[2] = r >> 32; ary[3] = r & 0xffffffff;
-    return ary;
-  }
-
-#endif

new file src/system/libroot/posix/crypt/crypt.cpp

@@ +1 @@
+/*
+ * Copyright 2017, Haiku, Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ * Andrew Aldridge, i80and@foxquill.com
+ */
+
+#include <assert.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <inttypes.h>
+#include <math.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <SupportDefs.h>
+
+#include "crypt_legacy.h"
+#include "crypto_scrypt.h"
+
+#define SALT_BYTES 32
+#define SALT_STR_BYTES (SALT_BYTES * 2 + 1)
+#define DEFAULT_N_LOG2 14
+#define MINIMUM_N_LOG2 12
+
+//                      $s$99$ salt  $  hash  \0
+#define CRYPT_OUTPUT_BYTES (6 + 64 + 1 + 64 + 1)
+
+static const char* kHexAlphabet = "0123456789abcdef";
+static const char kHexLookup[] = {
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 2, 3,
+    4, 5, 6, 7, 8, 9, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 10, 11, 12, 13, 14, 15};
+
+
+static int
+toHex(const uint8* buffer, size_t bufferLength, char* outBuffer,
+    size_t outBufferLength)
+{
+    size_t i;
+    size_t outIndex = 0;
+
+    if (outBufferLength <= bufferLength * 2) {
+        outBuffer[0] = '\0';
+        return 1;
+    }
+
+    for (i = 0; i < bufferLength; i += 1) {
+        const uint8 n = buffer[i];
+        const uint8 upper = n >> 4;
+        const uint8 lower = n & 0x0f;
+
+        assert(lower < 16 && upper < 16);
+        outBuffer[outIndex++] = kHexAlphabet[upper];
+        outBuffer[outIndex++] = kHexAlphabet[lower];
+        outBuffer[outIndex] = '\0';
+    }
+
+    outBuffer[outIndex] = '\0';
+
+    return 0;
+}
+
+
+static size_t
+fromHex(const char* hex, uint8* outBuffer, size_t outBufferLength)
+{
+    size_t i = 0;
+    size_t outIndex = 0;
+
+    if (hex[0] == '\0' || outBufferLength == 0)
+        return 0;
+
+    while (hex[i] != '\0' && hex[i + 1] != '\0') {
+        const uint8 char1 = hex[i];
+        const uint8 char2 = hex[i + 1];
+
+        if (char1 >= sizeof(kHexLookup) || char2 >= sizeof(kHexLookup))
+            return outIndex;
+
+        const char index1 = kHexLookup[char1];
+        const char index2 = kHexLookup[char2];
+
+        if (outIndex >= outBufferLength)
+            return 0;
+
+        outBuffer[outIndex++] = (index1 << 4) | index2;
+        i += 2;
+    }
+
+    return outIndex;
+}
+
+
+//! Generate a new salt appropriate for crypt().
+char*
+crypt_gensalt(int hardness)
+{
+    static char result[CRYPT_OUTPUT_BYTES];
+    uint8 salt[SALT_BYTES];
+    char saltString[SALT_STR_BYTES];
+    size_t totalBytesRead = 0;
+
+    int fd = open("/dev/random", O_RDONLY, 0);
+    if (fd < 0)
+        return NULL;
+
+    if (hardness < 0)
+        hardness = DEFAULT_N_LOG2;
+    else if (hardness < MINIMUM_N_LOG2) {
+        errno = EINVAL;
+        return NULL;
+    }
+
+    while (totalBytesRead < sizeof(salt)) {
+        const ssize_t bytesRead = read(fd,
+            static_cast<void*>(salt + totalBytesRead),
+            sizeof(salt) - totalBytesRead);
+        if (bytesRead <= 0) {
+            close(fd);
+            return NULL;
+        }
+
+        totalBytesRead += bytesRead;
+    }
+    close(fd);
+
+    assert(toHex(salt, sizeof(salt), saltString, sizeof(saltString)) == 0);
+    snprintf(result, sizeof(result), "$s$%d$%s$", hardness, saltString);
+    return result;
+}
+
+
+char *
+crypt(const char* key, const char* setting)
+{
+    static char outBuffer[CRYPT_OUTPUT_BYTES];
+    uint8 saltBinary[SALT_BYTES];
+    char saltString[SALT_STR_BYTES];
+    uint8 resultBuffer[32];
+    char hexResultBuffer[64 + 1];
+    int nLog2 = DEFAULT_N_LOG2;
+
+    // Some idioms existed where the password was also used as the salt.
+    // As a crude heuristic, use the old crypt algorithm if the salt is
+    // shortish.
+    if (strlen(setting) < 16)
+        return crypt_legacy(key, setting);
+
+    // We don't want to fall into the old algorithm by accident somehow, so
+    // if our salt is kind of like our salt, but not exactly, return an
+    // error.
+    if (sscanf(setting, "$s$%2d$%64s$", &nLog2, saltString) != 2) {
+        errno = EINVAL;
+        return NULL;
+    }
+
+    // Set a lower bound on N_log2: below 12 scrypt is weaker than bcrypt.
+    if (nLog2 < MINIMUM_N_LOG2) {
+        errno = EINVAL;
+        return NULL;
+    }
+
+    size_t saltBinaryLength = fromHex(saltString, saltBinary,
+        sizeof(saltBinary));
+    if (saltBinaryLength != sizeof(saltBinary)) {
+        errno = EINVAL;
+        return NULL;
+    }
+
+    long n = static_cast<long>(pow(2, nLog2));
+    if (crypto_scrypt(reinterpret_cast<const uint8*>(key), strlen(key),
+        saltBinary, saltBinaryLength, n, 8, 1, resultBuffer,
+        sizeof(resultBuffer)) != 0) {
+        // crypto_scrypt sets errno itself
+        return NULL;
+    }
+
+    assert(toHex(resultBuffer, sizeof(resultBuffer), hexResultBuffer,
+        sizeof(hexResultBuffer)) == 0);
+    snprintf(outBuffer, sizeof(outBuffer), "$s$%d$%s$%s", nLog2, saltString,
+        hexResultBuffer);
+
+    return outBuffer;
+}
+
+
+//! To make fcrypt users happy. They don't need to call init_des.
+char*
+fcrypt(const char* key, const char* salt)
+{
+    return crypt(key, salt);
+}

new file src/system/libroot/posix/crypt/crypt_legacy.c

@@ +1 @@
+/*
+ * UFC-crypt: ultra fast crypt(3) implementation
+ *
+ * Copyright (C) 1991, 1992, Free Software Foundation, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * @(#)crypt.c  2.19 5/28/92
+ *
+ * Semiportable C version
+ *
+ */
+
+#include "ufc-crypt.h"
+
+#ifdef _UFC_32_
+
+/*
+ * 32 bit version
+ */
+
+extern long32 _ufc_keytab[16][2];
+extern long32 _ufc_sb0[], _ufc_sb1[], _ufc_sb2[], _ufc_sb3[];
+
+#define SBA(sb, v) (*(long32*)((char*)(sb)+(v)))
+
+static ufc_long ary[4];
+
+ufc_long *_ufc_doit(l1, l2, r1, r2, itr)
+  ufc_long l1, l2, r1, r2, itr;
+  { int i;
+    long32 s, *k;
+    register long32 *sb0 = _ufc_sb0;
+    register long32 *sb1 = _ufc_sb1;
+    register long32 *sb2 = _ufc_sb2;
+    register long32 *sb3 = _ufc_sb3;
+
+    while(itr--) {
+      k = &_ufc_keytab[0][0];
+      for(i=8; i--; ) {
+    s = *k++ ^ r1;
+    l1 ^= SBA(sb1, s & 0xffff); l2 ^= SBA(sb1, (s & 0xffff)+4);  
+        l1 ^= SBA(sb0, s >>= 16);   l2 ^= SBA(sb0, (s)         +4); 
+        s = *k++ ^ r2; 
+        l1 ^= SBA(sb3, s & 0xffff); l2 ^= SBA(sb3, (s & 0xffff)+4);
+        l1 ^= SBA(sb2, s >>= 16);   l2 ^= SBA(sb2, (s)         +4);
+
+        s = *k++ ^ l1; 
+        r1 ^= SBA(sb1, s & 0xffff); r2 ^= SBA(sb1, (s & 0xffff)+4);  
+        r1 ^= SBA(sb0, s >>= 16);   r2 ^= SBA(sb0, (s)         +4); 
+        s = *k++ ^ l2; 
+        r1 ^= SBA(sb3, s & 0xffff); r2 ^= SBA(sb3, (s & 0xffff)+4);  
+        r1 ^= SBA(sb2, s >>= 16);   r2 ^= SBA(sb2, (s)         +4);
+      } 
+      s=l1; l1=r1; r1=s; s=l2; l2=r2; r2=s;
+    }
+    ary[0] = l1; ary[1] = l2; ary[2] = r1; ary[3] = r2;
+    return ary;
+  }
+
+#endif
+
+#ifdef _UFC_64_
+
+/*
+ * 64 bit version
+ */
+
+extern long64 _ufc_keytab[16];
+extern long64 _ufc_sb0[], _ufc_sb1[], _ufc_sb2[], _ufc_sb3[];
+
+#define SBA(sb, v) (*(long64*)((char*)(sb)+(v)))
+
+static ufc_long ary[4];
+
+ufc_long *_ufc_doit(l1, l2, r1, r2, itr)
+  ufc_long l1, l2, r1, r2, itr;
+  { int i;
+    long64 l, r, s, *k;
+    register long64 *sb0 = _ufc_sb0;
+    register long64 *sb1 = _ufc_sb1;
+    register long64 *sb2 = _ufc_sb2;
+    register long64 *sb3 = _ufc_sb3;
+
+    l = (((long64)l1) << 32) | ((long64)l2);
+    r = (((long64)r1) << 32) | ((long64)r2);
+
+    while(itr--) {
+      k = &_ufc_keytab[0];
+      for(i=8; i--; ) {
+    s = *k++ ^ r;
+    l ^= SBA(sb3, (s >>  0) & 0xffff);
+        l ^= SBA(sb2, (s >> 16) & 0xffff);
+        l ^= SBA(sb1, (s >> 32) & 0xffff);
+        l ^= SBA(sb0, (s >> 48) & 0xffff);
+
+    s = *k++ ^ l;
+    r ^= SBA(sb3, (s >>  0) & 0xffff);
+        r ^= SBA(sb2, (s >> 16) & 0xffff);
+        r ^= SBA(sb1, (s >> 32) & 0xffff);
+        r ^= SBA(sb0, (s >> 48) & 0xffff);
+      } 
+      s=l; l=r; r=s;
+    }
+
+    ary[0] = l >> 32; ary[1] = l & 0xffffffff;
+    ary[2] = r >> 32; ary[3] = r & 0xffffffff;
+    return ary;
+  }
+
+#endif

new file src/system/libroot/posix/crypt/crypt_legacy.h

@@ +1 @@
+#ifndef CRYPT_LEGACY_H
+#define CRYPT_LEGACY_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+char *crypt_legacy(const char *key, const char *salt);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // CRYPT_LEGACY_H

new file src/system/libroot/posix/crypt/crypt_legacy_util.c

@@ +1 @@
+/*
+ * UFC-crypt: ultra fast crypt(3) implementation
+ *
+ * Copyright (C) 1991, 1992, Free Software Foundation, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * @(#)crypt_util.c 2.40 09/21/92
+ *
+ * Support routines
+ *
+ */
+
+#include <string.h>
+#include "crypt_legacy.h"
+
+#ifdef DEBUG
+#include <stdio.h>
+#endif
+
+#ifndef STATIC
+#define STATIC static
+#endif
+
+#ifndef DOS
+#include "patchlevel.h"
+#include "ufc-crypt.h"
+#else
+/*
+ * Thanks to greg%wind@plains.NoDak.edu (Greg W. Wettstein)
+ * for DOS patches
+ */
+#include "pl.h"
+#include "ufc.h"
+#endif
+
+static char patchlevel_str[] = PATCHLEVEL;
+
+/* 
+ * Permutation done once on the 56 bit 
+ *  key derived from the original 8 byte ASCII key.
+ */
+static int pc1[56] = { 
+  57, 49, 41, 33, 25, 17,  9,  1, 58, 50, 42, 34, 26, 18,
+  10,  2, 59, 51, 43, 35, 27, 19, 11,  3, 60, 52, 44, 36,
+  63, 55, 47, 39, 31, 23, 15,  7, 62, 54, 46, 38, 30, 22,
+  14,  6, 61, 53, 45, 37, 29, 21, 13,  5, 28, 20, 12,  4
+};
+
+/*
+ * How much to rotate each 28 bit half of the pc1 permutated
+ *  56 bit key before using pc2 to give the i' key
+ */
+static int rots[16] = { 
+  1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1 
+};
+
+/* 
+ * Permutation giving the key 
+ * of the i' DES round 
+ */
+static int pc2[48] = { 
+  14, 17, 11, 24,  1,  5,  3, 28, 15,  6, 21, 10,
+  23, 19, 12,  4, 26,  8, 16,  7, 27, 20, 13,  2,
+  41, 52, 31, 37, 47, 55, 30, 40, 51, 45, 33, 48,
+  44, 49, 39, 56, 34, 53, 46, 42, 50, 36, 29, 32
+};
+
+/*
+ * The E expansion table which selects
+ * bits from the 32 bit intermediate result.
+ */
+static int esel[48] = { 
+  32,  1,  2,  3,  4,  5,  4,  5,  6,  7,  8,  9,
+   8,  9, 10, 11, 12, 13, 12, 13, 14, 15, 16, 17,
+  16, 17, 18, 19, 20, 21, 20, 21, 22, 23, 24, 25,
+  24, 25, 26, 27, 28, 29, 28, 29, 30, 31, 32,  1
+};
+static int e_inverse[64];
+
+/* 
+ * Permutation done on the 
+ * result of sbox lookups 
+ */
+static int perm32[32] = {
+  16,  7, 20, 21, 29, 12, 28, 17,  1, 15, 23, 26,  5, 18, 31, 10,
+  2,   8, 24, 14, 32, 27,  3,  9, 19, 13, 30,  6, 22, 11,  4, 25
+};
+
+/* 
+ * The sboxes
+ */
+static int sbox[8][4][16]= {
+        { { 14,  4, 13,  1,  2, 15, 11,  8,  3, 10,  6, 12,  5,  9,  0,  7 },
+          {  0, 15,  7,  4, 14,  2, 13,  1, 10,  6, 12, 11,  9,  5,  3,  8 },
+          {  4,  1, 14,  8, 13,  6,  2, 11, 15, 12,  9,  7,  3, 10,  5,  0 },
+          { 15, 12,  8,  2,  4,  9,  1,  7,  5, 11,  3, 14, 10,  0,  6, 13 }
+        },
+
+        { { 15,  1,  8, 14,  6, 11,  3,  4,  9,  7,  2, 13, 12,  0,  5, 10 },
+          {  3, 13,  4,  7, 15,  2,  8, 14, 12,  0,  1, 10,  6,  9, 11,  5 },
+          {  0, 14,  7, 11, 10,  4, 13,  1,  5,  8, 12,  6,  9,  3,  2, 15 },
+          { 13,  8, 10,  1,  3, 15,  4,  2, 11,  6,  7, 12,  0,  5, 14,  9 }
+        },
+
+        { { 10,  0,  9, 14,  6,  3, 15,  5,  1, 13, 12,  7, 11,  4,  2,  8 },
+          { 13,  7,  0,  9,  3,  4,  6, 10,  2,  8,  5, 14, 12, 11, 15,  1 },
+          { 13,  6,  4,  9,  8, 15,  3,  0, 11,  1,  2, 12,  5, 10, 14,  7 },
+          {  1, 10, 13,  0,  6,  9,  8,  7,  4, 15, 14,  3, 11,  5,  2, 12 }
+        },
+
+        { {  7, 13, 14,  3,  0,  6,  9, 10,  1,  2,  8,  5, 11, 12,  4, 15 },
+          { 13,  8, 11,  5,  6, 15,  0,  3,  4,  7,  2, 12,  1, 10, 14,  9 },
+          { 10,  6,  9,  0, 12, 11,  7, 13, 15,  1,  3, 14,  5,  2,  8,  4 },
+          {  3, 15,  0,  6, 10,  1, 13,  8,  9,  4,  5, 11, 12,  7,  2, 14 }
+        },
+
+        { {  2, 12,  4,  1,  7, 10, 11,  6,  8,  5,  3, 15, 13,  0, 14,  9 },
+          { 14, 11,  2, 12,  4,  7, 13,  1,  5,  0, 15, 10,  3,  9,  8,  6 },
+          {  4,  2,  1, 11, 10, 13,  7,  8, 15,  9, 12,  5,  6,  3,  0, 14 },
+          { 11,  8, 12,  7,  1, 14,  2, 13,  6, 15,  0,  9, 10,  4,  5,  3 }
+        },
+
+        { { 12,  1, 10, 15,  9,  2,  6,  8,  0, 13,  3,  4, 14,  7,  5, 11 },
+          { 10, 15,  4,  2,  7, 12,  9,  5,  6,  1, 13, 14,  0, 11,  3,  8 },
+          {  9, 14, 15,  5,  2,  8, 12,  3,  7,  0,  4, 10,  1, 13, 11,  6 },
+          {  4,  3,  2, 12,  9,  5, 15, 10, 11, 14,  1,  7,  6,  0,  8, 13 }
+        },
+
+        { {  4, 11,  2, 14, 15,  0,  8, 13,  3, 12,  9,  7,  5, 10,  6,  1 },
+          { 13,  0, 11,  7,  4,  9,  1, 10, 14,  3,  5, 12,  2, 15,  8,  6 },
+          {  1,  4, 11, 13, 12,  3,  7, 14, 10, 15,  6,  8,  0,  5,  9,  2 },
+          {  6, 11, 13,  8,  1,  4, 10,  7,  9,  5,  0, 15, 14,  2,  3, 12 }
+        },
+
+        { { 13,  2,  8,  4,  6, 15, 11,  1, 10,  9,  3, 14,  5,  0, 12,  7 },
+          {  1, 15, 13,  8, 10,  3,  7,  4, 12,  5,  6, 11,  0, 14,  9,  2 },
+          {  7, 11,  4,  1,  9, 12, 14,  2,  0,  6, 10, 13, 15,  3,  5,  8 },
+          {  2,  1, 14,  7,  4, 10,  8, 13, 15, 12,  9,  0,  3,  5,  6, 11 }
+        }
+};
+
+/* 
+ * This is the initial 
+ * permutation matrix
+ */
+static int initial_perm[64] = { 
+  58, 50, 42, 34, 26, 18, 10,  2, 60, 52, 44, 36, 28, 20, 12, 4,
+  62, 54, 46, 38, 30, 22, 14,  6, 64, 56, 48, 40, 32, 24, 16, 8,
+  57, 49, 41, 33, 25, 17,  9,  1, 59, 51, 43, 35, 27, 19, 11, 3,
+  61, 53, 45, 37, 29, 21, 13,  5, 63, 55, 47, 39, 31, 23, 15, 7
+};
+
+/* 
+ * This is the final 
+ * permutation matrix
+ */
+static int final_perm[64] = {
+  40,  8, 48, 16, 56, 24, 64, 32, 39,  7, 47, 15, 55, 23, 63, 31,
+  38,  6, 46, 14, 54, 22, 62, 30, 37,  5, 45, 13, 53, 21, 61, 29,
+  36,  4, 44, 12, 52, 20, 60, 28, 35,  3, 43, 11, 51, 19, 59, 27,
+  34,  2, 42, 10, 50, 18, 58, 26, 33,  1, 41,  9, 49, 17, 57, 25
+};
+
+/* 
+ * The 16 DES keys in BITMASK format 
+ */
+#ifdef _UFC_32_
+long32 _ufc_keytab[16][2];
+#endif
+#ifdef _UFC_64_
+long64 _ufc_keytab[16];
+#endif
+
+#define ascii_to_bin(c) ((c)>='a'?(c-59):(c)>='A'?((c)-53):(c)-'.')
+#define bin_to_ascii(c) ((c)>=38?((c)-38+'a'):(c)>=12?((c)-12+'A'):(c)+'.')
+
+/* Macro to set a bit (0..23) */
+#define BITMASK(i) ( (1L<<(11L-(i)%12L+3L)) << ((i)<12L?16L:0L) )
+
+/*
+ * sb arrays:
+ *
+ * Workhorses of the inner loop of the DES implementation.
+ * They do sbox lookup, shifting of this  value, 32 bit
+ * permutation and E permutation for the next round.
+ *
+ * Kept in 'BITMASK' format.
+ */
+
+#ifdef _UFC_32_
+long32 _ufc_sb0[8192], _ufc_sb1[8192], _ufc_sb2[8192], _ufc_sb3[8192];
+static long32 *sb[4] = {_ufc_sb0, _ufc_sb1, _ufc_sb2, _ufc_sb3}; 
+#endif
+
+#ifdef _UFC_64_
+long64 _ufc_sb0[4096], _ufc_sb1[4096], _ufc_sb2[4096], _ufc_sb3[4096];
+static long64 *sb[4] = {_ufc_sb0, _ufc_sb1, _ufc_sb2, _ufc_sb3}; 
+#endif
+
+/* 
+ * eperm32tab: do 32 bit permutation and E selection
+ *
+ * The first index is the byte number in the 32 bit value to be permuted
+ *  -  second  -   is the value of this byte
+ *  -  third   -   selects the two 32 bit values
+ *
+ * The table is used and generated internally in init_des to speed it up
+ */
+static ufc_long eperm32tab[4][256][2];
+
+/* 
+ * do_pc1: permform pc1 permutation in the key schedule generation.
+ *
+ * The first   index is the byte number in the 8 byte ASCII key
+ *  -  second    -      -    the two 28 bits halfs of the result
+ *  -  third     -   selects the 7 bits actually used of each byte
+ *
+ * The result is kept with 28 bit per 32 bit with the 4 most significant
+ * bits zero.
+ */
+static ufc_long do_pc1[8][2][128];
+
+/*
+ * do_pc2: permform pc2 permutation in the key schedule generation.
+ *
+ * The first   index is the septet number in the two 28 bit intermediate values
+ *  -  second    -    -  -  septet values
+ *
+ * Knowledge of the structure of the pc2 permutation is used.
+ *
+ * The result is kept with 28 bit per 32 bit with the 4 most significant
+ * bits zero.
+ */
+static ufc_long do_pc2[8][128];
+
+/*
+ * efp: undo an extra e selection and do final
+ *      permutation giving the DES result.
+ * 
+ *      Invoked 6 bit a time on two 48 bit values
+ *      giving two 32 bit longs.
+ */
+static ufc_long efp[16][64][2];
+
+/*
+ * revfinal: undo final permutation and do E expension.
+ *
+ *           Invoked 6 bit a time on DES output
+ *           giving 4 32 bit longs.
+ */
+static ufc_long revfinal[11][64][4];
+
+
+static unsigned char bytemask[8]  = {
+  0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01
+};
+
+static ufc_long longmask[32] = {
+  0x80000000, 0x40000000, 0x20000000, 0x10000000,
+  0x08000000, 0x04000000, 0x02000000, 0x01000000,
+  0x00800000, 0x00400000, 0x00200000, 0x00100000,
+  0x00080000, 0x00040000, 0x00020000, 0x00010000,
+  0x00008000, 0x00004000, 0x00002000, 0x00001000,
+  0x00000800, 0x00000400, 0x00000200, 0x00000100,
+  0x00000080, 0x00000040, 0x00000020, 0x00000010,
+  0x00000008, 0x00000004, 0x00000002, 0x00000001
+};
+
+#ifdef DEBUG
+
+pr_bits(a, n)
+  ufc_long *a;
+  int n;
+  { ufc_long i, j, t, tmp;
+    n /= 8;
+    for(i = 0; i < n; i++) {
+      tmp=0;
+      for(j = 0; j < 8; j++) {
+    t=8*i+j;
+    tmp|=(a[t/24] & BITMASK(t % 24))?bytemask[j]:0;
+      }
+      (void)printf("%02x ",tmp);
+    }
+    printf(" ");
+  }
+
+static set_bits(v, b)
+  ufc_long v;
+  ufc_long *b;
+  { ufc_long i;
+    *b = 0;
+    for(i = 0; i < 24; i++) {
+      if(v & longmask[8 + i])
+    *b |= BITMASK(i);
+    }
+  }
+
+#endif
+
+/*
+ * Silly rewrite of 'bzero'. I do so
+ * because some machines don't have
+ * bzero and some don't have memset.
+ */
+
+STATIC void clearmem(start, cnt)
+  char *start;
+  int cnt;
+  { while(cnt--)
+      *start++ = '\0';
+  }
+
+static int initialized = 0;
+
+/* lookup a 6 bit value in sbox */
+
+#define s_lookup(i,s) sbox[(i)][(((s)>>4) & 0x2)|((s) & 0x1)][((s)>>1) & 0xf];
+
+/*
+ * Initialize unit - may be invoked directly
+ * by fcrypt users.
+ */
+
+void init_des()
+  { int comes_from_bit;
+    int bit, sg;
+    ufc_long j;
+    ufc_long mask1, mask2;
+
+    /*
+     * Create the do_pc1 table used
+     * to affect pc1 permutation
+     * when generating keys
+     */
+    for(bit = 0; bit < 56; bit++) {
+      comes_from_bit  = pc1[bit] - 1;
+      mask1 = bytemask[comes_from_bit % 8 + 1];
+      mask2 = longmask[bit % 28 + 4];
+      for(j = 0; j < 128; j++) {
+    if(j & mask1) 
+      do_pc1[comes_from_bit / 8][bit / 28][j] |= mask2;
+      }
+    }
+
+    /*
+     * Create the do_pc2 table used
+     * to affect pc2 permutation when
+     * generating keys
+     */
+    for(bit = 0; bit < 48; bit++) {
+      comes_from_bit  = pc2[bit] - 1;
+      mask1 = bytemask[comes_from_bit % 7 + 1];
+      mask2 = BITMASK(bit % 24);
+      for(j = 0; j < 128; j++) {
+    if(j & mask1)
+      do_pc2[comes_from_bit / 7][j] |= mask2;
+      }
+    }
+
+    /* 
+     * Now generate the table used to do combined
+     * 32 bit permutation and e expansion
+     *
+     * We use it because we have to permute 16384 32 bit
+     * longs into 48 bit in order to initialize sb.
+     *
+     * Looping 48 rounds per permutation becomes 
+     * just too slow...
+     *
+     */
+
+    clearmem((char*)eperm32tab, sizeof(eperm32tab));
+
+    for(bit = 0; bit < 48; bit++) {
+      ufc_long mask1,comes_from;
+    
+      comes_from = perm32[esel[bit]-1]-1;
+      mask1      = bytemask[comes_from % 8];
+    
+      for(j = 256; j--;) {
+    if(j & mask1)
+      eperm32tab[comes_from / 8][j][bit / 24] |= BITMASK(bit % 24);
+      }
+    }
+    
+    /* 
+     * Create the sb tables:
+     *
+     * For each 12 bit segment of an 48 bit intermediate
+     * result, the sb table precomputes the two 4 bit
+     * values of the sbox lookups done with the two 6
+     * bit halves, shifts them to their proper place,
+     * sends them through perm32 and finally E expands
+     * them so that they are ready for the next
+     * DES round.
+     *
+     */
+    for(sg = 0; sg < 4; sg++) {
+      int j1, j2;
+      int s1, s2;
+    
+      for(j1 = 0; j1 < 64; j1++) {
+    s1 = s_lookup(2 * sg, j1);
+    for(j2 = 0; j2 < 64; j2++) {
+      ufc_long to_permute, inx;
+    
+      s2         = s_lookup(2 * sg + 1, j2);
+      to_permute = (((ufc_long)s1 << 4)  | 
+                   (ufc_long)s2) << (24 - 8 * (ufc_long)sg);
+
+#ifdef _UFC_32_
+      inx = ((j1 << 6)  | j2) << 1;
+      sb[sg][inx  ]  = eperm32tab[0][(to_permute >> 24) & 0xff][0];
+      sb[sg][inx+1]  = eperm32tab[0][(to_permute >> 24) & 0xff][1];
+      sb[sg][inx  ] |= eperm32tab[1][(to_permute >> 16) & 0xff][0];
+      sb[sg][inx+1] |= eperm32tab[1][(to_permute >> 16) & 0xff][1];
+      sb[sg][inx  ] |= eperm32tab[2][(to_permute >>  8) & 0xff][0];
+      sb[sg][inx+1] |= eperm32tab[2][(to_permute >>  8) & 0xff][1];
+      sb[sg][inx  ] |= eperm32tab[3][(to_permute)       & 0xff][0];
+      sb[sg][inx+1] |= eperm32tab[3][(to_permute)       & 0xff][1];
+#endif
+#ifdef _UFC_64_
+      inx = ((j1 << 6)  | j2);
+      sb[sg][inx]  = 
+        ((long64)eperm32tab[0][(to_permute >> 24) & 0xff][0] << 32) |
+         (long64)eperm32tab[0][(to_permute >> 24) & 0xff][1];
+      sb[sg][inx] |=
+        ((long64)eperm32tab[1][(to_permute >> 16) & 0xff][0] << 32) |
+         (long64)eperm32tab[1][(to_permute >> 16) & 0xff][1];
+      sb[sg][inx] |= 
+        ((long64)eperm32tab[2][(to_permute >>  8) & 0xff][0] << 32) |
+         (long64)eperm32tab[2][(to_permute >>  8) & 0xff][1];
+      sb[sg][inx] |=
+        ((long64)eperm32tab[3][(to_permute)       & 0xff][0] << 32) |
+         (long64)eperm32tab[3][(to_permute)       & 0xff][1];
+#endif
+    }
+      }
+    }  
+
+    /* 
+     * Create an inverse matrix for esel telling
+     * where to plug out bits if undoing it
+     */
+    for(bit=48; bit--;) {
+      e_inverse[esel[bit] - 1     ] = bit;
+      e_inverse[esel[bit] - 1 + 32] = bit + 48;
+    }
+
+    /* 
+     * create efp: the matrix used to
+     * undo the E expansion and effect final permutation
+     */
+    clearmem((char*)efp, sizeof efp);
+    for(bit = 0; bit < 64; bit++) {
+      int o_bit, o_long;
+      ufc_long word_value, mask1, mask2;
+      int comes_from_f_bit, comes_from_e_bit;
+      int comes_from_word, bit_within_word;
+
+      /* See where bit i belongs in the two 32 bit long's */
+      o_long = bit / 32; /* 0..1  */
+      o_bit  = bit % 32; /* 0..31 */
+
+      /* 
+       * And find a bit in the e permutated value setting this bit.
+       *
+       * Note: the e selection may have selected the same bit several
+       * times. By the initialization of e_inverse, we only look
+       * for one specific instance.
+       */
+      comes_from_f_bit = final_perm[bit] - 1;         /* 0..63 */
+      comes_from_e_bit = e_inverse[comes_from_f_bit]; /* 0..95 */
+      comes_from_word  = comes_from_e_bit / 6;        /* 0..15 */
+      bit_within_word  = comes_from_e_bit % 6;        /* 0..5  */
+
+      mask1 = longmask[bit_within_word + 26];
+      mask2 = longmask[o_bit];
+
+      for(word_value = 64; word_value--;) {
+    if(word_value & mask1)
+      efp[comes_from_word][word_value][o_long] |= mask2;
+      }
+    }
+
+    
+    /*
+     * Create revfinal: an array to undo final
+     * the effects of efp
+     */
+    clearmem((char*)revfinal, sizeof(revfinal));
+    for(bit = 0; bit < 96; bit++) {
+      int ibit = initial_perm[esel[bit % 48] - 1 + ((bit >= 48) ? 32 : 0)] - 1;
+      mask1 = bytemask[ibit % 6 +  2];
+      mask2 = BITMASK(bit % 24);
+      for(j = 64; j--;) {
+        if(j & mask1) {
+          revfinal[ibit / 6][j][bit / 24] |= mask2;
+        }
+      }
+    }
+
+    initialized++;
+  }
+
+/* 
+ * Process the elements of the sb table permuting the
+ * bits swapped in the expansion by the current salt.
+ */
+
+#ifdef _UFC_32_
+STATIC void shuffle_sb(k, saltbits)
+  long32 *k;
+  ufc_long saltbits;
+  { ufc_long j;
+    long32 x;
+    for(j=4096; j--;) {
+      x = (k[0] ^ k[1]) & (long32)saltbits;
+      *k++ ^= x;
+      *k++ ^= x;
+    }
+  }
+#endif
+
+#ifdef _UFC_64_
+STATIC void shuffle_sb(k, saltbits)
+  long64 *k;
+  ufc_long saltbits;
+  { ufc_long j;
+    long64 x;
+    for(j=4096; j--;) {
+      x = ((*k >> 32) ^ *k) & (long64)saltbits;
+      *k++ ^= (x << 32) | x;
+    }
+  }
+#endif
+
+/* 
+ * Setup the unit for a new salt
+ * Hopefully we'll not see a new salt in each crypt call.
+ */
+
+static unsigned char current_salt[3] = "&&"; /* invalid value */
+static ufc_long current_saltbits = 0;
+static int direction = 0;
+
+STATIC void setup_salt(s)
+  char *s;
+  { ufc_long i, j, saltbits;
+
+    if(!initialized)
+      init_des();
+
+    if(s[0] == current_salt[0] && s[1] == current_salt[1])
+      return;
+    current_salt[0] = s[0]; current_salt[1] = s[1];
+    
+    /* 
+     * This is the only crypt change to DES:
+     * entries are swapped in the expansion table
+     * according to the bits set in the salt.
+     */
+    saltbits = 0;
+    for(i = 0; i < 2; i++) {
+      long c=ascii_to_bin(s[i]);
+#ifdef notdef
+      /* 
+       * Some applications do rely on illegal
+       * salts. It seems that UFC-crypt behaves
+       * identically to standard crypt 
+       * implementations on illegal salts -- glad
+       */
+      if(c < 0 || c > 63)
+    c = 0;
+#endif
+      for(j = 0; j < 6; j++) {
+    if((c >> j) & 0x1)
+      saltbits |= BITMASK(6 * i + j);
+      }
+    }
+
+    /*
+     * Permute the sb table values
+     * to reflect the changed e
+     * selection table
+     */
+    shuffle_sb(_ufc_sb0, current_saltbits ^ saltbits); 
+    shuffle_sb(_ufc_sb1, current_saltbits ^ saltbits);
+    shuffle_sb(_ufc_sb2, current_saltbits ^ saltbits);
+    shuffle_sb(_ufc_sb3, current_saltbits ^ saltbits);
+
+    current_saltbits = saltbits;
+  }
+
+STATIC void ufc_mk_keytab(key)
+  char *key;
+  { ufc_long v1, v2, *k1;
+    int i;
+#ifdef _UFC_32_
+    long32 v, *k2 = &_ufc_keytab[0][0];
+#endif
+#ifdef _UFC_64_
+    long64 v, *k2 = &_ufc_keytab[0];
+#endif
+
+    v1 = v2 = 0; k1 = &do_pc1[0][0][0];
+    for(i = 8; i--;) {
+      v1 |= k1[*key   & 0x7f]; k1 += 128;
+      v2 |= k1[*key++ & 0x7f]; k1 += 128;
+    }
+
+    for(i = 0; i < 16; i++) {
+      k1 = &do_pc2[0][0];
+
+      v1 = (v1 << rots[i]) | (v1 >> (28 - rots[i]));
+      v  = k1[(v1 >> 21) & 0x7f]; k1 += 128;
+      v |= k1[(v1 >> 14) & 0x7f]; k1 += 128;
+      v |= k1[(v1 >>  7) & 0x7f]; k1 += 128;
+      v |= k1[(v1      ) & 0x7f]; k1 += 128;
+
+#ifdef _UFC_32_
+      *k2++ = v;
+      v = 0;
+#endif
+#ifdef _UFC_64_
+      v <<= 32;
+#endif
+
+      v2 = (v2 << rots[i]) | (v2 >> (28 - rots[i]));
+      v |= k1[(v2 >> 21) & 0x7f]; k1 += 128;
+      v |= k1[(v2 >> 14) & 0x7f]; k1 += 128;
+      v |= k1[(v2 >>  7) & 0x7f]; k1 += 128;
+      v |= k1[(v2      ) & 0x7f];
+
+      *k2++ = v;
+    }
+
+    direction = 0;
+  }
+
+/* 
+ * Undo an extra E selection and do final permutations
+ */
+
+ufc_long *_ufc_dofinalperm(l1, l2, r1, r2)
+  ufc_long l1,l2,r1,r2;
+  { ufc_long v1, v2, x;
+    static ufc_long ary[2];
+
+    x = (l1 ^ l2) & current_saltbits; l1 ^= x; l2 ^= x;
+    x = (r1 ^ r2) & current_saltbits; r1 ^= x; r2 ^= x;
+
+    v1=v2=0; l1 >>= 3; l2 >>= 3; r1 >>= 3; r2 >>= 3;
+
+    v1 |= efp[15][ r2         & 0x3f][0]; v2 |= efp[15][ r2 & 0x3f][1];
+    v1 |= efp[14][(r2 >>= 6)  & 0x3f][0]; v2 |= efp[14][ r2 & 0x3f][1];
+    v1 |= efp[13][(r2 >>= 10) & 0x3f][0]; v2 |= efp[13][ r2 & 0x3f][1];
+    v1 |= efp[12][(r2 >>= 6)  & 0x3f][0]; v2 |= efp[12][ r2 & 0x3f][1];
+
+    v1 |= efp[11][ r1         & 0x3f][0]; v2 |= efp[11][ r1 & 0x3f][1];
+    v1 |= efp[10][(r1 >>= 6)  & 0x3f][0]; v2 |= efp[10][ r1 & 0x3f][1];
+    v1 |= efp[ 9][(r1 >>= 10) & 0x3f][0]; v2 |= efp[ 9][ r1 & 0x3f][1];
+    v1 |= efp[ 8][(r1 >>= 6)  & 0x3f][0]; v2 |= efp[ 8][ r1 & 0x3f][1];
+
+    v1 |= efp[ 7][ l2         & 0x3f][0]; v2 |= efp[ 7][ l2 & 0x3f][1];
+    v1 |= efp[ 6][(l2 >>= 6)  & 0x3f][0]; v2 |= efp[ 6][ l2 & 0x3f][1];
+    v1 |= efp[ 5][(l2 >>= 10) & 0x3f][0]; v2 |= efp[ 5][ l2 & 0x3f][1];
+    v1 |= efp[ 4][(l2 >>= 6)  & 0x3f][0]; v2 |= efp[ 4][ l2 & 0x3f][1];
+
+    v1 |= efp[ 3][ l1         & 0x3f][0]; v2 |= efp[ 3][ l1 & 0x3f][1];
+    v1 |= efp[ 2][(l1 >>= 6)  & 0x3f][0]; v2 |= efp[ 2][ l1 & 0x3f][1];
+    v1 |= efp[ 1][(l1 >>= 10) & 0x3f][0]; v2 |= efp[ 1][ l1 & 0x3f][1];
+    v1 |= efp[ 0][(l1 >>= 6)  & 0x3f][0]; v2 |= efp[ 0][ l1 & 0x3f][1];
+
+    ary[0] = v1; ary[1] = v2;
+    return ary;
+  }
+
+/* 
+ * crypt only: convert from 64 bit to 11 bit ASCII 
+ * prefixing with the salt
+ */
+
+STATIC char *output_conversion(v1, v2, salt)
+  ufc_long v1, v2;
+  char *salt;
+  { static char outbuf[14];
+    int i, s, shf;
+
+    outbuf[0] = salt[0];
+    outbuf[1] = salt[1] ? salt[1] : salt[0];
+
+    for(i = 0; i < 5; i++) {
+      shf = (26 - 6 * i); /* to cope with MSC compiler bug */
+      outbuf[i + 2] = bin_to_ascii((v1 >> shf) & 0x3f);
+    }
+
+    s  = (v2 & 0xf) << 2;
+    v2 = (v2 >> 2) | ((v1 & 0x3) << 30);
+
+    for(i = 5; i < 10; i++) {
+      shf = (56 - 6 * i);
+      outbuf[i + 2] = bin_to_ascii((v2 >> shf) & 0x3f);
+    }
+
+    outbuf[12] = bin_to_ascii(s);
+    outbuf[13] = 0;
+
+    return outbuf;
+  }
+
+ufc_long *_ufc_doit();
+
+/* 
+ * UNIX crypt function
+ */
+   
+char *crypt_legacy(key, salt)
+  const char *key, *salt;
+  { ufc_long *s;
+    char ktab[9];
+
+    /*
+     * Hack DES tables according to salt
+     */
+    setup_salt(salt);
+
+    /*
+     * Setup key schedule
+     */
+    clearmem(ktab, sizeof ktab);
+    (void)strncpy(ktab, key, 8);
+    ufc_mk_keytab(ktab);
+
+    /*
+     * Go for the 25 DES encryptions
+     */
+    s = _ufc_doit((ufc_long)0, (ufc_long)0, 
+          (ufc_long)0, (ufc_long)0, (ufc_long)25);
+    /*
+     * Do final permutations
+     */
+    s = _ufc_dofinalperm(s[0], s[1], s[2], s[3]);
+
+    /*
+     * And convert back to 6 bit ASCII
+     */
+    return output_conversion(s[0], s[1], salt);
+  }
+
+/* 
+ * UNIX encrypt function. Takes a bitvector
+ * represented by one byte per bit and
+ * encrypt/decrypt according to edflag
+ */
+
+void encrypt(block, edflag)
+  char *block;
+  int edflag;
+  { ufc_long l1, l2, r1, r2, *s;
+    int i;
+
+    /*
+     * Undo any salt changes to E expansion
+     */
+    setup_salt("..");
+
+    /*
+     * Reverse key table if
+     * changing operation (encrypt/decrypt)
+     */
+    if((edflag == 0) != (direction == 0)) {
+      for(i = 0; i < 8; i++) {
+#ifdef _UFC_32_
+    long32 x;
+    x = _ufc_keytab[15-i][0]; 
+        _ufc_keytab[15-i][0] = _ufc_keytab[i][0]; 
+        _ufc_keytab[i][0] = x;
+
+    x = _ufc_keytab[15-i][1]; 
+        _ufc_keytab[15-i][1] = _ufc_keytab[i][1]; 
+        _ufc_keytab[i][1] = x;
+#endif
+#ifdef _UFC_64_
+    long64 x;
+    x = _ufc_keytab[15-i];
+    _ufc_keytab[15-i] = _ufc_keytab[i];
+    _ufc_keytab[i] = x;
+#endif
+      }
+      direction = edflag;
+    }
+
+    /*
+     * Do initial permutation + E expansion
+     */
+    i = 0;
+    for(l1 = 0; i < 24; i++) {
+      if(block[initial_perm[esel[i]-1]-1])
+    l1 |= BITMASK(i);
+    }
+    for(l2 = 0; i < 48; i++) {
+      if(block[initial_perm[esel[i]-1]-1])
+    l2 |= BITMASK(i-24);
+    }
+
+    i = 0;
+    for(r1 = 0; i < 24; i++) {
+      if(block[initial_perm[esel[i]-1+32]-1])
+    r1 |= BITMASK(i);
+    }
+    for(r2 = 0; i < 48; i++) {
+      if(block[initial_perm[esel[i]-1+32]-1])
+    r2 |= BITMASK(i-24);
+    }
+
+    /*
+     * Do DES inner loops + final conversion
+     */
+    s = _ufc_doit(l1, l2, r1, r2, (ufc_long)1);
+    /*
+     * Do final permutations
+     */
+    s = _ufc_dofinalperm(s[0], s[1], s[2], s[3]);
+
+    /*
+     * And convert to bit array
+     */
+    l1 = s[0]; r1 = s[1];
+    for(i = 0; i < 32; i++) {
+      *block++ = (l1 & longmask[i]) != 0;
+    }
+    for(i = 0; i < 32; i++) {
+      *block++ = (r1 & longmask[i]) != 0;
+    }
+    
+  }
+
+/* 
+ * UNIX setkey function. Take a 64 bit DES
+ * key and setup the machinery.
+ */
+
+void setkey(key)
+  char *key;
+  { int i,j;
+    unsigned char c;
+    unsigned char ktab[8];
+
+    setup_salt(".."); /* be sure we're initialized */
+
+    for(i = 0; i < 8; i++) {
+      for(j = 0, c = 0; j < 8; j++)
+    c = c << 1 | *key++;
+      ktab[i] = c >> 1;
+    }
+    
+    ufc_mk_keytab(ktab);
+  }
+
+/* 
+ * Ultrix crypt16 function, thanks to pcl@convex.oxford.ac.uk (Paul Leyland)
+ */
+   
+char *crypt16(key, salt)
+  char *key, *salt;
+  { ufc_long *s, *t;
+    char ktab[9], ttab[9];
+    static char q[14], res[25];
+    /*
+     * Hack DES tables according to salt
+     */
+    setup_salt(salt);
+    
+    /*
+     * Setup key schedule
+     */
+    clearmem(ktab, sizeof ktab);
+    (void)strncpy(ktab, key, 8);
+    ufc_mk_keytab(ktab);
+    
+    /*
+     * Go for first 20 DES encryptions
+     */
+    s = _ufc_doit((ufc_long)0, (ufc_long)0, 
+          (ufc_long)0, (ufc_long)0, (ufc_long)20);
+    
+    /*
+     * And convert back to 6 bit ASCII
+     */
+    strcpy (res, output_conversion(s[0], s[1], salt));
+    
+    clearmem(ttab, sizeof ttab);
+    if (strlen (key) > 8) (void)strncpy(ttab, key+8, 8);
+    ufc_mk_keytab(ttab);
+    
+    /*
+     * Go for second 5 DES encryptions
+     */
+    t = _ufc_doit((ufc_long)0, (ufc_long)0, 
+          (ufc_long)0, (ufc_long)0, (ufc_long)5);
+    /*
+     * And convert back to 6 bit ASCII
+     */
+    strcpy (q, output_conversion(t[0], t[1], salt));
+    strcpy (res+13, q+2);
+    
+    clearmem(ktab, sizeof ktab);
+    (void)strncpy(ktab, key, 8);
+    ufc_mk_keytab(ktab);
+    
+    return res;
+  }
+
+/*
+ * Experimental -- not supported -- may choke your dog
+ */
+
+void ufc_setup_password(cookie, s)
+  long *cookie;
+  char *s;
+  { char c;
+    int i;
+    ufc_long x;
+    ufc_long dl1, dl2, dr1, dr2;
+
+    setup_salt(s);
+    dl1 = dl2 = dr1 = dr2 = 0;
+    for(i = 0, s += 2; c = *s++; i++) {
+      int x = ascii_to_bin(c);
+      dl1 |= revfinal[i][x][0];
+      dl2 |= revfinal[i][x][1];
+      dr1 |= revfinal[i][x][2];
+      dr2 |= revfinal[i][x][3];
+    }
+    x = (dl1 ^ dl2) & current_saltbits;
+    x = (dr1 ^ dr2) & current_saltbits;
+    cookie[0] = dl1 ^ x; cookie[1] = dl2 ^ x;
+    cookie[2] = dr1 ^ x; cookie[3] = dr2 ^ x;
+  }
+
+void ufc_do_pw(cookie, guess)
+  long *cookie;  
+  char *guess;
+  { char ktab[9];
+    ufc_long *s;
+    clearmem(ktab, sizeof ktab);
+    (void)strncpy(ktab, guess, 8);
+    ufc_mk_keytab(ktab);
+    s = _ufc_doit((ufc_long)0, (ufc_long)0, 
+          (ufc_long)0, (ufc_long)0, (ufc_long)25);
+    cookie[0] = s[0];    cookie[1] = s[1];
+    cookie[2] = s[2];    cookie[3] = s[3];
+  }

deleted file src/system/libroot/posix/crypt/crypt_util.c

@@ -1 @@
-/*
- * UFC-crypt: ultra fast crypt(3) implementation
- *
- * Copyright (C) 1991, 1992, Free Software Foundation, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * @(#)crypt_util.c 2.40 09/21/92
- *
- * Support routines
- *
- */
-
-#include <string.h>
-
-#ifdef DEBUG
-#include <stdio.h>
-#endif
-
-#ifndef STATIC
-#define STATIC static
-#endif
-
-#ifndef DOS
-#include "patchlevel.h"
-#include "ufc-crypt.h"
-#else
-/*
- * Thanks to greg%wind@plains.NoDak.edu (Greg W. Wettstein)
- * for DOS patches
- */
-#include "pl.h"
-#include "ufc.h"
-#endif
-
-static char patchlevel_str[] = PATCHLEVEL;
-
-/* 
- * Permutation done once on the 56 bit 
- *  key derived from the original 8 byte ASCII key.
- */
-static int pc1[56] = { 
-  57, 49, 41, 33, 25, 17,  9,  1, 58, 50, 42, 34, 26, 18,
-  10,  2, 59, 51, 43, 35, 27, 19, 11,  3, 60, 52, 44, 36,
-  63, 55, 47, 39, 31, 23, 15,  7, 62, 54, 46, 38, 30, 22,
-  14,  6, 61, 53, 45, 37, 29, 21, 13,  5, 28, 20, 12,  4
-};
-
-/*
- * How much to rotate each 28 bit half of the pc1 permutated
- *  56 bit key before using pc2 to give the i' key
- */
-static int rots[16] = { 
-  1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1 
-};
-
-/* 
- * Permutation giving the key 
- * of the i' DES round 
- */
-static int pc2[48] = { 
-  14, 17, 11, 24,  1,  5,  3, 28, 15,  6, 21, 10,
-  23, 19, 12,  4, 26,  8, 16,  7, 27, 20, 13,  2,
-  41, 52, 31, 37, 47, 55, 30, 40, 51, 45, 33, 48,
-  44, 49, 39, 56, 34, 53, 46, 42, 50, 36, 29, 32
-};
-
-/*
- * The E expansion table which selects
- * bits from the 32 bit intermediate result.
- */
-static int esel[48] = { 
-  32,  1,  2,  3,  4,  5,  4,  5,  6,  7,  8,  9,
-   8,  9, 10, 11, 12, 13, 12, 13, 14, 15, 16, 17,
-  16, 17, 18, 19, 20, 21, 20, 21, 22, 23, 24, 25,
-  24, 25, 26, 27, 28, 29, 28, 29, 30, 31, 32,  1
-};
-static int e_inverse[64];
-
-/* 
- * Permutation done on the 
- * result of sbox lookups 
- */
-static int perm32[32] = {
-  16,  7, 20, 21, 29, 12, 28, 17,  1, 15, 23, 26,  5, 18, 31, 10,
-  2,   8, 24, 14, 32, 27,  3,  9, 19, 13, 30,  6, 22, 11,  4, 25
-};
-
-/* 
- * The sboxes
- */
-static int sbox[8][4][16]= {
-        { { 14,  4, 13,  1,  2, 15, 11,  8,  3, 10,  6, 12,  5,  9,  0,  7 },
-          {  0, 15,  7,  4, 14,  2, 13,  1, 10,  6, 12, 11,  9,  5,  3,  8 },
-          {  4,  1, 14,  8, 13,  6,  2, 11, 15, 12,  9,  7,  3, 10,  5,  0 },
-          { 15, 12,  8,  2,  4,  9,  1,  7,  5, 11,  3, 14, 10,  0,  6, 13 }
-        },
-
-        { { 15,  1,  8, 14,  6, 11,  3,  4,  9,  7,  2, 13, 12,  0,  5, 10 },
-          {  3, 13,  4,  7, 15,  2,  8, 14, 12,  0,  1, 10,  6,  9, 11,  5 },
-          {  0, 14,  7, 11, 10,  4, 13,  1,  5,  8, 12,  6,  9,  3,  2, 15 },
-          { 13,  8, 10,  1,  3, 15,  4,  2, 11,  6,  7, 12,  0,  5, 14,  9 }
-        },
-
-        { { 10,  0,  9, 14,  6,  3, 15,  5,  1, 13, 12,  7, 11,  4,  2,  8 },
-          { 13,  7,  0,  9,  3,  4,  6, 10,  2,  8,  5, 14, 12, 11, 15,  1 },
-          { 13,  6,  4,  9,  8, 15,  3,  0, 11,  1,  2, 12,  5, 10, 14,  7 },
-          {  1, 10, 13,  0,  6,  9,  8,  7,  4, 15, 14,  3, 11,  5,  2, 12 }
-        },
-
-        { {  7, 13, 14,  3,  0,  6,  9, 10,  1,  2,  8,  5, 11, 12,  4, 15 },
-          { 13,  8, 11,  5,  6, 15,  0,  3,  4,  7,  2, 12,  1, 10, 14,  9 },
-          { 10,  6,  9,  0, 12, 11,  7, 13, 15,  1,  3, 14,  5,  2,  8,  4 },
-          {  3, 15,  0,  6, 10,  1, 13,  8,  9,  4,  5, 11, 12,  7,  2, 14 }
-        },
-
-        { {  2, 12,  4,  1,  7, 10, 11,  6,  8,  5,  3, 15, 13,  0, 14,  9 },
-          { 14, 11,  2, 12,  4,  7, 13,  1,  5,  0, 15, 10,  3,  9,  8,  6 },
-          {  4,  2,  1, 11, 10, 13,  7,  8, 15,  9, 12,  5,  6,  3,  0, 14 },
-          { 11,  8, 12,  7,  1, 14,  2, 13,  6, 15,  0,  9, 10,  4,  5,  3 }
-        },
-
-        { { 12,  1, 10, 15,  9,  2,  6,  8,  0, 13,  3,  4, 14,  7,  5, 11 },
-          { 10, 15,  4,  2,  7, 12,  9,  5,  6,  1, 13, 14,  0, 11,  3,  8 },
-          {  9, 14, 15,  5,  2,  8, 12,  3,  7,  0,  4, 10,  1, 13, 11,  6 },
-          {  4,  3,  2, 12,  9,  5, 15, 10, 11, 14,  1,  7,  6,  0,  8, 13 }
-        },
-
-        { {  4, 11,  2, 14, 15,  0,  8, 13,  3, 12,  9,  7,  5, 10,  6,  1 },
-          { 13,  0, 11,  7,  4,  9,  1, 10, 14,  3,  5, 12,  2, 15,  8,  6 },
-          {  1,  4, 11, 13, 12,  3,  7, 14, 10, 15,  6,  8,  0,  5,  9,  2 },
-          {  6, 11, 13,  8,  1,  4, 10,  7,  9,  5,  0, 15, 14,  2,  3, 12 }
-        },
-
-        { { 13,  2,  8,  4,  6, 15, 11,  1, 10,  9,  3, 14,  5,  0, 12,  7 },
-          {  1, 15, 13,  8, 10,  3,  7,  4, 12,  5,  6, 11,  0, 14,  9,  2 },
-          {  7, 11,  4,  1,  9, 12, 14,  2,  0,  6, 10, 13, 15,  3,  5,  8 },
-          {  2,  1, 14,  7,  4, 10,  8, 13, 15, 12,  9,  0,  3,  5,  6, 11 }
-        }
-};
-
-/* 
- * This is the initial 
- * permutation matrix
- */
-static int initial_perm[64] = { 
-  58, 50, 42, 34, 26, 18, 10,  2, 60, 52, 44, 36, 28, 20, 12, 4,
-  62, 54, 46, 38, 30, 22, 14,  6, 64, 56, 48, 40, 32, 24, 16, 8,
-  57, 49, 41, 33, 25, 17,  9,  1, 59, 51, 43, 35, 27, 19, 11, 3,
-  61, 53, 45, 37, 29, 21, 13,  5, 63, 55, 47, 39, 31, 23, 15, 7
-};
-
-/* 
- * This is the final 
- * permutation matrix
- */
-static int final_perm[64] = {
-  40,  8, 48, 16, 56, 24, 64, 32, 39,  7, 47, 15, 55, 23, 63, 31,
-  38,  6, 46, 14, 54, 22, 62, 30, 37,  5, 45, 13, 53, 21, 61, 29,
-  36,  4, 44, 12, 52, 20, 60, 28, 35,  3, 43, 11, 51, 19, 59, 27,
-  34,  2, 42, 10, 50, 18, 58, 26, 33,  1, 41,  9, 49, 17, 57, 25
-};
-
-/* 
- * The 16 DES keys in BITMASK format 
- */
-#ifdef _UFC_32_
-long32 _ufc_keytab[16][2];
-#endif
-#ifdef _UFC_64_
-long64 _ufc_keytab[16];
-#endif
-
-#define ascii_to_bin(c) ((c)>='a'?(c-59):(c)>='A'?((c)-53):(c)-'.')
-#define bin_to_ascii(c) ((c)>=38?((c)-38+'a'):(c)>=12?((c)-12+'A'):(c)+'.')
-
-/* Macro to set a bit (0..23) */
-#define BITMASK(i) ( (1L<<(11L-(i)%12L+3L)) << ((i)<12L?16L:0L) )
-
-/*
- * sb arrays:
- *
- * Workhorses of the inner loop of the DES implementation.
- * They do sbox lookup, shifting of this  value, 32 bit
- * permutation and E permutation for the next round.
- *
- * Kept in 'BITMASK' format.
- */
-
-#ifdef _UFC_32_
-long32 _ufc_sb0[8192], _ufc_sb1[8192], _ufc_sb2[8192], _ufc_sb3[8192];
-static long32 *sb[4] = {_ufc_sb0, _ufc_sb1, _ufc_sb2, _ufc_sb3}; 
-#endif
-
-#ifdef _UFC_64_
-long64 _ufc_sb0[4096], _ufc_sb1[4096], _ufc_sb2[4096], _ufc_sb3[4096];
-static long64 *sb[4] = {_ufc_sb0, _ufc_sb1, _ufc_sb2, _ufc_sb3}; 
-#endif
-
-/* 
- * eperm32tab: do 32 bit permutation and E selection
- *
- * The first index is the byte number in the 32 bit value to be permuted
- *  -  second  -   is the value of this byte
- *  -  third   -   selects the two 32 bit values
- *
- * The table is used and generated internally in init_des to speed it up
- */
-static ufc_long eperm32tab[4][256][2];
-
-/* 
- * do_pc1: permform pc1 permutation in the key schedule generation.
- *
- * The first   index is the byte number in the 8 byte ASCII key
- *  -  second    -      -    the two 28 bits halfs of the result
- *  -  third     -   selects the 7 bits actually used of each byte
- *
- * The result is kept with 28 bit per 32 bit with the 4 most significant
- * bits zero.
- */
-static ufc_long do_pc1[8][2][128];
-
-/*
- * do_pc2: permform pc2 permutation in the key schedule generation.
- *
- * The first   index is the septet number in the two 28 bit intermediate values
- *  -  second    -    -  -  septet values
- *
- * Knowledge of the structure of the pc2 permutation is used.
- *
- * The result is kept with 28 bit per 32 bit with the 4 most significant
- * bits zero.
- */
-static ufc_long do_pc2[8][128];
-
-/*
- * efp: undo an extra e selection and do final
- *      permutation giving the DES result.
- * 
- *      Invoked 6 bit a time on two 48 bit values
- *      giving two 32 bit longs.
- */
-static ufc_long efp[16][64][2];
-
-/*
- * revfinal: undo final permutation and do E expension.
- *
- *           Invoked 6 bit a time on DES output
- *           giving 4 32 bit longs.
- */
-static ufc_long revfinal[11][64][4];
-
-
-static unsigned char bytemask[8]  = {
-  0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01
-};
-
-static ufc_long longmask[32] = {
-  0x80000000, 0x40000000, 0x20000000, 0x10000000,
-  0x08000000, 0x04000000, 0x02000000, 0x01000000,
-  0x00800000, 0x00400000, 0x00200000, 0x00100000,
-  0x00080000, 0x00040000, 0x00020000, 0x00010000,
-  0x00008000, 0x00004000, 0x00002000, 0x00001000,
-  0x00000800, 0x00000400, 0x00000200, 0x00000100,
-  0x00000080, 0x00000040, 0x00000020, 0x00000010,
-  0x00000008, 0x00000004, 0x00000002, 0x00000001
-};
-
-#ifdef DEBUG
-
-pr_bits(a, n)
-  ufc_long *a;
-  int n;
-  { ufc_long i, j, t, tmp;
-    n /= 8;
-    for(i = 0; i < n; i++) {
-      tmp=0;
-      for(j = 0; j < 8; j++) {
-    t=8*i+j;
-    tmp|=(a[t/24] & BITMASK(t % 24))?bytemask[j]:0;
-      }
-      (void)printf("%02x ",tmp);
-    }
-    printf(" ");
-  }
-
-static set_bits(v, b)
-  ufc_long v;
-  ufc_long *b;
-  { ufc_long i;
-    *b = 0;
-    for(i = 0; i < 24; i++) {
-      if(v & longmask[8 + i])
-    *b |= BITMASK(i);
-    }
-  }
-
-#endif
-
-/*
- * Silly rewrite of 'bzero'. I do so
- * because some machines don't have
- * bzero and some don't have memset.
- */
-
-STATIC void clearmem(start, cnt)
-  char *start;
-  int cnt;
-  { while(cnt--)
-      *start++ = '\0';
-  }
-
-static int initialized = 0;
-
-/* lookup a 6 bit value in sbox */
-
-#define s_lookup(i,s) sbox[(i)][(((s)>>4) & 0x2)|((s) & 0x1)][((s)>>1) & 0xf];
-
-/*
- * Initialize unit - may be invoked directly
- * by fcrypt users.
- */
-
-void init_des()
-  { int comes_from_bit;
-    int bit, sg;
-    ufc_long j;
-    ufc_long mask1, mask2;
-
-    /*
-     * Create the do_pc1 table used
-     * to affect pc1 permutation
-     * when generating keys
-     */
-    for(bit = 0; bit < 56; bit++) {
-      comes_from_bit  = pc1[bit] - 1;
-      mask1 = bytemask[comes_from_bit % 8 + 1];
-      mask2 = longmask[bit % 28 + 4];
-      for(j = 0; j < 128; j++) {
-    if(j & mask1) 
-      do_pc1[comes_from_bit / 8][bit / 28][j] |= mask2;
-      }
-    }
-
-    /*
-     * Create the do_pc2 table used
-     * to affect pc2 permutation when
-     * generating keys
-     */
-    for(bit = 0; bit < 48; bit++) {
-      comes_from_bit  = pc2[bit] - 1;
-      mask1 = bytemask[comes_from_bit % 7 + 1];
-      mask2 = BITMASK(bit % 24);
-      for(j = 0; j < 128; j++) {
-    if(j & mask1)
-      do_pc2[comes_from_bit / 7][j] |= mask2;
-      }
-    }
-
-    /* 
-     * Now generate the table used to do combined
-     * 32 bit permutation and e expansion
-     *
-     * We use it because we have to permute 16384 32 bit
-     * longs into 48 bit in order to initialize sb.
-     *
-     * Looping 48 rounds per permutation becomes 
-     * just too slow...
-     *
-     */
-
-    clearmem((char*)eperm32tab, sizeof(eperm32tab));
-
-    for(bit = 0; bit < 48; bit++) {
-      ufc_long mask1,comes_from;
-    
-      comes_from = perm32[esel[bit]-1]-1;
-      mask1      = bytemask[comes_from % 8];
-    
-      for(j = 256; j--;) {
-    if(j & mask1)
-      eperm32tab[comes_from / 8][j][bit / 24] |= BITMASK(bit % 24);
-      }
-    }
-    
-    /* 
-     * Create the sb tables:
-     *
-     * For each 12 bit segment of an 48 bit intermediate
-     * result, the sb table precomputes the two 4 bit
-     * values of the sbox lookups done with the two 6
-     * bit halves, shifts them to their proper place,
-     * sends them through perm32 and finally E expands
-     * them so that they are ready for the next
-     * DES round.
-     *
-     */
-    for(sg = 0; sg < 4; sg++) {
-      int j1, j2;
-      int s1, s2;
-    
-      for(j1 = 0; j1 < 64; j1++) {
-    s1 = s_lookup(2 * sg, j1);
-    for(j2 = 0; j2 < 64; j2++) {
-      ufc_long to_permute, inx;
-    
-      s2         = s_lookup(2 * sg + 1, j2);
-      to_permute = (((ufc_long)s1 << 4)  | 
-                   (ufc_long)s2) << (24 - 8 * (ufc_long)sg);
-
-#ifdef _UFC_32_
-      inx = ((j1 << 6)  | j2) << 1;
-      sb[sg][inx  ]  = eperm32tab[0][(to_permute >> 24) & 0xff][0];
-      sb[sg][inx+1]  = eperm32tab[0][(to_permute >> 24) & 0xff][1];
-      sb[sg][inx  ] |= eperm32tab[1][(to_permute >> 16) & 0xff][0];
-      sb[sg][inx+1] |= eperm32tab[1][(to_permute >> 16) & 0xff][1];
-      sb[sg][inx  ] |= eperm32tab[2][(to_permute >>  8) & 0xff][0];
-      sb[sg][inx+1] |= eperm32tab[2][(to_permute >>  8) & 0xff][1];
-      sb[sg][inx  ] |= eperm32tab[3][(to_permute)       & 0xff][0];
-      sb[sg][inx+1] |= eperm32tab[3][(to_permute)       & 0xff][1];
-#endif
-#ifdef _UFC_64_
-      inx = ((j1 << 6)  | j2);
-      sb[sg][inx]  = 
-        ((long64)eperm32tab[0][(to_permute >> 24) & 0xff][0] << 32) |
-         (long64)eperm32tab[0][(to_permute >> 24) & 0xff][1];
-      sb[sg][inx] |=
-        ((long64)eperm32tab[1][(to_permute >> 16) & 0xff][0] << 32) |
-         (long64)eperm32tab[1][(to_permute >> 16) & 0xff][1];
-      sb[sg][inx] |= 
-        ((long64)eperm32tab[2][(to_permute >>  8) & 0xff][0] << 32) |
-         (long64)eperm32tab[2][(to_permute >>  8) & 0xff][1];
-      sb[sg][inx] |=
-        ((long64)eperm32tab[3][(to_permute)       & 0xff][0] << 32) |
-         (long64)eperm32tab[3][(to_permute)       & 0xff][1];
-#endif
-    }
-      }
-    }  
-
-    /* 
-     * Create an inverse matrix for esel telling
-     * where to plug out bits if undoing it
-     */
-    for(bit=48; bit--;) {
-      e_inverse[esel[bit] - 1     ] = bit;
-      e_inverse[esel[bit] - 1 + 32] = bit + 48;
-    }
-
-    /* 
-     * create efp: the matrix used to
-     * undo the E expansion and effect final permutation
-     */
-    clearmem((char*)efp, sizeof efp);
-    for(bit = 0; bit < 64; bit++) {
-      int o_bit, o_long;
-      ufc_long word_value, mask1, mask2;
-      int comes_from_f_bit, comes_from_e_bit;
-      int comes_from_word, bit_within_word;
-
-      /* See where bit i belongs in the two 32 bit long's */
-      o_long = bit / 32; /* 0..1  */
-      o_bit  = bit % 32; /* 0..31 */
-
-      /* 
-       * And find a bit in the e permutated value setting this bit.
-       *
-       * Note: the e selection may have selected the same bit several
-       * times. By the initialization of e_inverse, we only look
-       * for one specific instance.
-       */
-      comes_from_f_bit = final_perm[bit] - 1;         /* 0..63 */
-      comes_from_e_bit = e_inverse[comes_from_f_bit]; /* 0..95 */
-      comes_from_word  = comes_from_e_bit / 6;        /* 0..15 */
-      bit_within_word  = comes_from_e_bit % 6;        /* 0..5  */
-
-      mask1 = longmask[bit_within_word + 26];
-      mask2 = longmask[o_bit];
-
-      for(word_value = 64; word_value--;) {
-    if(word_value & mask1)
-      efp[comes_from_word][word_value][o_long] |= mask2;
-      }
-    }
-
-    
-    /*
-     * Create revfinal: an array to undo final
-     * the effects of efp
-     */
-    clearmem((char*)revfinal, sizeof(revfinal));
-    for(bit = 0; bit < 96; bit++) {
-      int ibit = initial_perm[esel[bit % 48] - 1 + ((bit >= 48) ? 32 : 0)] - 1;
-      mask1 = bytemask[ibit % 6 +  2];
-      mask2 = BITMASK(bit % 24);
-      for(j = 64; j--;) {
-        if(j & mask1) {
-          revfinal[ibit / 6][j][bit / 24] |= mask2;
-        }
-      }
-    }
-
-    initialized++;
-  }
-
-/* 
- * Process the elements of the sb table permuting the
- * bits swapped in the expansion by the current salt.
- */
-
-#ifdef _UFC_32_
-STATIC void shuffle_sb(k, saltbits)
-  long32 *k;
-  ufc_long saltbits;
-  { ufc_long j;
-    long32 x;
-    for(j=4096; j--;) {
-      x = (k[0] ^ k[1]) & (long32)saltbits;
-      *k++ ^= x;
-      *k++ ^= x;
-    }
-  }
-#endif
-
-#ifdef _UFC_64_
-STATIC void shuffle_sb(k, saltbits)
-  long64 *k;
-  ufc_long saltbits;
-  { ufc_long j;
-    long64 x;
-    for(j=4096; j--;) {
-      x = ((*k >> 32) ^ *k) & (long64)saltbits;
-      *k++ ^= (x << 32) | x;
-    }
-  }
-#endif
-
-/* 
- * Setup the unit for a new salt
- * Hopefully we'll not see a new salt in each crypt call.
- */
-
-static unsigned char current_salt[3] = "&&"; /* invalid value */
-static ufc_long current_saltbits = 0;
-static int direction = 0;
-
-STATIC void setup_salt(s)
-  char *s;
-  { ufc_long i, j, saltbits;
-
-    if(!initialized)
-      init_des();
-
-    if(s[0] == current_salt[0] && s[1] == current_salt[1])
-      return;
-    current_salt[0] = s[0]; current_salt[1] = s[1];
-    
-    /* 
-     * This is the only crypt change to DES:
-     * entries are swapped in the expansion table
-     * according to the bits set in the salt.
-     */
-    saltbits = 0;
-    for(i = 0; i < 2; i++) {
-      long c=ascii_to_bin(s[i]);
-#ifdef notdef
-      /* 
-       * Some applications do rely on illegal
-       * salts. It seems that UFC-crypt behaves
-       * identically to standard crypt 
-       * implementations on illegal salts -- glad
-       */
-      if(c < 0 || c > 63)
-    c = 0;
-#endif
-      for(j = 0; j < 6; j++) {
-    if((c >> j) & 0x1)
-      saltbits |= BITMASK(6 * i + j);
-      }
-    }
-
-    /*
-     * Permute the sb table values
-     * to reflect the changed e
-     * selection table
-     */
-    shuffle_sb(_ufc_sb0, current_saltbits ^ saltbits); 
-    shuffle_sb(_ufc_sb1, current_saltbits ^ saltbits);
-    shuffle_sb(_ufc_sb2, current_saltbits ^ saltbits);
-    shuffle_sb(_ufc_sb3, current_saltbits ^ saltbits);
-
-    current_saltbits = saltbits;
-  }
-
-STATIC void ufc_mk_keytab(key)
-  char *key;
-  { ufc_long v1, v2, *k1;
-    int i;
-#ifdef _UFC_32_
-    long32 v, *k2 = &_ufc_keytab[0][0];
-#endif
-#ifdef _UFC_64_
-    long64 v, *k2 = &_ufc_keytab[0];
-#endif
-
-    v1 = v2 = 0; k1 = &do_pc1[0][0][0];
-    for(i = 8; i--;) {
-      v1 |= k1[*key   & 0x7f]; k1 += 128;
-      v2 |= k1[*key++ & 0x7f]; k1 += 128;
-    }
-
-    for(i = 0; i < 16; i++) {
-      k1 = &do_pc2[0][0];
-
-      v1 = (v1 << rots[i]) | (v1 >> (28 - rots[i]));
-      v  = k1[(v1 >> 21) & 0x7f]; k1 += 128;
-      v |= k1[(v1 >> 14) & 0x7f]; k1 += 128;
-      v |= k1[(v1 >>  7) & 0x7f]; k1 += 128;
-      v |= k1[(v1      ) & 0x7f]; k1 += 128;
-
-#ifdef _UFC_32_
-      *k2++ = v;
-      v = 0;
-#endif
-#ifdef _UFC_64_
-      v <<= 32;
-#endif
-
-      v2 = (v2 << rots[i]) | (v2 >> (28 - rots[i]));
-      v |= k1[(v2 >> 21) & 0x7f]; k1 += 128;
-      v |= k1[(v2 >> 14) & 0x7f]; k1 += 128;
-      v |= k1[(v2 >>  7) & 0x7f]; k1 += 128;
-      v |= k1[(v2      ) & 0x7f];
-
-      *k2++ = v;
-    }
-
-    direction = 0;
-  }
-
-/* 
- * Undo an extra E selection and do final permutations
- */
-
-ufc_long *_ufc_dofinalperm(l1, l2, r1, r2)
-  ufc_long l1,l2,r1,r2;
-  { ufc_long v1, v2, x;
-    static ufc_long ary[2];
-
-    x = (l1 ^ l2) & current_saltbits; l1 ^= x; l2 ^= x;
-    x = (r1 ^ r2) & current_saltbits; r1 ^= x; r2 ^= x;
-
-    v1=v2=0; l1 >>= 3; l2 >>= 3; r1 >>= 3; r2 >>= 3;
-
-    v1 |= efp[15][ r2         & 0x3f][0]; v2 |= efp[15][ r2 & 0x3f][1];
-    v1 |= efp[14][(r2 >>= 6)  & 0x3f][0]; v2 |= efp[14][ r2 & 0x3f][1];
-    v1 |= efp[13][(r2 >>= 10) & 0x3f][0]; v2 |= efp[13][ r2 & 0x3f][1];
-    v1 |= efp[12][(r2 >>= 6)  & 0x3f][0]; v2 |= efp[12][ r2 & 0x3f][1];
-
-    v1 |= efp[11][ r1         & 0x3f][0]; v2 |= efp[11][ r1 & 0x3f][1];
-    v1 |= efp[10][(r1 >>= 6)  & 0x3f][0]; v2 |= efp[10][ r1 & 0x3f][1];
-    v1 |= efp[ 9][(r1 >>= 10) & 0x3f][0]; v2 |= efp[ 9][ r1 & 0x3f][1];
-    v1 |= efp[ 8][(r1 >>= 6)  & 0x3f][0]; v2 |= efp[ 8][ r1 & 0x3f][1];
-
-    v1 |= efp[ 7][ l2         & 0x3f][0]; v2 |= efp[ 7][ l2 & 0x3f][1];
-    v1 |= efp[ 6][(l2 >>= 6)  & 0x3f][0]; v2 |= efp[ 6][ l2 & 0x3f][1];
-    v1 |= efp[ 5][(l2 >>= 10) & 0x3f][0]; v2 |= efp[ 5][ l2 & 0x3f][1];
-    v1 |= efp[ 4][(l2 >>= 6)  & 0x3f][0]; v2 |= efp[ 4][ l2 & 0x3f][1];
-
-    v1 |= efp[ 3][ l1         & 0x3f][0]; v2 |= efp[ 3][ l1 & 0x3f][1];
-    v1 |= efp[ 2][(l1 >>= 6)  & 0x3f][0]; v2 |= efp[ 2][ l1 & 0x3f][1];
-    v1 |= efp[ 1][(l1 >>= 10) & 0x3f][0]; v2 |= efp[ 1][ l1 & 0x3f][1];
-    v1 |= efp[ 0][(l1 >>= 6)  & 0x3f][0]; v2 |= efp[ 0][ l1 & 0x3f][1];
-
-    ary[0] = v1; ary[1] = v2;
-    return ary;
-  }
-
-/* 
- * crypt only: convert from 64 bit to 11 bit ASCII 
- * prefixing with the salt
- */
-
-STATIC char *output_conversion(v1, v2, salt)
-  ufc_long v1, v2;
-  char *salt;
-  { static char outbuf[14];
-    int i, s, shf;
-
-    outbuf[0] = salt[0];
-    outbuf[1] = salt[1] ? salt[1] : salt[0];
-
-    for(i = 0; i < 5; i++) {
-      shf = (26 - 6 * i); /* to cope with MSC compiler bug */
-      outbuf[i + 2] = bin_to_ascii((v1 >> shf) & 0x3f);
-    }
-
-    s  = (v2 & 0xf) << 2;
-    v2 = (v2 >> 2) | ((v1 & 0x3) << 30);
-
-    for(i = 5; i < 10; i++) {
-      shf = (56 - 6 * i);
-      outbuf[i + 2] = bin_to_ascii((v2 >> shf) & 0x3f);
-    }
-
-    outbuf[12] = bin_to_ascii(s);
-    outbuf[13] = 0;
-
-    return outbuf;
-  }
-
-ufc_long *_ufc_doit();
-
-/* 
- * UNIX crypt function
- */
-   
-char *crypt(key, salt)
-  char *key, *salt;
-  { ufc_long *s;
-    char ktab[9];
-
-    /*
-     * Hack DES tables according to salt
-     */
-    setup_salt(salt);
-
-    /*
-     * Setup key schedule
-     */
-    clearmem(ktab, sizeof ktab);
-    (void)strncpy(ktab, key, 8);
-    ufc_mk_keytab(ktab);
-
-    /*
-     * Go for the 25 DES encryptions
-     */
-    s = _ufc_doit((ufc_long)0, (ufc_long)0, 
-          (ufc_long)0, (ufc_long)0, (ufc_long)25);
-    /*
-     * Do final permutations
-     */
-    s = _ufc_dofinalperm(s[0], s[1], s[2], s[3]);
-
-    /*
-     * And convert back to 6 bit ASCII
-     */
-    return output_conversion(s[0], s[1], salt);
-  }
-
-/* 
- * To make fcrypt users happy.
- * They don't need to call init_des.
- */
-
-char *fcrypt(key, salt)
-  char *key;
-  char *salt;
-  { return crypt(key, salt);
-  }
-
-/* 
- * UNIX encrypt function. Takes a bitvector
- * represented by one byte per bit and
- * encrypt/decrypt according to edflag
- */
-
-void encrypt(block, edflag)
-  char *block;
-  int edflag;
-  { ufc_long l1, l2, r1, r2, *s;
-    int i;
-
-    /*
-     * Undo any salt changes to E expansion
-     */
-    setup_salt("..");
-
-    /*
-     * Reverse key table if
-     * changing operation (encrypt/decrypt)
-     */
-    if((edflag == 0) != (direction == 0)) {
-      for(i = 0; i < 8; i++) {
-#ifdef _UFC_32_
-    long32 x;
-    x = _ufc_keytab[15-i][0]; 
-        _ufc_keytab[15-i][0] = _ufc_keytab[i][0]; 
-        _ufc_keytab[i][0] = x;
-
-    x = _ufc_keytab[15-i][1]; 
-        _ufc_keytab[15-i][1] = _ufc_keytab[i][1]; 
-        _ufc_keytab[i][1] = x;
-#endif
-#ifdef _UFC_64_
-    long64 x;
-    x = _ufc_keytab[15-i];
-    _ufc_keytab[15-i] = _ufc_keytab[i];
-    _ufc_keytab[i] = x;
-#endif
-      }
-      direction = edflag;
-    }
-
-    /*
-     * Do initial permutation + E expansion
-     */
-    i = 0;
-    for(l1 = 0; i < 24; i++) {
-      if(block[initial_perm[esel[i]-1]-1])
-    l1 |= BITMASK(i);
-    }
-    for(l2 = 0; i < 48; i++) {
-      if(block[initial_perm[esel[i]-1]-1])
-    l2 |= BITMASK(i-24);
-    }
-
-    i = 0;
-    for(r1 = 0; i < 24; i++) {
-      if(block[initial_perm[esel[i]-1+32]-1])
-    r1 |= BITMASK(i);
-    }
-    for(r2 = 0; i < 48; i++) {
-      if(block[initial_perm[esel[i]-1+32]-1])
-    r2 |= BITMASK(i-24);
-    }
-
-    /*
-     * Do DES inner loops + final conversion
-     */
-    s = _ufc_doit(l1, l2, r1, r2, (ufc_long)1);
-    /*
-     * Do final permutations
-     */
-    s = _ufc_dofinalperm(s[0], s[1], s[2], s[3]);
-
-    /*
-     * And convert to bit array
-     */
-    l1 = s[0]; r1 = s[1];
-    for(i = 0; i < 32; i++) {
-      *block++ = (l1 & longmask[i]) != 0;
-    }
-    for(i = 0; i < 32; i++) {
-      *block++ = (r1 & longmask[i]) != 0;
-    }
-    
-  }
-
-/* 
- * UNIX setkey function. Take a 64 bit DES
- * key and setup the machinery.
- */
-
-void setkey(key)
-  char *key;
-  { int i,j;
-    unsigned char c;
-    unsigned char ktab[8];
-
-    setup_salt(".."); /* be sure we're initialized */
-
-    for(i = 0; i < 8; i++) {
-      for(j = 0, c = 0; j < 8; j++)
-    c = c << 1 | *key++;
-      ktab[i] = c >> 1;
-    }
-    
-    ufc_mk_keytab(ktab);
-  }
-
-/* 
- * Ultrix crypt16 function, thanks to pcl@convex.oxford.ac.uk (Paul Leyland)
- */
-   
-char *crypt16(key, salt)
-  char *key, *salt;
-  { ufc_long *s, *t;
-    char ktab[9], ttab[9];
-    static char q[14], res[25];
-    /*
-     * Hack DES tables according to salt
-     */
-    setup_salt(salt);
-    
-    /*
-     * Setup key schedule
-     */
-    clearmem(ktab, sizeof ktab);
-    (void)strncpy(ktab, key, 8);
-    ufc_mk_keytab(ktab);
-    
-    /*
-     * Go for first 20 DES encryptions
-     */
-    s = _ufc_doit((ufc_long)0, (ufc_long)0, 
-          (ufc_long)0, (ufc_long)0, (ufc_long)20);
-    
-    /*
-     * And convert back to 6 bit ASCII
-     */
-    strcpy (res, output_conversion(s[0], s[1], salt));
-    
-    clearmem(ttab, sizeof ttab);
-    if (strlen (key) > 8) (void)strncpy(ttab, key+8, 8);
-    ufc_mk_keytab(ttab);
-    
-    /*
-     * Go for second 5 DES encryptions
-     */
-    t = _ufc_doit((ufc_long)0, (ufc_long)0, 
-          (ufc_long)0, (ufc_long)0, (ufc_long)5);
-    /*
-     * And convert back to 6 bit ASCII
-     */
-    strcpy (q, output_conversion(t[0], t[1], salt));
-    strcpy (res+13, q+2);
-    
-    clearmem(ktab, sizeof ktab);
-    (void)strncpy(ktab, key, 8);
-    ufc_mk_keytab(ktab);
-    
-    return res;
-  }
-
-/*
- * Experimental -- not supported -- may choke your dog
- */
-
-void ufc_setup_password(cookie, s)
-  long *cookie;
-  char *s;
-  { char c;
-    int i;
-    ufc_long x;
-    ufc_long dl1, dl2, dr1, dr2;
-
-    setup_salt(s);
-    dl1 = dl2 = dr1 = dr2 = 0;
-    for(i = 0, s += 2; c = *s++; i++) {
-      int x = ascii_to_bin(c);
-      dl1 |= revfinal[i][x][0];
-      dl2 |= revfinal[i][x][1];
-      dr1 |= revfinal[i][x][2];
-      dr2 |= revfinal[i][x][3];
-    }
-    x = (dl1 ^ dl2) & current_saltbits;
-    x = (dr1 ^ dr2) & current_saltbits;
-    cookie[0] = dl1 ^ x; cookie[1] = dl2 ^ x;
-    cookie[2] = dr1 ^ x; cookie[3] = dr2 ^ x;
-  }
-
-void ufc_do_pw(cookie, guess)
-  long *cookie;  
-  char *guess;
-  { char ktab[9];
-    ufc_long *s;
-    clearmem(ktab, sizeof ktab);
-    (void)strncpy(ktab, guess, 8);
-    ufc_mk_keytab(ktab);
-    s = _ufc_doit((ufc_long)0, (ufc_long)0, 
-          (ufc_long)0, (ufc_long)0, (ufc_long)25);
-    cookie[0] = s[0];    cookie[1] = s[1];
-    cookie[2] = s[2];    cookie[3] = s[3];
-  }

new file src/system/libroot/posix/crypt/crypto_scrypt.cpp

@@ +1 @@
+/*-
+ * 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 <errno.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "pbkdf2.h"
+
+#include "crypto_scrypt_smix.h"
+
+#include "crypto_scrypt.h"
+
+static void (*smix_func)(uint8_t *, size_t, uint64_t, void *, void *) = NULL;
+
+/**
+ * _crypto_scrypt(passwd, passwdlen, salt, saltlen, N, r, p, buf, buflen, smix):
+ * Perform the requested scrypt computation, using ${smix} as the smix routine.
+ */
+static 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 (*smix)(uint8_t *, size_t, uint64_t, void *, void *))
+{
+    void * B0, * V0, * XY0;
+    uint8_t * B;
+    uint32_t * V;
+    uint32_t * XY;
+    size_t r = _r, p = _p;
+    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 < 2)) {
+        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);
+#if !defined(MAP_ANON) || !defined(HAVE_MMAP)
+    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));
+#if !defined(MAP_ANON) || !defined(HAVE_MMAP)
+    if ((V0 = malloc(128 * r * N + 63)) == NULL)
+        goto err2;
+    V = (uint32_t *)(((uintptr_t)(V0) + 63) & ~ (uintptr_t)(63));
+#endif
+#endif
+#if defined(MAP_ANON) && defined(HAVE_MMAP)
+    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. */
+#if defined(MAP_ANON) && defined(HAVE_MMAP)
+    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);
+}
+
+#define TESTLEN 64
+static struct scrypt_test {
+    const char * passwd;
+    const char * salt;
+    uint64_t N;
+    uint32_t r;
+    uint32_t p;
+    uint8_t result[TESTLEN];
+} testcase = {
+    "pleaseletmein",
+    "SodiumChloride",
+    16,
+    8,
+    1,
+    {
+        0x25, 0xa9, 0xfa, 0x20, 0x7f, 0x87, 0xca, 0x09,
+        0xa4, 0xef, 0x8b, 0x9f, 0x77, 0x7a, 0xca, 0x16,
+        0xbe, 0xb7, 0x84, 0xae, 0x18, 0x30, 0xbf, 0xbf,
+        0xd3, 0x83, 0x25, 0xaa, 0xbb, 0x93, 0x77, 0xdf,
+        0x1b, 0xa7, 0x84, 0xd7, 0x46, 0xea, 0x27, 0x3b,
+        0xf5, 0x16, 0xa4, 0x6f, 0xbf, 0xac, 0xf5, 0x11,
+        0xc5, 0xbe, 0xba, 0x4c, 0x4a, 0xb3, 0xac, 0xc7,
+        0xfa, 0x6f, 0x46, 0x0b, 0x6c, 0x0f, 0x47, 0x7b,
+    }
+};
+
+static int
+testsmix(void (*smix)(uint8_t *, size_t, uint64_t, void *, void *))
+{
+    uint8_t hbuf[TESTLEN];
+
+    /* Perform the computation. */
+    if (_crypto_scrypt(
+        (const uint8_t *)testcase.passwd, strlen(testcase.passwd),
+        (const uint8_t *)testcase.salt, strlen(testcase.salt),
+        testcase.N, testcase.r, testcase.p, hbuf, TESTLEN, smix))
+        return (-1);
+
+    /* Does it match? */
+    return (memcmp(testcase.result, hbuf, TESTLEN));
+}
+
+static void
+selectsmix(void)
+{
+    /* If generic smix works, use it. */
+    if (!testsmix(crypto_scrypt_smix)) {
+        smix_func = crypto_scrypt_smix;
+        return;
+    }
+
+    /* If we get here, something really bad happened. */
+    abort();
+}
+
+/**
+ * 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)
+{
+
+    if (smix_func == NULL)
+        selectsmix();
+
+    return (_crypto_scrypt(passwd, passwdlen, salt, saltlen, N, _r, _p,
+        buf, buflen, smix_func));
+}

new file src/system/libroot/posix/crypt/crypto_scrypt.h

@@ +1 @@
+/*-
+ * 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 <unistd.h>
+
+/**
+ * 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_ */

new file src/system/libroot/posix/crypt/crypto_scrypt_smix.cpp

@@ +1 @@
+/*-
+ * 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 <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <ByteOrder.h>
+#include "pbkdf2.h"
+#include "crypto_scrypt_smix.h"
+
+static void blkcpy(void *, const void *, size_t);
+static void blkxor(void *, const void *, size_t);
+static void salsa20_8(uint32_t[16]);
+static void blockmix_salsa8(const uint32_t *, uint32_t *, uint32_t *, size_t);
+static uint64_t integerify(const void *, size_t);
+
+static void
+blkcpy(void * dest, const void * src, size_t len)
+{
+    size_t * D = (size_t *)dest;
+    const size_t * S = (const size_t *)src;
+    size_t L = len / sizeof(size_t);
+    size_t i;
+
+    for (i = 0; i < L; i++)
+        D[i] = S[i];
+}
+
+static void
+blkxor(void * dest, const void * src, size_t len)
+{
+    size_t * D = (size_t *)dest;
+    const size_t * S = (const size_t *)src;
+    size_t L = len / sizeof(size_t);
+    size_t i;
+
+    for (i = 0; i < L; i++)
+        D[i] ^= S[i];
+}
+
+/**
+ * salsa20_8(B):
+ * Apply the salsa20/8 core to the provided block.
+ */
+static void
+salsa20_8(uint32_t B[16])
+{
+    uint32_t x[16];
+    size_t i;
+
+    blkcpy(x, B, 64);
+    for (i = 0; i < 8; i += 2) {
+#define R(a,b) (((a) << (b)) | ((a) >> (32 - (b))))
+        /* Operate on columns. */
+        x[ 4] ^= R(x[ 0]+x[12], 7);  x[ 8] ^= R(x[ 4]+x[ 0], 9);
+        x[12] ^= R(x[ 8]+x[ 4],13);  x[ 0] ^= R(x[12]+x[ 8],18);
+
+        x[ 9] ^= R(x[ 5]+x[ 1], 7);  x[13] ^= R(x[ 9]+x[ 5], 9);
+        x[ 1] ^= R(x[13]+x[ 9],13);  x[ 5] ^= R(x[ 1]+x[13],18);
+
+        x[14] ^= R(x[10]+x[ 6], 7);  x[ 2] ^= R(x[14]+x[10], 9);
+        x[ 6] ^= R(x[ 2]+x[14],13);  x[10] ^= R(x[ 6]+x[ 2],18);
+
+        x[ 3] ^= R(x[15]+x[11], 7);  x[ 7] ^= R(x[ 3]+x[15], 9);
+        x[11] ^= R(x[ 7]+x[ 3],13);  x[15] ^= R(x[11]+x[ 7],18);
+
+        /* Operate on rows. */
+        x[ 1] ^= R(x[ 0]+x[ 3], 7);  x[ 2] ^= R(x[ 1]+x[ 0], 9);
+        x[ 3] ^= R(x[ 2]+x[ 1],13);  x[ 0] ^= R(x[ 3]+x[ 2],18);
+
+        x[ 6] ^= R(x[ 5]+x[ 4], 7);  x[ 7] ^= R(x[ 6]+x[ 5], 9);
+        x[ 4] ^= R(x[ 7]+x[ 6],13);  x[ 5] ^= R(x[ 4]+x[ 7],18);
+
+        x[11] ^= R(x[10]+x[ 9], 7);  x[ 8] ^= R(x[11]+x[10], 9);
+        x[ 9] ^= R(x[ 8]+x[11],13);  x[10] ^= R(x[ 9]+x[ 8],18);
+
+        x[12] ^= R(x[15]+x[14], 7);  x[13] ^= R(x[12]+x[15], 9);
+        x[14] ^= R(x[13]+x[12],13);  x[15] ^= R(x[14]+x[13],18);
+#undef R
+    }
+    for (i = 0; i < 16; i++)
+        B[i] += x[i];
+}
+
+/**
+ * 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(const uint32_t * Bin, uint32_t * Bout, uint32_t * X, size_t r)
+{
+    size_t i;
+
+    /* 1: X <-- B_{2r - 1} */
+    blkcpy(X, &Bin[(2 * r - 1) * 16], 64);
+
+    /* 2: for i = 0 to 2r - 1 do */
+    for (i = 0; i < 2 * r; i += 2) {
+        /* 3: X <-- H(X \xor B_i) */
+        blkxor(X, &Bin[i * 16], 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 * 8], X, 64);
+
+        /* 3: X <-- H(X \xor B_i) */
+        blkxor(X, &Bin[i * 16 + 16], 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 * 8 + r * 16], X, 64);
+    }
+}
+
+/**
+ * integerify(B, r):
+ * Return the result of parsing B_{2r-1} as a little-endian integer.
+ */
+static uint64_t
+integerify(const void * B, size_t r)
+{
+    const uint32_t * X = (const uint32_t *)((uintptr_t)(B) + (2 * r - 1) * 64);
+
+    return (((uint64_t)(X[1]) << 32) + X[0]);
+}
+
+/**
+ * crypto_scrypt_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
+crypto_scrypt_smix(uint8_t * B, size_t r, uint64_t N, void * _V, void * XY)
+{
+    uint32_t * X = (uint32_t *)XY;
+    uint32_t * Y = (uint32_t *)((uint8_t *)(XY) + 128 * r);
+    uint32_t * Z = (uint32_t *)((uint8_t *)(XY) + 256 * r);
+    uint32_t * V = (uint32_t *)_V;
+    uint64_t i;
+    uint64_t j;
+    size_t k;
+
+    /* 1: X <-- B */
+    for (k = 0; k < 32 * r; k++) {
+        X[k] = B_LENDIAN_TO_HOST_INT32(((uint32_t*)B)[k]);
+    }
+
+    /* 2: for i = 0 to N - 1 do */
+    for (i = 0; i < N; i += 2) {
+        /* 3: V_i <-- X */
+        blkcpy(&V[i * (32 * r)], X, 128 * r);
+
+        /* 4: X <-- H(X) */
+        blockmix_salsa8(X, Y, Z, r);
+
+        /* 3: V_i <-- X */
+        blkcpy(&V[(i + 1) * (32 * 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, &V[j * (32 * 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, &V[j * (32 * r)], 128 * r);
+        blockmix_salsa8(Y, X, Z, r);
+    }
+
+    /* 10: B' <-- X */
+    for (k = 0; k < 32 * r; k++) {
+        uint32_t* B32 = &(reinterpret_cast<uint32_t*>(B)[k]);
+        *B32 = B_HOST_TO_LENDIAN_INT32(X[k]);
+    }
+}

new file src/system/libroot/posix/crypt/crypto_scrypt_smix.h

@@ +1 @@
+/*-
+ * 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_SMIX_H_
+#define _CRYPTO_SCRYPT_SMIX_H_
+
+/**
+ * crypto_scrypt_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 crypto_scrypt_smix(uint8_t *, size_t, uint64_t, void *, void *);
+
+#endif /* !_CRYPTO_SCRYPT_SMIX_H_ */

new file src/system/libroot/posix/crypt/pbkdf2.cpp

@@ +1 @@
+/* This file is distributed under the following terms:
+
+ * Copyright 2005-2014 Colin Percival.  All rights reserved.
+ * Copyright 2014 Sean Kelly.  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 <assert.h>
+#include <stdint.h>
+#include <string.h>
+#include <ByteOrder.h>
+#include "pbkdf2.h"
+
+/* Function which does the zeroing. */
+static void
+insecure_memzero_func(volatile void * buf, size_t len)
+{
+    volatile uint8_t * _buf = (volatile uint8_t *)buf;
+    size_t i;
+
+    for (i = 0; i < len; i++)
+        _buf[i] = 0;
+}
+
+/* Pointer to memory-zeroing function. */
+void (* volatile insecure_memzero_ptr)(volatile void *, size_t) =
+    insecure_memzero_func;
+
+/**
+ * HMAC_SHA256_Init(ctx, K, Klen):
+ * Initialize the HMAC-SHA256 context ${ctx} with ${Klen} bytes of key from
+ * ${K}.
+ */
+void
+HMAC_SHA256_Init(HMAC_SHA256_CTX * ctx, const void * _K, size_t Klen)
+{
+    uint8_t pad[64];
+    uint8_t khash[32];
+    const uint8_t * K = (const uint8_t *)_K;
+    size_t i;
+
+    /* If Klen > 64, the key is really SHA256(K). */
+    if (Klen > 64) {
+        ctx->ictx.Init();
+        ctx->ictx.Update(K, Klen);
+        memcpy(khash, ctx->ictx.Digest(), 32);
+        K = khash;
+        Klen = 32;
+    }
+
+    /* Inner SHA256 operation is SHA256(K xor [block of 0x36] || data). */
+    ctx->ictx.Init();
+    memset(pad, 0x36, 64);
+    for (i = 0; i < Klen; i++)
+        pad[i] ^= K[i];
+    ctx->ictx.Update(pad, 64);
+
+    /* Outer SHA256 operation is SHA256(K xor [block of 0x5c] || hash). */
+    ctx->octx.Init();
+    memset(pad, 0x5c, 64);
+    for (i = 0; i < Klen; i++)
+        pad[i] ^= K[i];
+    ctx->octx.Update(pad, 64);
+
+    /* Clean the stack. */
+    insecure_memzero(khash, 32);
+    insecure_memzero(pad, 64);
+}
+
+/**
+ * HMAC_SHA256_Update(ctx, in, len):
+ * Input ${len} bytes from ${in} into the HMAC-SHA256 context ${ctx}.
+ */
+void
+HMAC_SHA256_Update(HMAC_SHA256_CTX * ctx, const void * in, size_t len)
+{
+
+    /* Feed data to the inner SHA256 operation. */
+    ctx->ictx.Update(in, len);
+}
+
+/**
+ * HMAC_SHA256_Final(digest, ctx):
+ * Output the HMAC-SHA256 of the data input to the context ${ctx} into the
+ * buffer ${digest}.
+ */
+void
+HMAC_SHA256_Final(uint8_t digest[32], HMAC_SHA256_CTX * ctx)
+{
+    uint8_t ihash[32];
+
+    /* Finish the inner SHA256 operation. */
+    memcpy(ihash, ctx->ictx.Digest(), 32);
+
+    /* Feed the inner hash to the outer SHA256 operation. */
+    ctx->octx.Update(ihash, 32);
+
+    /* Finish the outer SHA256 operation. */
+    memcpy(digest, ctx->octx.Digest(), 32);
+
+    /* Clean the stack. */
+    insecure_memzero(ihash, 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;
+    uint32_t ivec;
+    uint8_t U[32];
+    uint8_t T[32];
+    uint64_t j;
+    int k;
+    size_t clen;
+
+    /* Sanity-check. */
+    assert(dkLen <= 32 * (size_t)(UINT32_MAX));
+
+    /* 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). */
+        ivec = B_HOST_TO_BENDIAN_INT32((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. */
+    insecure_memzero(&PShctx, sizeof(HMAC_SHA256_CTX));
+}

new file src/system/libroot/posix/crypt/pbkdf2.h

@@ +1 @@
+/* This file is distributed under the following terms:
+
+ * Copyright 2005-2014 Colin Percival.  All rights reserved.
+ * Copyright 2014 Sean Kelly.  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.
+ */
+
+#ifndef _SHA256_H_
+#define _SHA256_H_
+
+#include <stddef.h>
+#include <stdint.h>
+#include <SHA256.h>
+
+/* Pointer to memory-zeroing function. */
+extern void (* volatile insecure_memzero_ptr)(volatile void *, size_t);
+
+/**
+ * insecure_memzero(buf, len):
+ * Attempt to zero ${len} bytes at ${buf} in spite of optimizing compilers'
+ * best (standards-compliant) attempts to remove the buffer-zeroing.  In
+ * particular, to avoid performing the zeroing, a compiler would need to
+ * use optimistic devirtualization; recognize that non-volatile objects do not
+ * need to be treated as volatile, even if they are accessed via volatile
+ * qualified pointers; and perform link-time optimization; in addition to the
+ * dead-code elimination which often causes buffer-zeroing to be elided.
+ *
+ * Note however that zeroing a buffer does not guarantee that the data held
+ * in the buffer is not stored elsewhere; in particular, there may be copies
+ * held in CPU registers or in anonymous allocations on the stack, even if
+ * every named variable is successfully sanitized.  Solving the "wipe data
+ * from the system" problem will require a C language extension which does not
+ * yet exist.
+ *
+ * For more information, see:
+ * http://www.daemonology.net/blog/2014-09-04-how-to-zero-a-buffer.html
+ * http://www.daemonology.net/blog/2014-09-06-zeroing-buffers-is-insufficient.html
+ */
+static inline void
+insecure_memzero(volatile void * buf, size_t len)
+{
+
+    (insecure_memzero_ptr)(buf, len);
+}
+
+/* Context structure for SHA256 operations. */
+typedef struct {
+    uint32_t state[8];
+    uint64_t count;
+    uint8_t buf[64];
+} SHA256_CTX;
+
+/* Context structure for HMAC-SHA256 operations. */
+typedef struct {
+    SHA256 ictx;
+    SHA256 octx;
+} HMAC_SHA256_CTX;
+
+/**
+ * HMAC_SHA256_Init(ctx, K, Klen):
+ * Initialize the HMAC-SHA256 context ${ctx} with ${Klen} bytes of key from
+ * ${K}.
+ */
+void HMAC_SHA256_Init(HMAC_SHA256_CTX *, const void *, size_t);
+
+/**
+ * HMAC_SHA256_Update(ctx, in, len):
+ * Input ${len} bytes from ${in} into the HMAC-SHA256 context ${ctx}.
+ */
+void HMAC_SHA256_Update(HMAC_SHA256_CTX *, const void *, size_t);
+
+/**
+ * HMAC_SHA256_Final(digest, ctx):
+ * Output the HMAC-SHA256 of the data input to the context ${ctx} into the
+ * buffer ${digest}.
+ */
+void HMAC_SHA256_Final(uint8_t[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_ */

new file src/tests/system/libroot/posix/CryptTest.cpp

@@ +1 @@
+/*
+ * Copyright 2017, Haiku, Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ * Andrew Aldridge, i80and@foxquill.com
+ */
+
+
+#include <errno.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "CryptTest.h"
+
+#include <cppunit/TestCaller.h>
+#include <cppunit/TestSuite.h>
+
+
+#define PASSWORD "password"
+#define HASH_SALT "$s$12$101f2cf1a3b35aa671b8e006c6fb037e429d5b4ecb8dab16919097789e2d3a5f$ignorethis"
+#define HASH_RESULT "$s$12$101f2cf1a3b35aa671b8e006c6fb037e429d5b4ecb8dab16919097789e2d3a5f$4c5c886740871c447639e2dd5eeba004f22c0860ce88c811032ca6de6c95b23e"
+
+// This salt is only 31 bytes, while we need 32 bytes
+#define HASH_BAD_SALT "$s$12$101f2cf1a3b35aa671b8e006c6fb037e429d5b4ecb8dab16919097789e2d3a$ignorethis"
+
+
+CryptTest::CryptTest()
+{
+}
+
+
+CryptTest::~CryptTest()
+{
+}
+
+
+void
+CryptTest::setUp()
+{
+}
+
+
+void
+CryptTest::tearDown()
+{
+}
+
+
+void
+CryptTest::TestLegacy()
+{
+    char* buf = crypt(PASSWORD, "1d");
+    CPPUNIT_ASSERT(buf != NULL);
+    CPPUNIT_ASSERT(strcmp(buf, "1dVzQK99LSks6") == 0);
+}
+
+
+void
+CryptTest::TestCustomSalt()
+{
+    char* buf = crypt(PASSWORD, HASH_SALT);
+    CPPUNIT_ASSERT(buf != NULL);
+    CPPUNIT_ASSERT(strcmp(buf, HASH_RESULT) == 0);
+}
+
+
+void
+CryptTest::TestSaltGeneration()
+{
+    char tmp[200];
+    char* salt = crypt_gensalt(12);
+    CPPUNIT_ASSERT(salt != NULL);
+    CPPUNIT_ASSERT(strstr(salt, "12") == salt + 3);
+
+    char* buf = crypt(PASSWORD, salt);
+    CPPUNIT_ASSERT(buf != NULL);
+    strlcpy(tmp, buf, sizeof(tmp));
+    buf = crypt(PASSWORD, tmp);
+    CPPUNIT_ASSERT(strcmp(buf, tmp) == 0);
+}
+
+
+void
+CryptTest::TestBadSalt()
+{
+    errno = 0;
+    CPPUNIT_ASSERT(crypt(PASSWORD, HASH_BAD_SALT) == NULL);
+    CPPUNIT_ASSERT(errno == EINVAL);
+}
+
+
+void
+CryptTest::AddTests(BTestSuite& parent)
+{
+    CppUnit::TestSuite& suite = *new CppUnit::TestSuite("CryptTest");
+    suite.addTest(new CppUnit::TestCaller<CryptTest>(
+        "CryptTest::TestLegacy",
+        &CryptTest::TestLegacy));
+    suite.addTest(new CppUnit::TestCaller<CryptTest>(
+        "CryptTest::TestCustomSalt",
+        &CryptTest::TestCustomSalt));
+    suite.addTest(new CppUnit::TestCaller<CryptTest>(
+        "CryptTest::TestSaltGeneration",
+        &CryptTest::TestSaltGeneration));
+    suite.addTest(new CppUnit::TestCaller<CryptTest>(
+        "CryptTest::TestBadSalt",
+        &CryptTest::TestBadSalt));
+    parent.addTest("CryptTest", &suite);
+}

new file src/tests/system/libroot/posix/CryptTest.h

@@ +1 @@
+/*
+ * Copyright 2017, Haiku, Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ * Andrew Aldridge, i80and@foxquill.com
+ */
+
+
+#ifndef CRYPT_TEST_H
+#define CRYPT_TEST_H
+
+
+#include <TestCase.h>
+#include <TestSuite.h>
+
+
+class CryptTest : public CppUnit::TestCase {
+public:
+                CryptTest();
+    virtual         ~CryptTest();
+
+    virtual void        setUp();
+    virtual void        tearDown();
+
+        void        TestLegacy();
+        void        TestCustomSalt();
+        void        TestSaltGeneration();
+        void        TestBadSalt();
+
+    static  void        AddTests(BTestSuite& suite);
+};
+
+
+#endif  // CRYPT_TEST_H

src/tests/system/libroot/posix/Jamfile

@@ -73 +73 @@
 SimpleTest test_wctype : test_wctype.c ;
 SimpleTest wcs_test : wcs_test.cpp ;
 
+UnitTestLib librootposixtest.so :
+    LibRootPosix.cpp
+
+    CryptTest.cpp
+
+    : be [ TargetLibstdc++ ] [ TargetLibsupc++ ]
+;
 
 SubInclude HAIKU_TOP src tests system libroot posix math ;
 SubInclude HAIKU_TOP src tests system libroot posix string ;

new file src/tests/system/libroot/posix/LibRootPosix.cpp

@@ +1 @@
+/*
+ * Copyright 2017, Haiku, Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ * Andrew Aldridge, i80and@foxquill.com
+ */
+
+
+#include <TestSuite.h>
+#include <TestSuiteAddon.h>
+
+#include "CryptTest.h"
+
+
+BTestSuite*
+getTestSuite()
+{
+    BTestSuite* suite = new BTestSuite("LibRootPosix");
+    CryptTest::AddTests(*suite);
+    return suite;
+}