1 diff -urN glibc-2.1.91.orig/crypt/Makefile glibc-2.1.91/crypt/Makefile
2 --- glibc-2.1.91.orig/crypt/Makefile Wed Jun 14 05:49:02 2000
3 +++ glibc-2.1.91/crypt/Makefile Sat Jul 15 00:58:39 2000
6 extra-libs-others := $(extra-libs)
8 -libcrypt-routines := crypt-entry md5-crypt md5 crypt crypt_util
9 +libcrypt-routines := crypt-entry md5-crypt md5 arc4random bcrypt blowfish crypt crypt_util
11 tests = cert md5test md5c-test
13 diff -urN glibc-2.1.91.orig/crypt/arc4random.c glibc-2.1.91/crypt/arc4random.c
14 --- glibc-2.1.91.orig/crypt/arc4random.c Thu Jan 1 01:00:00 1970
15 +++ glibc-2.1.91/crypt/arc4random.c Sat Jul 15 00:56:30 2000
18 + * Arc4 random number generator for OpenBSD.
19 + * Copyright 1996 David Mazieres <dm@lcs.mit.edu>.
21 + * Modification and redistribution in source and binary forms is
22 + * permitted provided that due credit is given to the author and the
23 + * OpenBSD project (for instance by leaving this copyright notice
28 + * This code is derived from section 17.1 of Applied Cryptography,
29 + * second edition, which describes a stream cipher allegedly
30 + * compatible with RSA Labs "RC4" cipher (the actual description of
31 + * which is a trade secret). The same algorithm is used as a stream
32 + * cipher called "arcfour" in Tatu Ylonen's ssh package.
34 + * Here the stream cipher has been modified always to include the time
35 + * when initializing the state. That makes it impossible to
36 + * regenerate the same random sequence twice, so this can't be used
37 + * for encryption, but will generate good random numbers.
39 + * RC4 is a registered trademark of RSA Laboratories.
45 +#include <sys/types.h>
46 +#include <sys/time.h>
49 +#define inline __inline
50 +#else /* !__GNUC__ */
52 +#endif /* !__GNUC__ */
61 +static struct arc4_stream rs;
65 + struct arc4_stream *as;
69 + for (n = 0; n < 256; n++)
76 +arc4_addrandom(as, dat, datlen)
77 + struct arc4_stream *as;
85 + for (n = 0; n < 256; n++) {
86 + as->i = (as->i + 1);
88 + as->j = (as->j + si + dat[n % datlen]);
89 + as->s[as->i] = as->s[as->j];
96 + struct arc4_stream *as;
101 + u_int8_t rnd[128 - sizeof(struct timeval)];
104 + gettimeofday(&rdat.tv, NULL);
105 + fd = open("/dev/random", O_RDONLY);
107 + read(fd, rdat.rnd, sizeof(rdat.rnd));
110 + /* fd < 0? Ah, what the heck. We'll just take whatever was on the
113 + arc4_addrandom(as, (void *) &rdat, sizeof(rdat));
116 +static inline u_int8_t
118 + struct arc4_stream *as;
122 + as->i = (as->i + 1);
124 + as->j = (as->j + si);
128 + return (as->s[(si + sj) & 0xff]);
131 +static inline u_int32_t
133 + struct arc4_stream *as;
136 + val = arc4_getbyte(as) << 24;
137 + val |= arc4_getbyte(as) << 16;
138 + val |= arc4_getbyte(as) << 8;
139 + val |= arc4_getbyte(as);
146 + if (!rs_initialized) {
148 + rs_initialized = 1;
154 +arc4random_addrandom(dat, datlen)
158 + if (!rs_initialized)
160 + arc4_addrandom(&rs, dat, datlen);
166 + if (!rs_initialized)
168 + return arc4_getword(&rs);
172 +/*-------- Test code for i386 --------*/
174 +#include <machine/pctr.h>
176 +main(int argc, char **argv)
178 + const int iter = 1000000;
183 + for (i = 0; i < iter; i++)
188 + printf("%qd cycles\n", v);
191 diff -urN glibc-2.1.91.orig/crypt/bcrypt.c glibc-2.1.91/crypt/bcrypt.c
192 --- glibc-2.1.91.orig/crypt/bcrypt.c Thu Jan 1 01:00:00 1970
193 +++ glibc-2.1.91/crypt/bcrypt.c Sat Jul 15 00:56:30 2000
196 + * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
197 + * All rights reserved.
199 + * Redistribution and use in source and binary forms, with or without
200 + * modification, are permitted provided that the following conditions
202 + * 1. Redistributions of source code must retain the above copyright
203 + * notice, this list of conditions and the following disclaimer.
204 + * 2. Redistributions in binary form must reproduce the above copyright
205 + * notice, this list of conditions and the following disclaimer in the
206 + * documentation and/or other materials provided with the distribution.
207 + * 3. All advertising materials mentioning features or use of this software
208 + * must display the following acknowledgement:
209 + * This product includes software developed by Niels Provos.
210 + * 4. The name of the author may not be used to endorse or promote products
211 + * derived from this software without specific prior written permission.
213 + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
214 + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
215 + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
216 + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
217 + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
218 + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
219 + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
220 + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
221 + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
222 + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
225 +/* This password hashing algorithm was designed by David Mazieres
226 + * <dm@lcs.mit.edu> and works as follows:
228 + * 1. state := InitState ()
229 + * 2. state := ExpandKey (state, salt, password) 3.
231 + * state := ExpandKey (state, 0, salt)
232 + * state := ExpandKey(state, 0, password)
233 + * 4. ctext := "OrpheanBeholderScryDoubt"
235 + * ctext := Encrypt_ECB (state, ctext);
236 + * 6. RETURN Concatenate (salt, ctext);
246 +#include <sys/types.h>
251 +/* This implementation is adaptable to current computing power.
252 + * You can have up to 2^31 rounds which should be enough for some
256 +#define BCRYPT_VERSION '2'
257 +#define BCRYPT_MAXSALT 16 /* Precomputation is just so nice */
258 +#define BCRYPT_BLOCKS 6 /* Ciphertext blocks */
259 +#define BCRYPT_MINROUNDS 16 /* we have log2(rounds) in salt */
261 +char *bcrypt_gensalt __P((u_int8_t));
263 +static void encode_salt __P((char *, u_int8_t *, u_int16_t, u_int8_t));
264 +static void encode_base64 __P((u_int8_t *, u_int8_t *, u_int16_t));
265 +static void decode_base64 __P((u_int8_t *, u_int16_t, u_int8_t *));
267 +static char encrypted[128];
268 +static char gsalt[BCRYPT_MAXSALT * 4 / 3 + 1];
269 +static char error[] = ":";
271 +const static u_int8_t Base64Code[] =
272 +"./ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
274 +const static u_int8_t index_64[128] =
276 + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
277 + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
278 + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
279 + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
280 + 255, 255, 255, 255, 255, 255, 0, 1, 54, 55,
281 + 56, 57, 58, 59, 60, 61, 62, 63, 255, 255,
282 + 255, 255, 255, 255, 255, 2, 3, 4, 5, 6,
283 + 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
284 + 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
285 + 255, 255, 255, 255, 255, 255, 28, 29, 30,
286 + 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
287 + 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
288 + 51, 52, 53, 255, 255, 255, 255, 255
290 +#define CHAR64(c) ( (c) > 127 ? 255 : index_64[(c)])
294 +decode_base64(u_int8_t *buffer, u_int16_t len, u_int8_t *data)
297 +decode_base64(buffer, len, data)
303 + u_int8_t *bp = buffer;
304 + u_int8_t *p = data;
305 + u_int8_t c1, c2, c3, c4;
306 + while (bp < buffer + len) {
308 + c2 = CHAR64(*(p + 1));
311 + if (c1 == 255 || c2 == 255)
314 + *bp++ = (c1 << 2) | ((c2 & 0x30) >> 4);
315 + if (bp >= buffer + len)
318 + c3 = CHAR64(*(p + 2));
322 + *bp++ = ((c2 & 0x0f) << 4) | ((c3 & 0x3c) >> 2);
323 + if (bp >= buffer + len)
326 + c4 = CHAR64(*(p + 3));
329 + *bp++ = ((c3 & 0x03) << 6) | c4;
337 +encode_salt(char *salt, u_int8_t *csalt, u_int16_t clen, u_int8_t logr)
340 +encode_salt(salt, csalt, clen, logr)
348 + salt[1] = BCRYPT_VERSION;
352 + snprintf(salt + 4, 4, "%2.2u$", logr);
354 + encode_base64((u_int8_t *) salt + 7, csalt, clen);
356 +/* Generates a salt for this version of crypt.
357 + Since versions may change. Keeping this here
363 +bcrypt_gensalt(u_int8_t log_rounds)
366 +bcrypt_gensalt(log_rounds)
367 + u_int8_t log_rounds;
370 + u_int8_t csalt[BCRYPT_MAXSALT];
372 + u_int32_t seed = 0;
374 + for (i = 0; i < BCRYPT_MAXSALT; i++) {
376 + seed = arc4random();
377 + csalt[i] = seed & 0xff;
381 + if (log_rounds < 4)
384 + encode_salt(gsalt, csalt, BCRYPT_MAXSALT, log_rounds);
387 +/* We handle $Vers$log2(NumRounds)$salt+passwd$
388 + i.e. $2$04$iwouldntknowwhattosayetKdJ6iFtacBqJdKe6aW7ou */
396 + u_int32_t rounds, i, k;
398 + u_int8_t key_len, salt_len, logr, minor;
399 + u_int8_t ciphertext[4 * BCRYPT_BLOCKS] = "OrpheanBeholderScryDoubt";
400 + u_int8_t csalt[BCRYPT_MAXSALT];
401 + u_int32_t cdata[BCRYPT_BLOCKS];
403 + /* Discard "$" identifier */
406 + if (*salt > BCRYPT_VERSION) {
407 + /* How do I handle errors ? Return ':' */
411 + /* Check for minor versions */
412 + if (salt[1] != '$') {
415 + /* 'ab' should not yield the same as 'abab' */
425 + /* Discard version + "$" identifier */
428 + if (salt[2] != '$')
429 + /* Out of sync with passwd entry */
432 + /* Computer power doesnt increase linear, 2^x should be fine */
433 + if ((rounds = (u_int32_t) 1 << (logr = atoi(salt))) < BCRYPT_MINROUNDS)
436 + /* Discard num rounds + "$" identifier */
439 + /* We dont want the base64 salt but the raw data */
440 + decode_base64(csalt, BCRYPT_MAXSALT, (u_int8_t *) salt);
441 + salt_len = BCRYPT_MAXSALT;
442 + key_len = strlen(key) + (minor >= 'a' ? 1 : 0);
444 + /* Setting up S-Boxes and Subkeys */
445 + Blowfish_initstate(&state);
446 + Blowfish_expandstate(&state, csalt, salt_len,
447 + (u_int8_t *) key, key_len);
448 + for (k = 0; k < rounds; k++) {
449 + Blowfish_expand0state(&state, (u_int8_t *) key, key_len);
450 + Blowfish_expand0state(&state, csalt, salt_len);
453 + /* This can be precomputed later */
455 + for (i = 0; i < BCRYPT_BLOCKS; i++)
456 + cdata[i] = Blowfish_stream2word(ciphertext, 4 * BCRYPT_BLOCKS, &j);
458 + /* Now do the encryption */
459 + for (k = 0; k < 64; k++)
460 + blf_enc(&state, cdata, BCRYPT_BLOCKS / 2);
462 + for (i = 0; i < BCRYPT_BLOCKS; i++) {
463 + ciphertext[4 * i + 3] = cdata[i] & 0xff;
464 + cdata[i] = cdata[i] >> 8;
465 + ciphertext[4 * i + 2] = cdata[i] & 0xff;
466 + cdata[i] = cdata[i] >> 8;
467 + ciphertext[4 * i + 1] = cdata[i] & 0xff;
468 + cdata[i] = cdata[i] >> 8;
469 + ciphertext[4 * i + 0] = cdata[i] & 0xff;
474 + encrypted[i++] = '$';
475 + encrypted[i++] = BCRYPT_VERSION;
477 + encrypted[i++] = minor;
478 + encrypted[i++] = '$';
480 + snprintf(encrypted + i, 4, "%2.2u$", logr);
482 + encode_base64((u_int8_t *) encrypted + i + 3, csalt, BCRYPT_MAXSALT);
483 + encode_base64((u_int8_t *) encrypted + strlen(encrypted), ciphertext,
484 + 4 * BCRYPT_BLOCKS - 1);
490 +encode_base64(u_int8_t *buffer, u_int8_t *data, u_int16_t len)
493 +encode_base64(buffer, data, len)
499 + u_int8_t *bp = buffer;
500 + u_int8_t *p = data;
502 + while (p < data + len) {
504 + *bp++ = Base64Code[(c1 >> 2)];
505 + c1 = (c1 & 0x03) << 4;
506 + if (p >= data + len) {
507 + *bp++ = Base64Code[c1];
511 + c1 |= (c2 >> 4) & 0x0f;
512 + *bp++ = Base64Code[c1];
513 + c1 = (c2 & 0x0f) << 2;
514 + if (p >= data + len) {
515 + *bp++ = Base64Code[c1];
519 + c1 |= (c2 >> 6) & 0x03;
520 + *bp++ = Base64Code[c1];
521 + *bp++ = Base64Code[c2 & 0x3f];
533 + salt[1] = BCRYPT_VERSION;
536 + snprintf(salt + 3, 4, "%2.2u$", 5);
538 + printf("24 bytes of salt: ");
539 + fgets(salt + 6, 94, stdin);
541 + printf("72 bytes of password: ");
543 + fgets(blubber, 73, stdin);
546 + p = crypt(blubber, salt);
547 + printf("Passwd entry: %s\n\n", p);
549 + p = bcrypt_gensalt(5);
550 + printf("Generated salt: %s\n", p);
551 + p = crypt(blubber, p);
552 + printf("Passwd entry: %s\n", p);
555 diff -urN glibc-2.1.91.orig/crypt/blf.h glibc-2.1.91/crypt/blf.h
556 --- glibc-2.1.91.orig/crypt/blf.h Thu Jan 1 01:00:00 1970
557 +++ glibc-2.1.91/crypt/blf.h Sat Jul 15 00:56:30 2000
560 + * Blowfish - a fast block cipher designed by Bruce Schneier
562 + * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
563 + * All rights reserved.
565 + * Redistribution and use in source and binary forms, with or without
566 + * modification, are permitted provided that the following conditions
568 + * 1. Redistributions of source code must retain the above copyright
569 + * notice, this list of conditions and the following disclaimer.
570 + * 2. Redistributions in binary form must reproduce the above copyright
571 + * notice, this list of conditions and the following disclaimer in the
572 + * documentation and/or other materials provided with the distribution.
573 + * 3. All advertising materials mentioning features or use of this software
574 + * must display the following acknowledgement:
575 + * This product includes software developed by Niels Provos.
576 + * 4. The name of the author may not be used to endorse or promote products
577 + * derived from this software without specific prior written permission.
579 + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
580 + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
581 + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
582 + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
583 + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
584 + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
585 + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
586 + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
587 + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
588 + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
594 +/* Schneier states the maximum key length to be 56 bytes.
595 + * The way how the subkeys are initalized by the key up
596 + * to (N+2)*4 i.e. 72 bytes are utilized.
597 + * Warning: For normal blowfish encryption only 56 bytes
598 + * of the key affect all cipherbits.
601 +#define BLF_N 16 /* Number of Subkeys */
602 +#define BLF_MAXKEYLEN ((BLF_N-2)*4) /* 448 bits */
604 +/* Blowfish context */
605 +typedef struct BlowfishContext {
606 + u_int32_t S[4][256]; /* S-Boxes */
607 + u_int32_t P[BLF_N + 2]; /* Subkeys */
610 +/* Raw access to customized Blowfish
612 + * Blowfish_initstate( state )
613 + * Blowfish_expand0state( state, key, keylen )
616 +void Blowfish_encipher __P((blf_ctx *, u_int32_t *, u_int32_t *));
617 +void Blowfish_decipher __P((blf_ctx *, u_int32_t *, u_int32_t *));
618 +void Blowfish_initstate __P((blf_ctx *));
619 +void Blowfish_expand0state __P((blf_ctx *, const u_int8_t *, u_int16_t));
620 +void Blowfish_expandstate
621 + __P((blf_ctx *, const u_int8_t *, u_int16_t, const u_int8_t *, u_int16_t));
623 +/* Standard Blowfish */
625 +void blf_key __P((blf_ctx *, const u_int8_t *, u_int16_t));
626 +void blf_enc __P((blf_ctx *, u_int32_t *, u_int16_t));
627 +void blf_dec __P((blf_ctx *, u_int32_t *, u_int16_t));
629 +void blf_ecb_encrypt __P((blf_ctx *, u_int8_t *, u_int32_t));
630 +void blf_ecb_decrypt __P((blf_ctx *, u_int8_t *, u_int32_t));
632 +void blf_cbc_encrypt __P((blf_ctx *, u_int8_t *, u_int8_t *, u_int32_t));
633 +void blf_cbc_decrypt __P((blf_ctx *, u_int8_t *, u_int8_t *, u_int32_t));
635 +/* Converts u_int8_t to u_int32_t */
636 +u_int32_t Blowfish_stream2word __P((const u_int8_t *, u_int16_t , u_int16_t *));
639 diff -urN glibc-2.1.91.orig/crypt/blowfish.c glibc-2.1.91/crypt/blowfish.c
640 --- glibc-2.1.91.orig/crypt/blowfish.c Thu Jan 1 01:00:00 1970
641 +++ glibc-2.1.91/crypt/blowfish.c Sat Jul 15 00:56:30 2000
644 + * Blowfish block cipher for OpenBSD
645 + * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
646 + * All rights reserved.
648 + * Implementation advice by David Mazieres <dm@lcs.mit.edu>.
650 + * Redistribution and use in source and binary forms, with or without
651 + * modification, are permitted provided that the following conditions
653 + * 1. Redistributions of source code must retain the above copyright
654 + * notice, this list of conditions and the following disclaimer.
655 + * 2. Redistributions in binary form must reproduce the above copyright
656 + * notice, this list of conditions and the following disclaimer in the
657 + * documentation and/or other materials provided with the distribution.
658 + * 3. All advertising materials mentioning features or use of this software
659 + * must display the following acknowledgement:
660 + * This product includes software developed by Niels Provos.
661 + * 4. The name of the author may not be used to endorse or promote products
662 + * derived from this software without specific prior written permission.
664 + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
665 + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
666 + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
667 + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
668 + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
669 + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
670 + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
671 + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
672 + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
673 + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
677 + * This code is derived from section 14.3 and the given source
678 + * in section V of Applied Cryptography, second edition.
679 + * Blowfish is an unpatented fast block cipher designed by
684 +#include <stdio.h> /* used for debugging */
688 +#include <sys/types.h>
693 +#define inline __inline
694 +#else /* !__GNUC__ */
696 +#endif /* !__GNUC__ */
698 +/* Function for Feistel Networks */
700 +#define F(bc, x) ((((bc)->S[0][((x) & 0xFF000000) >> 24] \
701 + + (bc)->S[1][((x) &0xFF0000 ) >> 16]) \
702 + ^ (bc)->S[2][((x) & 0xFF00) >> 8]) \
703 + + (bc)->S[3][(x) & 0x00FF])
705 +#define BLFRND(bc,i,j,n) (i ^= F(bc,j) ^ (bc)->P[n])
708 +Blowfish_encipher(c, xl, xr)
720 + BLFRND(c, Xr, Xl, 1); BLFRND(c, Xl, Xr, 2);
721 + BLFRND(c, Xr, Xl, 3); BLFRND(c, Xl, Xr, 4);
722 + BLFRND(c, Xr, Xl, 5); BLFRND(c, Xl, Xr, 6);
723 + BLFRND(c, Xr, Xl, 7); BLFRND(c, Xl, Xr, 8);
724 + BLFRND(c, Xr, Xl, 9); BLFRND(c, Xl, Xr, 10);
725 + BLFRND(c, Xr, Xl, 11); BLFRND(c, Xl, Xr, 12);
726 + BLFRND(c, Xr, Xl, 13); BLFRND(c, Xl, Xr, 14);
727 + BLFRND(c, Xr, Xl, 15); BLFRND(c, Xl, Xr, 16);
729 + *xl = Xr ^ c->P[17];
734 +Blowfish_decipher(c, xl, xr)
746 + BLFRND(c, Xr, Xl, 16); BLFRND(c, Xl, Xr, 15);
747 + BLFRND(c, Xr, Xl, 14); BLFRND(c, Xl, Xr, 13);
748 + BLFRND(c, Xr, Xl, 12); BLFRND(c, Xl, Xr, 11);
749 + BLFRND(c, Xr, Xl, 10); BLFRND(c, Xl, Xr, 9);
750 + BLFRND(c, Xr, Xl, 8); BLFRND(c, Xl, Xr, 7);
751 + BLFRND(c, Xr, Xl, 6); BLFRND(c, Xl, Xr, 5);
752 + BLFRND(c, Xr, Xl, 4); BLFRND(c, Xl, Xr, 3);
753 + BLFRND(c, Xr, Xl, 2); BLFRND(c, Xl, Xr, 1);
755 + *xl = Xr ^ c->P[0];
760 +Blowfish_initstate(c)
764 +/* P-box and S-box tables initialized with digits of Pi */
766 + const blf_ctx initstate =
770 + 0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7,
771 + 0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
772 + 0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16,
773 + 0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e,
774 + 0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee,
775 + 0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
776 + 0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef,
777 + 0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e,
778 + 0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60,
779 + 0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440,
780 + 0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce,
781 + 0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a,
782 + 0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e,
783 + 0xafd6ba33, 0x6c24cf5c, 0x7a325381, 0x28958677,
784 + 0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193,
785 + 0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032,
786 + 0xef845d5d, 0xe98575b1, 0xdc262302, 0xeb651b88,
787 + 0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239,
788 + 0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e,
789 + 0x21c66842, 0xf6e96c9a, 0x670c9c61, 0xabd388f0,
790 + 0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3,
791 + 0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98,
792 + 0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88,
793 + 0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe,
794 + 0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6,
795 + 0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d,
796 + 0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b,
797 + 0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7,
798 + 0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba,
799 + 0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463,
800 + 0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f,
801 + 0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09,
802 + 0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3,
803 + 0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb,
804 + 0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279,
805 + 0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8,
806 + 0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab,
807 + 0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82,
808 + 0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db,
809 + 0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573,
810 + 0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0,
811 + 0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b,
812 + 0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790,
813 + 0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8,
814 + 0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4,
815 + 0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0,
816 + 0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, 0x8e7594b7,
817 + 0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c,
818 + 0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad,
819 + 0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1,
820 + 0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299,
821 + 0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9,
822 + 0x165fa266, 0x80957705, 0x93cc7314, 0x211a1477,
823 + 0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf,
824 + 0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49,
825 + 0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af,
826 + 0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa,
827 + 0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5,
828 + 0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41,
829 + 0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
830 + 0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400,
831 + 0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915,
832 + 0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664,
833 + 0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a},
835 + 0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623,
836 + 0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266,
837 + 0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1,
838 + 0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e,
839 + 0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6,
840 + 0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
841 + 0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e,
842 + 0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1,
843 + 0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737,
844 + 0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8,
845 + 0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff,
846 + 0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd,
847 + 0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701,
848 + 0x3ae5e581, 0x37c2dadc, 0xc8b57634, 0x9af3dda7,
849 + 0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41,
850 + 0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331,
851 + 0x4e548b38, 0x4f6db908, 0x6f420d03, 0xf60a04bf,
852 + 0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af,
853 + 0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e,
854 + 0x5512721f, 0x2e6b7124, 0x501adde6, 0x9f84cd87,
855 + 0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c,
856 + 0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2,
857 + 0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16,
858 + 0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd,
859 + 0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b,
860 + 0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509,
861 + 0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e,
862 + 0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3,
863 + 0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f,
864 + 0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a,
865 + 0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4,
866 + 0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960,
867 + 0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66,
868 + 0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28,
869 + 0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802,
870 + 0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84,
871 + 0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510,
872 + 0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf,
873 + 0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14,
874 + 0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e,
875 + 0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50,
876 + 0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7,
877 + 0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8,
878 + 0xf837889a, 0x97e32d77, 0x11ed935f, 0x16681281,
879 + 0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99,
880 + 0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696,
881 + 0xcdb30aeb, 0x532e3054, 0x8fd948e4, 0x6dbc3128,
882 + 0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73,
883 + 0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0,
884 + 0x45eee2b6, 0xa3aaabea, 0xdb6c4f15, 0xfacb4fd0,
885 + 0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105,
886 + 0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250,
887 + 0xcf62a1f2, 0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3,
888 + 0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285,
889 + 0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00,
890 + 0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061,
891 + 0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb,
892 + 0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e,
893 + 0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735,
894 + 0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc,
895 + 0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9,
896 + 0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340,
897 + 0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20,
898 + 0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7},
900 + 0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934,
901 + 0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,
902 + 0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af,
903 + 0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840,
904 + 0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45,
905 + 0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504,
906 + 0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a,
907 + 0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb,
908 + 0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee,
909 + 0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6,
910 + 0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42,
911 + 0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b,
912 + 0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2,
913 + 0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb,
914 + 0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527,
915 + 0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b,
916 + 0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33,
917 + 0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c,
918 + 0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3,
919 + 0x95c11548, 0xe4c66d22, 0x48c1133f, 0xc70f86dc,
920 + 0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17,
921 + 0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564,
922 + 0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b,
923 + 0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115,
924 + 0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922,
925 + 0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728,
926 + 0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0,
927 + 0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e,
928 + 0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37,
929 + 0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d,
930 + 0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804,
931 + 0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b,
932 + 0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3,
933 + 0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb,
934 + 0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d,
935 + 0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c,
936 + 0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350,
937 + 0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9,
938 + 0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a,
939 + 0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe,
940 + 0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d,
941 + 0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc,
942 + 0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f,
943 + 0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61,
944 + 0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2,
945 + 0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9,
946 + 0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2,
947 + 0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c,
948 + 0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e,
949 + 0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633,
950 + 0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10,
951 + 0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169,
952 + 0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52,
953 + 0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027,
954 + 0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5,
955 + 0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62,
956 + 0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634,
957 + 0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76,
958 + 0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24,
959 + 0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc,
960 + 0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4,
961 + 0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c,
962 + 0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837,
963 + 0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0},
965 + 0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b,
966 + 0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe,
967 + 0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b,
968 + 0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4,
969 + 0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8,
970 + 0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6,
971 + 0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304,
972 + 0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22,
973 + 0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4,
974 + 0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6,
975 + 0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9,
976 + 0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59,
977 + 0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593,
978 + 0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51,
979 + 0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28,
980 + 0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c,
981 + 0xe029ac71, 0xe019a5e6, 0x47b0acfd, 0xed93fa9b,
982 + 0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28,
983 + 0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c,
984 + 0x15056dd4, 0x88f46dba, 0x03a16125, 0x0564f0bd,
985 + 0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a,
986 + 0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319,
987 + 0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb,
988 + 0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f,
989 + 0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991,
990 + 0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32,
991 + 0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680,
992 + 0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166,
993 + 0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae,
994 + 0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb,
995 + 0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5,
996 + 0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47,
997 + 0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370,
998 + 0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d,
999 + 0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84,
1000 + 0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048,
1001 + 0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8,
1002 + 0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd,
1003 + 0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9,
1004 + 0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7,
1005 + 0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38,
1006 + 0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f,
1007 + 0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c,
1008 + 0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525,
1009 + 0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1,
1010 + 0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442,
1011 + 0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, 0x3278e964,
1012 + 0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e,
1013 + 0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8,
1014 + 0xdf359f8d, 0x9b992f2e, 0xe60b6f47, 0x0fe3f11d,
1015 + 0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f,
1016 + 0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299,
1017 + 0xf523f357, 0xa6327623, 0x93a83531, 0x56cccd02,
1018 + 0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc,
1019 + 0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614,
1020 + 0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a,
1021 + 0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6,
1022 + 0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b,
1023 + 0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0,
1024 + 0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060,
1025 + 0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e,
1026 + 0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9,
1027 + 0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f,
1028 + 0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6}
1031 + 0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344,
1032 + 0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89,
1033 + 0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
1034 + 0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917,
1035 + 0x9216d5d9, 0x8979fb1b
1044 +Blowfish_stream2word(const u_int8_t *data, u_int16_t databytes, u_int16_t *current)
1047 +Blowfish_stream2word(data, databytes, current)
1048 + const u_int8_t *data;
1049 + u_int16_t databytes;
1050 + u_int16_t *current;
1057 + temp = 0x00000000;
1060 + for (i = 0; i < 4; i++, j++) {
1061 + if (j >= databytes)
1063 + temp = (temp << 8) | data[j];
1072 +Blowfish_expand0state(blf_ctx *c, const u_int8_t *key, u_int16_t keybytes)
1075 +Blowfish_expand0state(c, key, keybytes)
1077 + const u_int8_t *key;
1078 + u_int16_t keybytes;
1089 + for (i = 0; i < BLF_N + 2; i++) {
1090 + /* Extract 4 int8 to 1 int32 from keystream */
1091 + temp = Blowfish_stream2word(key, keybytes, &j);
1092 + c->P[i] = c->P[i] ^ temp;
1096 + datal = 0x00000000;
1097 + datar = 0x00000000;
1098 + for (i = 0; i < BLF_N + 2; i += 2) {
1099 + Blowfish_encipher(c, &datal, &datar);
1102 + c->P[i + 1] = datar;
1105 + for (i = 0; i < 4; i++) {
1106 + for (k = 0; k < 256; k += 2) {
1107 + Blowfish_encipher(c, &datal, &datar);
1109 + c->S[i][k] = datal;
1110 + c->S[i][k + 1] = datar;
1118 +Blowfish_expandstate(blf_ctx *c, const u_int8_t *data, u_int16_t databytes,
1119 + const u_int8_t *key, u_int16_t keybytes)
1122 +Blowfish_expandstate(c, data, databytes, key, keybytes)
1124 + const u_int8_t *data;
1125 + u_int16_t databytes;
1126 + const u_int8_t *key;
1127 + u_int16_t keybytes;
1138 + for (i = 0; i < BLF_N + 2; i++) {
1139 + /* Extract 4 int8 to 1 int32 from keystream */
1140 + temp = Blowfish_stream2word(key, keybytes, &j);
1141 + c->P[i] = c->P[i] ^ temp;
1145 + datal = 0x00000000;
1146 + datar = 0x00000000;
1147 + for (i = 0; i < BLF_N + 2; i += 2) {
1148 + datal ^= Blowfish_stream2word(data, databytes, &j);
1149 + datar ^= Blowfish_stream2word(data, databytes, &j);
1150 + Blowfish_encipher(c, &datal, &datar);
1153 + c->P[i + 1] = datar;
1156 + for (i = 0; i < 4; i++) {
1157 + for (k = 0; k < 256; k += 2) {
1158 + datal ^= Blowfish_stream2word(data, databytes, &j);
1159 + datar ^= Blowfish_stream2word(data, databytes, &j);
1160 + Blowfish_encipher(c, &datal, &datar);
1162 + c->S[i][k] = datal;
1163 + c->S[i][k + 1] = datar;
1171 +blf_key(blf_ctx *c, const u_int8_t *k, u_int16_t len)
1176 + const u_int8_t *k;
1180 + /* Initalize S-boxes and subkeys with Pi */
1181 + Blowfish_initstate(c);
1183 + /* Transform S-boxes and subkeys with key */
1184 + Blowfish_expand0state(c, k, len);
1189 +blf_enc(blf_ctx *c, u_int32_t *data, u_int16_t blocks)
1192 +blf_enc(c, data, blocks)
1202 + for (i = 0; i < blocks; i++) {
1203 + Blowfish_encipher(c, d, d + 1);
1210 +blf_dec(blf_ctx *c, u_int32_t *data, u_int16_t blocks)
1213 +blf_dec(c, data, blocks)
1223 + for (i = 0; i < blocks; i++) {
1224 + Blowfish_decipher(c, d, d + 1);
1231 +blf_ecb_encrypt(blf_ctx *c, u_int8_t *data, u_int32_t len)
1234 +blf_ecb_encrypt(c, data, len)
1243 + for (i = 0; i < len; i += 8) {
1244 + l = data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3];
1245 + r = data[4] << 24 | data[5] << 16 | data[6] << 8 | data[7];
1246 + Blowfish_encipher(c, &l, &r);
1247 + data[0] = l >> 24 & 0xff;
1248 + data[1] = l >> 16 & 0xff;
1249 + data[2] = l >> 8 & 0xff;
1250 + data[3] = l & 0xff;
1251 + data[4] = r >> 24 & 0xff;
1252 + data[5] = r >> 16 & 0xff;
1253 + data[6] = r >> 8 & 0xff;
1254 + data[7] = r & 0xff;
1261 +blf_ecb_decrypt(blf_ctx *c, u_int8_t *data, u_int32_t len)
1264 +blf_ecb_decrypt(c, data, len)
1273 + for (i = 0; i < len; i += 8) {
1274 + l = data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3];
1275 + r = data[4] << 24 | data[5] << 16 | data[6] << 8 | data[7];
1276 + Blowfish_decipher(c, &l, &r);
1277 + data[0] = l >> 24 & 0xff;
1278 + data[1] = l >> 16 & 0xff;
1279 + data[2] = l >> 8 & 0xff;
1280 + data[3] = l & 0xff;
1281 + data[4] = r >> 24 & 0xff;
1282 + data[5] = r >> 16 & 0xff;
1283 + data[6] = r >> 8 & 0xff;
1284 + data[7] = r & 0xff;
1291 +blf_cbc_encrypt(blf_ctx *c, u_int8_t *iv, u_int8_t *data, u_int32_t len)
1294 +blf_cbc_encrypt(c, iv, data, len)
1304 + for (i = 0; i < len; i += 8) {
1305 + for (j = 0; j < 8; j++)
1307 + l = data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3];
1308 + r = data[4] << 24 | data[5] << 16 | data[6] << 8 | data[7];
1309 + Blowfish_encipher(c, &l, &r);
1310 + data[0] = l >> 24 & 0xff;
1311 + data[1] = l >> 16 & 0xff;
1312 + data[2] = l >> 8 & 0xff;
1313 + data[3] = l & 0xff;
1314 + data[4] = r >> 24 & 0xff;
1315 + data[5] = r >> 16 & 0xff;
1316 + data[6] = r >> 8 & 0xff;
1317 + data[7] = r & 0xff;
1325 +blf_cbc_decrypt(blf_ctx *c, u_int8_t *iva, u_int8_t *data, u_int32_t len)
1328 +blf_cbc_decrypt(c, iva, data, len)
1339 + iv = data + len - 16;
1340 + data = data + len - 8;
1341 + for (i = len - 8; i >= 8; i -= 8) {
1342 + l = data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3];
1343 + r = data[4] << 24 | data[5] << 16 | data[6] << 8 | data[7];
1344 + Blowfish_decipher(c, &l, &r);
1345 + data[0] = l >> 24 & 0xff;
1346 + data[1] = l >> 16 & 0xff;
1347 + data[2] = l >> 8 & 0xff;
1348 + data[3] = l & 0xff;
1349 + data[4] = r >> 24 & 0xff;
1350 + data[5] = r >> 16 & 0xff;
1351 + data[6] = r >> 8 & 0xff;
1352 + data[7] = r & 0xff;
1353 + for (j = 0; j < 8; j++)
1358 + l = data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3];
1359 + r = data[4] << 24 | data[5] << 16 | data[6] << 8 | data[7];
1360 + Blowfish_decipher(c, &l, &r);
1361 + data[0] = l >> 24 & 0xff;
1362 + data[1] = l >> 16 & 0xff;
1363 + data[2] = l >> 8 & 0xff;
1364 + data[3] = l & 0xff;
1365 + data[4] = r >> 24 & 0xff;
1366 + data[5] = r >> 16 & 0xff;
1367 + data[6] = r >> 8 & 0xff;
1368 + data[7] = r & 0xff;
1369 + for (j = 0; j < 8; j++)
1370 + data[j] ^= iva[j];
1375 +report(u_int32_t data[], u_int16_t len)
1378 + for (i = 0; i < len; i += 2)
1379 + printf("Block %0hd: %08lx %08lx.\n",
1380 + i / 2, data[i], data[i + 1]);
1387 + char key[] = "AAAAA";
1388 + char key2[] = "abcdefghijklmnopqrstuvwxyz";
1390 + u_int32_t data[10];
1391 + u_int32_t data2[] =
1392 + {0x424c4f57l, 0x46495348l};
1397 + for (i = 0; i < 10; i++)
1400 + blf_key(&c, (u_int8_t *) key, 5);
1401 + blf_enc(&c, data, 5);
1402 + blf_dec(&c, data, 1);
1403 + blf_dec(&c, data + 2, 4);
1404 + printf("Should read as 0 - 9.\n");
1408 + blf_key(&c, (u_int8_t *) key2, strlen(key2));
1409 + blf_enc(&c, data2, 1);
1410 + printf("\nShould read as: 0x324ed0fe 0xf413a203.\n");
1412 + blf_dec(&c, data2, 1);
1416 diff -urN glibc-2.1.91.orig/crypt/blowfish.h glibc-2.1.91/crypt/blowfish.h
1417 --- glibc-2.1.91.orig/crypt/blowfish.h Thu Jan 1 01:00:00 1970
1418 +++ glibc-2.1.91/crypt/blowfish.h Sat Jul 15 00:56:30 2000
1424 +#include <sys/types.h>
1426 +char *bcrypt(const char *key, const char *salt);
1427 +char *bcrypt_gensalt(u_int8_t log_rounds);
1429 +#endif /* BLOWFISH_H */
1430 diff -urN glibc-2.1.91.orig/crypt/crypt-entry.c glibc-2.1.91/crypt/crypt-entry.c
1431 --- glibc-2.1.91.orig/crypt/crypt-entry.c Sat Mar 4 01:47:30 2000
1432 +++ glibc-2.1.91/crypt/crypt-entry.c Sat Jul 15 00:56:30 2000
1435 #include "crypt-private.h"
1437 +#include "blowfish.h"
1439 /* Prototypes for local functions. */
1441 #ifndef __GNU_LIBRARY__
1443 replacement. This is meant to be the same as for other MD5 based
1444 encryption implementations. */
1445 static const char md5_salt_prefix[] = "$1$";
1446 +static const char blowfish_salt_prefix[] = "$2";
1448 /* For use by the old, non-reentrant routines (crypt/encrypt/setkey) */
1449 extern struct crypt_data _ufc_foobar;
1451 if (strncmp (md5_salt_prefix, salt, sizeof (md5_salt_prefix) - 1) == 0)
1452 return __md5_crypt_r (key, salt, (char *) data,
1453 sizeof (struct crypt_data));
1455 + /* Try to find out whether we have to use Blowfish encryption replacement. */
1456 + if (strncmp (blowfish_salt_prefix, salt, sizeof (blowfish_salt_prefix) - 1) == 0)
1457 + return bcrypt (key, salt);
1462 /* Try to find out whether we have to use MD5 encryption replacement. */
1463 if (strncmp (md5_salt_prefix, salt, sizeof (md5_salt_prefix) - 1) == 0)
1464 return __md5_crypt (key, salt);
1465 + if (strncmp (blowfish_salt_prefix, salt, sizeof (blowfish_salt_prefix) - 1) == 0)
1466 + return bcrypt (key, salt);
1469 return __crypt_r (key, salt, &_ufc_foobar);