glibc-crypt-blowfish.patch

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