1.1 --- a/tools/tests/Makefile	Mon Oct 11 09:03:18 2010 +0100
     1.2 +++ b/tools/tests/Makefile	Mon Oct 11 10:22:24 2010 +0100
     1.3 @@ -7,14 +7,21 @@ TARGET := test_x86_emulator
     1.4  .PHONY: all
     1.5  all: $(TARGET)
     1.6  
     1.7 -.PHONY: blowfish.bin
     1.8 -blowfish.bin:
     1.9 -	make -f blowfish.mk all
    1.10 -
    1.11 -blowfish.h: blowfish.bin
    1.12 -	(echo "static unsigned int blowfish_code[] = {"; \
    1.13 -	od -v -t x $< | sed 's/^[0-9]* /0x/' | sed 's/ /, 0x/g' | sed 's/$$/,/';\
    1.14 +.PHONY: blowfish.h
    1.15 +blowfish.h:
    1.16 +	rm -f blowfish.bin
    1.17 +	XEN_TARGET_ARCH=x86_32 make -f blowfish.mk all
    1.18 +	(echo "static unsigned int blowfish32_code[] = {"; \
    1.19 +	od -v -t x blowfish.bin | sed 's/^[0-9]* /0x/' | sed 's/ /, 0x/g' | sed 's/$$/,/';\
    1.20  	echo "};") >$@
    1.21 +	rm -f blowfish.bin
    1.22 +ifeq ($(XEN_COMPILE_ARCH),x86_64)
    1.23 +	XEN_TARGET_ARCH=x86_64 make -f blowfish.mk all
    1.24 +	(echo "static unsigned int blowfish64_code[] = {"; \
    1.25 +	od -v -t x blowfish.bin | sed 's/^[0-9]* /0x/' | sed 's/ /, 0x/g' | sed 's/$$/,/';\
    1.26 +	echo "};") >>$@
    1.27 +	rm -f blowfish.bin
    1.28 +endif
    1.29  
    1.30  $(TARGET): x86_emulate.o test_x86_emulator.o
    1.31  	$(HOSTCC) -o $@ $^

     2.1 --- a/tools/tests/blowfish.c	Mon Oct 11 09:03:18 2010 +0100
     2.2 +++ b/tools/tests/blowfish.c	Mon Oct 11 10:22:24 2010 +0100
     2.3 @@ -16,424 +16,425 @@ License along with this library; if not,
     2.4  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
     2.5  */
     2.6  
     2.7 -#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)
     2.8 -#define __attribute_used__ __attribute__((__used__))
     2.9 -#else
    2.10 -#define __attribute_used__ __attribute__((__unused__))
    2.11 -#endif
    2.12 +#include <stdint.h>
    2.13  
    2.14 -static unsigned long long blowfish_test(unsigned long long input)
    2.15 -    __attribute_used__;
    2.16 +uint64_t blowfish_test(uint64_t input);
    2.17  
    2.18  asm (
    2.19      ".globl _start\n"
    2.20      "_start:\n"
    2.21 +#if defined(__i386__)
    2.22      "push %edx; push %eax; "
    2.23      "call blowfish_test; "
    2.24      "addl $8,%esp; "
    2.25 +#else
    2.26 +    "shlq $32,%rdx; movl %eax,%edi; orq %rdx,%rdi; "
    2.27 +    "call blowfish_test; "
    2.28 +    "movq %rax,%rdi; movl %eax,%eax; shrq $32,%rdx; "
    2.29 +#endif
    2.30      "ret"
    2.31      );
    2.32  
    2.33  typedef struct {
    2.34 -  unsigned long P[16 + 2];
    2.35 -  unsigned long S[4][256];
    2.36 +    uint32_t P[16 + 2];
    2.37 +    uint32_t S[4][256];
    2.38  } BLOWFISH_CTX;
    2.39  
    2.40  #define N               16
    2.41  
    2.42 -static const unsigned long ORIG_P[16 + 2] = {
    2.43 -        0x243F6A88L, 0x85A308D3L, 0x13198A2EL, 0x03707344L,
    2.44 -        0xA4093822L, 0x299F31D0L, 0x082EFA98L, 0xEC4E6C89L,
    2.45 -        0x452821E6L, 0x38D01377L, 0xBE5466CFL, 0x34E90C6CL,
    2.46 -        0xC0AC29B7L, 0xC97C50DDL, 0x3F84D5B5L, 0xB5470917L,
    2.47 -        0x9216D5D9L, 0x8979FB1BL
    2.48 +static const uint32_t ORIG_P[16 + 2] = {
    2.49 +    0x243F6A88u, 0x85A308D3u, 0x13198A2Eu, 0x03707344u,
    2.50 +    0xA4093822u, 0x299F31D0u, 0x082EFA98u, 0xEC4E6C89u,
    2.51 +    0x452821E6u, 0x38D01377u, 0xBE5466CFu, 0x34E90C6Cu,
    2.52 +    0xC0AC29B7u, 0xC97C50DDu, 0x3F84D5B5u, 0xB5470917u,
    2.53 +    0x9216D5D9u, 0x8979FB1Bu
    2.54  };
    2.55  
    2.56 -static const unsigned long ORIG_S[4][256] = {
    2.57 -    {   0xD1310BA6L, 0x98DFB5ACL, 0x2FFD72DBL, 0xD01ADFB7L,
    2.58 -        0xB8E1AFEDL, 0x6A267E96L, 0xBA7C9045L, 0xF12C7F99L,
    2.59 -        0x24A19947L, 0xB3916CF7L, 0x0801F2E2L, 0x858EFC16L,
    2.60 -        0x636920D8L, 0x71574E69L, 0xA458FEA3L, 0xF4933D7EL,
    2.61 -        0x0D95748FL, 0x728EB658L, 0x718BCD58L, 0x82154AEEL,
    2.62 -        0x7B54A41DL, 0xC25A59B5L, 0x9C30D539L, 0x2AF26013L,
    2.63 -        0xC5D1B023L, 0x286085F0L, 0xCA417918L, 0xB8DB38EFL,
    2.64 -        0x8E79DCB0L, 0x603A180EL, 0x6C9E0E8BL, 0xB01E8A3EL,
    2.65 -        0xD71577C1L, 0xBD314B27L, 0x78AF2FDAL, 0x55605C60L,
    2.66 -        0xE65525F3L, 0xAA55AB94L, 0x57489862L, 0x63E81440L,
    2.67 -        0x55CA396AL, 0x2AAB10B6L, 0xB4CC5C34L, 0x1141E8CEL,
    2.68 -        0xA15486AFL, 0x7C72E993L, 0xB3EE1411L, 0x636FBC2AL,
    2.69 -        0x2BA9C55DL, 0x741831F6L, 0xCE5C3E16L, 0x9B87931EL,
    2.70 -        0xAFD6BA33L, 0x6C24CF5CL, 0x7A325381L, 0x28958677L,
    2.71 -        0x3B8F4898L, 0x6B4BB9AFL, 0xC4BFE81BL, 0x66282193L,
    2.72 -        0x61D809CCL, 0xFB21A991L, 0x487CAC60L, 0x5DEC8032L,
    2.73 -        0xEF845D5DL, 0xE98575B1L, 0xDC262302L, 0xEB651B88L,
    2.74 -        0x23893E81L, 0xD396ACC5L, 0x0F6D6FF3L, 0x83F44239L,
    2.75 -        0x2E0B4482L, 0xA4842004L, 0x69C8F04AL, 0x9E1F9B5EL,
    2.76 -        0x21C66842L, 0xF6E96C9AL, 0x670C9C61L, 0xABD388F0L,
    2.77 -        0x6A51A0D2L, 0xD8542F68L, 0x960FA728L, 0xAB5133A3L,
    2.78 -        0x6EEF0B6CL, 0x137A3BE4L, 0xBA3BF050L, 0x7EFB2A98L,
    2.79 -        0xA1F1651DL, 0x39AF0176L, 0x66CA593EL, 0x82430E88L,
    2.80 -        0x8CEE8619L, 0x456F9FB4L, 0x7D84A5C3L, 0x3B8B5EBEL,
    2.81 -        0xE06F75D8L, 0x85C12073L, 0x401A449FL, 0x56C16AA6L,
    2.82 -        0x4ED3AA62L, 0x363F7706L, 0x1BFEDF72L, 0x429B023DL,
    2.83 -        0x37D0D724L, 0xD00A1248L, 0xDB0FEAD3L, 0x49F1C09BL,
    2.84 -        0x075372C9L, 0x80991B7BL, 0x25D479D8L, 0xF6E8DEF7L,
    2.85 -        0xE3FE501AL, 0xB6794C3BL, 0x976CE0BDL, 0x04C006BAL,
    2.86 -        0xC1A94FB6L, 0x409F60C4L, 0x5E5C9EC2L, 0x196A2463L,
    2.87 -        0x68FB6FAFL, 0x3E6C53B5L, 0x1339B2EBL, 0x3B52EC6FL,
    2.88 -        0x6DFC511FL, 0x9B30952CL, 0xCC814544L, 0xAF5EBD09L,
    2.89 -        0xBEE3D004L, 0xDE334AFDL, 0x660F2807L, 0x192E4BB3L,
    2.90 -        0xC0CBA857L, 0x45C8740FL, 0xD20B5F39L, 0xB9D3FBDBL,
    2.91 -        0x5579C0BDL, 0x1A60320AL, 0xD6A100C6L, 0x402C7279L,
    2.92 -        0x679F25FEL, 0xFB1FA3CCL, 0x8EA5E9F8L, 0xDB3222F8L,
    2.93 -        0x3C7516DFL, 0xFD616B15L, 0x2F501EC8L, 0xAD0552ABL,
    2.94 -        0x323DB5FAL, 0xFD238760L, 0x53317B48L, 0x3E00DF82L,
    2.95 -        0x9E5C57BBL, 0xCA6F8CA0L, 0x1A87562EL, 0xDF1769DBL,
    2.96 -        0xD542A8F6L, 0x287EFFC3L, 0xAC6732C6L, 0x8C4F5573L,
    2.97 -        0x695B27B0L, 0xBBCA58C8L, 0xE1FFA35DL, 0xB8F011A0L,
    2.98 -        0x10FA3D98L, 0xFD2183B8L, 0x4AFCB56CL, 0x2DD1D35BL,
    2.99 -        0x9A53E479L, 0xB6F84565L, 0xD28E49BCL, 0x4BFB9790L,
   2.100 -        0xE1DDF2DAL, 0xA4CB7E33L, 0x62FB1341L, 0xCEE4C6E8L,
   2.101 -        0xEF20CADAL, 0x36774C01L, 0xD07E9EFEL, 0x2BF11FB4L,
   2.102 -        0x95DBDA4DL, 0xAE909198L, 0xEAAD8E71L, 0x6B93D5A0L,
   2.103 -        0xD08ED1D0L, 0xAFC725E0L, 0x8E3C5B2FL, 0x8E7594B7L,
   2.104 -        0x8FF6E2FBL, 0xF2122B64L, 0x8888B812L, 0x900DF01CL,
   2.105 -        0x4FAD5EA0L, 0x688FC31CL, 0xD1CFF191L, 0xB3A8C1ADL,
   2.106 -        0x2F2F2218L, 0xBE0E1777L, 0xEA752DFEL, 0x8B021FA1L,
   2.107 -        0xE5A0CC0FL, 0xB56F74E8L, 0x18ACF3D6L, 0xCE89E299L,
   2.108 -        0xB4A84FE0L, 0xFD13E0B7L, 0x7CC43B81L, 0xD2ADA8D9L,
   2.109 -        0x165FA266L, 0x80957705L, 0x93CC7314L, 0x211A1477L,
   2.110 -        0xE6AD2065L, 0x77B5FA86L, 0xC75442F5L, 0xFB9D35CFL,
   2.111 -        0xEBCDAF0CL, 0x7B3E89A0L, 0xD6411BD3L, 0xAE1E7E49L,
   2.112 -        0x00250E2DL, 0x2071B35EL, 0x226800BBL, 0x57B8E0AFL,
   2.113 -        0x2464369BL, 0xF009B91EL, 0x5563911DL, 0x59DFA6AAL,
   2.114 -        0x78C14389L, 0xD95A537FL, 0x207D5BA2L, 0x02E5B9C5L,
   2.115 -        0x83260376L, 0x6295CFA9L, 0x11C81968L, 0x4E734A41L,
   2.116 -        0xB3472DCAL, 0x7B14A94AL, 0x1B510052L, 0x9A532915L,
   2.117 -        0xD60F573FL, 0xBC9BC6E4L, 0x2B60A476L, 0x81E67400L,
   2.118 -        0x08BA6FB5L, 0x571BE91FL, 0xF296EC6BL, 0x2A0DD915L,
   2.119 -        0xB6636521L, 0xE7B9F9B6L, 0xFF34052EL, 0xC5855664L,
   2.120 -        0x53B02D5DL, 0xA99F8FA1L, 0x08BA4799L, 0x6E85076AL   },
   2.121 -    {   0x4B7A70E9L, 0xB5B32944L, 0xDB75092EL, 0xC4192623L,
   2.122 -        0xAD6EA6B0L, 0x49A7DF7DL, 0x9CEE60B8L, 0x8FEDB266L,
   2.123 -        0xECAA8C71L, 0x699A17FFL, 0x5664526CL, 0xC2B19EE1L,
   2.124 -        0x193602A5L, 0x75094C29L, 0xA0591340L, 0xE4183A3EL,
   2.125 -        0x3F54989AL, 0x5B429D65L, 0x6B8FE4D6L, 0x99F73FD6L,
   2.126 -        0xA1D29C07L, 0xEFE830F5L, 0x4D2D38E6L, 0xF0255DC1L,
   2.127 -        0x4CDD2086L, 0x8470EB26L, 0x6382E9C6L, 0x021ECC5EL,
   2.128 -        0x09686B3FL, 0x3EBAEFC9L, 0x3C971814L, 0x6B6A70A1L,
   2.129 -        0x687F3584L, 0x52A0E286L, 0xB79C5305L, 0xAA500737L,
   2.130 -        0x3E07841CL, 0x7FDEAE5CL, 0x8E7D44ECL, 0x5716F2B8L,
   2.131 -        0xB03ADA37L, 0xF0500C0DL, 0xF01C1F04L, 0x0200B3FFL,
   2.132 -        0xAE0CF51AL, 0x3CB574B2L, 0x25837A58L, 0xDC0921BDL,
   2.133 -        0xD19113F9L, 0x7CA92FF6L, 0x94324773L, 0x22F54701L,
   2.134 -        0x3AE5E581L, 0x37C2DADCL, 0xC8B57634L, 0x9AF3DDA7L,
   2.135 -        0xA9446146L, 0x0FD0030EL, 0xECC8C73EL, 0xA4751E41L,
   2.136 -        0xE238CD99L, 0x3BEA0E2FL, 0x3280BBA1L, 0x183EB331L,
   2.137 -        0x4E548B38L, 0x4F6DB908L, 0x6F420D03L, 0xF60A04BFL,
   2.138 -        0x2CB81290L, 0x24977C79L, 0x5679B072L, 0xBCAF89AFL,
   2.139 -        0xDE9A771FL, 0xD9930810L, 0xB38BAE12L, 0xDCCF3F2EL,
   2.140 -        0x5512721FL, 0x2E6B7124L, 0x501ADDE6L, 0x9F84CD87L,
   2.141 -        0x7A584718L, 0x7408DA17L, 0xBC9F9ABCL, 0xE94B7D8CL,
   2.142 -        0xEC7AEC3AL, 0xDB851DFAL, 0x63094366L, 0xC464C3D2L,
   2.143 -        0xEF1C1847L, 0x3215D908L, 0xDD433B37L, 0x24C2BA16L,
   2.144 -        0x12A14D43L, 0x2A65C451L, 0x50940002L, 0x133AE4DDL,
   2.145 -        0x71DFF89EL, 0x10314E55L, 0x81AC77D6L, 0x5F11199BL,
   2.146 -        0x043556F1L, 0xD7A3C76BL, 0x3C11183BL, 0x5924A509L,
   2.147 -        0xF28FE6EDL, 0x97F1FBFAL, 0x9EBABF2CL, 0x1E153C6EL,
   2.148 -        0x86E34570L, 0xEAE96FB1L, 0x860E5E0AL, 0x5A3E2AB3L,
   2.149 -        0x771FE71CL, 0x4E3D06FAL, 0x2965DCB9L, 0x99E71D0FL,
   2.150 -        0x803E89D6L, 0x5266C825L, 0x2E4CC978L, 0x9C10B36AL,
   2.151 -        0xC6150EBAL, 0x94E2EA78L, 0xA5FC3C53L, 0x1E0A2DF4L,
   2.152 -        0xF2F74EA7L, 0x361D2B3DL, 0x1939260FL, 0x19C27960L,
   2.153 -        0x5223A708L, 0xF71312B6L, 0xEBADFE6EL, 0xEAC31F66L,
   2.154 -        0xE3BC4595L, 0xA67BC883L, 0xB17F37D1L, 0x018CFF28L,
   2.155 -        0xC332DDEFL, 0xBE6C5AA5L, 0x65582185L, 0x68AB9802L,
   2.156 -        0xEECEA50FL, 0xDB2F953BL, 0x2AEF7DADL, 0x5B6E2F84L,
   2.157 -        0x1521B628L, 0x29076170L, 0xECDD4775L, 0x619F1510L,
   2.158 -        0x13CCA830L, 0xEB61BD96L, 0x0334FE1EL, 0xAA0363CFL,
   2.159 -        0xB5735C90L, 0x4C70A239L, 0xD59E9E0BL, 0xCBAADE14L,
   2.160 -        0xEECC86BCL, 0x60622CA7L, 0x9CAB5CABL, 0xB2F3846EL,
   2.161 -        0x648B1EAFL, 0x19BDF0CAL, 0xA02369B9L, 0x655ABB50L,
   2.162 -        0x40685A32L, 0x3C2AB4B3L, 0x319EE9D5L, 0xC021B8F7L,
   2.163 -        0x9B540B19L, 0x875FA099L, 0x95F7997EL, 0x623D7DA8L,
   2.164 -        0xF837889AL, 0x97E32D77L, 0x11ED935FL, 0x16681281L,
   2.165 -        0x0E358829L, 0xC7E61FD6L, 0x96DEDFA1L, 0x7858BA99L,
   2.166 -        0x57F584A5L, 0x1B227263L, 0x9B83C3FFL, 0x1AC24696L,
   2.167 -        0xCDB30AEBL, 0x532E3054L, 0x8FD948E4L, 0x6DBC3128L,
   2.168 -        0x58EBF2EFL, 0x34C6FFEAL, 0xFE28ED61L, 0xEE7C3C73L,
   2.169 -        0x5D4A14D9L, 0xE864B7E3L, 0x42105D14L, 0x203E13E0L,
   2.170 -        0x45EEE2B6L, 0xA3AAABEAL, 0xDB6C4F15L, 0xFACB4FD0L,
   2.171 -        0xC742F442L, 0xEF6ABBB5L, 0x654F3B1DL, 0x41CD2105L,
   2.172 -        0xD81E799EL, 0x86854DC7L, 0xE44B476AL, 0x3D816250L,
   2.173 -        0xCF62A1F2L, 0x5B8D2646L, 0xFC8883A0L, 0xC1C7B6A3L,
   2.174 -        0x7F1524C3L, 0x69CB7492L, 0x47848A0BL, 0x5692B285L,
   2.175 -        0x095BBF00L, 0xAD19489DL, 0x1462B174L, 0x23820E00L,
   2.176 -        0x58428D2AL, 0x0C55F5EAL, 0x1DADF43EL, 0x233F7061L,
   2.177 -        0x3372F092L, 0x8D937E41L, 0xD65FECF1L, 0x6C223BDBL,
   2.178 -        0x7CDE3759L, 0xCBEE7460L, 0x4085F2A7L, 0xCE77326EL,
   2.179 -        0xA6078084L, 0x19F8509EL, 0xE8EFD855L, 0x61D99735L,
   2.180 -        0xA969A7AAL, 0xC50C06C2L, 0x5A04ABFCL, 0x800BCADCL,
   2.181 -        0x9E447A2EL, 0xC3453484L, 0xFDD56705L, 0x0E1E9EC9L,
   2.182 -        0xDB73DBD3L, 0x105588CDL, 0x675FDA79L, 0xE3674340L,
   2.183 -        0xC5C43465L, 0x713E38D8L, 0x3D28F89EL, 0xF16DFF20L,
   2.184 -        0x153E21E7L, 0x8FB03D4AL, 0xE6E39F2BL, 0xDB83ADF7L   },
   2.185 -    {   0xE93D5A68L, 0x948140F7L, 0xF64C261CL, 0x94692934L,
   2.186 -        0x411520F7L, 0x7602D4F7L, 0xBCF46B2EL, 0xD4A20068L,
   2.187 -        0xD4082471L, 0x3320F46AL, 0x43B7D4B7L, 0x500061AFL,
   2.188 -        0x1E39F62EL, 0x97244546L, 0x14214F74L, 0xBF8B8840L,
   2.189 -        0x4D95FC1DL, 0x96B591AFL, 0x70F4DDD3L, 0x66A02F45L,
   2.190 -        0xBFBC09ECL, 0x03BD9785L, 0x7FAC6DD0L, 0x31CB8504L,
   2.191 -        0x96EB27B3L, 0x55FD3941L, 0xDA2547E6L, 0xABCA0A9AL,
   2.192 -        0x28507825L, 0x530429F4L, 0x0A2C86DAL, 0xE9B66DFBL,
   2.193 -        0x68DC1462L, 0xD7486900L, 0x680EC0A4L, 0x27A18DEEL,
   2.194 -        0x4F3FFEA2L, 0xE887AD8CL, 0xB58CE006L, 0x7AF4D6B6L,
   2.195 -        0xAACE1E7CL, 0xD3375FECL, 0xCE78A399L, 0x406B2A42L,
   2.196 -        0x20FE9E35L, 0xD9F385B9L, 0xEE39D7ABL, 0x3B124E8BL,
   2.197 -        0x1DC9FAF7L, 0x4B6D1856L, 0x26A36631L, 0xEAE397B2L,
   2.198 -        0x3A6EFA74L, 0xDD5B4332L, 0x6841E7F7L, 0xCA7820FBL,
   2.199 -        0xFB0AF54EL, 0xD8FEB397L, 0x454056ACL, 0xBA489527L,
   2.200 -        0x55533A3AL, 0x20838D87L, 0xFE6BA9B7L, 0xD096954BL,
   2.201 -        0x55A867BCL, 0xA1159A58L, 0xCCA92963L, 0x99E1DB33L,
   2.202 -        0xA62A4A56L, 0x3F3125F9L, 0x5EF47E1CL, 0x9029317CL,
   2.203 -        0xFDF8E802L, 0x04272F70L, 0x80BB155CL, 0x05282CE3L,
   2.204 -        0x95C11548L, 0xE4C66D22L, 0x48C1133FL, 0xC70F86DCL,
   2.205 -        0x07F9C9EEL, 0x41041F0FL, 0x404779A4L, 0x5D886E17L,
   2.206 -        0x325F51EBL, 0xD59BC0D1L, 0xF2BCC18FL, 0x41113564L,
   2.207 -        0x257B7834L, 0x602A9C60L, 0xDFF8E8A3L, 0x1F636C1BL,
   2.208 -        0x0E12B4C2L, 0x02E1329EL, 0xAF664FD1L, 0xCAD18115L,
   2.209 -        0x6B2395E0L, 0x333E92E1L, 0x3B240B62L, 0xEEBEB922L,
   2.210 -        0x85B2A20EL, 0xE6BA0D99L, 0xDE720C8CL, 0x2DA2F728L,
   2.211 -        0xD0127845L, 0x95B794FDL, 0x647D0862L, 0xE7CCF5F0L,
   2.212 -        0x5449A36FL, 0x877D48FAL, 0xC39DFD27L, 0xF33E8D1EL,
   2.213 -        0x0A476341L, 0x992EFF74L, 0x3A6F6EABL, 0xF4F8FD37L,
   2.214 -        0xA812DC60L, 0xA1EBDDF8L, 0x991BE14CL, 0xDB6E6B0DL,
   2.215 -        0xC67B5510L, 0x6D672C37L, 0x2765D43BL, 0xDCD0E804L,
   2.216 -        0xF1290DC7L, 0xCC00FFA3L, 0xB5390F92L, 0x690FED0BL,
   2.217 -        0x667B9FFBL, 0xCEDB7D9CL, 0xA091CF0BL, 0xD9155EA3L,
   2.218 -        0xBB132F88L, 0x515BAD24L, 0x7B9479BFL, 0x763BD6EBL,
   2.219 -        0x37392EB3L, 0xCC115979L, 0x8026E297L, 0xF42E312DL,
   2.220 -        0x6842ADA7L, 0xC66A2B3BL, 0x12754CCCL, 0x782EF11CL,
   2.221 -        0x6A124237L, 0xB79251E7L, 0x06A1BBE6L, 0x4BFB6350L,
   2.222 -        0x1A6B1018L, 0x11CAEDFAL, 0x3D25BDD8L, 0xE2E1C3C9L,
   2.223 -        0x44421659L, 0x0A121386L, 0xD90CEC6EL, 0xD5ABEA2AL,
   2.224 -        0x64AF674EL, 0xDA86A85FL, 0xBEBFE988L, 0x64E4C3FEL,
   2.225 -        0x9DBC8057L, 0xF0F7C086L, 0x60787BF8L, 0x6003604DL,
   2.226 -        0xD1FD8346L, 0xF6381FB0L, 0x7745AE04L, 0xD736FCCCL,
   2.227 -        0x83426B33L, 0xF01EAB71L, 0xB0804187L, 0x3C005E5FL,
   2.228 -        0x77A057BEL, 0xBDE8AE24L, 0x55464299L, 0xBF582E61L,
   2.229 -        0x4E58F48FL, 0xF2DDFDA2L, 0xF474EF38L, 0x8789BDC2L,
   2.230 -        0x5366F9C3L, 0xC8B38E74L, 0xB475F255L, 0x46FCD9B9L,
   2.231 -        0x7AEB2661L, 0x8B1DDF84L, 0x846A0E79L, 0x915F95E2L,
   2.232 -        0x466E598EL, 0x20B45770L, 0x8CD55591L, 0xC902DE4CL,
   2.233 -        0xB90BACE1L, 0xBB8205D0L, 0x11A86248L, 0x7574A99EL,
   2.234 -        0xB77F19B6L, 0xE0A9DC09L, 0x662D09A1L, 0xC4324633L,
   2.235 -        0xE85A1F02L, 0x09F0BE8CL, 0x4A99A025L, 0x1D6EFE10L,
   2.236 -        0x1AB93D1DL, 0x0BA5A4DFL, 0xA186F20FL, 0x2868F169L,
   2.237 -        0xDCB7DA83L, 0x573906FEL, 0xA1E2CE9BL, 0x4FCD7F52L,
   2.238 -        0x50115E01L, 0xA70683FAL, 0xA002B5C4L, 0x0DE6D027L,
   2.239 -        0x9AF88C27L, 0x773F8641L, 0xC3604C06L, 0x61A806B5L,
   2.240 -        0xF0177A28L, 0xC0F586E0L, 0x006058AAL, 0x30DC7D62L,
   2.241 -        0x11E69ED7L, 0x2338EA63L, 0x53C2DD94L, 0xC2C21634L,
   2.242 -        0xBBCBEE56L, 0x90BCB6DEL, 0xEBFC7DA1L, 0xCE591D76L,
   2.243 -        0x6F05E409L, 0x4B7C0188L, 0x39720A3DL, 0x7C927C24L,
   2.244 -        0x86E3725FL, 0x724D9DB9L, 0x1AC15BB4L, 0xD39EB8FCL,
   2.245 -        0xED545578L, 0x08FCA5B5L, 0xD83D7CD3L, 0x4DAD0FC4L,
   2.246 -        0x1E50EF5EL, 0xB161E6F8L, 0xA28514D9L, 0x6C51133CL,
   2.247 -        0x6FD5C7E7L, 0x56E14EC4L, 0x362ABFCEL, 0xDDC6C837L,
   2.248 -        0xD79A3234L, 0x92638212L, 0x670EFA8EL, 0x406000E0L  },
   2.249 -    {   0x3A39CE37L, 0xD3FAF5CFL, 0xABC27737L, 0x5AC52D1BL,
   2.250 -        0x5CB0679EL, 0x4FA33742L, 0xD3822740L, 0x99BC9BBEL,
   2.251 -        0xD5118E9DL, 0xBF0F7315L, 0xD62D1C7EL, 0xC700C47BL,
   2.252 -        0xB78C1B6BL, 0x21A19045L, 0xB26EB1BEL, 0x6A366EB4L,
   2.253 -        0x5748AB2FL, 0xBC946E79L, 0xC6A376D2L, 0x6549C2C8L,
   2.254 -        0x530FF8EEL, 0x468DDE7DL, 0xD5730A1DL, 0x4CD04DC6L,
   2.255 -        0x2939BBDBL, 0xA9BA4650L, 0xAC9526E8L, 0xBE5EE304L,
   2.256 -        0xA1FAD5F0L, 0x6A2D519AL, 0x63EF8CE2L, 0x9A86EE22L,
   2.257 -        0xC089C2B8L, 0x43242EF6L, 0xA51E03AAL, 0x9CF2D0A4L,
   2.258 -        0x83C061BAL, 0x9BE96A4DL, 0x8FE51550L, 0xBA645BD6L,
   2.259 -        0x2826A2F9L, 0xA73A3AE1L, 0x4BA99586L, 0xEF5562E9L,
   2.260 -        0xC72FEFD3L, 0xF752F7DAL, 0x3F046F69L, 0x77FA0A59L,
   2.261 -        0x80E4A915L, 0x87B08601L, 0x9B09E6ADL, 0x3B3EE593L,
   2.262 -        0xE990FD5AL, 0x9E34D797L, 0x2CF0B7D9L, 0x022B8B51L,
   2.263 -        0x96D5AC3AL, 0x017DA67DL, 0xD1CF3ED6L, 0x7C7D2D28L,
   2.264 -        0x1F9F25CFL, 0xADF2B89BL, 0x5AD6B472L, 0x5A88F54CL,
   2.265 -        0xE029AC71L, 0xE019A5E6L, 0x47B0ACFDL, 0xED93FA9BL,
   2.266 -        0xE8D3C48DL, 0x283B57CCL, 0xF8D56629L, 0x79132E28L,
   2.267 -        0x785F0191L, 0xED756055L, 0xF7960E44L, 0xE3D35E8CL,
   2.268 -        0x15056DD4L, 0x88F46DBAL, 0x03A16125L, 0x0564F0BDL,
   2.269 -        0xC3EB9E15L, 0x3C9057A2L, 0x97271AECL, 0xA93A072AL,
   2.270 -        0x1B3F6D9BL, 0x1E6321F5L, 0xF59C66FBL, 0x26DCF319L,
   2.271 -        0x7533D928L, 0xB155FDF5L, 0x03563482L, 0x8ABA3CBBL,
   2.272 -        0x28517711L, 0xC20AD9F8L, 0xABCC5167L, 0xCCAD925FL,
   2.273 -        0x4DE81751L, 0x3830DC8EL, 0x379D5862L, 0x9320F991L,
   2.274 -        0xEA7A90C2L, 0xFB3E7BCEL, 0x5121CE64L, 0x774FBE32L,
   2.275 -        0xA8B6E37EL, 0xC3293D46L, 0x48DE5369L, 0x6413E680L,
   2.276 -        0xA2AE0810L, 0xDD6DB224L, 0x69852DFDL, 0x09072166L,
   2.277 -        0xB39A460AL, 0x6445C0DDL, 0x586CDECFL, 0x1C20C8AEL,
   2.278 -        0x5BBEF7DDL, 0x1B588D40L, 0xCCD2017FL, 0x6BB4E3BBL,
   2.279 -        0xDDA26A7EL, 0x3A59FF45L, 0x3E350A44L, 0xBCB4CDD5L,
   2.280 -        0x72EACEA8L, 0xFA6484BBL, 0x8D6612AEL, 0xBF3C6F47L,
   2.281 -        0xD29BE463L, 0x542F5D9EL, 0xAEC2771BL, 0xF64E6370L,
   2.282 -        0x740E0D8DL, 0xE75B1357L, 0xF8721671L, 0xAF537D5DL,
   2.283 -        0x4040CB08L, 0x4EB4E2CCL, 0x34D2466AL, 0x0115AF84L,
   2.284 -        0xE1B00428L, 0x95983A1DL, 0x06B89FB4L, 0xCE6EA048L,
   2.285 -        0x6F3F3B82L, 0x3520AB82L, 0x011A1D4BL, 0x277227F8L,
   2.286 -        0x611560B1L, 0xE7933FDCL, 0xBB3A792BL, 0x344525BDL,
   2.287 -        0xA08839E1L, 0x51CE794BL, 0x2F32C9B7L, 0xA01FBAC9L,
   2.288 -        0xE01CC87EL, 0xBCC7D1F6L, 0xCF0111C3L, 0xA1E8AAC7L,
   2.289 -        0x1A908749L, 0xD44FBD9AL, 0xD0DADECBL, 0xD50ADA38L,
   2.290 -        0x0339C32AL, 0xC6913667L, 0x8DF9317CL, 0xE0B12B4FL,
   2.291 -        0xF79E59B7L, 0x43F5BB3AL, 0xF2D519FFL, 0x27D9459CL,
   2.292 -        0xBF97222CL, 0x15E6FC2AL, 0x0F91FC71L, 0x9B941525L,
   2.293 -        0xFAE59361L, 0xCEB69CEBL, 0xC2A86459L, 0x12BAA8D1L,
   2.294 -        0xB6C1075EL, 0xE3056A0CL, 0x10D25065L, 0xCB03A442L,
   2.295 -        0xE0EC6E0EL, 0x1698DB3BL, 0x4C98A0BEL, 0x3278E964L,
   2.296 -        0x9F1F9532L, 0xE0D392DFL, 0xD3A0342BL, 0x8971F21EL,
   2.297 -        0x1B0A7441L, 0x4BA3348CL, 0xC5BE7120L, 0xC37632D8L,
   2.298 -        0xDF359F8DL, 0x9B992F2EL, 0xE60B6F47L, 0x0FE3F11DL,
   2.299 -        0xE54CDA54L, 0x1EDAD891L, 0xCE6279CFL, 0xCD3E7E6FL,
   2.300 -        0x1618B166L, 0xFD2C1D05L, 0x848FD2C5L, 0xF6FB2299L,
   2.301 -        0xF523F357L, 0xA6327623L, 0x93A83531L, 0x56CCCD02L,
   2.302 -        0xACF08162L, 0x5A75EBB5L, 0x6E163697L, 0x88D273CCL,
   2.303 -        0xDE966292L, 0x81B949D0L, 0x4C50901BL, 0x71C65614L,
   2.304 -        0xE6C6C7BDL, 0x327A140AL, 0x45E1D006L, 0xC3F27B9AL,
   2.305 -        0xC9AA53FDL, 0x62A80F00L, 0xBB25BFE2L, 0x35BDD2F6L,
   2.306 -        0x71126905L, 0xB2040222L, 0xB6CBCF7CL, 0xCD769C2BL,
   2.307 -        0x53113EC0L, 0x1640E3D3L, 0x38ABBD60L, 0x2547ADF0L,
   2.308 -        0xBA38209CL, 0xF746CE76L, 0x77AFA1C5L, 0x20756060L,
   2.309 -        0x85CBFE4EL, 0x8AE88DD8L, 0x7AAAF9B0L, 0x4CF9AA7EL,
   2.310 -        0x1948C25CL, 0x02FB8A8CL, 0x01C36AE4L, 0xD6EBE1F9L,
   2.311 -        0x90D4F869L, 0xA65CDEA0L, 0x3F09252DL, 0xC208E69FL,
   2.312 -        0xB74E6132L, 0xCE77E25BL, 0x578FDFE3L, 0x3AC372E6L  }
   2.313 +static const uint32_t ORIG_S[4][256] = {
   2.314 +    {   0xD1310BA6u, 0x98DFB5ACu, 0x2FFD72DBu, 0xD01ADFB7u,
   2.315 +        0xB8E1AFEDu, 0x6A267E96u, 0xBA7C9045u, 0xF12C7F99u,
   2.316 +        0x24A19947u, 0xB3916CF7u, 0x0801F2E2u, 0x858EFC16u,
   2.317 +        0x636920D8u, 0x71574E69u, 0xA458FEA3u, 0xF4933D7Eu,
   2.318 +        0x0D95748Fu, 0x728EB658u, 0x718BCD58u, 0x82154AEEu,
   2.319 +        0x7B54A41Du, 0xC25A59B5u, 0x9C30D539u, 0x2AF26013u,
   2.320 +        0xC5D1B023u, 0x286085F0u, 0xCA417918u, 0xB8DB38EFu,
   2.321 +        0x8E79DCB0u, 0x603A180Eu, 0x6C9E0E8Bu, 0xB01E8A3Eu,
   2.322 +        0xD71577C1u, 0xBD314B27u, 0x78AF2FDAu, 0x55605C60u,
   2.323 +        0xE65525F3u, 0xAA55AB94u, 0x57489862u, 0x63E81440u,
   2.324 +        0x55CA396Au, 0x2AAB10B6u, 0xB4CC5C34u, 0x1141E8CEu,
   2.325 +        0xA15486AFu, 0x7C72E993u, 0xB3EE1411u, 0x636FBC2Au,
   2.326 +        0x2BA9C55Du, 0x741831F6u, 0xCE5C3E16u, 0x9B87931Eu,
   2.327 +        0xAFD6BA33u, 0x6C24CF5Cu, 0x7A325381u, 0x28958677u,
   2.328 +        0x3B8F4898u, 0x6B4BB9AFu, 0xC4BFE81Bu, 0x66282193u,
   2.329 +        0x61D809CCu, 0xFB21A991u, 0x487CAC60u, 0x5DEC8032u,
   2.330 +        0xEF845D5Du, 0xE98575B1u, 0xDC262302u, 0xEB651B88u,
   2.331 +        0x23893E81u, 0xD396ACC5u, 0x0F6D6FF3u, 0x83F44239u,
   2.332 +        0x2E0B4482u, 0xA4842004u, 0x69C8F04Au, 0x9E1F9B5Eu,
   2.333 +        0x21C66842u, 0xF6E96C9Au, 0x670C9C61u, 0xABD388F0u,
   2.334 +        0x6A51A0D2u, 0xD8542F68u, 0x960FA728u, 0xAB5133A3u,
   2.335 +        0x6EEF0B6Cu, 0x137A3BE4u, 0xBA3BF050u, 0x7EFB2A98u,
   2.336 +        0xA1F1651Du, 0x39AF0176u, 0x66CA593Eu, 0x82430E88u,
   2.337 +        0x8CEE8619u, 0x456F9FB4u, 0x7D84A5C3u, 0x3B8B5EBEu,
   2.338 +        0xE06F75D8u, 0x85C12073u, 0x401A449Fu, 0x56C16AA6u,
   2.339 +        0x4ED3AA62u, 0x363F7706u, 0x1BFEDF72u, 0x429B023Du,
   2.340 +        0x37D0D724u, 0xD00A1248u, 0xDB0FEAD3u, 0x49F1C09Bu,
   2.341 +        0x075372C9u, 0x80991B7Bu, 0x25D479D8u, 0xF6E8DEF7u,
   2.342 +        0xE3FE501Au, 0xB6794C3Bu, 0x976CE0BDu, 0x04C006BAu,
   2.343 +        0xC1A94FB6u, 0x409F60C4u, 0x5E5C9EC2u, 0x196A2463u,
   2.344 +        0x68FB6FAFu, 0x3E6C53B5u, 0x1339B2EBu, 0x3B52EC6Fu,
   2.345 +        0x6DFC511Fu, 0x9B30952Cu, 0xCC814544u, 0xAF5EBD09u,
   2.346 +        0xBEE3D004u, 0xDE334AFDu, 0x660F2807u, 0x192E4BB3u,
   2.347 +        0xC0CBA857u, 0x45C8740Fu, 0xD20B5F39u, 0xB9D3FBDBu,
   2.348 +        0x5579C0BDu, 0x1A60320Au, 0xD6A100C6u, 0x402C7279u,
   2.349 +        0x679F25FEu, 0xFB1FA3CCu, 0x8EA5E9F8u, 0xDB3222F8u,
   2.350 +        0x3C7516DFu, 0xFD616B15u, 0x2F501EC8u, 0xAD0552ABu,
   2.351 +        0x323DB5FAu, 0xFD238760u, 0x53317B48u, 0x3E00DF82u,
   2.352 +        0x9E5C57BBu, 0xCA6F8CA0u, 0x1A87562Eu, 0xDF1769DBu,
   2.353 +        0xD542A8F6u, 0x287EFFC3u, 0xAC6732C6u, 0x8C4F5573u,
   2.354 +        0x695B27B0u, 0xBBCA58C8u, 0xE1FFA35Du, 0xB8F011A0u,
   2.355 +        0x10FA3D98u, 0xFD2183B8u, 0x4AFCB56Cu, 0x2DD1D35Bu,
   2.356 +        0x9A53E479u, 0xB6F84565u, 0xD28E49BCu, 0x4BFB9790u,
   2.357 +        0xE1DDF2DAu, 0xA4CB7E33u, 0x62FB1341u, 0xCEE4C6E8u,
   2.358 +        0xEF20CADAu, 0x36774C01u, 0xD07E9EFEu, 0x2BF11FB4u,
   2.359 +        0x95DBDA4Du, 0xAE909198u, 0xEAAD8E71u, 0x6B93D5A0u,
   2.360 +        0xD08ED1D0u, 0xAFC725E0u, 0x8E3C5B2Fu, 0x8E7594B7u,
   2.361 +        0x8FF6E2FBu, 0xF2122B64u, 0x8888B812u, 0x900DF01Cu,
   2.362 +        0x4FAD5EA0u, 0x688FC31Cu, 0xD1CFF191u, 0xB3A8C1ADu,
   2.363 +        0x2F2F2218u, 0xBE0E1777u, 0xEA752DFEu, 0x8B021FA1u,
   2.364 +        0xE5A0CC0Fu, 0xB56F74E8u, 0x18ACF3D6u, 0xCE89E299u,
   2.365 +        0xB4A84FE0u, 0xFD13E0B7u, 0x7CC43B81u, 0xD2ADA8D9u,
   2.366 +        0x165FA266u, 0x80957705u, 0x93CC7314u, 0x211A1477u,
   2.367 +        0xE6AD2065u, 0x77B5FA86u, 0xC75442F5u, 0xFB9D35CFu,
   2.368 +        0xEBCDAF0Cu, 0x7B3E89A0u, 0xD6411BD3u, 0xAE1E7E49u,
   2.369 +        0x00250E2Du, 0x2071B35Eu, 0x226800BBu, 0x57B8E0AFu,
   2.370 +        0x2464369Bu, 0xF009B91Eu, 0x5563911Du, 0x59DFA6AAu,
   2.371 +        0x78C14389u, 0xD95A537Fu, 0x207D5BA2u, 0x02E5B9C5u,
   2.372 +        0x83260376u, 0x6295CFA9u, 0x11C81968u, 0x4E734A41u,
   2.373 +        0xB3472DCAu, 0x7B14A94Au, 0x1B510052u, 0x9A532915u,
   2.374 +        0xD60F573Fu, 0xBC9BC6E4u, 0x2B60A476u, 0x81E67400u,
   2.375 +        0x08BA6FB5u, 0x571BE91Fu, 0xF296EC6Bu, 0x2A0DD915u,
   2.376 +        0xB6636521u, 0xE7B9F9B6u, 0xFF34052Eu, 0xC5855664u,
   2.377 +        0x53B02D5Du, 0xA99F8FA1u, 0x08BA4799u, 0x6E85076Au   },
   2.378 +    {   0x4B7A70E9u, 0xB5B32944u, 0xDB75092Eu, 0xC4192623u,
   2.379 +        0xAD6EA6B0u, 0x49A7DF7Du, 0x9CEE60B8u, 0x8FEDB266u,
   2.380 +        0xECAA8C71u, 0x699A17FFu, 0x5664526Cu, 0xC2B19EE1u,
   2.381 +        0x193602A5u, 0x75094C29u, 0xA0591340u, 0xE4183A3Eu,
   2.382 +        0x3F54989Au, 0x5B429D65u, 0x6B8FE4D6u, 0x99F73FD6u,
   2.383 +        0xA1D29C07u, 0xEFE830F5u, 0x4D2D38E6u, 0xF0255DC1u,
   2.384 +        0x4CDD2086u, 0x8470EB26u, 0x6382E9C6u, 0x021ECC5Eu,
   2.385 +        0x09686B3Fu, 0x3EBAEFC9u, 0x3C971814u, 0x6B6A70A1u,
   2.386 +        0x687F3584u, 0x52A0E286u, 0xB79C5305u, 0xAA500737u,
   2.387 +        0x3E07841Cu, 0x7FDEAE5Cu, 0x8E7D44ECu, 0x5716F2B8u,
   2.388 +        0xB03ADA37u, 0xF0500C0Du, 0xF01C1F04u, 0x0200B3FFu,
   2.389 +        0xAE0CF51Au, 0x3CB574B2u, 0x25837A58u, 0xDC0921BDu,
   2.390 +        0xD19113F9u, 0x7CA92FF6u, 0x94324773u, 0x22F54701u,
   2.391 +        0x3AE5E581u, 0x37C2DADCu, 0xC8B57634u, 0x9AF3DDA7u,
   2.392 +        0xA9446146u, 0x0FD0030Eu, 0xECC8C73Eu, 0xA4751E41u,
   2.393 +        0xE238CD99u, 0x3BEA0E2Fu, 0x3280BBA1u, 0x183EB331u,
   2.394 +        0x4E548B38u, 0x4F6DB908u, 0x6F420D03u, 0xF60A04BFu,
   2.395 +        0x2CB81290u, 0x24977C79u, 0x5679B072u, 0xBCAF89AFu,
   2.396 +        0xDE9A771Fu, 0xD9930810u, 0xB38BAE12u, 0xDCCF3F2Eu,
   2.397 +        0x5512721Fu, 0x2E6B7124u, 0x501ADDE6u, 0x9F84CD87u,
   2.398 +        0x7A584718u, 0x7408DA17u, 0xBC9F9ABCu, 0xE94B7D8Cu,
   2.399 +        0xEC7AEC3Au, 0xDB851DFAu, 0x63094366u, 0xC464C3D2u,
   2.400 +        0xEF1C1847u, 0x3215D908u, 0xDD433B37u, 0x24C2BA16u,
   2.401 +        0x12A14D43u, 0x2A65C451u, 0x50940002u, 0x133AE4DDu,
   2.402 +        0x71DFF89Eu, 0x10314E55u, 0x81AC77D6u, 0x5F11199Bu,
   2.403 +        0x043556F1u, 0xD7A3C76Bu, 0x3C11183Bu, 0x5924A509u,
   2.404 +        0xF28FE6EDu, 0x97F1FBFAu, 0x9EBABF2Cu, 0x1E153C6Eu,
   2.405 +        0x86E34570u, 0xEAE96FB1u, 0x860E5E0Au, 0x5A3E2AB3u,
   2.406 +        0x771FE71Cu, 0x4E3D06FAu, 0x2965DCB9u, 0x99E71D0Fu,
   2.407 +        0x803E89D6u, 0x5266C825u, 0x2E4CC978u, 0x9C10B36Au,
   2.408 +        0xC6150EBAu, 0x94E2EA78u, 0xA5FC3C53u, 0x1E0A2DF4u,
   2.409 +        0xF2F74EA7u, 0x361D2B3Du, 0x1939260Fu, 0x19C27960u,
   2.410 +        0x5223A708u, 0xF71312B6u, 0xEBADFE6Eu, 0xEAC31F66u,
   2.411 +        0xE3BC4595u, 0xA67BC883u, 0xB17F37D1u, 0x018CFF28u,
   2.412 +        0xC332DDEFu, 0xBE6C5AA5u, 0x65582185u, 0x68AB9802u,
   2.413 +        0xEECEA50Fu, 0xDB2F953Bu, 0x2AEF7DADu, 0x5B6E2F84u,
   2.414 +        0x1521B628u, 0x29076170u, 0xECDD4775u, 0x619F1510u,
   2.415 +        0x13CCA830u, 0xEB61BD96u, 0x0334FE1Eu, 0xAA0363CFu,
   2.416 +        0xB5735C90u, 0x4C70A239u, 0xD59E9E0Bu, 0xCBAADE14u,
   2.417 +        0xEECC86BCu, 0x60622CA7u, 0x9CAB5CABu, 0xB2F3846Eu,
   2.418 +        0x648B1EAFu, 0x19BDF0CAu, 0xA02369B9u, 0x655ABB50u,
   2.419 +        0x40685A32u, 0x3C2AB4B3u, 0x319EE9D5u, 0xC021B8F7u,
   2.420 +        0x9B540B19u, 0x875FA099u, 0x95F7997Eu, 0x623D7DA8u,
   2.421 +        0xF837889Au, 0x97E32D77u, 0x11ED935Fu, 0x16681281u,
   2.422 +        0x0E358829u, 0xC7E61FD6u, 0x96DEDFA1u, 0x7858BA99u,
   2.423 +        0x57F584A5u, 0x1B227263u, 0x9B83C3FFu, 0x1AC24696u,
   2.424 +        0xCDB30AEBu, 0x532E3054u, 0x8FD948E4u, 0x6DBC3128u,
   2.425 +        0x58EBF2EFu, 0x34C6FFEAu, 0xFE28ED61u, 0xEE7C3C73u,
   2.426 +        0x5D4A14D9u, 0xE864B7E3u, 0x42105D14u, 0x203E13E0u,
   2.427 +        0x45EEE2B6u, 0xA3AAABEAu, 0xDB6C4F15u, 0xFACB4FD0u,
   2.428 +        0xC742F442u, 0xEF6ABBB5u, 0x654F3B1Du, 0x41CD2105u,
   2.429 +        0xD81E799Eu, 0x86854DC7u, 0xE44B476Au, 0x3D816250u,
   2.430 +        0xCF62A1F2u, 0x5B8D2646u, 0xFC8883A0u, 0xC1C7B6A3u,
   2.431 +        0x7F1524C3u, 0x69CB7492u, 0x47848A0Bu, 0x5692B285u,
   2.432 +        0x095BBF00u, 0xAD19489Du, 0x1462B174u, 0x23820E00u,
   2.433 +        0x58428D2Au, 0x0C55F5EAu, 0x1DADF43Eu, 0x233F7061u,
   2.434 +        0x3372F092u, 0x8D937E41u, 0xD65FECF1u, 0x6C223BDBu,
   2.435 +        0x7CDE3759u, 0xCBEE7460u, 0x4085F2A7u, 0xCE77326Eu,
   2.436 +        0xA6078084u, 0x19F8509Eu, 0xE8EFD855u, 0x61D99735u,
   2.437 +        0xA969A7AAu, 0xC50C06C2u, 0x5A04ABFCu, 0x800BCADCu,
   2.438 +        0x9E447A2Eu, 0xC3453484u, 0xFDD56705u, 0x0E1E9EC9u,
   2.439 +        0xDB73DBD3u, 0x105588CDu, 0x675FDA79u, 0xE3674340u,
   2.440 +        0xC5C43465u, 0x713E38D8u, 0x3D28F89Eu, 0xF16DFF20u,
   2.441 +        0x153E21E7u, 0x8FB03D4Au, 0xE6E39F2Bu, 0xDB83ADF7u   },
   2.442 +    {   0xE93D5A68u, 0x948140F7u, 0xF64C261Cu, 0x94692934u,
   2.443 +        0x411520F7u, 0x7602D4F7u, 0xBCF46B2Eu, 0xD4A20068u,
   2.444 +        0xD4082471u, 0x3320F46Au, 0x43B7D4B7u, 0x500061AFu,
   2.445 +        0x1E39F62Eu, 0x97244546u, 0x14214F74u, 0xBF8B8840u,
   2.446 +        0x4D95FC1Du, 0x96B591AFu, 0x70F4DDD3u, 0x66A02F45u,
   2.447 +        0xBFBC09ECu, 0x03BD9785u, 0x7FAC6DD0u, 0x31CB8504u,
   2.448 +        0x96EB27B3u, 0x55FD3941u, 0xDA2547E6u, 0xABCA0A9Au,
   2.449 +        0x28507825u, 0x530429F4u, 0x0A2C86DAu, 0xE9B66DFBu,
   2.450 +        0x68DC1462u, 0xD7486900u, 0x680EC0A4u, 0x27A18DEEu,
   2.451 +        0x4F3FFEA2u, 0xE887AD8Cu, 0xB58CE006u, 0x7AF4D6B6u,
   2.452 +        0xAACE1E7Cu, 0xD3375FECu, 0xCE78A399u, 0x406B2A42u,
   2.453 +        0x20FE9E35u, 0xD9F385B9u, 0xEE39D7ABu, 0x3B124E8Bu,
   2.454 +        0x1DC9FAF7u, 0x4B6D1856u, 0x26A36631u, 0xEAE397B2u,
   2.455 +        0x3A6EFA74u, 0xDD5B4332u, 0x6841E7F7u, 0xCA7820FBu,
   2.456 +        0xFB0AF54Eu, 0xD8FEB397u, 0x454056ACu, 0xBA489527u,
   2.457 +        0x55533A3Au, 0x20838D87u, 0xFE6BA9B7u, 0xD096954Bu,
   2.458 +        0x55A867BCu, 0xA1159A58u, 0xCCA92963u, 0x99E1DB33u,
   2.459 +        0xA62A4A56u, 0x3F3125F9u, 0x5EF47E1Cu, 0x9029317Cu,
   2.460 +        0xFDF8E802u, 0x04272F70u, 0x80BB155Cu, 0x05282CE3u,
   2.461 +        0x95C11548u, 0xE4C66D22u, 0x48C1133Fu, 0xC70F86DCu,
   2.462 +        0x07F9C9EEu, 0x41041F0Fu, 0x404779A4u, 0x5D886E17u,
   2.463 +        0x325F51EBu, 0xD59BC0D1u, 0xF2BCC18Fu, 0x41113564u,
   2.464 +        0x257B7834u, 0x602A9C60u, 0xDFF8E8A3u, 0x1F636C1Bu,
   2.465 +        0x0E12B4C2u, 0x02E1329Eu, 0xAF664FD1u, 0xCAD18115u,
   2.466 +        0x6B2395E0u, 0x333E92E1u, 0x3B240B62u, 0xEEBEB922u,
   2.467 +        0x85B2A20Eu, 0xE6BA0D99u, 0xDE720C8Cu, 0x2DA2F728u,
   2.468 +        0xD0127845u, 0x95B794FDu, 0x647D0862u, 0xE7CCF5F0u,
   2.469 +        0x5449A36Fu, 0x877D48FAu, 0xC39DFD27u, 0xF33E8D1Eu,
   2.470 +        0x0A476341u, 0x992EFF74u, 0x3A6F6EABu, 0xF4F8FD37u,
   2.471 +        0xA812DC60u, 0xA1EBDDF8u, 0x991BE14Cu, 0xDB6E6B0Du,
   2.472 +        0xC67B5510u, 0x6D672C37u, 0x2765D43Bu, 0xDCD0E804u,
   2.473 +        0xF1290DC7u, 0xCC00FFA3u, 0xB5390F92u, 0x690FED0Bu,
   2.474 +        0x667B9FFBu, 0xCEDB7D9Cu, 0xA091CF0Bu, 0xD9155EA3u,
   2.475 +        0xBB132F88u, 0x515BAD24u, 0x7B9479BFu, 0x763BD6EBu,
   2.476 +        0x37392EB3u, 0xCC115979u, 0x8026E297u, 0xF42E312Du,
   2.477 +        0x6842ADA7u, 0xC66A2B3Bu, 0x12754CCCu, 0x782EF11Cu,
   2.478 +        0x6A124237u, 0xB79251E7u, 0x06A1BBE6u, 0x4BFB6350u,
   2.479 +        0x1A6B1018u, 0x11CAEDFAu, 0x3D25BDD8u, 0xE2E1C3C9u,
   2.480 +        0x44421659u, 0x0A121386u, 0xD90CEC6Eu, 0xD5ABEA2Au,
   2.481 +        0x64AF674Eu, 0xDA86A85Fu, 0xBEBFE988u, 0x64E4C3FEu,
   2.482 +        0x9DBC8057u, 0xF0F7C086u, 0x60787BF8u, 0x6003604Du,
   2.483 +        0xD1FD8346u, 0xF6381FB0u, 0x7745AE04u, 0xD736FCCCu,
   2.484 +        0x83426B33u, 0xF01EAB71u, 0xB0804187u, 0x3C005E5Fu,
   2.485 +        0x77A057BEu, 0xBDE8AE24u, 0x55464299u, 0xBF582E61u,
   2.486 +        0x4E58F48Fu, 0xF2DDFDA2u, 0xF474EF38u, 0x8789BDC2u,
   2.487 +        0x5366F9C3u, 0xC8B38E74u, 0xB475F255u, 0x46FCD9B9u,
   2.488 +        0x7AEB2661u, 0x8B1DDF84u, 0x846A0E79u, 0x915F95E2u,
   2.489 +        0x466E598Eu, 0x20B45770u, 0x8CD55591u, 0xC902DE4Cu,
   2.490 +        0xB90BACE1u, 0xBB8205D0u, 0x11A86248u, 0x7574A99Eu,
   2.491 +        0xB77F19B6u, 0xE0A9DC09u, 0x662D09A1u, 0xC4324633u,
   2.492 +        0xE85A1F02u, 0x09F0BE8Cu, 0x4A99A025u, 0x1D6EFE10u,
   2.493 +        0x1AB93D1Du, 0x0BA5A4DFu, 0xA186F20Fu, 0x2868F169u,
   2.494 +        0xDCB7DA83u, 0x573906FEu, 0xA1E2CE9Bu, 0x4FCD7F52u,
   2.495 +        0x50115E01u, 0xA70683FAu, 0xA002B5C4u, 0x0DE6D027u,
   2.496 +        0x9AF88C27u, 0x773F8641u, 0xC3604C06u, 0x61A806B5u,
   2.497 +        0xF0177A28u, 0xC0F586E0u, 0x006058AAu, 0x30DC7D62u,
   2.498 +        0x11E69ED7u, 0x2338EA63u, 0x53C2DD94u, 0xC2C21634u,
   2.499 +        0xBBCBEE56u, 0x90BCB6DEu, 0xEBFC7DA1u, 0xCE591D76u,
   2.500 +        0x6F05E409u, 0x4B7C0188u, 0x39720A3Du, 0x7C927C24u,
   2.501 +        0x86E3725Fu, 0x724D9DB9u, 0x1AC15BB4u, 0xD39EB8FCu,
   2.502 +        0xED545578u, 0x08FCA5B5u, 0xD83D7CD3u, 0x4DAD0FC4u,
   2.503 +        0x1E50EF5Eu, 0xB161E6F8u, 0xA28514D9u, 0x6C51133Cu,
   2.504 +        0x6FD5C7E7u, 0x56E14EC4u, 0x362ABFCEu, 0xDDC6C837u,
   2.505 +        0xD79A3234u, 0x92638212u, 0x670EFA8Eu, 0x406000E0u  },
   2.506 +    {   0x3A39CE37u, 0xD3FAF5CFu, 0xABC27737u, 0x5AC52D1Bu,
   2.507 +        0x5CB0679Eu, 0x4FA33742u, 0xD3822740u, 0x99BC9BBEu,
   2.508 +        0xD5118E9Du, 0xBF0F7315u, 0xD62D1C7Eu, 0xC700C47Bu,
   2.509 +        0xB78C1B6Bu, 0x21A19045u, 0xB26EB1BEu, 0x6A366EB4u,
   2.510 +        0x5748AB2Fu, 0xBC946E79u, 0xC6A376D2u, 0x6549C2C8u,
   2.511 +        0x530FF8EEu, 0x468DDE7Du, 0xD5730A1Du, 0x4CD04DC6u,
   2.512 +        0x2939BBDBu, 0xA9BA4650u, 0xAC9526E8u, 0xBE5EE304u,
   2.513 +        0xA1FAD5F0u, 0x6A2D519Au, 0x63EF8CE2u, 0x9A86EE22u,
   2.514 +        0xC089C2B8u, 0x43242EF6u, 0xA51E03AAu, 0x9CF2D0A4u,
   2.515 +        0x83C061BAu, 0x9BE96A4Du, 0x8FE51550u, 0xBA645BD6u,
   2.516 +        0x2826A2F9u, 0xA73A3AE1u, 0x4BA99586u, 0xEF5562E9u,
   2.517 +        0xC72FEFD3u, 0xF752F7DAu, 0x3F046F69u, 0x77FA0A59u,
   2.518 +        0x80E4A915u, 0x87B08601u, 0x9B09E6ADu, 0x3B3EE593u,
   2.519 +        0xE990FD5Au, 0x9E34D797u, 0x2CF0B7D9u, 0x022B8B51u,
   2.520 +        0x96D5AC3Au, 0x017DA67Du, 0xD1CF3ED6u, 0x7C7D2D28u,
   2.521 +        0x1F9F25CFu, 0xADF2B89Bu, 0x5AD6B472u, 0x5A88F54Cu,
   2.522 +        0xE029AC71u, 0xE019A5E6u, 0x47B0ACFDu, 0xED93FA9Bu,
   2.523 +        0xE8D3C48Du, 0x283B57CCu, 0xF8D56629u, 0x79132E28u,
   2.524 +        0x785F0191u, 0xED756055u, 0xF7960E44u, 0xE3D35E8Cu,
   2.525 +        0x15056DD4u, 0x88F46DBAu, 0x03A16125u, 0x0564F0BDu,
   2.526 +        0xC3EB9E15u, 0x3C9057A2u, 0x97271AECu, 0xA93A072Au,
   2.527 +        0x1B3F6D9Bu, 0x1E6321F5u, 0xF59C66FBu, 0x26DCF319u,
   2.528 +        0x7533D928u, 0xB155FDF5u, 0x03563482u, 0x8ABA3CBBu,
   2.529 +        0x28517711u, 0xC20AD9F8u, 0xABCC5167u, 0xCCAD925Fu,
   2.530 +        0x4DE81751u, 0x3830DC8Eu, 0x379D5862u, 0x9320F991u,
   2.531 +        0xEA7A90C2u, 0xFB3E7BCEu, 0x5121CE64u, 0x774FBE32u,
   2.532 +        0xA8B6E37Eu, 0xC3293D46u, 0x48DE5369u, 0x6413E680u,
   2.533 +        0xA2AE0810u, 0xDD6DB224u, 0x69852DFDu, 0x09072166u,
   2.534 +        0xB39A460Au, 0x6445C0DDu, 0x586CDECFu, 0x1C20C8AEu,
   2.535 +        0x5BBEF7DDu, 0x1B588D40u, 0xCCD2017Fu, 0x6BB4E3BBu,
   2.536 +        0xDDA26A7Eu, 0x3A59FF45u, 0x3E350A44u, 0xBCB4CDD5u,
   2.537 +        0x72EACEA8u, 0xFA6484BBu, 0x8D6612AEu, 0xBF3C6F47u,
   2.538 +        0xD29BE463u, 0x542F5D9Eu, 0xAEC2771Bu, 0xF64E6370u,
   2.539 +        0x740E0D8Du, 0xE75B1357u, 0xF8721671u, 0xAF537D5Du,
   2.540 +        0x4040CB08u, 0x4EB4E2CCu, 0x34D2466Au, 0x0115AF84u,
   2.541 +        0xE1B00428u, 0x95983A1Du, 0x06B89FB4u, 0xCE6EA048u,
   2.542 +        0x6F3F3B82u, 0x3520AB82u, 0x011A1D4Bu, 0x277227F8u,
   2.543 +        0x611560B1u, 0xE7933FDCu, 0xBB3A792Bu, 0x344525BDu,
   2.544 +        0xA08839E1u, 0x51CE794Bu, 0x2F32C9B7u, 0xA01FBAC9u,
   2.545 +        0xE01CC87Eu, 0xBCC7D1F6u, 0xCF0111C3u, 0xA1E8AAC7u,
   2.546 +        0x1A908749u, 0xD44FBD9Au, 0xD0DADECBu, 0xD50ADA38u,
   2.547 +        0x0339C32Au, 0xC6913667u, 0x8DF9317Cu, 0xE0B12B4Fu,
   2.548 +        0xF79E59B7u, 0x43F5BB3Au, 0xF2D519FFu, 0x27D9459Cu,
   2.549 +        0xBF97222Cu, 0x15E6FC2Au, 0x0F91FC71u, 0x9B941525u,
   2.550 +        0xFAE59361u, 0xCEB69CEBu, 0xC2A86459u, 0x12BAA8D1u,
   2.551 +        0xB6C1075Eu, 0xE3056A0Cu, 0x10D25065u, 0xCB03A442u,
   2.552 +        0xE0EC6E0Eu, 0x1698DB3Bu, 0x4C98A0BEu, 0x3278E964u,
   2.553 +        0x9F1F9532u, 0xE0D392DFu, 0xD3A0342Bu, 0x8971F21Eu,
   2.554 +        0x1B0A7441u, 0x4BA3348Cu, 0xC5BE7120u, 0xC37632D8u,
   2.555 +        0xDF359F8Du, 0x9B992F2Eu, 0xE60B6F47u, 0x0FE3F11Du,
   2.556 +        0xE54CDA54u, 0x1EDAD891u, 0xCE6279CFu, 0xCD3E7E6Fu,
   2.557 +        0x1618B166u, 0xFD2C1D05u, 0x848FD2C5u, 0xF6FB2299u,
   2.558 +        0xF523F357u, 0xA6327623u, 0x93A83531u, 0x56CCCD02u,
   2.559 +        0xACF08162u, 0x5A75EBB5u, 0x6E163697u, 0x88D273CCu,
   2.560 +        0xDE966292u, 0x81B949D0u, 0x4C50901Bu, 0x71C65614u,
   2.561 +        0xE6C6C7BDu, 0x327A140Au, 0x45E1D006u, 0xC3F27B9Au,
   2.562 +        0xC9AA53FDu, 0x62A80F00u, 0xBB25BFE2u, 0x35BDD2F6u,
   2.563 +        0x71126905u, 0xB2040222u, 0xB6CBCF7Cu, 0xCD769C2Bu,
   2.564 +        0x53113EC0u, 0x1640E3D3u, 0x38ABBD60u, 0x2547ADF0u,
   2.565 +        0xBA38209Cu, 0xF746CE76u, 0x77AFA1C5u, 0x20756060u,
   2.566 +        0x85CBFE4Eu, 0x8AE88DD8u, 0x7AAAF9B0u, 0x4CF9AA7Eu,
   2.567 +        0x1948C25Cu, 0x02FB8A8Cu, 0x01C36AE4u, 0xD6EBE1F9u,
   2.568 +        0x90D4F869u, 0xA65CDEA0u, 0x3F09252Du, 0xC208E69Fu,
   2.569 +        0xB74E6132u, 0xCE77E25Bu, 0x578FDFE3u, 0x3AC372E6u  }
   2.570  };
   2.571  
   2.572  
   2.573 -static unsigned long F(BLOWFISH_CTX *ctx, unsigned long x) {
   2.574 -   unsigned short a, b, c, d;
   2.575 -   unsigned long  y;
   2.576 +static uint32_t F(BLOWFISH_CTX *ctx, uint32_t x) {
   2.577 +    uint16_t a, b, c, d;
   2.578 +    uint32_t  y;
   2.579  
   2.580 -   d = (unsigned short)(x & 0xFF);
   2.581 -   x >>= 8;
   2.582 -   c = (unsigned short)(x & 0xFF);
   2.583 -   x >>= 8;
   2.584 -   b = (unsigned short)(x & 0xFF);
   2.585 -   x >>= 8;
   2.586 -   a = (unsigned short)(x & 0xFF);
   2.587 -   y = ctx->S[0][a] + ctx->S[1][b];
   2.588 -   y = y ^ ctx->S[2][c];
   2.589 -   y = y + ctx->S[3][d];
   2.590 +    d = (uint16_t)(x & 0xFF);
   2.591 +    x >>= 8;
   2.592 +    c = (uint16_t)(x & 0xFF);
   2.593 +    x >>= 8;
   2.594 +    b = (uint16_t)(x & 0xFF);
   2.595 +    x >>= 8;
   2.596 +    a = (uint16_t)(x & 0xFF);
   2.597 +    y = ctx->S[0][a] + ctx->S[1][b];
   2.598 +    y = y ^ ctx->S[2][c];
   2.599 +    y = y + ctx->S[3][d];
   2.600  
   2.601 -   return y;
   2.602 +    return y;
   2.603  }
   2.604  
   2.605  
   2.606 -static void Blowfish_Encrypt(BLOWFISH_CTX *ctx, unsigned long *xl, unsigned long *xr){
   2.607 -  unsigned long  Xl;
   2.608 -  unsigned long  Xr;
   2.609 -  unsigned long  temp;
   2.610 -  short       i;
   2.611 +static void Blowfish_Encrypt(BLOWFISH_CTX *ctx, uint32_t *xl, uint32_t *xr){
   2.612 +    uint32_t  Xl;
   2.613 +    uint32_t  Xr;
   2.614 +    uint32_t  temp;
   2.615 +    short       i;
   2.616 +
   2.617 +    Xl = *xl;
   2.618 +    Xr = *xr;
   2.619  
   2.620 -  Xl = *xl;
   2.621 -  Xr = *xr;
   2.622 +    for (i = 0; i < N; ++i) {
   2.623 +        Xl = Xl ^ ctx->P[i];
   2.624 +        Xr = F(ctx, Xl) ^ Xr;
   2.625  
   2.626 -  for (i = 0; i < N; ++i) {
   2.627 -    Xl = Xl ^ ctx->P[i];
   2.628 -    Xr = F(ctx, Xl) ^ Xr;
   2.629 +        temp = Xl;
   2.630 +        Xl = Xr;
   2.631 +        Xr = temp;
   2.632 +    }
   2.633  
   2.634      temp = Xl;
   2.635      Xl = Xr;
   2.636      Xr = temp;
   2.637 -  }
   2.638 -
   2.639 -  temp = Xl;
   2.640 -  Xl = Xr;
   2.641 -  Xr = temp;
   2.642  
   2.643 -  Xr = Xr ^ ctx->P[N];
   2.644 -  Xl = Xl ^ ctx->P[N + 1];
   2.645 +    Xr = Xr ^ ctx->P[N];
   2.646 +    Xl = Xl ^ ctx->P[N + 1];
   2.647  
   2.648 -  *xl = Xl;
   2.649 -  *xr = Xr;
   2.650 +    *xl = Xl;
   2.651 +    *xr = Xr;
   2.652  }
   2.653  
   2.654  
   2.655 -static void Blowfish_Decrypt(BLOWFISH_CTX *ctx, unsigned long *xl, unsigned long *xr){
   2.656 -  unsigned long  Xl;
   2.657 -  unsigned long  Xr;
   2.658 -  unsigned long  temp;
   2.659 -  short       i;
   2.660 +static void Blowfish_Decrypt(BLOWFISH_CTX *ctx, uint32_t *xl, uint32_t *xr){
   2.661 +    uint32_t  Xl;
   2.662 +    uint32_t  Xr;
   2.663 +    uint32_t  temp;
   2.664 +    short       i;
   2.665 +
   2.666 +    Xl = *xl;
   2.667 +    Xr = *xr;
   2.668  
   2.669 -  Xl = *xl;
   2.670 -  Xr = *xr;
   2.671 +    for (i = N + 1; i > 1; --i) {
   2.672 +        Xl = Xl ^ ctx->P[i];
   2.673 +        Xr = F(ctx, Xl) ^ Xr;
   2.674  
   2.675 -  for (i = N + 1; i > 1; --i) {
   2.676 -    Xl = Xl ^ ctx->P[i];
   2.677 -    Xr = F(ctx, Xl) ^ Xr;
   2.678 +        /* Exchange Xl and Xr */
   2.679 +        temp = Xl;
   2.680 +        Xl = Xr;
   2.681 +        Xr = temp;
   2.682 +    }
   2.683  
   2.684      /* Exchange Xl and Xr */
   2.685      temp = Xl;
   2.686      Xl = Xr;
   2.687      Xr = temp;
   2.688 -  }
   2.689  
   2.690 -  /* Exchange Xl and Xr */
   2.691 -  temp = Xl;
   2.692 -  Xl = Xr;
   2.693 -  Xr = temp;
   2.694 +    Xr = Xr ^ ctx->P[1];
   2.695 +    Xl = Xl ^ ctx->P[0];
   2.696  
   2.697 -  Xr = Xr ^ ctx->P[1];
   2.698 -  Xl = Xl ^ ctx->P[0];
   2.699 -
   2.700 -  *xl = Xl;
   2.701 -  *xr = Xr;
   2.702 +    *xl = Xl;
   2.703 +    *xr = Xr;
   2.704  }
   2.705  
   2.706  static void Blowfish_Init(BLOWFISH_CTX *ctx, unsigned char *key, int keyLen) {
   2.707 -  int i, j, k;
   2.708 -  unsigned long data, datal, datar;
   2.709 -
   2.710 -  for (i = 0; i < 4; i++) {
   2.711 -    for (j = 0; j < 256; j++)
   2.712 -      ctx->S[i][j] = ORIG_S[i][j];
   2.713 -  }
   2.714 +    int i, j, k;
   2.715 +    uint32_t data, datal, datar;
   2.716  
   2.717 -  j = 0;
   2.718 -  for (i = 0; i < N + 2; ++i) {
   2.719 -    data = 0x00000000;
   2.720 -    for (k = 0; k < 4; ++k) {
   2.721 -      data = (data << 8) | key[j];
   2.722 -      j = j + 1;
   2.723 -      if (j >= keyLen)
   2.724 -        j = 0;
   2.725 +    for (i = 0; i < 4; i++) {
   2.726 +        for (j = 0; j < 256; j++)
   2.727 +            ctx->S[i][j] = ORIG_S[i][j];
   2.728      }
   2.729 -    ctx->P[i] = ORIG_P[i] ^ data;
   2.730 -  }
   2.731  
   2.732 -  datal = 0x00000000;
   2.733 -  datar = 0x00000000;
   2.734 +    j = 0;
   2.735 +    for (i = 0; i < N + 2; ++i) {
   2.736 +        data = 0x00000000;
   2.737 +        for (k = 0; k < 4; ++k) {
   2.738 +            data = (data << 8) | key[j];
   2.739 +            j = j + 1;
   2.740 +            if (j >= keyLen)
   2.741 +                j = 0;
   2.742 +        }
   2.743 +        ctx->P[i] = ORIG_P[i] ^ data;
   2.744 +    }
   2.745  
   2.746 -  for (i = 0; i < N + 2; i += 2) {
   2.747 -    Blowfish_Encrypt(ctx, &datal, &datar);
   2.748 -    ctx->P[i] = datal;
   2.749 -    ctx->P[i + 1] = datar;
   2.750 -  }
   2.751 +    datal = 0x00000000;
   2.752 +    datar = 0x00000000;
   2.753  
   2.754 -  for (i = 0; i < 4; ++i) {
   2.755 -    for (j = 0; j < 256; j += 2) {
   2.756 -      Blowfish_Encrypt(ctx, &datal, &datar);
   2.757 -      ctx->S[i][j] = datal;
   2.758 -      ctx->S[i][j + 1] = datar;
   2.759 +    for (i = 0; i < N + 2; i += 2) {
   2.760 +        Blowfish_Encrypt(ctx, &datal, &datar);
   2.761 +        ctx->P[i] = datal;
   2.762 +        ctx->P[i + 1] = datar;
   2.763      }
   2.764 -  }
   2.765 +
   2.766 +    for (i = 0; i < 4; ++i) {
   2.767 +        for (j = 0; j < 256; j += 2) {
   2.768 +            Blowfish_Encrypt(ctx, &datal, &datar);
   2.769 +            ctx->S[i][j] = datal;
   2.770 +            ctx->S[i][j + 1] = datar;
   2.771 +        }
   2.772 +    }
   2.773  }
   2.774  
   2.775 -static unsigned long long blowfish_test(unsigned long long input)
   2.776 +uint64_t blowfish_test(uint64_t input)
   2.777  {
   2.778 -    unsigned long L = input >> 32, R = input;
   2.779 +    uint32_t L = input >> 32, R = input;
   2.780      BLOWFISH_CTX ctx;
   2.781      Blowfish_Init(&ctx, (unsigned char*)"TESTKEY", 7);
   2.782      Blowfish_Encrypt(&ctx, &L, &R);
   2.783      Blowfish_Decrypt(&ctx, &L, &R);
   2.784 -    return ((unsigned long long)L << 32) | R;
   2.785 +    return ((uint64_t)L << 32) | R;
   2.786  }

     3.1 --- a/tools/tests/blowfish.mk	Mon Oct 11 09:03:18 2010 +0100
     3.2 +++ b/tools/tests/blowfish.mk	Mon Oct 11 10:22:24 2010 +0100
     3.3 @@ -1,5 +1,4 @@
     3.4  
     3.5 -override XEN_TARGET_ARCH = x86_32
     3.6  XEN_ROOT = ../..
     3.7  CFLAGS =
     3.8  include $(XEN_ROOT)/tools/Rules.mk

     4.1 --- a/tools/tests/test_x86_emulator.c	Mon Oct 11 09:03:18 2010 +0100
     4.2 +++ b/tools/tests/test_x86_emulator.c	Mon Oct 11 10:22:24 2010 +0100
     4.3 @@ -65,7 +65,7 @@ int main(int argc, char **argv)
     4.4      struct x86_emulate_ctxt ctxt;
     4.5      struct cpu_user_regs regs;
     4.6      char *instr;
     4.7 -    unsigned int *res, i;
     4.8 +    unsigned int *res, i, j;
     4.9      int rc;
    4.10  #ifndef __x86_64__
    4.11      unsigned int bcdres_native, bcdres_emul;
    4.12 @@ -442,41 +442,58 @@ int main(int argc, char **argv)
    4.13      printf("skipped\n");
    4.14  #endif
    4.15  
    4.16 -    printf("Testing blowfish code sequence");
    4.17 -    memcpy(res, blowfish_code, sizeof(blowfish_code));
    4.18 -    regs.eax = 2;
    4.19 -    regs.edx = 1;
    4.20 -    regs.eip = (unsigned long)res;
    4.21 -    regs.esp = (unsigned long)res + MMAP_SZ - 4;
    4.22 -    *(uint32_t *)(unsigned long)regs.esp = 0x12345678;
    4.23 -    regs.eflags = 2;
    4.24 -    i = 0;
    4.25 -    while ( (uint32_t)regs.eip != 0x12345678 )
    4.26 +    for ( j = 1; j <= 2; j++ )
    4.27      {
    4.28 -        if ( (i++ & 8191) == 0 )
    4.29 -            printf(".");
    4.30 -        rc = x86_emulate(&ctxt, &emulops);
    4.31 -        if ( rc != X86EMUL_OKAY )
    4.32 +#if defined(__i386__)
    4.33 +        if ( j == 2 ) break;
    4.34 +        memcpy(res, blowfish32_code, sizeof(blowfish32_code));
    4.35 +#else
    4.36 +        memcpy(res, (j == 1) ? blowfish32_code : blowfish64_code,
    4.37 +               (j == 1) ? sizeof(blowfish32_code) : sizeof(blowfish64_code));
    4.38 +#endif
    4.39 +        printf("Testing blowfish %u-bit code sequence", j*32);
    4.40 +        regs.eax = 2;
    4.41 +        regs.edx = 1;
    4.42 +        regs.eip = (unsigned long)res;
    4.43 +        regs.esp = (unsigned long)res + MMAP_SZ - 4;
    4.44 +        if ( j == 2 )
    4.45          {
    4.46 -            printf("failed at %%eip == %08x\n", (unsigned int)regs.eip);
    4.47 -            return 1;
    4.48 +            ctxt.addr_size = ctxt.sp_size = 64;
    4.49 +            *(uint32_t *)(unsigned long)regs.esp = 0;
    4.50 +            regs.esp -= 4;
    4.51          }
    4.52 +        *(uint32_t *)(unsigned long)regs.esp = 0x12345678;
    4.53 +        regs.eflags = 2;
    4.54 +        i = 0;
    4.55 +        while ( regs.eip != 0x12345678 )
    4.56 +        {
    4.57 +            if ( (i++ & 8191) == 0 )
    4.58 +                printf(".");
    4.59 +            rc = x86_emulate(&ctxt, &emulops);
    4.60 +            if ( rc != X86EMUL_OKAY )
    4.61 +            {
    4.62 +                printf("failed at %%eip == %08x\n", (unsigned int)regs.eip);
    4.63 +                return 1;
    4.64 +            }
    4.65 +        }
    4.66 +        if ( (regs.esp != ((unsigned long)res + MMAP_SZ)) ||
    4.67 +             (regs.eax != 2) || (regs.edx != 1) )
    4.68 +            goto fail;
    4.69 +        printf("okay\n");
    4.70      }
    4.71 -    if ( (regs.esp != ((unsigned long)res + MMAP_SZ)) ||
    4.72 -         (regs.eax != 2) || (regs.edx != 1) )
    4.73 -        goto fail;
    4.74 -    printf("okay\n");
    4.75  
    4.76 -#ifndef __x86_64__
    4.77      printf("%-40s", "Testing blowfish native execution...");    
    4.78      asm volatile (
    4.79 +#if defined(__i386__)
    4.80          "movl $0x100000,%%ecx; call *%%ecx"
    4.81 +#else
    4.82 +        "movl $0x100000,%%ecx; call *%%rcx"
    4.83 +#endif
    4.84          : "=a" (regs.eax), "=d" (regs.edx)
    4.85          : "0" (2), "1" (1) : "ecx" );
    4.86      if ( (regs.eax != 2) || (regs.edx != 1) )
    4.87          goto fail;
    4.88      printf("okay\n");
    4.89 -#endif    
    4.90  
    4.91      return 0;
    4.92