pam-unix-blowfish.patch

   1 diff -urN Linux-PAM-0.99.7.1.orig/modules/pam_unix/arc4random.c Linux-PAM-0.99.7.1/modules/pam_unix/arc4random.c
   2 --- Linux-PAM-0.99.7.1.orig/modules/pam_unix/arc4random.c       1970-01-01 01:00:00.000000000 +0100
   3 +++ Linux-PAM-0.99.7.1/modules/pam_unix/arc4random.c    2007-02-04 20:07:14.885603885 +0100
   4 @@ -0,0 +1,166 @@
   5 +/*
   6 + * Arc4 random number generator for OpenBSD.
   7 + * Copyright 1996 David Mazieres <dm@lcs.mit.edu>.
   8 + *
   9 + * Modification and redistribution in source and binary forms is
  10 + * permitted provided that due credit is given to the author and the
  11 + * OpenBSD project (for instance by leaving this copyright notice
  12 + * intact).
  13 + */
  14 +
  15 +/*
  16 + * This code is derived from section 17.1 of Applied Cryptography,
  17 + * second edition, which describes a stream cipher allegedly
  18 + * compatible with RSA Labs "RC4" cipher (the actual description of
  19 + * which is a trade secret).  The same algorithm is used as a stream
  20 + * cipher called "arcfour" in Tatu Ylonen's ssh package.
  21 + *
  22 + * Here the stream cipher has been modified always to include the time
  23 + * when initializing the state.  That makes it impossible to
  24 + * regenerate the same random sequence twice, so this can't be used
  25 + * for encryption, but will generate good random numbers.
  26 + *
  27 + * RC4 is a registered trademark of RSA Laboratories.
  28 + */
  29 +#include "config.h"
  30 +
  31 +#include <fcntl.h>
  32 +#include <stdlib.h>
  33 +#include <unistd.h>
  34 +#include <sys/types.h>
  35 +#include <sys/time.h>
  36 +
  37 +#ifdef __GNUC__
  38 +#define inline __inline
  39 +#else                          /* !__GNUC__ */
  40 +#define inline
  41 +#endif                         /* !__GNUC__ */
  42 +
  43 +struct arc4_stream {
  44 +       u_int8_t i;
  45 +       u_int8_t j;
  46 +       u_int8_t s[256];
  47 +};
  48 +
  49 +int     rs_initialized;
  50 +static struct arc4_stream rs;
  51 +
  52 +static inline void
  53 +arc4_init(struct arc4_stream *as)
  54 +{
  55 +       int     n;
  56 +
  57 +       for (n = 0; n < 256; n++)
  58 +               as->s[n] = n;
  59 +       as->i = 0;
  60 +       as->j = 0;
  61 +}
  62 +
  63 +static inline void
  64 +arc4_addrandom(struct arc4_stream *as, u_char *dat, int datlen)
  65 +{
  66 +       int     n;
  67 +       u_int8_t si;
  68 +
  69 +       as->i--;
  70 +       for (n = 0; n < 256; n++) {
  71 +               as->i = (as->i + 1);
  72 +               si = as->s[as->i];
  73 +               as->j = (as->j + si + dat[n % datlen]);
  74 +               as->s[as->i] = as->s[as->j];
  75 +               as->s[as->j] = si;
  76 +       }
  77 +}
  78 +
  79 +static void
  80 +arc4_stir(struct arc4_stream *as)
  81 +{
  82 +       int     fd;
  83 +       struct {
  84 +               struct timeval tv;
  85 +               u_int8_t rnd[128 - sizeof(struct timeval)];
  86 +       }       rdat;
  87 +
  88 +       gettimeofday(&rdat.tv, NULL);
  89 +       fd = open("/dev/random", O_RDONLY);
  90 +       if (fd >= 0) {
  91 +               read(fd, rdat.rnd, sizeof(rdat.rnd));
  92 +               close(fd);
  93 +       }
  94 +       /* fd < 0?  Ah, what the heck. We'll just take whatever was on the
  95 +        * stack... */
  96 +
  97 +       arc4_addrandom(as, (void *) &rdat, sizeof(rdat));
  98 +}
  99 +
 100 +static inline u_int8_t
 101 +arc4_getbyte(struct arc4_stream *as)
 102 +{
 103 +       u_int8_t si, sj;
 104 +
 105 +       as->i = (as->i + 1);
 106 +       si = as->s[as->i];
 107 +       as->j = (as->j + si);
 108 +       sj = as->s[as->j];
 109 +       as->s[as->i] = sj;
 110 +       as->s[as->j] = si;
 111 +       return (as->s[(si + sj) & 0xff]);
 112 +}
 113 +
 114 +static inline u_int32_t
 115 +arc4_getword(struct arc4_stream *as)
 116 +{
 117 +       u_int32_t val;
 118 +       val = arc4_getbyte(as) << 24;
 119 +       val |= arc4_getbyte(as) << 16;
 120 +       val |= arc4_getbyte(as) << 8;
 121 +       val |= arc4_getbyte(as);
 122 +       return val;
 123 +}
 124 +
 125 +static inline void
 126 +arc4random_stir(void)
 127 +{
 128 +       if (!rs_initialized) {
 129 +               arc4_init(&rs);
 130 +               rs_initialized = 1;
 131 +       }
 132 +       arc4_stir(&rs);
 133 +}
 134 +
 135 +static inline void
 136 +arc4random_addrandom(u_char *dat, int datlen)
 137 +{
 138 +       if (!rs_initialized)
 139 +               arc4random_stir();
 140 +       arc4_addrandom(&rs, dat, datlen);
 141 +}
 142 +
 143 +u_int32_t
 144 +arc4random(void)
 145 +{
 146 +       if (!rs_initialized)
 147 +               arc4random_stir();
 148 +       return arc4_getword(&rs);
 149 +}
 150 +
 151 +#if 0
 152 +/*-------- Test code for i386 --------*/
 153 +#include <stdio.h>
 154 +#include <machine/pctr.h>
 155 +int
 156 +main(int argc, char **argv)
 157 +{
 158 +       const int iter = 1000000;
 159 +       int     i;
 160 +       pctrval v;
 161 +
 162 +       v = rdtsc();
 163 +       for (i = 0; i < iter; i++)
 164 +               arc4random();
 165 +       v = rdtsc() - v;
 166 +       v /= iter;
 167 +
 168 +       printf("%qd cycles\n", v);
 169 +}
 170 +#endif
 171 diff -urN Linux-PAM-0.99.7.1.orig/modules/pam_unix/bcrypt.c Linux-PAM-0.99.7.1/modules/pam_unix/bcrypt.c
 172 --- Linux-PAM-0.99.7.1.orig/modules/pam_unix/bcrypt.c   1970-01-01 01:00:00.000000000 +0100
 173 +++ Linux-PAM-0.99.7.1/modules/pam_unix/bcrypt.c        2007-02-04 20:08:46.818842861 +0100
 174 @@ -0,0 +1,363 @@
 175 +/*
 176 + * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
 177 + * All rights reserved.
 178 + *
 179 + * Redistribution and use in source and binary forms, with or without
 180 + * modification, are permitted provided that the following conditions
 181 + * are met:
 182 + * 1. Redistributions of source code must retain the above copyright
 183 + *    notice, this list of conditions and the following disclaimer.
 184 + * 2. Redistributions in binary form must reproduce the above copyright
 185 + *    notice, this list of conditions and the following disclaimer in the
 186 + *    documentation and/or other materials provided with the distribution.
 187 + * 3. All advertising materials mentioning features or use of this software
 188 + *    must display the following acknowledgement:
 189 + *      This product includes software developed by Niels Provos.
 190 + * 4. The name of the author may not be used to endorse or promote products
 191 + *    derived from this software without specific prior written permission.
 192 + *
 193 + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 194 + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 195 + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 196 + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
 197 + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 198 + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 199 + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 200 + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 201 + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 202 + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 203 + */
 204 +
 205 +/* This password hashing algorithm was designed by David Mazieres
 206 + * <dm@lcs.mit.edu> and works as follows:
 207 + *
 208 + * 1. state := InitState ()
 209 + * 2. state := ExpandKey (state, salt, password) 3.
 210 + * REPEAT rounds:
 211 + *     state := ExpandKey (state, 0, salt)
 212 + *      state := ExpandKey(state, 0, password)
 213 + * 4. ctext := "OrpheanBeholderScryDoubt"
 214 + * 5. REPEAT 64:
 215 + *     ctext := Encrypt_ECB (state, ctext);
 216 + * 6. RETURN Concatenate (salt, ctext);
 217 + *
 218 + */
 219 +#include "config.h"
 220 +
 221 +#include <stdio.h>
 222 +#include <stdlib.h>
 223 +#include <sys/types.h>
 224 +#include <string.h>
 225 +#include <pwd.h>
 226 +#include "blf.h"
 227 +
 228 +/* This implementation is adaptable to current computing power.
 229 + * You can have up to 2^31 rounds which should be enough for some
 230 + * time to come.
 231 + */
 232 +
 233 +#define BCRYPT_VERSION '2'
 234 +#define BCRYPT_MAXSALT 16      /* Precomputation is just so nice */
 235 +#define BCRYPT_BLOCKS 6                /* Ciphertext blocks */
 236 +#define BCRYPT_MINROUNDS 16    /* we have log2(rounds) in salt */
 237 +
 238 +extern u_int32_t arc4random(void);
 239 +
 240 +char   *bcrypt_gensalt __P((u_int8_t));
 241 +
 242 +static void encode_salt __P((char *, u_int8_t *, u_int16_t, u_int8_t));
 243 +static void encode_base64 __P((u_int8_t *, u_int8_t *, u_int16_t));
 244 +static void decode_base64 __P((u_int8_t *, u_int16_t, u_int8_t *));
 245 +
 246 +static char    gsalt[BCRYPT_MAXSALT * 4 / 3 + 1];
 247 +static char    error[] = ":";
 248 +
 249 +static const u_int8_t Base64Code[] =
 250 +"./ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
 251 +
 252 +static const u_int8_t index_64[128] =
 253 +{
 254 +       255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
 255 +       255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
 256 +       255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
 257 +       255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
 258 +       255, 255, 255, 255, 255, 255, 0, 1, 54, 55,
 259 +       56, 57, 58, 59, 60, 61, 62, 63, 255, 255,
 260 +       255, 255, 255, 255, 255, 2, 3, 4, 5, 6,
 261 +       7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
 262 +       17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
 263 +       255, 255, 255, 255, 255, 255, 28, 29, 30,
 264 +       31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
 265 +       41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
 266 +       51, 52, 53, 255, 255, 255, 255, 255
 267 +};
 268 +#define CHAR64(c)  ( (c) > 127 ? 255 : index_64[(c)])
 269 +
 270 +#ifdef __STDC__
 271 +static void
 272 +decode_base64(u_int8_t *buffer, u_int16_t len, u_int8_t *data)
 273 +#else
 274 +static void
 275 +decode_base64(buffer, len, data)
 276 +       u_int8_t *buffer;
 277 +       u_int16_t len;
 278 +       u_int8_t *data;
 279 +#endif
 280 +{
 281 +       u_int8_t *bp = buffer;
 282 +       u_int8_t *p = data;
 283 +       u_int8_t c1, c2, c3, c4;
 284 +       while (bp < buffer + len) {
 285 +               c1 = CHAR64(*p);
 286 +               c2 = CHAR64(*(p + 1));
 287 +
 288 +               /* Invalid data */
 289 +               if (c1 == 255 || c2 == 255)
 290 +                       break;
 291 +
 292 +               *bp++ = (c1 << 2) | ((c2 & 0x30) >> 4);
 293 +               if (bp >= buffer + len)
 294 +                       break;
 295 +
 296 +               c3 = CHAR64(*(p + 2));
 297 +               if (c3 == 255)
 298 +                       break;
 299 +
 300 +               *bp++ = ((c2 & 0x0f) << 4) | ((c3 & 0x3c) >> 2);
 301 +               if (bp >= buffer + len)
 302 +                       break;
 303 +
 304 +               c4 = CHAR64(*(p + 3));
 305 +               if (c4 == 255)
 306 +                       break;
 307 +               *bp++ = ((c3 & 0x03) << 6) | c4;
 308 +
 309 +               p += 4;
 310 +       }
 311 +}
 312 +
 313 +#ifdef __STDC__
 314 +static void
 315 +encode_salt(char *salt, u_int8_t *csalt, u_int16_t clen, u_int8_t logr)
 316 +#else
 317 +static void
 318 +encode_salt(salt, csalt, clen, logr)
 319 +       char   *salt;
 320 +       u_int8_t *csalt;
 321 +       u_int16_t clen;
 322 +       u_int8_t logr;
 323 +#endif
 324 +{
 325 +       salt[0] = '$';
 326 +       salt[1] = BCRYPT_VERSION;
 327 +       salt[2] = 'a';
 328 +       salt[3] = '$';
 329 +
 330 +       snprintf(salt + 4, 4, "%2.2u$", logr);
 331 +
 332 +       encode_base64((u_int8_t *) salt + 7, csalt, clen);
 333 +}
 334 +/* Generates a salt for this version of crypt.
 335 +   Since versions may change. Keeping this here
 336 +   seems sensible.
 337 + */
 338 +
 339 +#ifdef __STDC__
 340 +char *
 341 +bcrypt_gensalt(u_int8_t log_rounds)
 342 +#else
 343 +char *
 344 +bcrypt_gensalt(log_rounds)
 345 +       u_int8_t log_rounds;
 346 +#endif
 347 +{
 348 +       u_int8_t csalt[BCRYPT_MAXSALT];
 349 +       u_int16_t i;
 350 +       u_int32_t seed = 0;
 351 +
 352 +       for (i = 0; i < BCRYPT_MAXSALT; i++) {
 353 +               if (i % 4 == 0)
 354 +                       seed = arc4random();
 355 +               csalt[i] = seed & 0xff;
 356 +               seed = seed >> 8;
 357 +       }
 358 +
 359 +       if (log_rounds < 4)
 360 +               log_rounds = 4;
 361 +
 362 +       encode_salt(gsalt, csalt, BCRYPT_MAXSALT, log_rounds);
 363 +       return gsalt;
 364 +}
 365 +/* We handle $Vers$log2(NumRounds)$salt+passwd$
 366 +   i.e. $2$04$iwouldntknowwhattosayetKdJ6iFtacBqJdKe6aW7ou */
 367 +
 368 +char   *
 369 +bcrypt(key, salt)
 370 +       const char   *key;
 371 +       const char   *salt;
 372 +{
 373 +       blf_ctx state;
 374 +       u_int32_t rounds, i, k;
 375 +       u_int16_t j;
 376 +       u_int8_t key_len, salt_len, logr, minor;
 377 +       u_int8_t ciphertext[4 * BCRYPT_BLOCKS] = "OrpheanBeholderScryDoubt";
 378 +       u_int8_t csalt[BCRYPT_MAXSALT];
 379 +       u_int32_t cdata[BCRYPT_BLOCKS];
 380 +       char *encrypted;
 381 +
 382 +       /* Discard "$" identifier */
 383 +       salt++;
 384 +
 385 +       if (*salt > BCRYPT_VERSION) {
 386 +               /* How do I handle errors ? Return ':' */
 387 +               return error;
 388 +       }
 389 +
 390 +       /* Check for minor versions */
 391 +       if (salt[1] != '$') {
 392 +                switch (salt[1]) {
 393 +                case 'a':
 394 +                        /* 'ab' should not yield the same as 'abab' */
 395 +                        minor = salt[1];
 396 +                        salt++;
 397 +                        break;
 398 +                default:
 399 +                        return error;
 400 +                }
 401 +       } else
 402 +                minor = 0;
 403 +
 404 +       /* Discard version + "$" identifier */
 405 +       salt += 2;
 406 +
 407 +       if (salt[2] != '$')
 408 +               /* Out of sync with passwd entry */
 409 +               return error;
 410 +
 411 +       /* Computer power doesnt increase linear, 2^x should be fine */
 412 +       if ((rounds = (u_int32_t) 1 << (logr = atoi(salt))) < BCRYPT_MINROUNDS)
 413 +               return error;
 414 +
 415 +       /* Discard num rounds + "$" identifier */
 416 +       salt += 3;
 417 +
 418 +       /* We dont want the base64 salt but the raw data */
 419 +       decode_base64(csalt, BCRYPT_MAXSALT, (u_int8_t *) salt);
 420 +       salt_len = BCRYPT_MAXSALT;
 421 +       key_len = strlen(key) + (minor >= 'a' ? 1 : 0);
 422 +
 423 +       /* Setting up S-Boxes and Subkeys */
 424 +       Blowfish_initstate(&state);
 425 +       Blowfish_expandstate(&state, csalt, salt_len,
 426 +           (u_int8_t *) key, key_len);
 427 +       for (k = 0; k < rounds; k++) {
 428 +               Blowfish_expand0state(&state, (u_int8_t *) key, key_len);
 429 +               Blowfish_expand0state(&state, csalt, salt_len);
 430 +       }
 431 +
 432 +       /* This can be precomputed later */
 433 +       j = 0;
 434 +       for (i = 0; i < BCRYPT_BLOCKS; i++)
 435 +               cdata[i] = Blowfish_stream2word(ciphertext, 4 * BCRYPT_BLOCKS, &j);
 436 +
 437 +       /* Now do the encryption */
 438 +       for (k = 0; k < 64; k++)
 439 +               blf_enc(&state, cdata, BCRYPT_BLOCKS / 2);
 440 +
 441 +       for (i = 0; i < BCRYPT_BLOCKS; i++) {
 442 +               ciphertext[4 * i + 3] = cdata[i] & 0xff;
 443 +               cdata[i] = cdata[i] >> 8;
 444 +               ciphertext[4 * i + 2] = cdata[i] & 0xff;
 445 +               cdata[i] = cdata[i] >> 8;
 446 +               ciphertext[4 * i + 1] = cdata[i] & 0xff;
 447 +               cdata[i] = cdata[i] >> 8;
 448 +               ciphertext[4 * i + 0] = cdata[i] & 0xff;
 449 +       }
 450 +
 451 +
 452 +       i = 0;
 453 +       encrypted = malloc(128);
 454 +       if (encrypted == NULL)
 455 +               return NULL;
 456 +
 457 +       encrypted[i++] = '$';
 458 +       encrypted[i++] = BCRYPT_VERSION;
 459 +       if (minor)
 460 +               encrypted[i++] = minor;
 461 +       encrypted[i++] = '$';
 462 +
 463 +       snprintf(encrypted + i, 4, "%2.2u$", logr);
 464 +
 465 +       encode_base64((u_int8_t *) encrypted + i + 3, csalt, BCRYPT_MAXSALT);
 466 +       encode_base64((u_int8_t *) encrypted + strlen(encrypted), ciphertext,
 467 +           4 * BCRYPT_BLOCKS - 1);
 468 +       return encrypted;
 469 +}
 470 +
 471 +#ifdef __STDC__
 472 +static void
 473 +encode_base64(u_int8_t *buffer, u_int8_t *data, u_int16_t len)
 474 +#else
 475 +static void
 476 +encode_base64(buffer, data, len)
 477 +       u_int8_t *buffer;
 478 +       u_int8_t *data;
 479 +       u_int16_t len;
 480 +#endif
 481 +{
 482 +       u_int8_t *bp = buffer;
 483 +       u_int8_t *p = data;
 484 +       u_int8_t c1, c2;
 485 +       while (p < data + len) {
 486 +               c1 = *p++;
 487 +               *bp++ = Base64Code[(c1 >> 2)];
 488 +               c1 = (c1 & 0x03) << 4;
 489 +               if (p >= data + len) {
 490 +                       *bp++ = Base64Code[c1];
 491 +                       break;
 492 +               }
 493 +               c2 = *p++;
 494 +               c1 |= (c2 >> 4) & 0x0f;
 495 +               *bp++ = Base64Code[c1];
 496 +               c1 = (c2 & 0x0f) << 2;
 497 +               if (p >= data + len) {
 498 +                       *bp++ = Base64Code[c1];
 499 +                       break;
 500 +               }
 501 +               c2 = *p++;
 502 +               c1 |= (c2 >> 6) & 0x03;
 503 +               *bp++ = Base64Code[c1];
 504 +               *bp++ = Base64Code[c2 & 0x3f];
 505 +       }
 506 +       *bp = '\0';
 507 +}
 508 +#if 0
 509 +void
 510 +main()
 511 +{
 512 +       char    blubber[73];
 513 +       char    salt[100];
 514 +       char   *p;
 515 +       salt[0] = '$';
 516 +       salt[1] = BCRYPT_VERSION;
 517 +       salt[2] = '$';
 518 +
 519 +       snprintf(salt + 3, 4, "%2.2u$", 5);
 520 +
 521 +       printf("24 bytes of salt: ");
 522 +       fgets(salt + 6, 94, stdin);
 523 +       salt[99] = 0;
 524 +       printf("72 bytes of password: ");
 525 +       fpurge(stdin);
 526 +       fgets(blubber, 73, stdin);
 527 +       blubber[72] = 0;
 528 +
 529 +       p = crypt(blubber, salt);
 530 +       printf("Passwd entry: %s\n\n", p);
 531 +
 532 +       p = bcrypt_gensalt(5);
 533 +       printf("Generated salt: %s\n", p);
 534 +       p = crypt(blubber, p);
 535 +       printf("Passwd entry: %s\n", p);
 536 +}
 537 +#endif
 538 diff -urN Linux-PAM-0.99.7.1.orig/modules/pam_unix/blf.h Linux-PAM-0.99.7.1/modules/pam_unix/blf.h
 539 --- Linux-PAM-0.99.7.1.orig/modules/pam_unix/blf.h      1970-01-01 01:00:00.000000000 +0100
 540 +++ Linux-PAM-0.99.7.1/modules/pam_unix/blf.h   2007-02-04 19:53:39.265687480 +0100
 541 @@ -0,0 +1,80 @@
 542 +/*
 543 + * Blowfish - a fast block cipher designed by Bruce Schneier
 544 + *
 545 + * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
 546 + * All rights reserved.
 547 + *
 548 + * Redistribution and use in source and binary forms, with or without
 549 + * modification, are permitted provided that the following conditions
 550 + * are met:
 551 + * 1. Redistributions of source code must retain the above copyright
 552 + *    notice, this list of conditions and the following disclaimer.
 553 + * 2. Redistributions in binary form must reproduce the above copyright
 554 + *    notice, this list of conditions and the following disclaimer in the
 555 + *    documentation and/or other materials provided with the distribution.
 556 + * 3. All advertising materials mentioning features or use of this software
 557 + *    must display the following acknowledgement:
 558 + *      This product includes software developed by Niels Provos.
 559 + * 4. The name of the author may not be used to endorse or promote products
 560 + *    derived from this software without specific prior written permission.
 561 + *
 562 + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 563 + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 564 + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 565 + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
 566 + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 567 + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 568 + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 569 + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 570 + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 571 + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 572 + */
 573 +
 574 +#ifndef _BLF_H_
 575 +#define _BLF_H_
 576 +
 577 +/* Schneier states the maximum key length to be 56 bytes.
 578 + * The way how the subkeys are initalized by the key up
 579 + * to (N+2)*4 i.e. 72 bytes are utilized.
 580 + * Warning: For normal blowfish encryption only 56 bytes
 581 + * of the key affect all cipherbits.
 582 + */
 583 +
 584 +#define BLF_N  16                      /* Number of Subkeys */
 585 +#define BLF_MAXKEYLEN ((BLF_N-2)*4)    /* 448 bits */
 586 +
 587 +/* Blowfish context */
 588 +typedef struct BlowfishContext {
 589 +       u_int32_t S[4][256];    /* S-Boxes */
 590 +       u_int32_t P[BLF_N + 2]; /* Subkeys */
 591 +} blf_ctx;
 592 +
 593 +/* Raw access to customized Blowfish
 594 + *     blf_key is just:
 595 + *     Blowfish_initstate( state )
 596 + *     Blowfish_expand0state( state, key, keylen )
 597 + */
 598 +
 599 +void Blowfish_encipher __P((blf_ctx *, u_int32_t *, u_int32_t *));
 600 +void Blowfish_decipher __P((blf_ctx *, u_int32_t *, u_int32_t *));
 601 +void Blowfish_initstate __P((blf_ctx *));
 602 +void Blowfish_expand0state __P((blf_ctx *, const u_int8_t *, u_int16_t));
 603 +void Blowfish_expandstate
 604 +    __P((blf_ctx *, const u_int8_t *, u_int16_t, const u_int8_t *, u_int16_t));
 605 +
 606 +/* Standard Blowfish */
 607 +
 608 +void blf_key __P((blf_ctx *, const u_int8_t *, u_int16_t));
 609 +void blf_enc __P((blf_ctx *, u_int32_t *, u_int16_t));
 610 +void blf_dec __P((blf_ctx *, u_int32_t *, u_int16_t));
 611 +
 612 +void blf_ecb_encrypt __P((blf_ctx *, u_int8_t *, u_int32_t));
 613 +void blf_ecb_decrypt __P((blf_ctx *, u_int8_t *, u_int32_t));
 614 +
 615 +void blf_cbc_encrypt __P((blf_ctx *, u_int8_t *, u_int8_t *, u_int32_t));
 616 +void blf_cbc_decrypt __P((blf_ctx *, u_int8_t *, u_int8_t *, u_int32_t));
 617 +
 618 +/* Converts u_int8_t to u_int32_t */
 619 +u_int32_t Blowfish_stream2word __P((const u_int8_t *, u_int16_t , u_int16_t *));
 620 +
 621 +#endif
 622 diff -urN Linux-PAM-0.99.7.1.orig/modules/pam_unix/blowfish.c Linux-PAM-0.99.7.1/modules/pam_unix/blowfish.c
 623 --- Linux-PAM-0.99.7.1.orig/modules/pam_unix/blowfish.c 1970-01-01 01:00:00.000000000 +0100
 624 +++ Linux-PAM-0.99.7.1/modules/pam_unix/blowfish.c      2007-02-04 19:53:39.265687480 +0100
 625 @@ -0,0 +1,769 @@
 626 +/*
 627 + * Blowfish block cipher for OpenBSD
 628 + * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
 629 + * All rights reserved.
 630 + *
 631 + * Implementation advice by David Mazieres <dm@lcs.mit.edu>.
 632 + *
 633 + * Redistribution and use in source and binary forms, with or without
 634 + * modification, are permitted provided that the following conditions
 635 + * are met:
 636 + * 1. Redistributions of source code must retain the above copyright
 637 + *    notice, this list of conditions and the following disclaimer.
 638 + * 2. Redistributions in binary form must reproduce the above copyright
 639 + *    notice, this list of conditions and the following disclaimer in the
 640 + *    documentation and/or other materials provided with the distribution.
 641 + * 3. All advertising materials mentioning features or use of this software
 642 + *    must display the following acknowledgement:
 643 + *      This product includes software developed by Niels Provos.
 644 + * 4. The name of the author may not be used to endorse or promote products
 645 + *    derived from this software without specific prior written permission.
 646 + *
 647 + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 648 + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 649 + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 650 + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
 651 + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 652 + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 653 + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 654 + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 655 + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 656 + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 657 + */
 658 +
 659 +/*
 660 + * This code is derived from section 14.3 and the given source
 661 + * in section V of Applied Cryptography, second edition.
 662 + * Blowfish is an unpatented fast block cipher designed by
 663 + * Bruce Schneier.
 664 + */
 665 +#include "config.h"
 666 +
 667 +#include <sys/types.h>
 668 +#include "blf.h"
 669 +
 670 +#undef inline
 671 +#ifdef __GNUC__
 672 +#define inline __inline
 673 +#else                          /* !__GNUC__ */
 674 +#define inline
 675 +#endif                         /* !__GNUC__ */
 676 +
 677 +/* Function for Feistel Networks */
 678 +
 679 +#define F(bc, x) ((((bc)->S[0][((x) & 0xFF000000) >> 24] \
 680 +                   + (bc)->S[1][((x) &0xFF0000 ) >> 16]) \
 681 +                  ^ (bc)->S[2][((x) & 0xFF00) >> 8]) \
 682 +                 + (bc)->S[3][(x) & 0x00FF])
 683 +
 684 +#define BLFRND(bc,i,j,n) (i ^= F(bc,j) ^ (bc)->P[n])
 685 +
 686 +void
 687 +Blowfish_encipher(c, xl, xr)
 688 +       blf_ctx *c;
 689 +       u_int32_t *xl;
 690 +       u_int32_t *xr;
 691 +{
 692 +       u_int32_t Xl;
 693 +       u_int32_t Xr;
 694 +
 695 +       Xl = *xl;
 696 +       Xr = *xr;
 697 +
 698 +       Xl ^= c->P[0];
 699 +       BLFRND(c, Xr, Xl, 1); BLFRND(c, Xl, Xr, 2);
 700 +       BLFRND(c, Xr, Xl, 3); BLFRND(c, Xl, Xr, 4);
 701 +       BLFRND(c, Xr, Xl, 5); BLFRND(c, Xl, Xr, 6);
 702 +       BLFRND(c, Xr, Xl, 7); BLFRND(c, Xl, Xr, 8);
 703 +       BLFRND(c, Xr, Xl, 9); BLFRND(c, Xl, Xr, 10);
 704 +       BLFRND(c, Xr, Xl, 11); BLFRND(c, Xl, Xr, 12);
 705 +       BLFRND(c, Xr, Xl, 13); BLFRND(c, Xl, Xr, 14);
 706 +       BLFRND(c, Xr, Xl, 15); BLFRND(c, Xl, Xr, 16);
 707 +
 708 +       *xl = Xr ^ c->P[17];
 709 +       *xr = Xl;
 710 +}
 711 +
 712 +void
 713 +Blowfish_decipher(c, xl, xr)
 714 +       blf_ctx *c;
 715 +       u_int32_t *xl;
 716 +       u_int32_t *xr;
 717 +{
 718 +       u_int32_t Xl;
 719 +       u_int32_t Xr;
 720 +
 721 +       Xl = *xl;
 722 +       Xr = *xr;
 723 +
 724 +       Xl ^= c->P[17];
 725 +       BLFRND(c, Xr, Xl, 16); BLFRND(c, Xl, Xr, 15);
 726 +       BLFRND(c, Xr, Xl, 14); BLFRND(c, Xl, Xr, 13);
 727 +       BLFRND(c, Xr, Xl, 12); BLFRND(c, Xl, Xr, 11);
 728 +       BLFRND(c, Xr, Xl, 10); BLFRND(c, Xl, Xr, 9);
 729 +       BLFRND(c, Xr, Xl, 8); BLFRND(c, Xl, Xr, 7);
 730 +       BLFRND(c, Xr, Xl, 6); BLFRND(c, Xl, Xr, 5);
 731 +       BLFRND(c, Xr, Xl, 4); BLFRND(c, Xl, Xr, 3);
 732 +       BLFRND(c, Xr, Xl, 2); BLFRND(c, Xl, Xr, 1);
 733 +
 734 +       *xl = Xr ^ c->P[0];
 735 +       *xr = Xl;
 736 +}
 737 +
 738 +void
 739 +Blowfish_initstate(c)
 740 +       blf_ctx *c;
 741 +{
 742 +
 743 +/* P-box and S-box tables initialized with digits of Pi */
 744 +
 745 +       const blf_ctx initstate =
 746 +
 747 +       { {
 748 +               {
 749 +                       0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7,
 750 +                       0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
 751 +                       0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16,
 752 +                       0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e,
 753 +                       0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee,
 754 +                       0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
 755 +                       0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef,
 756 +                       0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e,
 757 +                       0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60,
 758 +                       0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440,
 759 +                       0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce,
 760 +                       0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a,
 761 +                       0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e,
 762 +                       0xafd6ba33, 0x6c24cf5c, 0x7a325381, 0x28958677,
 763 +                       0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193,
 764 +                       0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032,
 765 +                       0xef845d5d, 0xe98575b1, 0xdc262302, 0xeb651b88,
 766 +                       0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239,
 767 +                       0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e,
 768 +                       0x21c66842, 0xf6e96c9a, 0x670c9c61, 0xabd388f0,
 769 +                       0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3,
 770 +                       0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98,
 771 +                       0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88,
 772 +                       0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe,
 773 +                       0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6,
 774 +                       0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d,
 775 +                       0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b,
 776 +                       0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7,
 777 +                       0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba,
 778 +                       0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463,
 779 +                       0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f,
 780 +                       0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09,
 781 +                       0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3,
 782 +                       0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb,
 783 +                       0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279,
 784 +                       0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8,
 785 +                       0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab,
 786 +                       0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82,
 787 +                       0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db,
 788 +                       0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573,
 789 +                       0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0,
 790 +                       0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b,
 791 +                       0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790,
 792 +                       0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8,
 793 +                       0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4,
 794 +                       0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0,
 795 +                       0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, 0x8e7594b7,
 796 +                       0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c,
 797 +                       0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad,
 798 +                       0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1,
 799 +                       0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299,
 800 +                       0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9,
 801 +                       0x165fa266, 0x80957705, 0x93cc7314, 0x211a1477,
 802 +                       0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf,
 803 +                       0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49,
 804 +                       0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af,
 805 +                       0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa,
 806 +                       0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5,
 807 +                       0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41,
 808 +                       0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
 809 +                       0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400,
 810 +                       0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915,
 811 +                       0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664,
 812 +               0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a},
 813 +               {
 814 +                       0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623,
 815 +                       0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266,
 816 +                       0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1,
 817 +                       0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e,
 818 +                       0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6,
 819 +                       0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
 820 +                       0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e,
 821 +                       0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1,
 822 +                       0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737,
 823 +                       0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8,
 824 +                       0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff,
 825 +                       0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd,
 826 +                       0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701,
 827 +                       0x3ae5e581, 0x37c2dadc, 0xc8b57634, 0x9af3dda7,
 828 +                       0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41,
 829 +                       0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331,
 830 +                       0x4e548b38, 0x4f6db908, 0x6f420d03, 0xf60a04bf,
 831 +                       0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af,
 832 +                       0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e,
 833 +                       0x5512721f, 0x2e6b7124, 0x501adde6, 0x9f84cd87,
 834 +                       0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c,
 835 +                       0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2,
 836 +                       0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16,
 837 +                       0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd,
 838 +                       0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b,
 839 +                       0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509,
 840 +                       0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e,
 841 +                       0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3,
 842 +                       0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f,
 843 +                       0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a,
 844 +                       0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4,
 845 +                       0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960,
 846 +                       0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66,
 847 +                       0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28,
 848 +                       0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802,
 849 +                       0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84,
 850 +                       0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510,
 851 +                       0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf,
 852 +                       0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14,
 853 +                       0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e,
 854 +                       0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50,
 855 +                       0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7,
 856 +                       0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8,
 857 +                       0xf837889a, 0x97e32d77, 0x11ed935f, 0x16681281,
 858 +                       0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99,
 859 +                       0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696,
 860 +                       0xcdb30aeb, 0x532e3054, 0x8fd948e4, 0x6dbc3128,
 861 +                       0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73,
 862 +                       0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0,
 863 +                       0x45eee2b6, 0xa3aaabea, 0xdb6c4f15, 0xfacb4fd0,
 864 +                       0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105,
 865 +                       0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250,
 866 +                       0xcf62a1f2, 0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3,
 867 +                       0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285,
 868 +                       0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00,
 869 +                       0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061,
 870 +                       0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb,
 871 +                       0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e,
 872 +                       0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735,
 873 +                       0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc,
 874 +                       0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9,
 875 +                       0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340,
 876 +                       0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20,
 877 +               0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7},
 878 +               {
 879 +                       0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934,
 880 +                       0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,
 881 +                       0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af,
 882 +                       0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840,
 883 +                       0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45,
 884 +                       0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504,
 885 +                       0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a,
 886 +                       0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb,
 887 +                       0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee,
 888 +                       0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6,
 889 +                       0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42,
 890 +                       0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b,
 891 +                       0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2,
 892 +                       0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb,
 893 +                       0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527,
 894 +                       0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b,
 895 +                       0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33,
 896 +                       0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c,
 897 +                       0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3,
 898 +                       0x95c11548, 0xe4c66d22, 0x48c1133f, 0xc70f86dc,
 899 +                       0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17,
 900 +                       0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564,
 901 +                       0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b,
 902 +                       0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115,
 903 +                       0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922,
 904 +                       0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728,
 905 +                       0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0,
 906 +                       0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e,
 907 +                       0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37,
 908 +                       0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d,
 909 +                       0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804,
 910 +                       0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b,
 911 +                       0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3,
 912 +                       0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb,
 913 +                       0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d,
 914 +                       0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c,
 915 +                       0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350,
 916 +                       0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9,
 917 +                       0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a,
 918 +                       0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe,
 919 +                       0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d,
 920 +                       0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc,
 921 +                       0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f,
 922 +                       0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61,
 923 +                       0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2,
 924 +                       0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9,
 925 +                       0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2,
 926 +                       0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c,
 927 +                       0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e,
 928 +                       0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633,
 929 +                       0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10,
 930 +                       0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169,
 931 +                       0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52,
 932 +                       0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027,
 933 +                       0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5,
 934 +                       0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62,
 935 +                       0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634,
 936 +                       0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76,
 937 +                       0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24,
 938 +                       0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc,
 939 +                       0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4,
 940 +                       0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c,
 941 +                       0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837,
 942 +               0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0},
 943 +               {
 944 +                       0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b,
 945 +                       0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe,
 946 +                       0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b,
 947 +                       0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4,
 948 +                       0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8,
 949 +                       0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6,
 950 +                       0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304,
 951 +                       0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22,
 952 +                       0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4,
 953 +                       0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6,
 954 +                       0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9,
 955 +                       0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59,
 956 +                       0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593,
 957 +                       0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51,
 958 +                       0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28,
 959 +                       0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c,
 960 +                       0xe029ac71, 0xe019a5e6, 0x47b0acfd, 0xed93fa9b,
 961 +                       0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28,
 962 +                       0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c,
 963 +                       0x15056dd4, 0x88f46dba, 0x03a16125, 0x0564f0bd,
 964 +                       0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a,
 965 +                       0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319,
 966 +                       0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb,
 967 +                       0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f,
 968 +                       0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991,
 969 +                       0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32,
 970 +                       0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680,
 971 +                       0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166,
 972 +                       0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae,
 973 +                       0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb,
 974 +                       0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5,
 975 +                       0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47,
 976 +                       0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370,
 977 +                       0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d,
 978 +                       0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84,
 979 +                       0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048,
 980 +                       0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8,
 981 +                       0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd,
 982 +                       0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9,
 983 +                       0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7,
 984 +                       0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38,
 985 +                       0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f,
 986 +                       0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c,
 987 +                       0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525,
 988 +                       0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1,
 989 +                       0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442,
 990 +                       0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, 0x3278e964,
 991 +                       0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e,
 992 +                       0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8,
 993 +                       0xdf359f8d, 0x9b992f2e, 0xe60b6f47, 0x0fe3f11d,
 994 +                       0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f,
 995 +                       0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299,
 996 +                       0xf523f357, 0xa6327623, 0x93a83531, 0x56cccd02,
 997 +                       0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc,
 998 +                       0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614,
 999 +                       0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a,
1000 +                       0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6,
1001 +                       0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b,
1002 +                       0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0,
1003 +                       0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060,
1004 +                       0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e,
1005 +                       0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9,
1006 +                       0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f,
1007 +               0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6}
1008 +       },
1009 +       {
1010 +               0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344,
1011 +               0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89,
1012 +               0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
1013 +               0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917,
1014 +               0x9216d5d9, 0x8979fb1b
1015 +       } };
1016 +
1017 +       *c = initstate;
1018 +
1019 +}
1020 +
1021 +#ifdef __STDC__
1022 +u_int32_t
1023 +Blowfish_stream2word(const u_int8_t *data, u_int16_t databytes, u_int16_t *current)
1024 +#else
1025 +u_int32_t
1026 +Blowfish_stream2word(data, databytes, current)
1027 +       const u_int8_t *data;
1028 +       u_int16_t databytes;
1029 +       u_int16_t *current;
1030 +#endif
1031 +{
1032 +       u_int8_t i;
1033 +       u_int16_t j;
1034 +       u_int32_t temp;
1035 +
1036 +       temp = 0x00000000;
1037 +       j = *current;
1038 +
1039 +       for (i = 0; i < 4; i++, j++) {
1040 +               if (j >= databytes)
1041 +                       j = 0;
1042 +               temp = (temp << 8) | data[j];
1043 +       }
1044 +
1045 +       *current = j;
1046 +       return temp;
1047 +}
1048 +
1049 +#if __STDC__
1050 +void
1051 +Blowfish_expand0state(blf_ctx *c, const u_int8_t *key, u_int16_t keybytes)
1052 +#else
1053 +void
1054 +Blowfish_expand0state(c, key, keybytes)
1055 +       blf_ctx *c;
1056 +       const u_int8_t *key;
1057 +       u_int16_t keybytes;
1058 +#endif
1059 +{
1060 +       u_int16_t i;
1061 +       u_int16_t j;
1062 +       u_int16_t k;
1063 +       u_int32_t temp;
1064 +       u_int32_t datal;
1065 +       u_int32_t datar;
1066 +
1067 +       j = 0;
1068 +       for (i = 0; i < BLF_N + 2; i++) {
1069 +               /* Extract 4 int8 to 1 int32 from keystream */
1070 +               temp = Blowfish_stream2word(key, keybytes, &j);
1071 +               c->P[i] = c->P[i] ^ temp;
1072 +       }
1073 +
1074 +       j = 0;
1075 +       datal = 0x00000000;
1076 +       datar = 0x00000000;
1077 +       for (i = 0; i < BLF_N + 2; i += 2) {
1078 +               Blowfish_encipher(c, &datal, &datar);
1079 +
1080 +               c->P[i] = datal;
1081 +               c->P[i + 1] = datar;
1082 +       }
1083 +
1084 +       for (i = 0; i < 4; i++) {
1085 +               for (k = 0; k < 256; k += 2) {
1086 +                       Blowfish_encipher(c, &datal, &datar);
1087 +
1088 +                       c->S[i][k] = datal;
1089 +                       c->S[i][k + 1] = datar;
1090 +               }
1091 +       }
1092 +}
1093 +
1094 +
1095 +#if __STDC__
1096 +void
1097 +Blowfish_expandstate(blf_ctx *c, const u_int8_t *data, u_int16_t databytes,
1098 +                    const u_int8_t *key, u_int16_t keybytes)
1099 +#else
1100 +void
1101 +Blowfish_expandstate(c, data, databytes, key, keybytes)
1102 +       blf_ctx *c;
1103 +       const u_int8_t *data;
1104 +       u_int16_t databytes;
1105 +       const u_int8_t *key;
1106 +       u_int16_t keybytes;
1107 +#endif
1108 +{
1109 +       u_int16_t i;
1110 +       u_int16_t j;
1111 +       u_int16_t k;
1112 +       u_int32_t temp;
1113 +       u_int32_t datal;
1114 +       u_int32_t datar;
1115 +
1116 +       j = 0;
1117 +       for (i = 0; i < BLF_N + 2; i++) {
1118 +               /* Extract 4 int8 to 1 int32 from keystream */
1119 +               temp = Blowfish_stream2word(key, keybytes, &j);
1120 +               c->P[i] = c->P[i] ^ temp;
1121 +       }
1122 +
1123 +       j = 0;
1124 +       datal = 0x00000000;
1125 +       datar = 0x00000000;
1126 +       for (i = 0; i < BLF_N + 2; i += 2) {
1127 +               datal ^= Blowfish_stream2word(data, databytes, &j);
1128 +               datar ^= Blowfish_stream2word(data, databytes, &j);
1129 +               Blowfish_encipher(c, &datal, &datar);
1130 +
1131 +               c->P[i] = datal;
1132 +               c->P[i + 1] = datar;
1133 +       }
1134 +
1135 +       for (i = 0; i < 4; i++) {
1136 +               for (k = 0; k < 256; k += 2) {
1137 +                       datal ^= Blowfish_stream2word(data, databytes, &j);
1138 +                       datar ^= Blowfish_stream2word(data, databytes, &j);
1139 +                       Blowfish_encipher(c, &datal, &datar);
1140 +
1141 +                       c->S[i][k] = datal;
1142 +                       c->S[i][k + 1] = datar;
1143 +               }
1144 +       }
1145 +
1146 +}
1147 +
1148 +#if __STDC__
1149 +void
1150 +blf_key(blf_ctx *c, const u_int8_t *k, u_int16_t len)
1151 +#else
1152 +void
1153 +blf_key(c, k, len)
1154 +       blf_ctx *c;
1155 +       const u_int8_t *k;
1156 +       u_int16_t len;
1157 +#endif
1158 +{
1159 +       /* Initalize S-boxes and subkeys with Pi */
1160 +       Blowfish_initstate(c);
1161 +
1162 +       /* Transform S-boxes and subkeys with key */
1163 +       Blowfish_expand0state(c, k, len);
1164 +}
1165 +
1166 +#if __STDC__
1167 +void
1168 +blf_enc(blf_ctx *c, u_int32_t *data, u_int16_t blocks)
1169 +#else
1170 +void
1171 +blf_enc(c, data, blocks)
1172 +       blf_ctx *c;
1173 +       u_int32_t *data;
1174 +       u_int16_t blocks;
1175 +#endif
1176 +{
1177 +       u_int32_t *d;
1178 +       u_int16_t i;
1179 +
1180 +       d = data;
1181 +       for (i = 0; i < blocks; i++) {
1182 +               Blowfish_encipher(c, d, d + 1);
1183 +               d += 2;
1184 +       }
1185 +}
1186 +
1187 +#if __STDC__
1188 +void
1189 +blf_dec(blf_ctx *c, u_int32_t *data, u_int16_t blocks)
1190 +#else
1191 +void
1192 +blf_dec(c, data, blocks)
1193 +       blf_ctx *c;
1194 +       u_int32_t *data;
1195 +       u_int16_t blocks;
1196 +#endif
1197 +{
1198 +       u_int32_t *d;
1199 +       u_int16_t i;
1200 +
1201 +       d = data;
1202 +       for (i = 0; i < blocks; i++) {
1203 +               Blowfish_decipher(c, d, d + 1);
1204 +               d += 2;
1205 +       }
1206 +}
1207 +
1208 +#if __STDC__
1209 +void
1210 +blf_ecb_encrypt(blf_ctx *c, u_int8_t *data, u_int32_t len)
1211 +#else
1212 +void
1213 +blf_ecb_encrypt(c, data, len)
1214 +     blf_ctx *c;
1215 +     u_int8_t *data;
1216 +     u_int32_t len;
1217 +#endif
1218 +{
1219 +       u_int32_t l, r;
1220 +       u_int32_t i;
1221 +
1222 +       for (i = 0; i < len; i += 8) {
1223 +               l = data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3];
1224 +               r = data[4] << 24 | data[5] << 16 | data[6] << 8 | data[7];
1225 +               Blowfish_encipher(c, &l, &r);
1226 +               data[0] = l >> 24 & 0xff;
1227 +               data[1] = l >> 16 & 0xff;
1228 +               data[2] = l >> 8 & 0xff;
1229 +               data[3] = l & 0xff;
1230 +               data[4] = r >> 24 & 0xff;
1231 +               data[5] = r >> 16 & 0xff;
1232 +               data[6] = r >> 8 & 0xff;
1233 +               data[7] = r & 0xff;
1234 +               data += 8;
1235 +       }
1236 +}
1237 +
1238 +#if __STDC__
1239 +void
1240 +blf_ecb_decrypt(blf_ctx *c, u_int8_t *data, u_int32_t len)
1241 +#else
1242 +void
1243 +blf_ecb_decrypt(c, data, len)
1244 +     blf_ctx *c;
1245 +     u_int8_t *data;
1246 +     u_int32_t len;
1247 +#endif
1248 +{
1249 +       u_int32_t l, r;
1250 +       u_int32_t i;
1251 +
1252 +       for (i = 0; i < len; i += 8) {
1253 +               l = data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3];
1254 +               r = data[4] << 24 | data[5] << 16 | data[6] << 8 | data[7];
1255 +               Blowfish_decipher(c, &l, &r);
1256 +               data[0] = l >> 24 & 0xff;
1257 +               data[1] = l >> 16 & 0xff;
1258 +               data[2] = l >> 8 & 0xff;
1259 +               data[3] = l & 0xff;
1260 +               data[4] = r >> 24 & 0xff;
1261 +               data[5] = r >> 16 & 0xff;
1262 +               data[6] = r >> 8 & 0xff;
1263 +               data[7] = r & 0xff;
1264 +               data += 8;
1265 +       }
1266 +}
1267 +
1268 +#if __STDC__
1269 +void
1270 +blf_cbc_encrypt(blf_ctx *c, u_int8_t *iv, u_int8_t *data, u_int32_t len)
1271 +#else
1272 +void
1273 +blf_cbc_encrypt(c, iv, data, len)
1274 +     blf_ctx *c;
1275 +     u_int8_t *iv;
1276 +     u_int8_t *data;
1277 +     u_int32_t len;
1278 +#endif
1279 +{
1280 +       u_int32_t l, r;
1281 +       u_int32_t i, j;
1282 +
1283 +       for (i = 0; i < len; i += 8) {
1284 +               for (j = 0; j < 8; j++)
1285 +                       data[j] ^= iv[j];
1286 +               l = data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3];
1287 +               r = data[4] << 24 | data[5] << 16 | data[6] << 8 | data[7];
1288 +               Blowfish_encipher(c, &l, &r);
1289 +               data[0] = l >> 24 & 0xff;
1290 +               data[1] = l >> 16 & 0xff;
1291 +               data[2] = l >> 8 & 0xff;
1292 +               data[3] = l & 0xff;
1293 +               data[4] = r >> 24 & 0xff;
1294 +               data[5] = r >> 16 & 0xff;
1295 +               data[6] = r >> 8 & 0xff;
1296 +               data[7] = r & 0xff;
1297 +               iv = data;
1298 +               data += 8;
1299 +       }
1300 +}
1301 +
1302 +#if __STDC__
1303 +void
1304 +blf_cbc_decrypt(blf_ctx *c, u_int8_t *iva, u_int8_t *data, u_int32_t len)
1305 +#else
1306 +void
1307 +blf_cbc_decrypt(c, iva, data, len)
1308 +     blf_ctx *c;
1309 +     u_int8_t *iva;
1310 +     u_int8_t *data;
1311 +     u_int32_t len;
1312 +#endif
1313 +{
1314 +       u_int32_t l, r;
1315 +       u_int8_t *iv;
1316 +       u_int32_t i, j;
1317 +
1318 +       iv = data + len - 16;
1319 +       data = data + len - 8;
1320 +       for (i = len - 8; i >= 8; i -= 8) {
1321 +               l = data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3];
1322 +               r = data[4] << 24 | data[5] << 16 | data[6] << 8 | data[7];
1323 +               Blowfish_decipher(c, &l, &r);
1324 +               data[0] = l >> 24 & 0xff;
1325 +               data[1] = l >> 16 & 0xff;
1326 +               data[2] = l >> 8 & 0xff;
1327 +               data[3] = l & 0xff;
1328 +               data[4] = r >> 24 & 0xff;
1329 +               data[5] = r >> 16 & 0xff;
1330 +               data[6] = r >> 8 & 0xff;
1331 +               data[7] = r & 0xff;
1332 +               for (j = 0; j < 8; j++)
1333 +                       data[j] ^= iv[j];
1334 +               iv = data;
1335 +               data -= 8;
1336 +       }
1337 +       l = data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3];
1338 +       r = data[4] << 24 | data[5] << 16 | data[6] << 8 | data[7];
1339 +       Blowfish_decipher(c, &l, &r);
1340 +       data[0] = l >> 24 & 0xff;
1341 +       data[1] = l >> 16 & 0xff;
1342 +       data[2] = l >> 8 & 0xff;
1343 +       data[3] = l & 0xff;
1344 +       data[4] = r >> 24 & 0xff;
1345 +       data[5] = r >> 16 & 0xff;
1346 +       data[6] = r >> 8 & 0xff;
1347 +       data[7] = r & 0xff;
1348 +       for (j = 0; j < 8; j++)
1349 +               data[j] ^= iva[j];
1350 +}
1351 +
1352 +#if 0
1353 +void
1354 +report(u_int32_t data[], u_int16_t len)
1355 +{
1356 +       u_int16_t i;
1357 +       for (i = 0; i < len; i += 2)
1358 +               printf("Block %0hd: %08lx %08lx.\n",
1359 +                   i / 2, data[i], data[i + 1]);
1360 +}
1361 +void
1362 +main(void)
1363 +{
1364 +
1365 +       blf_ctx c;
1366 +       char    key[] = "AAAAA";
1367 +       char    key2[] = "abcdefghijklmnopqrstuvwxyz";
1368 +
1369 +       u_int32_t data[10];
1370 +       u_int32_t data2[] =
1371 +       {0x424c4f57l, 0x46495348l};
1372 +
1373 +       u_int16_t i;
1374 +
1375 +       /* First test */
1376 +       for (i = 0; i < 10; i++)
1377 +               data[i] = i;
1378 +
1379 +       blf_key(&c, (u_int8_t *) key, 5);
1380 +       blf_enc(&c, data, 5);
1381 +       blf_dec(&c, data, 1);
1382 +       blf_dec(&c, data + 2, 4);
1383 +       printf("Should read as 0 - 9.\n");
1384 +       report(data, 10);
1385 +
1386 +       /* Second test */
1387 +       blf_key(&c, (u_int8_t *) key2, strlen(key2));
1388 +       blf_enc(&c, data2, 1);
1389 +       printf("\nShould read as: 0x324ed0fe 0xf413a203.\n");
1390 +       report(data2, 2);
1391 +       blf_dec(&c, data2, 1);
1392 +       report(data2, 2);
1393 +}
1394 +#endif
1395 diff -urN Linux-PAM-0.99.7.1.orig/modules/pam_unix/blowfish.h Linux-PAM-0.99.7.1/modules/pam_unix/blowfish.h
1396 --- Linux-PAM-0.99.7.1.orig/modules/pam_unix/blowfish.h 1970-01-01 01:00:00.000000000 +0100
1397 +++ Linux-PAM-0.99.7.1/modules/pam_unix/blowfish.h      2007-02-04 19:53:39.265687480 +0100
1398 @@ -0,0 +1,11 @@
1399 +
1400 +#ifndef BLOWFISH_H
1401 +#define BLOWFISH_H
1402 +
1403 +#define BLOWFISH_ROOT_ROUNDS   8
1404 +#define BLOWFISH_USER_ROUNDS   6
1405 +
1406 +char *bcrypt(const char *key, const char *salt);
1407 +char *bcrypt_gensalt(u_int8_t log_rounds);
1408 +
1409 +#endif                         /* BLOWFISH_H */
1410 diff -urN Linux-PAM-0.99.7.1.orig/modules/pam_unix/Makefile.am Linux-PAM-0.99.7.1/modules/pam_unix/Makefile.am
1411 --- Linux-PAM-0.99.7.1.orig/modules/pam_unix/Makefile.am        2006-12-18 19:50:50.000000000 +0100
1412 +++ Linux-PAM-0.99.7.1/modules/pam_unix/Makefile.am     2007-02-04 19:53:39.269687706 +0100
1413 @@ -34,7 +34,7 @@
1414
1415  securelib_LTLIBRARIES = pam_unix.la
1416
1417 -noinst_HEADERS = md5.h support.h yppasswd.h bigcrypt.h
1418 +noinst_HEADERS = md5.h support.h yppasswd.h bigcrypt.h blf.h blowfish.h
1419
1420  sbin_PROGRAMS = unix_chkpwd
1421
1422 @@ -42,13 +42,15 @@
1423
1424  pam_unix_la_SOURCES = bigcrypt.c pam_unix_acct.c \
1425         pam_unix_auth.c pam_unix_passwd.c pam_unix_sess.c support.c \
1426 -       yppasswd_xdr.c md5_good.c md5_broken.c
1427 +       yppasswd_xdr.c md5_good.c md5_broken.c \
1428 +       arc4random.c bcrypt.c blowfish.c
1429
1430  bigcrypt_SOURCES = bigcrypt.c bigcrypt_main.c
1431  bigcrypt_CFLAGS = $(AM_CFLAGS)
1432  bigcrypt_LDADD = @LIBCRYPT@
1433
1434 -unix_chkpwd_SOURCES = unix_chkpwd.c md5_good.c md5_broken.c bigcrypt.c
1435 +unix_chkpwd_SOURCES = unix_chkpwd.c md5_good.c md5_broken.c bigcrypt.c \
1436 +                     arc4random.c bcrypt.c blowfish.c
1437  unix_chkpwd_CFLAGS = $(AM_CFLAGS) @PIE_CFLAGS@
1438  unix_chkpwd_LDFLAGS = @PIE_LDFLAGS@
1439  unix_chkpwd_LDADD = -L$(top_builddir)/libpam -lpam @LIBCRYPT@ @LIBSELINUX@
1440 diff -urN Linux-PAM-0.99.7.1.orig/modules/pam_unix/pam_unix.8 Linux-PAM-0.99.7.1/modules/pam_unix/pam_unix.8
1441 --- Linux-PAM-0.99.7.1.orig/modules/pam_unix/pam_unix.8 2006-09-20 16:34:37.000000000 +0200
1442 +++ Linux-PAM-0.99.7.1/modules/pam_unix/pam_unix.8      2007-02-04 20:00:26.388888108 +0100
1443 @@ -96,6 +96,9 @@
1444  \fBmd5\fR
1445  When a user changes their password next, encrypt it with the MD5 algorithm.
1446  .TP 3n
1447 +\fBblowfish\fR
1448 +When a user changes their password next, encrypt it with the OpenBSD Blowfish algorithm.
1449 +.TP 3n
1450  \fBbigcrypt\fR
1451  When a user changes their password next, encrypt it with the DEC C2 algorithm.
1452  .TP 3n
1453 diff -urN Linux-PAM-0.99.7.1.orig/modules/pam_unix/pam_unix.8.xml Linux-PAM-0.99.7.1/modules/pam_unix/pam_unix.8.xml
1454 --- Linux-PAM-0.99.7.1.orig/modules/pam_unix/pam_unix.8.xml     2006-09-20 16:34:37.000000000 +0200
1455 +++ Linux-PAM-0.99.7.1/modules/pam_unix/pam_unix.8.xml  2007-02-04 19:53:39.269687706 +0100
1456 @@ -249,6 +249,17 @@
1457        </varlistentry>
1458        <varlistentry>
1459          <term>
1460 +          <option>blowfish</option>
1461 +        </term>
1462 +        <listitem>
1463 +          <para>
1464 +            When a user changes their password next, encrypt
1465 +            it with the OpenBSD Blowfish algorithm.
1466 +          </para>
1467 +        </listitem>
1468 +      </varlistentry>
1469 +      <varlistentry>
1470 +        <term>
1471            <option>bigcrypt</option>
1472          </term>
1473          <listitem>
1474 diff -urN Linux-PAM-0.99.7.1.orig/modules/pam_unix/pam_unix_passwd.c Linux-PAM-0.99.7.1/modules/pam_unix/pam_unix_passwd.c
1475 --- Linux-PAM-0.99.7.1.orig/modules/pam_unix/pam_unix_passwd.c  2006-12-20 12:08:59.000000000 +0100
1476 +++ Linux-PAM-0.99.7.1/modules/pam_unix/pam_unix_passwd.c       2007-02-04 19:53:39.269687706 +0100
1477 @@ -85,6 +85,7 @@
1478  #include "md5.h"
1479  #include "support.h"
1480  #include "bigcrypt.h"
1481 +#include "blowfish.h"
1482
1483  #if !((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 1))
1484  extern int getrpcport(const char *host, unsigned long prognum,
1485 @@ -185,6 +186,19 @@
1486         return x;
1487  }
1488
1489 +static char *crypt_blowfish_wrapper(const char *pass_new, int rounds)
1490 +{
1491 +       char *bf_salt;
1492 +       char *x = NULL;
1493 +
1494 +       if ((rounds < 5) || (rounds > 9))
1495 +               rounds = 7;
1496 +       bf_salt = bcrypt_gensalt(rounds);
1497 +       x = x_strdup(bcrypt(pass_new, bf_salt));
1498 +
1499 +       return x;
1500 +}
1501 +
1502  static char *getNISserver(pam_handle_t *pamh)
1503  {
1504         char *master;
1505 @@ -1303,6 +1317,14 @@
1506
1507                 if (on(UNIX_MD5_PASS, ctrl)) {
1508                         tpass = crypt_md5_wrapper(pass_new);
1509 +               } else if (on(UNIX_BLOWFISH, ctrl)) {
1510 +                       struct passwd *p_user;
1511 +
1512 +                       p_user = pam_modutil_getpwnam(pamh, user);
1513 +                       if ((p_user != NULL) && (p_user->pw_uid == 0))
1514 +                               tpass = crypt_blowfish_wrapper(pass_new, BLOWFISH_ROOT_ROUNDS);
1515 +                       else
1516 +                               tpass = crypt_blowfish_wrapper(pass_new, BLOWFISH_USER_ROUNDS);
1517                 } else {
1518                         /*
1519                          * Salt manipulation is stolen from Rick Faith's passwd
1520 diff -urN Linux-PAM-0.99.7.1.orig/modules/pam_unix/README Linux-PAM-0.99.7.1/modules/pam_unix/README
1521 --- Linux-PAM-0.99.7.1.orig/modules/pam_unix/README     2006-09-22 15:01:20.000000000 +0200
1522 +++ Linux-PAM-0.99.7.1/modules/pam_unix/README  2007-02-04 20:00:27.976978609 +0100
1523 @@ -109,6 +109,11 @@
1524
1525      When a user changes their password next, encrypt it with the MD5 algorithm.
1526
1527 +blowfish
1528 +
1529 +    When a user changes their password next, encrypt it with the OpenBSD
1530 +    Blowfish algorithm.
1531 +
1532  bigcrypt
1533
1534      When a user changes their password next, encrypt it with the DEC C2
1535 diff -urN Linux-PAM-0.99.7.1.orig/modules/pam_unix/support.c Linux-PAM-0.99.7.1/modules/pam_unix/support.c
1536 --- Linux-PAM-0.99.7.1.orig/modules/pam_unix/support.c  2007-01-23 10:41:21.000000000 +0100
1537 +++ Linux-PAM-0.99.7.1/modules/pam_unix/support.c       2007-02-04 20:00:16.992352631 +0100
1538 @@ -29,6 +29,7 @@
1539  #include "md5.h"
1540  #include "support.h"
1541  #include "bigcrypt.h"
1542 +#include "blowfish.h"
1543  #ifdef WITH_SELINUX
1544  #include <selinux/selinux.h>
1545  #define SELINUX_ENABLED is_selinux_enabled()>0
1546 @@ -698,6 +699,8 @@
1547                         _pam_delete(pp);
1548                         pp = Brokencrypt_md5(p, salt);
1549                     }
1550 +               } else if (!strncmp(salt, "$2", 2)) {
1551 +                   pp = bcrypt(p, salt);
1552                 } else if (*salt != '$' && salt_len >= 13) {
1553                     pp = bigcrypt(p, salt);
1554                     if (pp && strlen(pp) > salt_len) {
1555 diff -urN Linux-PAM-0.99.7.1.orig/modules/pam_unix/support.h Linux-PAM-0.99.7.1/modules/pam_unix/support.h
1556 --- Linux-PAM-0.99.7.1.orig/modules/pam_unix/support.h  2007-01-23 10:30:23.000000000 +0100
1557 +++ Linux-PAM-0.99.7.1/modules/pam_unix/support.h       2007-02-04 19:53:39.269687706 +0100
1558 @@ -84,8 +84,9 @@
1559  #define UNIX_NOREAP              21     /* don't reap child process */
1560  #define UNIX_BROKEN_SHADOW       22     /* ignore errors reading password aging
1561                                          * information during acct management */
1562 +#define UNIX_BLOWFISH            23    /* force the use of Blowfish passwords */
1563  /* -------------- */
1564 -#define UNIX_CTRLS_              23    /* number of ctrl arguments defined */
1565 +#define UNIX_CTRLS_              24    /* number of ctrl arguments defined */
1566
1567
1568  static const UNIX_Ctrls unix_args[UNIX_CTRLS_] =
1569 @@ -106,16 +107,17 @@
1570  /* UNIX__QUIET */          {NULL,              _ALL_ON_,               02000},
1571  /* UNIX_USE_AUTHTOK */     {"use_authtok",     _ALL_ON_,               04000},
1572  /* UNIX_SHADOW */          {"shadow",          _ALL_ON_,              010000},
1573 -/* UNIX_MD5_PASS */        {"md5",             _ALL_ON_^(0400000),    020000},
1574 +/* UNIX_MD5_PASS */        {"md5",             _ALL_ON_^(020400000),  020000},
1575  /* UNIX__NULLOK */         {"nullok",          _ALL_ON_^(01000),           0},
1576  /* UNIX_DEBUG */           {"debug",           _ALL_ON_,              040000},
1577  /* UNIX_NODELAY */         {"nodelay",         _ALL_ON_,             0100000},
1578  /* UNIX_NIS */             {"nis",             _ALL_ON_,             0200000},
1579 -/* UNIX_BIGCRYPT */        {"bigcrypt",        _ALL_ON_^(020000),    0400000},
1580 +/* UNIX_BIGCRYPT */        {"bigcrypt",        _ALL_ON_^(020020000), 0400000},
1581  /* UNIX_LIKE_AUTH */       {"likeauth",        _ALL_ON_,            01000000},
1582  /* UNIX_REMEMBER_PASSWD */ {"remember=",       _ALL_ON_,            02000000},
1583  /* UNIX_NOREAP */          {"noreap",          _ALL_ON_,            04000000},
1584  /* UNIX_BROKEN_SHADOW */   {"broken_shadow",   _ALL_ON_,           010000000},
1585 +/* UNIX_BLOWFISH */        {"blowfish",        _ALL_ON_^(000420000),020000000},
1586  };
1587
1588  #define UNIX_DEFAULTS  (unix_args[UNIX__NONULL].flag)
1589 diff -urN Linux-PAM-0.99.7.1.orig/modules/pam_unix/unix_chkpwd.c Linux-PAM-0.99.7.1/modules/pam_unix/unix_chkpwd.c
1590 --- Linux-PAM-0.99.7.1.orig/modules/pam_unix/unix_chkpwd.c      2006-10-24 12:01:49.000000000 +0200
1591 +++ Linux-PAM-0.99.7.1/modules/pam_unix/unix_chkpwd.c   2007-02-04 19:53:39.269687706 +0100
1592 @@ -41,6 +41,7 @@
1593
1594  #include "md5.h"
1595  #include "bigcrypt.h"
1596 +#include "blowfish.h"
1597
1598  /* syslogging function for errors and other information */
1599
1600 @@ -203,6 +204,10 @@
1601                         if (pp && strcmp(pp, salt) == 0)
1602                                 retval = PAM_SUCCESS;
1603                 }
1604 +       } else if (!strncmp(salt, "$2", 2)) {
1605 +               pp = bcrypt(p, salt);
1606 +               if (pp && strcmp(pp, salt) == 0)
1607 +                       retval = PAM_SUCCESS;
1608         } else if (*salt == '$') {
1609                 /*
1610                  * Ok, we don't know the crypt algorithm, but maybe