diff options
366 files changed, 8071 insertions, 39453 deletions
diff --git a/src/lib/libcrypto/Attic/Makefile b/src/lib/libcrypto/Attic/Makefile index 24b7f32fdd..b980f54dba 100644 --- a/src/lib/libcrypto/Attic/Makefile +++ b/src/lib/libcrypto/Attic/Makefile | |||
@@ -40,7 +40,7 @@ LIBOBJ= cryptlib.o mem.o mem_dbg.o cversion.o ex_data.o tmdiff.o cpt_err.o ebcdi | |||
40 | SRC= $(LIBSRC) | 40 | SRC= $(LIBSRC) |
41 | 41 | ||
42 | EXHEADER= crypto.h tmdiff.h opensslv.h opensslconf.h ebcdic.h | 42 | EXHEADER= crypto.h tmdiff.h opensslv.h opensslconf.h ebcdic.h |
43 | HEADER= cryptlib.h buildinf.h $(EXHEADER) | 43 | HEADER= cryptlib.h buildinf.h md32_common.h $(EXHEADER) |
44 | 44 | ||
45 | ALL= $(GENERAL) $(SRC) $(HEADER) | 45 | ALL= $(GENERAL) $(SRC) $(HEADER) |
46 | 46 | ||
diff --git a/src/lib/libcrypto/Makefile.ssl b/src/lib/libcrypto/Makefile.ssl index cab75d9f80..f9b33586be 100644 --- a/src/lib/libcrypto/Makefile.ssl +++ b/src/lib/libcrypto/Makefile.ssl | |||
@@ -40,7 +40,7 @@ LIBOBJ= cryptlib.o mem.o mem_dbg.o cversion.o ex_data.o tmdiff.o cpt_err.o ebcdi | |||
40 | SRC= $(LIBSRC) | 40 | SRC= $(LIBSRC) |
41 | 41 | ||
42 | EXHEADER= crypto.h tmdiff.h opensslv.h opensslconf.h ebcdic.h | 42 | EXHEADER= crypto.h tmdiff.h opensslv.h opensslconf.h ebcdic.h |
43 | HEADER= cryptlib.h buildinf.h $(EXHEADER) | 43 | HEADER= cryptlib.h buildinf.h md32_common.h $(EXHEADER) |
44 | 44 | ||
45 | ALL= $(GENERAL) $(SRC) $(HEADER) | 45 | ALL= $(GENERAL) $(SRC) $(HEADER) |
46 | 46 | ||
diff --git a/src/lib/libcrypto/asn1/asn1_err.c b/src/lib/libcrypto/asn1/asn1_err.c index b183814242..cecd555c88 100644 --- a/src/lib/libcrypto/asn1/asn1_err.c +++ b/src/lib/libcrypto/asn1/asn1_err.c | |||
@@ -54,7 +54,8 @@ | |||
54 | */ | 54 | */ |
55 | 55 | ||
56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes |
57 | * made to it will be overwritten when the script next updates this file. | 57 | * made to it will be overwritten when the script next updates this file, |
58 | * only reason strings will be preserved. | ||
58 | */ | 59 | */ |
59 | 60 | ||
60 | #include <stdio.h> | 61 | #include <stdio.h> |
diff --git a/src/lib/libcrypto/asn1/p5_pbe.c b/src/lib/libcrypto/asn1/p5_pbe.c index 64e90237cc..a147ac3295 100644 --- a/src/lib/libcrypto/asn1/p5_pbe.c +++ b/src/lib/libcrypto/asn1/p5_pbe.c | |||
@@ -129,7 +129,7 @@ X509_ALGOR *PKCS5_pbe_set(int alg, int iter, unsigned char *salt, | |||
129 | } | 129 | } |
130 | pbe->salt->length = saltlen; | 130 | pbe->salt->length = saltlen; |
131 | if (salt) memcpy (pbe->salt->data, salt, saltlen); | 131 | if (salt) memcpy (pbe->salt->data, salt, saltlen); |
132 | else if (RAND_bytes (pbe->salt->data, saltlen) <= 0) | 132 | else if (RAND_pseudo_bytes (pbe->salt->data, saltlen) < 0) |
133 | return NULL; | 133 | return NULL; |
134 | 134 | ||
135 | if (!(astype = ASN1_TYPE_new())) { | 135 | if (!(astype = ASN1_TYPE_new())) { |
diff --git a/src/lib/libcrypto/asn1/p5_pbev2.c b/src/lib/libcrypto/asn1/p5_pbev2.c index 4ce06a94ab..1bbdb10c71 100644 --- a/src/lib/libcrypto/asn1/p5_pbev2.c +++ b/src/lib/libcrypto/asn1/p5_pbev2.c | |||
@@ -194,7 +194,8 @@ X509_ALGOR *PKCS5_pbe2_set(const EVP_CIPHER *cipher, int iter, | |||
194 | if(!(scheme->parameter = ASN1_TYPE_new())) goto merr; | 194 | if(!(scheme->parameter = ASN1_TYPE_new())) goto merr; |
195 | 195 | ||
196 | /* Create random IV */ | 196 | /* Create random IV */ |
197 | RAND_pseudo_bytes(iv, EVP_CIPHER_iv_length(cipher)); | 197 | if (RAND_pseudo_bytes(iv, EVP_CIPHER_iv_length(cipher)) < 0) |
198 | goto err; | ||
198 | 199 | ||
199 | /* Dummy cipherinit to just setup the IV */ | 200 | /* Dummy cipherinit to just setup the IV */ |
200 | EVP_CipherInit(&ctx, cipher, NULL, iv, 0); | 201 | EVP_CipherInit(&ctx, cipher, NULL, iv, 0); |
@@ -212,7 +213,7 @@ X509_ALGOR *PKCS5_pbe2_set(const EVP_CIPHER *cipher, int iter, | |||
212 | if (!(osalt->data = Malloc (saltlen))) goto merr; | 213 | if (!(osalt->data = Malloc (saltlen))) goto merr; |
213 | osalt->length = saltlen; | 214 | osalt->length = saltlen; |
214 | if (salt) memcpy (osalt->data, salt, saltlen); | 215 | if (salt) memcpy (osalt->data, salt, saltlen); |
215 | else if (RAND_bytes (osalt->data, saltlen) <= 0) goto merr; | 216 | else if (RAND_pseudo_bytes (osalt->data, saltlen) < 0) goto merr; |
216 | 217 | ||
217 | if(iter <= 0) iter = PKCS5_DEFAULT_ITER; | 218 | if(iter <= 0) iter = PKCS5_DEFAULT_ITER; |
218 | if(!ASN1_INTEGER_set(kdf->iter, iter)) goto merr; | 219 | if(!ASN1_INTEGER_set(kdf->iter, iter)) goto merr; |
diff --git a/src/lib/libcrypto/asn1/t_req.c b/src/lib/libcrypto/asn1/t_req.c index 81dd6355a8..ea1af092db 100644 --- a/src/lib/libcrypto/asn1/t_req.c +++ b/src/lib/libcrypto/asn1/t_req.c | |||
@@ -119,7 +119,7 @@ int X509_REQ_print(BIO *bp, X509_REQ *x) | |||
119 | 119 | ||
120 | pkey=X509_REQ_get_pubkey(x); | 120 | pkey=X509_REQ_get_pubkey(x); |
121 | #ifndef NO_RSA | 121 | #ifndef NO_RSA |
122 | if (pkey->type == EVP_PKEY_RSA) | 122 | if (pkey != NULL && pkey->type == EVP_PKEY_RSA) |
123 | { | 123 | { |
124 | BIO_printf(bp,"%12sRSA Public Key: (%d bit)\n","", | 124 | BIO_printf(bp,"%12sRSA Public Key: (%d bit)\n","", |
125 | BN_num_bits(pkey->pkey.rsa->n)); | 125 | BN_num_bits(pkey->pkey.rsa->n)); |
@@ -128,7 +128,7 @@ int X509_REQ_print(BIO *bp, X509_REQ *x) | |||
128 | else | 128 | else |
129 | #endif | 129 | #endif |
130 | #ifndef NO_DSA | 130 | #ifndef NO_DSA |
131 | if (pkey->type == EVP_PKEY_DSA) | 131 | if (pkey != NULL && pkey->type == EVP_PKEY_DSA) |
132 | { | 132 | { |
133 | BIO_printf(bp,"%12sDSA Public Key:\n",""); | 133 | BIO_printf(bp,"%12sDSA Public Key:\n",""); |
134 | DSA_print(bp,pkey->pkey.dsa,16); | 134 | DSA_print(bp,pkey->pkey.dsa,16); |
@@ -137,7 +137,8 @@ int X509_REQ_print(BIO *bp, X509_REQ *x) | |||
137 | #endif | 137 | #endif |
138 | BIO_printf(bp,"%12sUnknown Public Key:\n",""); | 138 | BIO_printf(bp,"%12sUnknown Public Key:\n",""); |
139 | 139 | ||
140 | EVP_PKEY_free(pkey); | 140 | if (pkey != NULL) |
141 | EVP_PKEY_free(pkey); | ||
141 | 142 | ||
142 | /* may not be */ | 143 | /* may not be */ |
143 | sprintf(str,"%8sAttributes:\n",""); | 144 | sprintf(str,"%8sAttributes:\n",""); |
diff --git a/src/lib/libcrypto/asn1/x_pubkey.c b/src/lib/libcrypto/asn1/x_pubkey.c index 81e9815222..7a05d575c9 100644 --- a/src/lib/libcrypto/asn1/x_pubkey.c +++ b/src/lib/libcrypto/asn1/x_pubkey.c | |||
@@ -183,8 +183,10 @@ int X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey) | |||
183 | 183 | ||
184 | Free(s); | 184 | Free(s); |
185 | 185 | ||
186 | #if 0 | ||
186 | CRYPTO_add(&pkey->references,1,CRYPTO_LOCK_EVP_PKEY); | 187 | CRYPTO_add(&pkey->references,1,CRYPTO_LOCK_EVP_PKEY); |
187 | pk->pkey=pkey; | 188 | pk->pkey=pkey; |
189 | #endif | ||
188 | 190 | ||
189 | if (*x != NULL) | 191 | if (*x != NULL) |
190 | X509_PUBKEY_free(*x); | 192 | X509_PUBKEY_free(*x); |
diff --git a/src/lib/libcrypto/bf/Makefile.ssl b/src/lib/libcrypto/bf/Makefile.ssl index 15f6a63987..cf2f7dd48e 100644 --- a/src/lib/libcrypto/bf/Makefile.ssl +++ b/src/lib/libcrypto/bf/Makefile.ssl | |||
@@ -49,7 +49,7 @@ lib: $(LIBOBJ) | |||
49 | 49 | ||
50 | # elf | 50 | # elf |
51 | asm/bx86-elf.o: asm/bx86unix.cpp | 51 | asm/bx86-elf.o: asm/bx86unix.cpp |
52 | $(CPP) -DELF asm/bx86unix.cpp | as -o asm/bx86-elf.o | 52 | $(CPP) -DELF -x c asm/bx86unix.cpp | as -o asm/bx86-elf.o |
53 | 53 | ||
54 | # solaris | 54 | # solaris |
55 | asm/bx86-sol.o: asm/bx86unix.cpp | 55 | asm/bx86-sol.o: asm/bx86unix.cpp |
@@ -65,7 +65,7 @@ asm/bx86-out.o: asm/bx86unix.cpp | |||
65 | asm/bx86bsdi.o: asm/bx86unix.cpp | 65 | asm/bx86bsdi.o: asm/bx86unix.cpp |
66 | $(CPP) -DBSDI asm/bx86unix.cpp | sed 's/ :/:/' | as -o asm/bx86bsdi.o | 66 | $(CPP) -DBSDI asm/bx86unix.cpp | sed 's/ :/:/' | as -o asm/bx86bsdi.o |
67 | 67 | ||
68 | asm/bx86unix.cpp: | 68 | asm/bx86unix.cpp: asm/bf-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl |
69 | (cd asm; $(PERL) bf-586.pl cpp $(PROCESSOR) >bx86unix.cpp) | 69 | (cd asm; $(PERL) bf-586.pl cpp $(PROCESSOR) >bx86unix.cpp) |
70 | 70 | ||
71 | files: | 71 | files: |
diff --git a/src/lib/libcrypto/bf/Makefile.uni b/src/lib/libcrypto/bf/Makefile.uni index f67e5ca23b..e69de29bb2 100644 --- a/src/lib/libcrypto/bf/Makefile.uni +++ b/src/lib/libcrypto/bf/Makefile.uni | |||
@@ -1,157 +0,0 @@ | |||
1 | # Targets | ||
2 | # make - twidle the options yourself :-) | ||
3 | # make cc - standard cc options | ||
4 | # make gcc - standard gcc options | ||
5 | # make x86-elf - linux-elf etc | ||
6 | # make x86-out - linux-a.out, FreeBSD etc | ||
7 | # make x86-solaris | ||
8 | # make x86-bdsi | ||
9 | |||
10 | DIR= bf | ||
11 | TOP= . | ||
12 | # use BF_PTR2 for intel boxes, | ||
13 | # BF_PTR for sparc and MIPS/SGI | ||
14 | # use nothing for Alpha and HP. | ||
15 | |||
16 | # There are 3 possible performance options, experiment :-) | ||
17 | #OPTS= -DBF_PTR # usr for sparc and MIPS/SGI | ||
18 | #OPTS= -DBF_PTR2 # use for pentium | ||
19 | OPTS= # use for pentium pro, Alpha and HP | ||
20 | |||
21 | MAKE=make -f Makefile | ||
22 | #CC=cc | ||
23 | #CFLAG= -O | ||
24 | |||
25 | CC=gcc | ||
26 | #CFLAG= -O4 -funroll-loops -fomit-frame-pointer | ||
27 | CFLAG= -O3 -fomit-frame-pointer | ||
28 | |||
29 | CFLAGS=$(OPTS) $(CFLAG) | ||
30 | CPP=$(CC) -E | ||
31 | AS=as | ||
32 | RANLIB=ranlib | ||
33 | |||
34 | # Assember version of bf_encrypt(). | ||
35 | BF_ENC=bf_enc.o # normal C version | ||
36 | #BF_ENC=asm/bx86-elf.o # elf format x86 | ||
37 | #BF_ENC=asm/bx86-out.o # a.out format x86 | ||
38 | #BF_ENC=asm/bx86-sol.o # solaris format x86 | ||
39 | #BF_ENC=asm/bx86bsdi.o # bsdi format x86 | ||
40 | |||
41 | LIBDIR=/usr/local/lib | ||
42 | BINDIR=/usr/local/bin | ||
43 | INCDIR=/usr/local/include | ||
44 | MANDIR=/usr/local/man | ||
45 | MAN1=1 | ||
46 | MAN3=3 | ||
47 | SHELL=/bin/sh | ||
48 | LIBOBJ=bf_skey.o bf_ecb.o $(BF_ENC) bf_cfb64.o bf_ofb64.o | ||
49 | LIBSRC=bf_skey.c bf_ecb.c bf_enc.c bf_cfb64.c bf_ofb64.c | ||
50 | |||
51 | GENERAL=Makefile Makefile.ssl Makefile.uni asm bf_locl.org README \ | ||
52 | COPYRIGHT blowfish.doc INSTALL | ||
53 | |||
54 | TESTING= bftest bfspeed bf_opts | ||
55 | TESTING_SRC=bftest.c bfspeed.c bf_opts.c | ||
56 | HEADERS=bf_locl.h blowfish.h bf_pi.h | ||
57 | |||
58 | ALL= $(GENERAL) $(TESTING_SRC) $(LIBSRC) $(HEADERS) | ||
59 | |||
60 | BLIB= libblowfish.a | ||
61 | |||
62 | all: $(BLIB) $(TESTING) | ||
63 | |||
64 | cc: | ||
65 | $(MAKE) CC=cc CFLAGS="-O $(OPTS) $(CFLAG)" all | ||
66 | |||
67 | gcc: | ||
68 | $(MAKE) CC=gcc CFLAGS="-O3 -fomit-frame-pointer $(OPTS) $(CFLAG)" all | ||
69 | |||
70 | x86-elf: | ||
71 | $(MAKE) BF_ENC='asm/bx86-elf.o' CC=$(CC) CFLAGS="-DELF $(OPTS) $(CFLAG)" all | ||
72 | |||
73 | x86-out: | ||
74 | $(MAKE) BF_ENC='asm/bx86-out.o' CC=$(CC) CFLAGS="-DOUT $(OPTS) $(CFLAG)" all | ||
75 | |||
76 | x86-solaris: | ||
77 | $(MAKE) BF_ENC='asm/bx86-sol.o' CC=$(CC) CFLAGS="-DSOL $(OPTS) $(CFLAG)" all | ||
78 | |||
79 | x86-bsdi: | ||
80 | $(MAKE) BF_ENC='asm/bx86bsdi.o' CC=$(CC) CFLAGS="-DBSDI $(OPTS) $(CFLAG)" all | ||
81 | |||
82 | # elf | ||
83 | asm/bx86-elf.o: asm/bx86unix.cpp | ||
84 | $(CPP) -DELF asm/bx86unix.cpp | $(AS) -o asm/bx86-elf.o | ||
85 | |||
86 | # solaris | ||
87 | asm/bx86-sol.o: asm/bx86unix.cpp | ||
88 | $(CC) -E -DSOL asm/bx86unix.cpp | sed 's/^#.*//' > asm/bx86-sol.s | ||
89 | as -o asm/bx86-sol.o asm/bx86-sol.s | ||
90 | rm -f asm/bx86-sol.s | ||
91 | |||
92 | # a.out | ||
93 | asm/bx86-out.o: asm/bx86unix.cpp | ||
94 | $(CPP) -DOUT asm/bx86unix.cpp | $(AS) -o asm/bx86-out.o | ||
95 | |||
96 | # bsdi | ||
97 | asm/bx86bsdi.o: asm/bx86unix.cpp | ||
98 | $(CPP) -DBSDI asm/bx86unix.cpp | $(AS) -o asm/bx86bsdi.o | ||
99 | |||
100 | asm/bx86unix.cpp: | ||
101 | (cd asm; perl bf-586.pl cpp >bx86unix.cpp) | ||
102 | |||
103 | test: all | ||
104 | ./bftest | ||
105 | |||
106 | $(BLIB): $(LIBOBJ) | ||
107 | /bin/rm -f $(BLIB) | ||
108 | ar cr $(BLIB) $(LIBOBJ) | ||
109 | $(RANLIB) $(BLIB) | ||
110 | |||
111 | bftest: bftest.o $(BLIB) | ||
112 | $(CC) $(CFLAGS) -o bftest bftest.o $(BLIB) | ||
113 | |||
114 | bfspeed: bfspeed.o $(BLIB) | ||
115 | $(CC) $(CFLAGS) -o bfspeed bfspeed.o $(BLIB) | ||
116 | |||
117 | bf_opts: bf_opts.o $(BLIB) | ||
118 | $(CC) $(CFLAGS) -o bf_opts bf_opts.o $(BLIB) | ||
119 | |||
120 | tags: | ||
121 | ctags $(TESTING_SRC) $(LIBBF) | ||
122 | |||
123 | tar: | ||
124 | tar chf libbf.tar $(ALL) | ||
125 | |||
126 | shar: | ||
127 | shar $(ALL) >libbf.shar | ||
128 | |||
129 | depend: | ||
130 | makedepend $(LIBBF) $(TESTING_SRC) | ||
131 | |||
132 | clean: | ||
133 | /bin/rm -f *.o tags core $(TESTING) $(BLIB) .nfs* *.old *.bak asm/*.o | ||
134 | |||
135 | dclean: | ||
136 | sed -e '/^# DO NOT DELETE THIS LINE/ q' Makefile >Makefile.new | ||
137 | mv -f Makefile.new Makefile | ||
138 | |||
139 | # Eric is probably going to choke when he next looks at this --tjh | ||
140 | install: $(BLIB) | ||
141 | if test $(INSTALLTOP); then \ | ||
142 | echo SSL style install; \ | ||
143 | cp $(BLIB) $(INSTALLTOP)/lib; \ | ||
144 | $(RANLIB) $(BLIB); \ | ||
145 | chmod 644 $(INSTALLTOP)/lib/$(BLIB); \ | ||
146 | cp blowfish.h $(INSTALLTOP)/include; \ | ||
147 | chmod 644 $(INSTALLTOP)/include/blowfish.h; \ | ||
148 | else \ | ||
149 | echo Standalone install; \ | ||
150 | cp $(BLIB) $(LIBDIR)/$(BLIB); \ | ||
151 | $(RANLIB) $(BLIB); \ | ||
152 | chmod 644 $(LIBDIR)/$(BLIB); \ | ||
153 | cp blowfish.h $(INCDIR)/blowfish.h; \ | ||
154 | chmod 644 $(INCDIR)/blowfish.h; \ | ||
155 | fi | ||
156 | |||
157 | # DO NOT DELETE THIS LINE -- make depend depends on it. | ||
diff --git a/src/lib/libcrypto/bf/asm/b-win32.asm b/src/lib/libcrypto/bf/asm/b-win32.asm index 138c99d0aa..e69de29bb2 100644 --- a/src/lib/libcrypto/bf/asm/b-win32.asm +++ b/src/lib/libcrypto/bf/asm/b-win32.asm | |||
@@ -1,906 +0,0 @@ | |||
1 | ; Don't even think of reading this code | ||
2 | ; It was automatically generated by bf-586.pl | ||
3 | ; Which is a perl program used to generate the x86 assember for | ||
4 | ; any of elf, a.out, BSDI,Win32, or Solaris | ||
5 | ; eric <eay@cryptsoft.com> | ||
6 | ; | ||
7 | TITLE bf-586.asm | ||
8 | .486 | ||
9 | .model FLAT | ||
10 | _TEXT SEGMENT | ||
11 | PUBLIC _BF_encrypt | ||
12 | |||
13 | _BF_encrypt PROC NEAR | ||
14 | ; | ||
15 | push ebp | ||
16 | push ebx | ||
17 | mov ebx, DWORD PTR 12[esp] | ||
18 | mov ebp, DWORD PTR 16[esp] | ||
19 | push esi | ||
20 | push edi | ||
21 | ; Load the 2 words | ||
22 | mov edi, DWORD PTR [ebx] | ||
23 | mov esi, DWORD PTR 4[ebx] | ||
24 | xor eax, eax | ||
25 | mov ebx, DWORD PTR [ebp] | ||
26 | xor ecx, ecx | ||
27 | xor edi, ebx | ||
28 | ; | ||
29 | ; Round 0 | ||
30 | mov edx, DWORD PTR 4[ebp] | ||
31 | mov ebx, edi | ||
32 | xor esi, edx | ||
33 | shr ebx, 16 | ||
34 | mov edx, edi | ||
35 | mov al, bh | ||
36 | and ebx, 255 | ||
37 | mov cl, dh | ||
38 | and edx, 255 | ||
39 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
40 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
41 | add ebx, eax | ||
42 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
43 | xor ebx, eax | ||
44 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
45 | add ebx, edx | ||
46 | xor eax, eax | ||
47 | xor esi, ebx | ||
48 | ; | ||
49 | ; Round 1 | ||
50 | mov edx, DWORD PTR 8[ebp] | ||
51 | mov ebx, esi | ||
52 | xor edi, edx | ||
53 | shr ebx, 16 | ||
54 | mov edx, esi | ||
55 | mov al, bh | ||
56 | and ebx, 255 | ||
57 | mov cl, dh | ||
58 | and edx, 255 | ||
59 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
60 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
61 | add ebx, eax | ||
62 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
63 | xor ebx, eax | ||
64 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
65 | add ebx, edx | ||
66 | xor eax, eax | ||
67 | xor edi, ebx | ||
68 | ; | ||
69 | ; Round 2 | ||
70 | mov edx, DWORD PTR 12[ebp] | ||
71 | mov ebx, edi | ||
72 | xor esi, edx | ||
73 | shr ebx, 16 | ||
74 | mov edx, edi | ||
75 | mov al, bh | ||
76 | and ebx, 255 | ||
77 | mov cl, dh | ||
78 | and edx, 255 | ||
79 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
80 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
81 | add ebx, eax | ||
82 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
83 | xor ebx, eax | ||
84 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
85 | add ebx, edx | ||
86 | xor eax, eax | ||
87 | xor esi, ebx | ||
88 | ; | ||
89 | ; Round 3 | ||
90 | mov edx, DWORD PTR 16[ebp] | ||
91 | mov ebx, esi | ||
92 | xor edi, edx | ||
93 | shr ebx, 16 | ||
94 | mov edx, esi | ||
95 | mov al, bh | ||
96 | and ebx, 255 | ||
97 | mov cl, dh | ||
98 | and edx, 255 | ||
99 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
100 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
101 | add ebx, eax | ||
102 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
103 | xor ebx, eax | ||
104 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
105 | add ebx, edx | ||
106 | xor eax, eax | ||
107 | xor edi, ebx | ||
108 | ; | ||
109 | ; Round 4 | ||
110 | mov edx, DWORD PTR 20[ebp] | ||
111 | mov ebx, edi | ||
112 | xor esi, edx | ||
113 | shr ebx, 16 | ||
114 | mov edx, edi | ||
115 | mov al, bh | ||
116 | and ebx, 255 | ||
117 | mov cl, dh | ||
118 | and edx, 255 | ||
119 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
120 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
121 | add ebx, eax | ||
122 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
123 | xor ebx, eax | ||
124 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
125 | add ebx, edx | ||
126 | xor eax, eax | ||
127 | xor esi, ebx | ||
128 | ; | ||
129 | ; Round 5 | ||
130 | mov edx, DWORD PTR 24[ebp] | ||
131 | mov ebx, esi | ||
132 | xor edi, edx | ||
133 | shr ebx, 16 | ||
134 | mov edx, esi | ||
135 | mov al, bh | ||
136 | and ebx, 255 | ||
137 | mov cl, dh | ||
138 | and edx, 255 | ||
139 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
140 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
141 | add ebx, eax | ||
142 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
143 | xor ebx, eax | ||
144 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
145 | add ebx, edx | ||
146 | xor eax, eax | ||
147 | xor edi, ebx | ||
148 | ; | ||
149 | ; Round 6 | ||
150 | mov edx, DWORD PTR 28[ebp] | ||
151 | mov ebx, edi | ||
152 | xor esi, edx | ||
153 | shr ebx, 16 | ||
154 | mov edx, edi | ||
155 | mov al, bh | ||
156 | and ebx, 255 | ||
157 | mov cl, dh | ||
158 | and edx, 255 | ||
159 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
160 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
161 | add ebx, eax | ||
162 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
163 | xor ebx, eax | ||
164 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
165 | add ebx, edx | ||
166 | xor eax, eax | ||
167 | xor esi, ebx | ||
168 | ; | ||
169 | ; Round 7 | ||
170 | mov edx, DWORD PTR 32[ebp] | ||
171 | mov ebx, esi | ||
172 | xor edi, edx | ||
173 | shr ebx, 16 | ||
174 | mov edx, esi | ||
175 | mov al, bh | ||
176 | and ebx, 255 | ||
177 | mov cl, dh | ||
178 | and edx, 255 | ||
179 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
180 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
181 | add ebx, eax | ||
182 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
183 | xor ebx, eax | ||
184 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
185 | add ebx, edx | ||
186 | xor eax, eax | ||
187 | xor edi, ebx | ||
188 | ; | ||
189 | ; Round 8 | ||
190 | mov edx, DWORD PTR 36[ebp] | ||
191 | mov ebx, edi | ||
192 | xor esi, edx | ||
193 | shr ebx, 16 | ||
194 | mov edx, edi | ||
195 | mov al, bh | ||
196 | and ebx, 255 | ||
197 | mov cl, dh | ||
198 | and edx, 255 | ||
199 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
200 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
201 | add ebx, eax | ||
202 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
203 | xor ebx, eax | ||
204 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
205 | add ebx, edx | ||
206 | xor eax, eax | ||
207 | xor esi, ebx | ||
208 | ; | ||
209 | ; Round 9 | ||
210 | mov edx, DWORD PTR 40[ebp] | ||
211 | mov ebx, esi | ||
212 | xor edi, edx | ||
213 | shr ebx, 16 | ||
214 | mov edx, esi | ||
215 | mov al, bh | ||
216 | and ebx, 255 | ||
217 | mov cl, dh | ||
218 | and edx, 255 | ||
219 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
220 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
221 | add ebx, eax | ||
222 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
223 | xor ebx, eax | ||
224 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
225 | add ebx, edx | ||
226 | xor eax, eax | ||
227 | xor edi, ebx | ||
228 | ; | ||
229 | ; Round 10 | ||
230 | mov edx, DWORD PTR 44[ebp] | ||
231 | mov ebx, edi | ||
232 | xor esi, edx | ||
233 | shr ebx, 16 | ||
234 | mov edx, edi | ||
235 | mov al, bh | ||
236 | and ebx, 255 | ||
237 | mov cl, dh | ||
238 | and edx, 255 | ||
239 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
240 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
241 | add ebx, eax | ||
242 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
243 | xor ebx, eax | ||
244 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
245 | add ebx, edx | ||
246 | xor eax, eax | ||
247 | xor esi, ebx | ||
248 | ; | ||
249 | ; Round 11 | ||
250 | mov edx, DWORD PTR 48[ebp] | ||
251 | mov ebx, esi | ||
252 | xor edi, edx | ||
253 | shr ebx, 16 | ||
254 | mov edx, esi | ||
255 | mov al, bh | ||
256 | and ebx, 255 | ||
257 | mov cl, dh | ||
258 | and edx, 255 | ||
259 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
260 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
261 | add ebx, eax | ||
262 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
263 | xor ebx, eax | ||
264 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
265 | add ebx, edx | ||
266 | xor eax, eax | ||
267 | xor edi, ebx | ||
268 | ; | ||
269 | ; Round 12 | ||
270 | mov edx, DWORD PTR 52[ebp] | ||
271 | mov ebx, edi | ||
272 | xor esi, edx | ||
273 | shr ebx, 16 | ||
274 | mov edx, edi | ||
275 | mov al, bh | ||
276 | and ebx, 255 | ||
277 | mov cl, dh | ||
278 | and edx, 255 | ||
279 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
280 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
281 | add ebx, eax | ||
282 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
283 | xor ebx, eax | ||
284 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
285 | add ebx, edx | ||
286 | xor eax, eax | ||
287 | xor esi, ebx | ||
288 | ; | ||
289 | ; Round 13 | ||
290 | mov edx, DWORD PTR 56[ebp] | ||
291 | mov ebx, esi | ||
292 | xor edi, edx | ||
293 | shr ebx, 16 | ||
294 | mov edx, esi | ||
295 | mov al, bh | ||
296 | and ebx, 255 | ||
297 | mov cl, dh | ||
298 | and edx, 255 | ||
299 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
300 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
301 | add ebx, eax | ||
302 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
303 | xor ebx, eax | ||
304 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
305 | add ebx, edx | ||
306 | xor eax, eax | ||
307 | xor edi, ebx | ||
308 | ; | ||
309 | ; Round 14 | ||
310 | mov edx, DWORD PTR 60[ebp] | ||
311 | mov ebx, edi | ||
312 | xor esi, edx | ||
313 | shr ebx, 16 | ||
314 | mov edx, edi | ||
315 | mov al, bh | ||
316 | and ebx, 255 | ||
317 | mov cl, dh | ||
318 | and edx, 255 | ||
319 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
320 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
321 | add ebx, eax | ||
322 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
323 | xor ebx, eax | ||
324 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
325 | add ebx, edx | ||
326 | xor eax, eax | ||
327 | xor esi, ebx | ||
328 | ; | ||
329 | ; Round 15 | ||
330 | mov edx, DWORD PTR 64[ebp] | ||
331 | mov ebx, esi | ||
332 | xor edi, edx | ||
333 | shr ebx, 16 | ||
334 | mov edx, esi | ||
335 | mov al, bh | ||
336 | and ebx, 255 | ||
337 | mov cl, dh | ||
338 | and edx, 255 | ||
339 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
340 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
341 | add ebx, eax | ||
342 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
343 | xor ebx, eax | ||
344 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
345 | add ebx, edx | ||
346 | ; Load parameter 0 (16) enc=1 | ||
347 | mov eax, DWORD PTR 20[esp] | ||
348 | xor edi, ebx | ||
349 | mov edx, DWORD PTR 68[ebp] | ||
350 | xor esi, edx | ||
351 | mov DWORD PTR 4[eax],edi | ||
352 | mov DWORD PTR [eax],esi | ||
353 | pop edi | ||
354 | pop esi | ||
355 | pop ebx | ||
356 | pop ebp | ||
357 | ret | ||
358 | _BF_encrypt ENDP | ||
359 | _TEXT ENDS | ||
360 | _TEXT SEGMENT | ||
361 | PUBLIC _BF_decrypt | ||
362 | |||
363 | _BF_decrypt PROC NEAR | ||
364 | ; | ||
365 | push ebp | ||
366 | push ebx | ||
367 | mov ebx, DWORD PTR 12[esp] | ||
368 | mov ebp, DWORD PTR 16[esp] | ||
369 | push esi | ||
370 | push edi | ||
371 | ; Load the 2 words | ||
372 | mov edi, DWORD PTR [ebx] | ||
373 | mov esi, DWORD PTR 4[ebx] | ||
374 | xor eax, eax | ||
375 | mov ebx, DWORD PTR 68[ebp] | ||
376 | xor ecx, ecx | ||
377 | xor edi, ebx | ||
378 | ; | ||
379 | ; Round 16 | ||
380 | mov edx, DWORD PTR 64[ebp] | ||
381 | mov ebx, edi | ||
382 | xor esi, edx | ||
383 | shr ebx, 16 | ||
384 | mov edx, edi | ||
385 | mov al, bh | ||
386 | and ebx, 255 | ||
387 | mov cl, dh | ||
388 | and edx, 255 | ||
389 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
390 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
391 | add ebx, eax | ||
392 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
393 | xor ebx, eax | ||
394 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
395 | add ebx, edx | ||
396 | xor eax, eax | ||
397 | xor esi, ebx | ||
398 | ; | ||
399 | ; Round 15 | ||
400 | mov edx, DWORD PTR 60[ebp] | ||
401 | mov ebx, esi | ||
402 | xor edi, edx | ||
403 | shr ebx, 16 | ||
404 | mov edx, esi | ||
405 | mov al, bh | ||
406 | and ebx, 255 | ||
407 | mov cl, dh | ||
408 | and edx, 255 | ||
409 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
410 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
411 | add ebx, eax | ||
412 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
413 | xor ebx, eax | ||
414 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
415 | add ebx, edx | ||
416 | xor eax, eax | ||
417 | xor edi, ebx | ||
418 | ; | ||
419 | ; Round 14 | ||
420 | mov edx, DWORD PTR 56[ebp] | ||
421 | mov ebx, edi | ||
422 | xor esi, edx | ||
423 | shr ebx, 16 | ||
424 | mov edx, edi | ||
425 | mov al, bh | ||
426 | and ebx, 255 | ||
427 | mov cl, dh | ||
428 | and edx, 255 | ||
429 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
430 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
431 | add ebx, eax | ||
432 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
433 | xor ebx, eax | ||
434 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
435 | add ebx, edx | ||
436 | xor eax, eax | ||
437 | xor esi, ebx | ||
438 | ; | ||
439 | ; Round 13 | ||
440 | mov edx, DWORD PTR 52[ebp] | ||
441 | mov ebx, esi | ||
442 | xor edi, edx | ||
443 | shr ebx, 16 | ||
444 | mov edx, esi | ||
445 | mov al, bh | ||
446 | and ebx, 255 | ||
447 | mov cl, dh | ||
448 | and edx, 255 | ||
449 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
450 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
451 | add ebx, eax | ||
452 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
453 | xor ebx, eax | ||
454 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
455 | add ebx, edx | ||
456 | xor eax, eax | ||
457 | xor edi, ebx | ||
458 | ; | ||
459 | ; Round 12 | ||
460 | mov edx, DWORD PTR 48[ebp] | ||
461 | mov ebx, edi | ||
462 | xor esi, edx | ||
463 | shr ebx, 16 | ||
464 | mov edx, edi | ||
465 | mov al, bh | ||
466 | and ebx, 255 | ||
467 | mov cl, dh | ||
468 | and edx, 255 | ||
469 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
470 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
471 | add ebx, eax | ||
472 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
473 | xor ebx, eax | ||
474 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
475 | add ebx, edx | ||
476 | xor eax, eax | ||
477 | xor esi, ebx | ||
478 | ; | ||
479 | ; Round 11 | ||
480 | mov edx, DWORD PTR 44[ebp] | ||
481 | mov ebx, esi | ||
482 | xor edi, edx | ||
483 | shr ebx, 16 | ||
484 | mov edx, esi | ||
485 | mov al, bh | ||
486 | and ebx, 255 | ||
487 | mov cl, dh | ||
488 | and edx, 255 | ||
489 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
490 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
491 | add ebx, eax | ||
492 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
493 | xor ebx, eax | ||
494 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
495 | add ebx, edx | ||
496 | xor eax, eax | ||
497 | xor edi, ebx | ||
498 | ; | ||
499 | ; Round 10 | ||
500 | mov edx, DWORD PTR 40[ebp] | ||
501 | mov ebx, edi | ||
502 | xor esi, edx | ||
503 | shr ebx, 16 | ||
504 | mov edx, edi | ||
505 | mov al, bh | ||
506 | and ebx, 255 | ||
507 | mov cl, dh | ||
508 | and edx, 255 | ||
509 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
510 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
511 | add ebx, eax | ||
512 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
513 | xor ebx, eax | ||
514 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
515 | add ebx, edx | ||
516 | xor eax, eax | ||
517 | xor esi, ebx | ||
518 | ; | ||
519 | ; Round 9 | ||
520 | mov edx, DWORD PTR 36[ebp] | ||
521 | mov ebx, esi | ||
522 | xor edi, edx | ||
523 | shr ebx, 16 | ||
524 | mov edx, esi | ||
525 | mov al, bh | ||
526 | and ebx, 255 | ||
527 | mov cl, dh | ||
528 | and edx, 255 | ||
529 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
530 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
531 | add ebx, eax | ||
532 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
533 | xor ebx, eax | ||
534 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
535 | add ebx, edx | ||
536 | xor eax, eax | ||
537 | xor edi, ebx | ||
538 | ; | ||
539 | ; Round 8 | ||
540 | mov edx, DWORD PTR 32[ebp] | ||
541 | mov ebx, edi | ||
542 | xor esi, edx | ||
543 | shr ebx, 16 | ||
544 | mov edx, edi | ||
545 | mov al, bh | ||
546 | and ebx, 255 | ||
547 | mov cl, dh | ||
548 | and edx, 255 | ||
549 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
550 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
551 | add ebx, eax | ||
552 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
553 | xor ebx, eax | ||
554 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
555 | add ebx, edx | ||
556 | xor eax, eax | ||
557 | xor esi, ebx | ||
558 | ; | ||
559 | ; Round 7 | ||
560 | mov edx, DWORD PTR 28[ebp] | ||
561 | mov ebx, esi | ||
562 | xor edi, edx | ||
563 | shr ebx, 16 | ||
564 | mov edx, esi | ||
565 | mov al, bh | ||
566 | and ebx, 255 | ||
567 | mov cl, dh | ||
568 | and edx, 255 | ||
569 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
570 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
571 | add ebx, eax | ||
572 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
573 | xor ebx, eax | ||
574 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
575 | add ebx, edx | ||
576 | xor eax, eax | ||
577 | xor edi, ebx | ||
578 | ; | ||
579 | ; Round 6 | ||
580 | mov edx, DWORD PTR 24[ebp] | ||
581 | mov ebx, edi | ||
582 | xor esi, edx | ||
583 | shr ebx, 16 | ||
584 | mov edx, edi | ||
585 | mov al, bh | ||
586 | and ebx, 255 | ||
587 | mov cl, dh | ||
588 | and edx, 255 | ||
589 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
590 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
591 | add ebx, eax | ||
592 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
593 | xor ebx, eax | ||
594 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
595 | add ebx, edx | ||
596 | xor eax, eax | ||
597 | xor esi, ebx | ||
598 | ; | ||
599 | ; Round 5 | ||
600 | mov edx, DWORD PTR 20[ebp] | ||
601 | mov ebx, esi | ||
602 | xor edi, edx | ||
603 | shr ebx, 16 | ||
604 | mov edx, esi | ||
605 | mov al, bh | ||
606 | and ebx, 255 | ||
607 | mov cl, dh | ||
608 | and edx, 255 | ||
609 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
610 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
611 | add ebx, eax | ||
612 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
613 | xor ebx, eax | ||
614 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
615 | add ebx, edx | ||
616 | xor eax, eax | ||
617 | xor edi, ebx | ||
618 | ; | ||
619 | ; Round 4 | ||
620 | mov edx, DWORD PTR 16[ebp] | ||
621 | mov ebx, edi | ||
622 | xor esi, edx | ||
623 | shr ebx, 16 | ||
624 | mov edx, edi | ||
625 | mov al, bh | ||
626 | and ebx, 255 | ||
627 | mov cl, dh | ||
628 | and edx, 255 | ||
629 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
630 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
631 | add ebx, eax | ||
632 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
633 | xor ebx, eax | ||
634 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
635 | add ebx, edx | ||
636 | xor eax, eax | ||
637 | xor esi, ebx | ||
638 | ; | ||
639 | ; Round 3 | ||
640 | mov edx, DWORD PTR 12[ebp] | ||
641 | mov ebx, esi | ||
642 | xor edi, edx | ||
643 | shr ebx, 16 | ||
644 | mov edx, esi | ||
645 | mov al, bh | ||
646 | and ebx, 255 | ||
647 | mov cl, dh | ||
648 | and edx, 255 | ||
649 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
650 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
651 | add ebx, eax | ||
652 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
653 | xor ebx, eax | ||
654 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
655 | add ebx, edx | ||
656 | xor eax, eax | ||
657 | xor edi, ebx | ||
658 | ; | ||
659 | ; Round 2 | ||
660 | mov edx, DWORD PTR 8[ebp] | ||
661 | mov ebx, edi | ||
662 | xor esi, edx | ||
663 | shr ebx, 16 | ||
664 | mov edx, edi | ||
665 | mov al, bh | ||
666 | and ebx, 255 | ||
667 | mov cl, dh | ||
668 | and edx, 255 | ||
669 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
670 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
671 | add ebx, eax | ||
672 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
673 | xor ebx, eax | ||
674 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
675 | add ebx, edx | ||
676 | xor eax, eax | ||
677 | xor esi, ebx | ||
678 | ; | ||
679 | ; Round 1 | ||
680 | mov edx, DWORD PTR 4[ebp] | ||
681 | mov ebx, esi | ||
682 | xor edi, edx | ||
683 | shr ebx, 16 | ||
684 | mov edx, esi | ||
685 | mov al, bh | ||
686 | and ebx, 255 | ||
687 | mov cl, dh | ||
688 | and edx, 255 | ||
689 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
690 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
691 | add ebx, eax | ||
692 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
693 | xor ebx, eax | ||
694 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
695 | add ebx, edx | ||
696 | ; Load parameter 0 (1) enc=0 | ||
697 | mov eax, DWORD PTR 20[esp] | ||
698 | xor edi, ebx | ||
699 | mov edx, DWORD PTR [ebp] | ||
700 | xor esi, edx | ||
701 | mov DWORD PTR 4[eax],edi | ||
702 | mov DWORD PTR [eax],esi | ||
703 | pop edi | ||
704 | pop esi | ||
705 | pop ebx | ||
706 | pop ebp | ||
707 | ret | ||
708 | _BF_decrypt ENDP | ||
709 | _TEXT ENDS | ||
710 | _TEXT SEGMENT | ||
711 | PUBLIC _BF_cbc_encrypt | ||
712 | |||
713 | _BF_cbc_encrypt PROC NEAR | ||
714 | ; | ||
715 | push ebp | ||
716 | push ebx | ||
717 | push esi | ||
718 | push edi | ||
719 | mov ebp, DWORD PTR 28[esp] | ||
720 | ; getting iv ptr from parameter 4 | ||
721 | mov ebx, DWORD PTR 36[esp] | ||
722 | mov esi, DWORD PTR [ebx] | ||
723 | mov edi, DWORD PTR 4[ebx] | ||
724 | push edi | ||
725 | push esi | ||
726 | push edi | ||
727 | push esi | ||
728 | mov ebx, esp | ||
729 | mov esi, DWORD PTR 36[esp] | ||
730 | mov edi, DWORD PTR 40[esp] | ||
731 | ; getting encrypt flag from parameter 5 | ||
732 | mov ecx, DWORD PTR 56[esp] | ||
733 | ; get and push parameter 3 | ||
734 | mov eax, DWORD PTR 48[esp] | ||
735 | push eax | ||
736 | push ebx | ||
737 | cmp ecx, 0 | ||
738 | jz $L000decrypt | ||
739 | and ebp, 4294967288 | ||
740 | mov eax, DWORD PTR 8[esp] | ||
741 | mov ebx, DWORD PTR 12[esp] | ||
742 | jz $L001encrypt_finish | ||
743 | L002encrypt_loop: | ||
744 | mov ecx, DWORD PTR [esi] | ||
745 | mov edx, DWORD PTR 4[esi] | ||
746 | xor eax, ecx | ||
747 | xor ebx, edx | ||
748 | bswap eax | ||
749 | bswap ebx | ||
750 | mov DWORD PTR 8[esp],eax | ||
751 | mov DWORD PTR 12[esp],ebx | ||
752 | call _BF_encrypt | ||
753 | mov eax, DWORD PTR 8[esp] | ||
754 | mov ebx, DWORD PTR 12[esp] | ||
755 | bswap eax | ||
756 | bswap ebx | ||
757 | mov DWORD PTR [edi],eax | ||
758 | mov DWORD PTR 4[edi],ebx | ||
759 | add esi, 8 | ||
760 | add edi, 8 | ||
761 | sub ebp, 8 | ||
762 | jnz L002encrypt_loop | ||
763 | $L001encrypt_finish: | ||
764 | mov ebp, DWORD PTR 52[esp] | ||
765 | and ebp, 7 | ||
766 | jz $L003finish | ||
767 | xor ecx, ecx | ||
768 | xor edx, edx | ||
769 | mov ebp, DWORD PTR $L004cbc_enc_jmp_table[ebp*4] | ||
770 | jmp ebp | ||
771 | L005ej7: | ||
772 | mov dh, BYTE PTR 6[esi] | ||
773 | shl edx, 8 | ||
774 | L006ej6: | ||
775 | mov dh, BYTE PTR 5[esi] | ||
776 | L007ej5: | ||
777 | mov dl, BYTE PTR 4[esi] | ||
778 | L008ej4: | ||
779 | mov ecx, DWORD PTR [esi] | ||
780 | jmp $L009ejend | ||
781 | L010ej3: | ||
782 | mov ch, BYTE PTR 2[esi] | ||
783 | shl ecx, 8 | ||
784 | L011ej2: | ||
785 | mov ch, BYTE PTR 1[esi] | ||
786 | L012ej1: | ||
787 | mov cl, BYTE PTR [esi] | ||
788 | $L009ejend: | ||
789 | xor eax, ecx | ||
790 | xor ebx, edx | ||
791 | bswap eax | ||
792 | bswap ebx | ||
793 | mov DWORD PTR 8[esp],eax | ||
794 | mov DWORD PTR 12[esp],ebx | ||
795 | call _BF_encrypt | ||
796 | mov eax, DWORD PTR 8[esp] | ||
797 | mov ebx, DWORD PTR 12[esp] | ||
798 | bswap eax | ||
799 | bswap ebx | ||
800 | mov DWORD PTR [edi],eax | ||
801 | mov DWORD PTR 4[edi],ebx | ||
802 | jmp $L003finish | ||
803 | $L000decrypt: | ||
804 | and ebp, 4294967288 | ||
805 | mov eax, DWORD PTR 16[esp] | ||
806 | mov ebx, DWORD PTR 20[esp] | ||
807 | jz $L013decrypt_finish | ||
808 | L014decrypt_loop: | ||
809 | mov eax, DWORD PTR [esi] | ||
810 | mov ebx, DWORD PTR 4[esi] | ||
811 | bswap eax | ||
812 | bswap ebx | ||
813 | mov DWORD PTR 8[esp],eax | ||
814 | mov DWORD PTR 12[esp],ebx | ||
815 | call _BF_decrypt | ||
816 | mov eax, DWORD PTR 8[esp] | ||
817 | mov ebx, DWORD PTR 12[esp] | ||
818 | bswap eax | ||
819 | bswap ebx | ||
820 | mov ecx, DWORD PTR 16[esp] | ||
821 | mov edx, DWORD PTR 20[esp] | ||
822 | xor ecx, eax | ||
823 | xor edx, ebx | ||
824 | mov eax, DWORD PTR [esi] | ||
825 | mov ebx, DWORD PTR 4[esi] | ||
826 | mov DWORD PTR [edi],ecx | ||
827 | mov DWORD PTR 4[edi],edx | ||
828 | mov DWORD PTR 16[esp],eax | ||
829 | mov DWORD PTR 20[esp],ebx | ||
830 | add esi, 8 | ||
831 | add edi, 8 | ||
832 | sub ebp, 8 | ||
833 | jnz L014decrypt_loop | ||
834 | $L013decrypt_finish: | ||
835 | mov ebp, DWORD PTR 52[esp] | ||
836 | and ebp, 7 | ||
837 | jz $L003finish | ||
838 | mov eax, DWORD PTR [esi] | ||
839 | mov ebx, DWORD PTR 4[esi] | ||
840 | bswap eax | ||
841 | bswap ebx | ||
842 | mov DWORD PTR 8[esp],eax | ||
843 | mov DWORD PTR 12[esp],ebx | ||
844 | call _BF_decrypt | ||
845 | mov eax, DWORD PTR 8[esp] | ||
846 | mov ebx, DWORD PTR 12[esp] | ||
847 | bswap eax | ||
848 | bswap ebx | ||
849 | mov ecx, DWORD PTR 16[esp] | ||
850 | mov edx, DWORD PTR 20[esp] | ||
851 | xor ecx, eax | ||
852 | xor edx, ebx | ||
853 | mov eax, DWORD PTR [esi] | ||
854 | mov ebx, DWORD PTR 4[esi] | ||
855 | L015dj7: | ||
856 | ror edx, 16 | ||
857 | mov BYTE PTR 6[edi],dl | ||
858 | shr edx, 16 | ||
859 | L016dj6: | ||
860 | mov BYTE PTR 5[edi],dh | ||
861 | L017dj5: | ||
862 | mov BYTE PTR 4[edi],dl | ||
863 | L018dj4: | ||
864 | mov DWORD PTR [edi],ecx | ||
865 | jmp $L019djend | ||
866 | L020dj3: | ||
867 | ror ecx, 16 | ||
868 | mov BYTE PTR 2[edi],cl | ||
869 | shl ecx, 16 | ||
870 | L021dj2: | ||
871 | mov BYTE PTR 1[esi],ch | ||
872 | L022dj1: | ||
873 | mov BYTE PTR [esi], cl | ||
874 | $L019djend: | ||
875 | jmp $L003finish | ||
876 | $L003finish: | ||
877 | mov ecx, DWORD PTR 60[esp] | ||
878 | add esp, 24 | ||
879 | mov DWORD PTR [ecx],eax | ||
880 | mov DWORD PTR 4[ecx],ebx | ||
881 | pop edi | ||
882 | pop esi | ||
883 | pop ebx | ||
884 | pop ebp | ||
885 | ret | ||
886 | $L004cbc_enc_jmp_table: | ||
887 | DD 0 | ||
888 | DD L012ej1 | ||
889 | DD L011ej2 | ||
890 | DD L010ej3 | ||
891 | DD L008ej4 | ||
892 | DD L007ej5 | ||
893 | DD L006ej6 | ||
894 | DD L005ej7 | ||
895 | L023cbc_dec_jmp_table: | ||
896 | DD 0 | ||
897 | DD L022dj1 | ||
898 | DD L021dj2 | ||
899 | DD L020dj3 | ||
900 | DD L018dj4 | ||
901 | DD L017dj5 | ||
902 | DD L016dj6 | ||
903 | DD L015dj7 | ||
904 | _BF_cbc_encrypt ENDP | ||
905 | _TEXT ENDS | ||
906 | END | ||
diff --git a/src/lib/libcrypto/bio/Makefile.ssl b/src/lib/libcrypto/bio/Makefile.ssl index 2e7480ead9..755f255fe4 100644 --- a/src/lib/libcrypto/bio/Makefile.ssl +++ b/src/lib/libcrypto/bio/Makefile.ssl | |||
@@ -172,8 +172,10 @@ bss_acpt.o: ../../include/openssl/opensslconf.h | |||
172 | bss_acpt.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h | 172 | bss_acpt.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h |
173 | bss_acpt.o: ../../include/openssl/stack.h ../cryptlib.h | 173 | bss_acpt.o: ../../include/openssl/stack.h ../cryptlib.h |
174 | bss_bio.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h | 174 | bss_bio.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h |
175 | bss_bio.o: ../../include/openssl/err.h ../../include/openssl/opensslv.h | 175 | bss_bio.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h |
176 | bss_bio.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | 176 | bss_bio.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h |
177 | bss_bio.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h | ||
178 | bss_bio.o: ../../include/openssl/stack.h | ||
177 | bss_conn.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h | 179 | bss_conn.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h |
178 | bss_conn.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h | 180 | bss_conn.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h |
179 | bss_conn.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h | 181 | bss_conn.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h |
diff --git a/src/lib/libcrypto/bio/b_print.c b/src/lib/libcrypto/bio/b_print.c index 2a5e8b58c9..b11b501512 100644 --- a/src/lib/libcrypto/bio/b_print.c +++ b/src/lib/libcrypto/bio/b_print.c | |||
@@ -64,6 +64,8 @@ | |||
64 | #include <stdarg.h> | 64 | #include <stdarg.h> |
65 | #include <string.h> | 65 | #include <string.h> |
66 | #include <ctype.h> | 66 | #include <ctype.h> |
67 | #include <assert.h> | ||
68 | #include <limits.h> | ||
67 | #include "cryptlib.h" | 69 | #include "cryptlib.h" |
68 | #ifndef NO_SYS_TYPES_H | 70 | #ifndef NO_SYS_TYPES_H |
69 | #include <sys/types.h> | 71 | #include <sys/types.h> |
@@ -72,12 +74,16 @@ | |||
72 | 74 | ||
73 | #ifdef BN_LLONG | 75 | #ifdef BN_LLONG |
74 | # ifndef HAVE_LONG_LONG | 76 | # ifndef HAVE_LONG_LONG |
75 | # define HAVE_LONG_LONG | 77 | # define HAVE_LONG_LONG 1 |
76 | # endif | 78 | # endif |
77 | #endif | 79 | #endif |
78 | 80 | ||
79 | static void dopr (char *buffer, size_t maxlen, size_t *retlen, | 81 | static void dopr (char *buffer, size_t maxlen, size_t *retlen, |
80 | const char *format, va_list args); | 82 | const char *format, va_list args); |
83 | #ifdef USE_ALLOCATING_PRINT | ||
84 | static void doapr (char **buffer, size_t *retlen, | ||
85 | const char *format, va_list args); | ||
86 | #endif | ||
81 | 87 | ||
82 | int BIO_printf (BIO *bio, ...) | 88 | int BIO_printf (BIO *bio, ...) |
83 | { | 89 | { |
@@ -85,15 +91,32 @@ int BIO_printf (BIO *bio, ...) | |||
85 | char *format; | 91 | char *format; |
86 | int ret; | 92 | int ret; |
87 | size_t retlen; | 93 | size_t retlen; |
94 | #ifdef USE_ALLOCATING_PRINT | ||
95 | char *hugebuf; | ||
96 | #else | ||
88 | MS_STATIC char hugebuf[1024*2]; /* 10k in one chunk is the limit */ | 97 | MS_STATIC char hugebuf[1024*2]; /* 10k in one chunk is the limit */ |
98 | #endif | ||
89 | 99 | ||
90 | va_start(args, bio); | 100 | va_start(args, bio); |
91 | format=va_arg(args, char *); | 101 | format=va_arg(args, char *); |
92 | 102 | ||
103 | #ifndef USE_ALLOCATING_PRINT | ||
93 | hugebuf[0]='\0'; | 104 | hugebuf[0]='\0'; |
94 | dopr(hugebuf, sizeof(hugebuf), &retlen, format, args); | 105 | dopr(hugebuf, sizeof(hugebuf), &retlen, format, args); |
95 | ret=BIO_write(bio, hugebuf, (int)retlen); | 106 | #else |
107 | hugebuf = NULL; | ||
108 | CRYPTO_push_info("doapr()"); | ||
109 | doapr(&hugebuf, &retlen, format, args); | ||
110 | if (hugebuf) | ||
111 | { | ||
112 | #endif | ||
113 | ret=BIO_write(bio, hugebuf, (int)retlen); | ||
96 | 114 | ||
115 | #ifdef USE_ALLOCATING_PRINT | ||
116 | Free(hugebuf); | ||
117 | } | ||
118 | CRYPTO_pop_info(); | ||
119 | #endif | ||
97 | va_end(args); | 120 | va_end(args); |
98 | return(ret); | 121 | return(ret); |
99 | } | 122 | } |
@@ -131,10 +154,26 @@ int BIO_printf (BIO *bio, ...) | |||
131 | #define LLONG long | 154 | #define LLONG long |
132 | #endif | 155 | #endif |
133 | 156 | ||
134 | static void fmtstr (char *, size_t *, size_t, char *, int, int, int); | 157 | static void fmtstr (void (*)(char **, size_t *, size_t *, int), |
135 | static void fmtint (char *, size_t *, size_t, LLONG, int, int, int, int); | 158 | char **, size_t *, size_t *, const char *, int, int, |
136 | static void fmtfp (char *, size_t *, size_t, LDOUBLE, int, int, int); | 159 | int); |
137 | static void dopr_outch (char *, size_t *, size_t, int); | 160 | static void fmtint (void (*)(char **, size_t *, size_t *, int), |
161 | char **, size_t *, size_t *, LLONG, int, int, int, int); | ||
162 | static void fmtfp (void (*)(char **, size_t *, size_t *, int), | ||
163 | char **, size_t *, size_t *, LDOUBLE, int, int, int); | ||
164 | #ifndef USE_ALLOCATING_PRINT | ||
165 | static int dopr_isbig (size_t, size_t); | ||
166 | static int dopr_copy (size_t); | ||
167 | static void dopr_outch (char **, size_t *, size_t *, int); | ||
168 | #else | ||
169 | static int doapr_isbig (size_t, size_t); | ||
170 | static int doapr_copy (size_t); | ||
171 | static void doapr_outch (char **, size_t *, size_t *, int); | ||
172 | #endif | ||
173 | static void _dopr(void (*)(char **, size_t *, size_t *, int), | ||
174 | int (*)(size_t, size_t), int (*)(size_t), | ||
175 | char **buffer, size_t *maxlen, size_t *retlen, | ||
176 | const char *format, va_list args); | ||
138 | 177 | ||
139 | /* format read states */ | 178 | /* format read states */ |
140 | #define DP_S_DEFAULT 0 | 179 | #define DP_S_DEFAULT 0 |
@@ -165,6 +204,7 @@ static void dopr_outch (char *, size_t *, size_t, int); | |||
165 | #define char_to_int(p) (p - '0') | 204 | #define char_to_int(p) (p - '0') |
166 | #define MAX(p,q) ((p >= q) ? p : q) | 205 | #define MAX(p,q) ((p >= q) ? p : q) |
167 | 206 | ||
207 | #ifndef USE_ALLOCATING_PRINT | ||
168 | static void | 208 | static void |
169 | dopr( | 209 | dopr( |
170 | char *buffer, | 210 | char *buffer, |
@@ -173,6 +213,35 @@ dopr( | |||
173 | const char *format, | 213 | const char *format, |
174 | va_list args) | 214 | va_list args) |
175 | { | 215 | { |
216 | _dopr(dopr_outch, dopr_isbig, dopr_copy, | ||
217 | &buffer, &maxlen, retlen, format, args); | ||
218 | } | ||
219 | |||
220 | #else | ||
221 | static void | ||
222 | doapr( | ||
223 | char **buffer, | ||
224 | size_t *retlen, | ||
225 | const char *format, | ||
226 | va_list args) | ||
227 | { | ||
228 | size_t dummy_maxlen = 0; | ||
229 | _dopr(doapr_outch, doapr_isbig, doapr_copy, | ||
230 | buffer, &dummy_maxlen, retlen, format, args); | ||
231 | } | ||
232 | #endif | ||
233 | |||
234 | static void | ||
235 | _dopr( | ||
236 | void (*outch_fn)(char **, size_t *, size_t *, int), | ||
237 | int (*isbig_fn)(size_t, size_t), | ||
238 | int (*copy_fn)(size_t), | ||
239 | char **buffer, | ||
240 | size_t *maxlen, | ||
241 | size_t *retlen, | ||
242 | const char *format, | ||
243 | va_list args) | ||
244 | { | ||
176 | char ch; | 245 | char ch; |
177 | LLONG value; | 246 | LLONG value; |
178 | LDOUBLE fvalue; | 247 | LDOUBLE fvalue; |
@@ -190,7 +259,7 @@ dopr( | |||
190 | ch = *format++; | 259 | ch = *format++; |
191 | 260 | ||
192 | while (state != DP_S_DONE) { | 261 | while (state != DP_S_DONE) { |
193 | if ((ch == '\0') || (currlen >= maxlen)) | 262 | if ((ch == '\0') || (*isbig_fn)(currlen, *maxlen)) |
194 | state = DP_S_DONE; | 263 | state = DP_S_DONE; |
195 | 264 | ||
196 | switch (state) { | 265 | switch (state) { |
@@ -198,7 +267,7 @@ dopr( | |||
198 | if (ch == '%') | 267 | if (ch == '%') |
199 | state = DP_S_FLAGS; | 268 | state = DP_S_FLAGS; |
200 | else | 269 | else |
201 | dopr_outch(buffer, &currlen, maxlen, ch); | 270 | (*outch_fn)(buffer, &currlen, maxlen, ch); |
202 | ch = *format++; | 271 | ch = *format++; |
203 | break; | 272 | break; |
204 | case DP_S_FLAGS: | 273 | case DP_S_FLAGS: |
@@ -304,7 +373,8 @@ dopr( | |||
304 | value = va_arg(args, int); | 373 | value = va_arg(args, int); |
305 | break; | 374 | break; |
306 | } | 375 | } |
307 | fmtint(buffer, &currlen, maxlen, value, 10, min, max, flags); | 376 | fmtint(outch_fn, buffer, &currlen, maxlen, |
377 | value, 10, min, max, flags); | ||
308 | break; | 378 | break; |
309 | case 'X': | 379 | case 'X': |
310 | flags |= DP_F_UP; | 380 | flags |= DP_F_UP; |
@@ -329,7 +399,7 @@ dopr( | |||
329 | unsigned int); | 399 | unsigned int); |
330 | break; | 400 | break; |
331 | } | 401 | } |
332 | fmtint(buffer, &currlen, maxlen, value, | 402 | fmtint(outch_fn, buffer, &currlen, maxlen, value, |
333 | ch == 'o' ? 8 : (ch == 'u' ? 10 : 16), | 403 | ch == 'o' ? 8 : (ch == 'u' ? 10 : 16), |
334 | min, max, flags); | 404 | min, max, flags); |
335 | break; | 405 | break; |
@@ -338,7 +408,8 @@ dopr( | |||
338 | fvalue = va_arg(args, LDOUBLE); | 408 | fvalue = va_arg(args, LDOUBLE); |
339 | else | 409 | else |
340 | fvalue = va_arg(args, double); | 410 | fvalue = va_arg(args, double); |
341 | fmtfp(buffer, &currlen, maxlen, fvalue, min, max, flags); | 411 | fmtfp(outch_fn, buffer, &currlen, maxlen, |
412 | fvalue, min, max, flags); | ||
342 | break; | 413 | break; |
343 | case 'E': | 414 | case 'E': |
344 | flags |= DP_F_UP; | 415 | flags |= DP_F_UP; |
@@ -357,19 +428,19 @@ dopr( | |||
357 | fvalue = va_arg(args, double); | 428 | fvalue = va_arg(args, double); |
358 | break; | 429 | break; |
359 | case 'c': | 430 | case 'c': |
360 | dopr_outch(buffer, &currlen, maxlen, | 431 | (*outch_fn)(buffer, &currlen, maxlen, |
361 | va_arg(args, int)); | 432 | va_arg(args, int)); |
362 | break; | 433 | break; |
363 | case 's': | 434 | case 's': |
364 | strvalue = va_arg(args, char *); | 435 | strvalue = va_arg(args, char *); |
365 | if (max < 0) | 436 | if (max < 0) |
366 | max = maxlen; | 437 | max = (*copy_fn)(*maxlen); |
367 | fmtstr(buffer, &currlen, maxlen, strvalue, | 438 | fmtstr(outch_fn, buffer, &currlen, maxlen, strvalue, |
368 | flags, min, max); | 439 | flags, min, max); |
369 | break; | 440 | break; |
370 | case 'p': | 441 | case 'p': |
371 | value = (long)va_arg(args, void *); | 442 | value = (long)va_arg(args, void *); |
372 | fmtint(buffer, &currlen, maxlen, | 443 | fmtint(outch_fn, buffer, &currlen, maxlen, |
373 | value, 16, min, max, flags); | 444 | value, 16, min, max, flags); |
374 | break; | 445 | break; |
375 | case 'n': /* XXX */ | 446 | case 'n': /* XXX */ |
@@ -392,7 +463,7 @@ dopr( | |||
392 | } | 463 | } |
393 | break; | 464 | break; |
394 | case '%': | 465 | case '%': |
395 | dopr_outch(buffer, &currlen, maxlen, ch); | 466 | (*outch_fn)(buffer, &currlen, maxlen, ch); |
396 | break; | 467 | break; |
397 | case 'w': | 468 | case 'w': |
398 | /* not supported yet, treat as next char */ | 469 | /* not supported yet, treat as next char */ |
@@ -413,19 +484,20 @@ dopr( | |||
413 | break; | 484 | break; |
414 | } | 485 | } |
415 | } | 486 | } |
416 | if (currlen >= maxlen - 1) | 487 | if (currlen >= *maxlen - 1) |
417 | currlen = maxlen - 1; | 488 | currlen = *maxlen - 1; |
418 | buffer[currlen] = '\0'; | 489 | (*buffer)[currlen] = '\0'; |
419 | *retlen = currlen; | 490 | *retlen = currlen; |
420 | return; | 491 | return; |
421 | } | 492 | } |
422 | 493 | ||
423 | static void | 494 | static void |
424 | fmtstr( | 495 | fmtstr( |
425 | char *buffer, | 496 | void (*outch_fn)(char **, size_t *, size_t *, int), |
497 | char **buffer, | ||
426 | size_t *currlen, | 498 | size_t *currlen, |
427 | size_t maxlen, | 499 | size_t *maxlen, |
428 | char *value, | 500 | const char *value, |
429 | int flags, | 501 | int flags, |
430 | int min, | 502 | int min, |
431 | int max) | 503 | int max) |
@@ -444,16 +516,16 @@ fmtstr( | |||
444 | padlen = -padlen; | 516 | padlen = -padlen; |
445 | 517 | ||
446 | while ((padlen > 0) && (cnt < max)) { | 518 | while ((padlen > 0) && (cnt < max)) { |
447 | dopr_outch(buffer, currlen, maxlen, ' '); | 519 | (*outch_fn)(buffer, currlen, maxlen, ' '); |
448 | --padlen; | 520 | --padlen; |
449 | ++cnt; | 521 | ++cnt; |
450 | } | 522 | } |
451 | while (*value && (cnt < max)) { | 523 | while (*value && (cnt < max)) { |
452 | dopr_outch(buffer, currlen, maxlen, *value++); | 524 | (*outch_fn)(buffer, currlen, maxlen, *value++); |
453 | ++cnt; | 525 | ++cnt; |
454 | } | 526 | } |
455 | while ((padlen < 0) && (cnt < max)) { | 527 | while ((padlen < 0) && (cnt < max)) { |
456 | dopr_outch(buffer, currlen, maxlen, ' '); | 528 | (*outch_fn)(buffer, currlen, maxlen, ' '); |
457 | ++padlen; | 529 | ++padlen; |
458 | ++cnt; | 530 | ++cnt; |
459 | } | 531 | } |
@@ -461,9 +533,10 @@ fmtstr( | |||
461 | 533 | ||
462 | static void | 534 | static void |
463 | fmtint( | 535 | fmtint( |
464 | char *buffer, | 536 | void (*outch_fn)(char **, size_t *, size_t *, int), |
537 | char **buffer, | ||
465 | size_t *currlen, | 538 | size_t *currlen, |
466 | size_t maxlen, | 539 | size_t *maxlen, |
467 | LLONG value, | 540 | LLONG value, |
468 | int base, | 541 | int base, |
469 | int min, | 542 | int min, |
@@ -517,28 +590,28 @@ fmtint( | |||
517 | 590 | ||
518 | /* spaces */ | 591 | /* spaces */ |
519 | while (spadlen > 0) { | 592 | while (spadlen > 0) { |
520 | dopr_outch(buffer, currlen, maxlen, ' '); | 593 | (*outch_fn)(buffer, currlen, maxlen, ' '); |
521 | --spadlen; | 594 | --spadlen; |
522 | } | 595 | } |
523 | 596 | ||
524 | /* sign */ | 597 | /* sign */ |
525 | if (signvalue) | 598 | if (signvalue) |
526 | dopr_outch(buffer, currlen, maxlen, signvalue); | 599 | (*outch_fn)(buffer, currlen, maxlen, signvalue); |
527 | 600 | ||
528 | /* zeros */ | 601 | /* zeros */ |
529 | if (zpadlen > 0) { | 602 | if (zpadlen > 0) { |
530 | while (zpadlen > 0) { | 603 | while (zpadlen > 0) { |
531 | dopr_outch(buffer, currlen, maxlen, '0'); | 604 | (*outch_fn)(buffer, currlen, maxlen, '0'); |
532 | --zpadlen; | 605 | --zpadlen; |
533 | } | 606 | } |
534 | } | 607 | } |
535 | /* digits */ | 608 | /* digits */ |
536 | while (place > 0) | 609 | while (place > 0) |
537 | dopr_outch(buffer, currlen, maxlen, convert[--place]); | 610 | (*outch_fn)(buffer, currlen, maxlen, convert[--place]); |
538 | 611 | ||
539 | /* left justified spaces */ | 612 | /* left justified spaces */ |
540 | while (spadlen < 0) { | 613 | while (spadlen < 0) { |
541 | dopr_outch(buffer, currlen, maxlen, ' '); | 614 | (*outch_fn)(buffer, currlen, maxlen, ' '); |
542 | ++spadlen; | 615 | ++spadlen; |
543 | } | 616 | } |
544 | return; | 617 | return; |
@@ -577,9 +650,10 @@ round(LDOUBLE value) | |||
577 | 650 | ||
578 | static void | 651 | static void |
579 | fmtfp( | 652 | fmtfp( |
580 | char *buffer, | 653 | void (*outch_fn)(char **, size_t *, size_t *, int), |
654 | char **buffer, | ||
581 | size_t *currlen, | 655 | size_t *currlen, |
582 | size_t maxlen, | 656 | size_t *maxlen, |
583 | LDOUBLE fvalue, | 657 | LDOUBLE fvalue, |
584 | int min, | 658 | int min, |
585 | int max, | 659 | int max, |
@@ -657,54 +731,114 @@ fmtfp( | |||
657 | 731 | ||
658 | if ((flags & DP_F_ZERO) && (padlen > 0)) { | 732 | if ((flags & DP_F_ZERO) && (padlen > 0)) { |
659 | if (signvalue) { | 733 | if (signvalue) { |
660 | dopr_outch(buffer, currlen, maxlen, signvalue); | 734 | (*outch_fn)(buffer, currlen, maxlen, signvalue); |
661 | --padlen; | 735 | --padlen; |
662 | signvalue = 0; | 736 | signvalue = 0; |
663 | } | 737 | } |
664 | while (padlen > 0) { | 738 | while (padlen > 0) { |
665 | dopr_outch(buffer, currlen, maxlen, '0'); | 739 | (*outch_fn)(buffer, currlen, maxlen, '0'); |
666 | --padlen; | 740 | --padlen; |
667 | } | 741 | } |
668 | } | 742 | } |
669 | while (padlen > 0) { | 743 | while (padlen > 0) { |
670 | dopr_outch(buffer, currlen, maxlen, ' '); | 744 | (*outch_fn)(buffer, currlen, maxlen, ' '); |
671 | --padlen; | 745 | --padlen; |
672 | } | 746 | } |
673 | if (signvalue) | 747 | if (signvalue) |
674 | dopr_outch(buffer, currlen, maxlen, signvalue); | 748 | (*outch_fn)(buffer, currlen, maxlen, signvalue); |
675 | 749 | ||
676 | while (iplace > 0) | 750 | while (iplace > 0) |
677 | dopr_outch(buffer, currlen, maxlen, iconvert[--iplace]); | 751 | (*outch_fn)(buffer, currlen, maxlen, iconvert[--iplace]); |
678 | 752 | ||
679 | /* | 753 | /* |
680 | * Decimal point. This should probably use locale to find the correct | 754 | * Decimal point. This should probably use locale to find the correct |
681 | * char to print out. | 755 | * char to print out. |
682 | */ | 756 | */ |
683 | if (max > 0) { | 757 | if (max > 0) { |
684 | dopr_outch(buffer, currlen, maxlen, '.'); | 758 | (*outch_fn)(buffer, currlen, maxlen, '.'); |
685 | 759 | ||
686 | while (fplace > 0) | 760 | while (fplace > 0) |
687 | dopr_outch(buffer, currlen, maxlen, fconvert[--fplace]); | 761 | (*outch_fn)(buffer, currlen, maxlen, fconvert[--fplace]); |
688 | } | 762 | } |
689 | while (zpadlen > 0) { | 763 | while (zpadlen > 0) { |
690 | dopr_outch(buffer, currlen, maxlen, '0'); | 764 | (*outch_fn)(buffer, currlen, maxlen, '0'); |
691 | --zpadlen; | 765 | --zpadlen; |
692 | } | 766 | } |
693 | 767 | ||
694 | while (padlen < 0) { | 768 | while (padlen < 0) { |
695 | dopr_outch(buffer, currlen, maxlen, ' '); | 769 | (*outch_fn)(buffer, currlen, maxlen, ' '); |
696 | ++padlen; | 770 | ++padlen; |
697 | } | 771 | } |
698 | } | 772 | } |
699 | 773 | ||
774 | static int | ||
775 | dopr_copy( | ||
776 | size_t len) | ||
777 | { | ||
778 | return len; | ||
779 | } | ||
780 | |||
781 | #ifdef USE_ALLOCATING_PRINT | ||
782 | static int | ||
783 | doapr_copy( | ||
784 | size_t len) | ||
785 | { | ||
786 | /* Return as high an integer as possible */ | ||
787 | return INT_MAX; | ||
788 | } | ||
789 | #endif | ||
790 | |||
791 | static int | ||
792 | dopr_isbig( | ||
793 | size_t currlen, | ||
794 | size_t maxlen) | ||
795 | { | ||
796 | return currlen > maxlen; | ||
797 | } | ||
798 | |||
799 | #ifdef USE_ALLOCATING_PRINT | ||
800 | static int | ||
801 | doapr_isbig( | ||
802 | size_t currlen, | ||
803 | size_t maxlen) | ||
804 | { | ||
805 | return 0; | ||
806 | } | ||
807 | #endif | ||
808 | |||
700 | static void | 809 | static void |
701 | dopr_outch( | 810 | dopr_outch( |
702 | char *buffer, | 811 | char **buffer, |
703 | size_t *currlen, | 812 | size_t *currlen, |
704 | size_t maxlen, | 813 | size_t *maxlen, |
814 | int c) | ||
815 | { | ||
816 | if (*currlen < *maxlen) | ||
817 | (*buffer)[(*currlen)++] = (char)c; | ||
818 | return; | ||
819 | } | ||
820 | |||
821 | #ifdef USE_ALLOCATING_PRINT | ||
822 | static void | ||
823 | doapr_outch( | ||
824 | char **buffer, | ||
825 | size_t *currlen, | ||
826 | size_t *maxlen, | ||
705 | int c) | 827 | int c) |
706 | { | 828 | { |
707 | if (*currlen < maxlen) | 829 | if (*buffer == NULL) { |
708 | buffer[(*currlen)++] = (char)c; | 830 | if (*maxlen == 0) |
831 | *maxlen = 1024; | ||
832 | *buffer = Malloc(*maxlen); | ||
833 | } | ||
834 | while (*currlen >= *maxlen) { | ||
835 | *maxlen += 1024; | ||
836 | *buffer = Realloc(*buffer, *maxlen); | ||
837 | } | ||
838 | /* What to do if *buffer is NULL? */ | ||
839 | assert(*buffer != NULL); | ||
840 | |||
841 | (*buffer)[(*currlen)++] = (char)c; | ||
709 | return; | 842 | return; |
710 | } | 843 | } |
844 | #endif | ||
diff --git a/src/lib/libcrypto/bio/bio.h b/src/lib/libcrypto/bio/bio.h index bc08401eeb..ebdb18170b 100644 --- a/src/lib/libcrypto/bio/bio.h +++ b/src/lib/libcrypto/bio/bio.h | |||
@@ -507,7 +507,7 @@ int BIO_set(BIO *a,BIO_METHOD *type); | |||
507 | int BIO_free(BIO *a); | 507 | int BIO_free(BIO *a); |
508 | int BIO_read(BIO *b, void *data, int len); | 508 | int BIO_read(BIO *b, void *data, int len); |
509 | int BIO_gets(BIO *bp,char *buf, int size); | 509 | int BIO_gets(BIO *bp,char *buf, int size); |
510 | int BIO_write(BIO *b, const char *data, int len); | 510 | int BIO_write(BIO *b, const void *data, int len); |
511 | int BIO_puts(BIO *bp,const char *buf); | 511 | int BIO_puts(BIO *bp,const char *buf); |
512 | long BIO_ctrl(BIO *bp,int cmd,long larg,void *parg); | 512 | long BIO_ctrl(BIO *bp,int cmd,long larg,void *parg); |
513 | long BIO_callback_ctrl(BIO *bp,int cmd,void (*fp)()); | 513 | long BIO_callback_ctrl(BIO *bp,int cmd,void (*fp)()); |
diff --git a/src/lib/libcrypto/bio/bio_err.c b/src/lib/libcrypto/bio/bio_err.c index b5f07de5a0..f38e7b9178 100644 --- a/src/lib/libcrypto/bio/bio_err.c +++ b/src/lib/libcrypto/bio/bio_err.c | |||
@@ -54,7 +54,8 @@ | |||
54 | */ | 54 | */ |
55 | 55 | ||
56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes |
57 | * made to it will be overwritten when the script next updates this file. | 57 | * made to it will be overwritten when the script next updates this file, |
58 | * only reason strings will be preserved. | ||
58 | */ | 59 | */ |
59 | 60 | ||
60 | #include <stdio.h> | 61 | #include <stdio.h> |
diff --git a/src/lib/libcrypto/bio/bio_lib.c b/src/lib/libcrypto/bio/bio_lib.c index cf8e6150fd..e88dcc80f3 100644 --- a/src/lib/libcrypto/bio/bio_lib.c +++ b/src/lib/libcrypto/bio/bio_lib.c | |||
@@ -169,7 +169,7 @@ int BIO_read(BIO *b, void *out, int outl) | |||
169 | return(i); | 169 | return(i); |
170 | } | 170 | } |
171 | 171 | ||
172 | int BIO_write(BIO *b, const char *in, int inl) | 172 | int BIO_write(BIO *b, const void *in, int inl) |
173 | { | 173 | { |
174 | int i; | 174 | int i; |
175 | long (*cb)(); | 175 | long (*cb)(); |
diff --git a/src/lib/libcrypto/bio/bss_bio.c b/src/lib/libcrypto/bio/bss_bio.c index 0d0f9356f7..1e2d7491f2 100644 --- a/src/lib/libcrypto/bio/bss_bio.c +++ b/src/lib/libcrypto/bio/bss_bio.c | |||
@@ -19,8 +19,14 @@ | |||
19 | 19 | ||
20 | #include <openssl/bio.h> | 20 | #include <openssl/bio.h> |
21 | #include <openssl/err.h> | 21 | #include <openssl/err.h> |
22 | #include <openssl/err.h> | ||
22 | #include <openssl/crypto.h> | 23 | #include <openssl/crypto.h> |
23 | 24 | ||
25 | #include "openssl/e_os.h" | ||
26 | #ifndef SSIZE_MAX | ||
27 | # define SSIZE_MAX INT_MAX | ||
28 | #endif | ||
29 | |||
24 | static int bio_new(BIO *bio); | 30 | static int bio_new(BIO *bio); |
25 | static int bio_free(BIO *bio); | 31 | static int bio_free(BIO *bio); |
26 | static int bio_read(BIO *bio, char *buf, int size); | 32 | static int bio_read(BIO *bio, char *buf, int size); |
@@ -205,10 +211,10 @@ static int bio_read(BIO *bio, char *buf, int size_) | |||
205 | */ | 211 | */ |
206 | /* WARNING: The non-copying interface is largely untested as of yet | 212 | /* WARNING: The non-copying interface is largely untested as of yet |
207 | * and may contain bugs. */ | 213 | * and may contain bugs. */ |
208 | static size_t bio_nread0(BIO *bio, char **buf) | 214 | static ssize_t bio_nread0(BIO *bio, char **buf) |
209 | { | 215 | { |
210 | struct bio_bio_st *b, *peer_b; | 216 | struct bio_bio_st *b, *peer_b; |
211 | size_t num; | 217 | ssize_t num; |
212 | 218 | ||
213 | BIO_clear_retry_flags(bio); | 219 | BIO_clear_retry_flags(bio); |
214 | 220 | ||
@@ -243,15 +249,20 @@ static size_t bio_nread0(BIO *bio, char **buf) | |||
243 | return num; | 249 | return num; |
244 | } | 250 | } |
245 | 251 | ||
246 | static size_t bio_nread(BIO *bio, char **buf, size_t num) | 252 | static ssize_t bio_nread(BIO *bio, char **buf, size_t num_) |
247 | { | 253 | { |
248 | struct bio_bio_st *b, *peer_b; | 254 | struct bio_bio_st *b, *peer_b; |
249 | size_t available; | 255 | ssize_t num, available; |
256 | |||
257 | if (num_ > SSIZE_MAX) | ||
258 | num = SSIZE_MAX; | ||
259 | else | ||
260 | num = (ssize_t)num_; | ||
250 | 261 | ||
251 | available = bio_nread0(bio, buf); | 262 | available = bio_nread0(bio, buf); |
252 | if (num > available) | 263 | if (num > available) |
253 | num = available; | 264 | num = available; |
254 | if (num == 0) | 265 | if (num <= 0) |
255 | return num; | 266 | return num; |
256 | 267 | ||
257 | b = bio->ptr; | 268 | b = bio->ptr; |
@@ -351,7 +362,7 @@ static int bio_write(BIO *bio, char *buf, int num_) | |||
351 | * (example usage: bio_nwrite0(), write to buffer, bio_nwrite() | 362 | * (example usage: bio_nwrite0(), write to buffer, bio_nwrite() |
352 | * or just bio_nwrite(), write to buffer) | 363 | * or just bio_nwrite(), write to buffer) |
353 | */ | 364 | */ |
354 | static size_t bio_nwrite0(BIO *bio, char **buf) | 365 | static ssize_t bio_nwrite0(BIO *bio, char **buf) |
355 | { | 366 | { |
356 | struct bio_bio_st *b; | 367 | struct bio_bio_st *b; |
357 | size_t num; | 368 | size_t num; |
@@ -399,15 +410,20 @@ static size_t bio_nwrite0(BIO *bio, char **buf) | |||
399 | return num; | 410 | return num; |
400 | } | 411 | } |
401 | 412 | ||
402 | static size_t bio_nwrite(BIO *bio, char **buf, size_t num) | 413 | static ssize_t bio_nwrite(BIO *bio, char **buf, size_t num_) |
403 | { | 414 | { |
404 | struct bio_bio_st *b; | 415 | struct bio_bio_st *b; |
405 | size_t space; | 416 | ssize_t num, space; |
417 | |||
418 | if (num_ > SSIZE_MAX) | ||
419 | num = SSIZE_MAX; | ||
420 | else | ||
421 | num = (ssize_t)num_; | ||
406 | 422 | ||
407 | space = bio_nwrite0(bio, buf); | 423 | space = bio_nwrite0(bio, buf); |
408 | if (num > space) | 424 | if (num > space) |
409 | num = space; | 425 | num = space; |
410 | if (num == 0) | 426 | if (num <= 0) |
411 | return num; | 427 | return num; |
412 | b = bio->ptr; | 428 | b = bio->ptr; |
413 | assert(b != NULL); | 429 | assert(b != NULL); |
@@ -509,6 +525,11 @@ static long bio_ctrl(BIO *bio, int cmd, long num, void *ptr) | |||
509 | ret = 1; | 525 | ret = 1; |
510 | break; | 526 | break; |
511 | 527 | ||
528 | case BIO_C_NREAD0: | ||
529 | /* prepare for non-copying read */ | ||
530 | ret = (long) bio_nread0(bio, ptr); | ||
531 | break; | ||
532 | |||
512 | case BIO_C_NREAD: | 533 | case BIO_C_NREAD: |
513 | /* non-copying read */ | 534 | /* non-copying read */ |
514 | ret = (long) bio_nread(bio, ptr, (size_t) num); | 535 | ret = (long) bio_nread(bio, ptr, (size_t) num); |
diff --git a/src/lib/libcrypto/bio/bss_log.c b/src/lib/libcrypto/bio/bss_log.c index 4308b19663..497eb1af72 100644 --- a/src/lib/libcrypto/bio/bss_log.c +++ b/src/lib/libcrypto/bio/bss_log.c | |||
@@ -57,8 +57,8 @@ | |||
57 | Why BIO_s_log? | 57 | Why BIO_s_log? |
58 | 58 | ||
59 | BIO_s_log is useful for system daemons (or services under NT). | 59 | BIO_s_log is useful for system daemons (or services under NT). |
60 | It is one-way BIO, it sends all stuff to syslogd (or event log | 60 | It is one-way BIO, it sends all stuff to syslogd (on system that |
61 | under NT). | 61 | commonly use that), or event log (on NT), or OPCOM (on OpenVMS). |
62 | 62 | ||
63 | */ | 63 | */ |
64 | 64 | ||
@@ -66,29 +66,58 @@ | |||
66 | #include <stdio.h> | 66 | #include <stdio.h> |
67 | #include <errno.h> | 67 | #include <errno.h> |
68 | 68 | ||
69 | #ifndef WIN32 | 69 | #if defined(WIN32) |
70 | #ifdef __ultrix | 70 | # include <process.h> |
71 | #include <sys/syslog.h> | 71 | #elif defined(VMS) || defined(__VMS) |
72 | #else | 72 | # include <opcdef.h> |
73 | #include <syslog.h> | 73 | # include <descrip.h> |
74 | #endif | 74 | # include <lib$routines.h> |
75 | #else | 75 | # include <starlet.h> |
76 | #include <process.h> | 76 | #elif defined(__ultrix) |
77 | # include <sys/syslog.h> | ||
78 | #elif !defined(MSDOS) /* Unix */ | ||
79 | # include <syslog.h> | ||
77 | #endif | 80 | #endif |
78 | 81 | ||
79 | #include "cryptlib.h" | 82 | #include "cryptlib.h" |
80 | #include <openssl/buffer.h> | 83 | #include <openssl/buffer.h> |
81 | #include <openssl/err.h> | 84 | #include <openssl/err.h> |
85 | |||
82 | #ifndef NO_SYSLOG | 86 | #ifndef NO_SYSLOG |
83 | 87 | ||
88 | #if defined(WIN32) | ||
89 | #define LOG_EMERG 0 | ||
90 | #define LOG_ALERT 1 | ||
91 | #define LOG_CRIT 2 | ||
92 | #define LOG_ERR 3 | ||
93 | #define LOG_WARNING 4 | ||
94 | #define LOG_NOTICE 5 | ||
95 | #define LOG_INFO 6 | ||
96 | #define LOG_DEBUG 7 | ||
97 | |||
98 | #define LOG_DAEMON (3<<3) | ||
99 | #elif defined(VMS) | ||
100 | /* On VMS, we don't really care about these, but we need them to compile */ | ||
101 | #define LOG_EMERG 0 | ||
102 | #define LOG_ALERT 1 | ||
103 | #define LOG_CRIT 2 | ||
104 | #define LOG_ERR 3 | ||
105 | #define LOG_WARNING 4 | ||
106 | #define LOG_NOTICE 5 | ||
107 | #define LOG_INFO 6 | ||
108 | #define LOG_DEBUG 7 | ||
109 | |||
110 | #define LOG_DAEMON OPC$M_NM_NTWORK | ||
111 | #endif | ||
84 | 112 | ||
85 | static int MS_CALLBACK slg_write(BIO *h,char *buf,int num); | 113 | static int MS_CALLBACK slg_write(BIO *h,char *buf,int num); |
86 | static int MS_CALLBACK slg_puts(BIO *h,char *str); | 114 | static int MS_CALLBACK slg_puts(BIO *h,char *str); |
87 | static long MS_CALLBACK slg_ctrl(BIO *h,int cmd,long arg1,char *arg2); | 115 | static long MS_CALLBACK slg_ctrl(BIO *h,int cmd,long arg1,char *arg2); |
88 | static int MS_CALLBACK slg_new(BIO *h); | 116 | static int MS_CALLBACK slg_new(BIO *h); |
89 | static int MS_CALLBACK slg_free(BIO *data); | 117 | static int MS_CALLBACK slg_free(BIO *data); |
90 | static int xopenlog(BIO* bp, const char* name, int level); | 118 | static void xopenlog(BIO* bp, const char* name, int level); |
91 | static int xcloselog(BIO* bp); | 119 | static void xsyslog(BIO* bp, int priority, const char* string); |
120 | static void xcloselog(BIO* bp); | ||
92 | 121 | ||
93 | static BIO_METHOD methods_slg= | 122 | static BIO_METHOD methods_slg= |
94 | { | 123 | { |
@@ -113,11 +142,7 @@ static int MS_CALLBACK slg_new(BIO *bi) | |||
113 | bi->init=1; | 142 | bi->init=1; |
114 | bi->num=0; | 143 | bi->num=0; |
115 | bi->ptr=NULL; | 144 | bi->ptr=NULL; |
116 | #ifndef WIN32 | ||
117 | xopenlog(bi, "application", LOG_DAEMON); | 145 | xopenlog(bi, "application", LOG_DAEMON); |
118 | #else | ||
119 | xopenlog(bi, "application", 0); | ||
120 | #endif | ||
121 | return(1); | 146 | return(1); |
122 | } | 147 | } |
123 | 148 | ||
@@ -133,43 +158,14 @@ static int MS_CALLBACK slg_write(BIO *b, char *in, int inl) | |||
133 | int ret= inl; | 158 | int ret= inl; |
134 | char* buf= in; | 159 | char* buf= in; |
135 | char* pp; | 160 | char* pp; |
136 | #if defined(WIN32) | ||
137 | LPCSTR lpszStrings[2]; | ||
138 | WORD evtype= EVENTLOG_ERROR_TYPE; | ||
139 | int pid = _getpid(); | ||
140 | char pidbuf[20]; | ||
141 | #else | ||
142 | int priority; | 161 | int priority; |
143 | #endif | ||
144 | 162 | ||
145 | if((buf= (char *)Malloc(inl+ 1)) == NULL){ | 163 | if((buf= (char *)Malloc(inl+ 1)) == NULL){ |
146 | return(0); | 164 | return(0); |
147 | } | 165 | } |
148 | strncpy(buf, in, inl); | 166 | strncpy(buf, in, inl); |
149 | buf[inl]= '\0'; | 167 | buf[inl]= '\0'; |
150 | #if defined(WIN32) | ||
151 | if(strncmp(buf, "ERR ", 4) == 0){ | ||
152 | evtype= EVENTLOG_ERROR_TYPE; | ||
153 | pp= buf+ 4; | ||
154 | }else if(strncmp(buf, "WAR ", 4) == 0){ | ||
155 | evtype= EVENTLOG_WARNING_TYPE; | ||
156 | pp= buf+ 4; | ||
157 | }else if(strncmp(buf, "INF ", 4) == 0){ | ||
158 | evtype= EVENTLOG_INFORMATION_TYPE; | ||
159 | pp= buf+ 4; | ||
160 | }else{ | ||
161 | evtype= EVENTLOG_ERROR_TYPE; | ||
162 | pp= buf; | ||
163 | } | ||
164 | 168 | ||
165 | sprintf(pidbuf, "[%d] ", pid); | ||
166 | lpszStrings[0] = pidbuf; | ||
167 | lpszStrings[1] = pp; | ||
168 | |||
169 | if(b->ptr) | ||
170 | ReportEvent(b->ptr, evtype, 0, 1024, NULL, 2, 0, | ||
171 | lpszStrings, NULL); | ||
172 | #else | ||
173 | if(strncmp(buf, "ERR ", 4) == 0){ | 169 | if(strncmp(buf, "ERR ", 4) == 0){ |
174 | priority= LOG_ERR; | 170 | priority= LOG_ERR; |
175 | pp= buf+ 4; | 171 | pp= buf+ 4; |
@@ -184,8 +180,8 @@ static int MS_CALLBACK slg_write(BIO *b, char *in, int inl) | |||
184 | pp= buf; | 180 | pp= buf; |
185 | } | 181 | } |
186 | 182 | ||
187 | syslog(priority, "%s", pp); | 183 | xsyslog(b, priority, pp); |
188 | #endif | 184 | |
189 | Free(buf); | 185 | Free(buf); |
190 | return(ret); | 186 | return(ret); |
191 | } | 187 | } |
@@ -213,28 +209,128 @@ static int MS_CALLBACK slg_puts(BIO *bp, char *str) | |||
213 | return(ret); | 209 | return(ret); |
214 | } | 210 | } |
215 | 211 | ||
216 | static int xopenlog(BIO* bp, const char* name, int level) | ||
217 | { | ||
218 | #if defined(WIN32) | 212 | #if defined(WIN32) |
219 | if((bp->ptr= (char *)RegisterEventSource(NULL, name)) == NULL){ | 213 | |
220 | return(0); | 214 | static void xopenlog(BIO* bp, const char* name, int level) |
221 | } | 215 | { |
222 | #else | 216 | bp->ptr= (char *)RegisterEventSource(NULL, name); |
223 | openlog(name, LOG_PID|LOG_CONS, level); | ||
224 | #endif | ||
225 | return(1); | ||
226 | } | 217 | } |
227 | 218 | ||
228 | static int xcloselog(BIO* bp) | 219 | static void xsyslog(BIO *bp, int priority, const char *string) |
220 | { | ||
221 | LPCSTR lpszStrings[2]; | ||
222 | WORD evtype= EVENTLOG_ERROR_TYPE; | ||
223 | int pid = _getpid(); | ||
224 | char pidbuf[20]; | ||
225 | |||
226 | switch (priority) | ||
227 | { | ||
228 | case LOG_ERR: | ||
229 | evtype = EVENTLOG_ERROR_TYPE; | ||
230 | break; | ||
231 | case LOG_WARNING: | ||
232 | evtype = EVENTLOG_WARNING_TYPE; | ||
233 | break; | ||
234 | case LOG_INFO: | ||
235 | evtype = EVENTLOG_INFORMATION_TYPE; | ||
236 | break; | ||
237 | default: | ||
238 | evtype = EVENTLOG_ERROR_TYPE; | ||
239 | break; | ||
240 | } | ||
241 | |||
242 | sprintf(pidbuf, "[%d] ", pid); | ||
243 | lpszStrings[0] = pidbuf; | ||
244 | lpszStrings[1] = string; | ||
245 | |||
246 | if(bp->ptr) | ||
247 | ReportEvent(bp->ptr, evtype, 0, 1024, NULL, 2, 0, | ||
248 | lpszStrings, NULL); | ||
249 | } | ||
250 | |||
251 | static void xcloselog(BIO* bp) | ||
229 | { | 252 | { |
230 | #if defined(WIN32) | ||
231 | if(bp->ptr) | 253 | if(bp->ptr) |
232 | DeregisterEventSource((HANDLE)(bp->ptr)); | 254 | DeregisterEventSource((HANDLE)(bp->ptr)); |
233 | bp->ptr= NULL; | 255 | bp->ptr= NULL; |
234 | #else | 256 | } |
257 | |||
258 | #elif defined(VMS) | ||
259 | |||
260 | static int VMS_OPC_target = LOG_DAEMON; | ||
261 | |||
262 | static void xopenlog(BIO* bp, const char* name, int level) | ||
263 | { | ||
264 | VMS_OPC_target = level; | ||
265 | } | ||
266 | |||
267 | static void xsyslog(BIO *bp, int priority, const char *string) | ||
268 | { | ||
269 | struct dsc$descriptor_s opc_dsc; | ||
270 | struct opcdef *opcdef_p; | ||
271 | char buf[10240]; | ||
272 | unsigned int len; | ||
273 | struct dsc$descriptor_s buf_dsc; | ||
274 | $DESCRIPTOR(fao_cmd, "!AZ: !AZ"); | ||
275 | char *priority_tag; | ||
276 | |||
277 | switch (priority) | ||
278 | { | ||
279 | case LOG_EMERG: priority_tag = "Emergency"; break; | ||
280 | case LOG_ALERT: priority_tag = "Alert"; break; | ||
281 | case LOG_CRIT: priority_tag = "Critical"; break; | ||
282 | case LOG_ERR: priority_tag = "Error"; break; | ||
283 | case LOG_WARNING: priority_tag = "Warning"; break; | ||
284 | case LOG_NOTICE: priority_tag = "Notice"; break; | ||
285 | case LOG_INFO: priority_tag = "Info"; break; | ||
286 | case LOG_DEBUG: priority_tag = "DEBUG"; break; | ||
287 | } | ||
288 | |||
289 | buf_dsc.dsc$b_dtype = DSC$K_DTYPE_T; | ||
290 | buf_dsc.dsc$b_class = DSC$K_CLASS_S; | ||
291 | buf_dsc.dsc$a_pointer = buf; | ||
292 | buf_dsc.dsc$w_length = sizeof(buf) - 1; | ||
293 | |||
294 | lib$sys_fao(&fao_cmd, &len, &buf_dsc, priority_tag, string); | ||
295 | |||
296 | /* we know there's an 8 byte header. That's documented */ | ||
297 | opcdef_p = (struct opcdef *) Malloc(8 + len); | ||
298 | opcdef_p->opc$b_ms_type = OPC$_RQ_RQST; | ||
299 | memcpy(opcdef_p->opc$z_ms_target_classes, &VMS_OPC_target, 3); | ||
300 | opcdef_p->opc$l_ms_rqstid = 0; | ||
301 | memcpy(&opcdef_p->opc$l_ms_text, buf, len); | ||
302 | |||
303 | opc_dsc.dsc$b_dtype = DSC$K_DTYPE_T; | ||
304 | opc_dsc.dsc$b_class = DSC$K_CLASS_S; | ||
305 | opc_dsc.dsc$a_pointer = (char *)opcdef_p; | ||
306 | opc_dsc.dsc$w_length = len + 8; | ||
307 | |||
308 | sys$sndopr(opc_dsc, 0); | ||
309 | |||
310 | Free(opcdef_p); | ||
311 | } | ||
312 | |||
313 | static void xcloselog(BIO* bp) | ||
314 | { | ||
315 | } | ||
316 | |||
317 | #else /* Unix */ | ||
318 | |||
319 | static void xopenlog(BIO* bp, const char* name, int level) | ||
320 | { | ||
321 | openlog(name, LOG_PID|LOG_CONS, level); | ||
322 | } | ||
323 | |||
324 | static void xsyslog(BIO *bp, int priority, const char *string) | ||
325 | { | ||
326 | syslog(priority, "%s", string); | ||
327 | } | ||
328 | |||
329 | static void xcloselog(BIO* bp) | ||
330 | { | ||
235 | closelog(); | 331 | closelog(); |
236 | #endif | ||
237 | return(1); | ||
238 | } | 332 | } |
239 | 333 | ||
240 | #endif | 334 | #endif /* Unix */ |
335 | |||
336 | #endif /* NO_SYSLOG */ | ||
diff --git a/src/lib/libcrypto/bn/Makefile.ssl b/src/lib/libcrypto/bn/Makefile.ssl index fa23a43fa0..beb9c1b523 100644 --- a/src/lib/libcrypto/bn/Makefile.ssl +++ b/src/lib/libcrypto/bn/Makefile.ssl | |||
@@ -5,6 +5,7 @@ | |||
5 | DIR= bn | 5 | DIR= bn |
6 | TOP= ../.. | 6 | TOP= ../.. |
7 | CC= cc | 7 | CC= cc |
8 | CPP= $(CC) -E | ||
8 | INCLUDES= -I.. -I../../include | 9 | INCLUDES= -I.. -I../../include |
9 | CFLAG=-g | 10 | CFLAG=-g |
10 | INSTALL_PREFIX= | 11 | INSTALL_PREFIX= |
@@ -72,10 +73,10 @@ lib: $(LIBOBJ) | |||
72 | 73 | ||
73 | # elf | 74 | # elf |
74 | asm/bn86-elf.o: asm/bn86unix.cpp | 75 | asm/bn86-elf.o: asm/bn86unix.cpp |
75 | $(CPP) -DELF asm/bn86unix.cpp | as -o asm/bn86-elf.o | 76 | $(CPP) -DELF -x c asm/bn86unix.cpp | as -o asm/bn86-elf.o |
76 | 77 | ||
77 | asm/co86-elf.o: asm/co86unix.cpp | 78 | asm/co86-elf.o: asm/co86unix.cpp |
78 | $(CPP) -DELF asm/co86unix.cpp | as -o asm/co86-elf.o | 79 | $(CPP) -DELF -x c asm/co86unix.cpp | as -o asm/co86-elf.o |
79 | 80 | ||
80 | # solaris | 81 | # solaris |
81 | asm/bn86-sol.o: asm/bn86unix.cpp | 82 | asm/bn86-sol.o: asm/bn86unix.cpp |
@@ -102,10 +103,10 @@ asm/bn86bsdi.o: asm/bn86unix.cpp | |||
102 | asm/co86bsdi.o: asm/co86unix.cpp | 103 | asm/co86bsdi.o: asm/co86unix.cpp |
103 | $(CPP) -DBSDI asm/co86unix.cpp | sed 's/ :/:/' | as -o asm/co86bsdi.o | 104 | $(CPP) -DBSDI asm/co86unix.cpp | sed 's/ :/:/' | as -o asm/co86bsdi.o |
104 | 105 | ||
105 | asm/bn86unix.cpp: asm/bn-586.pl | 106 | asm/bn86unix.cpp: asm/bn-586.pl ../perlasm/x86asm.pl |
106 | (cd asm; $(PERL) bn-586.pl cpp >bn86unix.cpp ) | 107 | (cd asm; $(PERL) bn-586.pl cpp >bn86unix.cpp ) |
107 | 108 | ||
108 | asm/co86unix.cpp: asm/co-586.pl | 109 | asm/co86unix.cpp: asm/co-586.pl ../perlasm/x86asm.pl |
109 | (cd asm; $(PERL) co-586.pl cpp >co86unix.cpp ) | 110 | (cd asm; $(PERL) co-586.pl cpp >co86unix.cpp ) |
110 | 111 | ||
111 | asm/sparcv8.o: asm/sparcv8.S | 112 | asm/sparcv8.o: asm/sparcv8.S |
diff --git a/src/lib/libcrypto/bn/asm/bn-win32.asm b/src/lib/libcrypto/bn/asm/bn-win32.asm index 871bd88d77..e69de29bb2 100644 --- a/src/lib/libcrypto/bn/asm/bn-win32.asm +++ b/src/lib/libcrypto/bn/asm/bn-win32.asm | |||
@@ -1,2122 +0,0 @@ | |||
1 | ; Don't even think of reading this code | ||
2 | ; It was automatically generated by bn-586.pl | ||
3 | ; Which is a perl program used to generate the x86 assember for | ||
4 | ; any of elf, a.out, BSDI,Win32, or Solaris | ||
5 | ; eric <eay@cryptsoft.com> | ||
6 | ; | ||
7 | TITLE bn-586.asm | ||
8 | .386 | ||
9 | .model FLAT | ||
10 | _TEXT SEGMENT | ||
11 | PUBLIC _bn_mul_add_words | ||
12 | |||
13 | _bn_mul_add_words PROC NEAR | ||
14 | push ebp | ||
15 | push ebx | ||
16 | push esi | ||
17 | push edi | ||
18 | ; | ||
19 | xor esi, esi | ||
20 | mov edi, DWORD PTR 20[esp] | ||
21 | mov ecx, DWORD PTR 28[esp] | ||
22 | mov ebx, DWORD PTR 24[esp] | ||
23 | and ecx, 4294967288 | ||
24 | mov ebp, DWORD PTR 32[esp] | ||
25 | push ecx | ||
26 | jz $L000maw_finish | ||
27 | L001maw_loop: | ||
28 | mov DWORD PTR [esp],ecx | ||
29 | ; Round 0 | ||
30 | mov eax, DWORD PTR [ebx] | ||
31 | mul ebp | ||
32 | add eax, esi | ||
33 | mov esi, DWORD PTR [edi] | ||
34 | adc edx, 0 | ||
35 | add eax, esi | ||
36 | adc edx, 0 | ||
37 | mov DWORD PTR [edi],eax | ||
38 | mov esi, edx | ||
39 | ; Round 4 | ||
40 | mov eax, DWORD PTR 4[ebx] | ||
41 | mul ebp | ||
42 | add eax, esi | ||
43 | mov esi, DWORD PTR 4[edi] | ||
44 | adc edx, 0 | ||
45 | add eax, esi | ||
46 | adc edx, 0 | ||
47 | mov DWORD PTR 4[edi],eax | ||
48 | mov esi, edx | ||
49 | ; Round 8 | ||
50 | mov eax, DWORD PTR 8[ebx] | ||
51 | mul ebp | ||
52 | add eax, esi | ||
53 | mov esi, DWORD PTR 8[edi] | ||
54 | adc edx, 0 | ||
55 | add eax, esi | ||
56 | adc edx, 0 | ||
57 | mov DWORD PTR 8[edi],eax | ||
58 | mov esi, edx | ||
59 | ; Round 12 | ||
60 | mov eax, DWORD PTR 12[ebx] | ||
61 | mul ebp | ||
62 | add eax, esi | ||
63 | mov esi, DWORD PTR 12[edi] | ||
64 | adc edx, 0 | ||
65 | add eax, esi | ||
66 | adc edx, 0 | ||
67 | mov DWORD PTR 12[edi],eax | ||
68 | mov esi, edx | ||
69 | ; Round 16 | ||
70 | mov eax, DWORD PTR 16[ebx] | ||
71 | mul ebp | ||
72 | add eax, esi | ||
73 | mov esi, DWORD PTR 16[edi] | ||
74 | adc edx, 0 | ||
75 | add eax, esi | ||
76 | adc edx, 0 | ||
77 | mov DWORD PTR 16[edi],eax | ||
78 | mov esi, edx | ||
79 | ; Round 20 | ||
80 | mov eax, DWORD PTR 20[ebx] | ||
81 | mul ebp | ||
82 | add eax, esi | ||
83 | mov esi, DWORD PTR 20[edi] | ||
84 | adc edx, 0 | ||
85 | add eax, esi | ||
86 | adc edx, 0 | ||
87 | mov DWORD PTR 20[edi],eax | ||
88 | mov esi, edx | ||
89 | ; Round 24 | ||
90 | mov eax, DWORD PTR 24[ebx] | ||
91 | mul ebp | ||
92 | add eax, esi | ||
93 | mov esi, DWORD PTR 24[edi] | ||
94 | adc edx, 0 | ||
95 | add eax, esi | ||
96 | adc edx, 0 | ||
97 | mov DWORD PTR 24[edi],eax | ||
98 | mov esi, edx | ||
99 | ; Round 28 | ||
100 | mov eax, DWORD PTR 28[ebx] | ||
101 | mul ebp | ||
102 | add eax, esi | ||
103 | mov esi, DWORD PTR 28[edi] | ||
104 | adc edx, 0 | ||
105 | add eax, esi | ||
106 | adc edx, 0 | ||
107 | mov DWORD PTR 28[edi],eax | ||
108 | mov esi, edx | ||
109 | ; | ||
110 | mov ecx, DWORD PTR [esp] | ||
111 | add ebx, 32 | ||
112 | add edi, 32 | ||
113 | sub ecx, 8 | ||
114 | jnz L001maw_loop | ||
115 | $L000maw_finish: | ||
116 | mov ecx, DWORD PTR 32[esp] | ||
117 | and ecx, 7 | ||
118 | jnz $L002maw_finish2 | ||
119 | jmp $L003maw_end | ||
120 | $L002maw_finish2: | ||
121 | ; Tail Round 0 | ||
122 | mov eax, DWORD PTR [ebx] | ||
123 | mul ebp | ||
124 | add eax, esi | ||
125 | mov esi, DWORD PTR [edi] | ||
126 | adc edx, 0 | ||
127 | add eax, esi | ||
128 | adc edx, 0 | ||
129 | dec ecx | ||
130 | mov DWORD PTR [edi],eax | ||
131 | mov esi, edx | ||
132 | jz $L003maw_end | ||
133 | ; Tail Round 1 | ||
134 | mov eax, DWORD PTR 4[ebx] | ||
135 | mul ebp | ||
136 | add eax, esi | ||
137 | mov esi, DWORD PTR 4[edi] | ||
138 | adc edx, 0 | ||
139 | add eax, esi | ||
140 | adc edx, 0 | ||
141 | dec ecx | ||
142 | mov DWORD PTR 4[edi],eax | ||
143 | mov esi, edx | ||
144 | jz $L003maw_end | ||
145 | ; Tail Round 2 | ||
146 | mov eax, DWORD PTR 8[ebx] | ||
147 | mul ebp | ||
148 | add eax, esi | ||
149 | mov esi, DWORD PTR 8[edi] | ||
150 | adc edx, 0 | ||
151 | add eax, esi | ||
152 | adc edx, 0 | ||
153 | dec ecx | ||
154 | mov DWORD PTR 8[edi],eax | ||
155 | mov esi, edx | ||
156 | jz $L003maw_end | ||
157 | ; Tail Round 3 | ||
158 | mov eax, DWORD PTR 12[ebx] | ||
159 | mul ebp | ||
160 | add eax, esi | ||
161 | mov esi, DWORD PTR 12[edi] | ||
162 | adc edx, 0 | ||
163 | add eax, esi | ||
164 | adc edx, 0 | ||
165 | dec ecx | ||
166 | mov DWORD PTR 12[edi],eax | ||
167 | mov esi, edx | ||
168 | jz $L003maw_end | ||
169 | ; Tail Round 4 | ||
170 | mov eax, DWORD PTR 16[ebx] | ||
171 | mul ebp | ||
172 | add eax, esi | ||
173 | mov esi, DWORD PTR 16[edi] | ||
174 | adc edx, 0 | ||
175 | add eax, esi | ||
176 | adc edx, 0 | ||
177 | dec ecx | ||
178 | mov DWORD PTR 16[edi],eax | ||
179 | mov esi, edx | ||
180 | jz $L003maw_end | ||
181 | ; Tail Round 5 | ||
182 | mov eax, DWORD PTR 20[ebx] | ||
183 | mul ebp | ||
184 | add eax, esi | ||
185 | mov esi, DWORD PTR 20[edi] | ||
186 | adc edx, 0 | ||
187 | add eax, esi | ||
188 | adc edx, 0 | ||
189 | dec ecx | ||
190 | mov DWORD PTR 20[edi],eax | ||
191 | mov esi, edx | ||
192 | jz $L003maw_end | ||
193 | ; Tail Round 6 | ||
194 | mov eax, DWORD PTR 24[ebx] | ||
195 | mul ebp | ||
196 | add eax, esi | ||
197 | mov esi, DWORD PTR 24[edi] | ||
198 | adc edx, 0 | ||
199 | add eax, esi | ||
200 | adc edx, 0 | ||
201 | mov DWORD PTR 24[edi],eax | ||
202 | mov esi, edx | ||
203 | $L003maw_end: | ||
204 | mov eax, esi | ||
205 | pop ecx | ||
206 | pop edi | ||
207 | pop esi | ||
208 | pop ebx | ||
209 | pop ebp | ||
210 | ret | ||
211 | _bn_mul_add_words ENDP | ||
212 | _TEXT ENDS | ||
213 | _TEXT SEGMENT | ||
214 | PUBLIC _bn_mul_words | ||
215 | |||
216 | _bn_mul_words PROC NEAR | ||
217 | push ebp | ||
218 | push ebx | ||
219 | push esi | ||
220 | push edi | ||
221 | ; | ||
222 | xor esi, esi | ||
223 | mov edi, DWORD PTR 20[esp] | ||
224 | mov ebx, DWORD PTR 24[esp] | ||
225 | mov ebp, DWORD PTR 28[esp] | ||
226 | mov ecx, DWORD PTR 32[esp] | ||
227 | and ebp, 4294967288 | ||
228 | jz $L004mw_finish | ||
229 | L005mw_loop: | ||
230 | ; Round 0 | ||
231 | mov eax, DWORD PTR [ebx] | ||
232 | mul ecx | ||
233 | add eax, esi | ||
234 | adc edx, 0 | ||
235 | mov DWORD PTR [edi],eax | ||
236 | mov esi, edx | ||
237 | ; Round 4 | ||
238 | mov eax, DWORD PTR 4[ebx] | ||
239 | mul ecx | ||
240 | add eax, esi | ||
241 | adc edx, 0 | ||
242 | mov DWORD PTR 4[edi],eax | ||
243 | mov esi, edx | ||
244 | ; Round 8 | ||
245 | mov eax, DWORD PTR 8[ebx] | ||
246 | mul ecx | ||
247 | add eax, esi | ||
248 | adc edx, 0 | ||
249 | mov DWORD PTR 8[edi],eax | ||
250 | mov esi, edx | ||
251 | ; Round 12 | ||
252 | mov eax, DWORD PTR 12[ebx] | ||
253 | mul ecx | ||
254 | add eax, esi | ||
255 | adc edx, 0 | ||
256 | mov DWORD PTR 12[edi],eax | ||
257 | mov esi, edx | ||
258 | ; Round 16 | ||
259 | mov eax, DWORD PTR 16[ebx] | ||
260 | mul ecx | ||
261 | add eax, esi | ||
262 | adc edx, 0 | ||
263 | mov DWORD PTR 16[edi],eax | ||
264 | mov esi, edx | ||
265 | ; Round 20 | ||
266 | mov eax, DWORD PTR 20[ebx] | ||
267 | mul ecx | ||
268 | add eax, esi | ||
269 | adc edx, 0 | ||
270 | mov DWORD PTR 20[edi],eax | ||
271 | mov esi, edx | ||
272 | ; Round 24 | ||
273 | mov eax, DWORD PTR 24[ebx] | ||
274 | mul ecx | ||
275 | add eax, esi | ||
276 | adc edx, 0 | ||
277 | mov DWORD PTR 24[edi],eax | ||
278 | mov esi, edx | ||
279 | ; Round 28 | ||
280 | mov eax, DWORD PTR 28[ebx] | ||
281 | mul ecx | ||
282 | add eax, esi | ||
283 | adc edx, 0 | ||
284 | mov DWORD PTR 28[edi],eax | ||
285 | mov esi, edx | ||
286 | ; | ||
287 | add ebx, 32 | ||
288 | add edi, 32 | ||
289 | sub ebp, 8 | ||
290 | jz $L004mw_finish | ||
291 | jmp L005mw_loop | ||
292 | $L004mw_finish: | ||
293 | mov ebp, DWORD PTR 28[esp] | ||
294 | and ebp, 7 | ||
295 | jnz $L006mw_finish2 | ||
296 | jmp $L007mw_end | ||
297 | $L006mw_finish2: | ||
298 | ; Tail Round 0 | ||
299 | mov eax, DWORD PTR [ebx] | ||
300 | mul ecx | ||
301 | add eax, esi | ||
302 | adc edx, 0 | ||
303 | mov DWORD PTR [edi],eax | ||
304 | mov esi, edx | ||
305 | dec ebp | ||
306 | jz $L007mw_end | ||
307 | ; Tail Round 1 | ||
308 | mov eax, DWORD PTR 4[ebx] | ||
309 | mul ecx | ||
310 | add eax, esi | ||
311 | adc edx, 0 | ||
312 | mov DWORD PTR 4[edi],eax | ||
313 | mov esi, edx | ||
314 | dec ebp | ||
315 | jz $L007mw_end | ||
316 | ; Tail Round 2 | ||
317 | mov eax, DWORD PTR 8[ebx] | ||
318 | mul ecx | ||
319 | add eax, esi | ||
320 | adc edx, 0 | ||
321 | mov DWORD PTR 8[edi],eax | ||
322 | mov esi, edx | ||
323 | dec ebp | ||
324 | jz $L007mw_end | ||
325 | ; Tail Round 3 | ||
326 | mov eax, DWORD PTR 12[ebx] | ||
327 | mul ecx | ||
328 | add eax, esi | ||
329 | adc edx, 0 | ||
330 | mov DWORD PTR 12[edi],eax | ||
331 | mov esi, edx | ||
332 | dec ebp | ||
333 | jz $L007mw_end | ||
334 | ; Tail Round 4 | ||
335 | mov eax, DWORD PTR 16[ebx] | ||
336 | mul ecx | ||
337 | add eax, esi | ||
338 | adc edx, 0 | ||
339 | mov DWORD PTR 16[edi],eax | ||
340 | mov esi, edx | ||
341 | dec ebp | ||
342 | jz $L007mw_end | ||
343 | ; Tail Round 5 | ||
344 | mov eax, DWORD PTR 20[ebx] | ||
345 | mul ecx | ||
346 | add eax, esi | ||
347 | adc edx, 0 | ||
348 | mov DWORD PTR 20[edi],eax | ||
349 | mov esi, edx | ||
350 | dec ebp | ||
351 | jz $L007mw_end | ||
352 | ; Tail Round 6 | ||
353 | mov eax, DWORD PTR 24[ebx] | ||
354 | mul ecx | ||
355 | add eax, esi | ||
356 | adc edx, 0 | ||
357 | mov DWORD PTR 24[edi],eax | ||
358 | mov esi, edx | ||
359 | $L007mw_end: | ||
360 | mov eax, esi | ||
361 | pop edi | ||
362 | pop esi | ||
363 | pop ebx | ||
364 | pop ebp | ||
365 | ret | ||
366 | _bn_mul_words ENDP | ||
367 | _TEXT ENDS | ||
368 | _TEXT SEGMENT | ||
369 | PUBLIC _bn_sqr_words | ||
370 | |||
371 | _bn_sqr_words PROC NEAR | ||
372 | push ebp | ||
373 | push ebx | ||
374 | push esi | ||
375 | push edi | ||
376 | ; | ||
377 | mov esi, DWORD PTR 20[esp] | ||
378 | mov edi, DWORD PTR 24[esp] | ||
379 | mov ebx, DWORD PTR 28[esp] | ||
380 | and ebx, 4294967288 | ||
381 | jz $L008sw_finish | ||
382 | L009sw_loop: | ||
383 | ; Round 0 | ||
384 | mov eax, DWORD PTR [edi] | ||
385 | mul eax | ||
386 | mov DWORD PTR [esi],eax | ||
387 | mov DWORD PTR 4[esi],edx | ||
388 | ; Round 4 | ||
389 | mov eax, DWORD PTR 4[edi] | ||
390 | mul eax | ||
391 | mov DWORD PTR 8[esi],eax | ||
392 | mov DWORD PTR 12[esi],edx | ||
393 | ; Round 8 | ||
394 | mov eax, DWORD PTR 8[edi] | ||
395 | mul eax | ||
396 | mov DWORD PTR 16[esi],eax | ||
397 | mov DWORD PTR 20[esi],edx | ||
398 | ; Round 12 | ||
399 | mov eax, DWORD PTR 12[edi] | ||
400 | mul eax | ||
401 | mov DWORD PTR 24[esi],eax | ||
402 | mov DWORD PTR 28[esi],edx | ||
403 | ; Round 16 | ||
404 | mov eax, DWORD PTR 16[edi] | ||
405 | mul eax | ||
406 | mov DWORD PTR 32[esi],eax | ||
407 | mov DWORD PTR 36[esi],edx | ||
408 | ; Round 20 | ||
409 | mov eax, DWORD PTR 20[edi] | ||
410 | mul eax | ||
411 | mov DWORD PTR 40[esi],eax | ||
412 | mov DWORD PTR 44[esi],edx | ||
413 | ; Round 24 | ||
414 | mov eax, DWORD PTR 24[edi] | ||
415 | mul eax | ||
416 | mov DWORD PTR 48[esi],eax | ||
417 | mov DWORD PTR 52[esi],edx | ||
418 | ; Round 28 | ||
419 | mov eax, DWORD PTR 28[edi] | ||
420 | mul eax | ||
421 | mov DWORD PTR 56[esi],eax | ||
422 | mov DWORD PTR 60[esi],edx | ||
423 | ; | ||
424 | add edi, 32 | ||
425 | add esi, 64 | ||
426 | sub ebx, 8 | ||
427 | jnz L009sw_loop | ||
428 | $L008sw_finish: | ||
429 | mov ebx, DWORD PTR 28[esp] | ||
430 | and ebx, 7 | ||
431 | jz $L010sw_end | ||
432 | ; Tail Round 0 | ||
433 | mov eax, DWORD PTR [edi] | ||
434 | mul eax | ||
435 | mov DWORD PTR [esi],eax | ||
436 | dec ebx | ||
437 | mov DWORD PTR 4[esi],edx | ||
438 | jz $L010sw_end | ||
439 | ; Tail Round 1 | ||
440 | mov eax, DWORD PTR 4[edi] | ||
441 | mul eax | ||
442 | mov DWORD PTR 8[esi],eax | ||
443 | dec ebx | ||
444 | mov DWORD PTR 12[esi],edx | ||
445 | jz $L010sw_end | ||
446 | ; Tail Round 2 | ||
447 | mov eax, DWORD PTR 8[edi] | ||
448 | mul eax | ||
449 | mov DWORD PTR 16[esi],eax | ||
450 | dec ebx | ||
451 | mov DWORD PTR 20[esi],edx | ||
452 | jz $L010sw_end | ||
453 | ; Tail Round 3 | ||
454 | mov eax, DWORD PTR 12[edi] | ||
455 | mul eax | ||
456 | mov DWORD PTR 24[esi],eax | ||
457 | dec ebx | ||
458 | mov DWORD PTR 28[esi],edx | ||
459 | jz $L010sw_end | ||
460 | ; Tail Round 4 | ||
461 | mov eax, DWORD PTR 16[edi] | ||
462 | mul eax | ||
463 | mov DWORD PTR 32[esi],eax | ||
464 | dec ebx | ||
465 | mov DWORD PTR 36[esi],edx | ||
466 | jz $L010sw_end | ||
467 | ; Tail Round 5 | ||
468 | mov eax, DWORD PTR 20[edi] | ||
469 | mul eax | ||
470 | mov DWORD PTR 40[esi],eax | ||
471 | dec ebx | ||
472 | mov DWORD PTR 44[esi],edx | ||
473 | jz $L010sw_end | ||
474 | ; Tail Round 6 | ||
475 | mov eax, DWORD PTR 24[edi] | ||
476 | mul eax | ||
477 | mov DWORD PTR 48[esi],eax | ||
478 | mov DWORD PTR 52[esi],edx | ||
479 | $L010sw_end: | ||
480 | pop edi | ||
481 | pop esi | ||
482 | pop ebx | ||
483 | pop ebp | ||
484 | ret | ||
485 | _bn_sqr_words ENDP | ||
486 | _TEXT ENDS | ||
487 | _TEXT SEGMENT | ||
488 | PUBLIC _bn_div_words | ||
489 | |||
490 | _bn_div_words PROC NEAR | ||
491 | push ebp | ||
492 | push ebx | ||
493 | push esi | ||
494 | push edi | ||
495 | mov edx, DWORD PTR 20[esp] | ||
496 | mov eax, DWORD PTR 24[esp] | ||
497 | mov ebx, DWORD PTR 28[esp] | ||
498 | div ebx | ||
499 | pop edi | ||
500 | pop esi | ||
501 | pop ebx | ||
502 | pop ebp | ||
503 | ret | ||
504 | _bn_div_words ENDP | ||
505 | _TEXT ENDS | ||
506 | _TEXT SEGMENT | ||
507 | PUBLIC _bn_add_words | ||
508 | |||
509 | _bn_add_words PROC NEAR | ||
510 | push ebp | ||
511 | push ebx | ||
512 | push esi | ||
513 | push edi | ||
514 | ; | ||
515 | mov ebx, DWORD PTR 20[esp] | ||
516 | mov esi, DWORD PTR 24[esp] | ||
517 | mov edi, DWORD PTR 28[esp] | ||
518 | mov ebp, DWORD PTR 32[esp] | ||
519 | xor eax, eax | ||
520 | and ebp, 4294967288 | ||
521 | jz $L011aw_finish | ||
522 | L012aw_loop: | ||
523 | ; Round 0 | ||
524 | mov ecx, DWORD PTR [esi] | ||
525 | mov edx, DWORD PTR [edi] | ||
526 | add ecx, eax | ||
527 | mov eax, 0 | ||
528 | adc eax, eax | ||
529 | add ecx, edx | ||
530 | adc eax, 0 | ||
531 | mov DWORD PTR [ebx],ecx | ||
532 | ; Round 1 | ||
533 | mov ecx, DWORD PTR 4[esi] | ||
534 | mov edx, DWORD PTR 4[edi] | ||
535 | add ecx, eax | ||
536 | mov eax, 0 | ||
537 | adc eax, eax | ||
538 | add ecx, edx | ||
539 | adc eax, 0 | ||
540 | mov DWORD PTR 4[ebx],ecx | ||
541 | ; Round 2 | ||
542 | mov ecx, DWORD PTR 8[esi] | ||
543 | mov edx, DWORD PTR 8[edi] | ||
544 | add ecx, eax | ||
545 | mov eax, 0 | ||
546 | adc eax, eax | ||
547 | add ecx, edx | ||
548 | adc eax, 0 | ||
549 | mov DWORD PTR 8[ebx],ecx | ||
550 | ; Round 3 | ||
551 | mov ecx, DWORD PTR 12[esi] | ||
552 | mov edx, DWORD PTR 12[edi] | ||
553 | add ecx, eax | ||
554 | mov eax, 0 | ||
555 | adc eax, eax | ||
556 | add ecx, edx | ||
557 | adc eax, 0 | ||
558 | mov DWORD PTR 12[ebx],ecx | ||
559 | ; Round 4 | ||
560 | mov ecx, DWORD PTR 16[esi] | ||
561 | mov edx, DWORD PTR 16[edi] | ||
562 | add ecx, eax | ||
563 | mov eax, 0 | ||
564 | adc eax, eax | ||
565 | add ecx, edx | ||
566 | adc eax, 0 | ||
567 | mov DWORD PTR 16[ebx],ecx | ||
568 | ; Round 5 | ||
569 | mov ecx, DWORD PTR 20[esi] | ||
570 | mov edx, DWORD PTR 20[edi] | ||
571 | add ecx, eax | ||
572 | mov eax, 0 | ||
573 | adc eax, eax | ||
574 | add ecx, edx | ||
575 | adc eax, 0 | ||
576 | mov DWORD PTR 20[ebx],ecx | ||
577 | ; Round 6 | ||
578 | mov ecx, DWORD PTR 24[esi] | ||
579 | mov edx, DWORD PTR 24[edi] | ||
580 | add ecx, eax | ||
581 | mov eax, 0 | ||
582 | adc eax, eax | ||
583 | add ecx, edx | ||
584 | adc eax, 0 | ||
585 | mov DWORD PTR 24[ebx],ecx | ||
586 | ; Round 7 | ||
587 | mov ecx, DWORD PTR 28[esi] | ||
588 | mov edx, DWORD PTR 28[edi] | ||
589 | add ecx, eax | ||
590 | mov eax, 0 | ||
591 | adc eax, eax | ||
592 | add ecx, edx | ||
593 | adc eax, 0 | ||
594 | mov DWORD PTR 28[ebx],ecx | ||
595 | ; | ||
596 | add esi, 32 | ||
597 | add edi, 32 | ||
598 | add ebx, 32 | ||
599 | sub ebp, 8 | ||
600 | jnz L012aw_loop | ||
601 | $L011aw_finish: | ||
602 | mov ebp, DWORD PTR 32[esp] | ||
603 | and ebp, 7 | ||
604 | jz $L013aw_end | ||
605 | ; Tail Round 0 | ||
606 | mov ecx, DWORD PTR [esi] | ||
607 | mov edx, DWORD PTR [edi] | ||
608 | add ecx, eax | ||
609 | mov eax, 0 | ||
610 | adc eax, eax | ||
611 | add ecx, edx | ||
612 | adc eax, 0 | ||
613 | dec ebp | ||
614 | mov DWORD PTR [ebx],ecx | ||
615 | jz $L013aw_end | ||
616 | ; Tail Round 1 | ||
617 | mov ecx, DWORD PTR 4[esi] | ||
618 | mov edx, DWORD PTR 4[edi] | ||
619 | add ecx, eax | ||
620 | mov eax, 0 | ||
621 | adc eax, eax | ||
622 | add ecx, edx | ||
623 | adc eax, 0 | ||
624 | dec ebp | ||
625 | mov DWORD PTR 4[ebx],ecx | ||
626 | jz $L013aw_end | ||
627 | ; Tail Round 2 | ||
628 | mov ecx, DWORD PTR 8[esi] | ||
629 | mov edx, DWORD PTR 8[edi] | ||
630 | add ecx, eax | ||
631 | mov eax, 0 | ||
632 | adc eax, eax | ||
633 | add ecx, edx | ||
634 | adc eax, 0 | ||
635 | dec ebp | ||
636 | mov DWORD PTR 8[ebx],ecx | ||
637 | jz $L013aw_end | ||
638 | ; Tail Round 3 | ||
639 | mov ecx, DWORD PTR 12[esi] | ||
640 | mov edx, DWORD PTR 12[edi] | ||
641 | add ecx, eax | ||
642 | mov eax, 0 | ||
643 | adc eax, eax | ||
644 | add ecx, edx | ||
645 | adc eax, 0 | ||
646 | dec ebp | ||
647 | mov DWORD PTR 12[ebx],ecx | ||
648 | jz $L013aw_end | ||
649 | ; Tail Round 4 | ||
650 | mov ecx, DWORD PTR 16[esi] | ||
651 | mov edx, DWORD PTR 16[edi] | ||
652 | add ecx, eax | ||
653 | mov eax, 0 | ||
654 | adc eax, eax | ||
655 | add ecx, edx | ||
656 | adc eax, 0 | ||
657 | dec ebp | ||
658 | mov DWORD PTR 16[ebx],ecx | ||
659 | jz $L013aw_end | ||
660 | ; Tail Round 5 | ||
661 | mov ecx, DWORD PTR 20[esi] | ||
662 | mov edx, DWORD PTR 20[edi] | ||
663 | add ecx, eax | ||
664 | mov eax, 0 | ||
665 | adc eax, eax | ||
666 | add ecx, edx | ||
667 | adc eax, 0 | ||
668 | dec ebp | ||
669 | mov DWORD PTR 20[ebx],ecx | ||
670 | jz $L013aw_end | ||
671 | ; Tail Round 6 | ||
672 | mov ecx, DWORD PTR 24[esi] | ||
673 | mov edx, DWORD PTR 24[edi] | ||
674 | add ecx, eax | ||
675 | mov eax, 0 | ||
676 | adc eax, eax | ||
677 | add ecx, edx | ||
678 | adc eax, 0 | ||
679 | mov DWORD PTR 24[ebx],ecx | ||
680 | $L013aw_end: | ||
681 | pop edi | ||
682 | pop esi | ||
683 | pop ebx | ||
684 | pop ebp | ||
685 | ret | ||
686 | _bn_add_words ENDP | ||
687 | _TEXT ENDS | ||
688 | _TEXT SEGMENT | ||
689 | PUBLIC _bn_sub_words | ||
690 | |||
691 | _bn_sub_words PROC NEAR | ||
692 | push ebp | ||
693 | push ebx | ||
694 | push esi | ||
695 | push edi | ||
696 | ; | ||
697 | mov ebx, DWORD PTR 20[esp] | ||
698 | mov esi, DWORD PTR 24[esp] | ||
699 | mov edi, DWORD PTR 28[esp] | ||
700 | mov ebp, DWORD PTR 32[esp] | ||
701 | xor eax, eax | ||
702 | and ebp, 4294967288 | ||
703 | jz $L014aw_finish | ||
704 | L015aw_loop: | ||
705 | ; Round 0 | ||
706 | mov ecx, DWORD PTR [esi] | ||
707 | mov edx, DWORD PTR [edi] | ||
708 | sub ecx, eax | ||
709 | mov eax, 0 | ||
710 | adc eax, eax | ||
711 | sub ecx, edx | ||
712 | adc eax, 0 | ||
713 | mov DWORD PTR [ebx],ecx | ||
714 | ; Round 1 | ||
715 | mov ecx, DWORD PTR 4[esi] | ||
716 | mov edx, DWORD PTR 4[edi] | ||
717 | sub ecx, eax | ||
718 | mov eax, 0 | ||
719 | adc eax, eax | ||
720 | sub ecx, edx | ||
721 | adc eax, 0 | ||
722 | mov DWORD PTR 4[ebx],ecx | ||
723 | ; Round 2 | ||
724 | mov ecx, DWORD PTR 8[esi] | ||
725 | mov edx, DWORD PTR 8[edi] | ||
726 | sub ecx, eax | ||
727 | mov eax, 0 | ||
728 | adc eax, eax | ||
729 | sub ecx, edx | ||
730 | adc eax, 0 | ||
731 | mov DWORD PTR 8[ebx],ecx | ||
732 | ; Round 3 | ||
733 | mov ecx, DWORD PTR 12[esi] | ||
734 | mov edx, DWORD PTR 12[edi] | ||
735 | sub ecx, eax | ||
736 | mov eax, 0 | ||
737 | adc eax, eax | ||
738 | sub ecx, edx | ||
739 | adc eax, 0 | ||
740 | mov DWORD PTR 12[ebx],ecx | ||
741 | ; Round 4 | ||
742 | mov ecx, DWORD PTR 16[esi] | ||
743 | mov edx, DWORD PTR 16[edi] | ||
744 | sub ecx, eax | ||
745 | mov eax, 0 | ||
746 | adc eax, eax | ||
747 | sub ecx, edx | ||
748 | adc eax, 0 | ||
749 | mov DWORD PTR 16[ebx],ecx | ||
750 | ; Round 5 | ||
751 | mov ecx, DWORD PTR 20[esi] | ||
752 | mov edx, DWORD PTR 20[edi] | ||
753 | sub ecx, eax | ||
754 | mov eax, 0 | ||
755 | adc eax, eax | ||
756 | sub ecx, edx | ||
757 | adc eax, 0 | ||
758 | mov DWORD PTR 20[ebx],ecx | ||
759 | ; Round 6 | ||
760 | mov ecx, DWORD PTR 24[esi] | ||
761 | mov edx, DWORD PTR 24[edi] | ||
762 | sub ecx, eax | ||
763 | mov eax, 0 | ||
764 | adc eax, eax | ||
765 | sub ecx, edx | ||
766 | adc eax, 0 | ||
767 | mov DWORD PTR 24[ebx],ecx | ||
768 | ; Round 7 | ||
769 | mov ecx, DWORD PTR 28[esi] | ||
770 | mov edx, DWORD PTR 28[edi] | ||
771 | sub ecx, eax | ||
772 | mov eax, 0 | ||
773 | adc eax, eax | ||
774 | sub ecx, edx | ||
775 | adc eax, 0 | ||
776 | mov DWORD PTR 28[ebx],ecx | ||
777 | ; | ||
778 | add esi, 32 | ||
779 | add edi, 32 | ||
780 | add ebx, 32 | ||
781 | sub ebp, 8 | ||
782 | jnz L015aw_loop | ||
783 | $L014aw_finish: | ||
784 | mov ebp, DWORD PTR 32[esp] | ||
785 | and ebp, 7 | ||
786 | jz $L016aw_end | ||
787 | ; Tail Round 0 | ||
788 | mov ecx, DWORD PTR [esi] | ||
789 | mov edx, DWORD PTR [edi] | ||
790 | sub ecx, eax | ||
791 | mov eax, 0 | ||
792 | adc eax, eax | ||
793 | sub ecx, edx | ||
794 | adc eax, 0 | ||
795 | dec ebp | ||
796 | mov DWORD PTR [ebx],ecx | ||
797 | jz $L016aw_end | ||
798 | ; Tail Round 1 | ||
799 | mov ecx, DWORD PTR 4[esi] | ||
800 | mov edx, DWORD PTR 4[edi] | ||
801 | sub ecx, eax | ||
802 | mov eax, 0 | ||
803 | adc eax, eax | ||
804 | sub ecx, edx | ||
805 | adc eax, 0 | ||
806 | dec ebp | ||
807 | mov DWORD PTR 4[ebx],ecx | ||
808 | jz $L016aw_end | ||
809 | ; Tail Round 2 | ||
810 | mov ecx, DWORD PTR 8[esi] | ||
811 | mov edx, DWORD PTR 8[edi] | ||
812 | sub ecx, eax | ||
813 | mov eax, 0 | ||
814 | adc eax, eax | ||
815 | sub ecx, edx | ||
816 | adc eax, 0 | ||
817 | dec ebp | ||
818 | mov DWORD PTR 8[ebx],ecx | ||
819 | jz $L016aw_end | ||
820 | ; Tail Round 3 | ||
821 | mov ecx, DWORD PTR 12[esi] | ||
822 | mov edx, DWORD PTR 12[edi] | ||
823 | sub ecx, eax | ||
824 | mov eax, 0 | ||
825 | adc eax, eax | ||
826 | sub ecx, edx | ||
827 | adc eax, 0 | ||
828 | dec ebp | ||
829 | mov DWORD PTR 12[ebx],ecx | ||
830 | jz $L016aw_end | ||
831 | ; Tail Round 4 | ||
832 | mov ecx, DWORD PTR 16[esi] | ||
833 | mov edx, DWORD PTR 16[edi] | ||
834 | sub ecx, eax | ||
835 | mov eax, 0 | ||
836 | adc eax, eax | ||
837 | sub ecx, edx | ||
838 | adc eax, 0 | ||
839 | dec ebp | ||
840 | mov DWORD PTR 16[ebx],ecx | ||
841 | jz $L016aw_end | ||
842 | ; Tail Round 5 | ||
843 | mov ecx, DWORD PTR 20[esi] | ||
844 | mov edx, DWORD PTR 20[edi] | ||
845 | sub ecx, eax | ||
846 | mov eax, 0 | ||
847 | adc eax, eax | ||
848 | sub ecx, edx | ||
849 | adc eax, 0 | ||
850 | dec ebp | ||
851 | mov DWORD PTR 20[ebx],ecx | ||
852 | jz $L016aw_end | ||
853 | ; Tail Round 6 | ||
854 | mov ecx, DWORD PTR 24[esi] | ||
855 | mov edx, DWORD PTR 24[edi] | ||
856 | sub ecx, eax | ||
857 | mov eax, 0 | ||
858 | adc eax, eax | ||
859 | sub ecx, edx | ||
860 | adc eax, 0 | ||
861 | mov DWORD PTR 24[ebx],ecx | ||
862 | $L016aw_end: | ||
863 | pop edi | ||
864 | pop esi | ||
865 | pop ebx | ||
866 | pop ebp | ||
867 | ret | ||
868 | _bn_sub_words ENDP | ||
869 | _TEXT ENDS | ||
870 | _TEXT SEGMENT | ||
871 | PUBLIC _bn_mul_comba8 | ||
872 | |||
873 | _bn_mul_comba8 PROC NEAR | ||
874 | push esi | ||
875 | mov esi, DWORD PTR 12[esp] | ||
876 | push edi | ||
877 | mov edi, DWORD PTR 20[esp] | ||
878 | push ebp | ||
879 | push ebx | ||
880 | xor ebx, ebx | ||
881 | mov eax, DWORD PTR [esi] | ||
882 | xor ecx, ecx | ||
883 | mov edx, DWORD PTR [edi] | ||
884 | ; ################## Calculate word 0 | ||
885 | xor ebp, ebp | ||
886 | ; mul a[0]*b[0] | ||
887 | mul edx | ||
888 | add ebx, eax | ||
889 | mov eax, DWORD PTR 20[esp] | ||
890 | adc ecx, edx | ||
891 | mov edx, DWORD PTR [edi] | ||
892 | adc ebp, 0 | ||
893 | mov DWORD PTR [eax],ebx | ||
894 | mov eax, DWORD PTR 4[esi] | ||
895 | ; saved r[0] | ||
896 | ; ################## Calculate word 1 | ||
897 | xor ebx, ebx | ||
898 | ; mul a[1]*b[0] | ||
899 | mul edx | ||
900 | add ecx, eax | ||
901 | mov eax, DWORD PTR [esi] | ||
902 | adc ebp, edx | ||
903 | mov edx, DWORD PTR 4[edi] | ||
904 | adc ebx, 0 | ||
905 | ; mul a[0]*b[1] | ||
906 | mul edx | ||
907 | add ecx, eax | ||
908 | mov eax, DWORD PTR 20[esp] | ||
909 | adc ebp, edx | ||
910 | mov edx, DWORD PTR [edi] | ||
911 | adc ebx, 0 | ||
912 | mov DWORD PTR 4[eax],ecx | ||
913 | mov eax, DWORD PTR 8[esi] | ||
914 | ; saved r[1] | ||
915 | ; ################## Calculate word 2 | ||
916 | xor ecx, ecx | ||
917 | ; mul a[2]*b[0] | ||
918 | mul edx | ||
919 | add ebp, eax | ||
920 | mov eax, DWORD PTR 4[esi] | ||
921 | adc ebx, edx | ||
922 | mov edx, DWORD PTR 4[edi] | ||
923 | adc ecx, 0 | ||
924 | ; mul a[1]*b[1] | ||
925 | mul edx | ||
926 | add ebp, eax | ||
927 | mov eax, DWORD PTR [esi] | ||
928 | adc ebx, edx | ||
929 | mov edx, DWORD PTR 8[edi] | ||
930 | adc ecx, 0 | ||
931 | ; mul a[0]*b[2] | ||
932 | mul edx | ||
933 | add ebp, eax | ||
934 | mov eax, DWORD PTR 20[esp] | ||
935 | adc ebx, edx | ||
936 | mov edx, DWORD PTR [edi] | ||
937 | adc ecx, 0 | ||
938 | mov DWORD PTR 8[eax],ebp | ||
939 | mov eax, DWORD PTR 12[esi] | ||
940 | ; saved r[2] | ||
941 | ; ################## Calculate word 3 | ||
942 | xor ebp, ebp | ||
943 | ; mul a[3]*b[0] | ||
944 | mul edx | ||
945 | add ebx, eax | ||
946 | mov eax, DWORD PTR 8[esi] | ||
947 | adc ecx, edx | ||
948 | mov edx, DWORD PTR 4[edi] | ||
949 | adc ebp, 0 | ||
950 | ; mul a[2]*b[1] | ||
951 | mul edx | ||
952 | add ebx, eax | ||
953 | mov eax, DWORD PTR 4[esi] | ||
954 | adc ecx, edx | ||
955 | mov edx, DWORD PTR 8[edi] | ||
956 | adc ebp, 0 | ||
957 | ; mul a[1]*b[2] | ||
958 | mul edx | ||
959 | add ebx, eax | ||
960 | mov eax, DWORD PTR [esi] | ||
961 | adc ecx, edx | ||
962 | mov edx, DWORD PTR 12[edi] | ||
963 | adc ebp, 0 | ||
964 | ; mul a[0]*b[3] | ||
965 | mul edx | ||
966 | add ebx, eax | ||
967 | mov eax, DWORD PTR 20[esp] | ||
968 | adc ecx, edx | ||
969 | mov edx, DWORD PTR [edi] | ||
970 | adc ebp, 0 | ||
971 | mov DWORD PTR 12[eax],ebx | ||
972 | mov eax, DWORD PTR 16[esi] | ||
973 | ; saved r[3] | ||
974 | ; ################## Calculate word 4 | ||
975 | xor ebx, ebx | ||
976 | ; mul a[4]*b[0] | ||
977 | mul edx | ||
978 | add ecx, eax | ||
979 | mov eax, DWORD PTR 12[esi] | ||
980 | adc ebp, edx | ||
981 | mov edx, DWORD PTR 4[edi] | ||
982 | adc ebx, 0 | ||
983 | ; mul a[3]*b[1] | ||
984 | mul edx | ||
985 | add ecx, eax | ||
986 | mov eax, DWORD PTR 8[esi] | ||
987 | adc ebp, edx | ||
988 | mov edx, DWORD PTR 8[edi] | ||
989 | adc ebx, 0 | ||
990 | ; mul a[2]*b[2] | ||
991 | mul edx | ||
992 | add ecx, eax | ||
993 | mov eax, DWORD PTR 4[esi] | ||
994 | adc ebp, edx | ||
995 | mov edx, DWORD PTR 12[edi] | ||
996 | adc ebx, 0 | ||
997 | ; mul a[1]*b[3] | ||
998 | mul edx | ||
999 | add ecx, eax | ||
1000 | mov eax, DWORD PTR [esi] | ||
1001 | adc ebp, edx | ||
1002 | mov edx, DWORD PTR 16[edi] | ||
1003 | adc ebx, 0 | ||
1004 | ; mul a[0]*b[4] | ||
1005 | mul edx | ||
1006 | add ecx, eax | ||
1007 | mov eax, DWORD PTR 20[esp] | ||
1008 | adc ebp, edx | ||
1009 | mov edx, DWORD PTR [edi] | ||
1010 | adc ebx, 0 | ||
1011 | mov DWORD PTR 16[eax],ecx | ||
1012 | mov eax, DWORD PTR 20[esi] | ||
1013 | ; saved r[4] | ||
1014 | ; ################## Calculate word 5 | ||
1015 | xor ecx, ecx | ||
1016 | ; mul a[5]*b[0] | ||
1017 | mul edx | ||
1018 | add ebp, eax | ||
1019 | mov eax, DWORD PTR 16[esi] | ||
1020 | adc ebx, edx | ||
1021 | mov edx, DWORD PTR 4[edi] | ||
1022 | adc ecx, 0 | ||
1023 | ; mul a[4]*b[1] | ||
1024 | mul edx | ||
1025 | add ebp, eax | ||
1026 | mov eax, DWORD PTR 12[esi] | ||
1027 | adc ebx, edx | ||
1028 | mov edx, DWORD PTR 8[edi] | ||
1029 | adc ecx, 0 | ||
1030 | ; mul a[3]*b[2] | ||
1031 | mul edx | ||
1032 | add ebp, eax | ||
1033 | mov eax, DWORD PTR 8[esi] | ||
1034 | adc ebx, edx | ||
1035 | mov edx, DWORD PTR 12[edi] | ||
1036 | adc ecx, 0 | ||
1037 | ; mul a[2]*b[3] | ||
1038 | mul edx | ||
1039 | add ebp, eax | ||
1040 | mov eax, DWORD PTR 4[esi] | ||
1041 | adc ebx, edx | ||
1042 | mov edx, DWORD PTR 16[edi] | ||
1043 | adc ecx, 0 | ||
1044 | ; mul a[1]*b[4] | ||
1045 | mul edx | ||
1046 | add ebp, eax | ||
1047 | mov eax, DWORD PTR [esi] | ||
1048 | adc ebx, edx | ||
1049 | mov edx, DWORD PTR 20[edi] | ||
1050 | adc ecx, 0 | ||
1051 | ; mul a[0]*b[5] | ||
1052 | mul edx | ||
1053 | add ebp, eax | ||
1054 | mov eax, DWORD PTR 20[esp] | ||
1055 | adc ebx, edx | ||
1056 | mov edx, DWORD PTR [edi] | ||
1057 | adc ecx, 0 | ||
1058 | mov DWORD PTR 20[eax],ebp | ||
1059 | mov eax, DWORD PTR 24[esi] | ||
1060 | ; saved r[5] | ||
1061 | ; ################## Calculate word 6 | ||
1062 | xor ebp, ebp | ||
1063 | ; mul a[6]*b[0] | ||
1064 | mul edx | ||
1065 | add ebx, eax | ||
1066 | mov eax, DWORD PTR 20[esi] | ||
1067 | adc ecx, edx | ||
1068 | mov edx, DWORD PTR 4[edi] | ||
1069 | adc ebp, 0 | ||
1070 | ; mul a[5]*b[1] | ||
1071 | mul edx | ||
1072 | add ebx, eax | ||
1073 | mov eax, DWORD PTR 16[esi] | ||
1074 | adc ecx, edx | ||
1075 | mov edx, DWORD PTR 8[edi] | ||
1076 | adc ebp, 0 | ||
1077 | ; mul a[4]*b[2] | ||
1078 | mul edx | ||
1079 | add ebx, eax | ||
1080 | mov eax, DWORD PTR 12[esi] | ||
1081 | adc ecx, edx | ||
1082 | mov edx, DWORD PTR 12[edi] | ||
1083 | adc ebp, 0 | ||
1084 | ; mul a[3]*b[3] | ||
1085 | mul edx | ||
1086 | add ebx, eax | ||
1087 | mov eax, DWORD PTR 8[esi] | ||
1088 | adc ecx, edx | ||
1089 | mov edx, DWORD PTR 16[edi] | ||
1090 | adc ebp, 0 | ||
1091 | ; mul a[2]*b[4] | ||
1092 | mul edx | ||
1093 | add ebx, eax | ||
1094 | mov eax, DWORD PTR 4[esi] | ||
1095 | adc ecx, edx | ||
1096 | mov edx, DWORD PTR 20[edi] | ||
1097 | adc ebp, 0 | ||
1098 | ; mul a[1]*b[5] | ||
1099 | mul edx | ||
1100 | add ebx, eax | ||
1101 | mov eax, DWORD PTR [esi] | ||
1102 | adc ecx, edx | ||
1103 | mov edx, DWORD PTR 24[edi] | ||
1104 | adc ebp, 0 | ||
1105 | ; mul a[0]*b[6] | ||
1106 | mul edx | ||
1107 | add ebx, eax | ||
1108 | mov eax, DWORD PTR 20[esp] | ||
1109 | adc ecx, edx | ||
1110 | mov edx, DWORD PTR [edi] | ||
1111 | adc ebp, 0 | ||
1112 | mov DWORD PTR 24[eax],ebx | ||
1113 | mov eax, DWORD PTR 28[esi] | ||
1114 | ; saved r[6] | ||
1115 | ; ################## Calculate word 7 | ||
1116 | xor ebx, ebx | ||
1117 | ; mul a[7]*b[0] | ||
1118 | mul edx | ||
1119 | add ecx, eax | ||
1120 | mov eax, DWORD PTR 24[esi] | ||
1121 | adc ebp, edx | ||
1122 | mov edx, DWORD PTR 4[edi] | ||
1123 | adc ebx, 0 | ||
1124 | ; mul a[6]*b[1] | ||
1125 | mul edx | ||
1126 | add ecx, eax | ||
1127 | mov eax, DWORD PTR 20[esi] | ||
1128 | adc ebp, edx | ||
1129 | mov edx, DWORD PTR 8[edi] | ||
1130 | adc ebx, 0 | ||
1131 | ; mul a[5]*b[2] | ||
1132 | mul edx | ||
1133 | add ecx, eax | ||
1134 | mov eax, DWORD PTR 16[esi] | ||
1135 | adc ebp, edx | ||
1136 | mov edx, DWORD PTR 12[edi] | ||
1137 | adc ebx, 0 | ||
1138 | ; mul a[4]*b[3] | ||
1139 | mul edx | ||
1140 | add ecx, eax | ||
1141 | mov eax, DWORD PTR 12[esi] | ||
1142 | adc ebp, edx | ||
1143 | mov edx, DWORD PTR 16[edi] | ||
1144 | adc ebx, 0 | ||
1145 | ; mul a[3]*b[4] | ||
1146 | mul edx | ||
1147 | add ecx, eax | ||
1148 | mov eax, DWORD PTR 8[esi] | ||
1149 | adc ebp, edx | ||
1150 | mov edx, DWORD PTR 20[edi] | ||
1151 | adc ebx, 0 | ||
1152 | ; mul a[2]*b[5] | ||
1153 | mul edx | ||
1154 | add ecx, eax | ||
1155 | mov eax, DWORD PTR 4[esi] | ||
1156 | adc ebp, edx | ||
1157 | mov edx, DWORD PTR 24[edi] | ||
1158 | adc ebx, 0 | ||
1159 | ; mul a[1]*b[6] | ||
1160 | mul edx | ||
1161 | add ecx, eax | ||
1162 | mov eax, DWORD PTR [esi] | ||
1163 | adc ebp, edx | ||
1164 | mov edx, DWORD PTR 28[edi] | ||
1165 | adc ebx, 0 | ||
1166 | ; mul a[0]*b[7] | ||
1167 | mul edx | ||
1168 | add ecx, eax | ||
1169 | mov eax, DWORD PTR 20[esp] | ||
1170 | adc ebp, edx | ||
1171 | mov edx, DWORD PTR 4[edi] | ||
1172 | adc ebx, 0 | ||
1173 | mov DWORD PTR 28[eax],ecx | ||
1174 | mov eax, DWORD PTR 28[esi] | ||
1175 | ; saved r[7] | ||
1176 | ; ################## Calculate word 8 | ||
1177 | xor ecx, ecx | ||
1178 | ; mul a[7]*b[1] | ||
1179 | mul edx | ||
1180 | add ebp, eax | ||
1181 | mov eax, DWORD PTR 24[esi] | ||
1182 | adc ebx, edx | ||
1183 | mov edx, DWORD PTR 8[edi] | ||
1184 | adc ecx, 0 | ||
1185 | ; mul a[6]*b[2] | ||
1186 | mul edx | ||
1187 | add ebp, eax | ||
1188 | mov eax, DWORD PTR 20[esi] | ||
1189 | adc ebx, edx | ||
1190 | mov edx, DWORD PTR 12[edi] | ||
1191 | adc ecx, 0 | ||
1192 | ; mul a[5]*b[3] | ||
1193 | mul edx | ||
1194 | add ebp, eax | ||
1195 | mov eax, DWORD PTR 16[esi] | ||
1196 | adc ebx, edx | ||
1197 | mov edx, DWORD PTR 16[edi] | ||
1198 | adc ecx, 0 | ||
1199 | ; mul a[4]*b[4] | ||
1200 | mul edx | ||
1201 | add ebp, eax | ||
1202 | mov eax, DWORD PTR 12[esi] | ||
1203 | adc ebx, edx | ||
1204 | mov edx, DWORD PTR 20[edi] | ||
1205 | adc ecx, 0 | ||
1206 | ; mul a[3]*b[5] | ||
1207 | mul edx | ||
1208 | add ebp, eax | ||
1209 | mov eax, DWORD PTR 8[esi] | ||
1210 | adc ebx, edx | ||
1211 | mov edx, DWORD PTR 24[edi] | ||
1212 | adc ecx, 0 | ||
1213 | ; mul a[2]*b[6] | ||
1214 | mul edx | ||
1215 | add ebp, eax | ||
1216 | mov eax, DWORD PTR 4[esi] | ||
1217 | adc ebx, edx | ||
1218 | mov edx, DWORD PTR 28[edi] | ||
1219 | adc ecx, 0 | ||
1220 | ; mul a[1]*b[7] | ||
1221 | mul edx | ||
1222 | add ebp, eax | ||
1223 | mov eax, DWORD PTR 20[esp] | ||
1224 | adc ebx, edx | ||
1225 | mov edx, DWORD PTR 8[edi] | ||
1226 | adc ecx, 0 | ||
1227 | mov DWORD PTR 32[eax],ebp | ||
1228 | mov eax, DWORD PTR 28[esi] | ||
1229 | ; saved r[8] | ||
1230 | ; ################## Calculate word 9 | ||
1231 | xor ebp, ebp | ||
1232 | ; mul a[7]*b[2] | ||
1233 | mul edx | ||
1234 | add ebx, eax | ||
1235 | mov eax, DWORD PTR 24[esi] | ||
1236 | adc ecx, edx | ||
1237 | mov edx, DWORD PTR 12[edi] | ||
1238 | adc ebp, 0 | ||
1239 | ; mul a[6]*b[3] | ||
1240 | mul edx | ||
1241 | add ebx, eax | ||
1242 | mov eax, DWORD PTR 20[esi] | ||
1243 | adc ecx, edx | ||
1244 | mov edx, DWORD PTR 16[edi] | ||
1245 | adc ebp, 0 | ||
1246 | ; mul a[5]*b[4] | ||
1247 | mul edx | ||
1248 | add ebx, eax | ||
1249 | mov eax, DWORD PTR 16[esi] | ||
1250 | adc ecx, edx | ||
1251 | mov edx, DWORD PTR 20[edi] | ||
1252 | adc ebp, 0 | ||
1253 | ; mul a[4]*b[5] | ||
1254 | mul edx | ||
1255 | add ebx, eax | ||
1256 | mov eax, DWORD PTR 12[esi] | ||
1257 | adc ecx, edx | ||
1258 | mov edx, DWORD PTR 24[edi] | ||
1259 | adc ebp, 0 | ||
1260 | ; mul a[3]*b[6] | ||
1261 | mul edx | ||
1262 | add ebx, eax | ||
1263 | mov eax, DWORD PTR 8[esi] | ||
1264 | adc ecx, edx | ||
1265 | mov edx, DWORD PTR 28[edi] | ||
1266 | adc ebp, 0 | ||
1267 | ; mul a[2]*b[7] | ||
1268 | mul edx | ||
1269 | add ebx, eax | ||
1270 | mov eax, DWORD PTR 20[esp] | ||
1271 | adc ecx, edx | ||
1272 | mov edx, DWORD PTR 12[edi] | ||
1273 | adc ebp, 0 | ||
1274 | mov DWORD PTR 36[eax],ebx | ||
1275 | mov eax, DWORD PTR 28[esi] | ||
1276 | ; saved r[9] | ||
1277 | ; ################## Calculate word 10 | ||
1278 | xor ebx, ebx | ||
1279 | ; mul a[7]*b[3] | ||
1280 | mul edx | ||
1281 | add ecx, eax | ||
1282 | mov eax, DWORD PTR 24[esi] | ||
1283 | adc ebp, edx | ||
1284 | mov edx, DWORD PTR 16[edi] | ||
1285 | adc ebx, 0 | ||
1286 | ; mul a[6]*b[4] | ||
1287 | mul edx | ||
1288 | add ecx, eax | ||
1289 | mov eax, DWORD PTR 20[esi] | ||
1290 | adc ebp, edx | ||
1291 | mov edx, DWORD PTR 20[edi] | ||
1292 | adc ebx, 0 | ||
1293 | ; mul a[5]*b[5] | ||
1294 | mul edx | ||
1295 | add ecx, eax | ||
1296 | mov eax, DWORD PTR 16[esi] | ||
1297 | adc ebp, edx | ||
1298 | mov edx, DWORD PTR 24[edi] | ||
1299 | adc ebx, 0 | ||
1300 | ; mul a[4]*b[6] | ||
1301 | mul edx | ||
1302 | add ecx, eax | ||
1303 | mov eax, DWORD PTR 12[esi] | ||
1304 | adc ebp, edx | ||
1305 | mov edx, DWORD PTR 28[edi] | ||
1306 | adc ebx, 0 | ||
1307 | ; mul a[3]*b[7] | ||
1308 | mul edx | ||
1309 | add ecx, eax | ||
1310 | mov eax, DWORD PTR 20[esp] | ||
1311 | adc ebp, edx | ||
1312 | mov edx, DWORD PTR 16[edi] | ||
1313 | adc ebx, 0 | ||
1314 | mov DWORD PTR 40[eax],ecx | ||
1315 | mov eax, DWORD PTR 28[esi] | ||
1316 | ; saved r[10] | ||
1317 | ; ################## Calculate word 11 | ||
1318 | xor ecx, ecx | ||
1319 | ; mul a[7]*b[4] | ||
1320 | mul edx | ||
1321 | add ebp, eax | ||
1322 | mov eax, DWORD PTR 24[esi] | ||
1323 | adc ebx, edx | ||
1324 | mov edx, DWORD PTR 20[edi] | ||
1325 | adc ecx, 0 | ||
1326 | ; mul a[6]*b[5] | ||
1327 | mul edx | ||
1328 | add ebp, eax | ||
1329 | mov eax, DWORD PTR 20[esi] | ||
1330 | adc ebx, edx | ||
1331 | mov edx, DWORD PTR 24[edi] | ||
1332 | adc ecx, 0 | ||
1333 | ; mul a[5]*b[6] | ||
1334 | mul edx | ||
1335 | add ebp, eax | ||
1336 | mov eax, DWORD PTR 16[esi] | ||
1337 | adc ebx, edx | ||
1338 | mov edx, DWORD PTR 28[edi] | ||
1339 | adc ecx, 0 | ||
1340 | ; mul a[4]*b[7] | ||
1341 | mul edx | ||
1342 | add ebp, eax | ||
1343 | mov eax, DWORD PTR 20[esp] | ||
1344 | adc ebx, edx | ||
1345 | mov edx, DWORD PTR 20[edi] | ||
1346 | adc ecx, 0 | ||
1347 | mov DWORD PTR 44[eax],ebp | ||
1348 | mov eax, DWORD PTR 28[esi] | ||
1349 | ; saved r[11] | ||
1350 | ; ################## Calculate word 12 | ||
1351 | xor ebp, ebp | ||
1352 | ; mul a[7]*b[5] | ||
1353 | mul edx | ||
1354 | add ebx, eax | ||
1355 | mov eax, DWORD PTR 24[esi] | ||
1356 | adc ecx, edx | ||
1357 | mov edx, DWORD PTR 24[edi] | ||
1358 | adc ebp, 0 | ||
1359 | ; mul a[6]*b[6] | ||
1360 | mul edx | ||
1361 | add ebx, eax | ||
1362 | mov eax, DWORD PTR 20[esi] | ||
1363 | adc ecx, edx | ||
1364 | mov edx, DWORD PTR 28[edi] | ||
1365 | adc ebp, 0 | ||
1366 | ; mul a[5]*b[7] | ||
1367 | mul edx | ||
1368 | add ebx, eax | ||
1369 | mov eax, DWORD PTR 20[esp] | ||
1370 | adc ecx, edx | ||
1371 | mov edx, DWORD PTR 24[edi] | ||
1372 | adc ebp, 0 | ||
1373 | mov DWORD PTR 48[eax],ebx | ||
1374 | mov eax, DWORD PTR 28[esi] | ||
1375 | ; saved r[12] | ||
1376 | ; ################## Calculate word 13 | ||
1377 | xor ebx, ebx | ||
1378 | ; mul a[7]*b[6] | ||
1379 | mul edx | ||
1380 | add ecx, eax | ||
1381 | mov eax, DWORD PTR 24[esi] | ||
1382 | adc ebp, edx | ||
1383 | mov edx, DWORD PTR 28[edi] | ||
1384 | adc ebx, 0 | ||
1385 | ; mul a[6]*b[7] | ||
1386 | mul edx | ||
1387 | add ecx, eax | ||
1388 | mov eax, DWORD PTR 20[esp] | ||
1389 | adc ebp, edx | ||
1390 | mov edx, DWORD PTR 28[edi] | ||
1391 | adc ebx, 0 | ||
1392 | mov DWORD PTR 52[eax],ecx | ||
1393 | mov eax, DWORD PTR 28[esi] | ||
1394 | ; saved r[13] | ||
1395 | ; ################## Calculate word 14 | ||
1396 | xor ecx, ecx | ||
1397 | ; mul a[7]*b[7] | ||
1398 | mul edx | ||
1399 | add ebp, eax | ||
1400 | mov eax, DWORD PTR 20[esp] | ||
1401 | adc ebx, edx | ||
1402 | adc ecx, 0 | ||
1403 | mov DWORD PTR 56[eax],ebp | ||
1404 | ; saved r[14] | ||
1405 | ; save r[15] | ||
1406 | mov DWORD PTR 60[eax],ebx | ||
1407 | pop ebx | ||
1408 | pop ebp | ||
1409 | pop edi | ||
1410 | pop esi | ||
1411 | ret | ||
1412 | _bn_mul_comba8 ENDP | ||
1413 | _TEXT ENDS | ||
1414 | _TEXT SEGMENT | ||
1415 | PUBLIC _bn_mul_comba4 | ||
1416 | |||
1417 | _bn_mul_comba4 PROC NEAR | ||
1418 | push esi | ||
1419 | mov esi, DWORD PTR 12[esp] | ||
1420 | push edi | ||
1421 | mov edi, DWORD PTR 20[esp] | ||
1422 | push ebp | ||
1423 | push ebx | ||
1424 | xor ebx, ebx | ||
1425 | mov eax, DWORD PTR [esi] | ||
1426 | xor ecx, ecx | ||
1427 | mov edx, DWORD PTR [edi] | ||
1428 | ; ################## Calculate word 0 | ||
1429 | xor ebp, ebp | ||
1430 | ; mul a[0]*b[0] | ||
1431 | mul edx | ||
1432 | add ebx, eax | ||
1433 | mov eax, DWORD PTR 20[esp] | ||
1434 | adc ecx, edx | ||
1435 | mov edx, DWORD PTR [edi] | ||
1436 | adc ebp, 0 | ||
1437 | mov DWORD PTR [eax],ebx | ||
1438 | mov eax, DWORD PTR 4[esi] | ||
1439 | ; saved r[0] | ||
1440 | ; ################## Calculate word 1 | ||
1441 | xor ebx, ebx | ||
1442 | ; mul a[1]*b[0] | ||
1443 | mul edx | ||
1444 | add ecx, eax | ||
1445 | mov eax, DWORD PTR [esi] | ||
1446 | adc ebp, edx | ||
1447 | mov edx, DWORD PTR 4[edi] | ||
1448 | adc ebx, 0 | ||
1449 | ; mul a[0]*b[1] | ||
1450 | mul edx | ||
1451 | add ecx, eax | ||
1452 | mov eax, DWORD PTR 20[esp] | ||
1453 | adc ebp, edx | ||
1454 | mov edx, DWORD PTR [edi] | ||
1455 | adc ebx, 0 | ||
1456 | mov DWORD PTR 4[eax],ecx | ||
1457 | mov eax, DWORD PTR 8[esi] | ||
1458 | ; saved r[1] | ||
1459 | ; ################## Calculate word 2 | ||
1460 | xor ecx, ecx | ||
1461 | ; mul a[2]*b[0] | ||
1462 | mul edx | ||
1463 | add ebp, eax | ||
1464 | mov eax, DWORD PTR 4[esi] | ||
1465 | adc ebx, edx | ||
1466 | mov edx, DWORD PTR 4[edi] | ||
1467 | adc ecx, 0 | ||
1468 | ; mul a[1]*b[1] | ||
1469 | mul edx | ||
1470 | add ebp, eax | ||
1471 | mov eax, DWORD PTR [esi] | ||
1472 | adc ebx, edx | ||
1473 | mov edx, DWORD PTR 8[edi] | ||
1474 | adc ecx, 0 | ||
1475 | ; mul a[0]*b[2] | ||
1476 | mul edx | ||
1477 | add ebp, eax | ||
1478 | mov eax, DWORD PTR 20[esp] | ||
1479 | adc ebx, edx | ||
1480 | mov edx, DWORD PTR [edi] | ||
1481 | adc ecx, 0 | ||
1482 | mov DWORD PTR 8[eax],ebp | ||
1483 | mov eax, DWORD PTR 12[esi] | ||
1484 | ; saved r[2] | ||
1485 | ; ################## Calculate word 3 | ||
1486 | xor ebp, ebp | ||
1487 | ; mul a[3]*b[0] | ||
1488 | mul edx | ||
1489 | add ebx, eax | ||
1490 | mov eax, DWORD PTR 8[esi] | ||
1491 | adc ecx, edx | ||
1492 | mov edx, DWORD PTR 4[edi] | ||
1493 | adc ebp, 0 | ||
1494 | ; mul a[2]*b[1] | ||
1495 | mul edx | ||
1496 | add ebx, eax | ||
1497 | mov eax, DWORD PTR 4[esi] | ||
1498 | adc ecx, edx | ||
1499 | mov edx, DWORD PTR 8[edi] | ||
1500 | adc ebp, 0 | ||
1501 | ; mul a[1]*b[2] | ||
1502 | mul edx | ||
1503 | add ebx, eax | ||
1504 | mov eax, DWORD PTR [esi] | ||
1505 | adc ecx, edx | ||
1506 | mov edx, DWORD PTR 12[edi] | ||
1507 | adc ebp, 0 | ||
1508 | ; mul a[0]*b[3] | ||
1509 | mul edx | ||
1510 | add ebx, eax | ||
1511 | mov eax, DWORD PTR 20[esp] | ||
1512 | adc ecx, edx | ||
1513 | mov edx, DWORD PTR 4[edi] | ||
1514 | adc ebp, 0 | ||
1515 | mov DWORD PTR 12[eax],ebx | ||
1516 | mov eax, DWORD PTR 12[esi] | ||
1517 | ; saved r[3] | ||
1518 | ; ################## Calculate word 4 | ||
1519 | xor ebx, ebx | ||
1520 | ; mul a[3]*b[1] | ||
1521 | mul edx | ||
1522 | add ecx, eax | ||
1523 | mov eax, DWORD PTR 8[esi] | ||
1524 | adc ebp, edx | ||
1525 | mov edx, DWORD PTR 8[edi] | ||
1526 | adc ebx, 0 | ||
1527 | ; mul a[2]*b[2] | ||
1528 | mul edx | ||
1529 | add ecx, eax | ||
1530 | mov eax, DWORD PTR 4[esi] | ||
1531 | adc ebp, edx | ||
1532 | mov edx, DWORD PTR 12[edi] | ||
1533 | adc ebx, 0 | ||
1534 | ; mul a[1]*b[3] | ||
1535 | mul edx | ||
1536 | add ecx, eax | ||
1537 | mov eax, DWORD PTR 20[esp] | ||
1538 | adc ebp, edx | ||
1539 | mov edx, DWORD PTR 8[edi] | ||
1540 | adc ebx, 0 | ||
1541 | mov DWORD PTR 16[eax],ecx | ||
1542 | mov eax, DWORD PTR 12[esi] | ||
1543 | ; saved r[4] | ||
1544 | ; ################## Calculate word 5 | ||
1545 | xor ecx, ecx | ||
1546 | ; mul a[3]*b[2] | ||
1547 | mul edx | ||
1548 | add ebp, eax | ||
1549 | mov eax, DWORD PTR 8[esi] | ||
1550 | adc ebx, edx | ||
1551 | mov edx, DWORD PTR 12[edi] | ||
1552 | adc ecx, 0 | ||
1553 | ; mul a[2]*b[3] | ||
1554 | mul edx | ||
1555 | add ebp, eax | ||
1556 | mov eax, DWORD PTR 20[esp] | ||
1557 | adc ebx, edx | ||
1558 | mov edx, DWORD PTR 12[edi] | ||
1559 | adc ecx, 0 | ||
1560 | mov DWORD PTR 20[eax],ebp | ||
1561 | mov eax, DWORD PTR 12[esi] | ||
1562 | ; saved r[5] | ||
1563 | ; ################## Calculate word 6 | ||
1564 | xor ebp, ebp | ||
1565 | ; mul a[3]*b[3] | ||
1566 | mul edx | ||
1567 | add ebx, eax | ||
1568 | mov eax, DWORD PTR 20[esp] | ||
1569 | adc ecx, edx | ||
1570 | adc ebp, 0 | ||
1571 | mov DWORD PTR 24[eax],ebx | ||
1572 | ; saved r[6] | ||
1573 | ; save r[7] | ||
1574 | mov DWORD PTR 28[eax],ecx | ||
1575 | pop ebx | ||
1576 | pop ebp | ||
1577 | pop edi | ||
1578 | pop esi | ||
1579 | ret | ||
1580 | _bn_mul_comba4 ENDP | ||
1581 | _TEXT ENDS | ||
1582 | _TEXT SEGMENT | ||
1583 | PUBLIC _bn_sqr_comba8 | ||
1584 | |||
1585 | _bn_sqr_comba8 PROC NEAR | ||
1586 | push esi | ||
1587 | push edi | ||
1588 | push ebp | ||
1589 | push ebx | ||
1590 | mov edi, DWORD PTR 20[esp] | ||
1591 | mov esi, DWORD PTR 24[esp] | ||
1592 | xor ebx, ebx | ||
1593 | xor ecx, ecx | ||
1594 | mov eax, DWORD PTR [esi] | ||
1595 | ; ############### Calculate word 0 | ||
1596 | xor ebp, ebp | ||
1597 | ; sqr a[0]*a[0] | ||
1598 | mul eax | ||
1599 | add ebx, eax | ||
1600 | adc ecx, edx | ||
1601 | mov edx, DWORD PTR [esi] | ||
1602 | adc ebp, 0 | ||
1603 | mov DWORD PTR [edi],ebx | ||
1604 | mov eax, DWORD PTR 4[esi] | ||
1605 | ; saved r[0] | ||
1606 | ; ############### Calculate word 1 | ||
1607 | xor ebx, ebx | ||
1608 | ; sqr a[1]*a[0] | ||
1609 | mul edx | ||
1610 | add eax, eax | ||
1611 | adc edx, edx | ||
1612 | adc ebx, 0 | ||
1613 | add ecx, eax | ||
1614 | adc ebp, edx | ||
1615 | mov eax, DWORD PTR 8[esi] | ||
1616 | adc ebx, 0 | ||
1617 | mov DWORD PTR 4[edi],ecx | ||
1618 | mov edx, DWORD PTR [esi] | ||
1619 | ; saved r[1] | ||
1620 | ; ############### Calculate word 2 | ||
1621 | xor ecx, ecx | ||
1622 | ; sqr a[2]*a[0] | ||
1623 | mul edx | ||
1624 | add eax, eax | ||
1625 | adc edx, edx | ||
1626 | adc ecx, 0 | ||
1627 | add ebp, eax | ||
1628 | adc ebx, edx | ||
1629 | mov eax, DWORD PTR 4[esi] | ||
1630 | adc ecx, 0 | ||
1631 | ; sqr a[1]*a[1] | ||
1632 | mul eax | ||
1633 | add ebp, eax | ||
1634 | adc ebx, edx | ||
1635 | mov edx, DWORD PTR [esi] | ||
1636 | adc ecx, 0 | ||
1637 | mov DWORD PTR 8[edi],ebp | ||
1638 | mov eax, DWORD PTR 12[esi] | ||
1639 | ; saved r[2] | ||
1640 | ; ############### Calculate word 3 | ||
1641 | xor ebp, ebp | ||
1642 | ; sqr a[3]*a[0] | ||
1643 | mul edx | ||
1644 | add eax, eax | ||
1645 | adc edx, edx | ||
1646 | adc ebp, 0 | ||
1647 | add ebx, eax | ||
1648 | adc ecx, edx | ||
1649 | mov eax, DWORD PTR 8[esi] | ||
1650 | adc ebp, 0 | ||
1651 | mov edx, DWORD PTR 4[esi] | ||
1652 | ; sqr a[2]*a[1] | ||
1653 | mul edx | ||
1654 | add eax, eax | ||
1655 | adc edx, edx | ||
1656 | adc ebp, 0 | ||
1657 | add ebx, eax | ||
1658 | adc ecx, edx | ||
1659 | mov eax, DWORD PTR 16[esi] | ||
1660 | adc ebp, 0 | ||
1661 | mov DWORD PTR 12[edi],ebx | ||
1662 | mov edx, DWORD PTR [esi] | ||
1663 | ; saved r[3] | ||
1664 | ; ############### Calculate word 4 | ||
1665 | xor ebx, ebx | ||
1666 | ; sqr a[4]*a[0] | ||
1667 | mul edx | ||
1668 | add eax, eax | ||
1669 | adc edx, edx | ||
1670 | adc ebx, 0 | ||
1671 | add ecx, eax | ||
1672 | adc ebp, edx | ||
1673 | mov eax, DWORD PTR 12[esi] | ||
1674 | adc ebx, 0 | ||
1675 | mov edx, DWORD PTR 4[esi] | ||
1676 | ; sqr a[3]*a[1] | ||
1677 | mul edx | ||
1678 | add eax, eax | ||
1679 | adc edx, edx | ||
1680 | adc ebx, 0 | ||
1681 | add ecx, eax | ||
1682 | adc ebp, edx | ||
1683 | mov eax, DWORD PTR 8[esi] | ||
1684 | adc ebx, 0 | ||
1685 | ; sqr a[2]*a[2] | ||
1686 | mul eax | ||
1687 | add ecx, eax | ||
1688 | adc ebp, edx | ||
1689 | mov edx, DWORD PTR [esi] | ||
1690 | adc ebx, 0 | ||
1691 | mov DWORD PTR 16[edi],ecx | ||
1692 | mov eax, DWORD PTR 20[esi] | ||
1693 | ; saved r[4] | ||
1694 | ; ############### Calculate word 5 | ||
1695 | xor ecx, ecx | ||
1696 | ; sqr a[5]*a[0] | ||
1697 | mul edx | ||
1698 | add eax, eax | ||
1699 | adc edx, edx | ||
1700 | adc ecx, 0 | ||
1701 | add ebp, eax | ||
1702 | adc ebx, edx | ||
1703 | mov eax, DWORD PTR 16[esi] | ||
1704 | adc ecx, 0 | ||
1705 | mov edx, DWORD PTR 4[esi] | ||
1706 | ; sqr a[4]*a[1] | ||
1707 | mul edx | ||
1708 | add eax, eax | ||
1709 | adc edx, edx | ||
1710 | adc ecx, 0 | ||
1711 | add ebp, eax | ||
1712 | adc ebx, edx | ||
1713 | mov eax, DWORD PTR 12[esi] | ||
1714 | adc ecx, 0 | ||
1715 | mov edx, DWORD PTR 8[esi] | ||
1716 | ; sqr a[3]*a[2] | ||
1717 | mul edx | ||
1718 | add eax, eax | ||
1719 | adc edx, edx | ||
1720 | adc ecx, 0 | ||
1721 | add ebp, eax | ||
1722 | adc ebx, edx | ||
1723 | mov eax, DWORD PTR 24[esi] | ||
1724 | adc ecx, 0 | ||
1725 | mov DWORD PTR 20[edi],ebp | ||
1726 | mov edx, DWORD PTR [esi] | ||
1727 | ; saved r[5] | ||
1728 | ; ############### Calculate word 6 | ||
1729 | xor ebp, ebp | ||
1730 | ; sqr a[6]*a[0] | ||
1731 | mul edx | ||
1732 | add eax, eax | ||
1733 | adc edx, edx | ||
1734 | adc ebp, 0 | ||
1735 | add ebx, eax | ||
1736 | adc ecx, edx | ||
1737 | mov eax, DWORD PTR 20[esi] | ||
1738 | adc ebp, 0 | ||
1739 | mov edx, DWORD PTR 4[esi] | ||
1740 | ; sqr a[5]*a[1] | ||
1741 | mul edx | ||
1742 | add eax, eax | ||
1743 | adc edx, edx | ||
1744 | adc ebp, 0 | ||
1745 | add ebx, eax | ||
1746 | adc ecx, edx | ||
1747 | mov eax, DWORD PTR 16[esi] | ||
1748 | adc ebp, 0 | ||
1749 | mov edx, DWORD PTR 8[esi] | ||
1750 | ; sqr a[4]*a[2] | ||
1751 | mul edx | ||
1752 | add eax, eax | ||
1753 | adc edx, edx | ||
1754 | adc ebp, 0 | ||
1755 | add ebx, eax | ||
1756 | adc ecx, edx | ||
1757 | mov eax, DWORD PTR 12[esi] | ||
1758 | adc ebp, 0 | ||
1759 | ; sqr a[3]*a[3] | ||
1760 | mul eax | ||
1761 | add ebx, eax | ||
1762 | adc ecx, edx | ||
1763 | mov edx, DWORD PTR [esi] | ||
1764 | adc ebp, 0 | ||
1765 | mov DWORD PTR 24[edi],ebx | ||
1766 | mov eax, DWORD PTR 28[esi] | ||
1767 | ; saved r[6] | ||
1768 | ; ############### Calculate word 7 | ||
1769 | xor ebx, ebx | ||
1770 | ; sqr a[7]*a[0] | ||
1771 | mul edx | ||
1772 | add eax, eax | ||
1773 | adc edx, edx | ||
1774 | adc ebx, 0 | ||
1775 | add ecx, eax | ||
1776 | adc ebp, edx | ||
1777 | mov eax, DWORD PTR 24[esi] | ||
1778 | adc ebx, 0 | ||
1779 | mov edx, DWORD PTR 4[esi] | ||
1780 | ; sqr a[6]*a[1] | ||
1781 | mul edx | ||
1782 | add eax, eax | ||
1783 | adc edx, edx | ||
1784 | adc ebx, 0 | ||
1785 | add ecx, eax | ||
1786 | adc ebp, edx | ||
1787 | mov eax, DWORD PTR 20[esi] | ||
1788 | adc ebx, 0 | ||
1789 | mov edx, DWORD PTR 8[esi] | ||
1790 | ; sqr a[5]*a[2] | ||
1791 | mul edx | ||
1792 | add eax, eax | ||
1793 | adc edx, edx | ||
1794 | adc ebx, 0 | ||
1795 | add ecx, eax | ||
1796 | adc ebp, edx | ||
1797 | mov eax, DWORD PTR 16[esi] | ||
1798 | adc ebx, 0 | ||
1799 | mov edx, DWORD PTR 12[esi] | ||
1800 | ; sqr a[4]*a[3] | ||
1801 | mul edx | ||
1802 | add eax, eax | ||
1803 | adc edx, edx | ||
1804 | adc ebx, 0 | ||
1805 | add ecx, eax | ||
1806 | adc ebp, edx | ||
1807 | mov eax, DWORD PTR 28[esi] | ||
1808 | adc ebx, 0 | ||
1809 | mov DWORD PTR 28[edi],ecx | ||
1810 | mov edx, DWORD PTR 4[esi] | ||
1811 | ; saved r[7] | ||
1812 | ; ############### Calculate word 8 | ||
1813 | xor ecx, ecx | ||
1814 | ; sqr a[7]*a[1] | ||
1815 | mul edx | ||
1816 | add eax, eax | ||
1817 | adc edx, edx | ||
1818 | adc ecx, 0 | ||
1819 | add ebp, eax | ||
1820 | adc ebx, edx | ||
1821 | mov eax, DWORD PTR 24[esi] | ||
1822 | adc ecx, 0 | ||
1823 | mov edx, DWORD PTR 8[esi] | ||
1824 | ; sqr a[6]*a[2] | ||
1825 | mul edx | ||
1826 | add eax, eax | ||
1827 | adc edx, edx | ||
1828 | adc ecx, 0 | ||
1829 | add ebp, eax | ||
1830 | adc ebx, edx | ||
1831 | mov eax, DWORD PTR 20[esi] | ||
1832 | adc ecx, 0 | ||
1833 | mov edx, DWORD PTR 12[esi] | ||
1834 | ; sqr a[5]*a[3] | ||
1835 | mul edx | ||
1836 | add eax, eax | ||
1837 | adc edx, edx | ||
1838 | adc ecx, 0 | ||
1839 | add ebp, eax | ||
1840 | adc ebx, edx | ||
1841 | mov eax, DWORD PTR 16[esi] | ||
1842 | adc ecx, 0 | ||
1843 | ; sqr a[4]*a[4] | ||
1844 | mul eax | ||
1845 | add ebp, eax | ||
1846 | adc ebx, edx | ||
1847 | mov edx, DWORD PTR 8[esi] | ||
1848 | adc ecx, 0 | ||
1849 | mov DWORD PTR 32[edi],ebp | ||
1850 | mov eax, DWORD PTR 28[esi] | ||
1851 | ; saved r[8] | ||
1852 | ; ############### Calculate word 9 | ||
1853 | xor ebp, ebp | ||
1854 | ; sqr a[7]*a[2] | ||
1855 | mul edx | ||
1856 | add eax, eax | ||
1857 | adc edx, edx | ||
1858 | adc ebp, 0 | ||
1859 | add ebx, eax | ||
1860 | adc ecx, edx | ||
1861 | mov eax, DWORD PTR 24[esi] | ||
1862 | adc ebp, 0 | ||
1863 | mov edx, DWORD PTR 12[esi] | ||
1864 | ; sqr a[6]*a[3] | ||
1865 | mul edx | ||
1866 | add eax, eax | ||
1867 | adc edx, edx | ||
1868 | adc ebp, 0 | ||
1869 | add ebx, eax | ||
1870 | adc ecx, edx | ||
1871 | mov eax, DWORD PTR 20[esi] | ||
1872 | adc ebp, 0 | ||
1873 | mov edx, DWORD PTR 16[esi] | ||
1874 | ; sqr a[5]*a[4] | ||
1875 | mul edx | ||
1876 | add eax, eax | ||
1877 | adc edx, edx | ||
1878 | adc ebp, 0 | ||
1879 | add ebx, eax | ||
1880 | adc ecx, edx | ||
1881 | mov eax, DWORD PTR 28[esi] | ||
1882 | adc ebp, 0 | ||
1883 | mov DWORD PTR 36[edi],ebx | ||
1884 | mov edx, DWORD PTR 12[esi] | ||
1885 | ; saved r[9] | ||
1886 | ; ############### Calculate word 10 | ||
1887 | xor ebx, ebx | ||
1888 | ; sqr a[7]*a[3] | ||
1889 | mul edx | ||
1890 | add eax, eax | ||
1891 | adc edx, edx | ||
1892 | adc ebx, 0 | ||
1893 | add ecx, eax | ||
1894 | adc ebp, edx | ||
1895 | mov eax, DWORD PTR 24[esi] | ||
1896 | adc ebx, 0 | ||
1897 | mov edx, DWORD PTR 16[esi] | ||
1898 | ; sqr a[6]*a[4] | ||
1899 | mul edx | ||
1900 | add eax, eax | ||
1901 | adc edx, edx | ||
1902 | adc ebx, 0 | ||
1903 | add ecx, eax | ||
1904 | adc ebp, edx | ||
1905 | mov eax, DWORD PTR 20[esi] | ||
1906 | adc ebx, 0 | ||
1907 | ; sqr a[5]*a[5] | ||
1908 | mul eax | ||
1909 | add ecx, eax | ||
1910 | adc ebp, edx | ||
1911 | mov edx, DWORD PTR 16[esi] | ||
1912 | adc ebx, 0 | ||
1913 | mov DWORD PTR 40[edi],ecx | ||
1914 | mov eax, DWORD PTR 28[esi] | ||
1915 | ; saved r[10] | ||
1916 | ; ############### Calculate word 11 | ||
1917 | xor ecx, ecx | ||
1918 | ; sqr a[7]*a[4] | ||
1919 | mul edx | ||
1920 | add eax, eax | ||
1921 | adc edx, edx | ||
1922 | adc ecx, 0 | ||
1923 | add ebp, eax | ||
1924 | adc ebx, edx | ||
1925 | mov eax, DWORD PTR 24[esi] | ||
1926 | adc ecx, 0 | ||
1927 | mov edx, DWORD PTR 20[esi] | ||
1928 | ; sqr a[6]*a[5] | ||
1929 | mul edx | ||
1930 | add eax, eax | ||
1931 | adc edx, edx | ||
1932 | adc ecx, 0 | ||
1933 | add ebp, eax | ||
1934 | adc ebx, edx | ||
1935 | mov eax, DWORD PTR 28[esi] | ||
1936 | adc ecx, 0 | ||
1937 | mov DWORD PTR 44[edi],ebp | ||
1938 | mov edx, DWORD PTR 20[esi] | ||
1939 | ; saved r[11] | ||
1940 | ; ############### Calculate word 12 | ||
1941 | xor ebp, ebp | ||
1942 | ; sqr a[7]*a[5] | ||
1943 | mul edx | ||
1944 | add eax, eax | ||
1945 | adc edx, edx | ||
1946 | adc ebp, 0 | ||
1947 | add ebx, eax | ||
1948 | adc ecx, edx | ||
1949 | mov eax, DWORD PTR 24[esi] | ||
1950 | adc ebp, 0 | ||
1951 | ; sqr a[6]*a[6] | ||
1952 | mul eax | ||
1953 | add ebx, eax | ||
1954 | adc ecx, edx | ||
1955 | mov edx, DWORD PTR 24[esi] | ||
1956 | adc ebp, 0 | ||
1957 | mov DWORD PTR 48[edi],ebx | ||
1958 | mov eax, DWORD PTR 28[esi] | ||
1959 | ; saved r[12] | ||
1960 | ; ############### Calculate word 13 | ||
1961 | xor ebx, ebx | ||
1962 | ; sqr a[7]*a[6] | ||
1963 | mul edx | ||
1964 | add eax, eax | ||
1965 | adc edx, edx | ||
1966 | adc ebx, 0 | ||
1967 | add ecx, eax | ||
1968 | adc ebp, edx | ||
1969 | mov eax, DWORD PTR 28[esi] | ||
1970 | adc ebx, 0 | ||
1971 | mov DWORD PTR 52[edi],ecx | ||
1972 | ; saved r[13] | ||
1973 | ; ############### Calculate word 14 | ||
1974 | xor ecx, ecx | ||
1975 | ; sqr a[7]*a[7] | ||
1976 | mul eax | ||
1977 | add ebp, eax | ||
1978 | adc ebx, edx | ||
1979 | adc ecx, 0 | ||
1980 | mov DWORD PTR 56[edi],ebp | ||
1981 | ; saved r[14] | ||
1982 | mov DWORD PTR 60[edi],ebx | ||
1983 | pop ebx | ||
1984 | pop ebp | ||
1985 | pop edi | ||
1986 | pop esi | ||
1987 | ret | ||
1988 | _bn_sqr_comba8 ENDP | ||
1989 | _TEXT ENDS | ||
1990 | _TEXT SEGMENT | ||
1991 | PUBLIC _bn_sqr_comba4 | ||
1992 | |||
1993 | _bn_sqr_comba4 PROC NEAR | ||
1994 | push esi | ||
1995 | push edi | ||
1996 | push ebp | ||
1997 | push ebx | ||
1998 | mov edi, DWORD PTR 20[esp] | ||
1999 | mov esi, DWORD PTR 24[esp] | ||
2000 | xor ebx, ebx | ||
2001 | xor ecx, ecx | ||
2002 | mov eax, DWORD PTR [esi] | ||
2003 | ; ############### Calculate word 0 | ||
2004 | xor ebp, ebp | ||
2005 | ; sqr a[0]*a[0] | ||
2006 | mul eax | ||
2007 | add ebx, eax | ||
2008 | adc ecx, edx | ||
2009 | mov edx, DWORD PTR [esi] | ||
2010 | adc ebp, 0 | ||
2011 | mov DWORD PTR [edi],ebx | ||
2012 | mov eax, DWORD PTR 4[esi] | ||
2013 | ; saved r[0] | ||
2014 | ; ############### Calculate word 1 | ||
2015 | xor ebx, ebx | ||
2016 | ; sqr a[1]*a[0] | ||
2017 | mul edx | ||
2018 | add eax, eax | ||
2019 | adc edx, edx | ||
2020 | adc ebx, 0 | ||
2021 | add ecx, eax | ||
2022 | adc ebp, edx | ||
2023 | mov eax, DWORD PTR 8[esi] | ||
2024 | adc ebx, 0 | ||
2025 | mov DWORD PTR 4[edi],ecx | ||
2026 | mov edx, DWORD PTR [esi] | ||
2027 | ; saved r[1] | ||
2028 | ; ############### Calculate word 2 | ||
2029 | xor ecx, ecx | ||
2030 | ; sqr a[2]*a[0] | ||
2031 | mul edx | ||
2032 | add eax, eax | ||
2033 | adc edx, edx | ||
2034 | adc ecx, 0 | ||
2035 | add ebp, eax | ||
2036 | adc ebx, edx | ||
2037 | mov eax, DWORD PTR 4[esi] | ||
2038 | adc ecx, 0 | ||
2039 | ; sqr a[1]*a[1] | ||
2040 | mul eax | ||
2041 | add ebp, eax | ||
2042 | adc ebx, edx | ||
2043 | mov edx, DWORD PTR [esi] | ||
2044 | adc ecx, 0 | ||
2045 | mov DWORD PTR 8[edi],ebp | ||
2046 | mov eax, DWORD PTR 12[esi] | ||
2047 | ; saved r[2] | ||
2048 | ; ############### Calculate word 3 | ||
2049 | xor ebp, ebp | ||
2050 | ; sqr a[3]*a[0] | ||
2051 | mul edx | ||
2052 | add eax, eax | ||
2053 | adc edx, edx | ||
2054 | adc ebp, 0 | ||
2055 | add ebx, eax | ||
2056 | adc ecx, edx | ||
2057 | mov eax, DWORD PTR 8[esi] | ||
2058 | adc ebp, 0 | ||
2059 | mov edx, DWORD PTR 4[esi] | ||
2060 | ; sqr a[2]*a[1] | ||
2061 | mul edx | ||
2062 | add eax, eax | ||
2063 | adc edx, edx | ||
2064 | adc ebp, 0 | ||
2065 | add ebx, eax | ||
2066 | adc ecx, edx | ||
2067 | mov eax, DWORD PTR 12[esi] | ||
2068 | adc ebp, 0 | ||
2069 | mov DWORD PTR 12[edi],ebx | ||
2070 | mov edx, DWORD PTR 4[esi] | ||
2071 | ; saved r[3] | ||
2072 | ; ############### Calculate word 4 | ||
2073 | xor ebx, ebx | ||
2074 | ; sqr a[3]*a[1] | ||
2075 | mul edx | ||
2076 | add eax, eax | ||
2077 | adc edx, edx | ||
2078 | adc ebx, 0 | ||
2079 | add ecx, eax | ||
2080 | adc ebp, edx | ||
2081 | mov eax, DWORD PTR 8[esi] | ||
2082 | adc ebx, 0 | ||
2083 | ; sqr a[2]*a[2] | ||
2084 | mul eax | ||
2085 | add ecx, eax | ||
2086 | adc ebp, edx | ||
2087 | mov edx, DWORD PTR 8[esi] | ||
2088 | adc ebx, 0 | ||
2089 | mov DWORD PTR 16[edi],ecx | ||
2090 | mov eax, DWORD PTR 12[esi] | ||
2091 | ; saved r[4] | ||
2092 | ; ############### Calculate word 5 | ||
2093 | xor ecx, ecx | ||
2094 | ; sqr a[3]*a[2] | ||
2095 | mul edx | ||
2096 | add eax, eax | ||
2097 | adc edx, edx | ||
2098 | adc ecx, 0 | ||
2099 | add ebp, eax | ||
2100 | adc ebx, edx | ||
2101 | mov eax, DWORD PTR 12[esi] | ||
2102 | adc ecx, 0 | ||
2103 | mov DWORD PTR 20[edi],ebp | ||
2104 | ; saved r[5] | ||
2105 | ; ############### Calculate word 6 | ||
2106 | xor ebp, ebp | ||
2107 | ; sqr a[3]*a[3] | ||
2108 | mul eax | ||
2109 | add ebx, eax | ||
2110 | adc ecx, edx | ||
2111 | adc ebp, 0 | ||
2112 | mov DWORD PTR 24[edi],ebx | ||
2113 | ; saved r[6] | ||
2114 | mov DWORD PTR 28[edi],ecx | ||
2115 | pop ebx | ||
2116 | pop ebp | ||
2117 | pop edi | ||
2118 | pop esi | ||
2119 | ret | ||
2120 | _bn_sqr_comba4 ENDP | ||
2121 | _TEXT ENDS | ||
2122 | END | ||
diff --git a/src/lib/libcrypto/bn/asm/x86w16.asm b/src/lib/libcrypto/bn/asm/x86w16.asm index 80a9ed6eef..e69de29bb2 100644 --- a/src/lib/libcrypto/bn/asm/x86w16.asm +++ b/src/lib/libcrypto/bn/asm/x86w16.asm | |||
@@ -1,297 +0,0 @@ | |||
1 | ; Static Name Aliases | ||
2 | ; | ||
3 | TITLE bn_mulw.c | ||
4 | .8087 | ||
5 | F_TEXT SEGMENT WORD PUBLIC 'CODE' | ||
6 | F_TEXT ENDS | ||
7 | _DATA SEGMENT WORD PUBLIC 'DATA' | ||
8 | _DATA ENDS | ||
9 | _CONST SEGMENT WORD PUBLIC 'CONST' | ||
10 | _CONST ENDS | ||
11 | _BSS SEGMENT WORD PUBLIC 'BSS' | ||
12 | _BSS ENDS | ||
13 | DGROUP GROUP _CONST, _BSS, _DATA | ||
14 | ASSUME DS: DGROUP, SS: DGROUP | ||
15 | F_TEXT SEGMENT | ||
16 | ASSUME CS: F_TEXT | ||
17 | PUBLIC _bn_mul_add_words | ||
18 | _bn_mul_add_words PROC FAR | ||
19 | ; Line 58 | ||
20 | push bp | ||
21 | push bx | ||
22 | push si | ||
23 | push di | ||
24 | push ds | ||
25 | push es | ||
26 | mov bp,sp | ||
27 | ; w = 26 | ||
28 | ; num = 24 | ||
29 | ; ap = 20 | ||
30 | ; rp = 16 | ||
31 | xor si,si ;c=0; | ||
32 | mov di,WORD PTR [bp+16] ; load r | ||
33 | mov ds,WORD PTR [bp+18] ; load r | ||
34 | mov bx,WORD PTR [bp+20] ; load a | ||
35 | mov es,WORD PTR [bp+22] ; load a | ||
36 | mov cx,WORD PTR [bp+26] ; load w | ||
37 | mov bp,WORD PTR [bp+24] ; load num | ||
38 | |||
39 | shr bp,1 ; div count by 4 and do groups of 4 | ||
40 | shr bp,1 | ||
41 | je $L555 | ||
42 | |||
43 | $L546: | ||
44 | mov ax,cx | ||
45 | mul WORD PTR es:[bx] ; w* *a | ||
46 | add ax,WORD PTR ds:[di] ; + *r | ||
47 | adc dx,0 | ||
48 | adc ax,si | ||
49 | adc dx,0 | ||
50 | mov WORD PTR ds:[di],ax | ||
51 | mov si,dx | ||
52 | ; | ||
53 | mov ax,cx | ||
54 | mul WORD PTR es:[bx+2] ; w* *a | ||
55 | add ax,WORD PTR ds:[di+2] ; + *r | ||
56 | adc dx,0 | ||
57 | adc ax,si | ||
58 | adc dx,0 | ||
59 | mov WORD PTR ds:[di+2],ax | ||
60 | mov si,dx | ||
61 | ; | ||
62 | mov ax,cx | ||
63 | mul WORD PTR es:[bx+4] ; w* *a | ||
64 | add ax,WORD PTR ds:[di+4] ; + *r | ||
65 | adc dx,0 | ||
66 | adc ax,si | ||
67 | adc dx,0 | ||
68 | mov WORD PTR ds:[di+4],ax | ||
69 | mov si,dx | ||
70 | ; | ||
71 | mov ax,cx | ||
72 | mul WORD PTR es:[bx+6] ; w* *a | ||
73 | add ax,WORD PTR ds:[di+6] ; + *r | ||
74 | adc dx,0 | ||
75 | adc ax,si | ||
76 | adc dx,0 | ||
77 | mov WORD PTR ds:[di+6],ax | ||
78 | mov si,dx | ||
79 | ; | ||
80 | add bx,8 | ||
81 | add di,8 | ||
82 | ; | ||
83 | dec bp | ||
84 | je $L555 | ||
85 | jmp $L546 | ||
86 | ; | ||
87 | ; | ||
88 | $L555: | ||
89 | mov bp,sp | ||
90 | mov bp,WORD PTR [bp+24] ; load num | ||
91 | and bp,3 | ||
92 | dec bp | ||
93 | js $L547 | ||
94 | |||
95 | mov ax,cx | ||
96 | mul WORD PTR es:[bx] ; w* *a | ||
97 | add ax,WORD PTR ds:[di] ; + *r | ||
98 | adc dx,0 | ||
99 | adc ax,si | ||
100 | adc dx,0 | ||
101 | mov WORD PTR ds:[di],ax | ||
102 | mov si,dx | ||
103 | dec bp | ||
104 | js $L547 ; Note that we are now testing for -1 | ||
105 | ; | ||
106 | mov ax,cx | ||
107 | mul WORD PTR es:[bx+2] ; w* *a | ||
108 | add ax,WORD PTR ds:[di+2] ; + *r | ||
109 | adc dx,0 | ||
110 | adc ax,si | ||
111 | adc dx,0 | ||
112 | mov WORD PTR ds:[di+2],ax | ||
113 | mov si,dx | ||
114 | dec bp | ||
115 | js $L547 | ||
116 | ; | ||
117 | mov ax,cx | ||
118 | mul WORD PTR es:[bx+4] ; w* *a | ||
119 | add ax,WORD PTR ds:[di+4] ; + *r | ||
120 | adc dx,0 | ||
121 | adc ax,si | ||
122 | adc dx,0 | ||
123 | mov WORD PTR ds:[di+4],ax | ||
124 | mov si,dx | ||
125 | $L547: | ||
126 | mov ax,si | ||
127 | pop es | ||
128 | pop ds | ||
129 | pop di | ||
130 | pop si | ||
131 | pop bx | ||
132 | pop bp | ||
133 | ret | ||
134 | nop | ||
135 | |||
136 | _bn_mul_add_words ENDP | ||
137 | PUBLIC _bn_mul_words | ||
138 | _bn_mul_words PROC FAR | ||
139 | ; Line 76 | ||
140 | push bp | ||
141 | push bx | ||
142 | push si | ||
143 | push di | ||
144 | push ds | ||
145 | push es | ||
146 | xor si,si | ||
147 | mov bp,sp | ||
148 | mov di,WORD PTR [bp+16] ; r | ||
149 | mov ds,WORD PTR [bp+18] | ||
150 | mov bx,WORD PTR [bp+20] ; a | ||
151 | mov es,WORD PTR [bp+22] | ||
152 | mov cx,WORD PTR [bp+26] ; w | ||
153 | mov bp,WORD PTR [bp+24] ; num | ||
154 | $FC743: | ||
155 | mov ax,cx | ||
156 | mul WORD PTR es:[bx] | ||
157 | add ax,si | ||
158 | adc dx,0 | ||
159 | mov WORD PTR ds:[di],ax | ||
160 | mov si,dx | ||
161 | dec bp | ||
162 | je $L764 | ||
163 | ; | ||
164 | mov ax,cx | ||
165 | mul WORD PTR es:[bx+2] | ||
166 | add ax,si | ||
167 | adc dx,0 | ||
168 | mov WORD PTR ds:[di+2],ax | ||
169 | mov si,dx | ||
170 | dec bp | ||
171 | je $L764 | ||
172 | ; | ||
173 | mov ax,cx | ||
174 | mul WORD PTR es:[bx+4] | ||
175 | add ax,si | ||
176 | adc dx,0 | ||
177 | mov WORD PTR ds:[di+4],ax | ||
178 | mov si,dx | ||
179 | dec bp | ||
180 | je $L764 | ||
181 | ; | ||
182 | mov ax,cx | ||
183 | mul WORD PTR es:[bx+6] | ||
184 | add ax,si | ||
185 | adc dx,0 | ||
186 | mov WORD PTR ds:[di+6],ax | ||
187 | mov si,dx | ||
188 | dec bp | ||
189 | je $L764 | ||
190 | ; | ||
191 | add bx,8 | ||
192 | add di,8 | ||
193 | jmp $FC743 | ||
194 | nop | ||
195 | $L764: | ||
196 | mov ax,si | ||
197 | pop es | ||
198 | pop ds | ||
199 | pop di | ||
200 | pop si | ||
201 | pop bx | ||
202 | pop bp | ||
203 | ret | ||
204 | nop | ||
205 | _bn_mul_words ENDP | ||
206 | PUBLIC _bn_sqr_words | ||
207 | _bn_sqr_words PROC FAR | ||
208 | ; Line 92 | ||
209 | push bp | ||
210 | push bx | ||
211 | push si | ||
212 | push di | ||
213 | push ds | ||
214 | push es | ||
215 | mov bp,sp | ||
216 | mov si,WORD PTR [bp+16] | ||
217 | mov ds,WORD PTR [bp+18] | ||
218 | mov di,WORD PTR [bp+20] | ||
219 | mov es,WORD PTR [bp+22] | ||
220 | mov bx,WORD PTR [bp+24] | ||
221 | |||
222 | mov bp,bx ; save a memory lookup later | ||
223 | shr bx,1 ; div count by 4 and do groups of 4 | ||
224 | shr bx,1 | ||
225 | je $L666 | ||
226 | |||
227 | $L765: | ||
228 | mov ax,WORD PTR es:[di] | ||
229 | mul ax | ||
230 | mov WORD PTR ds:[si],ax | ||
231 | mov WORD PTR ds:[si+2],dx | ||
232 | ; | ||
233 | mov ax,WORD PTR es:[di+2] | ||
234 | mul ax | ||
235 | mov WORD PTR ds:[si+4],ax | ||
236 | mov WORD PTR ds:[si+6],dx | ||
237 | ; | ||
238 | mov ax,WORD PTR es:[di+4] | ||
239 | mul ax | ||
240 | mov WORD PTR ds:[si+8],ax | ||
241 | mov WORD PTR ds:[si+10],dx | ||
242 | ; | ||
243 | mov ax,WORD PTR es:[di+6] | ||
244 | mul ax | ||
245 | mov WORD PTR ds:[si+12],ax | ||
246 | mov WORD PTR ds:[si+14],dx | ||
247 | ; | ||
248 | add di,8 | ||
249 | add si,16 | ||
250 | dec bx | ||
251 | je $L666 | ||
252 | jmp $L765 | ||
253 | $L666: | ||
254 | and bp,3 | ||
255 | dec bp ; The copied value of bx (num) | ||
256 | js $L645 | ||
257 | ; | ||
258 | mov ax,WORD PTR es:[di] | ||
259 | mul ax | ||
260 | mov WORD PTR ds:[si],ax | ||
261 | mov WORD PTR ds:[si+2],dx | ||
262 | dec bp | ||
263 | js $L645 | ||
264 | ; | ||
265 | mov ax,WORD PTR es:[di+2] | ||
266 | mul ax | ||
267 | mov WORD PTR ds:[si+4],ax | ||
268 | mov WORD PTR ds:[si+6],dx | ||
269 | dec bp | ||
270 | js $L645 | ||
271 | ; | ||
272 | mov ax,WORD PTR es:[di+4] | ||
273 | mul ax | ||
274 | mov WORD PTR ds:[si+8],ax | ||
275 | mov WORD PTR ds:[si+10],dx | ||
276 | $L645: | ||
277 | pop es | ||
278 | pop ds | ||
279 | pop di | ||
280 | pop si | ||
281 | pop bx | ||
282 | pop bp | ||
283 | ret | ||
284 | |||
285 | _bn_sqr_words ENDP | ||
286 | PUBLIC _bn_div64 | ||
287 | _bn_div64 PROC FAR | ||
288 | push bp | ||
289 | mov bp,sp | ||
290 | mov dx, WORD PTR [bp+6] | ||
291 | mov ax, WORD PTR [bp+8] | ||
292 | div WORD PTR [bp+10] | ||
293 | pop bp | ||
294 | ret | ||
295 | _bn_div64 ENDP | ||
296 | F_TEXT ENDS | ||
297 | END | ||
diff --git a/src/lib/libcrypto/bn/asm/x86w32.asm b/src/lib/libcrypto/bn/asm/x86w32.asm index 957d71e3b1..e69de29bb2 100644 --- a/src/lib/libcrypto/bn/asm/x86w32.asm +++ b/src/lib/libcrypto/bn/asm/x86w32.asm | |||
@@ -1,360 +0,0 @@ | |||
1 | ; Static Name Aliases | ||
2 | ; | ||
3 | TITLE bn_mulw.c | ||
4 | .386 | ||
5 | F_TEXT SEGMENT WORD USE16 PUBLIC 'CODE' | ||
6 | F_TEXT ENDS | ||
7 | _DATA SEGMENT WORD USE16 PUBLIC 'DATA' | ||
8 | _DATA ENDS | ||
9 | _CONST SEGMENT WORD USE16 PUBLIC 'CONST' | ||
10 | _CONST ENDS | ||
11 | _BSS SEGMENT WORD USE16 PUBLIC 'BSS' | ||
12 | _BSS ENDS | ||
13 | DGROUP GROUP _CONST, _BSS, _DATA | ||
14 | ASSUME DS: DGROUP, SS: DGROUP | ||
15 | F_TEXT SEGMENT | ||
16 | ASSUME CS: F_TEXT | ||
17 | PUBLIC _bn_mul_add_words | ||
18 | _bn_mul_add_words PROC FAR | ||
19 | ; Line 58 | ||
20 | push bp | ||
21 | push bx | ||
22 | push esi | ||
23 | push di | ||
24 | push ds | ||
25 | push es | ||
26 | mov bp,sp | ||
27 | ; w = 28 | ||
28 | ; num = 26 | ||
29 | ; ap = 22 | ||
30 | ; rp = 18 | ||
31 | xor esi,esi ;c=0; | ||
32 | mov di,WORD PTR [bp+18] ; load r | ||
33 | mov ds,WORD PTR [bp+20] ; load r | ||
34 | mov bx,WORD PTR [bp+22] ; load a | ||
35 | mov es,WORD PTR [bp+24] ; load a | ||
36 | mov ecx,DWORD PTR [bp+28] ; load w | ||
37 | mov bp,WORD PTR [bp+26] ; load num | ||
38 | shr bp,1 ; div count by 4 and do groups of 4 | ||
39 | shr bp,1 | ||
40 | je $L555 | ||
41 | |||
42 | $L546: | ||
43 | mov eax,ecx | ||
44 | mul DWORD PTR es:[bx] ; w* *a | ||
45 | add eax,DWORD PTR ds:[di] ; + *r | ||
46 | adc edx,0 | ||
47 | adc eax,esi | ||
48 | adc edx,0 | ||
49 | mov DWORD PTR ds:[di],eax | ||
50 | mov esi,edx | ||
51 | ; | ||
52 | mov eax,ecx | ||
53 | mul DWORD PTR es:[bx+4] ; w* *a | ||
54 | add eax,DWORD PTR ds:[di+4] ; + *r | ||
55 | adc edx,0 | ||
56 | adc eax,esi | ||
57 | adc edx,0 | ||
58 | mov DWORD PTR ds:[di+4],eax | ||
59 | mov esi,edx | ||
60 | ; | ||
61 | mov eax,ecx | ||
62 | mul DWORD PTR es:[bx+8] ; w* *a | ||
63 | add eax,DWORD PTR ds:[di+8] ; + *r | ||
64 | adc edx,0 | ||
65 | adc eax,esi | ||
66 | adc edx,0 | ||
67 | mov DWORD PTR ds:[di+8],eax | ||
68 | mov esi,edx | ||
69 | ; | ||
70 | mov eax,ecx | ||
71 | mul DWORD PTR es:[bx+12] ; w* *a | ||
72 | add eax,DWORD PTR ds:[di+12] ; + *r | ||
73 | adc edx,0 | ||
74 | adc eax,esi | ||
75 | adc edx,0 | ||
76 | mov DWORD PTR ds:[di+12],eax | ||
77 | mov esi,edx | ||
78 | ; | ||
79 | add bx,16 | ||
80 | add di,16 | ||
81 | ; | ||
82 | dec bp | ||
83 | je $L555 | ||
84 | jmp $L546 | ||
85 | ; | ||
86 | ; | ||
87 | $L555: | ||
88 | mov bp,sp | ||
89 | mov bp,WORD PTR [bp+26] ; load num | ||
90 | and bp,3 | ||
91 | dec bp | ||
92 | js $L547m | ||
93 | |||
94 | mov eax,ecx | ||
95 | mul DWORD PTR es:[bx] ; w* *a | ||
96 | add eax,DWORD PTR ds:[di] ; + *r | ||
97 | adc edx,0 | ||
98 | adc eax,esi | ||
99 | adc edx,0 | ||
100 | mov DWORD PTR ds:[di],eax | ||
101 | mov esi,edx | ||
102 | dec bp | ||
103 | js $L547m ; Note that we are now testing for -1 | ||
104 | ; | ||
105 | mov eax,ecx | ||
106 | mul DWORD PTR es:[bx+4] ; w* *a | ||
107 | add eax,DWORD PTR ds:[di+4] ; + *r | ||
108 | adc edx,0 | ||
109 | adc eax,esi | ||
110 | adc edx,0 | ||
111 | mov DWORD PTR ds:[di+4],eax | ||
112 | mov esi,edx | ||
113 | dec bp | ||
114 | js $L547m | ||
115 | ; | ||
116 | mov eax,ecx | ||
117 | mul DWORD PTR es:[bx+8] ; w* *a | ||
118 | add eax,DWORD PTR ds:[di+8] ; + *r | ||
119 | adc edx,0 | ||
120 | adc eax,esi | ||
121 | adc edx,0 | ||
122 | mov DWORD PTR ds:[di+8],eax | ||
123 | mov esi,edx | ||
124 | $L547m: | ||
125 | mov eax,esi | ||
126 | mov edx,esi | ||
127 | shr edx,16 | ||
128 | pop es | ||
129 | pop ds | ||
130 | pop di | ||
131 | pop esi | ||
132 | pop bx | ||
133 | pop bp | ||
134 | ret | ||
135 | nop | ||
136 | _bn_mul_add_words ENDP | ||
137 | |||
138 | PUBLIC _bn_mul_words | ||
139 | _bn_mul_words PROC FAR | ||
140 | ; Line 76 | ||
141 | push bp | ||
142 | push bx | ||
143 | push esi | ||
144 | push di | ||
145 | push ds | ||
146 | push es | ||
147 | xor esi,esi | ||
148 | mov bp,sp | ||
149 | mov di,WORD PTR [bp+18] ; r | ||
150 | mov ds,WORD PTR [bp+20] | ||
151 | mov bx,WORD PTR [bp+22] ; a | ||
152 | mov es,WORD PTR [bp+24] | ||
153 | mov ecx,DWORD PTR [bp+28] ; w | ||
154 | mov bp,WORD PTR [bp+26] ; num | ||
155 | |||
156 | $FC743: | ||
157 | mov eax,ecx | ||
158 | mul DWORD PTR es:[bx] | ||
159 | add eax,esi | ||
160 | adc edx,0 | ||
161 | mov DWORD PTR ds:[di],eax | ||
162 | mov esi,edx | ||
163 | dec bp | ||
164 | je $L764 | ||
165 | ; | ||
166 | mov eax,ecx | ||
167 | mul DWORD PTR es:[bx+4] | ||
168 | add eax,esi | ||
169 | adc edx,0 | ||
170 | mov DWORD PTR ds:[di+4],eax | ||
171 | mov esi,edx | ||
172 | dec bp | ||
173 | je $L764 | ||
174 | ; | ||
175 | mov eax,ecx | ||
176 | mul DWORD PTR es:[bx+8] | ||
177 | add eax,esi | ||
178 | adc edx,0 | ||
179 | mov DWORD PTR ds:[di+8],eax | ||
180 | mov esi,edx | ||
181 | dec bp | ||
182 | je $L764 | ||
183 | ; | ||
184 | mov eax,ecx | ||
185 | mul DWORD PTR es:[bx+12] | ||
186 | add eax,esi | ||
187 | adc edx,0 | ||
188 | mov DWORD PTR ds:[di+12],eax | ||
189 | mov esi,edx | ||
190 | dec bp | ||
191 | je $L764 | ||
192 | ; | ||
193 | add bx,16 | ||
194 | add di,16 | ||
195 | jmp $FC743 | ||
196 | nop | ||
197 | $L764: | ||
198 | mov eax,esi | ||
199 | mov edx,esi | ||
200 | shr edx,16 | ||
201 | pop es | ||
202 | pop ds | ||
203 | pop di | ||
204 | pop esi | ||
205 | pop bx | ||
206 | pop bp | ||
207 | ret | ||
208 | nop | ||
209 | _bn_mul_words ENDP | ||
210 | PUBLIC _bn_sqr_words | ||
211 | _bn_sqr_words PROC FAR | ||
212 | ; Line 92 | ||
213 | push bp | ||
214 | push bx | ||
215 | push si | ||
216 | push di | ||
217 | push ds | ||
218 | push es | ||
219 | mov bp,sp | ||
220 | mov si,WORD PTR [bp+16] | ||
221 | mov ds,WORD PTR [bp+18] | ||
222 | mov di,WORD PTR [bp+20] | ||
223 | mov es,WORD PTR [bp+22] | ||
224 | mov bx,WORD PTR [bp+24] | ||
225 | |||
226 | mov bp,bx ; save a memory lookup later | ||
227 | shr bx,1 ; div count by 4 and do groups of 4 | ||
228 | shr bx,1 | ||
229 | je $L666 | ||
230 | |||
231 | $L765: | ||
232 | mov eax,DWORD PTR es:[di] | ||
233 | mul eax | ||
234 | mov DWORD PTR ds:[si],eax | ||
235 | mov DWORD PTR ds:[si+4],edx | ||
236 | ; | ||
237 | mov eax,DWORD PTR es:[di+4] | ||
238 | mul eax | ||
239 | mov DWORD PTR ds:[si+8],eax | ||
240 | mov DWORD PTR ds:[si+12],edx | ||
241 | ; | ||
242 | mov eax,DWORD PTR es:[di+8] | ||
243 | mul eax | ||
244 | mov DWORD PTR ds:[si+16],eax | ||
245 | mov DWORD PTR ds:[si+20],edx | ||
246 | ; | ||
247 | mov eax,DWORD PTR es:[di+12] | ||
248 | mul eax | ||
249 | mov DWORD PTR ds:[si+24],eax | ||
250 | mov DWORD PTR ds:[si+28],edx | ||
251 | ; | ||
252 | add di,16 | ||
253 | add si,32 | ||
254 | dec bx | ||
255 | je $L666 | ||
256 | jmp $L765 | ||
257 | $L666: | ||
258 | and bp,3 | ||
259 | dec bp ; The copied value of bx (num) | ||
260 | js $L645 | ||
261 | ; | ||
262 | mov eax,DWORD PTR es:[di] | ||
263 | mul eax | ||
264 | mov DWORD PTR ds:[si],eax | ||
265 | mov DWORD PTR ds:[si+4],edx | ||
266 | dec bp | ||
267 | js $L645 | ||
268 | ; | ||
269 | mov eax,DWORD PTR es:[di+4] | ||
270 | mul eax | ||
271 | mov DWORD PTR ds:[si+8],eax | ||
272 | mov DWORD PTR ds:[si+12],edx | ||
273 | dec bp | ||
274 | js $L645 | ||
275 | ; | ||
276 | mov eax,DWORD PTR es:[di+8] | ||
277 | mul eax | ||
278 | mov DWORD PTR ds:[si+16],eax | ||
279 | mov DWORD PTR ds:[si+20],edx | ||
280 | $L645: | ||
281 | pop es | ||
282 | pop ds | ||
283 | pop di | ||
284 | pop si | ||
285 | pop bx | ||
286 | pop bp | ||
287 | ret | ||
288 | _bn_sqr_words ENDP | ||
289 | |||
290 | PUBLIC _bn_div64 | ||
291 | _bn_div64 PROC FAR | ||
292 | push bp | ||
293 | mov bp,sp | ||
294 | mov edx, DWORD PTR [bp+6] | ||
295 | mov eax, DWORD PTR [bp+10] | ||
296 | div DWORD PTR [bp+14] | ||
297 | mov edx,eax | ||
298 | shr edx,16 | ||
299 | pop bp | ||
300 | ret | ||
301 | _bn_div64 ENDP | ||
302 | |||
303 | PUBLIC _bn_add_words | ||
304 | _bn_add_words PROC FAR | ||
305 | ; Line 58 | ||
306 | push bp | ||
307 | push bx | ||
308 | push esi | ||
309 | push di | ||
310 | push ds | ||
311 | push es | ||
312 | mov bp,sp | ||
313 | ; w = 28 | ||
314 | ; num = 26 | ||
315 | ; ap = 22 | ||
316 | ; rp = 18 | ||
317 | xor esi,esi ;c=0; | ||
318 | mov bx,WORD PTR [bp+18] ; load low r | ||
319 | mov si,WORD PTR [bp+22] ; load a | ||
320 | mov es,WORD PTR [bp+24] ; load a | ||
321 | mov di,WORD PTR [bp+26] ; load b | ||
322 | mov ds,WORD PTR [bp+28] ; load b | ||
323 | |||
324 | mov dx,WORD PTR [bp+30] ; load num | ||
325 | xor ecx,ecx | ||
326 | dec dx | ||
327 | js $L547a | ||
328 | |||
329 | $L5477: | ||
330 | mov eax,DWORD PTR es:[si] ; *a | ||
331 | add eax,ecx | ||
332 | mov ecx,0 | ||
333 | adc ecx,0 | ||
334 | add si,4 ; a++ | ||
335 | add eax,DWORD PTR ds:[di] ; + *b | ||
336 | adc ecx,0 | ||
337 | mov ds,WORD PTR [bp+20] | ||
338 | add di,4 | ||
339 | mov DWORD PTR ds:[bx],eax | ||
340 | mov ds,WORD PTR [bp+28] | ||
341 | add bx,4 | ||
342 | dec dx | ||
343 | js $L547a ; Note that we are now testing for -1 | ||
344 | jmp $L5477 | ||
345 | ; | ||
346 | $L547a: | ||
347 | mov eax,ecx | ||
348 | mov edx,ecx | ||
349 | shr edx,16 | ||
350 | pop es | ||
351 | pop ds | ||
352 | pop di | ||
353 | pop esi | ||
354 | pop bx | ||
355 | pop bp | ||
356 | ret | ||
357 | nop | ||
358 | _bn_add_words ENDP | ||
359 | F_TEXT ENDS | ||
360 | END | ||
diff --git a/src/lib/libcrypto/bn/bn.h b/src/lib/libcrypto/bn/bn.h index d8822610df..009b0eb685 100644 --- a/src/lib/libcrypto/bn/bn.h +++ b/src/lib/libcrypto/bn/bn.h | |||
@@ -89,7 +89,7 @@ extern "C" { | |||
89 | * For machines with only one compiler (or shared libraries), this should | 89 | * For machines with only one compiler (or shared libraries), this should |
90 | * be on. Again this in only really a problem on machines | 90 | * be on. Again this in only really a problem on machines |
91 | * using "long long's", are 32bit, and are not using my assembler code. */ | 91 | * using "long long's", are 32bit, and are not using my assembler code. */ |
92 | #if defined(MSDOS) || defined(WINDOWS) || defined(linux) | 92 | #if defined(MSDOS) || defined(WINDOWS) || defined(WIN32) || defined(linux) |
93 | #define BN_DIV2W | 93 | #define BN_DIV2W |
94 | #endif | 94 | #endif |
95 | 95 | ||
diff --git a/src/lib/libcrypto/bn/bn_err.c b/src/lib/libcrypto/bn/bn_err.c index f3b9497dca..988270bcf4 100644 --- a/src/lib/libcrypto/bn/bn_err.c +++ b/src/lib/libcrypto/bn/bn_err.c | |||
@@ -54,7 +54,8 @@ | |||
54 | */ | 54 | */ |
55 | 55 | ||
56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes |
57 | * made to it will be overwritten when the script next updates this file. | 57 | * made to it will be overwritten when the script next updates this file, |
58 | * only reason strings will be preserved. | ||
58 | */ | 59 | */ |
59 | 60 | ||
60 | #include <stdio.h> | 61 | #include <stdio.h> |
diff --git a/src/lib/libcrypto/bn/bn_mont.c b/src/lib/libcrypto/bn/bn_mont.c index 7bb0b91223..598fecbf0c 100644 --- a/src/lib/libcrypto/bn/bn_mont.c +++ b/src/lib/libcrypto/bn/bn_mont.c | |||
@@ -73,6 +73,7 @@ int BN_mod_mul_montgomery(BIGNUM *r, BIGNUM *a, BIGNUM *b, | |||
73 | BN_MONT_CTX *mont, BN_CTX *ctx) | 73 | BN_MONT_CTX *mont, BN_CTX *ctx) |
74 | { | 74 | { |
75 | BIGNUM *tmp,*tmp2; | 75 | BIGNUM *tmp,*tmp2; |
76 | int ret=0; | ||
76 | 77 | ||
77 | BN_CTX_start(ctx); | 78 | BN_CTX_start(ctx); |
78 | tmp = BN_CTX_get(ctx); | 79 | tmp = BN_CTX_get(ctx); |
@@ -101,10 +102,10 @@ int BN_mod_mul_montgomery(BIGNUM *r, BIGNUM *a, BIGNUM *b, | |||
101 | } | 102 | } |
102 | /* reduce from aRR to aR */ | 103 | /* reduce from aRR to aR */ |
103 | if (!BN_from_montgomery(r,tmp,mont,ctx)) goto err; | 104 | if (!BN_from_montgomery(r,tmp,mont,ctx)) goto err; |
104 | BN_CTX_end(ctx); | 105 | ret=1; |
105 | return(1); | ||
106 | err: | 106 | err: |
107 | return(0); | 107 | BN_CTX_end(ctx); |
108 | return(ret); | ||
108 | } | 109 | } |
109 | 110 | ||
110 | int BN_from_montgomery(BIGNUM *ret, BIGNUM *a, BN_MONT_CTX *mont, | 111 | int BN_from_montgomery(BIGNUM *ret, BIGNUM *a, BN_MONT_CTX *mont, |
diff --git a/src/lib/libcrypto/bn/bn_mul.c b/src/lib/libcrypto/bn/bn_mul.c index eb007e19e9..3e8baaad9a 100644 --- a/src/lib/libcrypto/bn/bn_mul.c +++ b/src/lib/libcrypto/bn/bn_mul.c | |||
@@ -61,6 +61,9 @@ | |||
61 | #include "bn_lcl.h" | 61 | #include "bn_lcl.h" |
62 | 62 | ||
63 | #ifdef BN_RECURSION | 63 | #ifdef BN_RECURSION |
64 | /* Karatsuba recursive multiplication algorithm | ||
65 | * (cf. Knuth, The Art of Computer Programming, Vol. 2) */ | ||
66 | |||
64 | /* r is 2*n2 words in size, | 67 | /* r is 2*n2 words in size, |
65 | * a and b are both n2 words in size. | 68 | * a and b are both n2 words in size. |
66 | * n2 must be a power of 2. | 69 | * n2 must be a power of 2. |
diff --git a/src/lib/libcrypto/bn/bntest.c b/src/lib/libcrypto/bn/bntest.c index 41c22f5954..0a97af69c5 100644 --- a/src/lib/libcrypto/bn/bntest.c +++ b/src/lib/libcrypto/bn/bntest.c | |||
@@ -234,7 +234,8 @@ int main(int argc, char *argv[]) | |||
234 | /**/ | 234 | /**/ |
235 | exit(0); | 235 | exit(0); |
236 | err: | 236 | err: |
237 | BIO_puts(out,"1\n"); /* make sure bc fails if we are piping to it */ | 237 | BIO_puts(out,"1\n"); /* make sure the Perl script fed by bc notices |
238 | * the failure, see test_bn in test/Makefile.ssl*/ | ||
238 | BIO_flush(out); | 239 | BIO_flush(out); |
239 | ERR_load_crypto_strings(); | 240 | ERR_load_crypto_strings(); |
240 | ERR_print_errors_fp(stderr); | 241 | ERR_print_errors_fp(stderr); |
diff --git a/src/lib/libcrypto/buffer/buf_err.c b/src/lib/libcrypto/buffer/buf_err.c index 7f9fd1f6c3..2f971a5f38 100644 --- a/src/lib/libcrypto/buffer/buf_err.c +++ b/src/lib/libcrypto/buffer/buf_err.c | |||
@@ -54,7 +54,8 @@ | |||
54 | */ | 54 | */ |
55 | 55 | ||
56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes |
57 | * made to it will be overwritten when the script next updates this file. | 57 | * made to it will be overwritten when the script next updates this file, |
58 | * only reason strings will be preserved. | ||
58 | */ | 59 | */ |
59 | 60 | ||
60 | #include <stdio.h> | 61 | #include <stdio.h> |
diff --git a/src/lib/libcrypto/cast/Makefile.ssl b/src/lib/libcrypto/cast/Makefile.ssl index 763148e314..4c70d1e3e8 100644 --- a/src/lib/libcrypto/cast/Makefile.ssl +++ b/src/lib/libcrypto/cast/Makefile.ssl | |||
@@ -52,7 +52,7 @@ lib: $(LIBOBJ) | |||
52 | 52 | ||
53 | # elf | 53 | # elf |
54 | asm/cx86-elf.o: asm/cx86unix.cpp | 54 | asm/cx86-elf.o: asm/cx86unix.cpp |
55 | $(CPP) -DELF asm/cx86unix.cpp | as -o asm/cx86-elf.o | 55 | $(CPP) -DELF -x c asm/cx86unix.cpp | as -o asm/cx86-elf.o |
56 | 56 | ||
57 | # solaris | 57 | # solaris |
58 | asm/cx86-sol.o: asm/cx86unix.cpp | 58 | asm/cx86-sol.o: asm/cx86unix.cpp |
@@ -68,7 +68,7 @@ asm/cx86-out.o: asm/cx86unix.cpp | |||
68 | asm/cx86bsdi.o: asm/cx86unix.cpp | 68 | asm/cx86bsdi.o: asm/cx86unix.cpp |
69 | $(CPP) -DBSDI asm/cx86unix.cpp | sed 's/ :/:/' | as -o asm/cx86bsdi.o | 69 | $(CPP) -DBSDI asm/cx86unix.cpp | sed 's/ :/:/' | as -o asm/cx86bsdi.o |
70 | 70 | ||
71 | asm/cx86unix.cpp: asm/cast-586.pl | 71 | asm/cx86unix.cpp: asm/cast-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl |
72 | (cd asm; $(PERL) cast-586.pl cpp $(PROCESSOR) >cx86unix.cpp) | 72 | (cd asm; $(PERL) cast-586.pl cpp $(PROCESSOR) >cx86unix.cpp) |
73 | 73 | ||
74 | files: | 74 | files: |
diff --git a/src/lib/libcrypto/cast/Makefile.uni b/src/lib/libcrypto/cast/Makefile.uni index a5870897cf..e69de29bb2 100644 --- a/src/lib/libcrypto/cast/Makefile.uni +++ b/src/lib/libcrypto/cast/Makefile.uni | |||
@@ -1,124 +0,0 @@ | |||
1 | # Targets | ||
2 | # make - twidle the options yourself :-) | ||
3 | # make cc - standard cc options | ||
4 | # make gcc - standard gcc options | ||
5 | # make x86-elf - linux-elf etc | ||
6 | # make x86-out - linux-a.out, FreeBSD etc | ||
7 | # make x86-solaris | ||
8 | # make x86-bdsi | ||
9 | |||
10 | # There are 3 possible performance options, experiment :-) | ||
11 | #OPTS= -DBF_PTR | ||
12 | #OPTS= -DBF_PTR2 | ||
13 | OPTS= | ||
14 | |||
15 | DIR= cast | ||
16 | TOP= . | ||
17 | CC= gcc | ||
18 | CFLAG= -O3 -fomit-frame-pointer | ||
19 | |||
20 | CPP= $(CC) -E | ||
21 | INCLUDES= | ||
22 | INSTALLTOP=/usr/local/lib | ||
23 | MAKE= make | ||
24 | MAKEDEPEND= makedepend | ||
25 | MAKEFILE= Makefile.uni | ||
26 | AR= ar r | ||
27 | RANLIB= ranlib | ||
28 | |||
29 | CAST_ENC=c_enc.o | ||
30 | # or use | ||
31 | #CAST_ENC=asm/cx86-elf.o | ||
32 | #CAST_ENC=asm/cx86-out.o | ||
33 | #CAST_ENC=asm/cx86-sol.o | ||
34 | #CAST_ENC=asm/cx86bdsi.o | ||
35 | |||
36 | CFLAGS= $(OPTS) $(INCLUDES) $(CFLAG) -DFULL_TEST | ||
37 | |||
38 | GENERAL=Makefile | ||
39 | TEST=casttest | ||
40 | APP1=cast_spd | ||
41 | APP2=castopts | ||
42 | APPS=$(APP1) $(APP2) | ||
43 | |||
44 | LIB=libcast.a | ||
45 | LIBSRC=c_skey.c c_ecb.c c_enc.c c_cfb64.c c_ofb64.c | ||
46 | LIBOBJ=c_skey.o c_ecb.o $(CAST_ENC) c_cfb64.o c_ofb64.o | ||
47 | |||
48 | SRC= $(LIBSRC) | ||
49 | |||
50 | EXHEADER= cast.h | ||
51 | HEADER= cast_lcl.h $(EXHEADER) | ||
52 | |||
53 | ALL= $(GENERAL) $(SRC) $(HEADER) | ||
54 | |||
55 | all: $(LIB) $(TEST) $(APPS) | ||
56 | |||
57 | $(LIB): $(LIBOBJ) | ||
58 | $(AR) $(LIB) $(LIBOBJ) | ||
59 | $(RANLIB) $(LIB) | ||
60 | # elf | ||
61 | asm/cx86-elf.o: asm/cx86unix.cpp | ||
62 | $(CPP) -DELF asm/cx86unix.cpp | as -o asm/cx86-elf.o | ||
63 | |||
64 | # solaris | ||
65 | asm/cx86-sol.o: asm/cx86unix.cpp | ||
66 | $(CC) -E -DSOL asm/cx86unix.cpp | sed 's/^#.*//' > asm/cx86-sol.s | ||
67 | as -o asm/cx86-sol.o asm/cx86-sol.s | ||
68 | rm -f asm/cx86-sol.s | ||
69 | |||
70 | # a.out | ||
71 | asm/cx86-out.o: asm/cx86unix.cpp | ||
72 | $(CPP) -DOUT asm/cx86unix.cpp | as -o asm/cx86-out.o | ||
73 | |||
74 | # bsdi | ||
75 | asm/cx86bsdi.o: asm/cx86unix.cpp | ||
76 | $(CPP) -DBSDI asm/cx86unix.cpp | as -o asm/cx86bsdi.o | ||
77 | |||
78 | asm/cx86unix.cpp: | ||
79 | (cd asm; perl cast-586.pl cpp >cx86unix.cpp) | ||
80 | |||
81 | test: $(TEST) | ||
82 | ./$(TEST) | ||
83 | |||
84 | $(TEST): $(TEST).c $(LIB) | ||
85 | $(CC) -o $(TEST) $(CFLAGS) $(TEST).c $(LIB) | ||
86 | |||
87 | $(APP1): $(APP1).c $(LIB) | ||
88 | $(CC) -o $(APP1) $(CFLAGS) $(APP1).c $(LIB) | ||
89 | |||
90 | $(APP2): $(APP2).c $(LIB) | ||
91 | $(CC) -o $(APP2) $(CFLAGS) $(APP2).c $(LIB) | ||
92 | |||
93 | lint: | ||
94 | lint -DLINT $(INCLUDES) $(SRC)>fluff | ||
95 | |||
96 | depend: | ||
97 | $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) | ||
98 | |||
99 | dclean: | ||
100 | perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new | ||
101 | mv -f Makefile.new $(MAKEFILE) | ||
102 | |||
103 | clean: | ||
104 | /bin/rm -f $(LIB) $(TEST) $(APPS) *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff | ||
105 | |||
106 | cc: | ||
107 | $(MAKE) CC="cc" CFLAG="-O" all | ||
108 | |||
109 | gcc: | ||
110 | $(MAKE) CC="gcc" CFLAGS="-O3 -fomit-frame-pointer" all | ||
111 | |||
112 | x86-elf: | ||
113 | $(MAKE) CAST_ENC="asm/cx86-elf.o" CFLAG="-DELF $(CFLAGS)" all | ||
114 | |||
115 | x86-out: | ||
116 | $(MAKE) CAST_ENC="asm/cx86-out.o" CFLAG="-DOUT $(CFLAGS)" all | ||
117 | |||
118 | x86-solaris: | ||
119 | $(MAKE) CAST_ENC="asm/cx86-sol.o" CFLAG="-DSOL $(CFLAGS)" all | ||
120 | |||
121 | x86-bdsi: | ||
122 | $(MAKE) CAST_ENC="asm/cx86-bdsi.o" CFLAG="-DBDSI $(CFLAGS)" all | ||
123 | |||
124 | # DO NOT DELETE THIS LINE -- make depend depends on it. | ||
diff --git a/src/lib/libcrypto/cast/asm/c-win32.asm b/src/lib/libcrypto/cast/asm/c-win32.asm index ba78a3c69c..e69de29bb2 100644 --- a/src/lib/libcrypto/cast/asm/c-win32.asm +++ b/src/lib/libcrypto/cast/asm/c-win32.asm | |||
@@ -1,953 +0,0 @@ | |||
1 | ; Don't even think of reading this code | ||
2 | ; It was automatically generated by cast-586.pl | ||
3 | ; Which is a perl program used to generate the x86 assember for | ||
4 | ; any of elf, a.out, BSDI,Win32, or Solaris | ||
5 | ; eric <eay@cryptsoft.com> | ||
6 | ; | ||
7 | TITLE cast-586.asm | ||
8 | .486 | ||
9 | .model FLAT | ||
10 | _TEXT SEGMENT | ||
11 | PUBLIC _CAST_encrypt | ||
12 | EXTERN _CAST_S_table0:DWORD | ||
13 | EXTERN _CAST_S_table1:DWORD | ||
14 | EXTERN _CAST_S_table2:DWORD | ||
15 | EXTERN _CAST_S_table3:DWORD | ||
16 | |||
17 | _CAST_encrypt PROC NEAR | ||
18 | ; | ||
19 | push ebp | ||
20 | push ebx | ||
21 | mov ebx, DWORD PTR 12[esp] | ||
22 | mov ebp, DWORD PTR 16[esp] | ||
23 | push esi | ||
24 | push edi | ||
25 | ; Load the 2 words | ||
26 | mov edi, DWORD PTR [ebx] | ||
27 | mov esi, DWORD PTR 4[ebx] | ||
28 | ; Get short key flag | ||
29 | mov eax, DWORD PTR 128[ebp] | ||
30 | push eax | ||
31 | xor eax, eax | ||
32 | ; round 0 | ||
33 | mov edx, DWORD PTR [ebp] | ||
34 | mov ecx, DWORD PTR 4[ebp] | ||
35 | add edx, esi | ||
36 | rol edx, cl | ||
37 | mov ebx, edx | ||
38 | xor ecx, ecx | ||
39 | mov cl, dh | ||
40 | and ebx, 255 | ||
41 | shr edx, 16 | ||
42 | xor eax, eax | ||
43 | mov al, dh | ||
44 | and edx, 255 | ||
45 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
46 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
47 | xor ecx, ebx | ||
48 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
49 | sub ecx, ebx | ||
50 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
51 | add ecx, ebx | ||
52 | xor edi, ecx | ||
53 | ; round 1 | ||
54 | mov edx, DWORD PTR 8[ebp] | ||
55 | mov ecx, DWORD PTR 12[ebp] | ||
56 | xor edx, edi | ||
57 | rol edx, cl | ||
58 | mov ebx, edx | ||
59 | xor ecx, ecx | ||
60 | mov cl, dh | ||
61 | and ebx, 255 | ||
62 | shr edx, 16 | ||
63 | xor eax, eax | ||
64 | mov al, dh | ||
65 | and edx, 255 | ||
66 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
67 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
68 | sub ecx, ebx | ||
69 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
70 | add ecx, ebx | ||
71 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
72 | xor ecx, ebx | ||
73 | xor esi, ecx | ||
74 | ; round 2 | ||
75 | mov edx, DWORD PTR 16[ebp] | ||
76 | mov ecx, DWORD PTR 20[ebp] | ||
77 | sub edx, esi | ||
78 | rol edx, cl | ||
79 | mov ebx, edx | ||
80 | xor ecx, ecx | ||
81 | mov cl, dh | ||
82 | and ebx, 255 | ||
83 | shr edx, 16 | ||
84 | xor eax, eax | ||
85 | mov al, dh | ||
86 | and edx, 255 | ||
87 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
88 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
89 | add ecx, ebx | ||
90 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
91 | xor ecx, ebx | ||
92 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
93 | sub ecx, ebx | ||
94 | xor edi, ecx | ||
95 | ; round 3 | ||
96 | mov edx, DWORD PTR 24[ebp] | ||
97 | mov ecx, DWORD PTR 28[ebp] | ||
98 | add edx, edi | ||
99 | rol edx, cl | ||
100 | mov ebx, edx | ||
101 | xor ecx, ecx | ||
102 | mov cl, dh | ||
103 | and ebx, 255 | ||
104 | shr edx, 16 | ||
105 | xor eax, eax | ||
106 | mov al, dh | ||
107 | and edx, 255 | ||
108 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
109 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
110 | xor ecx, ebx | ||
111 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
112 | sub ecx, ebx | ||
113 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
114 | add ecx, ebx | ||
115 | xor esi, ecx | ||
116 | ; round 4 | ||
117 | mov edx, DWORD PTR 32[ebp] | ||
118 | mov ecx, DWORD PTR 36[ebp] | ||
119 | xor edx, esi | ||
120 | rol edx, cl | ||
121 | mov ebx, edx | ||
122 | xor ecx, ecx | ||
123 | mov cl, dh | ||
124 | and ebx, 255 | ||
125 | shr edx, 16 | ||
126 | xor eax, eax | ||
127 | mov al, dh | ||
128 | and edx, 255 | ||
129 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
130 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
131 | sub ecx, ebx | ||
132 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
133 | add ecx, ebx | ||
134 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
135 | xor ecx, ebx | ||
136 | xor edi, ecx | ||
137 | ; round 5 | ||
138 | mov edx, DWORD PTR 40[ebp] | ||
139 | mov ecx, DWORD PTR 44[ebp] | ||
140 | sub edx, edi | ||
141 | rol edx, cl | ||
142 | mov ebx, edx | ||
143 | xor ecx, ecx | ||
144 | mov cl, dh | ||
145 | and ebx, 255 | ||
146 | shr edx, 16 | ||
147 | xor eax, eax | ||
148 | mov al, dh | ||
149 | and edx, 255 | ||
150 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
151 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
152 | add ecx, ebx | ||
153 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
154 | xor ecx, ebx | ||
155 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
156 | sub ecx, ebx | ||
157 | xor esi, ecx | ||
158 | ; round 6 | ||
159 | mov edx, DWORD PTR 48[ebp] | ||
160 | mov ecx, DWORD PTR 52[ebp] | ||
161 | add edx, esi | ||
162 | rol edx, cl | ||
163 | mov ebx, edx | ||
164 | xor ecx, ecx | ||
165 | mov cl, dh | ||
166 | and ebx, 255 | ||
167 | shr edx, 16 | ||
168 | xor eax, eax | ||
169 | mov al, dh | ||
170 | and edx, 255 | ||
171 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
172 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
173 | xor ecx, ebx | ||
174 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
175 | sub ecx, ebx | ||
176 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
177 | add ecx, ebx | ||
178 | xor edi, ecx | ||
179 | ; round 7 | ||
180 | mov edx, DWORD PTR 56[ebp] | ||
181 | mov ecx, DWORD PTR 60[ebp] | ||
182 | xor edx, edi | ||
183 | rol edx, cl | ||
184 | mov ebx, edx | ||
185 | xor ecx, ecx | ||
186 | mov cl, dh | ||
187 | and ebx, 255 | ||
188 | shr edx, 16 | ||
189 | xor eax, eax | ||
190 | mov al, dh | ||
191 | and edx, 255 | ||
192 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
193 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
194 | sub ecx, ebx | ||
195 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
196 | add ecx, ebx | ||
197 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
198 | xor ecx, ebx | ||
199 | xor esi, ecx | ||
200 | ; round 8 | ||
201 | mov edx, DWORD PTR 64[ebp] | ||
202 | mov ecx, DWORD PTR 68[ebp] | ||
203 | sub edx, esi | ||
204 | rol edx, cl | ||
205 | mov ebx, edx | ||
206 | xor ecx, ecx | ||
207 | mov cl, dh | ||
208 | and ebx, 255 | ||
209 | shr edx, 16 | ||
210 | xor eax, eax | ||
211 | mov al, dh | ||
212 | and edx, 255 | ||
213 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
214 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
215 | add ecx, ebx | ||
216 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
217 | xor ecx, ebx | ||
218 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
219 | sub ecx, ebx | ||
220 | xor edi, ecx | ||
221 | ; round 9 | ||
222 | mov edx, DWORD PTR 72[ebp] | ||
223 | mov ecx, DWORD PTR 76[ebp] | ||
224 | add edx, edi | ||
225 | rol edx, cl | ||
226 | mov ebx, edx | ||
227 | xor ecx, ecx | ||
228 | mov cl, dh | ||
229 | and ebx, 255 | ||
230 | shr edx, 16 | ||
231 | xor eax, eax | ||
232 | mov al, dh | ||
233 | and edx, 255 | ||
234 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
235 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
236 | xor ecx, ebx | ||
237 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
238 | sub ecx, ebx | ||
239 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
240 | add ecx, ebx | ||
241 | xor esi, ecx | ||
242 | ; round 10 | ||
243 | mov edx, DWORD PTR 80[ebp] | ||
244 | mov ecx, DWORD PTR 84[ebp] | ||
245 | xor edx, esi | ||
246 | rol edx, cl | ||
247 | mov ebx, edx | ||
248 | xor ecx, ecx | ||
249 | mov cl, dh | ||
250 | and ebx, 255 | ||
251 | shr edx, 16 | ||
252 | xor eax, eax | ||
253 | mov al, dh | ||
254 | and edx, 255 | ||
255 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
256 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
257 | sub ecx, ebx | ||
258 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
259 | add ecx, ebx | ||
260 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
261 | xor ecx, ebx | ||
262 | xor edi, ecx | ||
263 | ; round 11 | ||
264 | mov edx, DWORD PTR 88[ebp] | ||
265 | mov ecx, DWORD PTR 92[ebp] | ||
266 | sub edx, edi | ||
267 | rol edx, cl | ||
268 | mov ebx, edx | ||
269 | xor ecx, ecx | ||
270 | mov cl, dh | ||
271 | and ebx, 255 | ||
272 | shr edx, 16 | ||
273 | xor eax, eax | ||
274 | mov al, dh | ||
275 | and edx, 255 | ||
276 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
277 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
278 | add ecx, ebx | ||
279 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
280 | xor ecx, ebx | ||
281 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
282 | sub ecx, ebx | ||
283 | xor esi, ecx | ||
284 | ; test short key flag | ||
285 | pop edx | ||
286 | or edx, edx | ||
287 | jnz $L000cast_enc_done | ||
288 | ; round 12 | ||
289 | mov edx, DWORD PTR 96[ebp] | ||
290 | mov ecx, DWORD PTR 100[ebp] | ||
291 | add edx, esi | ||
292 | rol edx, cl | ||
293 | mov ebx, edx | ||
294 | xor ecx, ecx | ||
295 | mov cl, dh | ||
296 | and ebx, 255 | ||
297 | shr edx, 16 | ||
298 | xor eax, eax | ||
299 | mov al, dh | ||
300 | and edx, 255 | ||
301 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
302 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
303 | xor ecx, ebx | ||
304 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
305 | sub ecx, ebx | ||
306 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
307 | add ecx, ebx | ||
308 | xor edi, ecx | ||
309 | ; round 13 | ||
310 | mov edx, DWORD PTR 104[ebp] | ||
311 | mov ecx, DWORD PTR 108[ebp] | ||
312 | xor edx, edi | ||
313 | rol edx, cl | ||
314 | mov ebx, edx | ||
315 | xor ecx, ecx | ||
316 | mov cl, dh | ||
317 | and ebx, 255 | ||
318 | shr edx, 16 | ||
319 | xor eax, eax | ||
320 | mov al, dh | ||
321 | and edx, 255 | ||
322 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
323 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
324 | sub ecx, ebx | ||
325 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
326 | add ecx, ebx | ||
327 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
328 | xor ecx, ebx | ||
329 | xor esi, ecx | ||
330 | ; round 14 | ||
331 | mov edx, DWORD PTR 112[ebp] | ||
332 | mov ecx, DWORD PTR 116[ebp] | ||
333 | sub edx, esi | ||
334 | rol edx, cl | ||
335 | mov ebx, edx | ||
336 | xor ecx, ecx | ||
337 | mov cl, dh | ||
338 | and ebx, 255 | ||
339 | shr edx, 16 | ||
340 | xor eax, eax | ||
341 | mov al, dh | ||
342 | and edx, 255 | ||
343 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
344 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
345 | add ecx, ebx | ||
346 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
347 | xor ecx, ebx | ||
348 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
349 | sub ecx, ebx | ||
350 | xor edi, ecx | ||
351 | ; round 15 | ||
352 | mov edx, DWORD PTR 120[ebp] | ||
353 | mov ecx, DWORD PTR 124[ebp] | ||
354 | add edx, edi | ||
355 | rol edx, cl | ||
356 | mov ebx, edx | ||
357 | xor ecx, ecx | ||
358 | mov cl, dh | ||
359 | and ebx, 255 | ||
360 | shr edx, 16 | ||
361 | xor eax, eax | ||
362 | mov al, dh | ||
363 | and edx, 255 | ||
364 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
365 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
366 | xor ecx, ebx | ||
367 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
368 | sub ecx, ebx | ||
369 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
370 | add ecx, ebx | ||
371 | xor esi, ecx | ||
372 | $L000cast_enc_done: | ||
373 | nop | ||
374 | mov eax, DWORD PTR 20[esp] | ||
375 | mov DWORD PTR 4[eax],edi | ||
376 | mov DWORD PTR [eax],esi | ||
377 | pop edi | ||
378 | pop esi | ||
379 | pop ebx | ||
380 | pop ebp | ||
381 | ret | ||
382 | _CAST_encrypt ENDP | ||
383 | _TEXT ENDS | ||
384 | _TEXT SEGMENT | ||
385 | PUBLIC _CAST_decrypt | ||
386 | EXTERN _CAST_S_table0:DWORD | ||
387 | EXTERN _CAST_S_table1:DWORD | ||
388 | EXTERN _CAST_S_table2:DWORD | ||
389 | EXTERN _CAST_S_table3:DWORD | ||
390 | |||
391 | _CAST_decrypt PROC NEAR | ||
392 | ; | ||
393 | push ebp | ||
394 | push ebx | ||
395 | mov ebx, DWORD PTR 12[esp] | ||
396 | mov ebp, DWORD PTR 16[esp] | ||
397 | push esi | ||
398 | push edi | ||
399 | ; Load the 2 words | ||
400 | mov edi, DWORD PTR [ebx] | ||
401 | mov esi, DWORD PTR 4[ebx] | ||
402 | ; Get short key flag | ||
403 | mov eax, DWORD PTR 128[ebp] | ||
404 | or eax, eax | ||
405 | jnz $L001cast_dec_skip | ||
406 | xor eax, eax | ||
407 | ; round 15 | ||
408 | mov edx, DWORD PTR 120[ebp] | ||
409 | mov ecx, DWORD PTR 124[ebp] | ||
410 | add edx, esi | ||
411 | rol edx, cl | ||
412 | mov ebx, edx | ||
413 | xor ecx, ecx | ||
414 | mov cl, dh | ||
415 | and ebx, 255 | ||
416 | shr edx, 16 | ||
417 | xor eax, eax | ||
418 | mov al, dh | ||
419 | and edx, 255 | ||
420 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
421 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
422 | xor ecx, ebx | ||
423 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
424 | sub ecx, ebx | ||
425 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
426 | add ecx, ebx | ||
427 | xor edi, ecx | ||
428 | ; round 14 | ||
429 | mov edx, DWORD PTR 112[ebp] | ||
430 | mov ecx, DWORD PTR 116[ebp] | ||
431 | sub edx, edi | ||
432 | rol edx, cl | ||
433 | mov ebx, edx | ||
434 | xor ecx, ecx | ||
435 | mov cl, dh | ||
436 | and ebx, 255 | ||
437 | shr edx, 16 | ||
438 | xor eax, eax | ||
439 | mov al, dh | ||
440 | and edx, 255 | ||
441 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
442 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
443 | add ecx, ebx | ||
444 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
445 | xor ecx, ebx | ||
446 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
447 | sub ecx, ebx | ||
448 | xor esi, ecx | ||
449 | ; round 13 | ||
450 | mov edx, DWORD PTR 104[ebp] | ||
451 | mov ecx, DWORD PTR 108[ebp] | ||
452 | xor edx, esi | ||
453 | rol edx, cl | ||
454 | mov ebx, edx | ||
455 | xor ecx, ecx | ||
456 | mov cl, dh | ||
457 | and ebx, 255 | ||
458 | shr edx, 16 | ||
459 | xor eax, eax | ||
460 | mov al, dh | ||
461 | and edx, 255 | ||
462 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
463 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
464 | sub ecx, ebx | ||
465 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
466 | add ecx, ebx | ||
467 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
468 | xor ecx, ebx | ||
469 | xor edi, ecx | ||
470 | ; round 12 | ||
471 | mov edx, DWORD PTR 96[ebp] | ||
472 | mov ecx, DWORD PTR 100[ebp] | ||
473 | add edx, edi | ||
474 | rol edx, cl | ||
475 | mov ebx, edx | ||
476 | xor ecx, ecx | ||
477 | mov cl, dh | ||
478 | and ebx, 255 | ||
479 | shr edx, 16 | ||
480 | xor eax, eax | ||
481 | mov al, dh | ||
482 | and edx, 255 | ||
483 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
484 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
485 | xor ecx, ebx | ||
486 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
487 | sub ecx, ebx | ||
488 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
489 | add ecx, ebx | ||
490 | xor esi, ecx | ||
491 | $L001cast_dec_skip: | ||
492 | ; round 11 | ||
493 | mov edx, DWORD PTR 88[ebp] | ||
494 | mov ecx, DWORD PTR 92[ebp] | ||
495 | sub edx, esi | ||
496 | rol edx, cl | ||
497 | mov ebx, edx | ||
498 | xor ecx, ecx | ||
499 | mov cl, dh | ||
500 | and ebx, 255 | ||
501 | shr edx, 16 | ||
502 | xor eax, eax | ||
503 | mov al, dh | ||
504 | and edx, 255 | ||
505 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
506 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
507 | add ecx, ebx | ||
508 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
509 | xor ecx, ebx | ||
510 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
511 | sub ecx, ebx | ||
512 | xor edi, ecx | ||
513 | ; round 10 | ||
514 | mov edx, DWORD PTR 80[ebp] | ||
515 | mov ecx, DWORD PTR 84[ebp] | ||
516 | xor edx, edi | ||
517 | rol edx, cl | ||
518 | mov ebx, edx | ||
519 | xor ecx, ecx | ||
520 | mov cl, dh | ||
521 | and ebx, 255 | ||
522 | shr edx, 16 | ||
523 | xor eax, eax | ||
524 | mov al, dh | ||
525 | and edx, 255 | ||
526 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
527 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
528 | sub ecx, ebx | ||
529 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
530 | add ecx, ebx | ||
531 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
532 | xor ecx, ebx | ||
533 | xor esi, ecx | ||
534 | ; round 9 | ||
535 | mov edx, DWORD PTR 72[ebp] | ||
536 | mov ecx, DWORD PTR 76[ebp] | ||
537 | add edx, esi | ||
538 | rol edx, cl | ||
539 | mov ebx, edx | ||
540 | xor ecx, ecx | ||
541 | mov cl, dh | ||
542 | and ebx, 255 | ||
543 | shr edx, 16 | ||
544 | xor eax, eax | ||
545 | mov al, dh | ||
546 | and edx, 255 | ||
547 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
548 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
549 | xor ecx, ebx | ||
550 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
551 | sub ecx, ebx | ||
552 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
553 | add ecx, ebx | ||
554 | xor edi, ecx | ||
555 | ; round 8 | ||
556 | mov edx, DWORD PTR 64[ebp] | ||
557 | mov ecx, DWORD PTR 68[ebp] | ||
558 | sub edx, edi | ||
559 | rol edx, cl | ||
560 | mov ebx, edx | ||
561 | xor ecx, ecx | ||
562 | mov cl, dh | ||
563 | and ebx, 255 | ||
564 | shr edx, 16 | ||
565 | xor eax, eax | ||
566 | mov al, dh | ||
567 | and edx, 255 | ||
568 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
569 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
570 | add ecx, ebx | ||
571 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
572 | xor ecx, ebx | ||
573 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
574 | sub ecx, ebx | ||
575 | xor esi, ecx | ||
576 | ; round 7 | ||
577 | mov edx, DWORD PTR 56[ebp] | ||
578 | mov ecx, DWORD PTR 60[ebp] | ||
579 | xor edx, esi | ||
580 | rol edx, cl | ||
581 | mov ebx, edx | ||
582 | xor ecx, ecx | ||
583 | mov cl, dh | ||
584 | and ebx, 255 | ||
585 | shr edx, 16 | ||
586 | xor eax, eax | ||
587 | mov al, dh | ||
588 | and edx, 255 | ||
589 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
590 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
591 | sub ecx, ebx | ||
592 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
593 | add ecx, ebx | ||
594 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
595 | xor ecx, ebx | ||
596 | xor edi, ecx | ||
597 | ; round 6 | ||
598 | mov edx, DWORD PTR 48[ebp] | ||
599 | mov ecx, DWORD PTR 52[ebp] | ||
600 | add edx, edi | ||
601 | rol edx, cl | ||
602 | mov ebx, edx | ||
603 | xor ecx, ecx | ||
604 | mov cl, dh | ||
605 | and ebx, 255 | ||
606 | shr edx, 16 | ||
607 | xor eax, eax | ||
608 | mov al, dh | ||
609 | and edx, 255 | ||
610 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
611 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
612 | xor ecx, ebx | ||
613 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
614 | sub ecx, ebx | ||
615 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
616 | add ecx, ebx | ||
617 | xor esi, ecx | ||
618 | ; round 5 | ||
619 | mov edx, DWORD PTR 40[ebp] | ||
620 | mov ecx, DWORD PTR 44[ebp] | ||
621 | sub edx, esi | ||
622 | rol edx, cl | ||
623 | mov ebx, edx | ||
624 | xor ecx, ecx | ||
625 | mov cl, dh | ||
626 | and ebx, 255 | ||
627 | shr edx, 16 | ||
628 | xor eax, eax | ||
629 | mov al, dh | ||
630 | and edx, 255 | ||
631 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
632 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
633 | add ecx, ebx | ||
634 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
635 | xor ecx, ebx | ||
636 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
637 | sub ecx, ebx | ||
638 | xor edi, ecx | ||
639 | ; round 4 | ||
640 | mov edx, DWORD PTR 32[ebp] | ||
641 | mov ecx, DWORD PTR 36[ebp] | ||
642 | xor edx, edi | ||
643 | rol edx, cl | ||
644 | mov ebx, edx | ||
645 | xor ecx, ecx | ||
646 | mov cl, dh | ||
647 | and ebx, 255 | ||
648 | shr edx, 16 | ||
649 | xor eax, eax | ||
650 | mov al, dh | ||
651 | and edx, 255 | ||
652 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
653 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
654 | sub ecx, ebx | ||
655 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
656 | add ecx, ebx | ||
657 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
658 | xor ecx, ebx | ||
659 | xor esi, ecx | ||
660 | ; round 3 | ||
661 | mov edx, DWORD PTR 24[ebp] | ||
662 | mov ecx, DWORD PTR 28[ebp] | ||
663 | add edx, esi | ||
664 | rol edx, cl | ||
665 | mov ebx, edx | ||
666 | xor ecx, ecx | ||
667 | mov cl, dh | ||
668 | and ebx, 255 | ||
669 | shr edx, 16 | ||
670 | xor eax, eax | ||
671 | mov al, dh | ||
672 | and edx, 255 | ||
673 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
674 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
675 | xor ecx, ebx | ||
676 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
677 | sub ecx, ebx | ||
678 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
679 | add ecx, ebx | ||
680 | xor edi, ecx | ||
681 | ; round 2 | ||
682 | mov edx, DWORD PTR 16[ebp] | ||
683 | mov ecx, DWORD PTR 20[ebp] | ||
684 | sub edx, edi | ||
685 | rol edx, cl | ||
686 | mov ebx, edx | ||
687 | xor ecx, ecx | ||
688 | mov cl, dh | ||
689 | and ebx, 255 | ||
690 | shr edx, 16 | ||
691 | xor eax, eax | ||
692 | mov al, dh | ||
693 | and edx, 255 | ||
694 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
695 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
696 | add ecx, ebx | ||
697 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
698 | xor ecx, ebx | ||
699 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
700 | sub ecx, ebx | ||
701 | xor esi, ecx | ||
702 | ; round 1 | ||
703 | mov edx, DWORD PTR 8[ebp] | ||
704 | mov ecx, DWORD PTR 12[ebp] | ||
705 | xor edx, esi | ||
706 | rol edx, cl | ||
707 | mov ebx, edx | ||
708 | xor ecx, ecx | ||
709 | mov cl, dh | ||
710 | and ebx, 255 | ||
711 | shr edx, 16 | ||
712 | xor eax, eax | ||
713 | mov al, dh | ||
714 | and edx, 255 | ||
715 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
716 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
717 | sub ecx, ebx | ||
718 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
719 | add ecx, ebx | ||
720 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
721 | xor ecx, ebx | ||
722 | xor edi, ecx | ||
723 | ; round 0 | ||
724 | mov edx, DWORD PTR [ebp] | ||
725 | mov ecx, DWORD PTR 4[ebp] | ||
726 | add edx, edi | ||
727 | rol edx, cl | ||
728 | mov ebx, edx | ||
729 | xor ecx, ecx | ||
730 | mov cl, dh | ||
731 | and ebx, 255 | ||
732 | shr edx, 16 | ||
733 | xor eax, eax | ||
734 | mov al, dh | ||
735 | and edx, 255 | ||
736 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
737 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
738 | xor ecx, ebx | ||
739 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
740 | sub ecx, ebx | ||
741 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
742 | add ecx, ebx | ||
743 | xor esi, ecx | ||
744 | nop | ||
745 | mov eax, DWORD PTR 20[esp] | ||
746 | mov DWORD PTR 4[eax],edi | ||
747 | mov DWORD PTR [eax],esi | ||
748 | pop edi | ||
749 | pop esi | ||
750 | pop ebx | ||
751 | pop ebp | ||
752 | ret | ||
753 | _CAST_decrypt ENDP | ||
754 | _TEXT ENDS | ||
755 | _TEXT SEGMENT | ||
756 | PUBLIC _CAST_cbc_encrypt | ||
757 | |||
758 | _CAST_cbc_encrypt PROC NEAR | ||
759 | ; | ||
760 | push ebp | ||
761 | push ebx | ||
762 | push esi | ||
763 | push edi | ||
764 | mov ebp, DWORD PTR 28[esp] | ||
765 | ; getting iv ptr from parameter 4 | ||
766 | mov ebx, DWORD PTR 36[esp] | ||
767 | mov esi, DWORD PTR [ebx] | ||
768 | mov edi, DWORD PTR 4[ebx] | ||
769 | push edi | ||
770 | push esi | ||
771 | push edi | ||
772 | push esi | ||
773 | mov ebx, esp | ||
774 | mov esi, DWORD PTR 36[esp] | ||
775 | mov edi, DWORD PTR 40[esp] | ||
776 | ; getting encrypt flag from parameter 5 | ||
777 | mov ecx, DWORD PTR 56[esp] | ||
778 | ; get and push parameter 3 | ||
779 | mov eax, DWORD PTR 48[esp] | ||
780 | push eax | ||
781 | push ebx | ||
782 | cmp ecx, 0 | ||
783 | jz $L002decrypt | ||
784 | and ebp, 4294967288 | ||
785 | mov eax, DWORD PTR 8[esp] | ||
786 | mov ebx, DWORD PTR 12[esp] | ||
787 | jz $L003encrypt_finish | ||
788 | L004encrypt_loop: | ||
789 | mov ecx, DWORD PTR [esi] | ||
790 | mov edx, DWORD PTR 4[esi] | ||
791 | xor eax, ecx | ||
792 | xor ebx, edx | ||
793 | bswap eax | ||
794 | bswap ebx | ||
795 | mov DWORD PTR 8[esp],eax | ||
796 | mov DWORD PTR 12[esp],ebx | ||
797 | call _CAST_encrypt | ||
798 | mov eax, DWORD PTR 8[esp] | ||
799 | mov ebx, DWORD PTR 12[esp] | ||
800 | bswap eax | ||
801 | bswap ebx | ||
802 | mov DWORD PTR [edi],eax | ||
803 | mov DWORD PTR 4[edi],ebx | ||
804 | add esi, 8 | ||
805 | add edi, 8 | ||
806 | sub ebp, 8 | ||
807 | jnz L004encrypt_loop | ||
808 | $L003encrypt_finish: | ||
809 | mov ebp, DWORD PTR 52[esp] | ||
810 | and ebp, 7 | ||
811 | jz $L005finish | ||
812 | xor ecx, ecx | ||
813 | xor edx, edx | ||
814 | mov ebp, DWORD PTR $L006cbc_enc_jmp_table[ebp*4] | ||
815 | jmp ebp | ||
816 | L007ej7: | ||
817 | xor edx, edx | ||
818 | mov dh, BYTE PTR 6[esi] | ||
819 | shl edx, 8 | ||
820 | L008ej6: | ||
821 | mov dh, BYTE PTR 5[esi] | ||
822 | L009ej5: | ||
823 | mov dl, BYTE PTR 4[esi] | ||
824 | L010ej4: | ||
825 | mov ecx, DWORD PTR [esi] | ||
826 | jmp $L011ejend | ||
827 | L012ej3: | ||
828 | mov ch, BYTE PTR 2[esi] | ||
829 | xor ecx, ecx | ||
830 | shl ecx, 8 | ||
831 | L013ej2: | ||
832 | mov ch, BYTE PTR 1[esi] | ||
833 | L014ej1: | ||
834 | mov cl, BYTE PTR [esi] | ||
835 | $L011ejend: | ||
836 | xor eax, ecx | ||
837 | xor ebx, edx | ||
838 | bswap eax | ||
839 | bswap ebx | ||
840 | mov DWORD PTR 8[esp],eax | ||
841 | mov DWORD PTR 12[esp],ebx | ||
842 | call _CAST_encrypt | ||
843 | mov eax, DWORD PTR 8[esp] | ||
844 | mov ebx, DWORD PTR 12[esp] | ||
845 | bswap eax | ||
846 | bswap ebx | ||
847 | mov DWORD PTR [edi],eax | ||
848 | mov DWORD PTR 4[edi],ebx | ||
849 | jmp $L005finish | ||
850 | $L002decrypt: | ||
851 | and ebp, 4294967288 | ||
852 | mov eax, DWORD PTR 16[esp] | ||
853 | mov ebx, DWORD PTR 20[esp] | ||
854 | jz $L015decrypt_finish | ||
855 | L016decrypt_loop: | ||
856 | mov eax, DWORD PTR [esi] | ||
857 | mov ebx, DWORD PTR 4[esi] | ||
858 | bswap eax | ||
859 | bswap ebx | ||
860 | mov DWORD PTR 8[esp],eax | ||
861 | mov DWORD PTR 12[esp],ebx | ||
862 | call _CAST_decrypt | ||
863 | mov eax, DWORD PTR 8[esp] | ||
864 | mov ebx, DWORD PTR 12[esp] | ||
865 | bswap eax | ||
866 | bswap ebx | ||
867 | mov ecx, DWORD PTR 16[esp] | ||
868 | mov edx, DWORD PTR 20[esp] | ||
869 | xor ecx, eax | ||
870 | xor edx, ebx | ||
871 | mov eax, DWORD PTR [esi] | ||
872 | mov ebx, DWORD PTR 4[esi] | ||
873 | mov DWORD PTR [edi],ecx | ||
874 | mov DWORD PTR 4[edi],edx | ||
875 | mov DWORD PTR 16[esp],eax | ||
876 | mov DWORD PTR 20[esp],ebx | ||
877 | add esi, 8 | ||
878 | add edi, 8 | ||
879 | sub ebp, 8 | ||
880 | jnz L016decrypt_loop | ||
881 | $L015decrypt_finish: | ||
882 | mov ebp, DWORD PTR 52[esp] | ||
883 | and ebp, 7 | ||
884 | jz $L005finish | ||
885 | mov eax, DWORD PTR [esi] | ||
886 | mov ebx, DWORD PTR 4[esi] | ||
887 | bswap eax | ||
888 | bswap ebx | ||
889 | mov DWORD PTR 8[esp],eax | ||
890 | mov DWORD PTR 12[esp],ebx | ||
891 | call _CAST_decrypt | ||
892 | mov eax, DWORD PTR 8[esp] | ||
893 | mov ebx, DWORD PTR 12[esp] | ||
894 | bswap eax | ||
895 | bswap ebx | ||
896 | mov ecx, DWORD PTR 16[esp] | ||
897 | mov edx, DWORD PTR 20[esp] | ||
898 | xor ecx, eax | ||
899 | xor edx, ebx | ||
900 | mov eax, DWORD PTR [esi] | ||
901 | mov ebx, DWORD PTR 4[esi] | ||
902 | L017dj7: | ||
903 | ror edx, 16 | ||
904 | mov BYTE PTR 6[edi],dl | ||
905 | shr edx, 16 | ||
906 | L018dj6: | ||
907 | mov BYTE PTR 5[edi],dh | ||
908 | L019dj5: | ||
909 | mov BYTE PTR 4[edi],dl | ||
910 | L020dj4: | ||
911 | mov DWORD PTR [edi],ecx | ||
912 | jmp $L021djend | ||
913 | L022dj3: | ||
914 | ror ecx, 16 | ||
915 | mov BYTE PTR 2[edi],cl | ||
916 | shl ecx, 16 | ||
917 | L023dj2: | ||
918 | mov BYTE PTR 1[esi],ch | ||
919 | L024dj1: | ||
920 | mov BYTE PTR [esi], cl | ||
921 | $L021djend: | ||
922 | jmp $L005finish | ||
923 | $L005finish: | ||
924 | mov ecx, DWORD PTR 60[esp] | ||
925 | add esp, 24 | ||
926 | mov DWORD PTR [ecx],eax | ||
927 | mov DWORD PTR 4[ecx],ebx | ||
928 | pop edi | ||
929 | pop esi | ||
930 | pop ebx | ||
931 | pop ebp | ||
932 | ret | ||
933 | $L006cbc_enc_jmp_table: | ||
934 | DD 0 | ||
935 | DD L014ej1 | ||
936 | DD L013ej2 | ||
937 | DD L012ej3 | ||
938 | DD L010ej4 | ||
939 | DD L009ej5 | ||
940 | DD L008ej6 | ||
941 | DD L007ej7 | ||
942 | L025cbc_dec_jmp_table: | ||
943 | DD 0 | ||
944 | DD L024dj1 | ||
945 | DD L023dj2 | ||
946 | DD L022dj3 | ||
947 | DD L020dj4 | ||
948 | DD L019dj5 | ||
949 | DD L018dj6 | ||
950 | DD L017dj7 | ||
951 | _CAST_cbc_encrypt ENDP | ||
952 | _TEXT ENDS | ||
953 | END | ||
diff --git a/src/lib/libcrypto/cast/cast_lcl.h b/src/lib/libcrypto/cast/cast_lcl.h index cfe3842e91..5fab8a43f6 100644 --- a/src/lib/libcrypto/cast/cast_lcl.h +++ b/src/lib/libcrypto/cast/cast_lcl.h | |||
@@ -151,7 +151,7 @@ | |||
151 | *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \ | 151 | *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \ |
152 | *((c)++)=(unsigned char)(((l) )&0xff)) | 152 | *((c)++)=(unsigned char)(((l) )&0xff)) |
153 | 153 | ||
154 | #if defined(WIN32) | 154 | #if defined(WIN32) && defined(_MSC_VER) |
155 | #define ROTL(a,n) (_lrotl(a,n)) | 155 | #define ROTL(a,n) (_lrotl(a,n)) |
156 | #else | 156 | #else |
157 | #define ROTL(a,n) ((((a)<<(n))&0xffffffffL)|((a)>>(32-(n)))) | 157 | #define ROTL(a,n) ((((a)<<(n))&0xffffffffL)|((a)>>(32-(n)))) |
diff --git a/src/lib/libcrypto/comp/comp_err.c b/src/lib/libcrypto/comp/comp_err.c index 77a3f7070c..c10282a73c 100644 --- a/src/lib/libcrypto/comp/comp_err.c +++ b/src/lib/libcrypto/comp/comp_err.c | |||
@@ -54,7 +54,8 @@ | |||
54 | */ | 54 | */ |
55 | 55 | ||
56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes |
57 | * made to it will be overwritten when the script next updates this file. | 57 | * made to it will be overwritten when the script next updates this file, |
58 | * only reason strings will be preserved. | ||
58 | */ | 59 | */ |
59 | 60 | ||
60 | #include <stdio.h> | 61 | #include <stdio.h> |
diff --git a/src/lib/libcrypto/conf/conf_err.c b/src/lib/libcrypto/conf/conf_err.c index eb4b3cfc70..5c1ca59090 100644 --- a/src/lib/libcrypto/conf/conf_err.c +++ b/src/lib/libcrypto/conf/conf_err.c | |||
@@ -54,7 +54,8 @@ | |||
54 | */ | 54 | */ |
55 | 55 | ||
56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes |
57 | * made to it will be overwritten when the script next updates this file. | 57 | * made to it will be overwritten when the script next updates this file, |
58 | * only reason strings will be preserved. | ||
58 | */ | 59 | */ |
59 | 60 | ||
60 | #include <stdio.h> | 61 | #include <stdio.h> |
diff --git a/src/lib/libcrypto/cpt_err.c b/src/lib/libcrypto/cpt_err.c index c2a2dd4af6..dadd8d8d92 100644 --- a/src/lib/libcrypto/cpt_err.c +++ b/src/lib/libcrypto/cpt_err.c | |||
@@ -54,7 +54,8 @@ | |||
54 | */ | 54 | */ |
55 | 55 | ||
56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes |
57 | * made to it will be overwritten when the script next updates this file. | 57 | * made to it will be overwritten when the script next updates this file, |
58 | * only reason strings will be preserved. | ||
58 | */ | 59 | */ |
59 | 60 | ||
60 | #include <stdio.h> | 61 | #include <stdio.h> |
diff --git a/src/lib/libcrypto/crypto-lib.com b/src/lib/libcrypto/crypto-lib.com index 79d86771e8..8ddeafbc06 100644 --- a/src/lib/libcrypto/crypto-lib.com +++ b/src/lib/libcrypto/crypto-lib.com | |||
@@ -186,7 +186,7 @@ $ LIB_DES = "set_key,ecb_enc,cbc_enc,"+ - | |||
186 | "enc_read,enc_writ,ofb64enc,"+ - | 186 | "enc_read,enc_writ,ofb64enc,"+ - |
187 | "ofb_enc,str2key,pcbc_enc,qud_cksm,rand_key,"+ - | 187 | "ofb_enc,str2key,pcbc_enc,qud_cksm,rand_key,"+ - |
188 | "des_enc,fcrypt_b,read2pwd,"+ - | 188 | "des_enc,fcrypt_b,read2pwd,"+ - |
189 | "fcrypt,xcbc_enc,read_pwd,rpc_enc,cbc_cksm,supp,ede_cbcm_enc" | 189 | "fcrypt,xcbc_enc,read_pwd,rpc_enc,cbc_cksm,ede_cbcm_enc" |
190 | $ LIB_RC2 = "rc2_ecb,rc2_skey,rc2_cbc,rc2cfb64,rc2ofb64" | 190 | $ LIB_RC2 = "rc2_ecb,rc2_skey,rc2_cbc,rc2cfb64,rc2ofb64" |
191 | $ LIB_RC4 = "rc4_skey,rc4_enc" | 191 | $ LIB_RC4 = "rc4_skey,rc4_enc" |
192 | $ LIB_RC5 = "rc5_skey,rc5_ecb,rc5_enc,rc5cfb64,rc5ofb64" | 192 | $ LIB_RC5 = "rc5_skey,rc5_ecb,rc5_enc,rc5cfb64,rc5ofb64" |
@@ -208,7 +208,7 @@ $ LIB_BIO = "bio_lib,bio_cb,bio_err,"+ - | |||
208 | "bss_mem,bss_null,bss_fd,"+ - | 208 | "bss_mem,bss_null,bss_fd,"+ - |
209 | "bss_file,bss_sock,bss_conn,"+ - | 209 | "bss_file,bss_sock,bss_conn,"+ - |
210 | "bf_null,bf_buff,b_print,b_dump,"+ - | 210 | "bf_null,bf_buff,b_print,b_dump,"+ - |
211 | "b_sock,bss_acpt,bf_nbio,bss_rtcp,bss_bio" ! + ",bss_log" for syslog | 211 | "b_sock,bss_acpt,bf_nbio,bss_rtcp,bss_bio,bss_log" |
212 | $ LIB_STACK = "stack" | 212 | $ LIB_STACK = "stack" |
213 | $ LIB_LHASH = "lhash,lh_stats" | 213 | $ LIB_LHASH = "lhash,lh_stats" |
214 | $ LIB_RAND = "md_rand,randfile,rand_lib,rand_err,rand_egd" | 214 | $ LIB_RAND = "md_rand,randfile,rand_lib,rand_err,rand_egd" |
@@ -266,7 +266,7 @@ $! | |||
266 | $! Setup exceptional compilations | 266 | $! Setup exceptional compilations |
267 | $! | 267 | $! |
268 | $ COMPILEWITH_CC3 = ",bss_rtcp," | 268 | $ COMPILEWITH_CC3 = ",bss_rtcp," |
269 | $ COMPILEWITH_CC4 = ",a_utctm," | 269 | $ COMPILEWITH_CC4 = ",a_utctm,bss_log," |
270 | $ COMPILEWITH_CC5 = ",md2_dgst,md5_dgst,mdc2dgst,sha_dgst,sha1dgst," + - | 270 | $ COMPILEWITH_CC5 = ",md2_dgst,md5_dgst,mdc2dgst,sha_dgst,sha1dgst," + - |
271 | "rmd_dgst,bf_enc," | 271 | "rmd_dgst,bf_enc," |
272 | $! | 272 | $! |
@@ -1441,6 +1441,7 @@ $! | |||
1441 | $ IF P7 .NES. "" | 1441 | $ IF P7 .NES. "" |
1442 | $ THEN | 1442 | $ THEN |
1443 | $ ENCRYPT_TYPES = P7 | 1443 | $ ENCRYPT_TYPES = P7 |
1444 | $! NYI: ENCRYPT_PROGRAMS = P7 | ||
1444 | $ ENDIF | 1445 | $ ENDIF |
1445 | $! | 1446 | $! |
1446 | $! Time To RETURN... | 1447 | $! Time To RETURN... |
diff --git a/src/lib/libcrypto/des/DES.pod b/src/lib/libcrypto/des/DES.pod index 8a739e7ca0..e69de29bb2 100644 --- a/src/lib/libcrypto/des/DES.pod +++ b/src/lib/libcrypto/des/DES.pod | |||
@@ -1,16 +0,0 @@ | |||
1 | crypt <= crypt(buf,salt) | ||
2 | key <= set_odd_parity(key) | ||
3 | int <= is_weak_key(key) | ||
4 | keysched<= set_key(key) | ||
5 | key <= ecb_encrypt(string8,ks,enc) | ||
6 | key <= ecb3_encrypt(input,ks1,ks2,enc) | ||
7 | string <= cbc_encrypt(input,ks,ivec,enc) => ivec | ||
8 | string <= cbc3_encrypt(input,ks1,ks2,ivec1,ivec2,enc) => ivec1&ivec2 | ||
9 | ck1,ck2 <= cbc_cksum(input,ks,ivec) => ivec | ||
10 | string <= pcbc_encrypt(input,ks,ivec,enc) => ivec | ||
11 | string <= ofb_encrypt(input,numbits,ks,ivec) => ivec | ||
12 | string <= cfb_encrypt(input,numbits,ks,ivec,enc) => ivec | ||
13 | key <= random_key() | ||
14 | key <= string_to_key(string) | ||
15 | key1,key2<= string_to_2keys(string) | ||
16 | |||
diff --git a/src/lib/libcrypto/des/MODES.DES b/src/lib/libcrypto/des/MODES.DES index 0cbc44f51d..e69de29bb2 100644 --- a/src/lib/libcrypto/des/MODES.DES +++ b/src/lib/libcrypto/des/MODES.DES | |||
@@ -1,84 +0,0 @@ | |||
1 | Modes of DES | ||
2 | Quite a bit of the following information has been taken from | ||
3 | AS 2805.5.2 | ||
4 | Australian Standard | ||
5 | Electronic funds transfer - Requirements for interfaces, | ||
6 | Part 5.2: Modes of operation for an n-bit block cipher algorithm | ||
7 | Appendix A | ||
8 | |||
9 | There are several different modes in which DES can be used, they are | ||
10 | as follows. | ||
11 | |||
12 | Electronic Codebook Mode (ECB) (des_ecb_encrypt()) | ||
13 | - 64 bits are enciphered at a time. | ||
14 | - The order of the blocks can be rearranged without detection. | ||
15 | - The same plaintext block always produces the same ciphertext block | ||
16 | (for the same key) making it vulnerable to a 'dictionary attack'. | ||
17 | - An error will only affect one ciphertext block. | ||
18 | |||
19 | Cipher Block Chaining Mode (CBC) (des_cbc_encrypt()) | ||
20 | - a multiple of 64 bits are enciphered at a time. | ||
21 | - The CBC mode produces the same ciphertext whenever the same | ||
22 | plaintext is encrypted using the same key and starting variable. | ||
23 | - The chaining operation makes the ciphertext blocks dependent on the | ||
24 | current and all preceding plaintext blocks and therefore blocks can not | ||
25 | be rearranged. | ||
26 | - The use of different starting variables prevents the same plaintext | ||
27 | enciphering to the same ciphertext. | ||
28 | - An error will affect the current and the following ciphertext blocks. | ||
29 | |||
30 | Cipher Feedback Mode (CFB) (des_cfb_encrypt()) | ||
31 | - a number of bits (j) <= 64 are enciphered at a time. | ||
32 | - The CFB mode produces the same ciphertext whenever the same | ||
33 | plaintext is encrypted using the same key and starting variable. | ||
34 | - The chaining operation makes the ciphertext variables dependent on the | ||
35 | current and all preceding variables and therefore j-bit variables are | ||
36 | chained together and con not be rearranged. | ||
37 | - The use of different starting variables prevents the same plaintext | ||
38 | enciphering to the same ciphertext. | ||
39 | - The strength of the CFB mode depends on the size of k (maximal if | ||
40 | j == k). In my implementation this is always the case. | ||
41 | - Selection of a small value for j will require more cycles through | ||
42 | the encipherment algorithm per unit of plaintext and thus cause | ||
43 | greater processing overheads. | ||
44 | - Only multiples of j bits can be enciphered. | ||
45 | - An error will affect the current and the following ciphertext variables. | ||
46 | |||
47 | Output Feedback Mode (OFB) (des_ofb_encrypt()) | ||
48 | - a number of bits (j) <= 64 are enciphered at a time. | ||
49 | - The OFB mode produces the same ciphertext whenever the same | ||
50 | plaintext enciphered using the same key and starting variable. More | ||
51 | over, in the OFB mode the same key stream is produced when the same | ||
52 | key and start variable are used. Consequently, for security reasons | ||
53 | a specific start variable should be used only once for a given key. | ||
54 | - The absence of chaining makes the OFB more vulnerable to specific attacks. | ||
55 | - The use of different start variables values prevents the same | ||
56 | plaintext enciphering to the same ciphertext, by producing different | ||
57 | key streams. | ||
58 | - Selection of a small value for j will require more cycles through | ||
59 | the encipherment algorithm per unit of plaintext and thus cause | ||
60 | greater processing overheads. | ||
61 | - Only multiples of j bits can be enciphered. | ||
62 | - OFB mode of operation does not extend ciphertext errors in the | ||
63 | resultant plaintext output. Every bit error in the ciphertext causes | ||
64 | only one bit to be in error in the deciphered plaintext. | ||
65 | - OFB mode is not self-synchronising. If the two operation of | ||
66 | encipherment and decipherment get out of synchronism, the system needs | ||
67 | to be re-initialised. | ||
68 | - Each re-initialisation should use a value of the start variable | ||
69 | different from the start variable values used before with the same | ||
70 | key. The reason for this is that an identical bit stream would be | ||
71 | produced each time from the same parameters. This would be | ||
72 | susceptible to a 'known plaintext' attack. | ||
73 | |||
74 | Triple ECB Mode (des_ecb3_encrypt()) | ||
75 | - Encrypt with key1, decrypt with key2 and encrypt with key1 again. | ||
76 | - As for ECB encryption but increases the effective key length to 112 bits. | ||
77 | - If both keys are the same it is equivalent to encrypting once with | ||
78 | just one key. | ||
79 | |||
80 | Triple CBC Mode (des_3cbc_encrypt()) | ||
81 | - Encrypt with key1, decrypt with key2 and encrypt with key1 again. | ||
82 | - As for CBC encryption but increases the effective key length to 112 bits. | ||
83 | - If both keys are the same it is equivalent to encrypting once with | ||
84 | just one key. | ||
diff --git a/src/lib/libcrypto/des/Makefile.PL b/src/lib/libcrypto/des/Makefile.PL index b54a24387c..e69de29bb2 100644 --- a/src/lib/libcrypto/des/Makefile.PL +++ b/src/lib/libcrypto/des/Makefile.PL | |||
@@ -1,14 +0,0 @@ | |||
1 | use ExtUtils::MakeMaker; | ||
2 | # See lib/ExtUtils/MakeMaker.pm for details of how to influence | ||
3 | # the contents of the Makefile being created. | ||
4 | &writeMakefile( | ||
5 | 'potential_libs' => '', # e.g., '-lm' | ||
6 | 'INC' => '', # e.g., '-I/usr/include/other' | ||
7 | 'DISTNAME' => 'DES', | ||
8 | 'VERSION' => '0.1', | ||
9 | 'DEFINE' => '-DPERL5', | ||
10 | 'OBJECT' => 'DES.o cbc_cksm.o cbc_enc.o ecb_enc.o pcbc_enc.o \ | ||
11 | rand_key.o set_key.o str2key.o \ | ||
12 | enc_read.o enc_writ.o fcrypt.o cfb_enc.o \ | ||
13 | ecb3_enc.o ofb_enc.o cbc3_enc.o des_enc.o', | ||
14 | ); | ||
diff --git a/src/lib/libcrypto/des/Makefile.lit b/src/lib/libcrypto/des/Makefile.lit index c09f6969da..e69de29bb2 100644 --- a/src/lib/libcrypto/des/Makefile.lit +++ b/src/lib/libcrypto/des/Makefile.lit | |||
@@ -1,250 +0,0 @@ | |||
1 | # You must select the correct terminal control system to be used to | ||
2 | # turn character echo off when reading passwords. There a 5 systems | ||
3 | # SGTTY - the old BSD system | ||
4 | # TERMIO - most system V boxes | ||
5 | # TERMIOS - SGI (ala IRIX). | ||
6 | # VMS - the DEC operating system | ||
7 | # MSDOS - we all know what it is :-) | ||
8 | # read_pwd.c makes a reasonable guess at what is correct. | ||
9 | |||
10 | # Targets | ||
11 | # make - twidle the options yourself :-) | ||
12 | # make cc - standard cc options | ||
13 | # make gcc - standard gcc options | ||
14 | # make x86-elf - linux-elf etc | ||
15 | # make x86-out - linux-a.out, FreeBSD etc | ||
16 | # make x86-solaris | ||
17 | # make x86-bdsi | ||
18 | |||
19 | # If you are on a DEC Alpha, edit des.h and change the DES_LONG | ||
20 | # define to 'unsigned int'. I have seen this give a %20 speedup. | ||
21 | |||
22 | OPTS0= -DLIBDES_LIT -DRAND -DTERMIO #-DNOCONST | ||
23 | |||
24 | # Version 1.94 has changed the strings_to_key function so that it is | ||
25 | # now compatible with MITs when the string is longer than 8 characters. | ||
26 | # If you wish to keep the old version, uncomment the following line. | ||
27 | # This will affect the -E/-D options on des(1). | ||
28 | #OPTS1= -DOLD_STR_TO_KEY | ||
29 | |||
30 | # There are 4 possible performance options | ||
31 | # -DDES_PTR | ||
32 | # -DDES_RISC1 | ||
33 | # -DDES_RISC2 (only one of DES_RISC1 and DES_RISC2) | ||
34 | # -DDES_UNROLL | ||
35 | # after the initial build, run 'des_opts' to see which options are best | ||
36 | # for your platform. There are some listed in options.txt | ||
37 | #OPTS2= -DDES_PTR | ||
38 | #OPTS3= -DDES_RISC1 # or DES_RISC2 | ||
39 | #OPTS4= -DDES_UNROLL | ||
40 | |||
41 | OPTS= $(OPTS0) $(OPTS1) $(OPTS2) $(OPTS3) $(OPTS4) | ||
42 | |||
43 | MAKE=make -f Makefile | ||
44 | #CC=cc | ||
45 | #CFLAG= -O | ||
46 | |||
47 | CC=gcc | ||
48 | #CFLAG= -O4 -funroll-loops -fomit-frame-pointer | ||
49 | CFLAG= -O3 -fomit-frame-pointer | ||
50 | |||
51 | CFLAGS=$(OPTS) $(CFLAG) | ||
52 | CPP=$(CC) -E | ||
53 | AS=as | ||
54 | |||
55 | # Assember version of des_encrypt*(). | ||
56 | DES_ENC=des_enc.o fcrypt_b.o # normal C version | ||
57 | #DES_ENC=asm/dx86-elf.o asm/yx86-elf.o # elf format x86 | ||
58 | #DES_ENC=asm/dx86-out.o asm/yx86-out.o # a.out format x86 | ||
59 | #DES_ENC=asm/dx86-sol.o asm/yx86-sol.o # solaris format x86 | ||
60 | #DES_ENC=asm/dx86bsdi.o asm/yx86basi.o # bsdi format x86 | ||
61 | |||
62 | LIBDIR=/usr/local/lib | ||
63 | BINDIR=/usr/local/bin | ||
64 | INCDIR=/usr/local/include | ||
65 | MANDIR=/usr/local/man | ||
66 | MAN1=1 | ||
67 | MAN3=3 | ||
68 | SHELL=/bin/sh | ||
69 | OBJ_LIT=cbc_enc.o ecb_enc.o $(DES_ENC) fcrypt.o set_key.o | ||
70 | OBJ_FULL=cbc_cksm.o $(OBJ_LIT) pcbc_enc.o \ | ||
71 | xcbc_enc.o qud_cksm.o \ | ||
72 | cfb64ede.o cfb64enc.o cfb_enc.o ecb3_enc.o \ | ||
73 | enc_read.o enc_writ.o ofb64ede.o ofb64enc.o ofb_enc.o \ | ||
74 | rand_key.o read_pwd.o read2pwd.o rpc_enc.o str2key.o supp.o | ||
75 | |||
76 | GENERAL_LIT=COPYRIGHT INSTALL README VERSION Makefile des_crypt.man \ | ||
77 | des.doc options.txt asm | ||
78 | GENERAL_FULL=$(GENERAL_LIT) FILES Imakefile times vms.com KERBEROS MODES.DES \ | ||
79 | des.man DES.pm DES.pod DES.xs Makefile.PL dess.cpp des3s.cpp \ | ||
80 | Makefile.uni typemap t Makefile.ssl makefile.bc Makefile.lit \ | ||
81 | des.org des_locl.org | ||
82 | TESTING_LIT= destest speed des_opts | ||
83 | TESTING_FULL= rpw $(TESTING_LIT) | ||
84 | TESTING_SRC_LIT=destest.c speed.c des_opts.c | ||
85 | TESTING_SRC_FULL=rpw.c $(TESTING_SRC_LIT) | ||
86 | HEADERS_LIT=des_ver.h des.h des_locl.h podd.h sk.h spr.h | ||
87 | HEADERS_FULL= $(HEADERS_LIT) rpc_des.h | ||
88 | LIBDES_LIT=cbc_enc.c ecb_enc.c fcrypt.c set_key.c des_enc.c fcrypt_b.c | ||
89 | LIBDES_FULL= cbc_cksm.c pcbc_enc.c qud_cksm.c \ | ||
90 | cfb64ede.c cfb64enc.c cfb_enc.c ecb3_enc.c \ | ||
91 | enc_read.c enc_writ.c ofb64ede.c ofb64enc.c ofb_enc.c \ | ||
92 | rand_key.c rpc_enc.c str2key.c supp.c \ | ||
93 | xcbc_enc.c $(LIBDES_LIT) read_pwd.c read2pwd.c | ||
94 | |||
95 | PERL= des.pl testdes.pl doIP doPC1 doPC2 PC1 PC2 shifts.pl | ||
96 | |||
97 | OBJ= $(OBJ_LIT) | ||
98 | GENERAL=$(GENERAL_LIT) | ||
99 | TESTING=$(TESTING_LIT) | ||
100 | TESTING_SRC=$(TESTING_SRC_LIT) | ||
101 | HEADERS=$(HEADERS_LIT) | ||
102 | LIBDES= $(LIBDES_LIT) | ||
103 | |||
104 | ALL= $(GENERAL) $(TESTING_SRC) $(LIBDES) $(PERL) $(HEADERS) | ||
105 | |||
106 | DLIB= libdes.a | ||
107 | |||
108 | all: $(DLIB) $(TESTING) | ||
109 | |||
110 | cc: | ||
111 | $(MAKE) CC=cc CFLAGS="-O $(OPTS) $(CFLAG)" all | ||
112 | |||
113 | gcc: | ||
114 | $(MAKE) CC=gcc CFLAGS="-O3 -fomit-frame-pointer $(OPTS) $(CFLAG)" all | ||
115 | |||
116 | x86-elf: | ||
117 | $(MAKE) DES_ENC='asm/dx86-elf.o asm/yx86-elf.o' CC=$(CC) CFLAGS="-DELF $(OPTS) $(CFLAG)" all | ||
118 | |||
119 | x86-out: | ||
120 | $(MAKE) DES_ENC='asm/dx86-out.o asm/yx86-out.o' CC=$(CC) CFLAGS="-DOUT $(OPTS) $(CFLAG)" all | ||
121 | |||
122 | x86-solaris: | ||
123 | $(MAKE) DES_ENC='asm/dx86-sol.o asm/yx86-sol.o' CC=$(CC) CFLAGS="-DSOL $(OPTS) $(CFLAG)" all | ||
124 | |||
125 | x86-bsdi: | ||
126 | $(MAKE) DES_ENC='asm/dx86bsdi.o asm/yx86bsdi.o' CC=$(CC) CFLAGS="-DBSDI $(OPTS) $(CFLAG)" all | ||
127 | |||
128 | # elf | ||
129 | asm/dx86-elf.o: asm/dx86unix.cpp | ||
130 | $(CPP) -DELF asm/dx86unix.cpp | $(AS) -o asm/dx86-elf.o | ||
131 | |||
132 | asm/yx86-elf.o: asm/yx86unix.cpp | ||
133 | $(CPP) -DELF asm/yx86unix.cpp | $(AS) -o asm/yx86-elf.o | ||
134 | |||
135 | # solaris | ||
136 | asm/dx86-sol.o: asm/dx86unix.cpp | ||
137 | $(CC) -E -DSOL asm/dx86unix.cpp | sed 's/^#.*//' > asm/dx86-sol.s | ||
138 | as -o asm/dx86-sol.o asm/dx86-sol.s | ||
139 | rm -f asm/dx86-sol.s | ||
140 | |||
141 | asm/yx86-sol.o: asm/yx86unix.cpp | ||
142 | $(CC) -E -DSOL asm/yx86unix.cpp | sed 's/^#.*//' > asm/yx86-sol.s | ||
143 | as -o asm/yx86-sol.o asm/yx86-sol.s | ||
144 | rm -f asm/yx86-sol.s | ||
145 | |||
146 | # a.out | ||
147 | asm/dx86-out.o: asm/dx86unix.cpp | ||
148 | $(CPP) -DOUT asm/dx86unix.cpp | $(AS) -o asm/dx86-out.o | ||
149 | |||
150 | asm/yx86-out.o: asm/yx86unix.cpp | ||
151 | $(CPP) -DOUT asm/yx86unix.cpp | $(AS) -o asm/yx86-out.o | ||
152 | |||
153 | # bsdi | ||
154 | asm/dx86bsdi.o: asm/dx86unix.cpp | ||
155 | $(CPP) -DBSDI asm/dx86unix.cpp | $(AS) -o asm/dx86bsdi.o | ||
156 | |||
157 | asm/yx86bsdi.o: asm/yx86unix.cpp | ||
158 | $(CPP) -DBSDI asm/yx86unix.cpp | $(AS) -o asm/yx86bsdi.o | ||
159 | |||
160 | asm/dx86unix.cpp: | ||
161 | (cd asm; perl des-586.pl cpp >dx86unix.cpp) | ||
162 | |||
163 | asm/yx86unix.cpp: | ||
164 | (cd asm; perl crypt586.pl cpp >yx86unix.cpp) | ||
165 | |||
166 | test: all | ||
167 | ./destest | ||
168 | |||
169 | $(DLIB): $(OBJ) | ||
170 | /bin/rm -f $(DLIB) | ||
171 | ar cr $(DLIB) $(OBJ) | ||
172 | -if test -s /bin/ranlib; then /bin/ranlib $(DLIB); \ | ||
173 | else if test -s /usr/bin/ranlib; then /usr/bin/ranlib $(DLIB); \ | ||
174 | else exit 0; fi; fi | ||
175 | |||
176 | des_opts: des_opts.o $(DLIB) | ||
177 | $(CC) $(CFLAGS) -o des_opts des_opts.o $(DLIB) | ||
178 | |||
179 | destest: destest.o $(DLIB) | ||
180 | $(CC) $(CFLAGS) -o destest destest.o $(DLIB) | ||
181 | |||
182 | rpw: rpw.o $(DLIB) | ||
183 | $(CC) $(CFLAGS) -o rpw rpw.o $(DLIB) | ||
184 | |||
185 | speed: speed.o $(DLIB) | ||
186 | $(CC) $(CFLAGS) -o speed speed.o $(DLIB) | ||
187 | |||
188 | des: des.o $(DLIB) | ||
189 | $(CC) $(CFLAGS) -o des des.o $(DLIB) | ||
190 | |||
191 | tags: | ||
192 | ctags $(TESTING_SRC) $(LIBDES) | ||
193 | |||
194 | tar_lit: | ||
195 | /bin/mv Makefile Makefile.tmp | ||
196 | /bin/cp Makefile.lit Makefile | ||
197 | tar chf libdes-l.tar $(LIBDES_LIT) $(HEADERS_LIT) \ | ||
198 | $(GENERAL_LIT) $(TESTING_SRC_LIT) | ||
199 | /bin/rm -f Makefile | ||
200 | /bin/mv Makefile.tmp Makefile | ||
201 | |||
202 | tar: | ||
203 | tar chf libdes.tar $(ALL) | ||
204 | |||
205 | shar: | ||
206 | shar $(ALL) >libdes.shar | ||
207 | |||
208 | depend: | ||
209 | makedepend $(LIBDES) $(TESTING_SRC) | ||
210 | |||
211 | clean: | ||
212 | /bin/rm -f *.o tags core $(TESTING) $(DLIB) .nfs* *.old *.bak asm/*.o | ||
213 | |||
214 | dclean: | ||
215 | sed -e '/^# DO NOT DELETE THIS LINE/ q' Makefile >Makefile.new | ||
216 | mv -f Makefile.new Makefile | ||
217 | |||
218 | # Eric is probably going to choke when he next looks at this --tjh | ||
219 | install: | ||
220 | if test $(INSTALLTOP); then \ | ||
221 | echo SSL style install; \ | ||
222 | cp $(DLIB) $(INSTALLTOP)/lib; \ | ||
223 | if test -s /bin/ranlib; then \ | ||
224 | /bin/ranlib $(INSTALLTOP)/lib/$(DLIB); \ | ||
225 | else \ | ||
226 | if test -s /usr/bin/ranlib; then \ | ||
227 | /usr/bin/ranlib $(INSTALLTOP)/lib/$(DLIB); \ | ||
228 | fi; fi; \ | ||
229 | chmod 644 $(INSTALLTOP)/lib/$(DLIB); \ | ||
230 | cp des.h $(INSTALLTOP)/include; \ | ||
231 | chmod 644 $(INSTALLTOP)/include/des.h; \ | ||
232 | else \ | ||
233 | echo Standalone install; \ | ||
234 | cp $(DLIB) $(LIBDIR)/$(DLIB); \ | ||
235 | if test -s /bin/ranlib; then \ | ||
236 | /bin/ranlib $(LIBDIR)/$(DLIB); \ | ||
237 | else \ | ||
238 | if test -s /usr/bin/ranlib; then \ | ||
239 | /usr/bin/ranlib $(LIBDIR)/$(DLIB); \ | ||
240 | fi; \ | ||
241 | fi; \ | ||
242 | chmod 644 $(LIBDIR)/$(DLIB); \ | ||
243 | cp des_crypt.man $(MANDIR)/man$(MAN3)/des_crypt.$(MAN3); \ | ||
244 | chmod 644 $(MANDIR)/man$(MAN3)/des_crypt.$(MAN3); \ | ||
245 | cp des.man $(MANDIR)/man$(MAN1)/des.$(MAN1); \ | ||
246 | chmod 644 $(MANDIR)/man$(MAN1)/des.$(MAN1); \ | ||
247 | cp des.h $(INCDIR)/des.h; \ | ||
248 | chmod 644 $(INCDIR)/des.h; \ | ||
249 | fi | ||
250 | # DO NOT DELETE THIS LINE -- make depend depends on it. | ||
diff --git a/src/lib/libcrypto/des/Makefile.ssl b/src/lib/libcrypto/des/Makefile.ssl index 41976655e9..3eb0738b7b 100644 --- a/src/lib/libcrypto/des/Makefile.ssl +++ b/src/lib/libcrypto/des/Makefile.ssl | |||
@@ -32,21 +32,21 @@ LIBSRC= cbc_cksm.c cbc_enc.c cfb64enc.c cfb_enc.c \ | |||
32 | fcrypt.c ofb64enc.c ofb_enc.c pcbc_enc.c \ | 32 | fcrypt.c ofb64enc.c ofb_enc.c pcbc_enc.c \ |
33 | qud_cksm.c rand_key.c read_pwd.c rpc_enc.c set_key.c \ | 33 | qud_cksm.c rand_key.c read_pwd.c rpc_enc.c set_key.c \ |
34 | des_enc.c fcrypt_b.c read2pwd.c \ | 34 | des_enc.c fcrypt_b.c read2pwd.c \ |
35 | fcrypt.c xcbc_enc.c \ | 35 | xcbc_enc.c \ |
36 | str2key.c cfb64ede.c ofb64ede.c supp.c ede_cbcm_enc.c | 36 | str2key.c cfb64ede.c ofb64ede.c ede_cbcm_enc.c |
37 | 37 | ||
38 | LIBOBJ= set_key.o ecb_enc.o cbc_enc.o \ | 38 | LIBOBJ= set_key.o ecb_enc.o cbc_enc.o \ |
39 | ecb3_enc.o cfb64enc.o cfb64ede.o cfb_enc.o ofb64ede.o \ | 39 | ecb3_enc.o cfb64enc.o cfb64ede.o cfb_enc.o ofb64ede.o \ |
40 | enc_read.o enc_writ.o ofb64enc.o \ | 40 | enc_read.o enc_writ.o ofb64enc.o \ |
41 | ofb_enc.o str2key.o pcbc_enc.o qud_cksm.o rand_key.o \ | 41 | ofb_enc.o str2key.o pcbc_enc.o qud_cksm.o rand_key.o \ |
42 | ${DES_ENC} read2pwd.o \ | 42 | ${DES_ENC} read2pwd.o \ |
43 | fcrypt.o xcbc_enc.o read_pwd.o rpc_enc.o cbc_cksm.o supp.o \ | 43 | fcrypt.o xcbc_enc.o read_pwd.o rpc_enc.o cbc_cksm.o \ |
44 | ede_cbcm_enc.o | 44 | ede_cbcm_enc.o |
45 | 45 | ||
46 | SRC= $(LIBSRC) | 46 | SRC= $(LIBSRC) |
47 | 47 | ||
48 | EXHEADER= des.h | 48 | EXHEADER= des.h |
49 | HEADER= des_locl.h rpc_des.h podd.h sk.h spr.h des_ver.h $(EXHEADER) | 49 | HEADER= des_locl.h rpc_des.h spr.h des_ver.h $(EXHEADER) |
50 | 50 | ||
51 | ALL= $(GENERAL) $(SRC) $(HEADER) | 51 | ALL= $(GENERAL) $(SRC) $(HEADER) |
52 | 52 | ||
@@ -65,10 +65,10 @@ des: des.o cbc3_enc.o lib | |||
65 | 65 | ||
66 | # elf | 66 | # elf |
67 | asm/dx86-elf.o: asm/dx86unix.cpp | 67 | asm/dx86-elf.o: asm/dx86unix.cpp |
68 | $(CPP) -DELF asm/dx86unix.cpp | as -o asm/dx86-elf.o | 68 | $(CPP) -DELF -x c asm/dx86unix.cpp | as -o asm/dx86-elf.o |
69 | 69 | ||
70 | asm/yx86-elf.o: asm/yx86unix.cpp | 70 | asm/yx86-elf.o: asm/yx86unix.cpp |
71 | $(CPP) -DELF asm/yx86unix.cpp | as -o asm/yx86-elf.o | 71 | $(CPP) -DELF -x c asm/yx86unix.cpp | as -o asm/yx86-elf.o |
72 | 72 | ||
73 | # solaris | 73 | # solaris |
74 | asm/dx86-sol.o: asm/dx86unix.cpp | 74 | asm/dx86-sol.o: asm/dx86unix.cpp |
@@ -95,10 +95,10 @@ asm/dx86bsdi.o: asm/dx86unix.cpp | |||
95 | asm/yx86bsdi.o: asm/yx86unix.cpp | 95 | asm/yx86bsdi.o: asm/yx86unix.cpp |
96 | $(CPP) -DBSDI asm/yx86unix.cpp | sed 's/ :/:/' | as -o asm/yx86bsdi.o | 96 | $(CPP) -DBSDI asm/yx86unix.cpp | sed 's/ :/:/' | as -o asm/yx86bsdi.o |
97 | 97 | ||
98 | asm/dx86unix.cpp: asm/des-586.pl | 98 | asm/dx86unix.cpp: asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl |
99 | (cd asm; $(PERL) des-586.pl cpp >dx86unix.cpp) | 99 | (cd asm; $(PERL) des-586.pl cpp >dx86unix.cpp) |
100 | 100 | ||
101 | asm/yx86unix.cpp: asm/crypt586.pl | 101 | asm/yx86unix.cpp: asm/crypt586.pl ../perlasm/x86asm.pl |
102 | (cd asm; $(PERL) crypt586.pl cpp >yx86unix.cpp) | 102 | (cd asm; $(PERL) crypt586.pl cpp >yx86unix.cpp) |
103 | 103 | ||
104 | files: | 104 | files: |
@@ -172,10 +172,8 @@ enc_writ.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h | |||
172 | enc_writ.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h | 172 | enc_writ.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h |
173 | enc_writ.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | 173 | enc_writ.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h |
174 | enc_writ.o: ../cryptlib.h des_locl.h | 174 | enc_writ.o: ../cryptlib.h des_locl.h |
175 | fcrypt.o: ../../include/openssl/des.h ../../include/openssl/des.h | 175 | fcrypt.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h |
176 | fcrypt.o: ../../include/openssl/e_os2.h ../../include/openssl/e_os2.h | 176 | fcrypt.o: ../../include/openssl/opensslconf.h des_locl.h |
177 | fcrypt.o: ../../include/openssl/opensslconf.h | ||
178 | fcrypt.o: ../../include/openssl/opensslconf.h des_locl.h des_locl.h | ||
179 | fcrypt_b.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h | 177 | fcrypt_b.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h |
180 | fcrypt_b.o: ../../include/openssl/opensslconf.h des_locl.h | 178 | fcrypt_b.o: ../../include/openssl/opensslconf.h des_locl.h |
181 | ofb64ede.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h | 179 | ofb64ede.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h |
@@ -201,10 +199,8 @@ read_pwd.o: ../../include/openssl/stack.h ../cryptlib.h des_locl.h | |||
201 | rpc_enc.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h | 199 | rpc_enc.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h |
202 | rpc_enc.o: ../../include/openssl/opensslconf.h des_locl.h des_ver.h rpc_des.h | 200 | rpc_enc.o: ../../include/openssl/opensslconf.h des_locl.h des_ver.h rpc_des.h |
203 | set_key.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h | 201 | set_key.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h |
204 | set_key.o: ../../include/openssl/opensslconf.h des_locl.h podd.h sk.h | 202 | set_key.o: ../../include/openssl/opensslconf.h des_locl.h |
205 | str2key.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h | 203 | str2key.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h |
206 | str2key.o: ../../include/openssl/opensslconf.h des_locl.h | 204 | str2key.o: ../../include/openssl/opensslconf.h des_locl.h |
207 | supp.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h | ||
208 | supp.o: ../../include/openssl/opensslconf.h des_locl.h | ||
209 | xcbc_enc.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h | 205 | xcbc_enc.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h |
210 | xcbc_enc.o: ../../include/openssl/opensslconf.h des_locl.h | 206 | xcbc_enc.o: ../../include/openssl/opensslconf.h des_locl.h |
diff --git a/src/lib/libcrypto/des/Makefile.uni b/src/lib/libcrypto/des/Makefile.uni index ec19d75b81..e69de29bb2 100644 --- a/src/lib/libcrypto/des/Makefile.uni +++ b/src/lib/libcrypto/des/Makefile.uni | |||
@@ -1,251 +0,0 @@ | |||
1 | # You must select the correct terminal control system to be used to | ||
2 | # turn character echo off when reading passwords. There a 5 systems | ||
3 | # SGTTY - the old BSD system | ||
4 | # TERMIO - most system V boxes | ||
5 | # TERMIOS - SGI (ala IRIX). | ||
6 | # VMS - the DEC operating system | ||
7 | # MSDOS - we all know what it is :-) | ||
8 | # read_pwd.c makes a reasonable guess at what is correct. | ||
9 | |||
10 | # Targets | ||
11 | # make - twidle the options yourself :-) | ||
12 | # make cc - standard cc options | ||
13 | # make gcc - standard gcc options | ||
14 | # make x86-elf - linux-elf etc | ||
15 | # make x86-out - linux-a.out, FreeBSD etc | ||
16 | # make x86-solaris | ||
17 | # make x86-bdsi | ||
18 | |||
19 | # If you are on a DEC Alpha, edit des.h and change the DES_LONG | ||
20 | # define to 'unsigned int'. I have seen this give a %20 speedup. | ||
21 | |||
22 | OPTS0= -DRAND -DTERMIO #-DNOCONST | ||
23 | |||
24 | # Version 1.94 has changed the strings_to_key function so that it is | ||
25 | # now compatible with MITs when the string is longer than 8 characters. | ||
26 | # If you wish to keep the old version, uncomment the following line. | ||
27 | # This will affect the -E/-D options on des(1). | ||
28 | #OPTS1= -DOLD_STR_TO_KEY | ||
29 | |||
30 | # There are 4 possible performance options | ||
31 | # -DDES_PTR | ||
32 | # -DDES_RISC1 | ||
33 | # -DDES_RISC2 (only one of DES_RISC1 and DES_RISC2) | ||
34 | # -DDES_UNROLL | ||
35 | # after the initial build, run 'des_opts' to see which options are best | ||
36 | # for your platform. There are some listed in options.txt | ||
37 | #OPTS2= -DDES_PTR | ||
38 | #OPTS3= -DDES_RISC1 # or DES_RISC2 | ||
39 | #OPTS4= -DDES_UNROLL | ||
40 | |||
41 | OPTS= $(OPTS0) $(OPTS1) $(OPTS2) $(OPTS3) $(OPTS4) | ||
42 | |||
43 | MAKE=make -f Makefile | ||
44 | #CC=cc | ||
45 | #CFLAG= -O | ||
46 | |||
47 | CC=gcc | ||
48 | #CFLAG= -O4 -funroll-loops -fomit-frame-pointer | ||
49 | CFLAG= -O3 -fomit-frame-pointer | ||
50 | |||
51 | CFLAGS=$(OPTS) $(CFLAG) | ||
52 | CPP=$(CC) -E | ||
53 | AS=as | ||
54 | RANLIB=ranlib | ||
55 | |||
56 | # Assember version of des_encrypt*(). | ||
57 | DES_ENC=des_enc.o fcrypt_b.o # normal C version | ||
58 | #DES_ENC=asm/dx86-elf.o asm/yx86-elf.o # elf format x86 | ||
59 | #DES_ENC=asm/dx86-out.o asm/yx86-out.o # a.out format x86 | ||
60 | #DES_ENC=asm/dx86-sol.o asm/yx86-sol.o # solaris format x86 | ||
61 | #DES_ENC=asm/dx86bsdi.o asm/yx86basi.o # bsdi format x86 | ||
62 | |||
63 | LIBDIR=/usr/local/lib | ||
64 | BINDIR=/usr/local/bin | ||
65 | INCDIR=/usr/local/include | ||
66 | MANDIR=/usr/local/man | ||
67 | MAN1=1 | ||
68 | MAN3=3 | ||
69 | SHELL=/bin/sh | ||
70 | OBJ_LIT=cbc_enc.o ecb_enc.o $(DES_ENC) fcrypt.o set_key.o | ||
71 | OBJ_FULL=cbc_cksm.o $(OBJ_LIT) pcbc_enc.o \ | ||
72 | xcbc_enc.o qud_cksm.o cbc3_enc.o \ | ||
73 | cfb64ede.o cfb64enc.o cfb_enc.o ecb3_enc.o \ | ||
74 | enc_read.o enc_writ.o ofb64ede.o ofb64enc.o ofb_enc.o \ | ||
75 | rand_key.o read_pwd.o read2pwd.o rpc_enc.o str2key.o supp.o | ||
76 | |||
77 | GENERAL_LIT=COPYRIGHT INSTALL README VERSION Makefile des_crypt.man \ | ||
78 | des.doc options.txt asm | ||
79 | GENERAL_FULL=$(GENERAL_LIT) FILES Imakefile times vms.com KERBEROS MODES.DES \ | ||
80 | des.man DES.pm DES.pod DES.xs Makefile.PL dess.cpp des3s.cpp \ | ||
81 | Makefile.uni typemap t Makefile.ssl makefile.bc Makefile.lit \ | ||
82 | des.org des_locl.org | ||
83 | TESTING_LIT= destest speed des_opts | ||
84 | TESTING_FULL= rpw des $(TESTING_LIT) | ||
85 | TESTING_SRC_LIT=destest.c speed.c des_opts.c | ||
86 | TESTING_SRC_FULL=rpw.c des.c $(TESTING_SRC_LIT) | ||
87 | HEADERS_LIT=des_ver.h des.h des_locl.h podd.h sk.h spr.h | ||
88 | HEADERS_FULL= $(HEADERS_LIT) rpc_des.h | ||
89 | LIBDES_LIT=cbc_enc.c ecb_enc.c fcrypt.c set_key.c des_enc.c fcrypt_b.c | ||
90 | LIBDES_FULL= cbc_cksm.c pcbc_enc.c qud_cksm.c cbc3_enc.c \ | ||
91 | cfb64ede.c cfb64enc.c cfb_enc.c ecb3_enc.c \ | ||
92 | enc_read.c enc_writ.c ofb64ede.c ofb64enc.c ofb_enc.c \ | ||
93 | rand_key.c rpc_enc.c str2key.c supp.c \ | ||
94 | xcbc_enc.c $(LIBDES_LIT) read_pwd.c read2pwd.c | ||
95 | |||
96 | PERL= des.pl testdes.pl doIP doPC1 doPC2 PC1 PC2 shifts.pl | ||
97 | |||
98 | OBJ= $(OBJ_FULL) | ||
99 | GENERAL=$(GENERAL_FULL) | ||
100 | TESTING=$(TESTING_FULL) | ||
101 | TESTING_SRC=$(TESTING_SRC_FULL) | ||
102 | HEADERS=$(HEADERS_FULL) | ||
103 | LIBDES= $(LIBDES_FULL) | ||
104 | |||
105 | ALL= $(GENERAL) $(TESTING_SRC) $(LIBDES) $(PERL) $(HEADERS) | ||
106 | |||
107 | DLIB= libdes.a | ||
108 | |||
109 | all: $(DLIB) $(TESTING) | ||
110 | |||
111 | cc: | ||
112 | $(MAKE) CC=cc CFLAGS="-O $(OPTS) $(CFLAG)" all | ||
113 | |||
114 | gcc: | ||
115 | $(MAKE) CC=gcc CFLAGS="-O3 -fomit-frame-pointer $(OPTS) $(CFLAG)" all | ||
116 | |||
117 | x86-elf: | ||
118 | $(MAKE) DES_ENC='asm/dx86-elf.o asm/yx86-elf.o' CC=$(CC) CFLAGS="-DELF $(OPTS) $(CFLAG)" all | ||
119 | |||
120 | x86-out: | ||
121 | $(MAKE) DES_ENC='asm/dx86-out.o asm/yx86-out.o' CC=$(CC) CFLAGS="-DOUT $(OPTS) $(CFLAG)" all | ||
122 | |||
123 | x86-solaris: | ||
124 | $(MAKE) DES_ENC='asm/dx86-sol.o asm/yx86-sol.o' CC=$(CC) CFLAGS="-DSOL $(OPTS) $(CFLAG)" all | ||
125 | |||
126 | x86-bsdi: | ||
127 | $(MAKE) DES_ENC='asm/dx86bsdi.o asm/yx86bsdi.o' CC=$(CC) CFLAGS="-DBSDI $(OPTS) $(CFLAG)" all | ||
128 | |||
129 | # elf | ||
130 | asm/dx86-elf.o: asm/dx86unix.cpp | ||
131 | $(CPP) -DELF asm/dx86unix.cpp | $(AS) -o asm/dx86-elf.o | ||
132 | |||
133 | asm/yx86-elf.o: asm/yx86unix.cpp | ||
134 | $(CPP) -DELF asm/yx86unix.cpp | $(AS) -o asm/yx86-elf.o | ||
135 | |||
136 | # solaris | ||
137 | asm/dx86-sol.o: asm/dx86unix.cpp | ||
138 | $(CC) -E -DSOL asm/dx86unix.cpp | sed 's/^#.*//' > asm/dx86-sol.s | ||
139 | as -o asm/dx86-sol.o asm/dx86-sol.s | ||
140 | rm -f asm/dx86-sol.s | ||
141 | |||
142 | asm/yx86-sol.o: asm/yx86unix.cpp | ||
143 | $(CC) -E -DSOL asm/yx86unix.cpp | sed 's/^#.*//' > asm/yx86-sol.s | ||
144 | as -o asm/yx86-sol.o asm/yx86-sol.s | ||
145 | rm -f asm/yx86-sol.s | ||
146 | |||
147 | # a.out | ||
148 | asm/dx86-out.o: asm/dx86unix.cpp | ||
149 | $(CPP) -DOUT asm/dx86unix.cpp | $(AS) -o asm/dx86-out.o | ||
150 | |||
151 | asm/yx86-out.o: asm/yx86unix.cpp | ||
152 | $(CPP) -DOUT asm/yx86unix.cpp | $(AS) -o asm/yx86-out.o | ||
153 | |||
154 | # bsdi | ||
155 | asm/dx86bsdi.o: asm/dx86unix.cpp | ||
156 | $(CPP) -DBSDI asm/dx86unix.cpp | $(AS) -o asm/dx86bsdi.o | ||
157 | |||
158 | asm/yx86bsdi.o: asm/yx86unix.cpp | ||
159 | $(CPP) -DBSDI asm/yx86unix.cpp | $(AS) -o asm/yx86bsdi.o | ||
160 | |||
161 | asm/dx86unix.cpp: | ||
162 | (cd asm; perl des-586.pl cpp >dx86unix.cpp) | ||
163 | |||
164 | asm/yx86unix.cpp: | ||
165 | (cd asm; perl crypt586.pl cpp >yx86unix.cpp) | ||
166 | |||
167 | test: all | ||
168 | ./destest | ||
169 | |||
170 | $(DLIB): $(OBJ) | ||
171 | /bin/rm -f $(DLIB) | ||
172 | ar cr $(DLIB) $(OBJ) | ||
173 | $(RANLIB) $(DLIB) | ||
174 | |||
175 | des_opts: des_opts.o $(DLIB) | ||
176 | $(CC) $(CFLAGS) -o des_opts des_opts.o $(DLIB) | ||
177 | |||
178 | destest: destest.o $(DLIB) | ||
179 | $(CC) $(CFLAGS) -o destest destest.o $(DLIB) | ||
180 | |||
181 | rpw: rpw.o $(DLIB) | ||
182 | $(CC) $(CFLAGS) -o rpw rpw.o $(DLIB) | ||
183 | |||
184 | speed: speed.o $(DLIB) | ||
185 | $(CC) $(CFLAGS) -o speed speed.o $(DLIB) | ||
186 | |||
187 | des: des.o $(DLIB) | ||
188 | $(CC) $(CFLAGS) -o des des.o $(DLIB) | ||
189 | |||
190 | tags: | ||
191 | ctags $(TESTING_SRC) $(LIBDES) | ||
192 | |||
193 | tar_lit: | ||
194 | /bin/mv Makefile Makefile.tmp | ||
195 | /bin/cp Makefile.lit Makefile | ||
196 | for i in $(HEADERS_LIT) $(LIBDES_LIT) $(GENERAL_LIT) $(TESTING_SRC_LIT) ;\ | ||
197 | do \ | ||
198 | n="$$n des/$$i"; \ | ||
199 | done; \ | ||
200 | ( cd .. ; tar chf - $$n )| gzip > libdes-l.tgz | ||
201 | /bin/rm -f Makefile | ||
202 | /bin/mv Makefile.tmp Makefile | ||
203 | |||
204 | tar: | ||
205 | mv Makefile Makefile.tmp | ||
206 | /bin/cp Makefile.uni Makefile | ||
207 | for i in $(ALL) ;\ | ||
208 | do \ | ||
209 | n="$$n des/$$i"; \ | ||
210 | done; \ | ||
211 | ( cd .. ; tar chf - $$n )| gzip > libdes.tgz | ||
212 | /bin/rm -f Makefile | ||
213 | /bin/mv Makefile.tmp Makefile | ||
214 | |||
215 | shar: | ||
216 | shar $(ALL) >libdes.shar | ||
217 | |||
218 | depend: | ||
219 | makedepend $(LIBDES) $(TESTING_SRC) | ||
220 | |||
221 | clean: | ||
222 | /bin/rm -f *.o tags core $(TESTING) $(DLIB) .nfs* *.old *.bak asm/*.o | ||
223 | |||
224 | dclean: | ||
225 | sed -e '/^# DO NOT DELETE THIS LINE/ q' Makefile >Makefile.new | ||
226 | mv -f Makefile.new Makefile | ||
227 | |||
228 | # Eric is probably going to choke when he next looks at this --tjh | ||
229 | install: des | ||
230 | if test $(INSTALLTOP); then \ | ||
231 | echo SSL style install; \ | ||
232 | cp $(DLIB) $(INSTALLTOP)/lib; \ | ||
233 | $(RANLIB) $(DLIB); \ | ||
234 | chmod 644 $(INSTALLTOP)/lib/$(DLIB); \ | ||
235 | cp des.h $(INSTALLTOP)/include; \ | ||
236 | chmod 644 $(INSTALLTOP)/include/des.h; \ | ||
237 | else \ | ||
238 | echo Standalone install; \ | ||
239 | cp $(DLIB) $(LIBDIR)/$(DLIB); \ | ||
240 | $(RANLIB) $(DLIB); \ | ||
241 | chmod 644 $(LIBDIR)/$(DLIB); \ | ||
242 | cp des $(BINDIR)/des; \ | ||
243 | chmod 711 $(BINDIR)/des; \ | ||
244 | cp des_crypt.man $(MANDIR)/man$(MAN3)/des_crypt.$(MAN3); \ | ||
245 | chmod 644 $(MANDIR)/man$(MAN3)/des_crypt.$(MAN3); \ | ||
246 | cp des.man $(MANDIR)/man$(MAN1)/des.$(MAN1); \ | ||
247 | chmod 644 $(MANDIR)/man$(MAN1)/des.$(MAN1); \ | ||
248 | cp des.h $(INCDIR)/des.h; \ | ||
249 | chmod 644 $(INCDIR)/des.h; \ | ||
250 | fi | ||
251 | # DO NOT DELETE THIS LINE -- make depend depends on it. | ||
diff --git a/src/lib/libcrypto/des/PC1 b/src/lib/libcrypto/des/PC1 index efb8348b72..e69de29bb2 100644 --- a/src/lib/libcrypto/des/PC1 +++ b/src/lib/libcrypto/des/PC1 | |||
@@ -1,28 +0,0 @@ | |||
1 | #!/usr/local/bin/perl | ||
2 | |||
3 | @PC1=( 57,49,41,33,25,17, 9, | ||
4 | 1,58,50,42,34,26,18, | ||
5 | 10, 2,59,51,43,35,27, | ||
6 | 19,11, 3,60,52,44,36, | ||
7 | "-","-","-","-", | ||
8 | 63,55,47,39,31,23,15, | ||
9 | 7,62,54,46,38,30,22, | ||
10 | 14, 6,61,53,45,37,29, | ||
11 | 21,13, 5,28,20,12, 4, | ||
12 | "-","-","-","-", | ||
13 | ); | ||
14 | |||
15 | foreach (@PC1) | ||
16 | { | ||
17 | if ($_ ne "-") | ||
18 | { | ||
19 | $_--; | ||
20 | $_=int($_/8)*8+7-($_%8); | ||
21 | printf "%2d ",$_; | ||
22 | } | ||
23 | else | ||
24 | { print "-- "; } | ||
25 | print "\n" if (((++$i) % 8) == 0); | ||
26 | print "\n" if ((($i) % 32) == 0); | ||
27 | } | ||
28 | |||
diff --git a/src/lib/libcrypto/des/PC2 b/src/lib/libcrypto/des/PC2 index 2d560270ec..e69de29bb2 100644 --- a/src/lib/libcrypto/des/PC2 +++ b/src/lib/libcrypto/des/PC2 | |||
@@ -1,57 +0,0 @@ | |||
1 | #!/usr/local/bin/perl | ||
2 | |||
3 | @PC2_C=(14,17,11,24, 1, 5, | ||
4 | 3,28,15, 6,21,10, | ||
5 | 23,19,12, 4,26, 8, | ||
6 | 16, 7,27,20,13, 2, | ||
7 | ); | ||
8 | |||
9 | @PC2_D=(41,52,31,37,47,55, | ||
10 | 30,40,51,45,33,48, | ||
11 | 44,49,39,56,34,53, | ||
12 | 46,42,50,36,29,32, | ||
13 | ); | ||
14 | |||
15 | foreach (@PC2_C) { | ||
16 | if ($_ ne "-") | ||
17 | { | ||
18 | $_--; | ||
19 | printf "%2d ",$_; } | ||
20 | else { print "-- "; } | ||
21 | $C{$_}=1; | ||
22 | print "\n" if (((++$i) % 8) == 0); | ||
23 | } | ||
24 | $i=0; | ||
25 | print "\n"; | ||
26 | foreach (@PC2_D) { | ||
27 | if ($_ ne "-") | ||
28 | { | ||
29 | $_-=29; | ||
30 | printf "%2d ",$_; } | ||
31 | else { print "-- "; } | ||
32 | $D{$_}=1; | ||
33 | print "\n" if (((++$i) % 8) == 0); } | ||
34 | |||
35 | print "\n"; | ||
36 | foreach $i (0 .. 27) | ||
37 | { | ||
38 | $_=$C{$i}; | ||
39 | if ($_ ne "-") {printf "%2d ",$_;} | ||
40 | else { print "-- "; } | ||
41 | print "\n" if (((++$i) % 8) == 0); | ||
42 | } | ||
43 | print "\n"; | ||
44 | |||
45 | print "\n"; | ||
46 | foreach $i (0 .. 27) | ||
47 | { | ||
48 | $_=$D{$i}; | ||
49 | if ($_ ne "-") {printf "%2d ",$_;} | ||
50 | else { print "-- "; } | ||
51 | print "\n" if (((++$i) % 8) == 0); | ||
52 | } | ||
53 | print "\n"; | ||
54 | sub numsort | ||
55 | { | ||
56 | $a-$b; | ||
57 | } | ||
diff --git a/src/lib/libcrypto/des/asm/d-win32.asm b/src/lib/libcrypto/des/asm/d-win32.asm index 9e3dc9cd87..e69de29bb2 100644 --- a/src/lib/libcrypto/des/asm/d-win32.asm +++ b/src/lib/libcrypto/des/asm/d-win32.asm | |||
@@ -1,3132 +0,0 @@ | |||
1 | ; Don't even think of reading this code | ||
2 | ; It was automatically generated by des-586.pl | ||
3 | ; Which is a perl program used to generate the x86 assember for | ||
4 | ; any of elf, a.out, BSDI,Win32, or Solaris | ||
5 | ; eric <eay@cryptsoft.com> | ||
6 | ; | ||
7 | TITLE des-586.asm | ||
8 | .386 | ||
9 | .model FLAT | ||
10 | _TEXT SEGMENT | ||
11 | PUBLIC _des_encrypt | ||
12 | EXTRN _des_SPtrans:DWORD | ||
13 | _des_encrypt PROC NEAR | ||
14 | push esi | ||
15 | push edi | ||
16 | ; | ||
17 | ; Load the 2 words | ||
18 | mov esi, DWORD PTR 12[esp] | ||
19 | xor ecx, ecx | ||
20 | push ebx | ||
21 | push ebp | ||
22 | mov eax, DWORD PTR [esi] | ||
23 | mov ebx, DWORD PTR 28[esp] | ||
24 | mov edi, DWORD PTR 4[esi] | ||
25 | ; | ||
26 | ; IP | ||
27 | rol eax, 4 | ||
28 | mov esi, eax | ||
29 | xor eax, edi | ||
30 | and eax, 0f0f0f0f0h | ||
31 | xor esi, eax | ||
32 | xor edi, eax | ||
33 | ; | ||
34 | rol edi, 20 | ||
35 | mov eax, edi | ||
36 | xor edi, esi | ||
37 | and edi, 0fff0000fh | ||
38 | xor eax, edi | ||
39 | xor esi, edi | ||
40 | ; | ||
41 | rol eax, 14 | ||
42 | mov edi, eax | ||
43 | xor eax, esi | ||
44 | and eax, 033333333h | ||
45 | xor edi, eax | ||
46 | xor esi, eax | ||
47 | ; | ||
48 | rol esi, 22 | ||
49 | mov eax, esi | ||
50 | xor esi, edi | ||
51 | and esi, 003fc03fch | ||
52 | xor eax, esi | ||
53 | xor edi, esi | ||
54 | ; | ||
55 | rol eax, 9 | ||
56 | mov esi, eax | ||
57 | xor eax, edi | ||
58 | and eax, 0aaaaaaaah | ||
59 | xor esi, eax | ||
60 | xor edi, eax | ||
61 | ; | ||
62 | rol edi, 1 | ||
63 | mov ebp, DWORD PTR 24[esp] | ||
64 | cmp ebx, 0 | ||
65 | je $L000start_decrypt | ||
66 | ; | ||
67 | ; Round 0 | ||
68 | mov eax, DWORD PTR [ebp] | ||
69 | xor ebx, ebx | ||
70 | mov edx, DWORD PTR 4[ebp] | ||
71 | xor eax, esi | ||
72 | xor edx, esi | ||
73 | and eax, 0fcfcfcfch | ||
74 | and edx, 0cfcfcfcfh | ||
75 | mov bl, al | ||
76 | mov cl, ah | ||
77 | ror edx, 4 | ||
78 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
79 | mov bl, dl | ||
80 | xor edi, ebp | ||
81 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
82 | xor edi, ebp | ||
83 | mov cl, dh | ||
84 | shr eax, 16 | ||
85 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
86 | xor edi, ebp | ||
87 | mov bl, ah | ||
88 | shr edx, 16 | ||
89 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
90 | xor edi, ebp | ||
91 | mov ebp, DWORD PTR 24[esp] | ||
92 | mov cl, dh | ||
93 | and eax, 0ffh | ||
94 | and edx, 0ffh | ||
95 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
96 | xor edi, ebx | ||
97 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
98 | xor edi, ebx | ||
99 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
100 | xor edi, ebx | ||
101 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
102 | xor edi, ebx | ||
103 | ; | ||
104 | ; Round 1 | ||
105 | mov eax, DWORD PTR 8[ebp] | ||
106 | xor ebx, ebx | ||
107 | mov edx, DWORD PTR 12[ebp] | ||
108 | xor eax, edi | ||
109 | xor edx, edi | ||
110 | and eax, 0fcfcfcfch | ||
111 | and edx, 0cfcfcfcfh | ||
112 | mov bl, al | ||
113 | mov cl, ah | ||
114 | ror edx, 4 | ||
115 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
116 | mov bl, dl | ||
117 | xor esi, ebp | ||
118 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
119 | xor esi, ebp | ||
120 | mov cl, dh | ||
121 | shr eax, 16 | ||
122 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
123 | xor esi, ebp | ||
124 | mov bl, ah | ||
125 | shr edx, 16 | ||
126 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
127 | xor esi, ebp | ||
128 | mov ebp, DWORD PTR 24[esp] | ||
129 | mov cl, dh | ||
130 | and eax, 0ffh | ||
131 | and edx, 0ffh | ||
132 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
133 | xor esi, ebx | ||
134 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
135 | xor esi, ebx | ||
136 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
137 | xor esi, ebx | ||
138 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
139 | xor esi, ebx | ||
140 | ; | ||
141 | ; Round 2 | ||
142 | mov eax, DWORD PTR 16[ebp] | ||
143 | xor ebx, ebx | ||
144 | mov edx, DWORD PTR 20[ebp] | ||
145 | xor eax, esi | ||
146 | xor edx, esi | ||
147 | and eax, 0fcfcfcfch | ||
148 | and edx, 0cfcfcfcfh | ||
149 | mov bl, al | ||
150 | mov cl, ah | ||
151 | ror edx, 4 | ||
152 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
153 | mov bl, dl | ||
154 | xor edi, ebp | ||
155 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
156 | xor edi, ebp | ||
157 | mov cl, dh | ||
158 | shr eax, 16 | ||
159 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
160 | xor edi, ebp | ||
161 | mov bl, ah | ||
162 | shr edx, 16 | ||
163 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
164 | xor edi, ebp | ||
165 | mov ebp, DWORD PTR 24[esp] | ||
166 | mov cl, dh | ||
167 | and eax, 0ffh | ||
168 | and edx, 0ffh | ||
169 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
170 | xor edi, ebx | ||
171 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
172 | xor edi, ebx | ||
173 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
174 | xor edi, ebx | ||
175 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
176 | xor edi, ebx | ||
177 | ; | ||
178 | ; Round 3 | ||
179 | mov eax, DWORD PTR 24[ebp] | ||
180 | xor ebx, ebx | ||
181 | mov edx, DWORD PTR 28[ebp] | ||
182 | xor eax, edi | ||
183 | xor edx, edi | ||
184 | and eax, 0fcfcfcfch | ||
185 | and edx, 0cfcfcfcfh | ||
186 | mov bl, al | ||
187 | mov cl, ah | ||
188 | ror edx, 4 | ||
189 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
190 | mov bl, dl | ||
191 | xor esi, ebp | ||
192 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
193 | xor esi, ebp | ||
194 | mov cl, dh | ||
195 | shr eax, 16 | ||
196 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
197 | xor esi, ebp | ||
198 | mov bl, ah | ||
199 | shr edx, 16 | ||
200 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
201 | xor esi, ebp | ||
202 | mov ebp, DWORD PTR 24[esp] | ||
203 | mov cl, dh | ||
204 | and eax, 0ffh | ||
205 | and edx, 0ffh | ||
206 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
207 | xor esi, ebx | ||
208 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
209 | xor esi, ebx | ||
210 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
211 | xor esi, ebx | ||
212 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
213 | xor esi, ebx | ||
214 | ; | ||
215 | ; Round 4 | ||
216 | mov eax, DWORD PTR 32[ebp] | ||
217 | xor ebx, ebx | ||
218 | mov edx, DWORD PTR 36[ebp] | ||
219 | xor eax, esi | ||
220 | xor edx, esi | ||
221 | and eax, 0fcfcfcfch | ||
222 | and edx, 0cfcfcfcfh | ||
223 | mov bl, al | ||
224 | mov cl, ah | ||
225 | ror edx, 4 | ||
226 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
227 | mov bl, dl | ||
228 | xor edi, ebp | ||
229 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
230 | xor edi, ebp | ||
231 | mov cl, dh | ||
232 | shr eax, 16 | ||
233 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
234 | xor edi, ebp | ||
235 | mov bl, ah | ||
236 | shr edx, 16 | ||
237 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
238 | xor edi, ebp | ||
239 | mov ebp, DWORD PTR 24[esp] | ||
240 | mov cl, dh | ||
241 | and eax, 0ffh | ||
242 | and edx, 0ffh | ||
243 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
244 | xor edi, ebx | ||
245 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
246 | xor edi, ebx | ||
247 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
248 | xor edi, ebx | ||
249 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
250 | xor edi, ebx | ||
251 | ; | ||
252 | ; Round 5 | ||
253 | mov eax, DWORD PTR 40[ebp] | ||
254 | xor ebx, ebx | ||
255 | mov edx, DWORD PTR 44[ebp] | ||
256 | xor eax, edi | ||
257 | xor edx, edi | ||
258 | and eax, 0fcfcfcfch | ||
259 | and edx, 0cfcfcfcfh | ||
260 | mov bl, al | ||
261 | mov cl, ah | ||
262 | ror edx, 4 | ||
263 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
264 | mov bl, dl | ||
265 | xor esi, ebp | ||
266 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
267 | xor esi, ebp | ||
268 | mov cl, dh | ||
269 | shr eax, 16 | ||
270 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
271 | xor esi, ebp | ||
272 | mov bl, ah | ||
273 | shr edx, 16 | ||
274 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
275 | xor esi, ebp | ||
276 | mov ebp, DWORD PTR 24[esp] | ||
277 | mov cl, dh | ||
278 | and eax, 0ffh | ||
279 | and edx, 0ffh | ||
280 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
281 | xor esi, ebx | ||
282 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
283 | xor esi, ebx | ||
284 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
285 | xor esi, ebx | ||
286 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
287 | xor esi, ebx | ||
288 | ; | ||
289 | ; Round 6 | ||
290 | mov eax, DWORD PTR 48[ebp] | ||
291 | xor ebx, ebx | ||
292 | mov edx, DWORD PTR 52[ebp] | ||
293 | xor eax, esi | ||
294 | xor edx, esi | ||
295 | and eax, 0fcfcfcfch | ||
296 | and edx, 0cfcfcfcfh | ||
297 | mov bl, al | ||
298 | mov cl, ah | ||
299 | ror edx, 4 | ||
300 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
301 | mov bl, dl | ||
302 | xor edi, ebp | ||
303 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
304 | xor edi, ebp | ||
305 | mov cl, dh | ||
306 | shr eax, 16 | ||
307 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
308 | xor edi, ebp | ||
309 | mov bl, ah | ||
310 | shr edx, 16 | ||
311 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
312 | xor edi, ebp | ||
313 | mov ebp, DWORD PTR 24[esp] | ||
314 | mov cl, dh | ||
315 | and eax, 0ffh | ||
316 | and edx, 0ffh | ||
317 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
318 | xor edi, ebx | ||
319 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
320 | xor edi, ebx | ||
321 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
322 | xor edi, ebx | ||
323 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
324 | xor edi, ebx | ||
325 | ; | ||
326 | ; Round 7 | ||
327 | mov eax, DWORD PTR 56[ebp] | ||
328 | xor ebx, ebx | ||
329 | mov edx, DWORD PTR 60[ebp] | ||
330 | xor eax, edi | ||
331 | xor edx, edi | ||
332 | and eax, 0fcfcfcfch | ||
333 | and edx, 0cfcfcfcfh | ||
334 | mov bl, al | ||
335 | mov cl, ah | ||
336 | ror edx, 4 | ||
337 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
338 | mov bl, dl | ||
339 | xor esi, ebp | ||
340 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
341 | xor esi, ebp | ||
342 | mov cl, dh | ||
343 | shr eax, 16 | ||
344 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
345 | xor esi, ebp | ||
346 | mov bl, ah | ||
347 | shr edx, 16 | ||
348 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
349 | xor esi, ebp | ||
350 | mov ebp, DWORD PTR 24[esp] | ||
351 | mov cl, dh | ||
352 | and eax, 0ffh | ||
353 | and edx, 0ffh | ||
354 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
355 | xor esi, ebx | ||
356 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
357 | xor esi, ebx | ||
358 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
359 | xor esi, ebx | ||
360 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
361 | xor esi, ebx | ||
362 | ; | ||
363 | ; Round 8 | ||
364 | mov eax, DWORD PTR 64[ebp] | ||
365 | xor ebx, ebx | ||
366 | mov edx, DWORD PTR 68[ebp] | ||
367 | xor eax, esi | ||
368 | xor edx, esi | ||
369 | and eax, 0fcfcfcfch | ||
370 | and edx, 0cfcfcfcfh | ||
371 | mov bl, al | ||
372 | mov cl, ah | ||
373 | ror edx, 4 | ||
374 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
375 | mov bl, dl | ||
376 | xor edi, ebp | ||
377 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
378 | xor edi, ebp | ||
379 | mov cl, dh | ||
380 | shr eax, 16 | ||
381 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
382 | xor edi, ebp | ||
383 | mov bl, ah | ||
384 | shr edx, 16 | ||
385 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
386 | xor edi, ebp | ||
387 | mov ebp, DWORD PTR 24[esp] | ||
388 | mov cl, dh | ||
389 | and eax, 0ffh | ||
390 | and edx, 0ffh | ||
391 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
392 | xor edi, ebx | ||
393 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
394 | xor edi, ebx | ||
395 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
396 | xor edi, ebx | ||
397 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
398 | xor edi, ebx | ||
399 | ; | ||
400 | ; Round 9 | ||
401 | mov eax, DWORD PTR 72[ebp] | ||
402 | xor ebx, ebx | ||
403 | mov edx, DWORD PTR 76[ebp] | ||
404 | xor eax, edi | ||
405 | xor edx, edi | ||
406 | and eax, 0fcfcfcfch | ||
407 | and edx, 0cfcfcfcfh | ||
408 | mov bl, al | ||
409 | mov cl, ah | ||
410 | ror edx, 4 | ||
411 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
412 | mov bl, dl | ||
413 | xor esi, ebp | ||
414 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
415 | xor esi, ebp | ||
416 | mov cl, dh | ||
417 | shr eax, 16 | ||
418 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
419 | xor esi, ebp | ||
420 | mov bl, ah | ||
421 | shr edx, 16 | ||
422 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
423 | xor esi, ebp | ||
424 | mov ebp, DWORD PTR 24[esp] | ||
425 | mov cl, dh | ||
426 | and eax, 0ffh | ||
427 | and edx, 0ffh | ||
428 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
429 | xor esi, ebx | ||
430 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
431 | xor esi, ebx | ||
432 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
433 | xor esi, ebx | ||
434 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
435 | xor esi, ebx | ||
436 | ; | ||
437 | ; Round 10 | ||
438 | mov eax, DWORD PTR 80[ebp] | ||
439 | xor ebx, ebx | ||
440 | mov edx, DWORD PTR 84[ebp] | ||
441 | xor eax, esi | ||
442 | xor edx, esi | ||
443 | and eax, 0fcfcfcfch | ||
444 | and edx, 0cfcfcfcfh | ||
445 | mov bl, al | ||
446 | mov cl, ah | ||
447 | ror edx, 4 | ||
448 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
449 | mov bl, dl | ||
450 | xor edi, ebp | ||
451 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
452 | xor edi, ebp | ||
453 | mov cl, dh | ||
454 | shr eax, 16 | ||
455 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
456 | xor edi, ebp | ||
457 | mov bl, ah | ||
458 | shr edx, 16 | ||
459 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
460 | xor edi, ebp | ||
461 | mov ebp, DWORD PTR 24[esp] | ||
462 | mov cl, dh | ||
463 | and eax, 0ffh | ||
464 | and edx, 0ffh | ||
465 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
466 | xor edi, ebx | ||
467 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
468 | xor edi, ebx | ||
469 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
470 | xor edi, ebx | ||
471 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
472 | xor edi, ebx | ||
473 | ; | ||
474 | ; Round 11 | ||
475 | mov eax, DWORD PTR 88[ebp] | ||
476 | xor ebx, ebx | ||
477 | mov edx, DWORD PTR 92[ebp] | ||
478 | xor eax, edi | ||
479 | xor edx, edi | ||
480 | and eax, 0fcfcfcfch | ||
481 | and edx, 0cfcfcfcfh | ||
482 | mov bl, al | ||
483 | mov cl, ah | ||
484 | ror edx, 4 | ||
485 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
486 | mov bl, dl | ||
487 | xor esi, ebp | ||
488 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
489 | xor esi, ebp | ||
490 | mov cl, dh | ||
491 | shr eax, 16 | ||
492 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
493 | xor esi, ebp | ||
494 | mov bl, ah | ||
495 | shr edx, 16 | ||
496 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
497 | xor esi, ebp | ||
498 | mov ebp, DWORD PTR 24[esp] | ||
499 | mov cl, dh | ||
500 | and eax, 0ffh | ||
501 | and edx, 0ffh | ||
502 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
503 | xor esi, ebx | ||
504 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
505 | xor esi, ebx | ||
506 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
507 | xor esi, ebx | ||
508 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
509 | xor esi, ebx | ||
510 | ; | ||
511 | ; Round 12 | ||
512 | mov eax, DWORD PTR 96[ebp] | ||
513 | xor ebx, ebx | ||
514 | mov edx, DWORD PTR 100[ebp] | ||
515 | xor eax, esi | ||
516 | xor edx, esi | ||
517 | and eax, 0fcfcfcfch | ||
518 | and edx, 0cfcfcfcfh | ||
519 | mov bl, al | ||
520 | mov cl, ah | ||
521 | ror edx, 4 | ||
522 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
523 | mov bl, dl | ||
524 | xor edi, ebp | ||
525 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
526 | xor edi, ebp | ||
527 | mov cl, dh | ||
528 | shr eax, 16 | ||
529 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
530 | xor edi, ebp | ||
531 | mov bl, ah | ||
532 | shr edx, 16 | ||
533 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
534 | xor edi, ebp | ||
535 | mov ebp, DWORD PTR 24[esp] | ||
536 | mov cl, dh | ||
537 | and eax, 0ffh | ||
538 | and edx, 0ffh | ||
539 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
540 | xor edi, ebx | ||
541 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
542 | xor edi, ebx | ||
543 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
544 | xor edi, ebx | ||
545 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
546 | xor edi, ebx | ||
547 | ; | ||
548 | ; Round 13 | ||
549 | mov eax, DWORD PTR 104[ebp] | ||
550 | xor ebx, ebx | ||
551 | mov edx, DWORD PTR 108[ebp] | ||
552 | xor eax, edi | ||
553 | xor edx, edi | ||
554 | and eax, 0fcfcfcfch | ||
555 | and edx, 0cfcfcfcfh | ||
556 | mov bl, al | ||
557 | mov cl, ah | ||
558 | ror edx, 4 | ||
559 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
560 | mov bl, dl | ||
561 | xor esi, ebp | ||
562 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
563 | xor esi, ebp | ||
564 | mov cl, dh | ||
565 | shr eax, 16 | ||
566 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
567 | xor esi, ebp | ||
568 | mov bl, ah | ||
569 | shr edx, 16 | ||
570 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
571 | xor esi, ebp | ||
572 | mov ebp, DWORD PTR 24[esp] | ||
573 | mov cl, dh | ||
574 | and eax, 0ffh | ||
575 | and edx, 0ffh | ||
576 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
577 | xor esi, ebx | ||
578 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
579 | xor esi, ebx | ||
580 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
581 | xor esi, ebx | ||
582 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
583 | xor esi, ebx | ||
584 | ; | ||
585 | ; Round 14 | ||
586 | mov eax, DWORD PTR 112[ebp] | ||
587 | xor ebx, ebx | ||
588 | mov edx, DWORD PTR 116[ebp] | ||
589 | xor eax, esi | ||
590 | xor edx, esi | ||
591 | and eax, 0fcfcfcfch | ||
592 | and edx, 0cfcfcfcfh | ||
593 | mov bl, al | ||
594 | mov cl, ah | ||
595 | ror edx, 4 | ||
596 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
597 | mov bl, dl | ||
598 | xor edi, ebp | ||
599 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
600 | xor edi, ebp | ||
601 | mov cl, dh | ||
602 | shr eax, 16 | ||
603 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
604 | xor edi, ebp | ||
605 | mov bl, ah | ||
606 | shr edx, 16 | ||
607 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
608 | xor edi, ebp | ||
609 | mov ebp, DWORD PTR 24[esp] | ||
610 | mov cl, dh | ||
611 | and eax, 0ffh | ||
612 | and edx, 0ffh | ||
613 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
614 | xor edi, ebx | ||
615 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
616 | xor edi, ebx | ||
617 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
618 | xor edi, ebx | ||
619 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
620 | xor edi, ebx | ||
621 | ; | ||
622 | ; Round 15 | ||
623 | mov eax, DWORD PTR 120[ebp] | ||
624 | xor ebx, ebx | ||
625 | mov edx, DWORD PTR 124[ebp] | ||
626 | xor eax, edi | ||
627 | xor edx, edi | ||
628 | and eax, 0fcfcfcfch | ||
629 | and edx, 0cfcfcfcfh | ||
630 | mov bl, al | ||
631 | mov cl, ah | ||
632 | ror edx, 4 | ||
633 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
634 | mov bl, dl | ||
635 | xor esi, ebp | ||
636 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
637 | xor esi, ebp | ||
638 | mov cl, dh | ||
639 | shr eax, 16 | ||
640 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
641 | xor esi, ebp | ||
642 | mov bl, ah | ||
643 | shr edx, 16 | ||
644 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
645 | xor esi, ebp | ||
646 | mov ebp, DWORD PTR 24[esp] | ||
647 | mov cl, dh | ||
648 | and eax, 0ffh | ||
649 | and edx, 0ffh | ||
650 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
651 | xor esi, ebx | ||
652 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
653 | xor esi, ebx | ||
654 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
655 | xor esi, ebx | ||
656 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
657 | xor esi, ebx | ||
658 | jmp $L001end | ||
659 | $L000start_decrypt: | ||
660 | ; | ||
661 | ; Round 15 | ||
662 | mov eax, DWORD PTR 120[ebp] | ||
663 | xor ebx, ebx | ||
664 | mov edx, DWORD PTR 124[ebp] | ||
665 | xor eax, esi | ||
666 | xor edx, esi | ||
667 | and eax, 0fcfcfcfch | ||
668 | and edx, 0cfcfcfcfh | ||
669 | mov bl, al | ||
670 | mov cl, ah | ||
671 | ror edx, 4 | ||
672 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
673 | mov bl, dl | ||
674 | xor edi, ebp | ||
675 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
676 | xor edi, ebp | ||
677 | mov cl, dh | ||
678 | shr eax, 16 | ||
679 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
680 | xor edi, ebp | ||
681 | mov bl, ah | ||
682 | shr edx, 16 | ||
683 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
684 | xor edi, ebp | ||
685 | mov ebp, DWORD PTR 24[esp] | ||
686 | mov cl, dh | ||
687 | and eax, 0ffh | ||
688 | and edx, 0ffh | ||
689 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
690 | xor edi, ebx | ||
691 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
692 | xor edi, ebx | ||
693 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
694 | xor edi, ebx | ||
695 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
696 | xor edi, ebx | ||
697 | ; | ||
698 | ; Round 14 | ||
699 | mov eax, DWORD PTR 112[ebp] | ||
700 | xor ebx, ebx | ||
701 | mov edx, DWORD PTR 116[ebp] | ||
702 | xor eax, edi | ||
703 | xor edx, edi | ||
704 | and eax, 0fcfcfcfch | ||
705 | and edx, 0cfcfcfcfh | ||
706 | mov bl, al | ||
707 | mov cl, ah | ||
708 | ror edx, 4 | ||
709 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
710 | mov bl, dl | ||
711 | xor esi, ebp | ||
712 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
713 | xor esi, ebp | ||
714 | mov cl, dh | ||
715 | shr eax, 16 | ||
716 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
717 | xor esi, ebp | ||
718 | mov bl, ah | ||
719 | shr edx, 16 | ||
720 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
721 | xor esi, ebp | ||
722 | mov ebp, DWORD PTR 24[esp] | ||
723 | mov cl, dh | ||
724 | and eax, 0ffh | ||
725 | and edx, 0ffh | ||
726 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
727 | xor esi, ebx | ||
728 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
729 | xor esi, ebx | ||
730 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
731 | xor esi, ebx | ||
732 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
733 | xor esi, ebx | ||
734 | ; | ||
735 | ; Round 13 | ||
736 | mov eax, DWORD PTR 104[ebp] | ||
737 | xor ebx, ebx | ||
738 | mov edx, DWORD PTR 108[ebp] | ||
739 | xor eax, esi | ||
740 | xor edx, esi | ||
741 | and eax, 0fcfcfcfch | ||
742 | and edx, 0cfcfcfcfh | ||
743 | mov bl, al | ||
744 | mov cl, ah | ||
745 | ror edx, 4 | ||
746 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
747 | mov bl, dl | ||
748 | xor edi, ebp | ||
749 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
750 | xor edi, ebp | ||
751 | mov cl, dh | ||
752 | shr eax, 16 | ||
753 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
754 | xor edi, ebp | ||
755 | mov bl, ah | ||
756 | shr edx, 16 | ||
757 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
758 | xor edi, ebp | ||
759 | mov ebp, DWORD PTR 24[esp] | ||
760 | mov cl, dh | ||
761 | and eax, 0ffh | ||
762 | and edx, 0ffh | ||
763 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
764 | xor edi, ebx | ||
765 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
766 | xor edi, ebx | ||
767 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
768 | xor edi, ebx | ||
769 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
770 | xor edi, ebx | ||
771 | ; | ||
772 | ; Round 12 | ||
773 | mov eax, DWORD PTR 96[ebp] | ||
774 | xor ebx, ebx | ||
775 | mov edx, DWORD PTR 100[ebp] | ||
776 | xor eax, edi | ||
777 | xor edx, edi | ||
778 | and eax, 0fcfcfcfch | ||
779 | and edx, 0cfcfcfcfh | ||
780 | mov bl, al | ||
781 | mov cl, ah | ||
782 | ror edx, 4 | ||
783 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
784 | mov bl, dl | ||
785 | xor esi, ebp | ||
786 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
787 | xor esi, ebp | ||
788 | mov cl, dh | ||
789 | shr eax, 16 | ||
790 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
791 | xor esi, ebp | ||
792 | mov bl, ah | ||
793 | shr edx, 16 | ||
794 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
795 | xor esi, ebp | ||
796 | mov ebp, DWORD PTR 24[esp] | ||
797 | mov cl, dh | ||
798 | and eax, 0ffh | ||
799 | and edx, 0ffh | ||
800 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
801 | xor esi, ebx | ||
802 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
803 | xor esi, ebx | ||
804 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
805 | xor esi, ebx | ||
806 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
807 | xor esi, ebx | ||
808 | ; | ||
809 | ; Round 11 | ||
810 | mov eax, DWORD PTR 88[ebp] | ||
811 | xor ebx, ebx | ||
812 | mov edx, DWORD PTR 92[ebp] | ||
813 | xor eax, esi | ||
814 | xor edx, esi | ||
815 | and eax, 0fcfcfcfch | ||
816 | and edx, 0cfcfcfcfh | ||
817 | mov bl, al | ||
818 | mov cl, ah | ||
819 | ror edx, 4 | ||
820 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
821 | mov bl, dl | ||
822 | xor edi, ebp | ||
823 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
824 | xor edi, ebp | ||
825 | mov cl, dh | ||
826 | shr eax, 16 | ||
827 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
828 | xor edi, ebp | ||
829 | mov bl, ah | ||
830 | shr edx, 16 | ||
831 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
832 | xor edi, ebp | ||
833 | mov ebp, DWORD PTR 24[esp] | ||
834 | mov cl, dh | ||
835 | and eax, 0ffh | ||
836 | and edx, 0ffh | ||
837 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
838 | xor edi, ebx | ||
839 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
840 | xor edi, ebx | ||
841 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
842 | xor edi, ebx | ||
843 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
844 | xor edi, ebx | ||
845 | ; | ||
846 | ; Round 10 | ||
847 | mov eax, DWORD PTR 80[ebp] | ||
848 | xor ebx, ebx | ||
849 | mov edx, DWORD PTR 84[ebp] | ||
850 | xor eax, edi | ||
851 | xor edx, edi | ||
852 | and eax, 0fcfcfcfch | ||
853 | and edx, 0cfcfcfcfh | ||
854 | mov bl, al | ||
855 | mov cl, ah | ||
856 | ror edx, 4 | ||
857 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
858 | mov bl, dl | ||
859 | xor esi, ebp | ||
860 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
861 | xor esi, ebp | ||
862 | mov cl, dh | ||
863 | shr eax, 16 | ||
864 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
865 | xor esi, ebp | ||
866 | mov bl, ah | ||
867 | shr edx, 16 | ||
868 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
869 | xor esi, ebp | ||
870 | mov ebp, DWORD PTR 24[esp] | ||
871 | mov cl, dh | ||
872 | and eax, 0ffh | ||
873 | and edx, 0ffh | ||
874 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
875 | xor esi, ebx | ||
876 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
877 | xor esi, ebx | ||
878 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
879 | xor esi, ebx | ||
880 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
881 | xor esi, ebx | ||
882 | ; | ||
883 | ; Round 9 | ||
884 | mov eax, DWORD PTR 72[ebp] | ||
885 | xor ebx, ebx | ||
886 | mov edx, DWORD PTR 76[ebp] | ||
887 | xor eax, esi | ||
888 | xor edx, esi | ||
889 | and eax, 0fcfcfcfch | ||
890 | and edx, 0cfcfcfcfh | ||
891 | mov bl, al | ||
892 | mov cl, ah | ||
893 | ror edx, 4 | ||
894 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
895 | mov bl, dl | ||
896 | xor edi, ebp | ||
897 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
898 | xor edi, ebp | ||
899 | mov cl, dh | ||
900 | shr eax, 16 | ||
901 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
902 | xor edi, ebp | ||
903 | mov bl, ah | ||
904 | shr edx, 16 | ||
905 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
906 | xor edi, ebp | ||
907 | mov ebp, DWORD PTR 24[esp] | ||
908 | mov cl, dh | ||
909 | and eax, 0ffh | ||
910 | and edx, 0ffh | ||
911 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
912 | xor edi, ebx | ||
913 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
914 | xor edi, ebx | ||
915 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
916 | xor edi, ebx | ||
917 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
918 | xor edi, ebx | ||
919 | ; | ||
920 | ; Round 8 | ||
921 | mov eax, DWORD PTR 64[ebp] | ||
922 | xor ebx, ebx | ||
923 | mov edx, DWORD PTR 68[ebp] | ||
924 | xor eax, edi | ||
925 | xor edx, edi | ||
926 | and eax, 0fcfcfcfch | ||
927 | and edx, 0cfcfcfcfh | ||
928 | mov bl, al | ||
929 | mov cl, ah | ||
930 | ror edx, 4 | ||
931 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
932 | mov bl, dl | ||
933 | xor esi, ebp | ||
934 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
935 | xor esi, ebp | ||
936 | mov cl, dh | ||
937 | shr eax, 16 | ||
938 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
939 | xor esi, ebp | ||
940 | mov bl, ah | ||
941 | shr edx, 16 | ||
942 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
943 | xor esi, ebp | ||
944 | mov ebp, DWORD PTR 24[esp] | ||
945 | mov cl, dh | ||
946 | and eax, 0ffh | ||
947 | and edx, 0ffh | ||
948 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
949 | xor esi, ebx | ||
950 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
951 | xor esi, ebx | ||
952 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
953 | xor esi, ebx | ||
954 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
955 | xor esi, ebx | ||
956 | ; | ||
957 | ; Round 7 | ||
958 | mov eax, DWORD PTR 56[ebp] | ||
959 | xor ebx, ebx | ||
960 | mov edx, DWORD PTR 60[ebp] | ||
961 | xor eax, esi | ||
962 | xor edx, esi | ||
963 | and eax, 0fcfcfcfch | ||
964 | and edx, 0cfcfcfcfh | ||
965 | mov bl, al | ||
966 | mov cl, ah | ||
967 | ror edx, 4 | ||
968 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
969 | mov bl, dl | ||
970 | xor edi, ebp | ||
971 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
972 | xor edi, ebp | ||
973 | mov cl, dh | ||
974 | shr eax, 16 | ||
975 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
976 | xor edi, ebp | ||
977 | mov bl, ah | ||
978 | shr edx, 16 | ||
979 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
980 | xor edi, ebp | ||
981 | mov ebp, DWORD PTR 24[esp] | ||
982 | mov cl, dh | ||
983 | and eax, 0ffh | ||
984 | and edx, 0ffh | ||
985 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
986 | xor edi, ebx | ||
987 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
988 | xor edi, ebx | ||
989 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
990 | xor edi, ebx | ||
991 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
992 | xor edi, ebx | ||
993 | ; | ||
994 | ; Round 6 | ||
995 | mov eax, DWORD PTR 48[ebp] | ||
996 | xor ebx, ebx | ||
997 | mov edx, DWORD PTR 52[ebp] | ||
998 | xor eax, edi | ||
999 | xor edx, edi | ||
1000 | and eax, 0fcfcfcfch | ||
1001 | and edx, 0cfcfcfcfh | ||
1002 | mov bl, al | ||
1003 | mov cl, ah | ||
1004 | ror edx, 4 | ||
1005 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1006 | mov bl, dl | ||
1007 | xor esi, ebp | ||
1008 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1009 | xor esi, ebp | ||
1010 | mov cl, dh | ||
1011 | shr eax, 16 | ||
1012 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1013 | xor esi, ebp | ||
1014 | mov bl, ah | ||
1015 | shr edx, 16 | ||
1016 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1017 | xor esi, ebp | ||
1018 | mov ebp, DWORD PTR 24[esp] | ||
1019 | mov cl, dh | ||
1020 | and eax, 0ffh | ||
1021 | and edx, 0ffh | ||
1022 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1023 | xor esi, ebx | ||
1024 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1025 | xor esi, ebx | ||
1026 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1027 | xor esi, ebx | ||
1028 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1029 | xor esi, ebx | ||
1030 | ; | ||
1031 | ; Round 5 | ||
1032 | mov eax, DWORD PTR 40[ebp] | ||
1033 | xor ebx, ebx | ||
1034 | mov edx, DWORD PTR 44[ebp] | ||
1035 | xor eax, esi | ||
1036 | xor edx, esi | ||
1037 | and eax, 0fcfcfcfch | ||
1038 | and edx, 0cfcfcfcfh | ||
1039 | mov bl, al | ||
1040 | mov cl, ah | ||
1041 | ror edx, 4 | ||
1042 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1043 | mov bl, dl | ||
1044 | xor edi, ebp | ||
1045 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1046 | xor edi, ebp | ||
1047 | mov cl, dh | ||
1048 | shr eax, 16 | ||
1049 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1050 | xor edi, ebp | ||
1051 | mov bl, ah | ||
1052 | shr edx, 16 | ||
1053 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1054 | xor edi, ebp | ||
1055 | mov ebp, DWORD PTR 24[esp] | ||
1056 | mov cl, dh | ||
1057 | and eax, 0ffh | ||
1058 | and edx, 0ffh | ||
1059 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1060 | xor edi, ebx | ||
1061 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1062 | xor edi, ebx | ||
1063 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1064 | xor edi, ebx | ||
1065 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1066 | xor edi, ebx | ||
1067 | ; | ||
1068 | ; Round 4 | ||
1069 | mov eax, DWORD PTR 32[ebp] | ||
1070 | xor ebx, ebx | ||
1071 | mov edx, DWORD PTR 36[ebp] | ||
1072 | xor eax, edi | ||
1073 | xor edx, edi | ||
1074 | and eax, 0fcfcfcfch | ||
1075 | and edx, 0cfcfcfcfh | ||
1076 | mov bl, al | ||
1077 | mov cl, ah | ||
1078 | ror edx, 4 | ||
1079 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1080 | mov bl, dl | ||
1081 | xor esi, ebp | ||
1082 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1083 | xor esi, ebp | ||
1084 | mov cl, dh | ||
1085 | shr eax, 16 | ||
1086 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1087 | xor esi, ebp | ||
1088 | mov bl, ah | ||
1089 | shr edx, 16 | ||
1090 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1091 | xor esi, ebp | ||
1092 | mov ebp, DWORD PTR 24[esp] | ||
1093 | mov cl, dh | ||
1094 | and eax, 0ffh | ||
1095 | and edx, 0ffh | ||
1096 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1097 | xor esi, ebx | ||
1098 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1099 | xor esi, ebx | ||
1100 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1101 | xor esi, ebx | ||
1102 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1103 | xor esi, ebx | ||
1104 | ; | ||
1105 | ; Round 3 | ||
1106 | mov eax, DWORD PTR 24[ebp] | ||
1107 | xor ebx, ebx | ||
1108 | mov edx, DWORD PTR 28[ebp] | ||
1109 | xor eax, esi | ||
1110 | xor edx, esi | ||
1111 | and eax, 0fcfcfcfch | ||
1112 | and edx, 0cfcfcfcfh | ||
1113 | mov bl, al | ||
1114 | mov cl, ah | ||
1115 | ror edx, 4 | ||
1116 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1117 | mov bl, dl | ||
1118 | xor edi, ebp | ||
1119 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1120 | xor edi, ebp | ||
1121 | mov cl, dh | ||
1122 | shr eax, 16 | ||
1123 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1124 | xor edi, ebp | ||
1125 | mov bl, ah | ||
1126 | shr edx, 16 | ||
1127 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1128 | xor edi, ebp | ||
1129 | mov ebp, DWORD PTR 24[esp] | ||
1130 | mov cl, dh | ||
1131 | and eax, 0ffh | ||
1132 | and edx, 0ffh | ||
1133 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1134 | xor edi, ebx | ||
1135 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1136 | xor edi, ebx | ||
1137 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1138 | xor edi, ebx | ||
1139 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1140 | xor edi, ebx | ||
1141 | ; | ||
1142 | ; Round 2 | ||
1143 | mov eax, DWORD PTR 16[ebp] | ||
1144 | xor ebx, ebx | ||
1145 | mov edx, DWORD PTR 20[ebp] | ||
1146 | xor eax, edi | ||
1147 | xor edx, edi | ||
1148 | and eax, 0fcfcfcfch | ||
1149 | and edx, 0cfcfcfcfh | ||
1150 | mov bl, al | ||
1151 | mov cl, ah | ||
1152 | ror edx, 4 | ||
1153 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1154 | mov bl, dl | ||
1155 | xor esi, ebp | ||
1156 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1157 | xor esi, ebp | ||
1158 | mov cl, dh | ||
1159 | shr eax, 16 | ||
1160 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1161 | xor esi, ebp | ||
1162 | mov bl, ah | ||
1163 | shr edx, 16 | ||
1164 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1165 | xor esi, ebp | ||
1166 | mov ebp, DWORD PTR 24[esp] | ||
1167 | mov cl, dh | ||
1168 | and eax, 0ffh | ||
1169 | and edx, 0ffh | ||
1170 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1171 | xor esi, ebx | ||
1172 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1173 | xor esi, ebx | ||
1174 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1175 | xor esi, ebx | ||
1176 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1177 | xor esi, ebx | ||
1178 | ; | ||
1179 | ; Round 1 | ||
1180 | mov eax, DWORD PTR 8[ebp] | ||
1181 | xor ebx, ebx | ||
1182 | mov edx, DWORD PTR 12[ebp] | ||
1183 | xor eax, esi | ||
1184 | xor edx, esi | ||
1185 | and eax, 0fcfcfcfch | ||
1186 | and edx, 0cfcfcfcfh | ||
1187 | mov bl, al | ||
1188 | mov cl, ah | ||
1189 | ror edx, 4 | ||
1190 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1191 | mov bl, dl | ||
1192 | xor edi, ebp | ||
1193 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1194 | xor edi, ebp | ||
1195 | mov cl, dh | ||
1196 | shr eax, 16 | ||
1197 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1198 | xor edi, ebp | ||
1199 | mov bl, ah | ||
1200 | shr edx, 16 | ||
1201 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1202 | xor edi, ebp | ||
1203 | mov ebp, DWORD PTR 24[esp] | ||
1204 | mov cl, dh | ||
1205 | and eax, 0ffh | ||
1206 | and edx, 0ffh | ||
1207 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1208 | xor edi, ebx | ||
1209 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1210 | xor edi, ebx | ||
1211 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1212 | xor edi, ebx | ||
1213 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1214 | xor edi, ebx | ||
1215 | ; | ||
1216 | ; Round 0 | ||
1217 | mov eax, DWORD PTR [ebp] | ||
1218 | xor ebx, ebx | ||
1219 | mov edx, DWORD PTR 4[ebp] | ||
1220 | xor eax, edi | ||
1221 | xor edx, edi | ||
1222 | and eax, 0fcfcfcfch | ||
1223 | and edx, 0cfcfcfcfh | ||
1224 | mov bl, al | ||
1225 | mov cl, ah | ||
1226 | ror edx, 4 | ||
1227 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1228 | mov bl, dl | ||
1229 | xor esi, ebp | ||
1230 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1231 | xor esi, ebp | ||
1232 | mov cl, dh | ||
1233 | shr eax, 16 | ||
1234 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1235 | xor esi, ebp | ||
1236 | mov bl, ah | ||
1237 | shr edx, 16 | ||
1238 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1239 | xor esi, ebp | ||
1240 | mov ebp, DWORD PTR 24[esp] | ||
1241 | mov cl, dh | ||
1242 | and eax, 0ffh | ||
1243 | and edx, 0ffh | ||
1244 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1245 | xor esi, ebx | ||
1246 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1247 | xor esi, ebx | ||
1248 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1249 | xor esi, ebx | ||
1250 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1251 | xor esi, ebx | ||
1252 | $L001end: | ||
1253 | ; | ||
1254 | ; FP | ||
1255 | mov edx, DWORD PTR 20[esp] | ||
1256 | ror esi, 1 | ||
1257 | mov eax, edi | ||
1258 | xor edi, esi | ||
1259 | and edi, 0aaaaaaaah | ||
1260 | xor eax, edi | ||
1261 | xor esi, edi | ||
1262 | ; | ||
1263 | rol eax, 23 | ||
1264 | mov edi, eax | ||
1265 | xor eax, esi | ||
1266 | and eax, 003fc03fch | ||
1267 | xor edi, eax | ||
1268 | xor esi, eax | ||
1269 | ; | ||
1270 | rol edi, 10 | ||
1271 | mov eax, edi | ||
1272 | xor edi, esi | ||
1273 | and edi, 033333333h | ||
1274 | xor eax, edi | ||
1275 | xor esi, edi | ||
1276 | ; | ||
1277 | rol esi, 18 | ||
1278 | mov edi, esi | ||
1279 | xor esi, eax | ||
1280 | and esi, 0fff0000fh | ||
1281 | xor edi, esi | ||
1282 | xor eax, esi | ||
1283 | ; | ||
1284 | rol edi, 12 | ||
1285 | mov esi, edi | ||
1286 | xor edi, eax | ||
1287 | and edi, 0f0f0f0f0h | ||
1288 | xor esi, edi | ||
1289 | xor eax, edi | ||
1290 | ; | ||
1291 | ror eax, 4 | ||
1292 | mov DWORD PTR [edx],eax | ||
1293 | mov DWORD PTR 4[edx],esi | ||
1294 | pop ebp | ||
1295 | pop ebx | ||
1296 | pop edi | ||
1297 | pop esi | ||
1298 | ret | ||
1299 | _des_encrypt ENDP | ||
1300 | _TEXT ENDS | ||
1301 | _TEXT SEGMENT | ||
1302 | PUBLIC _des_encrypt2 | ||
1303 | EXTRN _des_SPtrans:DWORD | ||
1304 | _des_encrypt2 PROC NEAR | ||
1305 | push esi | ||
1306 | push edi | ||
1307 | ; | ||
1308 | ; Load the 2 words | ||
1309 | mov eax, DWORD PTR 12[esp] | ||
1310 | xor ecx, ecx | ||
1311 | push ebx | ||
1312 | push ebp | ||
1313 | mov esi, DWORD PTR [eax] | ||
1314 | mov ebx, DWORD PTR 28[esp] | ||
1315 | rol esi, 3 | ||
1316 | mov edi, DWORD PTR 4[eax] | ||
1317 | rol edi, 3 | ||
1318 | mov ebp, DWORD PTR 24[esp] | ||
1319 | cmp ebx, 0 | ||
1320 | je $L002start_decrypt | ||
1321 | ; | ||
1322 | ; Round 0 | ||
1323 | mov eax, DWORD PTR [ebp] | ||
1324 | xor ebx, ebx | ||
1325 | mov edx, DWORD PTR 4[ebp] | ||
1326 | xor eax, esi | ||
1327 | xor edx, esi | ||
1328 | and eax, 0fcfcfcfch | ||
1329 | and edx, 0cfcfcfcfh | ||
1330 | mov bl, al | ||
1331 | mov cl, ah | ||
1332 | ror edx, 4 | ||
1333 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1334 | mov bl, dl | ||
1335 | xor edi, ebp | ||
1336 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1337 | xor edi, ebp | ||
1338 | mov cl, dh | ||
1339 | shr eax, 16 | ||
1340 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1341 | xor edi, ebp | ||
1342 | mov bl, ah | ||
1343 | shr edx, 16 | ||
1344 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1345 | xor edi, ebp | ||
1346 | mov ebp, DWORD PTR 24[esp] | ||
1347 | mov cl, dh | ||
1348 | and eax, 0ffh | ||
1349 | and edx, 0ffh | ||
1350 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1351 | xor edi, ebx | ||
1352 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1353 | xor edi, ebx | ||
1354 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1355 | xor edi, ebx | ||
1356 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1357 | xor edi, ebx | ||
1358 | ; | ||
1359 | ; Round 1 | ||
1360 | mov eax, DWORD PTR 8[ebp] | ||
1361 | xor ebx, ebx | ||
1362 | mov edx, DWORD PTR 12[ebp] | ||
1363 | xor eax, edi | ||
1364 | xor edx, edi | ||
1365 | and eax, 0fcfcfcfch | ||
1366 | and edx, 0cfcfcfcfh | ||
1367 | mov bl, al | ||
1368 | mov cl, ah | ||
1369 | ror edx, 4 | ||
1370 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1371 | mov bl, dl | ||
1372 | xor esi, ebp | ||
1373 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1374 | xor esi, ebp | ||
1375 | mov cl, dh | ||
1376 | shr eax, 16 | ||
1377 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1378 | xor esi, ebp | ||
1379 | mov bl, ah | ||
1380 | shr edx, 16 | ||
1381 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1382 | xor esi, ebp | ||
1383 | mov ebp, DWORD PTR 24[esp] | ||
1384 | mov cl, dh | ||
1385 | and eax, 0ffh | ||
1386 | and edx, 0ffh | ||
1387 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1388 | xor esi, ebx | ||
1389 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1390 | xor esi, ebx | ||
1391 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1392 | xor esi, ebx | ||
1393 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1394 | xor esi, ebx | ||
1395 | ; | ||
1396 | ; Round 2 | ||
1397 | mov eax, DWORD PTR 16[ebp] | ||
1398 | xor ebx, ebx | ||
1399 | mov edx, DWORD PTR 20[ebp] | ||
1400 | xor eax, esi | ||
1401 | xor edx, esi | ||
1402 | and eax, 0fcfcfcfch | ||
1403 | and edx, 0cfcfcfcfh | ||
1404 | mov bl, al | ||
1405 | mov cl, ah | ||
1406 | ror edx, 4 | ||
1407 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1408 | mov bl, dl | ||
1409 | xor edi, ebp | ||
1410 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1411 | xor edi, ebp | ||
1412 | mov cl, dh | ||
1413 | shr eax, 16 | ||
1414 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1415 | xor edi, ebp | ||
1416 | mov bl, ah | ||
1417 | shr edx, 16 | ||
1418 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1419 | xor edi, ebp | ||
1420 | mov ebp, DWORD PTR 24[esp] | ||
1421 | mov cl, dh | ||
1422 | and eax, 0ffh | ||
1423 | and edx, 0ffh | ||
1424 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1425 | xor edi, ebx | ||
1426 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1427 | xor edi, ebx | ||
1428 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1429 | xor edi, ebx | ||
1430 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1431 | xor edi, ebx | ||
1432 | ; | ||
1433 | ; Round 3 | ||
1434 | mov eax, DWORD PTR 24[ebp] | ||
1435 | xor ebx, ebx | ||
1436 | mov edx, DWORD PTR 28[ebp] | ||
1437 | xor eax, edi | ||
1438 | xor edx, edi | ||
1439 | and eax, 0fcfcfcfch | ||
1440 | and edx, 0cfcfcfcfh | ||
1441 | mov bl, al | ||
1442 | mov cl, ah | ||
1443 | ror edx, 4 | ||
1444 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1445 | mov bl, dl | ||
1446 | xor esi, ebp | ||
1447 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1448 | xor esi, ebp | ||
1449 | mov cl, dh | ||
1450 | shr eax, 16 | ||
1451 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1452 | xor esi, ebp | ||
1453 | mov bl, ah | ||
1454 | shr edx, 16 | ||
1455 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1456 | xor esi, ebp | ||
1457 | mov ebp, DWORD PTR 24[esp] | ||
1458 | mov cl, dh | ||
1459 | and eax, 0ffh | ||
1460 | and edx, 0ffh | ||
1461 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1462 | xor esi, ebx | ||
1463 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1464 | xor esi, ebx | ||
1465 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1466 | xor esi, ebx | ||
1467 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1468 | xor esi, ebx | ||
1469 | ; | ||
1470 | ; Round 4 | ||
1471 | mov eax, DWORD PTR 32[ebp] | ||
1472 | xor ebx, ebx | ||
1473 | mov edx, DWORD PTR 36[ebp] | ||
1474 | xor eax, esi | ||
1475 | xor edx, esi | ||
1476 | and eax, 0fcfcfcfch | ||
1477 | and edx, 0cfcfcfcfh | ||
1478 | mov bl, al | ||
1479 | mov cl, ah | ||
1480 | ror edx, 4 | ||
1481 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1482 | mov bl, dl | ||
1483 | xor edi, ebp | ||
1484 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1485 | xor edi, ebp | ||
1486 | mov cl, dh | ||
1487 | shr eax, 16 | ||
1488 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1489 | xor edi, ebp | ||
1490 | mov bl, ah | ||
1491 | shr edx, 16 | ||
1492 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1493 | xor edi, ebp | ||
1494 | mov ebp, DWORD PTR 24[esp] | ||
1495 | mov cl, dh | ||
1496 | and eax, 0ffh | ||
1497 | and edx, 0ffh | ||
1498 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1499 | xor edi, ebx | ||
1500 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1501 | xor edi, ebx | ||
1502 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1503 | xor edi, ebx | ||
1504 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1505 | xor edi, ebx | ||
1506 | ; | ||
1507 | ; Round 5 | ||
1508 | mov eax, DWORD PTR 40[ebp] | ||
1509 | xor ebx, ebx | ||
1510 | mov edx, DWORD PTR 44[ebp] | ||
1511 | xor eax, edi | ||
1512 | xor edx, edi | ||
1513 | and eax, 0fcfcfcfch | ||
1514 | and edx, 0cfcfcfcfh | ||
1515 | mov bl, al | ||
1516 | mov cl, ah | ||
1517 | ror edx, 4 | ||
1518 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1519 | mov bl, dl | ||
1520 | xor esi, ebp | ||
1521 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1522 | xor esi, ebp | ||
1523 | mov cl, dh | ||
1524 | shr eax, 16 | ||
1525 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1526 | xor esi, ebp | ||
1527 | mov bl, ah | ||
1528 | shr edx, 16 | ||
1529 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1530 | xor esi, ebp | ||
1531 | mov ebp, DWORD PTR 24[esp] | ||
1532 | mov cl, dh | ||
1533 | and eax, 0ffh | ||
1534 | and edx, 0ffh | ||
1535 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1536 | xor esi, ebx | ||
1537 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1538 | xor esi, ebx | ||
1539 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1540 | xor esi, ebx | ||
1541 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1542 | xor esi, ebx | ||
1543 | ; | ||
1544 | ; Round 6 | ||
1545 | mov eax, DWORD PTR 48[ebp] | ||
1546 | xor ebx, ebx | ||
1547 | mov edx, DWORD PTR 52[ebp] | ||
1548 | xor eax, esi | ||
1549 | xor edx, esi | ||
1550 | and eax, 0fcfcfcfch | ||
1551 | and edx, 0cfcfcfcfh | ||
1552 | mov bl, al | ||
1553 | mov cl, ah | ||
1554 | ror edx, 4 | ||
1555 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1556 | mov bl, dl | ||
1557 | xor edi, ebp | ||
1558 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1559 | xor edi, ebp | ||
1560 | mov cl, dh | ||
1561 | shr eax, 16 | ||
1562 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1563 | xor edi, ebp | ||
1564 | mov bl, ah | ||
1565 | shr edx, 16 | ||
1566 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1567 | xor edi, ebp | ||
1568 | mov ebp, DWORD PTR 24[esp] | ||
1569 | mov cl, dh | ||
1570 | and eax, 0ffh | ||
1571 | and edx, 0ffh | ||
1572 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1573 | xor edi, ebx | ||
1574 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1575 | xor edi, ebx | ||
1576 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1577 | xor edi, ebx | ||
1578 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1579 | xor edi, ebx | ||
1580 | ; | ||
1581 | ; Round 7 | ||
1582 | mov eax, DWORD PTR 56[ebp] | ||
1583 | xor ebx, ebx | ||
1584 | mov edx, DWORD PTR 60[ebp] | ||
1585 | xor eax, edi | ||
1586 | xor edx, edi | ||
1587 | and eax, 0fcfcfcfch | ||
1588 | and edx, 0cfcfcfcfh | ||
1589 | mov bl, al | ||
1590 | mov cl, ah | ||
1591 | ror edx, 4 | ||
1592 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1593 | mov bl, dl | ||
1594 | xor esi, ebp | ||
1595 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1596 | xor esi, ebp | ||
1597 | mov cl, dh | ||
1598 | shr eax, 16 | ||
1599 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1600 | xor esi, ebp | ||
1601 | mov bl, ah | ||
1602 | shr edx, 16 | ||
1603 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1604 | xor esi, ebp | ||
1605 | mov ebp, DWORD PTR 24[esp] | ||
1606 | mov cl, dh | ||
1607 | and eax, 0ffh | ||
1608 | and edx, 0ffh | ||
1609 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1610 | xor esi, ebx | ||
1611 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1612 | xor esi, ebx | ||
1613 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1614 | xor esi, ebx | ||
1615 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1616 | xor esi, ebx | ||
1617 | ; | ||
1618 | ; Round 8 | ||
1619 | mov eax, DWORD PTR 64[ebp] | ||
1620 | xor ebx, ebx | ||
1621 | mov edx, DWORD PTR 68[ebp] | ||
1622 | xor eax, esi | ||
1623 | xor edx, esi | ||
1624 | and eax, 0fcfcfcfch | ||
1625 | and edx, 0cfcfcfcfh | ||
1626 | mov bl, al | ||
1627 | mov cl, ah | ||
1628 | ror edx, 4 | ||
1629 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1630 | mov bl, dl | ||
1631 | xor edi, ebp | ||
1632 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1633 | xor edi, ebp | ||
1634 | mov cl, dh | ||
1635 | shr eax, 16 | ||
1636 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1637 | xor edi, ebp | ||
1638 | mov bl, ah | ||
1639 | shr edx, 16 | ||
1640 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1641 | xor edi, ebp | ||
1642 | mov ebp, DWORD PTR 24[esp] | ||
1643 | mov cl, dh | ||
1644 | and eax, 0ffh | ||
1645 | and edx, 0ffh | ||
1646 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1647 | xor edi, ebx | ||
1648 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1649 | xor edi, ebx | ||
1650 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1651 | xor edi, ebx | ||
1652 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1653 | xor edi, ebx | ||
1654 | ; | ||
1655 | ; Round 9 | ||
1656 | mov eax, DWORD PTR 72[ebp] | ||
1657 | xor ebx, ebx | ||
1658 | mov edx, DWORD PTR 76[ebp] | ||
1659 | xor eax, edi | ||
1660 | xor edx, edi | ||
1661 | and eax, 0fcfcfcfch | ||
1662 | and edx, 0cfcfcfcfh | ||
1663 | mov bl, al | ||
1664 | mov cl, ah | ||
1665 | ror edx, 4 | ||
1666 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1667 | mov bl, dl | ||
1668 | xor esi, ebp | ||
1669 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1670 | xor esi, ebp | ||
1671 | mov cl, dh | ||
1672 | shr eax, 16 | ||
1673 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1674 | xor esi, ebp | ||
1675 | mov bl, ah | ||
1676 | shr edx, 16 | ||
1677 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1678 | xor esi, ebp | ||
1679 | mov ebp, DWORD PTR 24[esp] | ||
1680 | mov cl, dh | ||
1681 | and eax, 0ffh | ||
1682 | and edx, 0ffh | ||
1683 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1684 | xor esi, ebx | ||
1685 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1686 | xor esi, ebx | ||
1687 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1688 | xor esi, ebx | ||
1689 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1690 | xor esi, ebx | ||
1691 | ; | ||
1692 | ; Round 10 | ||
1693 | mov eax, DWORD PTR 80[ebp] | ||
1694 | xor ebx, ebx | ||
1695 | mov edx, DWORD PTR 84[ebp] | ||
1696 | xor eax, esi | ||
1697 | xor edx, esi | ||
1698 | and eax, 0fcfcfcfch | ||
1699 | and edx, 0cfcfcfcfh | ||
1700 | mov bl, al | ||
1701 | mov cl, ah | ||
1702 | ror edx, 4 | ||
1703 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1704 | mov bl, dl | ||
1705 | xor edi, ebp | ||
1706 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1707 | xor edi, ebp | ||
1708 | mov cl, dh | ||
1709 | shr eax, 16 | ||
1710 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1711 | xor edi, ebp | ||
1712 | mov bl, ah | ||
1713 | shr edx, 16 | ||
1714 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1715 | xor edi, ebp | ||
1716 | mov ebp, DWORD PTR 24[esp] | ||
1717 | mov cl, dh | ||
1718 | and eax, 0ffh | ||
1719 | and edx, 0ffh | ||
1720 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1721 | xor edi, ebx | ||
1722 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1723 | xor edi, ebx | ||
1724 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1725 | xor edi, ebx | ||
1726 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1727 | xor edi, ebx | ||
1728 | ; | ||
1729 | ; Round 11 | ||
1730 | mov eax, DWORD PTR 88[ebp] | ||
1731 | xor ebx, ebx | ||
1732 | mov edx, DWORD PTR 92[ebp] | ||
1733 | xor eax, edi | ||
1734 | xor edx, edi | ||
1735 | and eax, 0fcfcfcfch | ||
1736 | and edx, 0cfcfcfcfh | ||
1737 | mov bl, al | ||
1738 | mov cl, ah | ||
1739 | ror edx, 4 | ||
1740 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1741 | mov bl, dl | ||
1742 | xor esi, ebp | ||
1743 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1744 | xor esi, ebp | ||
1745 | mov cl, dh | ||
1746 | shr eax, 16 | ||
1747 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1748 | xor esi, ebp | ||
1749 | mov bl, ah | ||
1750 | shr edx, 16 | ||
1751 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1752 | xor esi, ebp | ||
1753 | mov ebp, DWORD PTR 24[esp] | ||
1754 | mov cl, dh | ||
1755 | and eax, 0ffh | ||
1756 | and edx, 0ffh | ||
1757 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1758 | xor esi, ebx | ||
1759 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1760 | xor esi, ebx | ||
1761 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1762 | xor esi, ebx | ||
1763 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1764 | xor esi, ebx | ||
1765 | ; | ||
1766 | ; Round 12 | ||
1767 | mov eax, DWORD PTR 96[ebp] | ||
1768 | xor ebx, ebx | ||
1769 | mov edx, DWORD PTR 100[ebp] | ||
1770 | xor eax, esi | ||
1771 | xor edx, esi | ||
1772 | and eax, 0fcfcfcfch | ||
1773 | and edx, 0cfcfcfcfh | ||
1774 | mov bl, al | ||
1775 | mov cl, ah | ||
1776 | ror edx, 4 | ||
1777 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1778 | mov bl, dl | ||
1779 | xor edi, ebp | ||
1780 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1781 | xor edi, ebp | ||
1782 | mov cl, dh | ||
1783 | shr eax, 16 | ||
1784 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1785 | xor edi, ebp | ||
1786 | mov bl, ah | ||
1787 | shr edx, 16 | ||
1788 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1789 | xor edi, ebp | ||
1790 | mov ebp, DWORD PTR 24[esp] | ||
1791 | mov cl, dh | ||
1792 | and eax, 0ffh | ||
1793 | and edx, 0ffh | ||
1794 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1795 | xor edi, ebx | ||
1796 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1797 | xor edi, ebx | ||
1798 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1799 | xor edi, ebx | ||
1800 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1801 | xor edi, ebx | ||
1802 | ; | ||
1803 | ; Round 13 | ||
1804 | mov eax, DWORD PTR 104[ebp] | ||
1805 | xor ebx, ebx | ||
1806 | mov edx, DWORD PTR 108[ebp] | ||
1807 | xor eax, edi | ||
1808 | xor edx, edi | ||
1809 | and eax, 0fcfcfcfch | ||
1810 | and edx, 0cfcfcfcfh | ||
1811 | mov bl, al | ||
1812 | mov cl, ah | ||
1813 | ror edx, 4 | ||
1814 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1815 | mov bl, dl | ||
1816 | xor esi, ebp | ||
1817 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1818 | xor esi, ebp | ||
1819 | mov cl, dh | ||
1820 | shr eax, 16 | ||
1821 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1822 | xor esi, ebp | ||
1823 | mov bl, ah | ||
1824 | shr edx, 16 | ||
1825 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1826 | xor esi, ebp | ||
1827 | mov ebp, DWORD PTR 24[esp] | ||
1828 | mov cl, dh | ||
1829 | and eax, 0ffh | ||
1830 | and edx, 0ffh | ||
1831 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1832 | xor esi, ebx | ||
1833 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1834 | xor esi, ebx | ||
1835 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1836 | xor esi, ebx | ||
1837 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1838 | xor esi, ebx | ||
1839 | ; | ||
1840 | ; Round 14 | ||
1841 | mov eax, DWORD PTR 112[ebp] | ||
1842 | xor ebx, ebx | ||
1843 | mov edx, DWORD PTR 116[ebp] | ||
1844 | xor eax, esi | ||
1845 | xor edx, esi | ||
1846 | and eax, 0fcfcfcfch | ||
1847 | and edx, 0cfcfcfcfh | ||
1848 | mov bl, al | ||
1849 | mov cl, ah | ||
1850 | ror edx, 4 | ||
1851 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1852 | mov bl, dl | ||
1853 | xor edi, ebp | ||
1854 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1855 | xor edi, ebp | ||
1856 | mov cl, dh | ||
1857 | shr eax, 16 | ||
1858 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1859 | xor edi, ebp | ||
1860 | mov bl, ah | ||
1861 | shr edx, 16 | ||
1862 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1863 | xor edi, ebp | ||
1864 | mov ebp, DWORD PTR 24[esp] | ||
1865 | mov cl, dh | ||
1866 | and eax, 0ffh | ||
1867 | and edx, 0ffh | ||
1868 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1869 | xor edi, ebx | ||
1870 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1871 | xor edi, ebx | ||
1872 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1873 | xor edi, ebx | ||
1874 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1875 | xor edi, ebx | ||
1876 | ; | ||
1877 | ; Round 15 | ||
1878 | mov eax, DWORD PTR 120[ebp] | ||
1879 | xor ebx, ebx | ||
1880 | mov edx, DWORD PTR 124[ebp] | ||
1881 | xor eax, edi | ||
1882 | xor edx, edi | ||
1883 | and eax, 0fcfcfcfch | ||
1884 | and edx, 0cfcfcfcfh | ||
1885 | mov bl, al | ||
1886 | mov cl, ah | ||
1887 | ror edx, 4 | ||
1888 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1889 | mov bl, dl | ||
1890 | xor esi, ebp | ||
1891 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1892 | xor esi, ebp | ||
1893 | mov cl, dh | ||
1894 | shr eax, 16 | ||
1895 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1896 | xor esi, ebp | ||
1897 | mov bl, ah | ||
1898 | shr edx, 16 | ||
1899 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1900 | xor esi, ebp | ||
1901 | mov ebp, DWORD PTR 24[esp] | ||
1902 | mov cl, dh | ||
1903 | and eax, 0ffh | ||
1904 | and edx, 0ffh | ||
1905 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1906 | xor esi, ebx | ||
1907 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1908 | xor esi, ebx | ||
1909 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1910 | xor esi, ebx | ||
1911 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1912 | xor esi, ebx | ||
1913 | jmp $L003end | ||
1914 | $L002start_decrypt: | ||
1915 | ; | ||
1916 | ; Round 15 | ||
1917 | mov eax, DWORD PTR 120[ebp] | ||
1918 | xor ebx, ebx | ||
1919 | mov edx, DWORD PTR 124[ebp] | ||
1920 | xor eax, esi | ||
1921 | xor edx, esi | ||
1922 | and eax, 0fcfcfcfch | ||
1923 | and edx, 0cfcfcfcfh | ||
1924 | mov bl, al | ||
1925 | mov cl, ah | ||
1926 | ror edx, 4 | ||
1927 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1928 | mov bl, dl | ||
1929 | xor edi, ebp | ||
1930 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1931 | xor edi, ebp | ||
1932 | mov cl, dh | ||
1933 | shr eax, 16 | ||
1934 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1935 | xor edi, ebp | ||
1936 | mov bl, ah | ||
1937 | shr edx, 16 | ||
1938 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1939 | xor edi, ebp | ||
1940 | mov ebp, DWORD PTR 24[esp] | ||
1941 | mov cl, dh | ||
1942 | and eax, 0ffh | ||
1943 | and edx, 0ffh | ||
1944 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1945 | xor edi, ebx | ||
1946 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1947 | xor edi, ebx | ||
1948 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1949 | xor edi, ebx | ||
1950 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1951 | xor edi, ebx | ||
1952 | ; | ||
1953 | ; Round 14 | ||
1954 | mov eax, DWORD PTR 112[ebp] | ||
1955 | xor ebx, ebx | ||
1956 | mov edx, DWORD PTR 116[ebp] | ||
1957 | xor eax, edi | ||
1958 | xor edx, edi | ||
1959 | and eax, 0fcfcfcfch | ||
1960 | and edx, 0cfcfcfcfh | ||
1961 | mov bl, al | ||
1962 | mov cl, ah | ||
1963 | ror edx, 4 | ||
1964 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1965 | mov bl, dl | ||
1966 | xor esi, ebp | ||
1967 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1968 | xor esi, ebp | ||
1969 | mov cl, dh | ||
1970 | shr eax, 16 | ||
1971 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1972 | xor esi, ebp | ||
1973 | mov bl, ah | ||
1974 | shr edx, 16 | ||
1975 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1976 | xor esi, ebp | ||
1977 | mov ebp, DWORD PTR 24[esp] | ||
1978 | mov cl, dh | ||
1979 | and eax, 0ffh | ||
1980 | and edx, 0ffh | ||
1981 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1982 | xor esi, ebx | ||
1983 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1984 | xor esi, ebx | ||
1985 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1986 | xor esi, ebx | ||
1987 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1988 | xor esi, ebx | ||
1989 | ; | ||
1990 | ; Round 13 | ||
1991 | mov eax, DWORD PTR 104[ebp] | ||
1992 | xor ebx, ebx | ||
1993 | mov edx, DWORD PTR 108[ebp] | ||
1994 | xor eax, esi | ||
1995 | xor edx, esi | ||
1996 | and eax, 0fcfcfcfch | ||
1997 | and edx, 0cfcfcfcfh | ||
1998 | mov bl, al | ||
1999 | mov cl, ah | ||
2000 | ror edx, 4 | ||
2001 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
2002 | mov bl, dl | ||
2003 | xor edi, ebp | ||
2004 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
2005 | xor edi, ebp | ||
2006 | mov cl, dh | ||
2007 | shr eax, 16 | ||
2008 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
2009 | xor edi, ebp | ||
2010 | mov bl, ah | ||
2011 | shr edx, 16 | ||
2012 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
2013 | xor edi, ebp | ||
2014 | mov ebp, DWORD PTR 24[esp] | ||
2015 | mov cl, dh | ||
2016 | and eax, 0ffh | ||
2017 | and edx, 0ffh | ||
2018 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
2019 | xor edi, ebx | ||
2020 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
2021 | xor edi, ebx | ||
2022 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
2023 | xor edi, ebx | ||
2024 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
2025 | xor edi, ebx | ||
2026 | ; | ||
2027 | ; Round 12 | ||
2028 | mov eax, DWORD PTR 96[ebp] | ||
2029 | xor ebx, ebx | ||
2030 | mov edx, DWORD PTR 100[ebp] | ||
2031 | xor eax, edi | ||
2032 | xor edx, edi | ||
2033 | and eax, 0fcfcfcfch | ||
2034 | and edx, 0cfcfcfcfh | ||
2035 | mov bl, al | ||
2036 | mov cl, ah | ||
2037 | ror edx, 4 | ||
2038 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
2039 | mov bl, dl | ||
2040 | xor esi, ebp | ||
2041 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
2042 | xor esi, ebp | ||
2043 | mov cl, dh | ||
2044 | shr eax, 16 | ||
2045 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
2046 | xor esi, ebp | ||
2047 | mov bl, ah | ||
2048 | shr edx, 16 | ||
2049 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
2050 | xor esi, ebp | ||
2051 | mov ebp, DWORD PTR 24[esp] | ||
2052 | mov cl, dh | ||
2053 | and eax, 0ffh | ||
2054 | and edx, 0ffh | ||
2055 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
2056 | xor esi, ebx | ||
2057 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
2058 | xor esi, ebx | ||
2059 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
2060 | xor esi, ebx | ||
2061 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
2062 | xor esi, ebx | ||
2063 | ; | ||
2064 | ; Round 11 | ||
2065 | mov eax, DWORD PTR 88[ebp] | ||
2066 | xor ebx, ebx | ||
2067 | mov edx, DWORD PTR 92[ebp] | ||
2068 | xor eax, esi | ||
2069 | xor edx, esi | ||
2070 | and eax, 0fcfcfcfch | ||
2071 | and edx, 0cfcfcfcfh | ||
2072 | mov bl, al | ||
2073 | mov cl, ah | ||
2074 | ror edx, 4 | ||
2075 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
2076 | mov bl, dl | ||
2077 | xor edi, ebp | ||
2078 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
2079 | xor edi, ebp | ||
2080 | mov cl, dh | ||
2081 | shr eax, 16 | ||
2082 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
2083 | xor edi, ebp | ||
2084 | mov bl, ah | ||
2085 | shr edx, 16 | ||
2086 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
2087 | xor edi, ebp | ||
2088 | mov ebp, DWORD PTR 24[esp] | ||
2089 | mov cl, dh | ||
2090 | and eax, 0ffh | ||
2091 | and edx, 0ffh | ||
2092 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
2093 | xor edi, ebx | ||
2094 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
2095 | xor edi, ebx | ||
2096 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
2097 | xor edi, ebx | ||
2098 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
2099 | xor edi, ebx | ||
2100 | ; | ||
2101 | ; Round 10 | ||
2102 | mov eax, DWORD PTR 80[ebp] | ||
2103 | xor ebx, ebx | ||
2104 | mov edx, DWORD PTR 84[ebp] | ||
2105 | xor eax, edi | ||
2106 | xor edx, edi | ||
2107 | and eax, 0fcfcfcfch | ||
2108 | and edx, 0cfcfcfcfh | ||
2109 | mov bl, al | ||
2110 | mov cl, ah | ||
2111 | ror edx, 4 | ||
2112 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
2113 | mov bl, dl | ||
2114 | xor esi, ebp | ||
2115 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
2116 | xor esi, ebp | ||
2117 | mov cl, dh | ||
2118 | shr eax, 16 | ||
2119 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
2120 | xor esi, ebp | ||
2121 | mov bl, ah | ||
2122 | shr edx, 16 | ||
2123 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
2124 | xor esi, ebp | ||
2125 | mov ebp, DWORD PTR 24[esp] | ||
2126 | mov cl, dh | ||
2127 | and eax, 0ffh | ||
2128 | and edx, 0ffh | ||
2129 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
2130 | xor esi, ebx | ||
2131 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
2132 | xor esi, ebx | ||
2133 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
2134 | xor esi, ebx | ||
2135 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
2136 | xor esi, ebx | ||
2137 | ; | ||
2138 | ; Round 9 | ||
2139 | mov eax, DWORD PTR 72[ebp] | ||
2140 | xor ebx, ebx | ||
2141 | mov edx, DWORD PTR 76[ebp] | ||
2142 | xor eax, esi | ||
2143 | xor edx, esi | ||
2144 | and eax, 0fcfcfcfch | ||
2145 | and edx, 0cfcfcfcfh | ||
2146 | mov bl, al | ||
2147 | mov cl, ah | ||
2148 | ror edx, 4 | ||
2149 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
2150 | mov bl, dl | ||
2151 | xor edi, ebp | ||
2152 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
2153 | xor edi, ebp | ||
2154 | mov cl, dh | ||
2155 | shr eax, 16 | ||
2156 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
2157 | xor edi, ebp | ||
2158 | mov bl, ah | ||
2159 | shr edx, 16 | ||
2160 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
2161 | xor edi, ebp | ||
2162 | mov ebp, DWORD PTR 24[esp] | ||
2163 | mov cl, dh | ||
2164 | and eax, 0ffh | ||
2165 | and edx, 0ffh | ||
2166 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
2167 | xor edi, ebx | ||
2168 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
2169 | xor edi, ebx | ||
2170 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
2171 | xor edi, ebx | ||
2172 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
2173 | xor edi, ebx | ||
2174 | ; | ||
2175 | ; Round 8 | ||
2176 | mov eax, DWORD PTR 64[ebp] | ||
2177 | xor ebx, ebx | ||
2178 | mov edx, DWORD PTR 68[ebp] | ||
2179 | xor eax, edi | ||
2180 | xor edx, edi | ||
2181 | and eax, 0fcfcfcfch | ||
2182 | and edx, 0cfcfcfcfh | ||
2183 | mov bl, al | ||
2184 | mov cl, ah | ||
2185 | ror edx, 4 | ||
2186 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
2187 | mov bl, dl | ||
2188 | xor esi, ebp | ||
2189 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
2190 | xor esi, ebp | ||
2191 | mov cl, dh | ||
2192 | shr eax, 16 | ||
2193 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
2194 | xor esi, ebp | ||
2195 | mov bl, ah | ||
2196 | shr edx, 16 | ||
2197 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
2198 | xor esi, ebp | ||
2199 | mov ebp, DWORD PTR 24[esp] | ||
2200 | mov cl, dh | ||
2201 | and eax, 0ffh | ||
2202 | and edx, 0ffh | ||
2203 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
2204 | xor esi, ebx | ||
2205 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
2206 | xor esi, ebx | ||
2207 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
2208 | xor esi, ebx | ||
2209 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
2210 | xor esi, ebx | ||
2211 | ; | ||
2212 | ; Round 7 | ||
2213 | mov eax, DWORD PTR 56[ebp] | ||
2214 | xor ebx, ebx | ||
2215 | mov edx, DWORD PTR 60[ebp] | ||
2216 | xor eax, esi | ||
2217 | xor edx, esi | ||
2218 | and eax, 0fcfcfcfch | ||
2219 | and edx, 0cfcfcfcfh | ||
2220 | mov bl, al | ||
2221 | mov cl, ah | ||
2222 | ror edx, 4 | ||
2223 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
2224 | mov bl, dl | ||
2225 | xor edi, ebp | ||
2226 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
2227 | xor edi, ebp | ||
2228 | mov cl, dh | ||
2229 | shr eax, 16 | ||
2230 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
2231 | xor edi, ebp | ||
2232 | mov bl, ah | ||
2233 | shr edx, 16 | ||
2234 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
2235 | xor edi, ebp | ||
2236 | mov ebp, DWORD PTR 24[esp] | ||
2237 | mov cl, dh | ||
2238 | and eax, 0ffh | ||
2239 | and edx, 0ffh | ||
2240 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
2241 | xor edi, ebx | ||
2242 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
2243 | xor edi, ebx | ||
2244 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
2245 | xor edi, ebx | ||
2246 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
2247 | xor edi, ebx | ||
2248 | ; | ||
2249 | ; Round 6 | ||
2250 | mov eax, DWORD PTR 48[ebp] | ||
2251 | xor ebx, ebx | ||
2252 | mov edx, DWORD PTR 52[ebp] | ||
2253 | xor eax, edi | ||
2254 | xor edx, edi | ||
2255 | and eax, 0fcfcfcfch | ||
2256 | and edx, 0cfcfcfcfh | ||
2257 | mov bl, al | ||
2258 | mov cl, ah | ||
2259 | ror edx, 4 | ||
2260 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
2261 | mov bl, dl | ||
2262 | xor esi, ebp | ||
2263 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
2264 | xor esi, ebp | ||
2265 | mov cl, dh | ||
2266 | shr eax, 16 | ||
2267 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
2268 | xor esi, ebp | ||
2269 | mov bl, ah | ||
2270 | shr edx, 16 | ||
2271 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
2272 | xor esi, ebp | ||
2273 | mov ebp, DWORD PTR 24[esp] | ||
2274 | mov cl, dh | ||
2275 | and eax, 0ffh | ||
2276 | and edx, 0ffh | ||
2277 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
2278 | xor esi, ebx | ||
2279 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
2280 | xor esi, ebx | ||
2281 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
2282 | xor esi, ebx | ||
2283 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
2284 | xor esi, ebx | ||
2285 | ; | ||
2286 | ; Round 5 | ||
2287 | mov eax, DWORD PTR 40[ebp] | ||
2288 | xor ebx, ebx | ||
2289 | mov edx, DWORD PTR 44[ebp] | ||
2290 | xor eax, esi | ||
2291 | xor edx, esi | ||
2292 | and eax, 0fcfcfcfch | ||
2293 | and edx, 0cfcfcfcfh | ||
2294 | mov bl, al | ||
2295 | mov cl, ah | ||
2296 | ror edx, 4 | ||
2297 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
2298 | mov bl, dl | ||
2299 | xor edi, ebp | ||
2300 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
2301 | xor edi, ebp | ||
2302 | mov cl, dh | ||
2303 | shr eax, 16 | ||
2304 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
2305 | xor edi, ebp | ||
2306 | mov bl, ah | ||
2307 | shr edx, 16 | ||
2308 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
2309 | xor edi, ebp | ||
2310 | mov ebp, DWORD PTR 24[esp] | ||
2311 | mov cl, dh | ||
2312 | and eax, 0ffh | ||
2313 | and edx, 0ffh | ||
2314 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
2315 | xor edi, ebx | ||
2316 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
2317 | xor edi, ebx | ||
2318 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
2319 | xor edi, ebx | ||
2320 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
2321 | xor edi, ebx | ||
2322 | ; | ||
2323 | ; Round 4 | ||
2324 | mov eax, DWORD PTR 32[ebp] | ||
2325 | xor ebx, ebx | ||
2326 | mov edx, DWORD PTR 36[ebp] | ||
2327 | xor eax, edi | ||
2328 | xor edx, edi | ||
2329 | and eax, 0fcfcfcfch | ||
2330 | and edx, 0cfcfcfcfh | ||
2331 | mov bl, al | ||
2332 | mov cl, ah | ||
2333 | ror edx, 4 | ||
2334 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
2335 | mov bl, dl | ||
2336 | xor esi, ebp | ||
2337 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
2338 | xor esi, ebp | ||
2339 | mov cl, dh | ||
2340 | shr eax, 16 | ||
2341 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
2342 | xor esi, ebp | ||
2343 | mov bl, ah | ||
2344 | shr edx, 16 | ||
2345 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
2346 | xor esi, ebp | ||
2347 | mov ebp, DWORD PTR 24[esp] | ||
2348 | mov cl, dh | ||
2349 | and eax, 0ffh | ||
2350 | and edx, 0ffh | ||
2351 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
2352 | xor esi, ebx | ||
2353 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
2354 | xor esi, ebx | ||
2355 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
2356 | xor esi, ebx | ||
2357 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
2358 | xor esi, ebx | ||
2359 | ; | ||
2360 | ; Round 3 | ||
2361 | mov eax, DWORD PTR 24[ebp] | ||
2362 | xor ebx, ebx | ||
2363 | mov edx, DWORD PTR 28[ebp] | ||
2364 | xor eax, esi | ||
2365 | xor edx, esi | ||
2366 | and eax, 0fcfcfcfch | ||
2367 | and edx, 0cfcfcfcfh | ||
2368 | mov bl, al | ||
2369 | mov cl, ah | ||
2370 | ror edx, 4 | ||
2371 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
2372 | mov bl, dl | ||
2373 | xor edi, ebp | ||
2374 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
2375 | xor edi, ebp | ||
2376 | mov cl, dh | ||
2377 | shr eax, 16 | ||
2378 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
2379 | xor edi, ebp | ||
2380 | mov bl, ah | ||
2381 | shr edx, 16 | ||
2382 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
2383 | xor edi, ebp | ||
2384 | mov ebp, DWORD PTR 24[esp] | ||
2385 | mov cl, dh | ||
2386 | and eax, 0ffh | ||
2387 | and edx, 0ffh | ||
2388 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
2389 | xor edi, ebx | ||
2390 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
2391 | xor edi, ebx | ||
2392 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
2393 | xor edi, ebx | ||
2394 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
2395 | xor edi, ebx | ||
2396 | ; | ||
2397 | ; Round 2 | ||
2398 | mov eax, DWORD PTR 16[ebp] | ||
2399 | xor ebx, ebx | ||
2400 | mov edx, DWORD PTR 20[ebp] | ||
2401 | xor eax, edi | ||
2402 | xor edx, edi | ||
2403 | and eax, 0fcfcfcfch | ||
2404 | and edx, 0cfcfcfcfh | ||
2405 | mov bl, al | ||
2406 | mov cl, ah | ||
2407 | ror edx, 4 | ||
2408 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
2409 | mov bl, dl | ||
2410 | xor esi, ebp | ||
2411 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
2412 | xor esi, ebp | ||
2413 | mov cl, dh | ||
2414 | shr eax, 16 | ||
2415 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
2416 | xor esi, ebp | ||
2417 | mov bl, ah | ||
2418 | shr edx, 16 | ||
2419 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
2420 | xor esi, ebp | ||
2421 | mov ebp, DWORD PTR 24[esp] | ||
2422 | mov cl, dh | ||
2423 | and eax, 0ffh | ||
2424 | and edx, 0ffh | ||
2425 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
2426 | xor esi, ebx | ||
2427 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
2428 | xor esi, ebx | ||
2429 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
2430 | xor esi, ebx | ||
2431 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
2432 | xor esi, ebx | ||
2433 | ; | ||
2434 | ; Round 1 | ||
2435 | mov eax, DWORD PTR 8[ebp] | ||
2436 | xor ebx, ebx | ||
2437 | mov edx, DWORD PTR 12[ebp] | ||
2438 | xor eax, esi | ||
2439 | xor edx, esi | ||
2440 | and eax, 0fcfcfcfch | ||
2441 | and edx, 0cfcfcfcfh | ||
2442 | mov bl, al | ||
2443 | mov cl, ah | ||
2444 | ror edx, 4 | ||
2445 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
2446 | mov bl, dl | ||
2447 | xor edi, ebp | ||
2448 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
2449 | xor edi, ebp | ||
2450 | mov cl, dh | ||
2451 | shr eax, 16 | ||
2452 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
2453 | xor edi, ebp | ||
2454 | mov bl, ah | ||
2455 | shr edx, 16 | ||
2456 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
2457 | xor edi, ebp | ||
2458 | mov ebp, DWORD PTR 24[esp] | ||
2459 | mov cl, dh | ||
2460 | and eax, 0ffh | ||
2461 | and edx, 0ffh | ||
2462 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
2463 | xor edi, ebx | ||
2464 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
2465 | xor edi, ebx | ||
2466 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
2467 | xor edi, ebx | ||
2468 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
2469 | xor edi, ebx | ||
2470 | ; | ||
2471 | ; Round 0 | ||
2472 | mov eax, DWORD PTR [ebp] | ||
2473 | xor ebx, ebx | ||
2474 | mov edx, DWORD PTR 4[ebp] | ||
2475 | xor eax, edi | ||
2476 | xor edx, edi | ||
2477 | and eax, 0fcfcfcfch | ||
2478 | and edx, 0cfcfcfcfh | ||
2479 | mov bl, al | ||
2480 | mov cl, ah | ||
2481 | ror edx, 4 | ||
2482 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
2483 | mov bl, dl | ||
2484 | xor esi, ebp | ||
2485 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
2486 | xor esi, ebp | ||
2487 | mov cl, dh | ||
2488 | shr eax, 16 | ||
2489 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
2490 | xor esi, ebp | ||
2491 | mov bl, ah | ||
2492 | shr edx, 16 | ||
2493 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
2494 | xor esi, ebp | ||
2495 | mov ebp, DWORD PTR 24[esp] | ||
2496 | mov cl, dh | ||
2497 | and eax, 0ffh | ||
2498 | and edx, 0ffh | ||
2499 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
2500 | xor esi, ebx | ||
2501 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
2502 | xor esi, ebx | ||
2503 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
2504 | xor esi, ebx | ||
2505 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
2506 | xor esi, ebx | ||
2507 | $L003end: | ||
2508 | ; | ||
2509 | ; Fixup | ||
2510 | ror edi, 3 | ||
2511 | mov eax, DWORD PTR 20[esp] | ||
2512 | ror esi, 3 | ||
2513 | mov DWORD PTR [eax],edi | ||
2514 | mov DWORD PTR 4[eax],esi | ||
2515 | pop ebp | ||
2516 | pop ebx | ||
2517 | pop edi | ||
2518 | pop esi | ||
2519 | ret | ||
2520 | _des_encrypt2 ENDP | ||
2521 | _TEXT ENDS | ||
2522 | _TEXT SEGMENT | ||
2523 | PUBLIC _des_encrypt3 | ||
2524 | |||
2525 | _des_encrypt3 PROC NEAR | ||
2526 | push ebx | ||
2527 | mov ebx, DWORD PTR 8[esp] | ||
2528 | push ebp | ||
2529 | push esi | ||
2530 | push edi | ||
2531 | ; | ||
2532 | ; Load the data words | ||
2533 | mov edi, DWORD PTR [ebx] | ||
2534 | mov esi, DWORD PTR 4[ebx] | ||
2535 | sub esp, 12 | ||
2536 | ; | ||
2537 | ; IP | ||
2538 | rol edi, 4 | ||
2539 | mov edx, edi | ||
2540 | xor edi, esi | ||
2541 | and edi, 0f0f0f0f0h | ||
2542 | xor edx, edi | ||
2543 | xor esi, edi | ||
2544 | ; | ||
2545 | rol esi, 20 | ||
2546 | mov edi, esi | ||
2547 | xor esi, edx | ||
2548 | and esi, 0fff0000fh | ||
2549 | xor edi, esi | ||
2550 | xor edx, esi | ||
2551 | ; | ||
2552 | rol edi, 14 | ||
2553 | mov esi, edi | ||
2554 | xor edi, edx | ||
2555 | and edi, 033333333h | ||
2556 | xor esi, edi | ||
2557 | xor edx, edi | ||
2558 | ; | ||
2559 | rol edx, 22 | ||
2560 | mov edi, edx | ||
2561 | xor edx, esi | ||
2562 | and edx, 003fc03fch | ||
2563 | xor edi, edx | ||
2564 | xor esi, edx | ||
2565 | ; | ||
2566 | rol edi, 9 | ||
2567 | mov edx, edi | ||
2568 | xor edi, esi | ||
2569 | and edi, 0aaaaaaaah | ||
2570 | xor edx, edi | ||
2571 | xor esi, edi | ||
2572 | ; | ||
2573 | ror edx, 3 | ||
2574 | ror esi, 2 | ||
2575 | mov DWORD PTR 4[ebx],esi | ||
2576 | mov eax, DWORD PTR 36[esp] | ||
2577 | mov DWORD PTR [ebx],edx | ||
2578 | mov edi, DWORD PTR 40[esp] | ||
2579 | mov esi, DWORD PTR 44[esp] | ||
2580 | mov DWORD PTR 8[esp],1 | ||
2581 | mov DWORD PTR 4[esp],eax | ||
2582 | mov DWORD PTR [esp],ebx | ||
2583 | call _des_encrypt2 | ||
2584 | mov DWORD PTR 8[esp],0 | ||
2585 | mov DWORD PTR 4[esp],edi | ||
2586 | mov DWORD PTR [esp],ebx | ||
2587 | call _des_encrypt2 | ||
2588 | mov DWORD PTR 8[esp],1 | ||
2589 | mov DWORD PTR 4[esp],esi | ||
2590 | mov DWORD PTR [esp],ebx | ||
2591 | call _des_encrypt2 | ||
2592 | add esp, 12 | ||
2593 | mov edi, DWORD PTR [ebx] | ||
2594 | mov esi, DWORD PTR 4[ebx] | ||
2595 | ; | ||
2596 | ; FP | ||
2597 | rol esi, 2 | ||
2598 | rol edi, 3 | ||
2599 | mov eax, edi | ||
2600 | xor edi, esi | ||
2601 | and edi, 0aaaaaaaah | ||
2602 | xor eax, edi | ||
2603 | xor esi, edi | ||
2604 | ; | ||
2605 | rol eax, 23 | ||
2606 | mov edi, eax | ||
2607 | xor eax, esi | ||
2608 | and eax, 003fc03fch | ||
2609 | xor edi, eax | ||
2610 | xor esi, eax | ||
2611 | ; | ||
2612 | rol edi, 10 | ||
2613 | mov eax, edi | ||
2614 | xor edi, esi | ||
2615 | and edi, 033333333h | ||
2616 | xor eax, edi | ||
2617 | xor esi, edi | ||
2618 | ; | ||
2619 | rol esi, 18 | ||
2620 | mov edi, esi | ||
2621 | xor esi, eax | ||
2622 | and esi, 0fff0000fh | ||
2623 | xor edi, esi | ||
2624 | xor eax, esi | ||
2625 | ; | ||
2626 | rol edi, 12 | ||
2627 | mov esi, edi | ||
2628 | xor edi, eax | ||
2629 | and edi, 0f0f0f0f0h | ||
2630 | xor esi, edi | ||
2631 | xor eax, edi | ||
2632 | ; | ||
2633 | ror eax, 4 | ||
2634 | mov DWORD PTR [ebx],eax | ||
2635 | mov DWORD PTR 4[ebx],esi | ||
2636 | pop edi | ||
2637 | pop esi | ||
2638 | pop ebp | ||
2639 | pop ebx | ||
2640 | ret | ||
2641 | _des_encrypt3 ENDP | ||
2642 | _TEXT ENDS | ||
2643 | _TEXT SEGMENT | ||
2644 | PUBLIC _des_decrypt3 | ||
2645 | |||
2646 | _des_decrypt3 PROC NEAR | ||
2647 | push ebx | ||
2648 | mov ebx, DWORD PTR 8[esp] | ||
2649 | push ebp | ||
2650 | push esi | ||
2651 | push edi | ||
2652 | ; | ||
2653 | ; Load the data words | ||
2654 | mov edi, DWORD PTR [ebx] | ||
2655 | mov esi, DWORD PTR 4[ebx] | ||
2656 | sub esp, 12 | ||
2657 | ; | ||
2658 | ; IP | ||
2659 | rol edi, 4 | ||
2660 | mov edx, edi | ||
2661 | xor edi, esi | ||
2662 | and edi, 0f0f0f0f0h | ||
2663 | xor edx, edi | ||
2664 | xor esi, edi | ||
2665 | ; | ||
2666 | rol esi, 20 | ||
2667 | mov edi, esi | ||
2668 | xor esi, edx | ||
2669 | and esi, 0fff0000fh | ||
2670 | xor edi, esi | ||
2671 | xor edx, esi | ||
2672 | ; | ||
2673 | rol edi, 14 | ||
2674 | mov esi, edi | ||
2675 | xor edi, edx | ||
2676 | and edi, 033333333h | ||
2677 | xor esi, edi | ||
2678 | xor edx, edi | ||
2679 | ; | ||
2680 | rol edx, 22 | ||
2681 | mov edi, edx | ||
2682 | xor edx, esi | ||
2683 | and edx, 003fc03fch | ||
2684 | xor edi, edx | ||
2685 | xor esi, edx | ||
2686 | ; | ||
2687 | rol edi, 9 | ||
2688 | mov edx, edi | ||
2689 | xor edi, esi | ||
2690 | and edi, 0aaaaaaaah | ||
2691 | xor edx, edi | ||
2692 | xor esi, edi | ||
2693 | ; | ||
2694 | ror edx, 3 | ||
2695 | ror esi, 2 | ||
2696 | mov DWORD PTR 4[ebx],esi | ||
2697 | mov esi, DWORD PTR 36[esp] | ||
2698 | mov DWORD PTR [ebx],edx | ||
2699 | mov edi, DWORD PTR 40[esp] | ||
2700 | mov eax, DWORD PTR 44[esp] | ||
2701 | mov DWORD PTR 8[esp],0 | ||
2702 | mov DWORD PTR 4[esp],eax | ||
2703 | mov DWORD PTR [esp],ebx | ||
2704 | call _des_encrypt2 | ||
2705 | mov DWORD PTR 8[esp],1 | ||
2706 | mov DWORD PTR 4[esp],edi | ||
2707 | mov DWORD PTR [esp],ebx | ||
2708 | call _des_encrypt2 | ||
2709 | mov DWORD PTR 8[esp],0 | ||
2710 | mov DWORD PTR 4[esp],esi | ||
2711 | mov DWORD PTR [esp],ebx | ||
2712 | call _des_encrypt2 | ||
2713 | add esp, 12 | ||
2714 | mov edi, DWORD PTR [ebx] | ||
2715 | mov esi, DWORD PTR 4[ebx] | ||
2716 | ; | ||
2717 | ; FP | ||
2718 | rol esi, 2 | ||
2719 | rol edi, 3 | ||
2720 | mov eax, edi | ||
2721 | xor edi, esi | ||
2722 | and edi, 0aaaaaaaah | ||
2723 | xor eax, edi | ||
2724 | xor esi, edi | ||
2725 | ; | ||
2726 | rol eax, 23 | ||
2727 | mov edi, eax | ||
2728 | xor eax, esi | ||
2729 | and eax, 003fc03fch | ||
2730 | xor edi, eax | ||
2731 | xor esi, eax | ||
2732 | ; | ||
2733 | rol edi, 10 | ||
2734 | mov eax, edi | ||
2735 | xor edi, esi | ||
2736 | and edi, 033333333h | ||
2737 | xor eax, edi | ||
2738 | xor esi, edi | ||
2739 | ; | ||
2740 | rol esi, 18 | ||
2741 | mov edi, esi | ||
2742 | xor esi, eax | ||
2743 | and esi, 0fff0000fh | ||
2744 | xor edi, esi | ||
2745 | xor eax, esi | ||
2746 | ; | ||
2747 | rol edi, 12 | ||
2748 | mov esi, edi | ||
2749 | xor edi, eax | ||
2750 | and edi, 0f0f0f0f0h | ||
2751 | xor esi, edi | ||
2752 | xor eax, edi | ||
2753 | ; | ||
2754 | ror eax, 4 | ||
2755 | mov DWORD PTR [ebx],eax | ||
2756 | mov DWORD PTR 4[ebx],esi | ||
2757 | pop edi | ||
2758 | pop esi | ||
2759 | pop ebp | ||
2760 | pop ebx | ||
2761 | ret | ||
2762 | _des_decrypt3 ENDP | ||
2763 | _TEXT ENDS | ||
2764 | _TEXT SEGMENT | ||
2765 | PUBLIC _des_ncbc_encrypt | ||
2766 | |||
2767 | _des_ncbc_encrypt PROC NEAR | ||
2768 | ; | ||
2769 | push ebp | ||
2770 | push ebx | ||
2771 | push esi | ||
2772 | push edi | ||
2773 | mov ebp, DWORD PTR 28[esp] | ||
2774 | ; getting iv ptr from parameter 4 | ||
2775 | mov ebx, DWORD PTR 36[esp] | ||
2776 | mov esi, DWORD PTR [ebx] | ||
2777 | mov edi, DWORD PTR 4[ebx] | ||
2778 | push edi | ||
2779 | push esi | ||
2780 | push edi | ||
2781 | push esi | ||
2782 | mov ebx, esp | ||
2783 | mov esi, DWORD PTR 36[esp] | ||
2784 | mov edi, DWORD PTR 40[esp] | ||
2785 | ; getting encrypt flag from parameter 5 | ||
2786 | mov ecx, DWORD PTR 56[esp] | ||
2787 | ; get and push parameter 5 | ||
2788 | push ecx | ||
2789 | ; get and push parameter 3 | ||
2790 | mov eax, DWORD PTR 52[esp] | ||
2791 | push eax | ||
2792 | push ebx | ||
2793 | cmp ecx, 0 | ||
2794 | jz $L004decrypt | ||
2795 | and ebp, 4294967288 | ||
2796 | mov eax, DWORD PTR 12[esp] | ||
2797 | mov ebx, DWORD PTR 16[esp] | ||
2798 | jz $L005encrypt_finish | ||
2799 | L006encrypt_loop: | ||
2800 | mov ecx, DWORD PTR [esi] | ||
2801 | mov edx, DWORD PTR 4[esi] | ||
2802 | xor eax, ecx | ||
2803 | xor ebx, edx | ||
2804 | mov DWORD PTR 12[esp],eax | ||
2805 | mov DWORD PTR 16[esp],ebx | ||
2806 | call _des_encrypt | ||
2807 | mov eax, DWORD PTR 12[esp] | ||
2808 | mov ebx, DWORD PTR 16[esp] | ||
2809 | mov DWORD PTR [edi],eax | ||
2810 | mov DWORD PTR 4[edi],ebx | ||
2811 | add esi, 8 | ||
2812 | add edi, 8 | ||
2813 | sub ebp, 8 | ||
2814 | jnz L006encrypt_loop | ||
2815 | $L005encrypt_finish: | ||
2816 | mov ebp, DWORD PTR 56[esp] | ||
2817 | and ebp, 7 | ||
2818 | jz $L007finish | ||
2819 | xor ecx, ecx | ||
2820 | xor edx, edx | ||
2821 | mov ebp, DWORD PTR $L008cbc_enc_jmp_table[ebp*4] | ||
2822 | jmp ebp | ||
2823 | L009ej7: | ||
2824 | mov dh, BYTE PTR 6[esi] | ||
2825 | shl edx, 8 | ||
2826 | L010ej6: | ||
2827 | mov dh, BYTE PTR 5[esi] | ||
2828 | L011ej5: | ||
2829 | mov dl, BYTE PTR 4[esi] | ||
2830 | L012ej4: | ||
2831 | mov ecx, DWORD PTR [esi] | ||
2832 | jmp $L013ejend | ||
2833 | L014ej3: | ||
2834 | mov ch, BYTE PTR 2[esi] | ||
2835 | shl ecx, 8 | ||
2836 | L015ej2: | ||
2837 | mov ch, BYTE PTR 1[esi] | ||
2838 | L016ej1: | ||
2839 | mov cl, BYTE PTR [esi] | ||
2840 | $L013ejend: | ||
2841 | xor eax, ecx | ||
2842 | xor ebx, edx | ||
2843 | mov DWORD PTR 12[esp],eax | ||
2844 | mov DWORD PTR 16[esp],ebx | ||
2845 | call _des_encrypt | ||
2846 | mov eax, DWORD PTR 12[esp] | ||
2847 | mov ebx, DWORD PTR 16[esp] | ||
2848 | mov DWORD PTR [edi],eax | ||
2849 | mov DWORD PTR 4[edi],ebx | ||
2850 | jmp $L007finish | ||
2851 | $L004decrypt: | ||
2852 | and ebp, 4294967288 | ||
2853 | mov eax, DWORD PTR 20[esp] | ||
2854 | mov ebx, DWORD PTR 24[esp] | ||
2855 | jz $L017decrypt_finish | ||
2856 | L018decrypt_loop: | ||
2857 | mov eax, DWORD PTR [esi] | ||
2858 | mov ebx, DWORD PTR 4[esi] | ||
2859 | mov DWORD PTR 12[esp],eax | ||
2860 | mov DWORD PTR 16[esp],ebx | ||
2861 | call _des_encrypt | ||
2862 | mov eax, DWORD PTR 12[esp] | ||
2863 | mov ebx, DWORD PTR 16[esp] | ||
2864 | mov ecx, DWORD PTR 20[esp] | ||
2865 | mov edx, DWORD PTR 24[esp] | ||
2866 | xor ecx, eax | ||
2867 | xor edx, ebx | ||
2868 | mov eax, DWORD PTR [esi] | ||
2869 | mov ebx, DWORD PTR 4[esi] | ||
2870 | mov DWORD PTR [edi],ecx | ||
2871 | mov DWORD PTR 4[edi],edx | ||
2872 | mov DWORD PTR 20[esp],eax | ||
2873 | mov DWORD PTR 24[esp],ebx | ||
2874 | add esi, 8 | ||
2875 | add edi, 8 | ||
2876 | sub ebp, 8 | ||
2877 | jnz L018decrypt_loop | ||
2878 | $L017decrypt_finish: | ||
2879 | mov ebp, DWORD PTR 56[esp] | ||
2880 | and ebp, 7 | ||
2881 | jz $L007finish | ||
2882 | mov eax, DWORD PTR [esi] | ||
2883 | mov ebx, DWORD PTR 4[esi] | ||
2884 | mov DWORD PTR 12[esp],eax | ||
2885 | mov DWORD PTR 16[esp],ebx | ||
2886 | call _des_encrypt | ||
2887 | mov eax, DWORD PTR 12[esp] | ||
2888 | mov ebx, DWORD PTR 16[esp] | ||
2889 | mov ecx, DWORD PTR 20[esp] | ||
2890 | mov edx, DWORD PTR 24[esp] | ||
2891 | xor ecx, eax | ||
2892 | xor edx, ebx | ||
2893 | mov eax, DWORD PTR [esi] | ||
2894 | mov ebx, DWORD PTR 4[esi] | ||
2895 | L019dj7: | ||
2896 | ror edx, 16 | ||
2897 | mov BYTE PTR 6[edi],dl | ||
2898 | shr edx, 16 | ||
2899 | L020dj6: | ||
2900 | mov BYTE PTR 5[edi],dh | ||
2901 | L021dj5: | ||
2902 | mov BYTE PTR 4[edi],dl | ||
2903 | L022dj4: | ||
2904 | mov DWORD PTR [edi],ecx | ||
2905 | jmp $L023djend | ||
2906 | L024dj3: | ||
2907 | ror ecx, 16 | ||
2908 | mov BYTE PTR 2[edi],cl | ||
2909 | shl ecx, 16 | ||
2910 | L025dj2: | ||
2911 | mov BYTE PTR 1[esi],ch | ||
2912 | L026dj1: | ||
2913 | mov BYTE PTR [esi], cl | ||
2914 | $L023djend: | ||
2915 | jmp $L007finish | ||
2916 | $L007finish: | ||
2917 | mov ecx, DWORD PTR 64[esp] | ||
2918 | add esp, 28 | ||
2919 | mov DWORD PTR [ecx],eax | ||
2920 | mov DWORD PTR 4[ecx],ebx | ||
2921 | pop edi | ||
2922 | pop esi | ||
2923 | pop ebx | ||
2924 | pop ebp | ||
2925 | ret | ||
2926 | $L008cbc_enc_jmp_table: | ||
2927 | DD 0 | ||
2928 | DD L016ej1 | ||
2929 | DD L015ej2 | ||
2930 | DD L014ej3 | ||
2931 | DD L012ej4 | ||
2932 | DD L011ej5 | ||
2933 | DD L010ej6 | ||
2934 | DD L009ej7 | ||
2935 | L027cbc_dec_jmp_table: | ||
2936 | DD 0 | ||
2937 | DD L026dj1 | ||
2938 | DD L025dj2 | ||
2939 | DD L024dj3 | ||
2940 | DD L022dj4 | ||
2941 | DD L021dj5 | ||
2942 | DD L020dj6 | ||
2943 | DD L019dj7 | ||
2944 | _des_ncbc_encrypt ENDP | ||
2945 | _TEXT ENDS | ||
2946 | _TEXT SEGMENT | ||
2947 | PUBLIC _des_ede3_cbc_encrypt | ||
2948 | |||
2949 | _des_ede3_cbc_encrypt PROC NEAR | ||
2950 | ; | ||
2951 | push ebp | ||
2952 | push ebx | ||
2953 | push esi | ||
2954 | push edi | ||
2955 | mov ebp, DWORD PTR 28[esp] | ||
2956 | ; getting iv ptr from parameter 6 | ||
2957 | mov ebx, DWORD PTR 44[esp] | ||
2958 | mov esi, DWORD PTR [ebx] | ||
2959 | mov edi, DWORD PTR 4[ebx] | ||
2960 | push edi | ||
2961 | push esi | ||
2962 | push edi | ||
2963 | push esi | ||
2964 | mov ebx, esp | ||
2965 | mov esi, DWORD PTR 36[esp] | ||
2966 | mov edi, DWORD PTR 40[esp] | ||
2967 | ; getting encrypt flag from parameter 7 | ||
2968 | mov ecx, DWORD PTR 64[esp] | ||
2969 | ; get and push parameter 5 | ||
2970 | mov eax, DWORD PTR 56[esp] | ||
2971 | push eax | ||
2972 | ; get and push parameter 4 | ||
2973 | mov eax, DWORD PTR 56[esp] | ||
2974 | push eax | ||
2975 | ; get and push parameter 3 | ||
2976 | mov eax, DWORD PTR 56[esp] | ||
2977 | push eax | ||
2978 | push ebx | ||
2979 | cmp ecx, 0 | ||
2980 | jz $L028decrypt | ||
2981 | and ebp, 4294967288 | ||
2982 | mov eax, DWORD PTR 16[esp] | ||
2983 | mov ebx, DWORD PTR 20[esp] | ||
2984 | jz $L029encrypt_finish | ||
2985 | L030encrypt_loop: | ||
2986 | mov ecx, DWORD PTR [esi] | ||
2987 | mov edx, DWORD PTR 4[esi] | ||
2988 | xor eax, ecx | ||
2989 | xor ebx, edx | ||
2990 | mov DWORD PTR 16[esp],eax | ||
2991 | mov DWORD PTR 20[esp],ebx | ||
2992 | call _des_encrypt3 | ||
2993 | mov eax, DWORD PTR 16[esp] | ||
2994 | mov ebx, DWORD PTR 20[esp] | ||
2995 | mov DWORD PTR [edi],eax | ||
2996 | mov DWORD PTR 4[edi],ebx | ||
2997 | add esi, 8 | ||
2998 | add edi, 8 | ||
2999 | sub ebp, 8 | ||
3000 | jnz L030encrypt_loop | ||
3001 | $L029encrypt_finish: | ||
3002 | mov ebp, DWORD PTR 60[esp] | ||
3003 | and ebp, 7 | ||
3004 | jz $L031finish | ||
3005 | xor ecx, ecx | ||
3006 | xor edx, edx | ||
3007 | mov ebp, DWORD PTR $L032cbc_enc_jmp_table[ebp*4] | ||
3008 | jmp ebp | ||
3009 | L033ej7: | ||
3010 | mov dh, BYTE PTR 6[esi] | ||
3011 | shl edx, 8 | ||
3012 | L034ej6: | ||
3013 | mov dh, BYTE PTR 5[esi] | ||
3014 | L035ej5: | ||
3015 | mov dl, BYTE PTR 4[esi] | ||
3016 | L036ej4: | ||
3017 | mov ecx, DWORD PTR [esi] | ||
3018 | jmp $L037ejend | ||
3019 | L038ej3: | ||
3020 | mov ch, BYTE PTR 2[esi] | ||
3021 | shl ecx, 8 | ||
3022 | L039ej2: | ||
3023 | mov ch, BYTE PTR 1[esi] | ||
3024 | L040ej1: | ||
3025 | mov cl, BYTE PTR [esi] | ||
3026 | $L037ejend: | ||
3027 | xor eax, ecx | ||
3028 | xor ebx, edx | ||
3029 | mov DWORD PTR 16[esp],eax | ||
3030 | mov DWORD PTR 20[esp],ebx | ||
3031 | call _des_encrypt3 | ||
3032 | mov eax, DWORD PTR 16[esp] | ||
3033 | mov ebx, DWORD PTR 20[esp] | ||
3034 | mov DWORD PTR [edi],eax | ||
3035 | mov DWORD PTR 4[edi],ebx | ||
3036 | jmp $L031finish | ||
3037 | $L028decrypt: | ||
3038 | and ebp, 4294967288 | ||
3039 | mov eax, DWORD PTR 24[esp] | ||
3040 | mov ebx, DWORD PTR 28[esp] | ||
3041 | jz $L041decrypt_finish | ||
3042 | L042decrypt_loop: | ||
3043 | mov eax, DWORD PTR [esi] | ||
3044 | mov ebx, DWORD PTR 4[esi] | ||
3045 | mov DWORD PTR 16[esp],eax | ||
3046 | mov DWORD PTR 20[esp],ebx | ||
3047 | call _des_decrypt3 | ||
3048 | mov eax, DWORD PTR 16[esp] | ||
3049 | mov ebx, DWORD PTR 20[esp] | ||
3050 | mov ecx, DWORD PTR 24[esp] | ||
3051 | mov edx, DWORD PTR 28[esp] | ||
3052 | xor ecx, eax | ||
3053 | xor edx, ebx | ||
3054 | mov eax, DWORD PTR [esi] | ||
3055 | mov ebx, DWORD PTR 4[esi] | ||
3056 | mov DWORD PTR [edi],ecx | ||
3057 | mov DWORD PTR 4[edi],edx | ||
3058 | mov DWORD PTR 24[esp],eax | ||
3059 | mov DWORD PTR 28[esp],ebx | ||
3060 | add esi, 8 | ||
3061 | add edi, 8 | ||
3062 | sub ebp, 8 | ||
3063 | jnz L042decrypt_loop | ||
3064 | $L041decrypt_finish: | ||
3065 | mov ebp, DWORD PTR 60[esp] | ||
3066 | and ebp, 7 | ||
3067 | jz $L031finish | ||
3068 | mov eax, DWORD PTR [esi] | ||
3069 | mov ebx, DWORD PTR 4[esi] | ||
3070 | mov DWORD PTR 16[esp],eax | ||
3071 | mov DWORD PTR 20[esp],ebx | ||
3072 | call _des_decrypt3 | ||
3073 | mov eax, DWORD PTR 16[esp] | ||
3074 | mov ebx, DWORD PTR 20[esp] | ||
3075 | mov ecx, DWORD PTR 24[esp] | ||
3076 | mov edx, DWORD PTR 28[esp] | ||
3077 | xor ecx, eax | ||
3078 | xor edx, ebx | ||
3079 | mov eax, DWORD PTR [esi] | ||
3080 | mov ebx, DWORD PTR 4[esi] | ||
3081 | L043dj7: | ||
3082 | ror edx, 16 | ||
3083 | mov BYTE PTR 6[edi],dl | ||
3084 | shr edx, 16 | ||
3085 | L044dj6: | ||
3086 | mov BYTE PTR 5[edi],dh | ||
3087 | L045dj5: | ||
3088 | mov BYTE PTR 4[edi],dl | ||
3089 | L046dj4: | ||
3090 | mov DWORD PTR [edi],ecx | ||
3091 | jmp $L047djend | ||
3092 | L048dj3: | ||
3093 | ror ecx, 16 | ||
3094 | mov BYTE PTR 2[edi],cl | ||
3095 | shl ecx, 16 | ||
3096 | L049dj2: | ||
3097 | mov BYTE PTR 1[esi],ch | ||
3098 | L050dj1: | ||
3099 | mov BYTE PTR [esi], cl | ||
3100 | $L047djend: | ||
3101 | jmp $L031finish | ||
3102 | $L031finish: | ||
3103 | mov ecx, DWORD PTR 76[esp] | ||
3104 | add esp, 32 | ||
3105 | mov DWORD PTR [ecx],eax | ||
3106 | mov DWORD PTR 4[ecx],ebx | ||
3107 | pop edi | ||
3108 | pop esi | ||
3109 | pop ebx | ||
3110 | pop ebp | ||
3111 | ret | ||
3112 | $L032cbc_enc_jmp_table: | ||
3113 | DD 0 | ||
3114 | DD L040ej1 | ||
3115 | DD L039ej2 | ||
3116 | DD L038ej3 | ||
3117 | DD L036ej4 | ||
3118 | DD L035ej5 | ||
3119 | DD L034ej6 | ||
3120 | DD L033ej7 | ||
3121 | L051cbc_dec_jmp_table: | ||
3122 | DD 0 | ||
3123 | DD L050dj1 | ||
3124 | DD L049dj2 | ||
3125 | DD L048dj3 | ||
3126 | DD L046dj4 | ||
3127 | DD L045dj5 | ||
3128 | DD L044dj6 | ||
3129 | DD L043dj7 | ||
3130 | _des_ede3_cbc_encrypt ENDP | ||
3131 | _TEXT ENDS | ||
3132 | END | ||
diff --git a/src/lib/libcrypto/des/asm/y-win32.asm b/src/lib/libcrypto/des/asm/y-win32.asm index af5c102422..e69de29bb2 100644 --- a/src/lib/libcrypto/des/asm/y-win32.asm +++ b/src/lib/libcrypto/des/asm/y-win32.asm | |||
@@ -1,929 +0,0 @@ | |||
1 | ; Don't even think of reading this code | ||
2 | ; It was automatically generated by crypt586.pl | ||
3 | ; Which is a perl program used to generate the x86 assember for | ||
4 | ; any of elf, a.out, BSDI,Win32, or Solaris | ||
5 | ; eric <eay@cryptsoft.com> | ||
6 | ; | ||
7 | TITLE crypt586.asm | ||
8 | .386 | ||
9 | .model FLAT | ||
10 | _TEXT SEGMENT | ||
11 | PUBLIC _fcrypt_body | ||
12 | EXTRN _des_SPtrans:DWORD | ||
13 | _fcrypt_body PROC NEAR | ||
14 | push ebp | ||
15 | push ebx | ||
16 | push esi | ||
17 | push edi | ||
18 | ; | ||
19 | ; Load the 2 words | ||
20 | xor edi, edi | ||
21 | xor esi, esi | ||
22 | mov ebp, DWORD PTR 24[esp] | ||
23 | push 25 | ||
24 | L000start: | ||
25 | ; | ||
26 | ; Round 0 | ||
27 | mov eax, DWORD PTR 32[esp] | ||
28 | mov edx, esi | ||
29 | shr edx, 16 | ||
30 | mov ecx, DWORD PTR 36[esp] | ||
31 | xor edx, esi | ||
32 | and eax, edx | ||
33 | and edx, ecx | ||
34 | mov ebx, eax | ||
35 | shl ebx, 16 | ||
36 | mov ecx, edx | ||
37 | shl ecx, 16 | ||
38 | xor eax, ebx | ||
39 | xor edx, ecx | ||
40 | mov ebx, DWORD PTR [ebp] | ||
41 | xor eax, ebx | ||
42 | mov ecx, DWORD PTR 4[ebp] | ||
43 | xor eax, esi | ||
44 | xor edx, esi | ||
45 | xor edx, ecx | ||
46 | and eax, 0fcfcfcfch | ||
47 | xor ebx, ebx | ||
48 | and edx, 0cfcfcfcfh | ||
49 | xor ecx, ecx | ||
50 | mov bl, al | ||
51 | mov cl, ah | ||
52 | ror edx, 4 | ||
53 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
54 | mov bl, dl | ||
55 | xor edi, ebp | ||
56 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
57 | xor edi, ebp | ||
58 | mov cl, dh | ||
59 | shr eax, 16 | ||
60 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
61 | xor edi, ebp | ||
62 | mov bl, ah | ||
63 | shr edx, 16 | ||
64 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
65 | xor edi, ebp | ||
66 | mov ebp, DWORD PTR 28[esp] | ||
67 | mov cl, dh | ||
68 | and eax, 0ffh | ||
69 | and edx, 0ffh | ||
70 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
71 | xor edi, ebx | ||
72 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
73 | xor edi, ebx | ||
74 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
75 | xor edi, ebx | ||
76 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
77 | xor edi, ebx | ||
78 | ; | ||
79 | ; Round 1 | ||
80 | mov eax, DWORD PTR 32[esp] | ||
81 | mov edx, edi | ||
82 | shr edx, 16 | ||
83 | mov ecx, DWORD PTR 36[esp] | ||
84 | xor edx, edi | ||
85 | and eax, edx | ||
86 | and edx, ecx | ||
87 | mov ebx, eax | ||
88 | shl ebx, 16 | ||
89 | mov ecx, edx | ||
90 | shl ecx, 16 | ||
91 | xor eax, ebx | ||
92 | xor edx, ecx | ||
93 | mov ebx, DWORD PTR 8[ebp] | ||
94 | xor eax, ebx | ||
95 | mov ecx, DWORD PTR 12[ebp] | ||
96 | xor eax, edi | ||
97 | xor edx, edi | ||
98 | xor edx, ecx | ||
99 | and eax, 0fcfcfcfch | ||
100 | xor ebx, ebx | ||
101 | and edx, 0cfcfcfcfh | ||
102 | xor ecx, ecx | ||
103 | mov bl, al | ||
104 | mov cl, ah | ||
105 | ror edx, 4 | ||
106 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
107 | mov bl, dl | ||
108 | xor esi, ebp | ||
109 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
110 | xor esi, ebp | ||
111 | mov cl, dh | ||
112 | shr eax, 16 | ||
113 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
114 | xor esi, ebp | ||
115 | mov bl, ah | ||
116 | shr edx, 16 | ||
117 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
118 | xor esi, ebp | ||
119 | mov ebp, DWORD PTR 28[esp] | ||
120 | mov cl, dh | ||
121 | and eax, 0ffh | ||
122 | and edx, 0ffh | ||
123 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
124 | xor esi, ebx | ||
125 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
126 | xor esi, ebx | ||
127 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
128 | xor esi, ebx | ||
129 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
130 | xor esi, ebx | ||
131 | ; | ||
132 | ; Round 2 | ||
133 | mov eax, DWORD PTR 32[esp] | ||
134 | mov edx, esi | ||
135 | shr edx, 16 | ||
136 | mov ecx, DWORD PTR 36[esp] | ||
137 | xor edx, esi | ||
138 | and eax, edx | ||
139 | and edx, ecx | ||
140 | mov ebx, eax | ||
141 | shl ebx, 16 | ||
142 | mov ecx, edx | ||
143 | shl ecx, 16 | ||
144 | xor eax, ebx | ||
145 | xor edx, ecx | ||
146 | mov ebx, DWORD PTR 16[ebp] | ||
147 | xor eax, ebx | ||
148 | mov ecx, DWORD PTR 20[ebp] | ||
149 | xor eax, esi | ||
150 | xor edx, esi | ||
151 | xor edx, ecx | ||
152 | and eax, 0fcfcfcfch | ||
153 | xor ebx, ebx | ||
154 | and edx, 0cfcfcfcfh | ||
155 | xor ecx, ecx | ||
156 | mov bl, al | ||
157 | mov cl, ah | ||
158 | ror edx, 4 | ||
159 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
160 | mov bl, dl | ||
161 | xor edi, ebp | ||
162 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
163 | xor edi, ebp | ||
164 | mov cl, dh | ||
165 | shr eax, 16 | ||
166 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
167 | xor edi, ebp | ||
168 | mov bl, ah | ||
169 | shr edx, 16 | ||
170 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
171 | xor edi, ebp | ||
172 | mov ebp, DWORD PTR 28[esp] | ||
173 | mov cl, dh | ||
174 | and eax, 0ffh | ||
175 | and edx, 0ffh | ||
176 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
177 | xor edi, ebx | ||
178 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
179 | xor edi, ebx | ||
180 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
181 | xor edi, ebx | ||
182 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
183 | xor edi, ebx | ||
184 | ; | ||
185 | ; Round 3 | ||
186 | mov eax, DWORD PTR 32[esp] | ||
187 | mov edx, edi | ||
188 | shr edx, 16 | ||
189 | mov ecx, DWORD PTR 36[esp] | ||
190 | xor edx, edi | ||
191 | and eax, edx | ||
192 | and edx, ecx | ||
193 | mov ebx, eax | ||
194 | shl ebx, 16 | ||
195 | mov ecx, edx | ||
196 | shl ecx, 16 | ||
197 | xor eax, ebx | ||
198 | xor edx, ecx | ||
199 | mov ebx, DWORD PTR 24[ebp] | ||
200 | xor eax, ebx | ||
201 | mov ecx, DWORD PTR 28[ebp] | ||
202 | xor eax, edi | ||
203 | xor edx, edi | ||
204 | xor edx, ecx | ||
205 | and eax, 0fcfcfcfch | ||
206 | xor ebx, ebx | ||
207 | and edx, 0cfcfcfcfh | ||
208 | xor ecx, ecx | ||
209 | mov bl, al | ||
210 | mov cl, ah | ||
211 | ror edx, 4 | ||
212 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
213 | mov bl, dl | ||
214 | xor esi, ebp | ||
215 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
216 | xor esi, ebp | ||
217 | mov cl, dh | ||
218 | shr eax, 16 | ||
219 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
220 | xor esi, ebp | ||
221 | mov bl, ah | ||
222 | shr edx, 16 | ||
223 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
224 | xor esi, ebp | ||
225 | mov ebp, DWORD PTR 28[esp] | ||
226 | mov cl, dh | ||
227 | and eax, 0ffh | ||
228 | and edx, 0ffh | ||
229 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
230 | xor esi, ebx | ||
231 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
232 | xor esi, ebx | ||
233 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
234 | xor esi, ebx | ||
235 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
236 | xor esi, ebx | ||
237 | ; | ||
238 | ; Round 4 | ||
239 | mov eax, DWORD PTR 32[esp] | ||
240 | mov edx, esi | ||
241 | shr edx, 16 | ||
242 | mov ecx, DWORD PTR 36[esp] | ||
243 | xor edx, esi | ||
244 | and eax, edx | ||
245 | and edx, ecx | ||
246 | mov ebx, eax | ||
247 | shl ebx, 16 | ||
248 | mov ecx, edx | ||
249 | shl ecx, 16 | ||
250 | xor eax, ebx | ||
251 | xor edx, ecx | ||
252 | mov ebx, DWORD PTR 32[ebp] | ||
253 | xor eax, ebx | ||
254 | mov ecx, DWORD PTR 36[ebp] | ||
255 | xor eax, esi | ||
256 | xor edx, esi | ||
257 | xor edx, ecx | ||
258 | and eax, 0fcfcfcfch | ||
259 | xor ebx, ebx | ||
260 | and edx, 0cfcfcfcfh | ||
261 | xor ecx, ecx | ||
262 | mov bl, al | ||
263 | mov cl, ah | ||
264 | ror edx, 4 | ||
265 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
266 | mov bl, dl | ||
267 | xor edi, ebp | ||
268 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
269 | xor edi, ebp | ||
270 | mov cl, dh | ||
271 | shr eax, 16 | ||
272 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
273 | xor edi, ebp | ||
274 | mov bl, ah | ||
275 | shr edx, 16 | ||
276 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
277 | xor edi, ebp | ||
278 | mov ebp, DWORD PTR 28[esp] | ||
279 | mov cl, dh | ||
280 | and eax, 0ffh | ||
281 | and edx, 0ffh | ||
282 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
283 | xor edi, ebx | ||
284 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
285 | xor edi, ebx | ||
286 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
287 | xor edi, ebx | ||
288 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
289 | xor edi, ebx | ||
290 | ; | ||
291 | ; Round 5 | ||
292 | mov eax, DWORD PTR 32[esp] | ||
293 | mov edx, edi | ||
294 | shr edx, 16 | ||
295 | mov ecx, DWORD PTR 36[esp] | ||
296 | xor edx, edi | ||
297 | and eax, edx | ||
298 | and edx, ecx | ||
299 | mov ebx, eax | ||
300 | shl ebx, 16 | ||
301 | mov ecx, edx | ||
302 | shl ecx, 16 | ||
303 | xor eax, ebx | ||
304 | xor edx, ecx | ||
305 | mov ebx, DWORD PTR 40[ebp] | ||
306 | xor eax, ebx | ||
307 | mov ecx, DWORD PTR 44[ebp] | ||
308 | xor eax, edi | ||
309 | xor edx, edi | ||
310 | xor edx, ecx | ||
311 | and eax, 0fcfcfcfch | ||
312 | xor ebx, ebx | ||
313 | and edx, 0cfcfcfcfh | ||
314 | xor ecx, ecx | ||
315 | mov bl, al | ||
316 | mov cl, ah | ||
317 | ror edx, 4 | ||
318 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
319 | mov bl, dl | ||
320 | xor esi, ebp | ||
321 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
322 | xor esi, ebp | ||
323 | mov cl, dh | ||
324 | shr eax, 16 | ||
325 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
326 | xor esi, ebp | ||
327 | mov bl, ah | ||
328 | shr edx, 16 | ||
329 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
330 | xor esi, ebp | ||
331 | mov ebp, DWORD PTR 28[esp] | ||
332 | mov cl, dh | ||
333 | and eax, 0ffh | ||
334 | and edx, 0ffh | ||
335 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
336 | xor esi, ebx | ||
337 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
338 | xor esi, ebx | ||
339 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
340 | xor esi, ebx | ||
341 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
342 | xor esi, ebx | ||
343 | ; | ||
344 | ; Round 6 | ||
345 | mov eax, DWORD PTR 32[esp] | ||
346 | mov edx, esi | ||
347 | shr edx, 16 | ||
348 | mov ecx, DWORD PTR 36[esp] | ||
349 | xor edx, esi | ||
350 | and eax, edx | ||
351 | and edx, ecx | ||
352 | mov ebx, eax | ||
353 | shl ebx, 16 | ||
354 | mov ecx, edx | ||
355 | shl ecx, 16 | ||
356 | xor eax, ebx | ||
357 | xor edx, ecx | ||
358 | mov ebx, DWORD PTR 48[ebp] | ||
359 | xor eax, ebx | ||
360 | mov ecx, DWORD PTR 52[ebp] | ||
361 | xor eax, esi | ||
362 | xor edx, esi | ||
363 | xor edx, ecx | ||
364 | and eax, 0fcfcfcfch | ||
365 | xor ebx, ebx | ||
366 | and edx, 0cfcfcfcfh | ||
367 | xor ecx, ecx | ||
368 | mov bl, al | ||
369 | mov cl, ah | ||
370 | ror edx, 4 | ||
371 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
372 | mov bl, dl | ||
373 | xor edi, ebp | ||
374 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
375 | xor edi, ebp | ||
376 | mov cl, dh | ||
377 | shr eax, 16 | ||
378 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
379 | xor edi, ebp | ||
380 | mov bl, ah | ||
381 | shr edx, 16 | ||
382 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
383 | xor edi, ebp | ||
384 | mov ebp, DWORD PTR 28[esp] | ||
385 | mov cl, dh | ||
386 | and eax, 0ffh | ||
387 | and edx, 0ffh | ||
388 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
389 | xor edi, ebx | ||
390 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
391 | xor edi, ebx | ||
392 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
393 | xor edi, ebx | ||
394 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
395 | xor edi, ebx | ||
396 | ; | ||
397 | ; Round 7 | ||
398 | mov eax, DWORD PTR 32[esp] | ||
399 | mov edx, edi | ||
400 | shr edx, 16 | ||
401 | mov ecx, DWORD PTR 36[esp] | ||
402 | xor edx, edi | ||
403 | and eax, edx | ||
404 | and edx, ecx | ||
405 | mov ebx, eax | ||
406 | shl ebx, 16 | ||
407 | mov ecx, edx | ||
408 | shl ecx, 16 | ||
409 | xor eax, ebx | ||
410 | xor edx, ecx | ||
411 | mov ebx, DWORD PTR 56[ebp] | ||
412 | xor eax, ebx | ||
413 | mov ecx, DWORD PTR 60[ebp] | ||
414 | xor eax, edi | ||
415 | xor edx, edi | ||
416 | xor edx, ecx | ||
417 | and eax, 0fcfcfcfch | ||
418 | xor ebx, ebx | ||
419 | and edx, 0cfcfcfcfh | ||
420 | xor ecx, ecx | ||
421 | mov bl, al | ||
422 | mov cl, ah | ||
423 | ror edx, 4 | ||
424 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
425 | mov bl, dl | ||
426 | xor esi, ebp | ||
427 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
428 | xor esi, ebp | ||
429 | mov cl, dh | ||
430 | shr eax, 16 | ||
431 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
432 | xor esi, ebp | ||
433 | mov bl, ah | ||
434 | shr edx, 16 | ||
435 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
436 | xor esi, ebp | ||
437 | mov ebp, DWORD PTR 28[esp] | ||
438 | mov cl, dh | ||
439 | and eax, 0ffh | ||
440 | and edx, 0ffh | ||
441 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
442 | xor esi, ebx | ||
443 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
444 | xor esi, ebx | ||
445 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
446 | xor esi, ebx | ||
447 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
448 | xor esi, ebx | ||
449 | ; | ||
450 | ; Round 8 | ||
451 | mov eax, DWORD PTR 32[esp] | ||
452 | mov edx, esi | ||
453 | shr edx, 16 | ||
454 | mov ecx, DWORD PTR 36[esp] | ||
455 | xor edx, esi | ||
456 | and eax, edx | ||
457 | and edx, ecx | ||
458 | mov ebx, eax | ||
459 | shl ebx, 16 | ||
460 | mov ecx, edx | ||
461 | shl ecx, 16 | ||
462 | xor eax, ebx | ||
463 | xor edx, ecx | ||
464 | mov ebx, DWORD PTR 64[ebp] | ||
465 | xor eax, ebx | ||
466 | mov ecx, DWORD PTR 68[ebp] | ||
467 | xor eax, esi | ||
468 | xor edx, esi | ||
469 | xor edx, ecx | ||
470 | and eax, 0fcfcfcfch | ||
471 | xor ebx, ebx | ||
472 | and edx, 0cfcfcfcfh | ||
473 | xor ecx, ecx | ||
474 | mov bl, al | ||
475 | mov cl, ah | ||
476 | ror edx, 4 | ||
477 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
478 | mov bl, dl | ||
479 | xor edi, ebp | ||
480 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
481 | xor edi, ebp | ||
482 | mov cl, dh | ||
483 | shr eax, 16 | ||
484 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
485 | xor edi, ebp | ||
486 | mov bl, ah | ||
487 | shr edx, 16 | ||
488 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
489 | xor edi, ebp | ||
490 | mov ebp, DWORD PTR 28[esp] | ||
491 | mov cl, dh | ||
492 | and eax, 0ffh | ||
493 | and edx, 0ffh | ||
494 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
495 | xor edi, ebx | ||
496 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
497 | xor edi, ebx | ||
498 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
499 | xor edi, ebx | ||
500 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
501 | xor edi, ebx | ||
502 | ; | ||
503 | ; Round 9 | ||
504 | mov eax, DWORD PTR 32[esp] | ||
505 | mov edx, edi | ||
506 | shr edx, 16 | ||
507 | mov ecx, DWORD PTR 36[esp] | ||
508 | xor edx, edi | ||
509 | and eax, edx | ||
510 | and edx, ecx | ||
511 | mov ebx, eax | ||
512 | shl ebx, 16 | ||
513 | mov ecx, edx | ||
514 | shl ecx, 16 | ||
515 | xor eax, ebx | ||
516 | xor edx, ecx | ||
517 | mov ebx, DWORD PTR 72[ebp] | ||
518 | xor eax, ebx | ||
519 | mov ecx, DWORD PTR 76[ebp] | ||
520 | xor eax, edi | ||
521 | xor edx, edi | ||
522 | xor edx, ecx | ||
523 | and eax, 0fcfcfcfch | ||
524 | xor ebx, ebx | ||
525 | and edx, 0cfcfcfcfh | ||
526 | xor ecx, ecx | ||
527 | mov bl, al | ||
528 | mov cl, ah | ||
529 | ror edx, 4 | ||
530 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
531 | mov bl, dl | ||
532 | xor esi, ebp | ||
533 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
534 | xor esi, ebp | ||
535 | mov cl, dh | ||
536 | shr eax, 16 | ||
537 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
538 | xor esi, ebp | ||
539 | mov bl, ah | ||
540 | shr edx, 16 | ||
541 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
542 | xor esi, ebp | ||
543 | mov ebp, DWORD PTR 28[esp] | ||
544 | mov cl, dh | ||
545 | and eax, 0ffh | ||
546 | and edx, 0ffh | ||
547 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
548 | xor esi, ebx | ||
549 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
550 | xor esi, ebx | ||
551 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
552 | xor esi, ebx | ||
553 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
554 | xor esi, ebx | ||
555 | ; | ||
556 | ; Round 10 | ||
557 | mov eax, DWORD PTR 32[esp] | ||
558 | mov edx, esi | ||
559 | shr edx, 16 | ||
560 | mov ecx, DWORD PTR 36[esp] | ||
561 | xor edx, esi | ||
562 | and eax, edx | ||
563 | and edx, ecx | ||
564 | mov ebx, eax | ||
565 | shl ebx, 16 | ||
566 | mov ecx, edx | ||
567 | shl ecx, 16 | ||
568 | xor eax, ebx | ||
569 | xor edx, ecx | ||
570 | mov ebx, DWORD PTR 80[ebp] | ||
571 | xor eax, ebx | ||
572 | mov ecx, DWORD PTR 84[ebp] | ||
573 | xor eax, esi | ||
574 | xor edx, esi | ||
575 | xor edx, ecx | ||
576 | and eax, 0fcfcfcfch | ||
577 | xor ebx, ebx | ||
578 | and edx, 0cfcfcfcfh | ||
579 | xor ecx, ecx | ||
580 | mov bl, al | ||
581 | mov cl, ah | ||
582 | ror edx, 4 | ||
583 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
584 | mov bl, dl | ||
585 | xor edi, ebp | ||
586 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
587 | xor edi, ebp | ||
588 | mov cl, dh | ||
589 | shr eax, 16 | ||
590 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
591 | xor edi, ebp | ||
592 | mov bl, ah | ||
593 | shr edx, 16 | ||
594 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
595 | xor edi, ebp | ||
596 | mov ebp, DWORD PTR 28[esp] | ||
597 | mov cl, dh | ||
598 | and eax, 0ffh | ||
599 | and edx, 0ffh | ||
600 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
601 | xor edi, ebx | ||
602 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
603 | xor edi, ebx | ||
604 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
605 | xor edi, ebx | ||
606 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
607 | xor edi, ebx | ||
608 | ; | ||
609 | ; Round 11 | ||
610 | mov eax, DWORD PTR 32[esp] | ||
611 | mov edx, edi | ||
612 | shr edx, 16 | ||
613 | mov ecx, DWORD PTR 36[esp] | ||
614 | xor edx, edi | ||
615 | and eax, edx | ||
616 | and edx, ecx | ||
617 | mov ebx, eax | ||
618 | shl ebx, 16 | ||
619 | mov ecx, edx | ||
620 | shl ecx, 16 | ||
621 | xor eax, ebx | ||
622 | xor edx, ecx | ||
623 | mov ebx, DWORD PTR 88[ebp] | ||
624 | xor eax, ebx | ||
625 | mov ecx, DWORD PTR 92[ebp] | ||
626 | xor eax, edi | ||
627 | xor edx, edi | ||
628 | xor edx, ecx | ||
629 | and eax, 0fcfcfcfch | ||
630 | xor ebx, ebx | ||
631 | and edx, 0cfcfcfcfh | ||
632 | xor ecx, ecx | ||
633 | mov bl, al | ||
634 | mov cl, ah | ||
635 | ror edx, 4 | ||
636 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
637 | mov bl, dl | ||
638 | xor esi, ebp | ||
639 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
640 | xor esi, ebp | ||
641 | mov cl, dh | ||
642 | shr eax, 16 | ||
643 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
644 | xor esi, ebp | ||
645 | mov bl, ah | ||
646 | shr edx, 16 | ||
647 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
648 | xor esi, ebp | ||
649 | mov ebp, DWORD PTR 28[esp] | ||
650 | mov cl, dh | ||
651 | and eax, 0ffh | ||
652 | and edx, 0ffh | ||
653 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
654 | xor esi, ebx | ||
655 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
656 | xor esi, ebx | ||
657 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
658 | xor esi, ebx | ||
659 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
660 | xor esi, ebx | ||
661 | ; | ||
662 | ; Round 12 | ||
663 | mov eax, DWORD PTR 32[esp] | ||
664 | mov edx, esi | ||
665 | shr edx, 16 | ||
666 | mov ecx, DWORD PTR 36[esp] | ||
667 | xor edx, esi | ||
668 | and eax, edx | ||
669 | and edx, ecx | ||
670 | mov ebx, eax | ||
671 | shl ebx, 16 | ||
672 | mov ecx, edx | ||
673 | shl ecx, 16 | ||
674 | xor eax, ebx | ||
675 | xor edx, ecx | ||
676 | mov ebx, DWORD PTR 96[ebp] | ||
677 | xor eax, ebx | ||
678 | mov ecx, DWORD PTR 100[ebp] | ||
679 | xor eax, esi | ||
680 | xor edx, esi | ||
681 | xor edx, ecx | ||
682 | and eax, 0fcfcfcfch | ||
683 | xor ebx, ebx | ||
684 | and edx, 0cfcfcfcfh | ||
685 | xor ecx, ecx | ||
686 | mov bl, al | ||
687 | mov cl, ah | ||
688 | ror edx, 4 | ||
689 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
690 | mov bl, dl | ||
691 | xor edi, ebp | ||
692 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
693 | xor edi, ebp | ||
694 | mov cl, dh | ||
695 | shr eax, 16 | ||
696 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
697 | xor edi, ebp | ||
698 | mov bl, ah | ||
699 | shr edx, 16 | ||
700 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
701 | xor edi, ebp | ||
702 | mov ebp, DWORD PTR 28[esp] | ||
703 | mov cl, dh | ||
704 | and eax, 0ffh | ||
705 | and edx, 0ffh | ||
706 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
707 | xor edi, ebx | ||
708 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
709 | xor edi, ebx | ||
710 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
711 | xor edi, ebx | ||
712 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
713 | xor edi, ebx | ||
714 | ; | ||
715 | ; Round 13 | ||
716 | mov eax, DWORD PTR 32[esp] | ||
717 | mov edx, edi | ||
718 | shr edx, 16 | ||
719 | mov ecx, DWORD PTR 36[esp] | ||
720 | xor edx, edi | ||
721 | and eax, edx | ||
722 | and edx, ecx | ||
723 | mov ebx, eax | ||
724 | shl ebx, 16 | ||
725 | mov ecx, edx | ||
726 | shl ecx, 16 | ||
727 | xor eax, ebx | ||
728 | xor edx, ecx | ||
729 | mov ebx, DWORD PTR 104[ebp] | ||
730 | xor eax, ebx | ||
731 | mov ecx, DWORD PTR 108[ebp] | ||
732 | xor eax, edi | ||
733 | xor edx, edi | ||
734 | xor edx, ecx | ||
735 | and eax, 0fcfcfcfch | ||
736 | xor ebx, ebx | ||
737 | and edx, 0cfcfcfcfh | ||
738 | xor ecx, ecx | ||
739 | mov bl, al | ||
740 | mov cl, ah | ||
741 | ror edx, 4 | ||
742 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
743 | mov bl, dl | ||
744 | xor esi, ebp | ||
745 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
746 | xor esi, ebp | ||
747 | mov cl, dh | ||
748 | shr eax, 16 | ||
749 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
750 | xor esi, ebp | ||
751 | mov bl, ah | ||
752 | shr edx, 16 | ||
753 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
754 | xor esi, ebp | ||
755 | mov ebp, DWORD PTR 28[esp] | ||
756 | mov cl, dh | ||
757 | and eax, 0ffh | ||
758 | and edx, 0ffh | ||
759 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
760 | xor esi, ebx | ||
761 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
762 | xor esi, ebx | ||
763 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
764 | xor esi, ebx | ||
765 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
766 | xor esi, ebx | ||
767 | ; | ||
768 | ; Round 14 | ||
769 | mov eax, DWORD PTR 32[esp] | ||
770 | mov edx, esi | ||
771 | shr edx, 16 | ||
772 | mov ecx, DWORD PTR 36[esp] | ||
773 | xor edx, esi | ||
774 | and eax, edx | ||
775 | and edx, ecx | ||
776 | mov ebx, eax | ||
777 | shl ebx, 16 | ||
778 | mov ecx, edx | ||
779 | shl ecx, 16 | ||
780 | xor eax, ebx | ||
781 | xor edx, ecx | ||
782 | mov ebx, DWORD PTR 112[ebp] | ||
783 | xor eax, ebx | ||
784 | mov ecx, DWORD PTR 116[ebp] | ||
785 | xor eax, esi | ||
786 | xor edx, esi | ||
787 | xor edx, ecx | ||
788 | and eax, 0fcfcfcfch | ||
789 | xor ebx, ebx | ||
790 | and edx, 0cfcfcfcfh | ||
791 | xor ecx, ecx | ||
792 | mov bl, al | ||
793 | mov cl, ah | ||
794 | ror edx, 4 | ||
795 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
796 | mov bl, dl | ||
797 | xor edi, ebp | ||
798 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
799 | xor edi, ebp | ||
800 | mov cl, dh | ||
801 | shr eax, 16 | ||
802 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
803 | xor edi, ebp | ||
804 | mov bl, ah | ||
805 | shr edx, 16 | ||
806 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
807 | xor edi, ebp | ||
808 | mov ebp, DWORD PTR 28[esp] | ||
809 | mov cl, dh | ||
810 | and eax, 0ffh | ||
811 | and edx, 0ffh | ||
812 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
813 | xor edi, ebx | ||
814 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
815 | xor edi, ebx | ||
816 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
817 | xor edi, ebx | ||
818 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
819 | xor edi, ebx | ||
820 | ; | ||
821 | ; Round 15 | ||
822 | mov eax, DWORD PTR 32[esp] | ||
823 | mov edx, edi | ||
824 | shr edx, 16 | ||
825 | mov ecx, DWORD PTR 36[esp] | ||
826 | xor edx, edi | ||
827 | and eax, edx | ||
828 | and edx, ecx | ||
829 | mov ebx, eax | ||
830 | shl ebx, 16 | ||
831 | mov ecx, edx | ||
832 | shl ecx, 16 | ||
833 | xor eax, ebx | ||
834 | xor edx, ecx | ||
835 | mov ebx, DWORD PTR 120[ebp] | ||
836 | xor eax, ebx | ||
837 | mov ecx, DWORD PTR 124[ebp] | ||
838 | xor eax, edi | ||
839 | xor edx, edi | ||
840 | xor edx, ecx | ||
841 | and eax, 0fcfcfcfch | ||
842 | xor ebx, ebx | ||
843 | and edx, 0cfcfcfcfh | ||
844 | xor ecx, ecx | ||
845 | mov bl, al | ||
846 | mov cl, ah | ||
847 | ror edx, 4 | ||
848 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
849 | mov bl, dl | ||
850 | xor esi, ebp | ||
851 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
852 | xor esi, ebp | ||
853 | mov cl, dh | ||
854 | shr eax, 16 | ||
855 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
856 | xor esi, ebp | ||
857 | mov bl, ah | ||
858 | shr edx, 16 | ||
859 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
860 | xor esi, ebp | ||
861 | mov ebp, DWORD PTR 28[esp] | ||
862 | mov cl, dh | ||
863 | and eax, 0ffh | ||
864 | and edx, 0ffh | ||
865 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
866 | xor esi, ebx | ||
867 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
868 | xor esi, ebx | ||
869 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
870 | xor esi, ebx | ||
871 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
872 | xor esi, ebx | ||
873 | mov ebx, DWORD PTR [esp] | ||
874 | mov eax, edi | ||
875 | dec ebx | ||
876 | mov edi, esi | ||
877 | mov esi, eax | ||
878 | mov DWORD PTR [esp],ebx | ||
879 | jnz L000start | ||
880 | ; | ||
881 | ; FP | ||
882 | mov edx, DWORD PTR 24[esp] | ||
883 | ror edi, 1 | ||
884 | mov eax, esi | ||
885 | xor esi, edi | ||
886 | and esi, 0aaaaaaaah | ||
887 | xor eax, esi | ||
888 | xor edi, esi | ||
889 | ; | ||
890 | rol eax, 23 | ||
891 | mov esi, eax | ||
892 | xor eax, edi | ||
893 | and eax, 003fc03fch | ||
894 | xor esi, eax | ||
895 | xor edi, eax | ||
896 | ; | ||
897 | rol esi, 10 | ||
898 | mov eax, esi | ||
899 | xor esi, edi | ||
900 | and esi, 033333333h | ||
901 | xor eax, esi | ||
902 | xor edi, esi | ||
903 | ; | ||
904 | rol edi, 18 | ||
905 | mov esi, edi | ||
906 | xor edi, eax | ||
907 | and edi, 0fff0000fh | ||
908 | xor esi, edi | ||
909 | xor eax, edi | ||
910 | ; | ||
911 | rol esi, 12 | ||
912 | mov edi, esi | ||
913 | xor esi, eax | ||
914 | and esi, 0f0f0f0f0h | ||
915 | xor edi, esi | ||
916 | xor eax, esi | ||
917 | ; | ||
918 | ror eax, 4 | ||
919 | mov DWORD PTR [edx],eax | ||
920 | mov DWORD PTR 4[edx],edi | ||
921 | pop ecx | ||
922 | pop edi | ||
923 | pop esi | ||
924 | pop ebx | ||
925 | pop ebp | ||
926 | ret | ||
927 | _fcrypt_body ENDP | ||
928 | _TEXT ENDS | ||
929 | END | ||
diff --git a/src/lib/libcrypto/des/des.c b/src/lib/libcrypto/des/des.c index 91d7153b34..0197489c9e 100644 --- a/src/lib/libcrypto/des/des.c +++ b/src/lib/libcrypto/des/des.c | |||
@@ -58,6 +58,7 @@ | |||
58 | 58 | ||
59 | #include <stdio.h> | 59 | #include <stdio.h> |
60 | #include <stdlib.h> | 60 | #include <stdlib.h> |
61 | #include <string.h> | ||
61 | #ifndef MSDOS | 62 | #ifndef MSDOS |
62 | #ifndef VMS | 63 | #ifndef VMS |
63 | #include <openssl/opensslconf.h> | 64 | #include <openssl/opensslconf.h> |
@@ -69,7 +70,7 @@ | |||
69 | #include <math.h> | 70 | #include <math.h> |
70 | #endif /* __DECC */ | 71 | #endif /* __DECC */ |
71 | #endif /* VMS */ | 72 | #endif /* VMS */ |
72 | #else | 73 | #else /* MSDOS */ |
73 | #include <io.h> | 74 | #include <io.h> |
74 | #endif | 75 | #endif |
75 | 76 | ||
@@ -88,10 +89,6 @@ | |||
88 | #include <openssl/des.h> | 89 | #include <openssl/des.h> |
89 | #include <openssl/rand.h> | 90 | #include <openssl/rand.h> |
90 | 91 | ||
91 | #if defined(__STDC__) || defined(VMS) || defined(M_XENIX) || defined(MSDOS) | ||
92 | #include <string.h> | ||
93 | #endif | ||
94 | |||
95 | void usage(void); | 92 | void usage(void); |
96 | void doencryption(void); | 93 | void doencryption(void); |
97 | int uufwrite(unsigned char *data, int size, unsigned int num, FILE *fp); | 94 | int uufwrite(unsigned char *data, int size, unsigned int num, FILE *fp); |
diff --git a/src/lib/libcrypto/des/des.h b/src/lib/libcrypto/des/des.h index 98a9c4127c..ead67986d9 100644 --- a/src/lib/libcrypto/des/des.h +++ b/src/lib/libcrypto/des/des.h | |||
@@ -78,10 +78,7 @@ extern "C" { | |||
78 | typedef unsigned char des_cblock[8]; | 78 | typedef unsigned char des_cblock[8]; |
79 | typedef /* const */ unsigned char const_des_cblock[8]; | 79 | typedef /* const */ unsigned char const_des_cblock[8]; |
80 | /* With "const", gcc 2.8.1 on Solaris thinks that des_cblock * | 80 | /* With "const", gcc 2.8.1 on Solaris thinks that des_cblock * |
81 | * and const_des_cblock * are incompatible pointer types. | 81 | * and const_des_cblock * are incompatible pointer types. */ |
82 | * I haven't seen that warning on other systems ... I'll look | ||
83 | * what the standard says. */ | ||
84 | |||
85 | 82 | ||
86 | typedef struct des_ks_struct | 83 | typedef struct des_ks_struct |
87 | { | 84 | { |
@@ -141,8 +138,26 @@ void des_cfb_encrypt(const unsigned char *in,unsigned char *out,int numbits, | |||
141 | int enc); | 138 | int enc); |
142 | void des_ecb_encrypt(const_des_cblock *input,des_cblock *output, | 139 | void des_ecb_encrypt(const_des_cblock *input,des_cblock *output, |
143 | des_key_schedule ks,int enc); | 140 | des_key_schedule ks,int enc); |
141 | |||
142 | /* This is the DES encryption function that gets called by just about | ||
143 | every other DES routine in the library. You should not use this | ||
144 | function except to implement 'modes' of DES. I say this because the | ||
145 | functions that call this routine do the conversion from 'char *' to | ||
146 | long, and this needs to be done to make sure 'non-aligned' memory | ||
147 | access do not occur. The characters are loaded 'little endian'. | ||
148 | Data is a pointer to 2 unsigned long's and ks is the | ||
149 | des_key_schedule to use. enc, is non zero specifies encryption, | ||
150 | zero if decryption. */ | ||
144 | void des_encrypt(DES_LONG *data,des_key_schedule ks, int enc); | 151 | void des_encrypt(DES_LONG *data,des_key_schedule ks, int enc); |
152 | |||
153 | /* This functions is the same as des_encrypt() except that the DES | ||
154 | initial permutation (IP) and final permutation (FP) have been left | ||
155 | out. As for des_encrypt(), you should not use this function. | ||
156 | It is used by the routines in the library that implement triple DES. | ||
157 | IP() des_encrypt2() des_encrypt2() des_encrypt2() FP() is the same | ||
158 | as des_encrypt() des_encrypt() des_encrypt() except faster :-). */ | ||
145 | void des_encrypt2(DES_LONG *data,des_key_schedule ks, int enc); | 159 | void des_encrypt2(DES_LONG *data,des_key_schedule ks, int enc); |
160 | |||
146 | void des_encrypt3(DES_LONG *data, des_key_schedule ks1, | 161 | void des_encrypt3(DES_LONG *data, des_key_schedule ks1, |
147 | des_key_schedule ks2, des_key_schedule ks3); | 162 | des_key_schedule ks2, des_key_schedule ks3); |
148 | void des_decrypt3(DES_LONG *data, des_key_schedule ks1, | 163 | void des_decrypt3(DES_LONG *data, des_key_schedule ks1, |
@@ -192,6 +207,7 @@ int des_read_2passwords(des_cblock *key1,des_cblock *key2, | |||
192 | const char *prompt,int verify); | 207 | const char *prompt,int verify); |
193 | int des_read_pw_string(char *buf,int length,const char *prompt,int verify); | 208 | int des_read_pw_string(char *buf,int length,const char *prompt,int verify); |
194 | void des_set_odd_parity(des_cblock *key); | 209 | void des_set_odd_parity(des_cblock *key); |
210 | int des_check_key_parity(const_des_cblock *key); | ||
195 | int des_is_weak_key(const_des_cblock *key); | 211 | int des_is_weak_key(const_des_cblock *key); |
196 | /* des_set_key (= set_key = des_key_sched = key_sched) calls | 212 | /* des_set_key (= set_key = des_key_sched = key_sched) calls |
197 | * des_set_key_checked if global variable des_check_key is set, | 213 | * des_set_key_checked if global variable des_check_key is set, |
@@ -209,9 +225,6 @@ void des_ofb64_encrypt(const unsigned char *in,unsigned char *out,long length, | |||
209 | des_key_schedule schedule,des_cblock *ivec,int *num); | 225 | des_key_schedule schedule,des_cblock *ivec,int *num); |
210 | int des_read_pw(char *buf,char *buff,int size,const char *prompt,int verify); | 226 | int des_read_pw(char *buf,char *buff,int size,const char *prompt,int verify); |
211 | 227 | ||
212 | /* Extra functions from Mark Murray <mark@grondar.za> */ | ||
213 | void des_cblock_print_file(const_des_cblock *cb, FILE *fp); | ||
214 | |||
215 | /* The following definitions provide compatibility with the MIT Kerberos | 228 | /* The following definitions provide compatibility with the MIT Kerberos |
216 | * library. The des_key_schedule structure is not binary compatible. */ | 229 | * library. The des_key_schedule structure is not binary compatible. */ |
217 | 230 | ||
@@ -241,11 +254,11 @@ void des_cblock_print_file(const_des_cblock *cb, FILE *fp); | |||
241 | # define xcbc_encrypt des_xcbc_encrypt | 254 | # define xcbc_encrypt des_xcbc_encrypt |
242 | # define cbc_cksum des_cbc_cksum | 255 | # define cbc_cksum des_cbc_cksum |
243 | # define quad_cksum des_quad_cksum | 256 | # define quad_cksum des_quad_cksum |
257 | # define check_parity des_check_key_parity | ||
244 | #endif | 258 | #endif |
245 | 259 | ||
246 | typedef des_key_schedule bit_64; | 260 | typedef des_key_schedule bit_64; |
247 | #define des_fixup_key_parity des_set_odd_parity | 261 | #define des_fixup_key_parity des_set_odd_parity |
248 | #define des_check_key_parity check_parity | ||
249 | 262 | ||
250 | #ifdef __cplusplus | 263 | #ifdef __cplusplus |
251 | } | 264 | } |
diff --git a/src/lib/libcrypto/des/des.man b/src/lib/libcrypto/des/des.man index 7e06a1851a..e69de29bb2 100644 --- a/src/lib/libcrypto/des/des.man +++ b/src/lib/libcrypto/des/des.man | |||
@@ -1,186 +0,0 @@ | |||
1 | .TH DES 1 | ||
2 | .SH NAME | ||
3 | des - encrypt or decrypt data using Data Encryption Standard | ||
4 | .SH SYNOPSIS | ||
5 | .B des | ||
6 | ( | ||
7 | .B \-e | ||
8 | | | ||
9 | .B \-E | ||
10 | ) | ( | ||
11 | .B \-d | ||
12 | | | ||
13 | .B \-D | ||
14 | ) | ( | ||
15 | .B \-\fR[\fPcC\fR][\fPckname\fR]\fP | ||
16 | ) | | ||
17 | [ | ||
18 | .B \-b3hfs | ||
19 | ] [ | ||
20 | .B \-k | ||
21 | .I key | ||
22 | ] | ||
23 | ] [ | ||
24 | .B \-u\fR[\fIuuname\fR] | ||
25 | [ | ||
26 | .I input-file | ||
27 | [ | ||
28 | .I output-file | ||
29 | ] ] | ||
30 | .SH DESCRIPTION | ||
31 | .B des | ||
32 | encrypts and decrypts data using the | ||
33 | Data Encryption Standard algorithm. | ||
34 | One of | ||
35 | .B \-e, \-E | ||
36 | (for encrypt) or | ||
37 | .B \-d, \-D | ||
38 | (for decrypt) must be specified. | ||
39 | It is also possible to use | ||
40 | .B \-c | ||
41 | or | ||
42 | .B \-C | ||
43 | in conjunction or instead of the a encrypt/decrypt option to generate | ||
44 | a 16 character hexadecimal checksum, generated via the | ||
45 | .I des_cbc_cksum. | ||
46 | .LP | ||
47 | Two standard encryption modes are supported by the | ||
48 | .B des | ||
49 | program, Cipher Block Chaining (the default) and Electronic Code Book | ||
50 | (specified with | ||
51 | .B \-b | ||
52 | ). | ||
53 | .LP | ||
54 | The key used for the DES | ||
55 | algorithm is obtained by prompting the user unless the | ||
56 | .B `\-k | ||
57 | .I key' | ||
58 | option is given. | ||
59 | If the key is an argument to the | ||
60 | .B des | ||
61 | command, it is potentially visible to users executing | ||
62 | .BR ps (1) | ||
63 | or a derivative. To minimise this possibility, | ||
64 | .B des | ||
65 | takes care to destroy the key argument immediately upon entry. | ||
66 | If your shell keeps a history file be careful to make sure it is not | ||
67 | world readable. | ||
68 | .LP | ||
69 | Since this program attempts to maintain compatability with sunOS's | ||
70 | des(1) command, there are 2 different methods used to convert the user | ||
71 | supplied key to a des key. | ||
72 | Whenever and one or more of | ||
73 | .B \-E, \-D, \-C | ||
74 | or | ||
75 | .B \-3 | ||
76 | options are used, the key conversion procedure will not be compatible | ||
77 | with the sunOS des(1) version but will use all the user supplied | ||
78 | character to generate the des key. | ||
79 | .B des | ||
80 | command reads from standard input unless | ||
81 | .I input-file | ||
82 | is specified and writes to standard output unless | ||
83 | .I output-file | ||
84 | is given. | ||
85 | .SH OPTIONS | ||
86 | .TP | ||
87 | .B \-b | ||
88 | Select ECB | ||
89 | (eight bytes at a time) encryption mode. | ||
90 | .TP | ||
91 | .B \-3 | ||
92 | Encrypt using triple encryption. | ||
93 | By default triple cbc encryption is used but if the | ||
94 | .B \-b | ||
95 | option is used then triple ecb encryption is performed. | ||
96 | If the key is less than 8 characters long, the flag has no effect. | ||
97 | .TP | ||
98 | .B \-e | ||
99 | Encrypt data using an 8 byte key in a manner compatible with sunOS | ||
100 | des(1). | ||
101 | .TP | ||
102 | .B \-E | ||
103 | Encrypt data using a key of nearly unlimited length (1024 bytes). | ||
104 | This will product a more secure encryption. | ||
105 | .TP | ||
106 | .B \-d | ||
107 | Decrypt data that was encrypted with the \-e option. | ||
108 | .TP | ||
109 | .B \-D | ||
110 | Decrypt data that was encrypted with the \-E option. | ||
111 | .TP | ||
112 | .B \-c | ||
113 | Generate a 16 character hexadecimal cbc checksum and output this to | ||
114 | stderr. | ||
115 | If a filename was specified after the | ||
116 | .B \-c | ||
117 | option, the checksum is output to that file. | ||
118 | The checksum is generated using a key generated in a sunOS compatible | ||
119 | manner. | ||
120 | .TP | ||
121 | .B \-C | ||
122 | A cbc checksum is generated in the same manner as described for the | ||
123 | .B \-c | ||
124 | option but the DES key is generated in the same manner as used for the | ||
125 | .B \-E | ||
126 | and | ||
127 | .B \-D | ||
128 | options | ||
129 | .TP | ||
130 | .B \-f | ||
131 | Does nothing - allowed for compatibility with sunOS des(1) command. | ||
132 | .TP | ||
133 | .B \-s | ||
134 | Does nothing - allowed for compatibility with sunOS des(1) command. | ||
135 | .TP | ||
136 | .B "\-k \fIkey\fP" | ||
137 | Use the encryption | ||
138 | .I key | ||
139 | specified. | ||
140 | .TP | ||
141 | .B "\-h" | ||
142 | The | ||
143 | .I key | ||
144 | is assumed to be a 16 character hexadecimal number. | ||
145 | If the | ||
146 | .B "\-3" | ||
147 | option is used the key is assumed to be a 32 character hexadecimal | ||
148 | number. | ||
149 | .TP | ||
150 | .B \-u | ||
151 | This flag is used to read and write uuencoded files. If decrypting, | ||
152 | the input file is assumed to contain uuencoded, DES encrypted data. | ||
153 | If encrypting, the characters following the -u are used as the name of | ||
154 | the uuencoded file to embed in the begin line of the uuencoded | ||
155 | output. If there is no name specified after the -u, the name text.des | ||
156 | will be embedded in the header. | ||
157 | .SH SEE ALSO | ||
158 | .B ps (1) | ||
159 | .B des_crypt(3) | ||
160 | .SH BUGS | ||
161 | .LP | ||
162 | The problem with using the | ||
163 | .B -e | ||
164 | option is the short key length. | ||
165 | It would be better to use a real 56-bit key rather than an | ||
166 | ASCII-based 56-bit pattern. Knowing that the key was derived from ASCII | ||
167 | radically reduces the time necessary for a brute-force cryptographic attack. | ||
168 | My attempt to remove this problem is to add an alternative text-key to | ||
169 | DES-key function. This alternative function (accessed via | ||
170 | .B -E, -D, -S | ||
171 | and | ||
172 | .B -3 | ||
173 | ) | ||
174 | uses DES to help generate the key. | ||
175 | .LP | ||
176 | Be carefully when using the -u option. Doing des -ud <filename> will | ||
177 | not decrypt filename (the -u option will gobble the d option). | ||
178 | .LP | ||
179 | The VMS operating system operates in a world where files are always a | ||
180 | multiple of 512 bytes. This causes problems when encrypted data is | ||
181 | send from unix to VMS since a 88 byte file will suddenly be padded | ||
182 | with 424 null bytes. To get around this problem, use the -u option | ||
183 | to uuencode the data before it is send to the VMS system. | ||
184 | .SH AUTHOR | ||
185 | .LP | ||
186 | Eric Young (eay@cryptsoft.com) | ||
diff --git a/src/lib/libcrypto/des/des.pl b/src/lib/libcrypto/des/des.pl index 8a3f7e3ed6..e69de29bb2 100644 --- a/src/lib/libcrypto/des/des.pl +++ b/src/lib/libcrypto/des/des.pl | |||
@@ -1,552 +0,0 @@ | |||
1 | #!/usr/local/bin/perl | ||
2 | # des.pl - eric young 22/11/1991 eay@cryptsoft.com | ||
3 | # | ||
4 | # Copyright (C) 1993 Eric Young | ||
5 | # | ||
6 | # 11 April 1996 - patched to circumvent Perl 5 (through 5.002) problem | ||
7 | # with sign-extension on right shift operations. | ||
8 | # Ed Kubaitis - ejk@uiuc.edu | ||
9 | # | ||
10 | # eay - 92/08/31 - I think I have fixed all problems for 64bit | ||
11 | # versions of perl but I could be wrong since I have not tested it yet :-). | ||
12 | # | ||
13 | # This is an implementation of DES in perl. | ||
14 | # The two routines (des_set_key and des_ecb_encrypt) | ||
15 | # take 8 byte objects as arguments. | ||
16 | # | ||
17 | # des_set_key takes an 8 byte string as a key and returns a key schedule | ||
18 | # for use in calls to des_ecb_encrypt. | ||
19 | # des_ecb_encrypt takes three arguments, the first is a key schedule | ||
20 | # (make sure to pass it by reference with the *), the second is 1 | ||
21 | # to encrypt, 0 to decrypt. The third argument is an 8 byte object | ||
22 | # to encrypt. The function returns an 8 byte object that has been | ||
23 | # DES encrypted. | ||
24 | # | ||
25 | # example: | ||
26 | # require 'des.pl' | ||
27 | # | ||
28 | # $key =pack("C8",0x12,0x23,0x45,0x67,0x89,0xab,0xcd,0xef); | ||
29 | # @ks= &des_set_key($key); | ||
30 | # | ||
31 | # $outbytes= &des_ecb_encrypt(*ks,1,$data); | ||
32 | # @enc =unpack("C8",$outbytes); | ||
33 | # | ||
34 | |||
35 | package des; | ||
36 | |||
37 | eval("use integer;") if (int($]) > 4); | ||
38 | |||
39 | # The following 8 arrays are used in des_set_key | ||
40 | @skb0=( | ||
41 | # for C bits (numbered as per FIPS 46) 1 2 3 4 5 6 | ||
42 | 0x00000000,0x00000010,0x20000000,0x20000010, | ||
43 | 0x00010000,0x00010010,0x20010000,0x20010010, | ||
44 | 0x00000800,0x00000810,0x20000800,0x20000810, | ||
45 | 0x00010800,0x00010810,0x20010800,0x20010810, | ||
46 | 0x00000020,0x00000030,0x20000020,0x20000030, | ||
47 | 0x00010020,0x00010030,0x20010020,0x20010030, | ||
48 | 0x00000820,0x00000830,0x20000820,0x20000830, | ||
49 | 0x00010820,0x00010830,0x20010820,0x20010830, | ||
50 | 0x00080000,0x00080010,0x20080000,0x20080010, | ||
51 | 0x00090000,0x00090010,0x20090000,0x20090010, | ||
52 | 0x00080800,0x00080810,0x20080800,0x20080810, | ||
53 | 0x00090800,0x00090810,0x20090800,0x20090810, | ||
54 | 0x00080020,0x00080030,0x20080020,0x20080030, | ||
55 | 0x00090020,0x00090030,0x20090020,0x20090030, | ||
56 | 0x00080820,0x00080830,0x20080820,0x20080830, | ||
57 | 0x00090820,0x00090830,0x20090820,0x20090830, | ||
58 | ); | ||
59 | @skb1=( | ||
60 | # for C bits (numbered as per FIPS 46) 7 8 10 11 12 13 | ||
61 | 0x00000000,0x02000000,0x00002000,0x02002000, | ||
62 | 0x00200000,0x02200000,0x00202000,0x02202000, | ||
63 | 0x00000004,0x02000004,0x00002004,0x02002004, | ||
64 | 0x00200004,0x02200004,0x00202004,0x02202004, | ||
65 | 0x00000400,0x02000400,0x00002400,0x02002400, | ||
66 | 0x00200400,0x02200400,0x00202400,0x02202400, | ||
67 | 0x00000404,0x02000404,0x00002404,0x02002404, | ||
68 | 0x00200404,0x02200404,0x00202404,0x02202404, | ||
69 | 0x10000000,0x12000000,0x10002000,0x12002000, | ||
70 | 0x10200000,0x12200000,0x10202000,0x12202000, | ||
71 | 0x10000004,0x12000004,0x10002004,0x12002004, | ||
72 | 0x10200004,0x12200004,0x10202004,0x12202004, | ||
73 | 0x10000400,0x12000400,0x10002400,0x12002400, | ||
74 | 0x10200400,0x12200400,0x10202400,0x12202400, | ||
75 | 0x10000404,0x12000404,0x10002404,0x12002404, | ||
76 | 0x10200404,0x12200404,0x10202404,0x12202404, | ||
77 | ); | ||
78 | @skb2=( | ||
79 | # for C bits (numbered as per FIPS 46) 14 15 16 17 19 20 | ||
80 | 0x00000000,0x00000001,0x00040000,0x00040001, | ||
81 | 0x01000000,0x01000001,0x01040000,0x01040001, | ||
82 | 0x00000002,0x00000003,0x00040002,0x00040003, | ||
83 | 0x01000002,0x01000003,0x01040002,0x01040003, | ||
84 | 0x00000200,0x00000201,0x00040200,0x00040201, | ||
85 | 0x01000200,0x01000201,0x01040200,0x01040201, | ||
86 | 0x00000202,0x00000203,0x00040202,0x00040203, | ||
87 | 0x01000202,0x01000203,0x01040202,0x01040203, | ||
88 | 0x08000000,0x08000001,0x08040000,0x08040001, | ||
89 | 0x09000000,0x09000001,0x09040000,0x09040001, | ||
90 | 0x08000002,0x08000003,0x08040002,0x08040003, | ||
91 | 0x09000002,0x09000003,0x09040002,0x09040003, | ||
92 | 0x08000200,0x08000201,0x08040200,0x08040201, | ||
93 | 0x09000200,0x09000201,0x09040200,0x09040201, | ||
94 | 0x08000202,0x08000203,0x08040202,0x08040203, | ||
95 | 0x09000202,0x09000203,0x09040202,0x09040203, | ||
96 | ); | ||
97 | @skb3=( | ||
98 | # for C bits (numbered as per FIPS 46) 21 23 24 26 27 28 | ||
99 | 0x00000000,0x00100000,0x00000100,0x00100100, | ||
100 | 0x00000008,0x00100008,0x00000108,0x00100108, | ||
101 | 0x00001000,0x00101000,0x00001100,0x00101100, | ||
102 | 0x00001008,0x00101008,0x00001108,0x00101108, | ||
103 | 0x04000000,0x04100000,0x04000100,0x04100100, | ||
104 | 0x04000008,0x04100008,0x04000108,0x04100108, | ||
105 | 0x04001000,0x04101000,0x04001100,0x04101100, | ||
106 | 0x04001008,0x04101008,0x04001108,0x04101108, | ||
107 | 0x00020000,0x00120000,0x00020100,0x00120100, | ||
108 | 0x00020008,0x00120008,0x00020108,0x00120108, | ||
109 | 0x00021000,0x00121000,0x00021100,0x00121100, | ||
110 | 0x00021008,0x00121008,0x00021108,0x00121108, | ||
111 | 0x04020000,0x04120000,0x04020100,0x04120100, | ||
112 | 0x04020008,0x04120008,0x04020108,0x04120108, | ||
113 | 0x04021000,0x04121000,0x04021100,0x04121100, | ||
114 | 0x04021008,0x04121008,0x04021108,0x04121108, | ||
115 | ); | ||
116 | @skb4=( | ||
117 | # for D bits (numbered as per FIPS 46) 1 2 3 4 5 6 | ||
118 | 0x00000000,0x10000000,0x00010000,0x10010000, | ||
119 | 0x00000004,0x10000004,0x00010004,0x10010004, | ||
120 | 0x20000000,0x30000000,0x20010000,0x30010000, | ||
121 | 0x20000004,0x30000004,0x20010004,0x30010004, | ||
122 | 0x00100000,0x10100000,0x00110000,0x10110000, | ||
123 | 0x00100004,0x10100004,0x00110004,0x10110004, | ||
124 | 0x20100000,0x30100000,0x20110000,0x30110000, | ||
125 | 0x20100004,0x30100004,0x20110004,0x30110004, | ||
126 | 0x00001000,0x10001000,0x00011000,0x10011000, | ||
127 | 0x00001004,0x10001004,0x00011004,0x10011004, | ||
128 | 0x20001000,0x30001000,0x20011000,0x30011000, | ||
129 | 0x20001004,0x30001004,0x20011004,0x30011004, | ||
130 | 0x00101000,0x10101000,0x00111000,0x10111000, | ||
131 | 0x00101004,0x10101004,0x00111004,0x10111004, | ||
132 | 0x20101000,0x30101000,0x20111000,0x30111000, | ||
133 | 0x20101004,0x30101004,0x20111004,0x30111004, | ||
134 | ); | ||
135 | @skb5=( | ||
136 | # for D bits (numbered as per FIPS 46) 8 9 11 12 13 14 | ||
137 | 0x00000000,0x08000000,0x00000008,0x08000008, | ||
138 | 0x00000400,0x08000400,0x00000408,0x08000408, | ||
139 | 0x00020000,0x08020000,0x00020008,0x08020008, | ||
140 | 0x00020400,0x08020400,0x00020408,0x08020408, | ||
141 | 0x00000001,0x08000001,0x00000009,0x08000009, | ||
142 | 0x00000401,0x08000401,0x00000409,0x08000409, | ||
143 | 0x00020001,0x08020001,0x00020009,0x08020009, | ||
144 | 0x00020401,0x08020401,0x00020409,0x08020409, | ||
145 | 0x02000000,0x0A000000,0x02000008,0x0A000008, | ||
146 | 0x02000400,0x0A000400,0x02000408,0x0A000408, | ||
147 | 0x02020000,0x0A020000,0x02020008,0x0A020008, | ||
148 | 0x02020400,0x0A020400,0x02020408,0x0A020408, | ||
149 | 0x02000001,0x0A000001,0x02000009,0x0A000009, | ||
150 | 0x02000401,0x0A000401,0x02000409,0x0A000409, | ||
151 | 0x02020001,0x0A020001,0x02020009,0x0A020009, | ||
152 | 0x02020401,0x0A020401,0x02020409,0x0A020409, | ||
153 | ); | ||
154 | @skb6=( | ||
155 | # for D bits (numbered as per FIPS 46) 16 17 18 19 20 21 | ||
156 | 0x00000000,0x00000100,0x00080000,0x00080100, | ||
157 | 0x01000000,0x01000100,0x01080000,0x01080100, | ||
158 | 0x00000010,0x00000110,0x00080010,0x00080110, | ||
159 | 0x01000010,0x01000110,0x01080010,0x01080110, | ||
160 | 0x00200000,0x00200100,0x00280000,0x00280100, | ||
161 | 0x01200000,0x01200100,0x01280000,0x01280100, | ||
162 | 0x00200010,0x00200110,0x00280010,0x00280110, | ||
163 | 0x01200010,0x01200110,0x01280010,0x01280110, | ||
164 | 0x00000200,0x00000300,0x00080200,0x00080300, | ||
165 | 0x01000200,0x01000300,0x01080200,0x01080300, | ||
166 | 0x00000210,0x00000310,0x00080210,0x00080310, | ||
167 | 0x01000210,0x01000310,0x01080210,0x01080310, | ||
168 | 0x00200200,0x00200300,0x00280200,0x00280300, | ||
169 | 0x01200200,0x01200300,0x01280200,0x01280300, | ||
170 | 0x00200210,0x00200310,0x00280210,0x00280310, | ||
171 | 0x01200210,0x01200310,0x01280210,0x01280310, | ||
172 | ); | ||
173 | @skb7=( | ||
174 | # for D bits (numbered as per FIPS 46) 22 23 24 25 27 28 | ||
175 | 0x00000000,0x04000000,0x00040000,0x04040000, | ||
176 | 0x00000002,0x04000002,0x00040002,0x04040002, | ||
177 | 0x00002000,0x04002000,0x00042000,0x04042000, | ||
178 | 0x00002002,0x04002002,0x00042002,0x04042002, | ||
179 | 0x00000020,0x04000020,0x00040020,0x04040020, | ||
180 | 0x00000022,0x04000022,0x00040022,0x04040022, | ||
181 | 0x00002020,0x04002020,0x00042020,0x04042020, | ||
182 | 0x00002022,0x04002022,0x00042022,0x04042022, | ||
183 | 0x00000800,0x04000800,0x00040800,0x04040800, | ||
184 | 0x00000802,0x04000802,0x00040802,0x04040802, | ||
185 | 0x00002800,0x04002800,0x00042800,0x04042800, | ||
186 | 0x00002802,0x04002802,0x00042802,0x04042802, | ||
187 | 0x00000820,0x04000820,0x00040820,0x04040820, | ||
188 | 0x00000822,0x04000822,0x00040822,0x04040822, | ||
189 | 0x00002820,0x04002820,0x00042820,0x04042820, | ||
190 | 0x00002822,0x04002822,0x00042822,0x04042822, | ||
191 | ); | ||
192 | |||
193 | @shifts2=(0,0,1,1,1,1,1,1,0,1,1,1,1,1,1,0); | ||
194 | |||
195 | # used in ecb_encrypt | ||
196 | @SP0=( | ||
197 | 0x00410100, 0x00010000, 0x40400000, 0x40410100, | ||
198 | 0x00400000, 0x40010100, 0x40010000, 0x40400000, | ||
199 | 0x40010100, 0x00410100, 0x00410000, 0x40000100, | ||
200 | 0x40400100, 0x00400000, 0x00000000, 0x40010000, | ||
201 | 0x00010000, 0x40000000, 0x00400100, 0x00010100, | ||
202 | 0x40410100, 0x00410000, 0x40000100, 0x00400100, | ||
203 | 0x40000000, 0x00000100, 0x00010100, 0x40410000, | ||
204 | 0x00000100, 0x40400100, 0x40410000, 0x00000000, | ||
205 | 0x00000000, 0x40410100, 0x00400100, 0x40010000, | ||
206 | 0x00410100, 0x00010000, 0x40000100, 0x00400100, | ||
207 | 0x40410000, 0x00000100, 0x00010100, 0x40400000, | ||
208 | 0x40010100, 0x40000000, 0x40400000, 0x00410000, | ||
209 | 0x40410100, 0x00010100, 0x00410000, 0x40400100, | ||
210 | 0x00400000, 0x40000100, 0x40010000, 0x00000000, | ||
211 | 0x00010000, 0x00400000, 0x40400100, 0x00410100, | ||
212 | 0x40000000, 0x40410000, 0x00000100, 0x40010100, | ||
213 | ); | ||
214 | @SP1=( | ||
215 | 0x08021002, 0x00000000, 0x00021000, 0x08020000, | ||
216 | 0x08000002, 0x00001002, 0x08001000, 0x00021000, | ||
217 | 0x00001000, 0x08020002, 0x00000002, 0x08001000, | ||
218 | 0x00020002, 0x08021000, 0x08020000, 0x00000002, | ||
219 | 0x00020000, 0x08001002, 0x08020002, 0x00001000, | ||
220 | 0x00021002, 0x08000000, 0x00000000, 0x00020002, | ||
221 | 0x08001002, 0x00021002, 0x08021000, 0x08000002, | ||
222 | 0x08000000, 0x00020000, 0x00001002, 0x08021002, | ||
223 | 0x00020002, 0x08021000, 0x08001000, 0x00021002, | ||
224 | 0x08021002, 0x00020002, 0x08000002, 0x00000000, | ||
225 | 0x08000000, 0x00001002, 0x00020000, 0x08020002, | ||
226 | 0x00001000, 0x08000000, 0x00021002, 0x08001002, | ||
227 | 0x08021000, 0x00001000, 0x00000000, 0x08000002, | ||
228 | 0x00000002, 0x08021002, 0x00021000, 0x08020000, | ||
229 | 0x08020002, 0x00020000, 0x00001002, 0x08001000, | ||
230 | 0x08001002, 0x00000002, 0x08020000, 0x00021000, | ||
231 | ); | ||
232 | @SP2=( | ||
233 | 0x20800000, 0x00808020, 0x00000020, 0x20800020, | ||
234 | 0x20008000, 0x00800000, 0x20800020, 0x00008020, | ||
235 | 0x00800020, 0x00008000, 0x00808000, 0x20000000, | ||
236 | 0x20808020, 0x20000020, 0x20000000, 0x20808000, | ||
237 | 0x00000000, 0x20008000, 0x00808020, 0x00000020, | ||
238 | 0x20000020, 0x20808020, 0x00008000, 0x20800000, | ||
239 | 0x20808000, 0x00800020, 0x20008020, 0x00808000, | ||
240 | 0x00008020, 0x00000000, 0x00800000, 0x20008020, | ||
241 | 0x00808020, 0x00000020, 0x20000000, 0x00008000, | ||
242 | 0x20000020, 0x20008000, 0x00808000, 0x20800020, | ||
243 | 0x00000000, 0x00808020, 0x00008020, 0x20808000, | ||
244 | 0x20008000, 0x00800000, 0x20808020, 0x20000000, | ||
245 | 0x20008020, 0x20800000, 0x00800000, 0x20808020, | ||
246 | 0x00008000, 0x00800020, 0x20800020, 0x00008020, | ||
247 | 0x00800020, 0x00000000, 0x20808000, 0x20000020, | ||
248 | 0x20800000, 0x20008020, 0x00000020, 0x00808000, | ||
249 | ); | ||
250 | @SP3=( | ||
251 | 0x00080201, 0x02000200, 0x00000001, 0x02080201, | ||
252 | 0x00000000, 0x02080000, 0x02000201, 0x00080001, | ||
253 | 0x02080200, 0x02000001, 0x02000000, 0x00000201, | ||
254 | 0x02000001, 0x00080201, 0x00080000, 0x02000000, | ||
255 | 0x02080001, 0x00080200, 0x00000200, 0x00000001, | ||
256 | 0x00080200, 0x02000201, 0x02080000, 0x00000200, | ||
257 | 0x00000201, 0x00000000, 0x00080001, 0x02080200, | ||
258 | 0x02000200, 0x02080001, 0x02080201, 0x00080000, | ||
259 | 0x02080001, 0x00000201, 0x00080000, 0x02000001, | ||
260 | 0x00080200, 0x02000200, 0x00000001, 0x02080000, | ||
261 | 0x02000201, 0x00000000, 0x00000200, 0x00080001, | ||
262 | 0x00000000, 0x02080001, 0x02080200, 0x00000200, | ||
263 | 0x02000000, 0x02080201, 0x00080201, 0x00080000, | ||
264 | 0x02080201, 0x00000001, 0x02000200, 0x00080201, | ||
265 | 0x00080001, 0x00080200, 0x02080000, 0x02000201, | ||
266 | 0x00000201, 0x02000000, 0x02000001, 0x02080200, | ||
267 | ); | ||
268 | @SP4=( | ||
269 | 0x01000000, 0x00002000, 0x00000080, 0x01002084, | ||
270 | 0x01002004, 0x01000080, 0x00002084, 0x01002000, | ||
271 | 0x00002000, 0x00000004, 0x01000004, 0x00002080, | ||
272 | 0x01000084, 0x01002004, 0x01002080, 0x00000000, | ||
273 | 0x00002080, 0x01000000, 0x00002004, 0x00000084, | ||
274 | 0x01000080, 0x00002084, 0x00000000, 0x01000004, | ||
275 | 0x00000004, 0x01000084, 0x01002084, 0x00002004, | ||
276 | 0x01002000, 0x00000080, 0x00000084, 0x01002080, | ||
277 | 0x01002080, 0x01000084, 0x00002004, 0x01002000, | ||
278 | 0x00002000, 0x00000004, 0x01000004, 0x01000080, | ||
279 | 0x01000000, 0x00002080, 0x01002084, 0x00000000, | ||
280 | 0x00002084, 0x01000000, 0x00000080, 0x00002004, | ||
281 | 0x01000084, 0x00000080, 0x00000000, 0x01002084, | ||
282 | 0x01002004, 0x01002080, 0x00000084, 0x00002000, | ||
283 | 0x00002080, 0x01002004, 0x01000080, 0x00000084, | ||
284 | 0x00000004, 0x00002084, 0x01002000, 0x01000004, | ||
285 | ); | ||
286 | @SP5=( | ||
287 | 0x10000008, 0x00040008, 0x00000000, 0x10040400, | ||
288 | 0x00040008, 0x00000400, 0x10000408, 0x00040000, | ||
289 | 0x00000408, 0x10040408, 0x00040400, 0x10000000, | ||
290 | 0x10000400, 0x10000008, 0x10040000, 0x00040408, | ||
291 | 0x00040000, 0x10000408, 0x10040008, 0x00000000, | ||
292 | 0x00000400, 0x00000008, 0x10040400, 0x10040008, | ||
293 | 0x10040408, 0x10040000, 0x10000000, 0x00000408, | ||
294 | 0x00000008, 0x00040400, 0x00040408, 0x10000400, | ||
295 | 0x00000408, 0x10000000, 0x10000400, 0x00040408, | ||
296 | 0x10040400, 0x00040008, 0x00000000, 0x10000400, | ||
297 | 0x10000000, 0x00000400, 0x10040008, 0x00040000, | ||
298 | 0x00040008, 0x10040408, 0x00040400, 0x00000008, | ||
299 | 0x10040408, 0x00040400, 0x00040000, 0x10000408, | ||
300 | 0x10000008, 0x10040000, 0x00040408, 0x00000000, | ||
301 | 0x00000400, 0x10000008, 0x10000408, 0x10040400, | ||
302 | 0x10040000, 0x00000408, 0x00000008, 0x10040008, | ||
303 | ); | ||
304 | @SP6=( | ||
305 | 0x00000800, 0x00000040, 0x00200040, 0x80200000, | ||
306 | 0x80200840, 0x80000800, 0x00000840, 0x00000000, | ||
307 | 0x00200000, 0x80200040, 0x80000040, 0x00200800, | ||
308 | 0x80000000, 0x00200840, 0x00200800, 0x80000040, | ||
309 | 0x80200040, 0x00000800, 0x80000800, 0x80200840, | ||
310 | 0x00000000, 0x00200040, 0x80200000, 0x00000840, | ||
311 | 0x80200800, 0x80000840, 0x00200840, 0x80000000, | ||
312 | 0x80000840, 0x80200800, 0x00000040, 0x00200000, | ||
313 | 0x80000840, 0x00200800, 0x80200800, 0x80000040, | ||
314 | 0x00000800, 0x00000040, 0x00200000, 0x80200800, | ||
315 | 0x80200040, 0x80000840, 0x00000840, 0x00000000, | ||
316 | 0x00000040, 0x80200000, 0x80000000, 0x00200040, | ||
317 | 0x00000000, 0x80200040, 0x00200040, 0x00000840, | ||
318 | 0x80000040, 0x00000800, 0x80200840, 0x00200000, | ||
319 | 0x00200840, 0x80000000, 0x80000800, 0x80200840, | ||
320 | 0x80200000, 0x00200840, 0x00200800, 0x80000800, | ||
321 | ); | ||
322 | @SP7=( | ||
323 | 0x04100010, 0x04104000, 0x00004010, 0x00000000, | ||
324 | 0x04004000, 0x00100010, 0x04100000, 0x04104010, | ||
325 | 0x00000010, 0x04000000, 0x00104000, 0x00004010, | ||
326 | 0x00104010, 0x04004010, 0x04000010, 0x04100000, | ||
327 | 0x00004000, 0x00104010, 0x00100010, 0x04004000, | ||
328 | 0x04104010, 0x04000010, 0x00000000, 0x00104000, | ||
329 | 0x04000000, 0x00100000, 0x04004010, 0x04100010, | ||
330 | 0x00100000, 0x00004000, 0x04104000, 0x00000010, | ||
331 | 0x00100000, 0x00004000, 0x04000010, 0x04104010, | ||
332 | 0x00004010, 0x04000000, 0x00000000, 0x00104000, | ||
333 | 0x04100010, 0x04004010, 0x04004000, 0x00100010, | ||
334 | 0x04104000, 0x00000010, 0x00100010, 0x04004000, | ||
335 | 0x04104010, 0x00100000, 0x04100000, 0x04000010, | ||
336 | 0x00104000, 0x00004010, 0x04004010, 0x04100000, | ||
337 | 0x00000010, 0x04104000, 0x00104010, 0x00000000, | ||
338 | 0x04000000, 0x04100010, 0x00004000, 0x00104010, | ||
339 | ); | ||
340 | |||
341 | sub main'des_set_key | ||
342 | { | ||
343 | local($param)=@_; | ||
344 | local(@key); | ||
345 | local($c,$d,$i,$s,$t); | ||
346 | local(@ks)=(); | ||
347 | |||
348 | # Get the bytes in the order we want. | ||
349 | @key=unpack("C8",$param); | ||
350 | |||
351 | $c= ($key[0] )| | ||
352 | ($key[1]<< 8)| | ||
353 | ($key[2]<<16)| | ||
354 | ($key[3]<<24); | ||
355 | $d= ($key[4] )| | ||
356 | ($key[5]<< 8)| | ||
357 | ($key[6]<<16)| | ||
358 | ($key[7]<<24); | ||
359 | |||
360 | &doPC1(*c,*d); | ||
361 | |||
362 | for $i (@shifts2) | ||
363 | { | ||
364 | if ($i) | ||
365 | { | ||
366 | $c=($c>>2)|($c<<26); | ||
367 | $d=($d>>2)|($d<<26); | ||
368 | } | ||
369 | else | ||
370 | { | ||
371 | $c=($c>>1)|($c<<27); | ||
372 | $d=($d>>1)|($d<<27); | ||
373 | } | ||
374 | $c&=0x0fffffff; | ||
375 | $d&=0x0fffffff; | ||
376 | $s= $skb0[ ($c )&0x3f ]| | ||
377 | $skb1[(($c>> 6)&0x03)|(($c>> 7)&0x3c)]| | ||
378 | $skb2[(($c>>13)&0x0f)|(($c>>14)&0x30)]| | ||
379 | $skb3[(($c>>20)&0x01)|(($c>>21)&0x06) | | ||
380 | (($c>>22)&0x38)]; | ||
381 | $t= $skb4[ ($d )&0x3f ]| | ||
382 | $skb5[(($d>> 7)&0x03)|(($d>> 8)&0x3c)]| | ||
383 | $skb6[ ($d>>15)&0x3f ]| | ||
384 | $skb7[(($d>>21)&0x0f)|(($d>>22)&0x30)]; | ||
385 | push(@ks,(($t<<16)|($s&0x0000ffff))&0xffffffff); | ||
386 | $s= (($s>>16)&0x0000ffff)|($t&0xffff0000) ; | ||
387 | push(@ks,(($s<<4)|(($s>>28)&0xf))&0xffffffff); | ||
388 | } | ||
389 | @ks; | ||
390 | } | ||
391 | |||
392 | sub doPC1 | ||
393 | { | ||
394 | local(*a,*b)=@_; | ||
395 | local($t); | ||
396 | |||
397 | $t=(($b>>4)^$a)&0x0f0f0f0f; | ||
398 | $b^=($t<<4); $a^=$t; | ||
399 | # do $a first | ||
400 | $t=(($a<<18)^$a)&0xcccc0000; | ||
401 | $a=$a^$t^(($t>>18)&0x00003fff); | ||
402 | $t=(($a<<17)^$a)&0xaaaa0000; | ||
403 | $a=$a^$t^(($t>>17)&0x00007fff); | ||
404 | $t=(($a<< 8)^$a)&0x00ff0000; | ||
405 | $a=$a^$t^(($t>> 8)&0x00ffffff); | ||
406 | $t=(($a<<17)^$a)&0xaaaa0000; | ||
407 | $a=$a^$t^(($t>>17)&0x00007fff); | ||
408 | |||
409 | # now do $b | ||
410 | $t=(($b<<24)^$b)&0xff000000; | ||
411 | $b=$b^$t^(($t>>24)&0x000000ff); | ||
412 | $t=(($b<< 8)^$b)&0x00ff0000; | ||
413 | $b=$b^$t^(($t>> 8)&0x00ffffff); | ||
414 | $t=(($b<<14)^$b)&0x33330000; | ||
415 | $b=$b^$t^(($t>>14)&0x0003ffff); | ||
416 | $b=(($b&0x00aa00aa)<<7)|(($b&0x55005500)>>7)|($b&0xaa55aa55); | ||
417 | $b=(($b>>8)&0x00ffffff)|((($a&0xf0000000)>>4)&0x0fffffff); | ||
418 | $a&=0x0fffffff; | ||
419 | } | ||
420 | |||
421 | sub doIP | ||
422 | { | ||
423 | local(*a,*b)=@_; | ||
424 | local($t); | ||
425 | |||
426 | $t=(($b>> 4)^$a)&0x0f0f0f0f; | ||
427 | $b^=($t<< 4); $a^=$t; | ||
428 | $t=(($a>>16)^$b)&0x0000ffff; | ||
429 | $a^=($t<<16); $b^=$t; | ||
430 | $t=(($b>> 2)^$a)&0x33333333; | ||
431 | $b^=($t<< 2); $a^=$t; | ||
432 | $t=(($a>> 8)^$b)&0x00ff00ff; | ||
433 | $a^=($t<< 8); $b^=$t; | ||
434 | $t=(($b>> 1)^$a)&0x55555555; | ||
435 | $b^=($t<< 1); $a^=$t; | ||
436 | $t=$a; | ||
437 | $a=$b&0xffffffff; | ||
438 | $b=$t&0xffffffff; | ||
439 | } | ||
440 | |||
441 | sub doFP | ||
442 | { | ||
443 | local(*a,*b)=@_; | ||
444 | local($t); | ||
445 | |||
446 | $t=(($b>> 1)^$a)&0x55555555; | ||
447 | $b^=($t<< 1); $a^=$t; | ||
448 | $t=(($a>> 8)^$b)&0x00ff00ff; | ||
449 | $a^=($t<< 8); $b^=$t; | ||
450 | $t=(($b>> 2)^$a)&0x33333333; | ||
451 | $b^=($t<< 2); $a^=$t; | ||
452 | $t=(($a>>16)^$b)&0x0000ffff; | ||
453 | $a^=($t<<16); $b^=$t; | ||
454 | $t=(($b>> 4)^$a)&0x0f0f0f0f; | ||
455 | $b^=($t<< 4); $a^=$t; | ||
456 | $a&=0xffffffff; | ||
457 | $b&=0xffffffff; | ||
458 | } | ||
459 | |||
460 | sub main'des_ecb_encrypt | ||
461 | { | ||
462 | local(*ks,$encrypt,$in)=@_; | ||
463 | local($l,$r,$i,$t,$u,@input); | ||
464 | |||
465 | @input=unpack("C8",$in); | ||
466 | # Get the bytes in the order we want. | ||
467 | $l= ($input[0] )| | ||
468 | ($input[1]<< 8)| | ||
469 | ($input[2]<<16)| | ||
470 | ($input[3]<<24); | ||
471 | $r= ($input[4] )| | ||
472 | ($input[5]<< 8)| | ||
473 | ($input[6]<<16)| | ||
474 | ($input[7]<<24); | ||
475 | |||
476 | $l&=0xffffffff; | ||
477 | $r&=0xffffffff; | ||
478 | &doIP(*l,*r); | ||
479 | if ($encrypt) | ||
480 | { | ||
481 | for ($i=0; $i<32; $i+=4) | ||
482 | { | ||
483 | $t=((($r&0x7fffffff)<<1)|(($r>>31)&0x00000001)); | ||
484 | $u=$t^$ks[$i ]; | ||
485 | $t=$t^$ks[$i+1]; | ||
486 | $t2=(($t&0x0000000f)<<28); | ||
487 | |||
488 | $t=((($t>>4)&0x0fffffff)|(($t&0x0000000f)<<28)); | ||
489 | $l^= $SP1[ $t &0x3f]| | ||
490 | $SP3[($t>> 8)&0x3f]| | ||
491 | $SP5[($t>>16)&0x3f]| | ||
492 | $SP7[($t>>24)&0x3f]| | ||
493 | $SP0[ $u &0x3f]| | ||
494 | $SP2[($u>> 8)&0x3f]| | ||
495 | $SP4[($u>>16)&0x3f]| | ||
496 | $SP6[($u>>24)&0x3f]; | ||
497 | |||
498 | $t=(($l<<1)|(($l>>31)&0x1))&0xffffffff; | ||
499 | $u=$t^$ks[$i+2]; | ||
500 | $t=$t^$ks[$i+3]; | ||
501 | $t=((($t>>4)&0x0fffffff)|($t<<28))&0xffffffff; | ||
502 | $r^= $SP1[ $t &0x3f]| | ||
503 | $SP3[($t>> 8)&0x3f]| | ||
504 | $SP5[($t>>16)&0x3f]| | ||
505 | $SP7[($t>>24)&0x3f]| | ||
506 | $SP0[ $u &0x3f]| | ||
507 | $SP2[($u>> 8)&0x3f]| | ||
508 | $SP4[($u>>16)&0x3f]| | ||
509 | $SP6[($u>>24)&0x3f]; | ||
510 | } | ||
511 | } | ||
512 | else | ||
513 | { | ||
514 | for ($i=30; $i>0; $i-=4) | ||
515 | { | ||
516 | $t=(($r<<1)|(($r>>31)&0x1))&0xffffffff; | ||
517 | $u=$t^$ks[$i ]; | ||
518 | $t=$t^$ks[$i+1]; | ||
519 | $t=((($t>>4)&0x0fffffff)|($t<<28))&0xffffffff; | ||
520 | $l^= $SP1[ $t &0x3f]| | ||
521 | $SP3[($t>> 8)&0x3f]| | ||
522 | $SP5[($t>>16)&0x3f]| | ||
523 | $SP7[($t>>24)&0x3f]| | ||
524 | $SP0[ $u &0x3f]| | ||
525 | $SP2[($u>> 8)&0x3f]| | ||
526 | $SP4[($u>>16)&0x3f]| | ||
527 | $SP6[($u>>24)&0x3f]; | ||
528 | |||
529 | $t=(($l<<1)|(($l>>31)&0x1))&0xffffffff; | ||
530 | $u=$t^$ks[$i-2]; | ||
531 | $t=$t^$ks[$i-1]; | ||
532 | $t=((($t>>4)&0x0fffffff)|($t<<28))&0xffffffff; | ||
533 | $r^= $SP1[ $t &0x3f]| | ||
534 | $SP3[($t>> 8)&0x3f]| | ||
535 | $SP5[($t>>16)&0x3f]| | ||
536 | $SP7[($t>>24)&0x3f]| | ||
537 | $SP0[ $u &0x3f]| | ||
538 | $SP2[($u>> 8)&0x3f]| | ||
539 | $SP4[($u>>16)&0x3f]| | ||
540 | $SP6[($u>>24)&0x3f]; | ||
541 | } | ||
542 | } | ||
543 | &doFP(*l,*r); | ||
544 | pack("C8",$l&0xff, | ||
545 | ($l>> 8)&0x00ffffff, | ||
546 | ($l>>16)&0x0000ffff, | ||
547 | ($l>>24)&0x000000ff, | ||
548 | $r&0xff, | ||
549 | ($r>> 8)&0x00ffffff, | ||
550 | ($r>>16)&0x0000ffff, | ||
551 | ($r>>24)&0x000000ff); | ||
552 | } | ||
diff --git a/src/lib/libcrypto/des/des.pod b/src/lib/libcrypto/des/des.pod new file mode 100644 index 0000000000..bf479e83d2 --- /dev/null +++ b/src/lib/libcrypto/des/des.pod | |||
@@ -0,0 +1,217 @@ | |||
1 | =pod | ||
2 | |||
3 | =head1 NAME | ||
4 | |||
5 | des - encrypt or decrypt data using Data Encryption Standard | ||
6 | |||
7 | =head1 SYNOPSIS | ||
8 | |||
9 | B<des> | ||
10 | ( | ||
11 | B<-e> | ||
12 | | | ||
13 | B<-E> | ||
14 | ) | ( | ||
15 | B<-d> | ||
16 | | | ||
17 | B<-D> | ||
18 | ) | ( | ||
19 | B<->[B<cC>][B<ckname>] | ||
20 | ) | | ||
21 | [ | ||
22 | B<-b3hfs> | ||
23 | ] [ | ||
24 | B<-k> | ||
25 | I<key> | ||
26 | ] | ||
27 | ] [ | ||
28 | B<-u>[I<uuname>] | ||
29 | [ | ||
30 | I<input-file> | ||
31 | [ | ||
32 | I<output-file> | ||
33 | ] ] | ||
34 | |||
35 | =head1 NOTE | ||
36 | |||
37 | This page describes the B<des> stand-alone program, not the B<openssl des> | ||
38 | command. | ||
39 | |||
40 | =head1 DESCRIPTION | ||
41 | |||
42 | B<des> | ||
43 | encrypts and decrypts data using the | ||
44 | Data Encryption Standard algorithm. | ||
45 | One of | ||
46 | B<-e>, B<-E> | ||
47 | (for encrypt) or | ||
48 | B<-d>, B<-D> | ||
49 | (for decrypt) must be specified. | ||
50 | It is also possible to use | ||
51 | B<-c> | ||
52 | or | ||
53 | B<-C> | ||
54 | in conjunction or instead of the a encrypt/decrypt option to generate | ||
55 | a 16 character hexadecimal checksum, generated via the | ||
56 | I<des_cbc_cksum>. | ||
57 | |||
58 | Two standard encryption modes are supported by the | ||
59 | B<des> | ||
60 | program, Cipher Block Chaining (the default) and Electronic Code Book | ||
61 | (specified with | ||
62 | B<-b>). | ||
63 | |||
64 | The key used for the DES | ||
65 | algorithm is obtained by prompting the user unless the | ||
66 | B<-k> | ||
67 | I<key> | ||
68 | option is given. | ||
69 | If the key is an argument to the | ||
70 | B<des> | ||
71 | command, it is potentially visible to users executing | ||
72 | ps(1) | ||
73 | or a derivative. To minimise this possibility, | ||
74 | B<des> | ||
75 | takes care to destroy the key argument immediately upon entry. | ||
76 | If your shell keeps a history file be careful to make sure it is not | ||
77 | world readable. | ||
78 | |||
79 | Since this program attempts to maintain compatibility with sunOS's | ||
80 | des(1) command, there are 2 different methods used to convert the user | ||
81 | supplied key to a des key. | ||
82 | Whenever and one or more of | ||
83 | B<-E>, B<-D>, B<-C> | ||
84 | or | ||
85 | B<-3> | ||
86 | options are used, the key conversion procedure will not be compatible | ||
87 | with the sunOS des(1) version but will use all the user supplied | ||
88 | character to generate the des key. | ||
89 | B<des> | ||
90 | command reads from standard input unless | ||
91 | I<input-file> | ||
92 | is specified and writes to standard output unless | ||
93 | I<output-file> | ||
94 | is given. | ||
95 | |||
96 | =head1 OPTIONS | ||
97 | |||
98 | =over 4 | ||
99 | |||
100 | =item B<-b> | ||
101 | |||
102 | Select ECB | ||
103 | (eight bytes at a time) encryption mode. | ||
104 | |||
105 | =item B<-3> | ||
106 | |||
107 | Encrypt using triple encryption. | ||
108 | By default triple cbc encryption is used but if the | ||
109 | B<-b> | ||
110 | option is used then triple ECB encryption is performed. | ||
111 | If the key is less than 8 characters long, the flag has no effect. | ||
112 | |||
113 | =item B<-e> | ||
114 | |||
115 | Encrypt data using an 8 byte key in a manner compatible with sunOS | ||
116 | des(1). | ||
117 | |||
118 | =item B<-E> | ||
119 | |||
120 | Encrypt data using a key of nearly unlimited length (1024 bytes). | ||
121 | This will product a more secure encryption. | ||
122 | |||
123 | =item B<-d> | ||
124 | |||
125 | Decrypt data that was encrypted with the B<-e> option. | ||
126 | |||
127 | =item B<-D> | ||
128 | |||
129 | Decrypt data that was encrypted with the B<-E> option. | ||
130 | |||
131 | =item B<-c> | ||
132 | |||
133 | Generate a 16 character hexadecimal cbc checksum and output this to | ||
134 | stderr. | ||
135 | If a filename was specified after the | ||
136 | B<-c> | ||
137 | option, the checksum is output to that file. | ||
138 | The checksum is generated using a key generated in a sunOS compatible | ||
139 | manner. | ||
140 | |||
141 | =item B<-C> | ||
142 | |||
143 | A cbc checksum is generated in the same manner as described for the | ||
144 | B<-c> | ||
145 | option but the DES key is generated in the same manner as used for the | ||
146 | B<-E> | ||
147 | and | ||
148 | B<-D> | ||
149 | options | ||
150 | |||
151 | =item B<-f> | ||
152 | |||
153 | Does nothing - allowed for compatibility with sunOS des(1) command. | ||
154 | |||
155 | =item B<-s> | ||
156 | |||
157 | Does nothing - allowed for compatibility with sunOS des(1) command. | ||
158 | |||
159 | =item B<-k> I<key> | ||
160 | |||
161 | Use the encryption | ||
162 | I<key> | ||
163 | specified. | ||
164 | |||
165 | =item B<-h> | ||
166 | |||
167 | The | ||
168 | I<key> | ||
169 | is assumed to be a 16 character hexadecimal number. | ||
170 | If the | ||
171 | B<-3> | ||
172 | option is used the key is assumed to be a 32 character hexadecimal | ||
173 | number. | ||
174 | |||
175 | =item B<-u> | ||
176 | |||
177 | This flag is used to read and write uuencoded files. If decrypting, | ||
178 | the input file is assumed to contain uuencoded, DES encrypted data. | ||
179 | If encrypting, the characters following the B<-u> are used as the name of | ||
180 | the uuencoded file to embed in the begin line of the uuencoded | ||
181 | output. If there is no name specified after the B<-u>, the name text.des | ||
182 | will be embedded in the header. | ||
183 | |||
184 | =head1 SEE ALSO | ||
185 | |||
186 | ps(1), | ||
187 | L<des_crypt(3)|des_crypt(3)> | ||
188 | |||
189 | =head1 BUGS | ||
190 | |||
191 | The problem with using the | ||
192 | B<-e> | ||
193 | option is the short key length. | ||
194 | It would be better to use a real 56-bit key rather than an | ||
195 | ASCII-based 56-bit pattern. Knowing that the key was derived from ASCII | ||
196 | radically reduces the time necessary for a brute-force cryptographic attack. | ||
197 | My attempt to remove this problem is to add an alternative text-key to | ||
198 | DES-key function. This alternative function (accessed via | ||
199 | B<-E>, B<-D>, B<-S> | ||
200 | and | ||
201 | B<-3>) | ||
202 | uses DES to help generate the key. | ||
203 | |||
204 | Be carefully when using the B<-u> option. Doing B<des -ud> I<filename> will | ||
205 | not decrypt filename (the B<-u> option will gobble the B<-d> option). | ||
206 | |||
207 | The VMS operating system operates in a world where files are always a | ||
208 | multiple of 512 bytes. This causes problems when encrypted data is | ||
209 | send from Unix to VMS since a 88 byte file will suddenly be padded | ||
210 | with 424 null bytes. To get around this problem, use the B<-u> option | ||
211 | to uuencode the data before it is send to the VMS system. | ||
212 | |||
213 | =head1 AUTHOR | ||
214 | |||
215 | Eric Young (eay@cryptsoft.com) | ||
216 | |||
217 | =cut | ||
diff --git a/src/lib/libcrypto/des/des_crypt.man b/src/lib/libcrypto/des/des_crypt.man index 0ecc416877..e69de29bb2 100644 --- a/src/lib/libcrypto/des/des_crypt.man +++ b/src/lib/libcrypto/des/des_crypt.man | |||
@@ -1,508 +0,0 @@ | |||
1 | .TH DES_CRYPT 3 | ||
2 | .SH NAME | ||
3 | des_read_password, des_read_2password, | ||
4 | des_string_to_key, des_string_to_2key, des_read_pw_string, | ||
5 | des_random_key, des_set_key, | ||
6 | des_key_sched, des_ecb_encrypt, des_ecb3_encrypt, des_cbc_encrypt, | ||
7 | des_3cbc_encrypt, | ||
8 | des_pcbc_encrypt, des_cfb_encrypt, des_ofb_encrypt, | ||
9 | des_cbc_cksum, des_quad_cksum, | ||
10 | des_enc_read, des_enc_write, des_set_odd_parity, | ||
11 | des_is_weak_key, crypt \- (non USA) DES encryption | ||
12 | .SH SYNOPSIS | ||
13 | .nf | ||
14 | .nj | ||
15 | .ft B | ||
16 | #include <des.h> | ||
17 | .PP | ||
18 | .B int des_read_password(key,prompt,verify) | ||
19 | des_cblock *key; | ||
20 | char *prompt; | ||
21 | int verify; | ||
22 | .PP | ||
23 | .B int des_read_2password(key1,key2,prompt,verify) | ||
24 | des_cblock *key1,*key2; | ||
25 | char *prompt; | ||
26 | int verify; | ||
27 | .PP | ||
28 | .B int des_string_to_key(str,key) | ||
29 | char *str; | ||
30 | des_cblock *key; | ||
31 | .PP | ||
32 | .B int des_string_to_2keys(str,key1,key2) | ||
33 | char *str; | ||
34 | des_cblock *key1,*key2; | ||
35 | .PP | ||
36 | .B int des_read_pw_string(buf,length,prompt,verify) | ||
37 | char *buf; | ||
38 | int length; | ||
39 | char *prompt; | ||
40 | int verify; | ||
41 | .PP | ||
42 | .B int des_random_key(key) | ||
43 | des_cblock *key; | ||
44 | .PP | ||
45 | .B int des_set_key(key,schedule) | ||
46 | des_cblock *key; | ||
47 | des_key_schedule schedule; | ||
48 | .PP | ||
49 | .B int des_key_sched(key,schedule) | ||
50 | des_cblock *key; | ||
51 | des_key_schedule schedule; | ||
52 | .PP | ||
53 | .B int des_ecb_encrypt(input,output,schedule,encrypt) | ||
54 | des_cblock *input; | ||
55 | des_cblock *output; | ||
56 | des_key_schedule schedule; | ||
57 | int encrypt; | ||
58 | .PP | ||
59 | .B int des_ecb3_encrypt(input,output,ks1,ks2,encrypt) | ||
60 | des_cblock *input; | ||
61 | des_cblock *output; | ||
62 | des_key_schedule ks1,ks2; | ||
63 | int encrypt; | ||
64 | .PP | ||
65 | .B int des_cbc_encrypt(input,output,length,schedule,ivec,encrypt) | ||
66 | des_cblock *input; | ||
67 | des_cblock *output; | ||
68 | long length; | ||
69 | des_key_schedule schedule; | ||
70 | des_cblock *ivec; | ||
71 | int encrypt; | ||
72 | .PP | ||
73 | .B int des_3cbc_encrypt(input,output,length,sk1,sk2,ivec1,ivec2,encrypt) | ||
74 | des_cblock *input; | ||
75 | des_cblock *output; | ||
76 | long length; | ||
77 | des_key_schedule sk1; | ||
78 | des_key_schedule sk2; | ||
79 | des_cblock *ivec1; | ||
80 | des_cblock *ivec2; | ||
81 | int encrypt; | ||
82 | .PP | ||
83 | .B int des_pcbc_encrypt(input,output,length,schedule,ivec,encrypt) | ||
84 | des_cblock *input; | ||
85 | des_cblock *output; | ||
86 | long length; | ||
87 | des_key_schedule schedule; | ||
88 | des_cblock *ivec; | ||
89 | int encrypt; | ||
90 | .PP | ||
91 | .B int des_cfb_encrypt(input,output,numbits,length,schedule,ivec,encrypt) | ||
92 | unsigned char *input; | ||
93 | unsigned char *output; | ||
94 | int numbits; | ||
95 | long length; | ||
96 | des_key_schedule schedule; | ||
97 | des_cblock *ivec; | ||
98 | int encrypt; | ||
99 | .PP | ||
100 | .B int des_ofb_encrypt(input,output,numbits,length,schedule,ivec) | ||
101 | unsigned char *input,*output; | ||
102 | int numbits; | ||
103 | long length; | ||
104 | des_key_schedule schedule; | ||
105 | des_cblock *ivec; | ||
106 | .PP | ||
107 | .B unsigned long des_cbc_cksum(input,output,length,schedule,ivec) | ||
108 | des_cblock *input; | ||
109 | des_cblock *output; | ||
110 | long length; | ||
111 | des_key_schedule schedule; | ||
112 | des_cblock *ivec; | ||
113 | .PP | ||
114 | .B unsigned long des_quad_cksum(input,output,length,out_count,seed) | ||
115 | des_cblock *input; | ||
116 | des_cblock *output; | ||
117 | long length; | ||
118 | int out_count; | ||
119 | des_cblock *seed; | ||
120 | .PP | ||
121 | .B int des_check_key; | ||
122 | .PP | ||
123 | .B int des_enc_read(fd,buf,len,sched,iv) | ||
124 | int fd; | ||
125 | char *buf; | ||
126 | int len; | ||
127 | des_key_schedule sched; | ||
128 | des_cblock *iv; | ||
129 | .PP | ||
130 | .B int des_enc_write(fd,buf,len,sched,iv) | ||
131 | int fd; | ||
132 | char *buf; | ||
133 | int len; | ||
134 | des_key_schedule sched; | ||
135 | des_cblock *iv; | ||
136 | .PP | ||
137 | .B extern int des_rw_mode; | ||
138 | .PP | ||
139 | .B void des_set_odd_parity(key) | ||
140 | des_cblock *key; | ||
141 | .PP | ||
142 | .B int des_is_weak_key(key) | ||
143 | des_cblock *key; | ||
144 | .PP | ||
145 | .B char *crypt(passwd,salt) | ||
146 | char *passwd; | ||
147 | char *salt; | ||
148 | .PP | ||
149 | .fi | ||
150 | .SH DESCRIPTION | ||
151 | This library contains a fast implementation of the DES encryption | ||
152 | algorithm. | ||
153 | .PP | ||
154 | There are two phases to the use of DES encryption. | ||
155 | The first is the generation of a | ||
156 | .I des_key_schedule | ||
157 | from a key, | ||
158 | the second is the actual encryption. | ||
159 | A des key is of type | ||
160 | .I des_cblock. | ||
161 | This type is made from 8 characters with odd parity. | ||
162 | The least significant bit in the character is the parity bit. | ||
163 | The key schedule is an expanded form of the key; it is used to speed the | ||
164 | encryption process. | ||
165 | .PP | ||
166 | .I des_read_password | ||
167 | writes the string specified by prompt to the standard output, | ||
168 | turns off echo and reads an input string from standard input | ||
169 | until terminated with a newline. | ||
170 | If verify is non-zero, it prompts and reads the input again and verifies | ||
171 | that both entered passwords are the same. | ||
172 | The entered string is converted into a des key by using the | ||
173 | .I des_string_to_key | ||
174 | routine. | ||
175 | The new key is placed in the | ||
176 | .I des_cblock | ||
177 | that was passed (by reference) to the routine. | ||
178 | If there were no errors, | ||
179 | .I des_read_password | ||
180 | returns 0, | ||
181 | -1 is returned if there was a terminal error and 1 is returned for | ||
182 | any other error. | ||
183 | .PP | ||
184 | .I des_read_2password | ||
185 | operates in the same way as | ||
186 | .I des_read_password | ||
187 | except that it generates 2 keys by using the | ||
188 | .I des_string_to_2key | ||
189 | function. | ||
190 | .PP | ||
191 | .I des_read_pw_string | ||
192 | is called by | ||
193 | .I des_read_password | ||
194 | to read and verify a string from a terminal device. | ||
195 | The string is returned in | ||
196 | .I buf. | ||
197 | The size of | ||
198 | .I buf | ||
199 | is passed to the routine via the | ||
200 | .I length | ||
201 | parameter. | ||
202 | .PP | ||
203 | .I des_string_to_key | ||
204 | converts a string into a valid des key. | ||
205 | .PP | ||
206 | .I des_string_to_2key | ||
207 | converts a string into 2 valid des keys. | ||
208 | This routine is best suited for used to generate keys for use with | ||
209 | .I des_ecb3_encrypt. | ||
210 | .PP | ||
211 | .I des_random_key | ||
212 | returns a random key that is made of a combination of process id, | ||
213 | time and an increasing counter. | ||
214 | .PP | ||
215 | Before a des key can be used it is converted into a | ||
216 | .I des_key_schedule | ||
217 | via the | ||
218 | .I des_set_key | ||
219 | routine. | ||
220 | If the | ||
221 | .I des_check_key | ||
222 | flag is non-zero, | ||
223 | .I des_set_key | ||
224 | will check that the key passed is of odd parity and is not a week or | ||
225 | semi-weak key. | ||
226 | If the parity is wrong, | ||
227 | then -1 is returned. | ||
228 | If the key is a weak key, | ||
229 | then -2 is returned. | ||
230 | If an error is returned, | ||
231 | the key schedule is not generated. | ||
232 | .PP | ||
233 | .I des_key_sched | ||
234 | is another name for the | ||
235 | .I des_set_key | ||
236 | function. | ||
237 | .PP | ||
238 | The following routines mostly operate on an input and output stream of | ||
239 | .I des_cblock's. | ||
240 | .PP | ||
241 | .I des_ecb_encrypt | ||
242 | is the basic DES encryption routine that encrypts or decrypts a single 8-byte | ||
243 | .I des_cblock | ||
244 | in | ||
245 | .I electronic code book | ||
246 | mode. | ||
247 | It always transforms the input data, pointed to by | ||
248 | .I input, | ||
249 | into the output data, | ||
250 | pointed to by the | ||
251 | .I output | ||
252 | argument. | ||
253 | If the | ||
254 | .I encrypt | ||
255 | argument is non-zero (DES_ENCRYPT), | ||
256 | the | ||
257 | .I input | ||
258 | (cleartext) is encrypted in to the | ||
259 | .I output | ||
260 | (ciphertext) using the key_schedule specified by the | ||
261 | .I schedule | ||
262 | argument, | ||
263 | previously set via | ||
264 | .I des_set_key. | ||
265 | If | ||
266 | .I encrypt | ||
267 | is zero (DES_DECRYPT), | ||
268 | the | ||
269 | .I input | ||
270 | (now ciphertext) | ||
271 | is decrypted into the | ||
272 | .I output | ||
273 | (now cleartext). | ||
274 | Input and output may overlap. | ||
275 | No meaningful value is returned. | ||
276 | .PP | ||
277 | .I des_ecb3_encrypt | ||
278 | encrypts/decrypts the | ||
279 | .I input | ||
280 | block by using triple ecb DES encryption. | ||
281 | This involves encrypting the input with | ||
282 | .I ks1, | ||
283 | decryption with the key schedule | ||
284 | .I ks2, | ||
285 | and then encryption with the first again. | ||
286 | This routine greatly reduces the chances of brute force breaking of | ||
287 | DES and has the advantage of if | ||
288 | .I ks1 | ||
289 | and | ||
290 | .I ks2 | ||
291 | are the same, it is equivalent to just encryption using ecb mode and | ||
292 | .I ks1 | ||
293 | as the key. | ||
294 | .PP | ||
295 | .I des_cbc_encrypt | ||
296 | encrypts/decrypts using the | ||
297 | .I cipher-block-chaining | ||
298 | mode of DES. | ||
299 | If the | ||
300 | .I encrypt | ||
301 | argument is non-zero, | ||
302 | the routine cipher-block-chain encrypts the cleartext data pointed to by the | ||
303 | .I input | ||
304 | argument into the ciphertext pointed to by the | ||
305 | .I output | ||
306 | argument, | ||
307 | using the key schedule provided by the | ||
308 | .I schedule | ||
309 | argument, | ||
310 | and initialisation vector provided by the | ||
311 | .I ivec | ||
312 | argument. | ||
313 | If the | ||
314 | .I length | ||
315 | argument is not an integral multiple of eight bytes, | ||
316 | the last block is copied to a temporary area and zero filled. | ||
317 | The output is always | ||
318 | an integral multiple of eight bytes. | ||
319 | To make multiple cbc encrypt calls on a large amount of data appear to | ||
320 | be one | ||
321 | .I des_cbc_encrypt | ||
322 | call, the | ||
323 | .I ivec | ||
324 | of subsequent calls should be the last 8 bytes of the output. | ||
325 | .PP | ||
326 | .I des_3cbc_encrypt | ||
327 | encrypts/decrypts the | ||
328 | .I input | ||
329 | block by using triple cbc DES encryption. | ||
330 | This involves encrypting the input with key schedule | ||
331 | .I ks1, | ||
332 | decryption with the key schedule | ||
333 | .I ks2, | ||
334 | and then encryption with the first again. | ||
335 | 2 initialisation vectors are required, | ||
336 | .I ivec1 | ||
337 | and | ||
338 | .I ivec2. | ||
339 | Unlike | ||
340 | .I des_cbc_encrypt, | ||
341 | these initialisation vectors are modified by the subroutine. | ||
342 | This routine greatly reduces the chances of brute force breaking of | ||
343 | DES and has the advantage of if | ||
344 | .I ks1 | ||
345 | and | ||
346 | .I ks2 | ||
347 | are the same, it is equivalent to just encryption using cbc mode and | ||
348 | .I ks1 | ||
349 | as the key. | ||
350 | .PP | ||
351 | .I des_pcbc_encrypt | ||
352 | encrypt/decrypts using a modified block chaining mode. | ||
353 | It provides better error propagation characteristics than cbc | ||
354 | encryption. | ||
355 | .PP | ||
356 | .I des_cfb_encrypt | ||
357 | encrypt/decrypts using cipher feedback mode. This method takes an | ||
358 | array of characters as input and outputs and array of characters. It | ||
359 | does not require any padding to 8 character groups. Note: the ivec | ||
360 | variable is changed and the new changed value needs to be passed to | ||
361 | the next call to this function. Since this function runs a complete | ||
362 | DES ecb encryption per numbits, this function is only suggested for | ||
363 | use when sending small numbers of characters. | ||
364 | .PP | ||
365 | .I des_ofb_encrypt | ||
366 | encrypt using output feedback mode. This method takes an | ||
367 | array of characters as input and outputs and array of characters. It | ||
368 | does not require any padding to 8 character groups. Note: the ivec | ||
369 | variable is changed and the new changed value needs to be passed to | ||
370 | the next call to this function. Since this function runs a complete | ||
371 | DES ecb encryption per numbits, this function is only suggested for | ||
372 | use when sending small numbers of characters. | ||
373 | .PP | ||
374 | .I des_cbc_cksum | ||
375 | produces an 8 byte checksum based on the input stream (via cbc encryption). | ||
376 | The last 4 bytes of the checksum is returned and the complete 8 bytes is | ||
377 | placed in | ||
378 | .I output. | ||
379 | .PP | ||
380 | .I des_quad_cksum | ||
381 | returns a 4 byte checksum from the input bytes. | ||
382 | The algorithm can be iterated over the input, | ||
383 | depending on | ||
384 | .I out_count, | ||
385 | 1, 2, 3 or 4 times. | ||
386 | If | ||
387 | .I output | ||
388 | is non-NULL, | ||
389 | the 8 bytes generated by each pass are written into | ||
390 | .I output. | ||
391 | .PP | ||
392 | .I des_enc_write | ||
393 | is used to write | ||
394 | .I len | ||
395 | bytes | ||
396 | to file descriptor | ||
397 | .I fd | ||
398 | from buffer | ||
399 | .I buf. | ||
400 | The data is encrypted via | ||
401 | .I pcbc_encrypt | ||
402 | (default) using | ||
403 | .I sched | ||
404 | for the key and | ||
405 | .I iv | ||
406 | as a starting vector. | ||
407 | The actual data send down | ||
408 | .I fd | ||
409 | consists of 4 bytes (in network byte order) containing the length of the | ||
410 | following encrypted data. The encrypted data then follows, padded with random | ||
411 | data out to a multiple of 8 bytes. | ||
412 | .PP | ||
413 | .I des_enc_read | ||
414 | is used to read | ||
415 | .I len | ||
416 | bytes | ||
417 | from file descriptor | ||
418 | .I fd | ||
419 | into buffer | ||
420 | .I buf. | ||
421 | The data being read from | ||
422 | .I fd | ||
423 | is assumed to have come from | ||
424 | .I des_enc_write | ||
425 | and is decrypted using | ||
426 | .I sched | ||
427 | for the key schedule and | ||
428 | .I iv | ||
429 | for the initial vector. | ||
430 | The | ||
431 | .I des_enc_read/des_enc_write | ||
432 | pair can be used to read/write to files, pipes and sockets. | ||
433 | I have used them in implementing a version of rlogin in which all | ||
434 | data is encrypted. | ||
435 | .PP | ||
436 | .I des_rw_mode | ||
437 | is used to specify the encryption mode to use with | ||
438 | .I des_enc_read | ||
439 | and | ||
440 | .I des_end_write. | ||
441 | If set to | ||
442 | .I DES_PCBC_MODE | ||
443 | (the default), des_pcbc_encrypt is used. | ||
444 | If set to | ||
445 | .I DES_CBC_MODE | ||
446 | des_cbc_encrypt is used. | ||
447 | These two routines and the variable are not part of the normal MIT library. | ||
448 | .PP | ||
449 | .I des_set_odd_parity | ||
450 | sets the parity of the passed | ||
451 | .I key | ||
452 | to odd. This routine is not part of the standard MIT library. | ||
453 | .PP | ||
454 | .I des_is_weak_key | ||
455 | returns 1 is the passed key is a weak key (pick again :-), | ||
456 | 0 if it is ok. | ||
457 | This routine is not part of the standard MIT library. | ||
458 | .PP | ||
459 | .I crypt | ||
460 | is a replacement for the normal system crypt. | ||
461 | It is much faster than the system crypt. | ||
462 | .PP | ||
463 | .SH FILES | ||
464 | /usr/include/des.h | ||
465 | .br | ||
466 | /usr/lib/libdes.a | ||
467 | .PP | ||
468 | The encryption routines have been tested on 16bit, 32bit and 64bit | ||
469 | machines of various endian and even works under VMS. | ||
470 | .PP | ||
471 | .SH BUGS | ||
472 | .PP | ||
473 | If you think this manual is sparse, | ||
474 | read the des_crypt(3) manual from the MIT kerberos (or bones outside | ||
475 | of the USA) distribution. | ||
476 | .PP | ||
477 | .I des_cfb_encrypt | ||
478 | and | ||
479 | .I des_ofb_encrypt | ||
480 | operates on input of 8 bits. What this means is that if you set | ||
481 | numbits to 12, and length to 2, the first 12 bits will come from the 1st | ||
482 | input byte and the low half of the second input byte. The second 12 | ||
483 | bits will have the low 8 bits taken from the 3rd input byte and the | ||
484 | top 4 bits taken from the 4th input byte. The same holds for output. | ||
485 | This function has been implemented this way because most people will | ||
486 | be using a multiple of 8 and because once you get into pulling bytes input | ||
487 | bytes apart things get ugly! | ||
488 | .PP | ||
489 | .I des_read_pw_string | ||
490 | is the most machine/OS dependent function and normally generates the | ||
491 | most problems when porting this code. | ||
492 | .PP | ||
493 | .I des_string_to_key | ||
494 | is probably different from the MIT version since there are lots | ||
495 | of fun ways to implement one-way encryption of a text string. | ||
496 | .PP | ||
497 | The routines are optimised for 32 bit machines and so are not efficient | ||
498 | on IBM PCs. | ||
499 | .PP | ||
500 | NOTE: extensive work has been done on this library since this document | ||
501 | was origionally written. Please try to read des.doc from the libdes | ||
502 | distribution since it is far more upto date and documents more of the | ||
503 | functions. Libdes is now also being shipped as part of SSLeay, a | ||
504 | general cryptographic library that amonst other things implements | ||
505 | netscapes SSL protocoll. The most recent version can be found in | ||
506 | SSLeay distributions. | ||
507 | .SH AUTHOR | ||
508 | Eric Young (eay@cryptsoft.com) | ||
diff --git a/src/lib/libcrypto/des/des_locl.h b/src/lib/libcrypto/des/des_locl.h index 4dfed199a7..1ace8f5930 100644 --- a/src/lib/libcrypto/des/des_locl.h +++ b/src/lib/libcrypto/des/des_locl.h | |||
@@ -155,7 +155,7 @@ | |||
155 | } \ | 155 | } \ |
156 | } | 156 | } |
157 | 157 | ||
158 | #if defined(WIN32) | 158 | #if defined(WIN32) && defined(_MSC_VER) |
159 | #define ROTATE(a,n) (_lrotr(a,n)) | 159 | #define ROTATE(a,n) (_lrotr(a,n)) |
160 | #else | 160 | #else |
161 | #define ROTATE(a,n) (((a)>>(n))+((a)<<(32-(n)))) | 161 | #define ROTATE(a,n) (((a)>>(n))+((a)<<(32-(n)))) |
diff --git a/src/lib/libcrypto/des/destest.c b/src/lib/libcrypto/des/destest.c index 9ad4ecb072..df0d615d6b 100644 --- a/src/lib/libcrypto/des/destest.c +++ b/src/lib/libcrypto/des/destest.c | |||
@@ -336,8 +336,15 @@ int main(int argc, char *argv[]) | |||
336 | unsigned char cbc_in[40]; | 336 | unsigned char cbc_in[40]; |
337 | unsigned char cbc_out[40]; | 337 | unsigned char cbc_out[40]; |
338 | DES_LONG cs; | 338 | DES_LONG cs; |
339 | unsigned char qret[4][4],cret[8]; | 339 | unsigned char cret[8]; |
340 | DES_LONG lqret[4]; | 340 | #ifdef _CRAY |
341 | struct { | ||
342 | int a:32; | ||
343 | int b:32; | ||
344 | } lqret[2]; | ||
345 | #else | ||
346 | DES_LONG lqret[4]; | ||
347 | #endif | ||
341 | int num; | 348 | int num; |
342 | char *str; | 349 | char *str; |
343 | 350 | ||
@@ -701,43 +708,40 @@ plain[8+4], plain[8+5], plain[8+6], plain[8+7]); | |||
701 | } | 708 | } |
702 | 709 | ||
703 | printf("Doing quad_cksum\n"); | 710 | printf("Doing quad_cksum\n"); |
704 | /* This is obviously done this way especially to puzzle me. Although | 711 | cs=quad_cksum(cbc_data,(des_cblock *)lqret, |
705 | quad_cksum returns up to 4 groups of 8 bytes, this test gets it to | 712 | (long)strlen((char *)cbc_data),2,(des_cblock *)cbc_iv); |
706 | produce 2 groups then treats them as 4 groups of 4 bytes. | 713 | if (cs != 0x70d7a63aL) |
707 | Ben 13 Feb 1999 */ | ||
708 | cs=quad_cksum(cbc_data,(des_cblock *)qret,strlen((char *)cbc_data),2, | ||
709 | &cbc_iv); | ||
710 | |||
711 | { /* Big-endian fix */ | ||
712 | static DES_LONG l=1; | ||
713 | static unsigned char *c=(unsigned char *)&l; | ||
714 | DES_LONG ll; | ||
715 | |||
716 | j=sizeof(lqret[0])-4; | ||
717 | for (i=0; i<4; i++) | ||
718 | { | 714 | { |
719 | lqret[i]=0; | 715 | printf("quad_cksum error, ret %08lx should be 70d7a63a\n", |
720 | memcpy(&(lqret[i]),&(qret[i][0]),4); | 716 | (unsigned long)cs); |
721 | if (!c[0] && (j > 0)) | 717 | err=1; |
722 | lqret[i]=lqret[i]>>(j*8); /* For Cray */ | ||
723 | } | 718 | } |
724 | 719 | #ifdef _CRAY | |
725 | if (!c[0]) | 720 | if (lqret[0].a != 0x327eba8dL) |
726 | { | 721 | { |
727 | ll=lqret[0]^lqret[3]; | 722 | printf("quad_cksum error, out[0] %08lx is not %08lx\n", |
728 | lqret[0]^=ll; | 723 | (unsigned long)lqret[0].a,0x327eba8dUL); |
729 | lqret[3]^=ll; | 724 | err=1; |
730 | ll=lqret[1]^lqret[2]; | ||
731 | lqret[1]^=ll; | ||
732 | lqret[2]^=ll; | ||
733 | } | 725 | } |
734 | } | 726 | if (lqret[0].b != 0x201a49ccL) |
735 | if (cs != 0x70d7a63aL) | ||
736 | { | 727 | { |
737 | printf("quad_cksum error, ret %08lx should be 70d7a63a\n", | 728 | printf("quad_cksum error, out[1] %08lx is not %08lx\n", |
738 | (unsigned long)cs); | 729 | (unsigned long)lqret[0].b,0x201a49ccUL); |
730 | err=1; | ||
731 | } | ||
732 | if (lqret[1].a != 0x70d7a63aL) | ||
733 | { | ||
734 | printf("quad_cksum error, out[2] %08lx is not %08lx\n", | ||
735 | (unsigned long)lqret[1].a,0x70d7a63aUL); | ||
739 | err=1; | 736 | err=1; |
740 | } | 737 | } |
738 | if (lqret[1].b != 0x501c2c26L) | ||
739 | { | ||
740 | printf("quad_cksum error, out[3] %08lx is not %08lx\n", | ||
741 | (unsigned long)lqret[1].b,0x501c2c26UL); | ||
742 | err=1; | ||
743 | } | ||
744 | #else | ||
741 | if (lqret[0] != 0x327eba8dL) | 745 | if (lqret[0] != 0x327eba8dL) |
742 | { | 746 | { |
743 | printf("quad_cksum error, out[0] %08lx is not %08lx\n", | 747 | printf("quad_cksum error, out[0] %08lx is not %08lx\n", |
@@ -763,6 +767,7 @@ plain[8+4], plain[8+5], plain[8+6], plain[8+7]); | |||
763 | err=1; | 767 | err=1; |
764 | } | 768 | } |
765 | #endif | 769 | #endif |
770 | #endif | ||
766 | 771 | ||
767 | printf("input word alignment test"); | 772 | printf("input word alignment test"); |
768 | for (i=0; i<4; i++) | 773 | for (i=0; i<4; i++) |
diff --git a/src/lib/libcrypto/des/doIP b/src/lib/libcrypto/des/doIP index 18cf231303..e69de29bb2 100644 --- a/src/lib/libcrypto/des/doIP +++ b/src/lib/libcrypto/des/doIP | |||
@@ -1,46 +0,0 @@ | |||
1 | #!/usr/local/bin/perl | ||
2 | |||
3 | @l=( | ||
4 | 0, 1, 2, 3, 4, 5, 6, 7, | ||
5 | 8, 9,10,11,12,13,14,15, | ||
6 | 16,17,18,19,20,21,22,23, | ||
7 | 24,25,26,27,28,29,30,31 | ||
8 | ); | ||
9 | @r=( | ||
10 | 32,33,34,35,36,37,38,39, | ||
11 | 40,41,42,43,44,45,46,47, | ||
12 | 48,49,50,51,52,53,54,55, | ||
13 | 56,57,58,59,60,61,62,63 | ||
14 | ); | ||
15 | |||
16 | require 'shifts.pl'; | ||
17 | |||
18 | sub PERM_OP | ||
19 | { | ||
20 | local(*a,*b,*t,$n,$m)=@_; | ||
21 | |||
22 | @z=&shift(*a,-$n); | ||
23 | @z=&xor(*b,*z); | ||
24 | @z=&and(*z,$m); | ||
25 | @b=&xor(*b,*z); | ||
26 | @z=&shift(*z,$n); | ||
27 | @a=&xor(*a,*z); | ||
28 | } | ||
29 | |||
30 | |||
31 | @L=@l; | ||
32 | @R=@r; | ||
33 | &PERM_OP(*R,*L,*T,4,0x0f0f0f0f); | ||
34 | &PERM_OP(*L,*R,*T,16,0x0000ffff); | ||
35 | &PERM_OP(*R,*L,*T,2,0x33333333); | ||
36 | &PERM_OP(*L,*R,*T,8,0x00ff00ff); | ||
37 | &PERM_OP(*R,*L,*T,1,0x55555555); | ||
38 | &printit(@L); | ||
39 | &printit(@R); | ||
40 | &PERM_OP(*R,*L,*T,1,0x55555555); | ||
41 | &PERM_OP(*L,*R,*T,8,0x00ff00ff); | ||
42 | &PERM_OP(*R,*L,*T,2,0x33333333); | ||
43 | &PERM_OP(*L,*R,*T,16,0x0000ffff); | ||
44 | &PERM_OP(*R,*L,*T,4,0x0f0f0f0f); | ||
45 | &printit(@L); | ||
46 | &printit(@R); | ||
diff --git a/src/lib/libcrypto/des/doPC1 b/src/lib/libcrypto/des/doPC1 index 096afd8c46..e69de29bb2 100644 --- a/src/lib/libcrypto/des/doPC1 +++ b/src/lib/libcrypto/des/doPC1 | |||
@@ -1,110 +0,0 @@ | |||
1 | #!/usr/local/bin/perl | ||
2 | |||
3 | @l=( | ||
4 | 0, 1, 2, 3, 4, 5, 6, 7, | ||
5 | 8, 9,10,11,12,13,14,15, | ||
6 | 16,17,18,19,20,21,22,23, | ||
7 | 24,25,26,27,28,29,30,31 | ||
8 | ); | ||
9 | @r=( | ||
10 | 32,33,34,35,36,37,38,39, | ||
11 | 40,41,42,43,44,45,46,47, | ||
12 | 48,49,50,51,52,53,54,55, | ||
13 | 56,57,58,59,60,61,62,63 | ||
14 | ); | ||
15 | |||
16 | require 'shifts.pl'; | ||
17 | |||
18 | sub PERM_OP | ||
19 | { | ||
20 | local(*a,*b,*t,$n,$m)=@_; | ||
21 | |||
22 | @z=&shift(*a,-$n); | ||
23 | @z=&xor(*b,*z); | ||
24 | @z=&and(*z,$m); | ||
25 | @b=&xor(*b,*z); | ||
26 | @z=&shift(*z,$n); | ||
27 | @a=&xor(*a,*z); | ||
28 | } | ||
29 | |||
30 | sub HPERM_OP2 | ||
31 | { | ||
32 | local(*a,*t,$n,$m)=@_; | ||
33 | local(@x,@y,$i); | ||
34 | |||
35 | @z=&shift(*a,16-$n); | ||
36 | @z=&xor(*a,*z); | ||
37 | @z=&and(*z,$m); | ||
38 | @a=&xor(*a,*z); | ||
39 | @z=&shift(*z,$n-16); | ||
40 | @a=&xor(*a,*z); | ||
41 | } | ||
42 | |||
43 | sub HPERM_OP | ||
44 | { | ||
45 | local(*a,*t,$n,$m)=@_; | ||
46 | local(@x,@y,$i); | ||
47 | |||
48 | for ($i=0; $i<16; $i++) | ||
49 | { | ||
50 | $x[$i]=$a[$i]; | ||
51 | $y[$i]=$a[16+$i]; | ||
52 | } | ||
53 | @z=&shift(*x,-$n); | ||
54 | @z=&xor(*y,*z); | ||
55 | @z=&and(*z,$m); | ||
56 | @y=&xor(*y,*z); | ||
57 | @z=&shift(*z,$n); | ||
58 | @x=&xor(*x,*z); | ||
59 | for ($i=0; $i<16; $i++) | ||
60 | { | ||
61 | $a[$i]=$x[$i]; | ||
62 | $a[16+$i]=$y[$i]; | ||
63 | } | ||
64 | } | ||
65 | |||
66 | @L=@l; | ||
67 | @R=@r; | ||
68 | |||
69 | print "---\n"; &printit(@R); | ||
70 | &PERM_OP(*R,*L,*T,4,0x0f0f0f0f); | ||
71 | print "---\n"; &printit(@R); | ||
72 | &HPERM_OP2(*L,*T,-2,0xcccc0000); | ||
73 | &HPERM_OP2(*R,*T,-2,0xcccc0000); | ||
74 | print "---\n"; &printit(@R); | ||
75 | &PERM_OP(*R,*L,*T,1,0x55555555); | ||
76 | print "---\n"; &printit(@R); | ||
77 | &PERM_OP(*L,*R,*T,8,0x00ff00ff); | ||
78 | print "---\n"; &printit(@R); | ||
79 | &PERM_OP(*R,*L,*T,1,0x55555555); | ||
80 | print "---\n"; &printit(@R); | ||
81 | # &printit(@L); | ||
82 | &printit(@R); | ||
83 | print <<"EOF"; | ||
84 | ============================== | ||
85 | 63 55 47 39 31 23 15 7 | ||
86 | 62 54 46 38 30 22 14 6 | ||
87 | 61 53 45 37 29 21 13 5 | ||
88 | 60 52 44 36 -- -- -- -- | ||
89 | |||
90 | 57 49 41 33 25 17 9 1 | ||
91 | 58 50 42 34 26 18 10 2 | ||
92 | 59 51 43 35 27 19 11 3 | ||
93 | 28 20 12 4 -- -- -- -- | ||
94 | EOF | ||
95 | exit(1); | ||
96 | @A=&and(*R,0x000000ff); | ||
97 | @A=&shift(*A,16); | ||
98 | @B=&and(*R,0x0000ff00); | ||
99 | @C=&and(*R,0x00ff0000); | ||
100 | @C=&shift(*C,-16); | ||
101 | @D=&and(*L,0xf0000000); | ||
102 | @D=&shift(*D,-4); | ||
103 | @A=&or(*A,*B); | ||
104 | @B=&or(*D,*C); | ||
105 | @R=&or(*A,*B); | ||
106 | @L=&and(*L,0x0fffffff); | ||
107 | |||
108 | &printit(@L); | ||
109 | &printit(@R); | ||
110 | |||
diff --git a/src/lib/libcrypto/des/doPC2 b/src/lib/libcrypto/des/doPC2 index fa5cf74cf7..e69de29bb2 100644 --- a/src/lib/libcrypto/des/doPC2 +++ b/src/lib/libcrypto/des/doPC2 | |||
@@ -1,94 +0,0 @@ | |||
1 | #!/usr/local/bin/perl | ||
2 | |||
3 | @PC2_C=(14,17,11,24, 1, 5, | ||
4 | 3,28,15, 6,21,10, | ||
5 | 23,19,12, 4,26, 8, | ||
6 | 16, 7,27,20,13, 2, | ||
7 | ); | ||
8 | |||
9 | @PC2_D=(41,52,31,37,47,55, | ||
10 | 30,40,51,45,33,48, | ||
11 | 44,49,39,56,34,53, | ||
12 | 46,42,50,36,29,32, | ||
13 | ); | ||
14 | |||
15 | $i=0; | ||
16 | foreach (@PC2_C) { | ||
17 | $_--; | ||
18 | # printf "%2d,",$_; | ||
19 | $C{$_}=$i; | ||
20 | ++$i; | ||
21 | # print "\n" if ((($i) % 8) == 0); | ||
22 | } | ||
23 | $i=0; | ||
24 | #print "\n"; | ||
25 | foreach (@PC2_D) { | ||
26 | $_-=28; | ||
27 | $_--; | ||
28 | # printf "%2d,",$_; | ||
29 | $D{$_}=$i; | ||
30 | $i++; | ||
31 | # print "\n" if ((($i) % 8) == 0); | ||
32 | } | ||
33 | |||
34 | #print "\n"; | ||
35 | foreach $i (0 .. 27) | ||
36 | { | ||
37 | $_=$C{$i}; | ||
38 | # printf "%2d,",$_; | ||
39 | $i++; | ||
40 | # print "\n" if ((($i) % 8) == 0); | ||
41 | } | ||
42 | #print "\n"; | ||
43 | |||
44 | #print "\n"; | ||
45 | foreach $i (0 .. 27) | ||
46 | { | ||
47 | $_=$D{$i}; | ||
48 | # printf "%2d,",$_; | ||
49 | $i++; | ||
50 | # print "\n" if ((($i) % 8) == 0); | ||
51 | } | ||
52 | #print "\n"; | ||
53 | |||
54 | print "static ulong skb[8][64]={\n"; | ||
55 | &doit("C",*C, 0, 1, 2, 3, 4, 5); | ||
56 | &doit("C",*C, 6, 7, 9,10,11,12); | ||
57 | &doit("C",*C,13,14,15,16,18,19); | ||
58 | &doit("C",*C,20,22,23,25,26,27); | ||
59 | |||
60 | &doit("D",*D, 0, 1, 2, 3, 4, 5); | ||
61 | &doit("D",*D, 7, 8,10,11,12,13); | ||
62 | &doit("D",*D,15,16,17,18,19,20); | ||
63 | &doit("D",*D,21,22,23,24,26,27); | ||
64 | print "};\n"; | ||
65 | |||
66 | sub doit | ||
67 | { | ||
68 | local($l,*A,@b)=@_; | ||
69 | local(@out); | ||
70 | |||
71 | printf("/* for $l bits (numbered as per FIPS 46) %d %d %d %d %d %d */\n", | ||
72 | $b[0]+1, $b[1]+1, $b[2]+1, $b[3]+1, $b[4]+1, $b[5]+1); | ||
73 | for ($i=0; $i<64; $i++) | ||
74 | { | ||
75 | $out[$i]=0; | ||
76 | $j=1; | ||
77 | #print "\n"; | ||
78 | for ($k=0; $k<6; $k++) | ||
79 | { | ||
80 | $l=$A{$b[$k]}; | ||
81 | #print"$l - "; | ||
82 | if ((1<<$k) & $i) | ||
83 | { | ||
84 | $ll=int($l/6)*8+($l%6); | ||
85 | $out[$i]|=1<<($ll); | ||
86 | } | ||
87 | } | ||
88 | $pp=$out[$i]; | ||
89 | $pp=($pp&0xff0000ff)| (($pp&0x00ff0000)>>8)| | ||
90 | (($pp&0x0000ff00)<<8); | ||
91 | printf("0x%08X,",$pp); | ||
92 | print "\n" if (($i+1) % 4 == 0); | ||
93 | } | ||
94 | } | ||
diff --git a/src/lib/libcrypto/des/fcrypt.c b/src/lib/libcrypto/des/fcrypt.c index fa1b8aa34a..9b21f81cc2 100644 --- a/src/lib/libcrypto/des/fcrypt.c +++ b/src/lib/libcrypto/des/fcrypt.c | |||
@@ -3,7 +3,6 @@ | |||
3 | 3 | ||
4 | /* This version of crypt has been developed from my MIT compatible | 4 | /* This version of crypt has been developed from my MIT compatible |
5 | * DES library. | 5 | * DES library. |
6 | * The library is available at pub/Crypto/DES at ftp.psy.uq.oz.au | ||
7 | * Eric Young (eay@cryptsoft.com) | 6 | * Eric Young (eay@cryptsoft.com) |
8 | */ | 7 | */ |
9 | 8 | ||
diff --git a/src/lib/libcrypto/des/fcrypt_b.c b/src/lib/libcrypto/des/fcrypt_b.c index 83c94054e3..22c87f5983 100644 --- a/src/lib/libcrypto/des/fcrypt_b.c +++ b/src/lib/libcrypto/des/fcrypt_b.c | |||
@@ -97,7 +97,7 @@ void fcrypt_body(DES_LONG *out, des_key_schedule ks, DES_LONG Eswap0, | |||
97 | 97 | ||
98 | for (j=0; j<25; j++) | 98 | for (j=0; j<25; j++) |
99 | { | 99 | { |
100 | #ifdef DES_UNROLL | 100 | #ifndef DES_UNROLL |
101 | register int i; | 101 | register int i; |
102 | 102 | ||
103 | for (i=0; i<32; i+=8) | 103 | for (i=0; i<32; i+=8) |
diff --git a/src/lib/libcrypto/des/ncbc_enc.c b/src/lib/libcrypto/des/ncbc_enc.c index e0e67a417d..3b681691a9 100644 --- a/src/lib/libcrypto/des/ncbc_enc.c +++ b/src/lib/libcrypto/des/ncbc_enc.c | |||
@@ -1,4 +1,9 @@ | |||
1 | /* crypto/des/ncbc_enc.c */ | 1 | /* crypto/des/ncbc_enc.c */ |
2 | /* | ||
3 | * #included by: | ||
4 | * cbc_enc.c (des_cbc_encrypt) | ||
5 | * des_enc.c (des_ncbc_encrypt) | ||
6 | */ | ||
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 7 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 8 | * All rights reserved. |
4 | * | 9 | * |
diff --git a/src/lib/libcrypto/des/podd.h b/src/lib/libcrypto/des/podd.h index 1b2bfe0843..e69de29bb2 100644 --- a/src/lib/libcrypto/des/podd.h +++ b/src/lib/libcrypto/des/podd.h | |||
@@ -1,75 +0,0 @@ | |||
1 | /* crypto/des/podd.h */ | ||
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
3 | * All rights reserved. | ||
4 | * | ||
5 | * This package is an SSL implementation written | ||
6 | * by Eric Young (eay@cryptsoft.com). | ||
7 | * The implementation was written so as to conform with Netscapes SSL. | ||
8 | * | ||
9 | * This library is free for commercial and non-commercial use as long as | ||
10 | * the following conditions are aheared to. The following conditions | ||
11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
13 | * included with this distribution is covered by the same copyright terms | ||
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
15 | * | ||
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
17 | * the code are not to be removed. | ||
18 | * If this package is used in a product, Eric Young should be given attribution | ||
19 | * as the author of the parts of the library used. | ||
20 | * This can be in the form of a textual message at program startup or | ||
21 | * in documentation (online or textual) provided with the package. | ||
22 | * | ||
23 | * Redistribution and use in source and binary forms, with or without | ||
24 | * modification, are permitted provided that the following conditions | ||
25 | * are met: | ||
26 | * 1. Redistributions of source code must retain the copyright | ||
27 | * notice, this list of conditions and the following disclaimer. | ||
28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
29 | * notice, this list of conditions and the following disclaimer in the | ||
30 | * documentation and/or other materials provided with the distribution. | ||
31 | * 3. All advertising materials mentioning features or use of this software | ||
32 | * must display the following acknowledgement: | ||
33 | * "This product includes cryptographic software written by | ||
34 | * Eric Young (eay@cryptsoft.com)" | ||
35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
36 | * being used are not cryptographic related :-). | ||
37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
38 | * the apps directory (application code) you must include an acknowledgement: | ||
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
40 | * | ||
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
51 | * SUCH DAMAGE. | ||
52 | * | ||
53 | * The licence and distribution terms for any publically available version or | ||
54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
55 | * copied and put under another distribution licence | ||
56 | * [including the GNU Public Licence.] | ||
57 | */ | ||
58 | |||
59 | static const unsigned char odd_parity[256]={ | ||
60 | 1, 1, 2, 2, 4, 4, 7, 7, 8, 8, 11, 11, 13, 13, 14, 14, | ||
61 | 16, 16, 19, 19, 21, 21, 22, 22, 25, 25, 26, 26, 28, 28, 31, 31, | ||
62 | 32, 32, 35, 35, 37, 37, 38, 38, 41, 41, 42, 42, 44, 44, 47, 47, | ||
63 | 49, 49, 50, 50, 52, 52, 55, 55, 56, 56, 59, 59, 61, 61, 62, 62, | ||
64 | 64, 64, 67, 67, 69, 69, 70, 70, 73, 73, 74, 74, 76, 76, 79, 79, | ||
65 | 81, 81, 82, 82, 84, 84, 87, 87, 88, 88, 91, 91, 93, 93, 94, 94, | ||
66 | 97, 97, 98, 98,100,100,103,103,104,104,107,107,109,109,110,110, | ||
67 | 112,112,115,115,117,117,118,118,121,121,122,122,124,124,127,127, | ||
68 | 128,128,131,131,133,133,134,134,137,137,138,138,140,140,143,143, | ||
69 | 145,145,146,146,148,148,151,151,152,152,155,155,157,157,158,158, | ||
70 | 161,161,162,162,164,164,167,167,168,168,171,171,173,173,174,174, | ||
71 | 176,176,179,179,181,181,182,182,185,185,186,186,188,188,191,191, | ||
72 | 193,193,194,194,196,196,199,199,200,200,203,203,205,205,206,206, | ||
73 | 208,208,211,211,213,213,214,214,217,217,218,218,220,220,223,223, | ||
74 | 224,224,227,227,229,229,230,230,233,233,234,234,236,236,239,239, | ||
75 | 241,241,242,242,244,244,247,247,248,248,251,251,253,253,254,254}; | ||
diff --git a/src/lib/libcrypto/des/qud_cksm.c b/src/lib/libcrypto/des/qud_cksm.c index 6ce8c61b42..5f0ec5387f 100644 --- a/src/lib/libcrypto/des/qud_cksm.c +++ b/src/lib/libcrypto/des/qud_cksm.c | |||
@@ -80,10 +80,14 @@ DES_LONG des_quad_cksum(const unsigned char *input, des_cblock output[], | |||
80 | int i; | 80 | int i; |
81 | long l; | 81 | long l; |
82 | const unsigned char *cp; | 82 | const unsigned char *cp; |
83 | unsigned char *lp; | 83 | #ifdef _CRAY |
84 | short *lp; | ||
85 | #else | ||
86 | DES_LONG *lp; | ||
87 | #endif | ||
84 | 88 | ||
85 | if (out_count < 1) out_count=1; | 89 | if (out_count < 1) out_count=1; |
86 | lp = &(output[0])[0]; | 90 | lp = (DES_LONG *) &(output[0])[0]; |
87 | 91 | ||
88 | z0=Q_B0((*seed)[0])|Q_B1((*seed)[1])|Q_B2((*seed)[2])|Q_B3((*seed)[3]); | 92 | z0=Q_B0((*seed)[0])|Q_B1((*seed)[1])|Q_B2((*seed)[2])|Q_B3((*seed)[3]); |
89 | z1=Q_B0((*seed)[4])|Q_B1((*seed)[5])|Q_B2((*seed)[6])|Q_B3((*seed)[7]); | 93 | z1=Q_B0((*seed)[4])|Q_B1((*seed)[5])|Q_B2((*seed)[6])|Q_B3((*seed)[7]); |
@@ -114,25 +118,10 @@ DES_LONG des_quad_cksum(const unsigned char *input, des_cblock output[], | |||
114 | } | 118 | } |
115 | if (lp != NULL) | 119 | if (lp != NULL) |
116 | { | 120 | { |
117 | /* I believe I finally have things worked out. | 121 | /* The MIT library assumes that the checksum is |
118 | * The MIT library assumes that the checksum | 122 | * composed of 2*out_count 32 bit ints */ |
119 | * is one huge number and it is returned in a | 123 | *lp++ = z0; |
120 | * host dependant byte order. | 124 | *lp++ = z1; |
121 | */ | ||
122 | static DES_LONG ltmp=1; | ||
123 | static unsigned char *c=(unsigned char *)<mp; | ||
124 | |||
125 | if (c[0]) | ||
126 | { | ||
127 | l2c(z0,lp); | ||
128 | l2c(z1,lp); | ||
129 | } | ||
130 | else | ||
131 | { | ||
132 | lp = &(output[out_count-i-1])[0]; | ||
133 | l2n(z1,lp); | ||
134 | l2n(z0,lp); | ||
135 | } | ||
136 | } | 125 | } |
137 | } | 126 | } |
138 | return(z0); | 127 | return(z0); |
diff --git a/src/lib/libcrypto/des/rand_key.c b/src/lib/libcrypto/des/rand_key.c index 7816a8f25c..ee1a6c274e 100644 --- a/src/lib/libcrypto/des/rand_key.c +++ b/src/lib/libcrypto/des/rand_key.c | |||
@@ -63,7 +63,11 @@ void des_random_seed(des_cblock *key) | |||
63 | 63 | ||
64 | int des_random_key(des_cblock *ret) | 64 | int des_random_key(des_cblock *ret) |
65 | { | 65 | { |
66 | int r = RAND_bytes((unsigned char *)ret, sizeof(des_cblock)); | 66 | do |
67 | { | ||
68 | if (RAND_bytes((unsigned char *)ret, sizeof(des_cblock)) != 1) | ||
69 | return (0); | ||
70 | } while (des_is_weak_key(ret)); | ||
67 | des_set_odd_parity(ret); | 71 | des_set_odd_parity(ret); |
68 | return r; | 72 | return (1); |
69 | } | 73 | } |
diff --git a/src/lib/libcrypto/des/set_key.c b/src/lib/libcrypto/des/set_key.c index bbdc71ba6b..09afd4fc03 100644 --- a/src/lib/libcrypto/des/set_key.c +++ b/src/lib/libcrypto/des/set_key.c | |||
@@ -64,12 +64,27 @@ | |||
64 | * 1.0 First working version | 64 | * 1.0 First working version |
65 | */ | 65 | */ |
66 | #include "des_locl.h" | 66 | #include "des_locl.h" |
67 | #include "podd.h" | ||
68 | #include "sk.h" | ||
69 | 67 | ||
70 | static int check_parity(const_des_cblock *key); | ||
71 | OPENSSL_GLOBAL int des_check_key=0; | 68 | OPENSSL_GLOBAL int des_check_key=0; |
72 | 69 | ||
70 | static const unsigned char odd_parity[256]={ | ||
71 | 1, 1, 2, 2, 4, 4, 7, 7, 8, 8, 11, 11, 13, 13, 14, 14, | ||
72 | 16, 16, 19, 19, 21, 21, 22, 22, 25, 25, 26, 26, 28, 28, 31, 31, | ||
73 | 32, 32, 35, 35, 37, 37, 38, 38, 41, 41, 42, 42, 44, 44, 47, 47, | ||
74 | 49, 49, 50, 50, 52, 52, 55, 55, 56, 56, 59, 59, 61, 61, 62, 62, | ||
75 | 64, 64, 67, 67, 69, 69, 70, 70, 73, 73, 74, 74, 76, 76, 79, 79, | ||
76 | 81, 81, 82, 82, 84, 84, 87, 87, 88, 88, 91, 91, 93, 93, 94, 94, | ||
77 | 97, 97, 98, 98,100,100,103,103,104,104,107,107,109,109,110,110, | ||
78 | 112,112,115,115,117,117,118,118,121,121,122,122,124,124,127,127, | ||
79 | 128,128,131,131,133,133,134,134,137,137,138,138,140,140,143,143, | ||
80 | 145,145,146,146,148,148,151,151,152,152,155,155,157,157,158,158, | ||
81 | 161,161,162,162,164,164,167,167,168,168,171,171,173,173,174,174, | ||
82 | 176,176,179,179,181,181,182,182,185,185,186,186,188,188,191,191, | ||
83 | 193,193,194,194,196,196,199,199,200,200,203,203,205,205,206,206, | ||
84 | 208,208,211,211,213,213,214,214,217,217,218,218,220,220,223,223, | ||
85 | 224,224,227,227,229,229,230,230,233,233,234,234,236,236,239,239, | ||
86 | 241,241,242,242,244,244,247,247,248,248,251,251,253,253,254,254}; | ||
87 | |||
73 | void des_set_odd_parity(des_cblock *key) | 88 | void des_set_odd_parity(des_cblock *key) |
74 | { | 89 | { |
75 | int i; | 90 | int i; |
@@ -78,7 +93,7 @@ void des_set_odd_parity(des_cblock *key) | |||
78 | (*key)[i]=odd_parity[(*key)[i]]; | 93 | (*key)[i]=odd_parity[(*key)[i]]; |
79 | } | 94 | } |
80 | 95 | ||
81 | static int check_parity(const_des_cblock *key) | 96 | int des_check_key_parity(const_des_cblock *key) |
82 | { | 97 | { |
83 | int i; | 98 | int i; |
84 | 99 | ||
@@ -145,6 +160,153 @@ int des_is_weak_key(const_des_cblock *key) | |||
145 | #define HPERM_OP(a,t,n,m) ((t)=((((a)<<(16-(n)))^(a))&(m)),\ | 160 | #define HPERM_OP(a,t,n,m) ((t)=((((a)<<(16-(n)))^(a))&(m)),\ |
146 | (a)=(a)^(t)^(t>>(16-(n)))) | 161 | (a)=(a)^(t)^(t>>(16-(n)))) |
147 | 162 | ||
163 | static const DES_LONG des_skb[8][64]={ | ||
164 | { | ||
165 | /* for C bits (numbered as per FIPS 46) 1 2 3 4 5 6 */ | ||
166 | 0x00000000L,0x00000010L,0x20000000L,0x20000010L, | ||
167 | 0x00010000L,0x00010010L,0x20010000L,0x20010010L, | ||
168 | 0x00000800L,0x00000810L,0x20000800L,0x20000810L, | ||
169 | 0x00010800L,0x00010810L,0x20010800L,0x20010810L, | ||
170 | 0x00000020L,0x00000030L,0x20000020L,0x20000030L, | ||
171 | 0x00010020L,0x00010030L,0x20010020L,0x20010030L, | ||
172 | 0x00000820L,0x00000830L,0x20000820L,0x20000830L, | ||
173 | 0x00010820L,0x00010830L,0x20010820L,0x20010830L, | ||
174 | 0x00080000L,0x00080010L,0x20080000L,0x20080010L, | ||
175 | 0x00090000L,0x00090010L,0x20090000L,0x20090010L, | ||
176 | 0x00080800L,0x00080810L,0x20080800L,0x20080810L, | ||
177 | 0x00090800L,0x00090810L,0x20090800L,0x20090810L, | ||
178 | 0x00080020L,0x00080030L,0x20080020L,0x20080030L, | ||
179 | 0x00090020L,0x00090030L,0x20090020L,0x20090030L, | ||
180 | 0x00080820L,0x00080830L,0x20080820L,0x20080830L, | ||
181 | 0x00090820L,0x00090830L,0x20090820L,0x20090830L, | ||
182 | },{ | ||
183 | /* for C bits (numbered as per FIPS 46) 7 8 10 11 12 13 */ | ||
184 | 0x00000000L,0x02000000L,0x00002000L,0x02002000L, | ||
185 | 0x00200000L,0x02200000L,0x00202000L,0x02202000L, | ||
186 | 0x00000004L,0x02000004L,0x00002004L,0x02002004L, | ||
187 | 0x00200004L,0x02200004L,0x00202004L,0x02202004L, | ||
188 | 0x00000400L,0x02000400L,0x00002400L,0x02002400L, | ||
189 | 0x00200400L,0x02200400L,0x00202400L,0x02202400L, | ||
190 | 0x00000404L,0x02000404L,0x00002404L,0x02002404L, | ||
191 | 0x00200404L,0x02200404L,0x00202404L,0x02202404L, | ||
192 | 0x10000000L,0x12000000L,0x10002000L,0x12002000L, | ||
193 | 0x10200000L,0x12200000L,0x10202000L,0x12202000L, | ||
194 | 0x10000004L,0x12000004L,0x10002004L,0x12002004L, | ||
195 | 0x10200004L,0x12200004L,0x10202004L,0x12202004L, | ||
196 | 0x10000400L,0x12000400L,0x10002400L,0x12002400L, | ||
197 | 0x10200400L,0x12200400L,0x10202400L,0x12202400L, | ||
198 | 0x10000404L,0x12000404L,0x10002404L,0x12002404L, | ||
199 | 0x10200404L,0x12200404L,0x10202404L,0x12202404L, | ||
200 | },{ | ||
201 | /* for C bits (numbered as per FIPS 46) 14 15 16 17 19 20 */ | ||
202 | 0x00000000L,0x00000001L,0x00040000L,0x00040001L, | ||
203 | 0x01000000L,0x01000001L,0x01040000L,0x01040001L, | ||
204 | 0x00000002L,0x00000003L,0x00040002L,0x00040003L, | ||
205 | 0x01000002L,0x01000003L,0x01040002L,0x01040003L, | ||
206 | 0x00000200L,0x00000201L,0x00040200L,0x00040201L, | ||
207 | 0x01000200L,0x01000201L,0x01040200L,0x01040201L, | ||
208 | 0x00000202L,0x00000203L,0x00040202L,0x00040203L, | ||
209 | 0x01000202L,0x01000203L,0x01040202L,0x01040203L, | ||
210 | 0x08000000L,0x08000001L,0x08040000L,0x08040001L, | ||
211 | 0x09000000L,0x09000001L,0x09040000L,0x09040001L, | ||
212 | 0x08000002L,0x08000003L,0x08040002L,0x08040003L, | ||
213 | 0x09000002L,0x09000003L,0x09040002L,0x09040003L, | ||
214 | 0x08000200L,0x08000201L,0x08040200L,0x08040201L, | ||
215 | 0x09000200L,0x09000201L,0x09040200L,0x09040201L, | ||
216 | 0x08000202L,0x08000203L,0x08040202L,0x08040203L, | ||
217 | 0x09000202L,0x09000203L,0x09040202L,0x09040203L, | ||
218 | },{ | ||
219 | /* for C bits (numbered as per FIPS 46) 21 23 24 26 27 28 */ | ||
220 | 0x00000000L,0x00100000L,0x00000100L,0x00100100L, | ||
221 | 0x00000008L,0x00100008L,0x00000108L,0x00100108L, | ||
222 | 0x00001000L,0x00101000L,0x00001100L,0x00101100L, | ||
223 | 0x00001008L,0x00101008L,0x00001108L,0x00101108L, | ||
224 | 0x04000000L,0x04100000L,0x04000100L,0x04100100L, | ||
225 | 0x04000008L,0x04100008L,0x04000108L,0x04100108L, | ||
226 | 0x04001000L,0x04101000L,0x04001100L,0x04101100L, | ||
227 | 0x04001008L,0x04101008L,0x04001108L,0x04101108L, | ||
228 | 0x00020000L,0x00120000L,0x00020100L,0x00120100L, | ||
229 | 0x00020008L,0x00120008L,0x00020108L,0x00120108L, | ||
230 | 0x00021000L,0x00121000L,0x00021100L,0x00121100L, | ||
231 | 0x00021008L,0x00121008L,0x00021108L,0x00121108L, | ||
232 | 0x04020000L,0x04120000L,0x04020100L,0x04120100L, | ||
233 | 0x04020008L,0x04120008L,0x04020108L,0x04120108L, | ||
234 | 0x04021000L,0x04121000L,0x04021100L,0x04121100L, | ||
235 | 0x04021008L,0x04121008L,0x04021108L,0x04121108L, | ||
236 | },{ | ||
237 | /* for D bits (numbered as per FIPS 46) 1 2 3 4 5 6 */ | ||
238 | 0x00000000L,0x10000000L,0x00010000L,0x10010000L, | ||
239 | 0x00000004L,0x10000004L,0x00010004L,0x10010004L, | ||
240 | 0x20000000L,0x30000000L,0x20010000L,0x30010000L, | ||
241 | 0x20000004L,0x30000004L,0x20010004L,0x30010004L, | ||
242 | 0x00100000L,0x10100000L,0x00110000L,0x10110000L, | ||
243 | 0x00100004L,0x10100004L,0x00110004L,0x10110004L, | ||
244 | 0x20100000L,0x30100000L,0x20110000L,0x30110000L, | ||
245 | 0x20100004L,0x30100004L,0x20110004L,0x30110004L, | ||
246 | 0x00001000L,0x10001000L,0x00011000L,0x10011000L, | ||
247 | 0x00001004L,0x10001004L,0x00011004L,0x10011004L, | ||
248 | 0x20001000L,0x30001000L,0x20011000L,0x30011000L, | ||
249 | 0x20001004L,0x30001004L,0x20011004L,0x30011004L, | ||
250 | 0x00101000L,0x10101000L,0x00111000L,0x10111000L, | ||
251 | 0x00101004L,0x10101004L,0x00111004L,0x10111004L, | ||
252 | 0x20101000L,0x30101000L,0x20111000L,0x30111000L, | ||
253 | 0x20101004L,0x30101004L,0x20111004L,0x30111004L, | ||
254 | },{ | ||
255 | /* for D bits (numbered as per FIPS 46) 8 9 11 12 13 14 */ | ||
256 | 0x00000000L,0x08000000L,0x00000008L,0x08000008L, | ||
257 | 0x00000400L,0x08000400L,0x00000408L,0x08000408L, | ||
258 | 0x00020000L,0x08020000L,0x00020008L,0x08020008L, | ||
259 | 0x00020400L,0x08020400L,0x00020408L,0x08020408L, | ||
260 | 0x00000001L,0x08000001L,0x00000009L,0x08000009L, | ||
261 | 0x00000401L,0x08000401L,0x00000409L,0x08000409L, | ||
262 | 0x00020001L,0x08020001L,0x00020009L,0x08020009L, | ||
263 | 0x00020401L,0x08020401L,0x00020409L,0x08020409L, | ||
264 | 0x02000000L,0x0A000000L,0x02000008L,0x0A000008L, | ||
265 | 0x02000400L,0x0A000400L,0x02000408L,0x0A000408L, | ||
266 | 0x02020000L,0x0A020000L,0x02020008L,0x0A020008L, | ||
267 | 0x02020400L,0x0A020400L,0x02020408L,0x0A020408L, | ||
268 | 0x02000001L,0x0A000001L,0x02000009L,0x0A000009L, | ||
269 | 0x02000401L,0x0A000401L,0x02000409L,0x0A000409L, | ||
270 | 0x02020001L,0x0A020001L,0x02020009L,0x0A020009L, | ||
271 | 0x02020401L,0x0A020401L,0x02020409L,0x0A020409L, | ||
272 | },{ | ||
273 | /* for D bits (numbered as per FIPS 46) 16 17 18 19 20 21 */ | ||
274 | 0x00000000L,0x00000100L,0x00080000L,0x00080100L, | ||
275 | 0x01000000L,0x01000100L,0x01080000L,0x01080100L, | ||
276 | 0x00000010L,0x00000110L,0x00080010L,0x00080110L, | ||
277 | 0x01000010L,0x01000110L,0x01080010L,0x01080110L, | ||
278 | 0x00200000L,0x00200100L,0x00280000L,0x00280100L, | ||
279 | 0x01200000L,0x01200100L,0x01280000L,0x01280100L, | ||
280 | 0x00200010L,0x00200110L,0x00280010L,0x00280110L, | ||
281 | 0x01200010L,0x01200110L,0x01280010L,0x01280110L, | ||
282 | 0x00000200L,0x00000300L,0x00080200L,0x00080300L, | ||
283 | 0x01000200L,0x01000300L,0x01080200L,0x01080300L, | ||
284 | 0x00000210L,0x00000310L,0x00080210L,0x00080310L, | ||
285 | 0x01000210L,0x01000310L,0x01080210L,0x01080310L, | ||
286 | 0x00200200L,0x00200300L,0x00280200L,0x00280300L, | ||
287 | 0x01200200L,0x01200300L,0x01280200L,0x01280300L, | ||
288 | 0x00200210L,0x00200310L,0x00280210L,0x00280310L, | ||
289 | 0x01200210L,0x01200310L,0x01280210L,0x01280310L, | ||
290 | },{ | ||
291 | /* for D bits (numbered as per FIPS 46) 22 23 24 25 27 28 */ | ||
292 | 0x00000000L,0x04000000L,0x00040000L,0x04040000L, | ||
293 | 0x00000002L,0x04000002L,0x00040002L,0x04040002L, | ||
294 | 0x00002000L,0x04002000L,0x00042000L,0x04042000L, | ||
295 | 0x00002002L,0x04002002L,0x00042002L,0x04042002L, | ||
296 | 0x00000020L,0x04000020L,0x00040020L,0x04040020L, | ||
297 | 0x00000022L,0x04000022L,0x00040022L,0x04040022L, | ||
298 | 0x00002020L,0x04002020L,0x00042020L,0x04042020L, | ||
299 | 0x00002022L,0x04002022L,0x00042022L,0x04042022L, | ||
300 | 0x00000800L,0x04000800L,0x00040800L,0x04040800L, | ||
301 | 0x00000802L,0x04000802L,0x00040802L,0x04040802L, | ||
302 | 0x00002800L,0x04002800L,0x00042800L,0x04042800L, | ||
303 | 0x00002802L,0x04002802L,0x00042802L,0x04042802L, | ||
304 | 0x00000820L,0x04000820L,0x00040820L,0x04040820L, | ||
305 | 0x00000822L,0x04000822L,0x00040822L,0x04040822L, | ||
306 | 0x00002820L,0x04002820L,0x00042820L,0x04042820L, | ||
307 | 0x00002822L,0x04002822L,0x00042822L,0x04042822L, | ||
308 | }}; | ||
309 | |||
148 | int des_set_key(const_des_cblock *key, des_key_schedule schedule) | 310 | int des_set_key(const_des_cblock *key, des_key_schedule schedule) |
149 | { | 311 | { |
150 | if (des_check_key) | 312 | if (des_check_key) |
@@ -164,7 +326,7 @@ int des_set_key(const_des_cblock *key, des_key_schedule schedule) | |||
164 | */ | 326 | */ |
165 | int des_set_key_checked(const_des_cblock *key, des_key_schedule schedule) | 327 | int des_set_key_checked(const_des_cblock *key, des_key_schedule schedule) |
166 | { | 328 | { |
167 | if (!check_parity(key)) | 329 | if (!des_check_key_parity(key)) |
168 | return(-1); | 330 | return(-1); |
169 | if (des_is_weak_key(key)) | 331 | if (des_is_weak_key(key)) |
170 | return(-2); | 332 | return(-2); |
@@ -186,20 +348,7 @@ void des_set_key_unchecked(const_des_cblock *key, des_key_schedule schedule) | |||
186 | c2l(in,c); | 348 | c2l(in,c); |
187 | c2l(in,d); | 349 | c2l(in,d); |
188 | 350 | ||
189 | /* do PC1 in 60 simple operations */ | 351 | /* do PC1 in 47 simple operations :-) |
190 | /* PERM_OP(d,c,t,4,0x0f0f0f0fL); | ||
191 | HPERM_OP(c,t,-2, 0xcccc0000L); | ||
192 | HPERM_OP(c,t,-1, 0xaaaa0000L); | ||
193 | HPERM_OP(c,t, 8, 0x00ff0000L); | ||
194 | HPERM_OP(c,t,-1, 0xaaaa0000L); | ||
195 | HPERM_OP(d,t,-8, 0xff000000L); | ||
196 | HPERM_OP(d,t, 8, 0x00ff0000L); | ||
197 | HPERM_OP(d,t, 2, 0x33330000L); | ||
198 | d=((d&0x00aa00aaL)<<7L)|((d&0x55005500L)>>7L)|(d&0xaa55aa55L); | ||
199 | d=(d>>8)|((c&0xf0000000L)>>4); | ||
200 | c&=0x0fffffffL; */ | ||
201 | |||
202 | /* I now do it in 47 simple operations :-) | ||
203 | * Thanks to John Fletcher (john_fletcher@lccmail.ocf.llnl.gov) | 352 | * Thanks to John Fletcher (john_fletcher@lccmail.ocf.llnl.gov) |
204 | * for the inspiration. :-) */ | 353 | * for the inspiration. :-) */ |
205 | PERM_OP (d,c,t,4,0x0f0f0f0fL); | 354 | PERM_OP (d,c,t,4,0x0f0f0f0fL); |
@@ -223,9 +372,9 @@ void des_set_key_unchecked(const_des_cblock *key, des_key_schedule schedule) | |||
223 | /* could be a few less shifts but I am to lazy at this | 372 | /* could be a few less shifts but I am to lazy at this |
224 | * point in time to investigate */ | 373 | * point in time to investigate */ |
225 | s= des_skb[0][ (c )&0x3f ]| | 374 | s= des_skb[0][ (c )&0x3f ]| |
226 | des_skb[1][((c>> 6)&0x03)|((c>> 7L)&0x3c)]| | 375 | des_skb[1][((c>> 6L)&0x03)|((c>> 7L)&0x3c)]| |
227 | des_skb[2][((c>>13)&0x0f)|((c>>14L)&0x30)]| | 376 | des_skb[2][((c>>13L)&0x0f)|((c>>14L)&0x30)]| |
228 | des_skb[3][((c>>20)&0x01)|((c>>21L)&0x06) | | 377 | des_skb[3][((c>>20L)&0x01)|((c>>21L)&0x06) | |
229 | ((c>>22L)&0x38)]; | 378 | ((c>>22L)&0x38)]; |
230 | t= des_skb[4][ (d )&0x3f ]| | 379 | t= des_skb[4][ (d )&0x3f ]| |
231 | des_skb[5][((d>> 7L)&0x03)|((d>> 8L)&0x3c)]| | 380 | des_skb[5][((d>> 7L)&0x03)|((d>> 8L)&0x3c)]| |
@@ -245,3 +394,9 @@ int des_key_sched(const_des_cblock *key, des_key_schedule schedule) | |||
245 | { | 394 | { |
246 | return(des_set_key(key,schedule)); | 395 | return(des_set_key(key,schedule)); |
247 | } | 396 | } |
397 | |||
398 | #undef des_fixup_key_parity | ||
399 | void des_fixup_key_parity(des_cblock *key) | ||
400 | { | ||
401 | des_set_odd_parity(key); | ||
402 | } | ||
diff --git a/src/lib/libcrypto/des/shifts.pl b/src/lib/libcrypto/des/shifts.pl index ba686d8ef5..e69de29bb2 100644 --- a/src/lib/libcrypto/des/shifts.pl +++ b/src/lib/libcrypto/des/shifts.pl | |||
@@ -1,198 +0,0 @@ | |||
1 | #!/usr/local/bin/perl | ||
2 | |||
3 | sub lab_shift | ||
4 | { | ||
5 | local(*a,$n)=@_; | ||
6 | local(@r,$i,$j,$k,$d,@z); | ||
7 | |||
8 | @r=&shift(*a,$n); | ||
9 | foreach $i (0 .. 31) | ||
10 | { | ||
11 | @z=split(/\^/,$r[$i]); | ||
12 | for ($j=0; $j <= $#z; $j++) | ||
13 | { | ||
14 | ($d)=($z[$j] =~ /^(..)/); | ||
15 | ($k)=($z[$j] =~ /\[(.*)\]$/); | ||
16 | $k.=",$n" if ($k ne ""); | ||
17 | $k="$n" if ($k eq ""); | ||
18 | $d="$d[$k]"; | ||
19 | $z[$j]=$d; | ||
20 | } | ||
21 | $r[$i]=join('^',@z); | ||
22 | } | ||
23 | return(@r); | ||
24 | } | ||
25 | |||
26 | sub shift | ||
27 | { | ||
28 | local(*a,$n)=@_; | ||
29 | local(@f); | ||
30 | |||
31 | if ($n > 0) | ||
32 | { | ||
33 | @f=&shiftl(*a,$n); | ||
34 | } | ||
35 | else | ||
36 | { | ||
37 | @f=&shiftr(*a,-$n); | ||
38 | } | ||
39 | return(@f); | ||
40 | } | ||
41 | |||
42 | sub rotate | ||
43 | { | ||
44 | local(*a,$n)=@_; | ||
45 | local(@f); | ||
46 | |||
47 | if ($n > 0) | ||
48 | { @f=&rotatel(*a,$n); } | ||
49 | else | ||
50 | { @f=&rotater(*a,-$n); } | ||
51 | return(@f); | ||
52 | } | ||
53 | |||
54 | sub rotater | ||
55 | { | ||
56 | local(*a,$n)=@_; | ||
57 | local(@f,@g); | ||
58 | |||
59 | @f=&shiftr(*a,$n); | ||
60 | @g=&shiftl(*a,32-$n); | ||
61 | $#f=31; | ||
62 | $#g=31; | ||
63 | return(&or(*f,*g)); | ||
64 | } | ||
65 | |||
66 | sub rotatel | ||
67 | { | ||
68 | local(*a,$n)=@_; | ||
69 | local(@f,@g); | ||
70 | |||
71 | @f=&shiftl(*a,$n); | ||
72 | @g=&shiftr(*a,32-$n); | ||
73 | $#f=31; | ||
74 | $#g=31; | ||
75 | return(&or(*f,*g)); | ||
76 | } | ||
77 | |||
78 | sub shiftr | ||
79 | { | ||
80 | local(*a,$n)=@_; | ||
81 | local(@r,$i); | ||
82 | |||
83 | $#r=31; | ||
84 | foreach $i (0 .. 31) | ||
85 | { | ||
86 | if (($i+$n) > 31) | ||
87 | { | ||
88 | $r[$i]="--"; | ||
89 | } | ||
90 | else | ||
91 | { | ||
92 | $r[$i]=$a[$i+$n]; | ||
93 | } | ||
94 | } | ||
95 | return(@r); | ||
96 | } | ||
97 | |||
98 | sub shiftl | ||
99 | { | ||
100 | local(*a,$n)=@_; | ||
101 | local(@r,$i); | ||
102 | |||
103 | $#r=31; | ||
104 | foreach $i (0 .. 31) | ||
105 | { | ||
106 | if ($i < $n) | ||
107 | { | ||
108 | $r[$i]="--"; | ||
109 | } | ||
110 | else | ||
111 | { | ||
112 | $r[$i]=$a[$i-$n]; | ||
113 | } | ||
114 | } | ||
115 | return(@r); | ||
116 | } | ||
117 | |||
118 | sub printit | ||
119 | { | ||
120 | local(@a)=@_; | ||
121 | local($i); | ||
122 | |||
123 | foreach $i (0 .. 31) | ||
124 | { | ||
125 | printf "%2s ",$a[$i]; | ||
126 | print "\n" if (($i%8) == 7); | ||
127 | } | ||
128 | print "\n"; | ||
129 | } | ||
130 | |||
131 | sub xor | ||
132 | { | ||
133 | local(*a,*b)=@_; | ||
134 | local(@r,$i); | ||
135 | |||
136 | $#r=31; | ||
137 | foreach $i (0 .. 31) | ||
138 | { | ||
139 | $r[$i]=&compress($a[$i].'^'.$b[$i]); | ||
140 | # $r[$i]=$a[$i]."^".$b[$i]; | ||
141 | } | ||
142 | return(@r); | ||
143 | } | ||
144 | |||
145 | sub and | ||
146 | { | ||
147 | local(*a,$m)=@_; | ||
148 | local(@r,$i); | ||
149 | |||
150 | $#r=31; | ||
151 | foreach $i (0 .. 31) | ||
152 | { | ||
153 | $r[$i]=(($m & (1<<$i))?($a[$i]):('--')); | ||
154 | } | ||
155 | return(@r); | ||
156 | } | ||
157 | |||
158 | sub or | ||
159 | { | ||
160 | local(*a,*b)=@_; | ||
161 | local(@r,$i); | ||
162 | |||
163 | $#r=31; | ||
164 | foreach $i (0 .. 31) | ||
165 | { | ||
166 | $r[$i]='--' if (($a[$i] eq '--') && ($b[$i] eq '--')); | ||
167 | $r[$i]=$a[$i] if (($a[$i] ne '--') && ($b[$i] eq '--')); | ||
168 | $r[$i]=$b[$i] if (($a[$i] eq '--') && ($b[$i] ne '--')); | ||
169 | $r[$i]='++' if (($a[$i] ne '--') && ($b[$i] ne '--')); | ||
170 | } | ||
171 | return(@r); | ||
172 | } | ||
173 | |||
174 | sub compress | ||
175 | { | ||
176 | local($s)=@_; | ||
177 | local($_,$i,@a,%a,$r); | ||
178 | |||
179 | $s =~ s/\^\^/\^/g; | ||
180 | $s =~ s/^\^//; | ||
181 | $s =~ s/\^$//; | ||
182 | @a=split(/\^/,$s); | ||
183 | |||
184 | while ($#a >= 0) | ||
185 | { | ||
186 | $_=shift(@a); | ||
187 | next unless /\d/; | ||
188 | $a{$_}++; | ||
189 | } | ||
190 | foreach $i (sort keys %a) | ||
191 | { | ||
192 | next if ($a{$i}%2 == 0); | ||
193 | $r.="$i^"; | ||
194 | } | ||
195 | chop($r); | ||
196 | return($r); | ||
197 | } | ||
198 | 1; | ||
diff --git a/src/lib/libcrypto/des/sk.h b/src/lib/libcrypto/des/sk.h index f2ade88c7c..e69de29bb2 100644 --- a/src/lib/libcrypto/des/sk.h +++ b/src/lib/libcrypto/des/sk.h | |||
@@ -1,204 +0,0 @@ | |||
1 | /* crypto/des/sk.h */ | ||
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
3 | * All rights reserved. | ||
4 | * | ||
5 | * This package is an SSL implementation written | ||
6 | * by Eric Young (eay@cryptsoft.com). | ||
7 | * The implementation was written so as to conform with Netscapes SSL. | ||
8 | * | ||
9 | * This library is free for commercial and non-commercial use as long as | ||
10 | * the following conditions are aheared to. The following conditions | ||
11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
13 | * included with this distribution is covered by the same copyright terms | ||
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
15 | * | ||
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
17 | * the code are not to be removed. | ||
18 | * If this package is used in a product, Eric Young should be given attribution | ||
19 | * as the author of the parts of the library used. | ||
20 | * This can be in the form of a textual message at program startup or | ||
21 | * in documentation (online or textual) provided with the package. | ||
22 | * | ||
23 | * Redistribution and use in source and binary forms, with or without | ||
24 | * modification, are permitted provided that the following conditions | ||
25 | * are met: | ||
26 | * 1. Redistributions of source code must retain the copyright | ||
27 | * notice, this list of conditions and the following disclaimer. | ||
28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
29 | * notice, this list of conditions and the following disclaimer in the | ||
30 | * documentation and/or other materials provided with the distribution. | ||
31 | * 3. All advertising materials mentioning features or use of this software | ||
32 | * must display the following acknowledgement: | ||
33 | * "This product includes cryptographic software written by | ||
34 | * Eric Young (eay@cryptsoft.com)" | ||
35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
36 | * being used are not cryptographic related :-). | ||
37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
38 | * the apps directory (application code) you must include an acknowledgement: | ||
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
40 | * | ||
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
51 | * SUCH DAMAGE. | ||
52 | * | ||
53 | * The licence and distribution terms for any publically available version or | ||
54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
55 | * copied and put under another distribution licence | ||
56 | * [including the GNU Public Licence.] | ||
57 | */ | ||
58 | |||
59 | static const DES_LONG des_skb[8][64]={ | ||
60 | { | ||
61 | /* for C bits (numbered as per FIPS 46) 1 2 3 4 5 6 */ | ||
62 | 0x00000000L,0x00000010L,0x20000000L,0x20000010L, | ||
63 | 0x00010000L,0x00010010L,0x20010000L,0x20010010L, | ||
64 | 0x00000800L,0x00000810L,0x20000800L,0x20000810L, | ||
65 | 0x00010800L,0x00010810L,0x20010800L,0x20010810L, | ||
66 | 0x00000020L,0x00000030L,0x20000020L,0x20000030L, | ||
67 | 0x00010020L,0x00010030L,0x20010020L,0x20010030L, | ||
68 | 0x00000820L,0x00000830L,0x20000820L,0x20000830L, | ||
69 | 0x00010820L,0x00010830L,0x20010820L,0x20010830L, | ||
70 | 0x00080000L,0x00080010L,0x20080000L,0x20080010L, | ||
71 | 0x00090000L,0x00090010L,0x20090000L,0x20090010L, | ||
72 | 0x00080800L,0x00080810L,0x20080800L,0x20080810L, | ||
73 | 0x00090800L,0x00090810L,0x20090800L,0x20090810L, | ||
74 | 0x00080020L,0x00080030L,0x20080020L,0x20080030L, | ||
75 | 0x00090020L,0x00090030L,0x20090020L,0x20090030L, | ||
76 | 0x00080820L,0x00080830L,0x20080820L,0x20080830L, | ||
77 | 0x00090820L,0x00090830L,0x20090820L,0x20090830L, | ||
78 | },{ | ||
79 | /* for C bits (numbered as per FIPS 46) 7 8 10 11 12 13 */ | ||
80 | 0x00000000L,0x02000000L,0x00002000L,0x02002000L, | ||
81 | 0x00200000L,0x02200000L,0x00202000L,0x02202000L, | ||
82 | 0x00000004L,0x02000004L,0x00002004L,0x02002004L, | ||
83 | 0x00200004L,0x02200004L,0x00202004L,0x02202004L, | ||
84 | 0x00000400L,0x02000400L,0x00002400L,0x02002400L, | ||
85 | 0x00200400L,0x02200400L,0x00202400L,0x02202400L, | ||
86 | 0x00000404L,0x02000404L,0x00002404L,0x02002404L, | ||
87 | 0x00200404L,0x02200404L,0x00202404L,0x02202404L, | ||
88 | 0x10000000L,0x12000000L,0x10002000L,0x12002000L, | ||
89 | 0x10200000L,0x12200000L,0x10202000L,0x12202000L, | ||
90 | 0x10000004L,0x12000004L,0x10002004L,0x12002004L, | ||
91 | 0x10200004L,0x12200004L,0x10202004L,0x12202004L, | ||
92 | 0x10000400L,0x12000400L,0x10002400L,0x12002400L, | ||
93 | 0x10200400L,0x12200400L,0x10202400L,0x12202400L, | ||
94 | 0x10000404L,0x12000404L,0x10002404L,0x12002404L, | ||
95 | 0x10200404L,0x12200404L,0x10202404L,0x12202404L, | ||
96 | },{ | ||
97 | /* for C bits (numbered as per FIPS 46) 14 15 16 17 19 20 */ | ||
98 | 0x00000000L,0x00000001L,0x00040000L,0x00040001L, | ||
99 | 0x01000000L,0x01000001L,0x01040000L,0x01040001L, | ||
100 | 0x00000002L,0x00000003L,0x00040002L,0x00040003L, | ||
101 | 0x01000002L,0x01000003L,0x01040002L,0x01040003L, | ||
102 | 0x00000200L,0x00000201L,0x00040200L,0x00040201L, | ||
103 | 0x01000200L,0x01000201L,0x01040200L,0x01040201L, | ||
104 | 0x00000202L,0x00000203L,0x00040202L,0x00040203L, | ||
105 | 0x01000202L,0x01000203L,0x01040202L,0x01040203L, | ||
106 | 0x08000000L,0x08000001L,0x08040000L,0x08040001L, | ||
107 | 0x09000000L,0x09000001L,0x09040000L,0x09040001L, | ||
108 | 0x08000002L,0x08000003L,0x08040002L,0x08040003L, | ||
109 | 0x09000002L,0x09000003L,0x09040002L,0x09040003L, | ||
110 | 0x08000200L,0x08000201L,0x08040200L,0x08040201L, | ||
111 | 0x09000200L,0x09000201L,0x09040200L,0x09040201L, | ||
112 | 0x08000202L,0x08000203L,0x08040202L,0x08040203L, | ||
113 | 0x09000202L,0x09000203L,0x09040202L,0x09040203L, | ||
114 | },{ | ||
115 | /* for C bits (numbered as per FIPS 46) 21 23 24 26 27 28 */ | ||
116 | 0x00000000L,0x00100000L,0x00000100L,0x00100100L, | ||
117 | 0x00000008L,0x00100008L,0x00000108L,0x00100108L, | ||
118 | 0x00001000L,0x00101000L,0x00001100L,0x00101100L, | ||
119 | 0x00001008L,0x00101008L,0x00001108L,0x00101108L, | ||
120 | 0x04000000L,0x04100000L,0x04000100L,0x04100100L, | ||
121 | 0x04000008L,0x04100008L,0x04000108L,0x04100108L, | ||
122 | 0x04001000L,0x04101000L,0x04001100L,0x04101100L, | ||
123 | 0x04001008L,0x04101008L,0x04001108L,0x04101108L, | ||
124 | 0x00020000L,0x00120000L,0x00020100L,0x00120100L, | ||
125 | 0x00020008L,0x00120008L,0x00020108L,0x00120108L, | ||
126 | 0x00021000L,0x00121000L,0x00021100L,0x00121100L, | ||
127 | 0x00021008L,0x00121008L,0x00021108L,0x00121108L, | ||
128 | 0x04020000L,0x04120000L,0x04020100L,0x04120100L, | ||
129 | 0x04020008L,0x04120008L,0x04020108L,0x04120108L, | ||
130 | 0x04021000L,0x04121000L,0x04021100L,0x04121100L, | ||
131 | 0x04021008L,0x04121008L,0x04021108L,0x04121108L, | ||
132 | },{ | ||
133 | /* for D bits (numbered as per FIPS 46) 1 2 3 4 5 6 */ | ||
134 | 0x00000000L,0x10000000L,0x00010000L,0x10010000L, | ||
135 | 0x00000004L,0x10000004L,0x00010004L,0x10010004L, | ||
136 | 0x20000000L,0x30000000L,0x20010000L,0x30010000L, | ||
137 | 0x20000004L,0x30000004L,0x20010004L,0x30010004L, | ||
138 | 0x00100000L,0x10100000L,0x00110000L,0x10110000L, | ||
139 | 0x00100004L,0x10100004L,0x00110004L,0x10110004L, | ||
140 | 0x20100000L,0x30100000L,0x20110000L,0x30110000L, | ||
141 | 0x20100004L,0x30100004L,0x20110004L,0x30110004L, | ||
142 | 0x00001000L,0x10001000L,0x00011000L,0x10011000L, | ||
143 | 0x00001004L,0x10001004L,0x00011004L,0x10011004L, | ||
144 | 0x20001000L,0x30001000L,0x20011000L,0x30011000L, | ||
145 | 0x20001004L,0x30001004L,0x20011004L,0x30011004L, | ||
146 | 0x00101000L,0x10101000L,0x00111000L,0x10111000L, | ||
147 | 0x00101004L,0x10101004L,0x00111004L,0x10111004L, | ||
148 | 0x20101000L,0x30101000L,0x20111000L,0x30111000L, | ||
149 | 0x20101004L,0x30101004L,0x20111004L,0x30111004L, | ||
150 | },{ | ||
151 | /* for D bits (numbered as per FIPS 46) 8 9 11 12 13 14 */ | ||
152 | 0x00000000L,0x08000000L,0x00000008L,0x08000008L, | ||
153 | 0x00000400L,0x08000400L,0x00000408L,0x08000408L, | ||
154 | 0x00020000L,0x08020000L,0x00020008L,0x08020008L, | ||
155 | 0x00020400L,0x08020400L,0x00020408L,0x08020408L, | ||
156 | 0x00000001L,0x08000001L,0x00000009L,0x08000009L, | ||
157 | 0x00000401L,0x08000401L,0x00000409L,0x08000409L, | ||
158 | 0x00020001L,0x08020001L,0x00020009L,0x08020009L, | ||
159 | 0x00020401L,0x08020401L,0x00020409L,0x08020409L, | ||
160 | 0x02000000L,0x0A000000L,0x02000008L,0x0A000008L, | ||
161 | 0x02000400L,0x0A000400L,0x02000408L,0x0A000408L, | ||
162 | 0x02020000L,0x0A020000L,0x02020008L,0x0A020008L, | ||
163 | 0x02020400L,0x0A020400L,0x02020408L,0x0A020408L, | ||
164 | 0x02000001L,0x0A000001L,0x02000009L,0x0A000009L, | ||
165 | 0x02000401L,0x0A000401L,0x02000409L,0x0A000409L, | ||
166 | 0x02020001L,0x0A020001L,0x02020009L,0x0A020009L, | ||
167 | 0x02020401L,0x0A020401L,0x02020409L,0x0A020409L, | ||
168 | },{ | ||
169 | /* for D bits (numbered as per FIPS 46) 16 17 18 19 20 21 */ | ||
170 | 0x00000000L,0x00000100L,0x00080000L,0x00080100L, | ||
171 | 0x01000000L,0x01000100L,0x01080000L,0x01080100L, | ||
172 | 0x00000010L,0x00000110L,0x00080010L,0x00080110L, | ||
173 | 0x01000010L,0x01000110L,0x01080010L,0x01080110L, | ||
174 | 0x00200000L,0x00200100L,0x00280000L,0x00280100L, | ||
175 | 0x01200000L,0x01200100L,0x01280000L,0x01280100L, | ||
176 | 0x00200010L,0x00200110L,0x00280010L,0x00280110L, | ||
177 | 0x01200010L,0x01200110L,0x01280010L,0x01280110L, | ||
178 | 0x00000200L,0x00000300L,0x00080200L,0x00080300L, | ||
179 | 0x01000200L,0x01000300L,0x01080200L,0x01080300L, | ||
180 | 0x00000210L,0x00000310L,0x00080210L,0x00080310L, | ||
181 | 0x01000210L,0x01000310L,0x01080210L,0x01080310L, | ||
182 | 0x00200200L,0x00200300L,0x00280200L,0x00280300L, | ||
183 | 0x01200200L,0x01200300L,0x01280200L,0x01280300L, | ||
184 | 0x00200210L,0x00200310L,0x00280210L,0x00280310L, | ||
185 | 0x01200210L,0x01200310L,0x01280210L,0x01280310L, | ||
186 | },{ | ||
187 | /* for D bits (numbered as per FIPS 46) 22 23 24 25 27 28 */ | ||
188 | 0x00000000L,0x04000000L,0x00040000L,0x04040000L, | ||
189 | 0x00000002L,0x04000002L,0x00040002L,0x04040002L, | ||
190 | 0x00002000L,0x04002000L,0x00042000L,0x04042000L, | ||
191 | 0x00002002L,0x04002002L,0x00042002L,0x04042002L, | ||
192 | 0x00000020L,0x04000020L,0x00040020L,0x04040020L, | ||
193 | 0x00000022L,0x04000022L,0x00040022L,0x04040022L, | ||
194 | 0x00002020L,0x04002020L,0x00042020L,0x04042020L, | ||
195 | 0x00002022L,0x04002022L,0x00042022L,0x04042022L, | ||
196 | 0x00000800L,0x04000800L,0x00040800L,0x04040800L, | ||
197 | 0x00000802L,0x04000802L,0x00040802L,0x04040802L, | ||
198 | 0x00002800L,0x04002800L,0x00042800L,0x04042800L, | ||
199 | 0x00002802L,0x04002802L,0x00042802L,0x04042802L, | ||
200 | 0x00000820L,0x04000820L,0x00040820L,0x04040820L, | ||
201 | 0x00000822L,0x04000822L,0x00040822L,0x04040822L, | ||
202 | 0x00002820L,0x04002820L,0x00042820L,0x04042820L, | ||
203 | 0x00002822L,0x04002822L,0x00042822L,0x04042822L, | ||
204 | }}; | ||
diff --git a/src/lib/libcrypto/des/testdes.pl b/src/lib/libcrypto/des/testdes.pl index 01a165a963..e69de29bb2 100644 --- a/src/lib/libcrypto/des/testdes.pl +++ b/src/lib/libcrypto/des/testdes.pl | |||
@@ -1,167 +0,0 @@ | |||
1 | #!/usr/local/bin/perl | ||
2 | |||
3 | # des.pl tesing code | ||
4 | |||
5 | require 'des.pl'; | ||
6 | |||
7 | $num_tests=34; | ||
8 | @key_data=( | ||
9 | 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, | ||
10 | 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, | ||
11 | 0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00, | ||
12 | 0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11, | ||
13 | 0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF, | ||
14 | 0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11, | ||
15 | 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, | ||
16 | 0xFE,0xDC,0xBA,0x98,0x76,0x54,0x32,0x10, | ||
17 | 0x7C,0xA1,0x10,0x45,0x4A,0x1A,0x6E,0x57, | ||
18 | 0x01,0x31,0xD9,0x61,0x9D,0xC1,0x37,0x6E, | ||
19 | 0x07,0xA1,0x13,0x3E,0x4A,0x0B,0x26,0x86, | ||
20 | 0x38,0x49,0x67,0x4C,0x26,0x02,0x31,0x9E, | ||
21 | 0x04,0xB9,0x15,0xBA,0x43,0xFE,0xB5,0xB6, | ||
22 | 0x01,0x13,0xB9,0x70,0xFD,0x34,0xF2,0xCE, | ||
23 | 0x01,0x70,0xF1,0x75,0x46,0x8F,0xB5,0xE6, | ||
24 | 0x43,0x29,0x7F,0xAD,0x38,0xE3,0x73,0xFE, | ||
25 | 0x07,0xA7,0x13,0x70,0x45,0xDA,0x2A,0x16, | ||
26 | 0x04,0x68,0x91,0x04,0xC2,0xFD,0x3B,0x2F, | ||
27 | 0x37,0xD0,0x6B,0xB5,0x16,0xCB,0x75,0x46, | ||
28 | 0x1F,0x08,0x26,0x0D,0x1A,0xC2,0x46,0x5E, | ||
29 | 0x58,0x40,0x23,0x64,0x1A,0xBA,0x61,0x76, | ||
30 | 0x02,0x58,0x16,0x16,0x46,0x29,0xB0,0x07, | ||
31 | 0x49,0x79,0x3E,0xBC,0x79,0xB3,0x25,0x8F, | ||
32 | 0x4F,0xB0,0x5E,0x15,0x15,0xAB,0x73,0xA7, | ||
33 | 0x49,0xE9,0x5D,0x6D,0x4C,0xA2,0x29,0xBF, | ||
34 | 0x01,0x83,0x10,0xDC,0x40,0x9B,0x26,0xD6, | ||
35 | 0x1C,0x58,0x7F,0x1C,0x13,0x92,0x4F,0xEF, | ||
36 | 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, | ||
37 | 0x1F,0x1F,0x1F,0x1F,0x0E,0x0E,0x0E,0x0E, | ||
38 | 0xE0,0xFE,0xE0,0xFE,0xF1,0xFE,0xF1,0xFE, | ||
39 | 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, | ||
40 | 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, | ||
41 | 0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF, | ||
42 | 0xFE,0xDC,0xBA,0x98,0x76,0x54,0x32,0x10, | ||
43 | ); | ||
44 | |||
45 | @plain_data=( | ||
46 | 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, | ||
47 | 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, | ||
48 | 0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x01, | ||
49 | 0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11, | ||
50 | 0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11, | ||
51 | 0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF, | ||
52 | 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, | ||
53 | 0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF, | ||
54 | 0x01,0xA1,0xD6,0xD0,0x39,0x77,0x67,0x42, | ||
55 | 0x5C,0xD5,0x4C,0xA8,0x3D,0xEF,0x57,0xDA, | ||
56 | 0x02,0x48,0xD4,0x38,0x06,0xF6,0x71,0x72, | ||
57 | 0x51,0x45,0x4B,0x58,0x2D,0xDF,0x44,0x0A, | ||
58 | 0x42,0xFD,0x44,0x30,0x59,0x57,0x7F,0xA2, | ||
59 | 0x05,0x9B,0x5E,0x08,0x51,0xCF,0x14,0x3A, | ||
60 | 0x07,0x56,0xD8,0xE0,0x77,0x47,0x61,0xD2, | ||
61 | 0x76,0x25,0x14,0xB8,0x29,0xBF,0x48,0x6A, | ||
62 | 0x3B,0xDD,0x11,0x90,0x49,0x37,0x28,0x02, | ||
63 | 0x26,0x95,0x5F,0x68,0x35,0xAF,0x60,0x9A, | ||
64 | 0x16,0x4D,0x5E,0x40,0x4F,0x27,0x52,0x32, | ||
65 | 0x6B,0x05,0x6E,0x18,0x75,0x9F,0x5C,0xCA, | ||
66 | 0x00,0x4B,0xD6,0xEF,0x09,0x17,0x60,0x62, | ||
67 | 0x48,0x0D,0x39,0x00,0x6E,0xE7,0x62,0xF2, | ||
68 | 0x43,0x75,0x40,0xC8,0x69,0x8F,0x3C,0xFA, | ||
69 | 0x07,0x2D,0x43,0xA0,0x77,0x07,0x52,0x92, | ||
70 | 0x02,0xFE,0x55,0x77,0x81,0x17,0xF1,0x2A, | ||
71 | 0x1D,0x9D,0x5C,0x50,0x18,0xF7,0x28,0xC2, | ||
72 | 0x30,0x55,0x32,0x28,0x6D,0x6F,0x29,0x5A, | ||
73 | 0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF, | ||
74 | 0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF, | ||
75 | 0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF, | ||
76 | 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, | ||
77 | 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, | ||
78 | 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, | ||
79 | 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF); | ||
80 | |||
81 | @cipher_data=( | ||
82 | 0x8C,0xA6,0x4D,0xE9,0xC1,0xB1,0x23,0xA7, | ||
83 | 0x73,0x59,0xB2,0x16,0x3E,0x4E,0xDC,0x58, | ||
84 | 0x95,0x8E,0x6E,0x62,0x7A,0x05,0x55,0x7B, | ||
85 | 0xF4,0x03,0x79,0xAB,0x9E,0x0E,0xC5,0x33, | ||
86 | 0x17,0x66,0x8D,0xFC,0x72,0x92,0x53,0x2D, | ||
87 | 0x8A,0x5A,0xE1,0xF8,0x1A,0xB8,0xF2,0xDD, | ||
88 | 0x8C,0xA6,0x4D,0xE9,0xC1,0xB1,0x23,0xA7, | ||
89 | 0xED,0x39,0xD9,0x50,0xFA,0x74,0xBC,0xC4, | ||
90 | 0x69,0x0F,0x5B,0x0D,0x9A,0x26,0x93,0x9B, | ||
91 | 0x7A,0x38,0x9D,0x10,0x35,0x4B,0xD2,0x71, | ||
92 | 0x86,0x8E,0xBB,0x51,0xCA,0xB4,0x59,0x9A, | ||
93 | 0x71,0x78,0x87,0x6E,0x01,0xF1,0x9B,0x2A, | ||
94 | 0xAF,0x37,0xFB,0x42,0x1F,0x8C,0x40,0x95, | ||
95 | 0x86,0xA5,0x60,0xF1,0x0E,0xC6,0xD8,0x5B, | ||
96 | 0x0C,0xD3,0xDA,0x02,0x00,0x21,0xDC,0x09, | ||
97 | 0xEA,0x67,0x6B,0x2C,0xB7,0xDB,0x2B,0x7A, | ||
98 | 0xDF,0xD6,0x4A,0x81,0x5C,0xAF,0x1A,0x0F, | ||
99 | 0x5C,0x51,0x3C,0x9C,0x48,0x86,0xC0,0x88, | ||
100 | 0x0A,0x2A,0xEE,0xAE,0x3F,0xF4,0xAB,0x77, | ||
101 | 0xEF,0x1B,0xF0,0x3E,0x5D,0xFA,0x57,0x5A, | ||
102 | 0x88,0xBF,0x0D,0xB6,0xD7,0x0D,0xEE,0x56, | ||
103 | 0xA1,0xF9,0x91,0x55,0x41,0x02,0x0B,0x56, | ||
104 | 0x6F,0xBF,0x1C,0xAF,0xCF,0xFD,0x05,0x56, | ||
105 | 0x2F,0x22,0xE4,0x9B,0xAB,0x7C,0xA1,0xAC, | ||
106 | 0x5A,0x6B,0x61,0x2C,0xC2,0x6C,0xCE,0x4A, | ||
107 | 0x5F,0x4C,0x03,0x8E,0xD1,0x2B,0x2E,0x41, | ||
108 | 0x63,0xFA,0xC0,0xD0,0x34,0xD9,0xF7,0x93, | ||
109 | 0x61,0x7B,0x3A,0x0C,0xE8,0xF0,0x71,0x00, | ||
110 | 0xDB,0x95,0x86,0x05,0xF8,0xC8,0xC6,0x06, | ||
111 | 0xED,0xBF,0xD1,0xC6,0x6C,0x29,0xCC,0xC7, | ||
112 | 0x35,0x55,0x50,0xB2,0x15,0x0E,0x24,0x51, | ||
113 | 0xCA,0xAA,0xAF,0x4D,0xEA,0xF1,0xDB,0xAE, | ||
114 | 0xD5,0xD4,0x4F,0xF7,0x20,0x68,0x3D,0x0D, | ||
115 | 0x2A,0x2B,0xB0,0x08,0xDF,0x97,0xC2,0xF2); | ||
116 | |||
117 | print "Doing ecb tests\n"; | ||
118 | for ($i=0; $i<$num_tests; $i++) | ||
119 | { | ||
120 | printf "Doing test $i\n"; | ||
121 | $key =pack("C8",splice(@key_data ,0,8)); | ||
122 | $data=pack("C8",splice(@plain_data ,0,8)); | ||
123 | $res =pack("C8",splice(@cipher_data,0,8)); | ||
124 | |||
125 | @ks= &des_set_key($key); | ||
126 | $out1= &des_ecb_encrypt(*ks,1,$data); | ||
127 | $out2= &des_ecb_encrypt(*ks,0,$out1); | ||
128 | $out3= &des_ecb_encrypt(*ks,0,$res); | ||
129 | &eprint("encryption failure",$res,$out1) | ||
130 | if ($out1 ne $res); | ||
131 | &eprint("encryption/decryption failure",$data,$out2) | ||
132 | if ($out2 ne $data); | ||
133 | &eprint("decryption failure",$data,$out3) | ||
134 | if ($data ne $out3); | ||
135 | } | ||
136 | print "Done\n"; | ||
137 | |||
138 | print "doing speed test over 30 seconds\n"; | ||
139 | $SIG{'ALRM'}='done'; | ||
140 | sub done {$done=1;} | ||
141 | $done=0; | ||
142 | |||
143 | $count=0; | ||
144 | $d=pack("C8",0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef); | ||
145 | @ks= &des_set_key($d); | ||
146 | alarm(30); | ||
147 | $start=(times)[0]; | ||
148 | while (!$done) | ||
149 | { | ||
150 | $count++; | ||
151 | $d=&des_ecb_encrypt(*ks,1,$d); | ||
152 | } | ||
153 | $end=(times)[0]; | ||
154 | $t=$end-$start; | ||
155 | printf "$count DESs in %.2f seconds is %.2f DESs/sec or %.2f bytes/sec\n", | ||
156 | 1.0*$t,1.0*$count/$t,$count*8.0/$t; | ||
157 | |||
158 | sub eprint | ||
159 | { | ||
160 | local($s,$c,$e)=@_; | ||
161 | local(@k); | ||
162 | |||
163 | @k=unpack("C8",$c); | ||
164 | printf "%02x%02x%02x%02x %02x%02x%02x%02x - ",unpack("C8",$c); | ||
165 | printf "%02x%02x%02x%02x %02x%02x%02x%02x :",unpack("C8",$e); | ||
166 | print " $s\n"; | ||
167 | } | ||
diff --git a/src/lib/libcrypto/dh/dh_err.c b/src/lib/libcrypto/dh/dh_err.c index 0348bd24a2..ff2d1684c2 100644 --- a/src/lib/libcrypto/dh/dh_err.c +++ b/src/lib/libcrypto/dh/dh_err.c | |||
@@ -54,7 +54,8 @@ | |||
54 | */ | 54 | */ |
55 | 55 | ||
56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes |
57 | * made to it will be overwritten when the script next updates this file. | 57 | * made to it will be overwritten when the script next updates this file, |
58 | * only reason strings will be preserved. | ||
58 | */ | 59 | */ |
59 | 60 | ||
60 | #include <stdio.h> | 61 | #include <stdio.h> |
diff --git a/src/lib/libcrypto/doc/DH_set_method.pod b/src/lib/libcrypto/doc/DH_set_method.pod index dca41d8dbc..a8f75bdd9d 100644 --- a/src/lib/libcrypto/doc/DH_set_method.pod +++ b/src/lib/libcrypto/doc/DH_set_method.pod | |||
@@ -56,7 +56,7 @@ the default method is used. | |||
56 | /* compute shared secret */ | 56 | /* compute shared secret */ |
57 | int (*compute_key)(unsigned char *key, BIGNUM *pub_key, DH *dh); | 57 | int (*compute_key)(unsigned char *key, BIGNUM *pub_key, DH *dh); |
58 | 58 | ||
59 | /* compute r = a ^ p mod m. May be NULL */ | 59 | /* compute r = a ^ p mod m (May be NULL for some implementations) */ |
60 | int (*bn_mod_exp)(DH *dh, BIGNUM *r, BIGNUM *a, const BIGNUM *p, | 60 | int (*bn_mod_exp)(DH *dh, BIGNUM *r, BIGNUM *a, const BIGNUM *p, |
61 | const BIGNUM *m, BN_CTX *ctx, | 61 | const BIGNUM *m, BN_CTX *ctx, |
62 | BN_MONT_CTX *m_ctx); | 62 | BN_MONT_CTX *m_ctx); |
diff --git a/src/lib/libcrypto/doc/DSA_set_method.pod b/src/lib/libcrypto/doc/DSA_set_method.pod index 0b13ec9237..edec46413d 100644 --- a/src/lib/libcrypto/doc/DSA_set_method.pod +++ b/src/lib/libcrypto/doc/DSA_set_method.pod | |||
@@ -62,12 +62,13 @@ struct | |||
62 | int (*dsa_do_verify)(const unsigned char *dgst, int dgst_len, | 62 | int (*dsa_do_verify)(const unsigned char *dgst, int dgst_len, |
63 | DSA_SIG *sig, DSA *dsa); | 63 | DSA_SIG *sig, DSA *dsa); |
64 | 64 | ||
65 | /* compute rr = a1^p1 * a2^p2 mod m. May be NULL */ | 65 | /* compute rr = a1^p1 * a2^p2 mod m (May be NULL for some |
66 | implementations) */ | ||
66 | int (*dsa_mod_exp)(DSA *dsa, BIGNUM *rr, BIGNUM *a1, BIGNUM *p1, | 67 | int (*dsa_mod_exp)(DSA *dsa, BIGNUM *rr, BIGNUM *a1, BIGNUM *p1, |
67 | BIGNUM *a2, BIGNUM *p2, BIGNUM *m, | 68 | BIGNUM *a2, BIGNUM *p2, BIGNUM *m, |
68 | BN_CTX *ctx, BN_MONT_CTX *in_mont); | 69 | BN_CTX *ctx, BN_MONT_CTX *in_mont); |
69 | 70 | ||
70 | /* compute r = a ^ p mod m. May be NULL */ | 71 | /* compute r = a ^ p mod m (May be NULL for some implementations) */ |
71 | int (*bn_mod_exp)(DSA *dsa, BIGNUM *r, BIGNUM *a, | 72 | int (*bn_mod_exp)(DSA *dsa, BIGNUM *r, BIGNUM *a, |
72 | const BIGNUM *p, const BIGNUM *m, | 73 | const BIGNUM *p, const BIGNUM *m, |
73 | BN_CTX *ctx, BN_MONT_CTX *m_ctx); | 74 | BN_CTX *ctx, BN_MONT_CTX *m_ctx); |
diff --git a/src/lib/libcrypto/doc/EVP_OpenInit.pod b/src/lib/libcrypto/doc/EVP_OpenInit.pod new file mode 100644 index 0000000000..9707a4b399 --- /dev/null +++ b/src/lib/libcrypto/doc/EVP_OpenInit.pod | |||
@@ -0,0 +1,51 @@ | |||
1 | =pod | ||
2 | |||
3 | =head1 NAME | ||
4 | |||
5 | EVP_OpenInit, EVP_OpenUpdate, EVP_OpenFinal - EVP envelope decryption | ||
6 | |||
7 | =head1 SYNOPSIS | ||
8 | |||
9 | #include <openssl/evp.h> | ||
10 | |||
11 | int EVP_OpenInit(EVP_CIPHER_CTX *ctx,EVP_CIPHER *type,unsigned char *ek, | ||
12 | int ekl,unsigned char *iv,EVP_PKEY *priv); | ||
13 | void EVP_OpenUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, | ||
14 | int *outl, unsigned char *in, int inl); | ||
15 | void EVP_OpenFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, | ||
16 | int *outl); | ||
17 | |||
18 | =head1 DESCRIPTION | ||
19 | |||
20 | The EVP envelope routines are a high level interface to envelope | ||
21 | decryption. They decrypt a public key encrypted symmetric key and | ||
22 | then decrypt data using it. | ||
23 | |||
24 | EVP_OpenInit() initialises a cipher context B<ctx> for decryption | ||
25 | with cipher B<type>. It decrypts the encrypted symmetric key of length | ||
26 | B<ekl> bytes passed in the B<ek> parameter using the private key B<priv>. | ||
27 | The IV is supplied in the B<iv> parameter. | ||
28 | |||
29 | EVP_OpenUpdate() and EVP_OpenFinal() have exactly the same properties | ||
30 | as the EVP_DecryptUpdate() and EVP_DecryptFinal() routines, as | ||
31 | documented on the L<EVP_EncryptInit(3)|EVP_EncryptInit(3)> manual | ||
32 | page. | ||
33 | |||
34 | =head1 RETURN VALUES | ||
35 | |||
36 | EVP_OpenInit() returns -1 on error or an non zero integer (actually the | ||
37 | recovered secret key size) if successful. | ||
38 | |||
39 | EVP_SealUpdate() does not return a value. | ||
40 | |||
41 | EVP_SealFinal() returns 0 if the decrypt failed or 1 for success. | ||
42 | |||
43 | =head1 SEE ALSO | ||
44 | |||
45 | L<evp(3)|evp(3)>,L<rand(3)|rand(3)> | ||
46 | L<EVP_EncryptInit(3)|EVP_EncryptInit(3)>, | ||
47 | L<EVP_SealInit(3)|EVP_SealInit(3)> | ||
48 | |||
49 | =head1 HISTORY | ||
50 | |||
51 | =cut | ||
diff --git a/src/lib/libcrypto/doc/EVP_SealInit.pod b/src/lib/libcrypto/doc/EVP_SealInit.pod new file mode 100644 index 0000000000..1579d110fa --- /dev/null +++ b/src/lib/libcrypto/doc/EVP_SealInit.pod | |||
@@ -0,0 +1,70 @@ | |||
1 | =pod | ||
2 | |||
3 | =head1 NAME | ||
4 | |||
5 | EVP_SealInit, EVP_SealUpdate, EVP_SealFinal - EVP envelope encryption | ||
6 | |||
7 | =head1 SYNOPSIS | ||
8 | |||
9 | #include <openssl/evp.h> | ||
10 | |||
11 | int EVP_SealInit(EVP_CIPHER_CTX *ctx, EVP_CIPHER *type, unsigned char **ek, | ||
12 | int *ekl, unsigned char *iv,EVP_PKEY **pubk, int npubk); | ||
13 | void EVP_SealUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, | ||
14 | int *outl, unsigned char *in, int inl); | ||
15 | void EVP_SealFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, | ||
16 | int *outl); | ||
17 | |||
18 | =head1 DESCRIPTION | ||
19 | |||
20 | The EVP envelope routines are a high level interface to envelope | ||
21 | encryption. They generate a random key and then "envelope" it by | ||
22 | using public key encryption. Data can then be encrypted using this | ||
23 | key. | ||
24 | |||
25 | EVP_SealInit() initialises a cipher context B<ctx> for encryption | ||
26 | with cipher B<type> using a random secret key and IV supplied in | ||
27 | the B<iv> parameter. B<type> is normally supplied by a function such | ||
28 | as EVP_des_cbc(). The secret key is encrypted using one or more public | ||
29 | keys, this allows the same encrypted data to be decrypted using any | ||
30 | of the corresponding private keys. B<ek> is an array of buffers where | ||
31 | the public key encrypted secret key will be written, each buffer must | ||
32 | contain enough room for the corresponding encrypted key: that is | ||
33 | B<ek[i]> must have room for B<EVP_PKEY_size(pubk[i])> bytes. The actual | ||
34 | size of each encrypted secret key is written to the array B<ekl>. B<pubk> is | ||
35 | an array of B<npubk> public keys. | ||
36 | |||
37 | EVP_SealUpdate() and EVP_SealFinal() have exactly the same properties | ||
38 | as the EVP_EncryptUpdate() and EVP_EncryptFinal() routines, as | ||
39 | documented on the L<EVP_EncryptInit(3)|EVP_EncryptInit(3)> manual | ||
40 | page. | ||
41 | |||
42 | =head1 RETURN VALUES | ||
43 | |||
44 | EVP_SealInit() returns -1 on error or B<npubk> if successful. | ||
45 | |||
46 | EVP_SealUpdate() and EVP_SealFinal() do not return values. | ||
47 | |||
48 | =head1 NOTES | ||
49 | |||
50 | Because a random secret key is generated the random number generator | ||
51 | must be seeded before calling EVP_SealInit(). | ||
52 | |||
53 | The public key must be RSA because it is the only OpenSSL public key | ||
54 | algorithm that supports key transport. | ||
55 | |||
56 | Envelope encryption is the usual method of using public key encryption | ||
57 | on large amounts of data, this is because public key encryption is slow | ||
58 | but symmetric encryption is fast. So symmetric encryption is used for | ||
59 | bulk encryption and the small random symmetric key used is transferred | ||
60 | using public key encryption. | ||
61 | |||
62 | =head1 SEE ALSO | ||
63 | |||
64 | L<evp(3)|evp(3)>,L<rand(3)|rand(3)> | ||
65 | L<EVP_EncryptInit(3)|EVP_EncryptInit(3)>, | ||
66 | L<EVP_OpenInit(3)|EVP_OpenInit(3)> | ||
67 | |||
68 | =head1 HISTORY | ||
69 | |||
70 | =cut | ||
diff --git a/src/lib/libcrypto/doc/EVP_SignInit.pod b/src/lib/libcrypto/doc/EVP_SignInit.pod new file mode 100644 index 0000000000..bbc9203c9c --- /dev/null +++ b/src/lib/libcrypto/doc/EVP_SignInit.pod | |||
@@ -0,0 +1,85 @@ | |||
1 | =pod | ||
2 | |||
3 | =head1 NAME | ||
4 | |||
5 | EVP_SignInit, EVP_SignUpdate, EVP_SignFinal - EVP signing functions | ||
6 | |||
7 | =head1 SYNOPSIS | ||
8 | |||
9 | #include <openssl/evp.h> | ||
10 | |||
11 | void EVP_SignInit(EVP_MD_CTX *ctx, const EVP_MD *type); | ||
12 | void EVP_SignUpdate(EVP_MD_CTX *ctx, const void *d, unsigned int cnt); | ||
13 | int EVP_SignFinal(EVP_MD_CTX *ctx,unsigned char *sig,unsigned int *s, EVP_PKEY *pkey); | ||
14 | |||
15 | int EVP_PKEY_size(EVP_PKEY *pkey); | ||
16 | |||
17 | =head1 DESCRIPTION | ||
18 | |||
19 | The EVP signature routines are a high level interface to digital | ||
20 | signatures. | ||
21 | |||
22 | EVP_SignInit() initialises a signing context B<ctx> to using digest | ||
23 | B<type>: this will typically be supplied by a function such as | ||
24 | EVP_sha1(). | ||
25 | |||
26 | EVP_SignUpdate() hashes B<cnt> bytes of data at B<d> into the | ||
27 | signature context B<ctx>. This funtion can be called several times on the | ||
28 | same B<ctx> to include additional data. | ||
29 | |||
30 | EVP_SignFinal() signs the data in B<ctx> using the private key B<pkey> | ||
31 | and places the signature in B<sig>. If the B<s> parameter is not NULL | ||
32 | then the number of bytes of data written (i.e. the length of the signature) | ||
33 | will be written to the integer at B<s>, at most EVP_PKEY_size(pkey) bytes | ||
34 | will be written. After calling EVP_SignFinal() no additional calls to | ||
35 | EVP_SignUpdate() can be made, but EVP_SignInit() can be called to initialiase | ||
36 | a new signature operation. | ||
37 | |||
38 | EVP_PKEY_size() returns the maximum size of a signature in bytes. The actual | ||
39 | signature returned by EVP_SignFinal() may be smaller. | ||
40 | |||
41 | =head1 RETURN VALUES | ||
42 | |||
43 | EVP_SignInit() and EVP_SignUpdate() do not return values. | ||
44 | |||
45 | EVP_SignFinal() returns 1 for success and 0 for failure. | ||
46 | |||
47 | EVP_PKEY_size() returns the maximum size of a signature in bytes. | ||
48 | |||
49 | The error codes can be obtained by L<ERR_get_error(3)|ERR_get_error(3)>. | ||
50 | |||
51 | =head1 NOTES | ||
52 | |||
53 | The B<EVP> interface to digital signatures should almost always be used in | ||
54 | preference to the low level interfaces. This is because the code then becomes | ||
55 | transparent to the algorithm used and much more flexible. | ||
56 | |||
57 | Due to the link between message digests and public key algorithms the correct | ||
58 | digest algorithm must be used with the correct public key type. A list of | ||
59 | algorithms and associated public key algorithms appears in | ||
60 | L<EVP_DigestInit(3)|EVP_DigestInit(3)>. | ||
61 | |||
62 | When signing with DSA private keys the random number generator must be seeded | ||
63 | or the operation will fail. The random number generator does not need to be | ||
64 | seeded for RSA signatures. | ||
65 | |||
66 | =head1 BUGS | ||
67 | |||
68 | Several of the functions do not return values: maybe they should. Although the | ||
69 | internal digest operations will never fail some future hardware based operations | ||
70 | might. | ||
71 | |||
72 | =head1 SEE ALSO | ||
73 | |||
74 | L<EVP_VerifyInit(3)|EVP_VerifyInit(3)>, | ||
75 | L<EVP_DigestInit(3)|EVP_DigestInit(3)>, L<err(3)|err(3)>, | ||
76 | L<evp(3)|evp(3)>, L<hmac(3)|hmac(3)>, L<md2(3)|md2(3)>, | ||
77 | L<md5(3)|md5(3)>, L<mdc2(3)|mdc2(3)>, L<ripemd(3)|ripemd(3)>, | ||
78 | L<sha(3)|sha(3)>, L<digest(1)|digest(1)> | ||
79 | |||
80 | =head1 HISTORY | ||
81 | |||
82 | EVP_SignInit(), EVP_SignUpdate() and EVP_SignFinal() are | ||
83 | available in all versions of SSLeay and OpenSSL. | ||
84 | |||
85 | =cut | ||
diff --git a/src/lib/libcrypto/doc/EVP_VerifyInit.pod b/src/lib/libcrypto/doc/EVP_VerifyInit.pod new file mode 100644 index 0000000000..3b5e07f4ad --- /dev/null +++ b/src/lib/libcrypto/doc/EVP_VerifyInit.pod | |||
@@ -0,0 +1,71 @@ | |||
1 | =pod | ||
2 | |||
3 | =head1 NAME | ||
4 | |||
5 | EVP_VerifyInit, EVP_VerifyUpdate, EVP_VerifyFinal - EVP signature verification functions | ||
6 | |||
7 | =head1 SYNOPSIS | ||
8 | |||
9 | #include <openssl/evp.h> | ||
10 | |||
11 | void EVP_VerifyInit(EVP_MD_CTX *ctx, const EVP_MD *type); | ||
12 | void EVP_VerifyUpdate(EVP_MD_CTX *ctx, const void *d, unsigned int cnt); | ||
13 | int EVP_VerifyFinal(EVP_MD_CTX *ctx,unsigned char *sigbuf, unsigned int siglen,EVP_PKEY *pkey); | ||
14 | |||
15 | =head1 DESCRIPTION | ||
16 | |||
17 | The EVP signature verification routines are a high level interface to digital | ||
18 | signatures. | ||
19 | |||
20 | EVP_VerifyInit() initialises a verification context B<ctx> to using digest | ||
21 | B<type>: this will typically be supplied by a function such as EVP_sha1(). | ||
22 | |||
23 | EVP_VerifyUpdate() hashes B<cnt> bytes of data at B<d> into the | ||
24 | verification context B<ctx>. This funtion can be called several times on the | ||
25 | same B<ctx> to include additional data. | ||
26 | |||
27 | EVP_VerifyFinal() verifies the data in B<ctx> using the public key B<pkey> | ||
28 | and against the B<siglen> bytes at B<sigbuf>. After calling EVP_VerifyFinal() | ||
29 | no additional calls to EVP_VerifyUpdate() can be made, but EVP_VerifyInit() | ||
30 | can be called to initialiase a new verification operation. | ||
31 | |||
32 | =head1 RETURN VALUES | ||
33 | |||
34 | EVP_VerifyInit() and EVP_VerifyUpdate() do not return values. | ||
35 | |||
36 | EVP_VerifyFinal() returns 1 for a correct signature, 0 for failure and -1 if some | ||
37 | other error occurred. | ||
38 | |||
39 | The error codes can be obtained by L<ERR_get_error(3)|ERR_get_error(3)>. | ||
40 | |||
41 | =head1 NOTES | ||
42 | |||
43 | The B<EVP> interface to digital signatures should almost always be used in | ||
44 | preference to the low level interfaces. This is because the code then becomes | ||
45 | transparent to the algorithm used and much more flexible. | ||
46 | |||
47 | Due to the link between message digests and public key algorithms the correct | ||
48 | digest algorithm must be used with the correct public key type. A list of | ||
49 | algorithms and associated public key algorithms appears in | ||
50 | L<EVP_DigestInit(3)|EVP_DigestInit(3)>. | ||
51 | |||
52 | =head1 BUGS | ||
53 | |||
54 | Several of the functions do not return values: maybe they should. Although the | ||
55 | internal digest operations will never fail some future hardware based operations | ||
56 | might. | ||
57 | |||
58 | =head1 SEE ALSO | ||
59 | |||
60 | L<EVP_SignInit(3)|EVP_SignInit(3)>, | ||
61 | L<EVP_DigestInit(3)|EVP_DigestInit(3)>, L<err(3)|err(3)>, | ||
62 | L<evp(3)|evp(3)>, L<hmac(3)|hmac(3)>, L<md2(3)|md2(3)>, | ||
63 | L<md5(3)|md5(3)>, L<mdc2(3)|mdc2(3)>, L<ripemd(3)|ripemd(3)>, | ||
64 | L<sha(3)|sha(3)>, L<digest(1)|digest(1)> | ||
65 | |||
66 | =head1 HISTORY | ||
67 | |||
68 | EVP_VerifyInit(), EVP_VerifyUpdate() and EVP_VerifyFinal() are | ||
69 | available in all versions of SSLeay and OpenSSL. | ||
70 | |||
71 | =cut | ||
diff --git a/src/lib/libcrypto/doc/RAND_add.pod b/src/lib/libcrypto/doc/RAND_add.pod index 0a13ec2a92..67c66f3e0c 100644 --- a/src/lib/libcrypto/doc/RAND_add.pod +++ b/src/lib/libcrypto/doc/RAND_add.pod | |||
@@ -2,7 +2,8 @@ | |||
2 | 2 | ||
3 | =head1 NAME | 3 | =head1 NAME |
4 | 4 | ||
5 | RAND_add, RAND_seed, RAND_screen - add entropy to the PRNG | 5 | RAND_add, RAND_seed, RAND_status, RAND_event, RAND_screen - add |
6 | entropy to the PRNG | ||
6 | 7 | ||
7 | =head1 SYNOPSIS | 8 | =head1 SYNOPSIS |
8 | 9 | ||
@@ -14,6 +15,7 @@ RAND_add, RAND_seed, RAND_screen - add entropy to the PRNG | |||
14 | 15 | ||
15 | int RAND_status(void); | 16 | int RAND_status(void); |
16 | 17 | ||
18 | int RAND_event(UINT iMsg, WPARAM wParam, LPARAM lParam); | ||
17 | void RAND_screen(void); | 19 | void RAND_screen(void); |
18 | 20 | ||
19 | =head1 DESCRIPTION | 21 | =head1 DESCRIPTION |
@@ -40,17 +42,24 @@ or L<RAND_load_file(3)|RAND_load_file(3)>. | |||
40 | 42 | ||
41 | RAND_seed() is equivalent to RAND_add() when B<num == entropy>. | 43 | RAND_seed() is equivalent to RAND_add() when B<num == entropy>. |
42 | 44 | ||
45 | RAND_event() collects the entropy from Windows events such as mouse | ||
46 | movements and other user interaction. It should be called with the | ||
47 | B<iMsg>, B<wParam> and B<lParam> arguments of I<all> messages sent to | ||
48 | the window procedure. It will estimate the entropy contained in the | ||
49 | event message (if any), and add it to the PRNG. The program can then | ||
50 | process the messages as usual. | ||
51 | |||
43 | The RAND_screen() function is available for the convenience of Windows | 52 | The RAND_screen() function is available for the convenience of Windows |
44 | programmers. It adds the current contents of the screen to the PRNG. | 53 | programmers. It adds the current contents of the screen to the PRNG. |
45 | For applications that can catch Windows events, seeding the PRNG with | 54 | For applications that can catch Windows events, seeding the PRNG by |
46 | the parameters of B<WM_MOUSEMOVE> events is a significantly better | 55 | calling RAND_event() is a significantly better source of |
47 | source of randomness. It should be noted that both methods cannot be | 56 | randomness. It should be noted that both methods cannot be used on |
48 | used on servers that run without user interaction. | 57 | servers that run without user interaction. |
49 | 58 | ||
50 | =head1 RETURN VALUES | 59 | =head1 RETURN VALUES |
51 | 60 | ||
52 | RAND_status() returns 1 if the PRNG has been seeded with enough data, | 61 | RAND_status() and RAND_event() return 1 if the PRNG has been seeded |
53 | 0 otherwise. | 62 | with enough data, 0 otherwise. |
54 | 63 | ||
55 | The other functions do not return values. | 64 | The other functions do not return values. |
56 | 65 | ||
@@ -63,6 +72,6 @@ L<RAND_load_file(3)|RAND_load_file(3)>, L<RAND_cleanup(3)|RAND_cleanup(3)> | |||
63 | 72 | ||
64 | RAND_seed() and RAND_screen() are available in all versions of SSLeay | 73 | RAND_seed() and RAND_screen() are available in all versions of SSLeay |
65 | and OpenSSL. RAND_add() and RAND_status() have been added in OpenSSL | 74 | and OpenSSL. RAND_add() and RAND_status() have been added in OpenSSL |
66 | 0.9.5. | 75 | 0.9.5, RAND_event() in OpenSSL 0.9.5a. |
67 | 76 | ||
68 | =cut | 77 | =cut |
diff --git a/src/lib/libcrypto/doc/RAND_set_rand_method.pod b/src/lib/libcrypto/doc/RAND_set_rand_method.pod index 466e9b8767..464eba416d 100644 --- a/src/lib/libcrypto/doc/RAND_set_rand_method.pod +++ b/src/lib/libcrypto/doc/RAND_set_rand_method.pod | |||
@@ -34,10 +34,12 @@ RAND_get_rand_method() returns a pointer to the current method. | |||
34 | void (*cleanup)(void); | 34 | void (*cleanup)(void); |
35 | void (*add)(const void *buf, int num, int entropy); | 35 | void (*add)(const void *buf, int num, int entropy); |
36 | int (*pseudorand)(unsigned char *buf, int num); | 36 | int (*pseudorand)(unsigned char *buf, int num); |
37 | int (*status)(void); | ||
37 | } RAND_METHOD; | 38 | } RAND_METHOD; |
38 | 39 | ||
39 | The components point to the implementation of RAND_seed(), | 40 | The components point to the implementation of RAND_seed(), |
40 | RAND_bytes(), RAND_cleanup(), RAND_add() and RAND_pseudo_rand(). | 41 | RAND_bytes(), RAND_cleanup(), RAND_add(), RAND_pseudo_rand() |
42 | and RAND_status(). | ||
41 | Each component may be NULL if the function is not implemented. | 43 | Each component may be NULL if the function is not implemented. |
42 | 44 | ||
43 | =head1 RETURN VALUES | 45 | =head1 RETURN VALUES |
diff --git a/src/lib/libcrypto/doc/RSA_set_method.pod b/src/lib/libcrypto/doc/RSA_set_method.pod index deb1183a23..14b0b4cf35 100644 --- a/src/lib/libcrypto/doc/RSA_set_method.pod +++ b/src/lib/libcrypto/doc/RSA_set_method.pod | |||
@@ -87,10 +87,11 @@ the default method is used. | |||
87 | int (*rsa_priv_dec)(int flen, unsigned char *from, | 87 | int (*rsa_priv_dec)(int flen, unsigned char *from, |
88 | unsigned char *to, RSA *rsa, int padding); | 88 | unsigned char *to, RSA *rsa, int padding); |
89 | 89 | ||
90 | /* compute r0 = r0 ^ I mod rsa->n. May be NULL */ | 90 | /* compute r0 = r0 ^ I mod rsa->n (May be NULL for some |
91 | implementations) */ | ||
91 | int (*rsa_mod_exp)(BIGNUM *r0, BIGNUM *I, RSA *rsa); | 92 | int (*rsa_mod_exp)(BIGNUM *r0, BIGNUM *I, RSA *rsa); |
92 | 93 | ||
93 | /* compute r = a ^ p mod m. May be NULL */ | 94 | /* compute r = a ^ p mod m (May be NULL for some implementations) */ |
94 | int (*bn_mod_exp)(BIGNUM *r, BIGNUM *a, const BIGNUM *p, | 95 | int (*bn_mod_exp)(BIGNUM *r, BIGNUM *a, const BIGNUM *p, |
95 | const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx); | 96 | const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx); |
96 | 97 | ||
diff --git a/src/lib/libcrypto/doc/rsa.pod b/src/lib/libcrypto/doc/rsa.pod index 0486c044a6..eb8ba612c4 100644 --- a/src/lib/libcrypto/doc/rsa.pod +++ b/src/lib/libcrypto/doc/rsa.pod | |||
@@ -86,8 +86,9 @@ contain public as well as private RSA keys: | |||
86 | In public keys, the private exponent and the related secret values are | 86 | In public keys, the private exponent and the related secret values are |
87 | B<NULL>. | 87 | B<NULL>. |
88 | 88 | ||
89 | B<dmp1>, B<dmq1> and B<iqmp> may be B<NULL> in private keys, but the | 89 | B<p>, B<q>, B<dmp1>, B<dmq1> and B<iqmp> may be B<NULL> in private |
90 | RSA operations are much faster when these values are available. | 90 | keys, but the RSA operations are much faster when these values are |
91 | available. | ||
91 | 92 | ||
92 | =head1 CONFORMING TO | 93 | =head1 CONFORMING TO |
93 | 94 | ||
diff --git a/src/lib/libcrypto/dsa/dsa_err.c b/src/lib/libcrypto/dsa/dsa_err.c index 38e4af968c..2b3ab3a9ad 100644 --- a/src/lib/libcrypto/dsa/dsa_err.c +++ b/src/lib/libcrypto/dsa/dsa_err.c | |||
@@ -54,7 +54,8 @@ | |||
54 | */ | 54 | */ |
55 | 55 | ||
56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes |
57 | * made to it will be overwritten when the script next updates this file. | 57 | * made to it will be overwritten when the script next updates this file, |
58 | * only reason strings will be preserved. | ||
58 | */ | 59 | */ |
59 | 60 | ||
60 | #include <stdio.h> | 61 | #include <stdio.h> |
diff --git a/src/lib/libcrypto/dsa/dsa_key.c b/src/lib/libcrypto/dsa/dsa_key.c index ab7f38fc7c..5aef2d5fcf 100644 --- a/src/lib/libcrypto/dsa/dsa_key.c +++ b/src/lib/libcrypto/dsa/dsa_key.c | |||
@@ -84,7 +84,8 @@ int DSA_generate_key(DSA *dsa) | |||
84 | i=BN_num_bits(dsa->q); | 84 | i=BN_num_bits(dsa->q); |
85 | for (;;) | 85 | for (;;) |
86 | { | 86 | { |
87 | BN_rand(priv_key,i,1,0); | 87 | if (!BN_rand(priv_key,i,1,0)) |
88 | goto err; | ||
88 | if (BN_cmp(priv_key,dsa->q) >= 0) | 89 | if (BN_cmp(priv_key,dsa->q) >= 0) |
89 | BN_sub(priv_key,priv_key,dsa->q); | 90 | BN_sub(priv_key,priv_key,dsa->q); |
90 | if (!BN_is_zero(priv_key)) break; | 91 | if (!BN_is_zero(priv_key)) break; |
diff --git a/src/lib/libcrypto/err/err.c b/src/lib/libcrypto/err/err.c index 93c64cbc4f..eb8c76aa0b 100644 --- a/src/lib/libcrypto/err/err.c +++ b/src/lib/libcrypto/err/err.c | |||
@@ -55,9 +55,63 @@ | |||
55 | * copied and put under another distribution licence | 55 | * copied and put under another distribution licence |
56 | * [including the GNU Public Licence.] | 56 | * [including the GNU Public Licence.] |
57 | */ | 57 | */ |
58 | /* ==================================================================== | ||
59 | * Copyright (c) 1998-2000 The OpenSSL Project. All rights reserved. | ||
60 | * | ||
61 | * Redistribution and use in source and binary forms, with or without | ||
62 | * modification, are permitted provided that the following conditions | ||
63 | * are met: | ||
64 | * | ||
65 | * 1. Redistributions of source code must retain the above copyright | ||
66 | * notice, this list of conditions and the following disclaimer. | ||
67 | * | ||
68 | * 2. Redistributions in binary form must reproduce the above copyright | ||
69 | * notice, this list of conditions and the following disclaimer in | ||
70 | * the documentation and/or other materials provided with the | ||
71 | * distribution. | ||
72 | * | ||
73 | * 3. All advertising materials mentioning features or use of this | ||
74 | * software must display the following acknowledgment: | ||
75 | * "This product includes software developed by the OpenSSL Project | ||
76 | * for use in the OpenSSL Toolkit. (http://www.openssl.org/)" | ||
77 | * | ||
78 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
79 | * endorse or promote products derived from this software without | ||
80 | * prior written permission. For written permission, please contact | ||
81 | * openssl-core@openssl.org. | ||
82 | * | ||
83 | * 5. Products derived from this software may not be called "OpenSSL" | ||
84 | * nor may "OpenSSL" appear in their names without prior written | ||
85 | * permission of the OpenSSL Project. | ||
86 | * | ||
87 | * 6. Redistributions of any form whatsoever must retain the following | ||
88 | * acknowledgment: | ||
89 | * "This product includes software developed by the OpenSSL Project | ||
90 | * for use in the OpenSSL Toolkit (http://www.openssl.org/)" | ||
91 | * | ||
92 | * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
93 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
94 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
95 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
96 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
97 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
98 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
99 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
100 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
101 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
102 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
103 | * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
104 | * ==================================================================== | ||
105 | * | ||
106 | * This product includes cryptographic software written by Eric Young | ||
107 | * (eay@cryptsoft.com). This product includes software written by Tim | ||
108 | * Hudson (tjh@cryptsoft.com). | ||
109 | * | ||
110 | */ | ||
58 | 111 | ||
59 | #include <stdio.h> | 112 | #include <stdio.h> |
60 | #include <stdarg.h> | 113 | #include <stdarg.h> |
114 | #include <string.h> | ||
61 | #include <openssl/lhash.h> | 115 | #include <openssl/lhash.h> |
62 | #include <openssl/crypto.h> | 116 | #include <openssl/crypto.h> |
63 | #include "cryptlib.h" | 117 | #include "cryptlib.h" |
@@ -154,6 +208,54 @@ static ERR_STRING_DATA ERR_str_reasons[]= | |||
154 | 208 | ||
155 | {0,NULL}, | 209 | {0,NULL}, |
156 | }; | 210 | }; |
211 | |||
212 | |||
213 | #define NUM_SYS_STR_REASONS 127 | ||
214 | #define LEN_SYS_STR_REASON 32 | ||
215 | |||
216 | static ERR_STRING_DATA SYS_str_reasons[NUM_SYS_STR_REASONS + 1]; | ||
217 | /* SYS_str_reasons is filled with copies of strerror() results at | ||
218 | * initialization. | ||
219 | * 'errno' values up to 127 should cover all usual errors, | ||
220 | * others will be displayed numerically by ERR_error_string. | ||
221 | * It is crucial that we have something for each reason code | ||
222 | * that occurs in ERR_str_reasons, or bogus reason strings | ||
223 | * will be returned for SYSerr(), which always gets an errno | ||
224 | * value and never one of those 'standard' reason codes. */ | ||
225 | |||
226 | static void build_SYS_str_reasons() | ||
227 | { | ||
228 | /* Malloc cannot be used here, use static storage instead */ | ||
229 | static char strerror_tab[NUM_SYS_STR_REASONS][LEN_SYS_STR_REASON]; | ||
230 | int i; | ||
231 | |||
232 | CRYPTO_w_lock(CRYPTO_LOCK_ERR_HASH); | ||
233 | |||
234 | for (i = 1; i <= NUM_SYS_STR_REASONS; i++) | ||
235 | { | ||
236 | ERR_STRING_DATA *str = &SYS_str_reasons[i - 1]; | ||
237 | |||
238 | str->error = (unsigned long)i; | ||
239 | if (str->string == NULL) | ||
240 | { | ||
241 | char (*dest)[LEN_SYS_STR_REASON] = &(strerror_tab[i - 1]); | ||
242 | char *src = strerror(i); | ||
243 | if (src != NULL) | ||
244 | { | ||
245 | strncpy(*dest, src, sizeof *dest); | ||
246 | (*dest)[sizeof *dest - 1] = '\0'; | ||
247 | str->string = *dest; | ||
248 | } | ||
249 | } | ||
250 | if (str->string == NULL) | ||
251 | str->string = "unknown"; | ||
252 | } | ||
253 | |||
254 | /* Now we still have SYS_str_reasons[NUM_SYS_STR_REASONS] = {0, NULL}, | ||
255 | * as required by ERR_load_strings. */ | ||
256 | |||
257 | CRYPTO_w_unlock(CRYPTO_LOCK_ERR_HASH); | ||
258 | } | ||
157 | #endif | 259 | #endif |
158 | 260 | ||
159 | #define err_clear_data(p,i) \ | 261 | #define err_clear_data(p,i) \ |
@@ -191,14 +293,16 @@ void ERR_load_ERR_strings(void) | |||
191 | CRYPTO_w_unlock(CRYPTO_LOCK_ERR); | 293 | CRYPTO_w_unlock(CRYPTO_LOCK_ERR); |
192 | return; | 294 | return; |
193 | } | 295 | } |
194 | init=0; | ||
195 | CRYPTO_w_unlock(CRYPTO_LOCK_ERR); | 296 | CRYPTO_w_unlock(CRYPTO_LOCK_ERR); |
196 | 297 | ||
197 | #ifndef NO_ERR | 298 | #ifndef NO_ERR |
198 | ERR_load_strings(0,ERR_str_libraries); | 299 | ERR_load_strings(0,ERR_str_libraries); |
199 | ERR_load_strings(0,ERR_str_reasons); | 300 | ERR_load_strings(0,ERR_str_reasons); |
200 | ERR_load_strings(ERR_LIB_SYS,ERR_str_functs); | 301 | ERR_load_strings(ERR_LIB_SYS,ERR_str_functs); |
302 | build_SYS_str_reasons(); | ||
303 | ERR_load_strings(ERR_LIB_SYS,SYS_str_reasons); | ||
201 | #endif | 304 | #endif |
305 | init=0; | ||
202 | } | 306 | } |
203 | } | 307 | } |
204 | 308 | ||
diff --git a/src/lib/libcrypto/evp/evp_err.c b/src/lib/libcrypto/evp/evp_err.c index 97953a0fc1..fc149cbb1a 100644 --- a/src/lib/libcrypto/evp/evp_err.c +++ b/src/lib/libcrypto/evp/evp_err.c | |||
@@ -54,7 +54,8 @@ | |||
54 | */ | 54 | */ |
55 | 55 | ||
56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes |
57 | * made to it will be overwritten when the script next updates this file. | 57 | * made to it will be overwritten when the script next updates this file, |
58 | * only reason strings will be preserved. | ||
58 | */ | 59 | */ |
59 | 60 | ||
60 | #include <stdio.h> | 61 | #include <stdio.h> |
diff --git a/src/lib/libcrypto/evp/evp_pkey.c b/src/lib/libcrypto/evp/evp_pkey.c index d5e6f5880f..4ab091fa56 100644 --- a/src/lib/libcrypto/evp/evp_pkey.c +++ b/src/lib/libcrypto/evp/evp_pkey.c | |||
@@ -133,7 +133,7 @@ EVP_PKEY *EVP_PKCS82PKEY (PKCS8_PRIV_KEY_INFO *p8) | |||
133 | * SEQUENCE {parameters, priv_key} | 133 | * SEQUENCE {parameters, priv_key} |
134 | * SEQUENCE {pub_key, priv_key} | 134 | * SEQUENCE {pub_key, priv_key} |
135 | */ | 135 | */ |
136 | 136 | ||
137 | t1 = (ASN1_TYPE *)sk_value(ndsa, 0); | 137 | t1 = (ASN1_TYPE *)sk_value(ndsa, 0); |
138 | t2 = (ASN1_TYPE *)sk_value(ndsa, 1); | 138 | t2 = (ASN1_TYPE *)sk_value(ndsa, 1); |
139 | if(t1->type == V_ASN1_SEQUENCE) { | 139 | if(t1->type == V_ASN1_SEQUENCE) { |
@@ -152,7 +152,14 @@ EVP_PKEY *EVP_PKCS82PKEY (PKCS8_PRIV_KEY_INFO *p8) | |||
152 | goto dsaerr; | 152 | goto dsaerr; |
153 | } | 153 | } |
154 | privkey = t2->value.integer; | 154 | privkey = t2->value.integer; |
155 | } else if (!(privkey=d2i_ASN1_INTEGER (NULL, &p, pkeylen))) { | 155 | } else { |
156 | if (!(privkey=d2i_ASN1_INTEGER (NULL, &p, pkeylen))) { | ||
157 | EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_DECODE_ERROR); | ||
158 | goto dsaerr; | ||
159 | } | ||
160 | param = p8->pkeyalg->parameter; | ||
161 | } | ||
162 | if (!param || (param->type != V_ASN1_SEQUENCE)) { | ||
156 | EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_DECODE_ERROR); | 163 | EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_DECODE_ERROR); |
157 | goto dsaerr; | 164 | goto dsaerr; |
158 | } | 165 | } |
@@ -186,7 +193,8 @@ EVP_PKEY *EVP_PKCS82PKEY (PKCS8_PRIV_KEY_INFO *p8) | |||
186 | 193 | ||
187 | EVP_PKEY_assign_DSA(pkey, dsa); | 194 | EVP_PKEY_assign_DSA(pkey, dsa); |
188 | BN_CTX_free (ctx); | 195 | BN_CTX_free (ctx); |
189 | sk_pop_free(ndsa, ASN1_TYPE_free); | 196 | if(ndsa) sk_pop_free(ndsa, ASN1_TYPE_free); |
197 | else ASN1_INTEGER_free(privkey); | ||
190 | break; | 198 | break; |
191 | dsaerr: | 199 | dsaerr: |
192 | BN_CTX_free (ctx); | 200 | BN_CTX_free (ctx); |
diff --git a/src/lib/libcrypto/evp/names.c b/src/lib/libcrypto/evp/names.c index 3e8f460328..620f43feaa 100644 --- a/src/lib/libcrypto/evp/names.c +++ b/src/lib/libcrypto/evp/names.c | |||
@@ -114,5 +114,10 @@ void EVP_cleanup(void) | |||
114 | { | 114 | { |
115 | OBJ_NAME_cleanup(OBJ_NAME_TYPE_CIPHER_METH); | 115 | OBJ_NAME_cleanup(OBJ_NAME_TYPE_CIPHER_METH); |
116 | OBJ_NAME_cleanup(OBJ_NAME_TYPE_MD_METH); | 116 | OBJ_NAME_cleanup(OBJ_NAME_TYPE_MD_METH); |
117 | /* The above calls will only clean out the contents of the name | ||
118 | hash table, but not the hash table itself. The following line | ||
119 | does that part. -- Richard Levitte */ | ||
120 | OBJ_NAME_cleanup(-1); | ||
121 | |||
117 | EVP_PBE_cleanup(); | 122 | EVP_PBE_cleanup(); |
118 | } | 123 | } |
diff --git a/src/lib/libcrypto/hmac/hmac.c b/src/lib/libcrypto/hmac/hmac.c index 23b7c98f8f..e1ec79e093 100644 --- a/src/lib/libcrypto/hmac/hmac.c +++ b/src/lib/libcrypto/hmac/hmac.c | |||
@@ -88,9 +88,11 @@ void HMAC_Init(HMAC_CTX *ctx, const void *key, int len, | |||
88 | else | 88 | else |
89 | { | 89 | { |
90 | memcpy(ctx->key,key,len); | 90 | memcpy(ctx->key,key,len); |
91 | memset(&(ctx->key[len]),0,sizeof(ctx->key)-len); | ||
92 | ctx->key_length=len; | 91 | ctx->key_length=len; |
93 | } | 92 | } |
93 | if(ctx->key_length != HMAC_MAX_MD_CBLOCK) | ||
94 | memset(&ctx->key[ctx->key_length], 0, | ||
95 | HMAC_MAX_MD_CBLOCK - ctx->key_length); | ||
94 | } | 96 | } |
95 | 97 | ||
96 | if (reset) | 98 | if (reset) |
diff --git a/src/lib/libcrypto/lhash/lhash.c b/src/lib/libcrypto/lhash/lhash.c index 6a340a2403..7eb92a18bc 100644 --- a/src/lib/libcrypto/lhash/lhash.c +++ b/src/lib/libcrypto/lhash/lhash.c | |||
@@ -159,7 +159,7 @@ void lh_free(LHASH *lh) | |||
159 | unsigned int i; | 159 | unsigned int i; |
160 | LHASH_NODE *n,*nn; | 160 | LHASH_NODE *n,*nn; |
161 | 161 | ||
162 | if(lh == NULL) | 162 | if (lh == NULL) |
163 | return; | 163 | return; |
164 | 164 | ||
165 | for (i=0; i<lh->num_nodes; i++) | 165 | for (i=0; i<lh->num_nodes; i++) |
@@ -422,21 +422,6 @@ static LHASH_NODE **getrn(LHASH *lh, void *data, unsigned long *rhash) | |||
422 | return(ret); | 422 | return(ret); |
423 | } | 423 | } |
424 | 424 | ||
425 | /* | ||
426 | unsigned long lh_strhash(char *str) | ||
427 | { | ||
428 | int i,l; | ||
429 | unsigned long ret=0; | ||
430 | unsigned short *s; | ||
431 | |||
432 | if (str == NULL) return(0); | ||
433 | l=(strlen(str)+1)/2; | ||
434 | s=(unsigned short *)str; | ||
435 | for (i=0; i<l; i++) | ||
436 | ret^=(s[i]<<(i&0x0f)); | ||
437 | return(ret); | ||
438 | } */ | ||
439 | |||
440 | /* The following hash seems to work very well on normal text strings | 425 | /* The following hash seems to work very well on normal text strings |
441 | * no collisions on /usr/dict/words and it distributes on %2^n quite | 426 | * no collisions on /usr/dict/words and it distributes on %2^n quite |
442 | * well, not as good as MD5, but still good. | 427 | * well, not as good as MD5, but still good. |
@@ -470,3 +455,7 @@ unsigned long lh_strhash(const char *c) | |||
470 | return((ret>>16)^ret); | 455 | return((ret>>16)^ret); |
471 | } | 456 | } |
472 | 457 | ||
458 | unsigned long lh_num_items(LHASH *lh) | ||
459 | { | ||
460 | return lh ? lh->num_items : 0; | ||
461 | } | ||
diff --git a/src/lib/libcrypto/lhash/lhash.h b/src/lib/libcrypto/lhash/lhash.h index 6f6eeb2698..d315fd9c6d 100644 --- a/src/lib/libcrypto/lhash/lhash.h +++ b/src/lib/libcrypto/lhash/lhash.h | |||
@@ -124,6 +124,7 @@ void *lh_retrieve(LHASH *lh, void *data); | |||
124 | void lh_doall(LHASH *lh, void (*func)(/*void *b*/)); | 124 | void lh_doall(LHASH *lh, void (*func)(/*void *b*/)); |
125 | void lh_doall_arg(LHASH *lh, void (*func)(/*void *a,void *b*/),void *arg); | 125 | void lh_doall_arg(LHASH *lh, void (*func)(/*void *a,void *b*/),void *arg); |
126 | unsigned long lh_strhash(const char *c); | 126 | unsigned long lh_strhash(const char *c); |
127 | unsigned long lh_num_items(LHASH *lh); | ||
127 | 128 | ||
128 | #ifndef NO_FP_API | 129 | #ifndef NO_FP_API |
129 | void lh_stats(LHASH *lh, FILE *out); | 130 | void lh_stats(LHASH *lh, FILE *out); |
diff --git a/src/lib/libcrypto/md5/Makefile.ssl b/src/lib/libcrypto/md5/Makefile.ssl index d50f967be7..45fbd04239 100644 --- a/src/lib/libcrypto/md5/Makefile.ssl +++ b/src/lib/libcrypto/md5/Makefile.ssl | |||
@@ -55,7 +55,7 @@ lib: $(LIBOBJ) | |||
55 | 55 | ||
56 | # elf | 56 | # elf |
57 | asm/mx86-elf.o: asm/mx86unix.cpp | 57 | asm/mx86-elf.o: asm/mx86unix.cpp |
58 | $(CPP) -DELF asm/mx86unix.cpp | as -o asm/mx86-elf.o | 58 | $(CPP) -DELF -x c asm/mx86unix.cpp | as -o asm/mx86-elf.o |
59 | 59 | ||
60 | # solaris | 60 | # solaris |
61 | asm/mx86-sol.o: asm/mx86unix.cpp | 61 | asm/mx86-sol.o: asm/mx86unix.cpp |
@@ -71,7 +71,7 @@ asm/mx86-out.o: asm/mx86unix.cpp | |||
71 | asm/mx86bsdi.o: asm/mx86unix.cpp | 71 | asm/mx86bsdi.o: asm/mx86unix.cpp |
72 | $(CPP) -DBSDI asm/mx86unix.cpp | sed 's/ :/:/' | as -o asm/mx86bsdi.o | 72 | $(CPP) -DBSDI asm/mx86unix.cpp | sed 's/ :/:/' | as -o asm/mx86bsdi.o |
73 | 73 | ||
74 | asm/mx86unix.cpp: asm/md5-586.pl | 74 | asm/mx86unix.cpp: asm/md5-586.pl ../perlasm/x86asm.pl |
75 | (cd asm; $(PERL) md5-586.pl cpp >mx86unix.cpp) | 75 | (cd asm; $(PERL) md5-586.pl cpp >mx86unix.cpp) |
76 | 76 | ||
77 | asm/md5-sparcv8plus.o: asm/md5-sparcv9.S | 77 | asm/md5-sparcv8plus.o: asm/md5-sparcv9.S |
diff --git a/src/lib/libcrypto/md5/Makefile.uni b/src/lib/libcrypto/md5/Makefile.uni index d21c72f3ea..e69de29bb2 100644 --- a/src/lib/libcrypto/md5/Makefile.uni +++ b/src/lib/libcrypto/md5/Makefile.uni | |||
@@ -1,110 +0,0 @@ | |||
1 | # Targets | ||
2 | # make - twidle the options yourself :-) | ||
3 | # make cc - standard cc options | ||
4 | # make gcc - standard gcc options | ||
5 | # make x86-elf - linux-elf etc | ||
6 | # make x86-out - linux-a.out, FreeBSD etc | ||
7 | # make x86-solaris | ||
8 | # make x86-bdsi | ||
9 | |||
10 | DIR= md5 | ||
11 | TOP= . | ||
12 | CC= gcc | ||
13 | CFLAG= -O3 -fomit-frame-pointer | ||
14 | |||
15 | CPP= $(CC) -E | ||
16 | INCLUDES= | ||
17 | INSTALLTOP=/usr/local/lib | ||
18 | MAKE= make | ||
19 | MAKEDEPEND= makedepend | ||
20 | MAKEFILE= Makefile.uni | ||
21 | AR= ar r | ||
22 | RANLIB= ranlib | ||
23 | |||
24 | MD5_ASM_OBJ= | ||
25 | |||
26 | CFLAGS= $(INCLUDES) $(CFLAG) | ||
27 | |||
28 | GENERAL=Makefile | ||
29 | TEST=md5test | ||
30 | APPS=md5 | ||
31 | |||
32 | LIB=libmd5.a | ||
33 | LIBSRC=md5_dgst.c md5_one.c | ||
34 | LIBOBJ=md5_dgst.o md5_one.o $(MD5_ASM_OBJ) | ||
35 | |||
36 | SRC= $(LIBSRC) | ||
37 | |||
38 | EXHEADER= md5.h | ||
39 | HEADER= md5_locl.h $(EXHEADER) | ||
40 | |||
41 | ALL= $(GENERAL) $(SRC) $(HEADER) | ||
42 | |||
43 | all: $(LIB) $(TEST) $(APPS) | ||
44 | |||
45 | $(LIB): $(LIBOBJ) | ||
46 | $(AR) $(LIB) $(LIBOBJ) | ||
47 | $(RANLIB) $(LIB) | ||
48 | |||
49 | # elf | ||
50 | asm/mx86-elf.o: asm/mx86unix.cpp | ||
51 | $(CPP) -DELF asm/mx86unix.cpp | as -o asm/mx86-elf.o | ||
52 | |||
53 | # solaris | ||
54 | asm/mx86-sol.o: asm/mx86unix.cpp | ||
55 | $(CC) -E -DSOL asm/mx86unix.cpp | sed 's/^#.*//' > asm/mx86-sol.s | ||
56 | as -o asm/mx86-sol.o asm/mx86-sol.s | ||
57 | rm -f asm/mx86-sol.s | ||
58 | |||
59 | # a.out | ||
60 | asm/mx86-out.o: asm/mx86unix.cpp | ||
61 | $(CPP) -DOUT asm/mx86unix.cpp | as -o asm/mx86-out.o | ||
62 | |||
63 | # bsdi | ||
64 | asm/mx86bsdi.o: asm/mx86unix.cpp | ||
65 | $(CPP) -DBSDI asm/mx86unix.cpp | as -o asm/mx86bsdi.o | ||
66 | |||
67 | asm/mx86unix.cpp: | ||
68 | (cd asm; perl md5-586.pl cpp >mx86unix.cpp) | ||
69 | |||
70 | test: $(TEST) | ||
71 | ./$(TEST) | ||
72 | |||
73 | $(TEST): $(TEST).c $(LIB) | ||
74 | $(CC) -o $(TEST) $(CFLAGS) $(TEST).c $(LIB) | ||
75 | |||
76 | $(APPS): $(APPS).c $(LIB) | ||
77 | $(CC) -o $(APPS) $(CFLAGS) $(APPS).c $(LIB) | ||
78 | |||
79 | lint: | ||
80 | lint -DLINT $(INCLUDES) $(SRC)>fluff | ||
81 | |||
82 | depend: | ||
83 | $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) | ||
84 | |||
85 | dclean: | ||
86 | perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new | ||
87 | mv -f Makefile.new $(MAKEFILE) | ||
88 | |||
89 | clean: | ||
90 | /bin/rm -f $(LIB) $(TEST) $(APPS) *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff | ||
91 | |||
92 | cc: | ||
93 | $(MAKE) MD5_ASM_OBJ="" CC="cc" CFLAG="-O" all | ||
94 | |||
95 | gcc: | ||
96 | $(MAKE) MD5_ASM_OBJ="" CC="gcc" CFLAGS="-O3 -fomit-frame-pointer" all | ||
97 | |||
98 | x86-elf: | ||
99 | $(MAKE) MD5_ASM_OBJ="asm/mx86-elf.o" CFLAG="-DELF -DMD5_ASM -DL_ENDIAN $(CFLAGS)" all | ||
100 | |||
101 | x86-out: | ||
102 | $(MAKE) MD5_ASM_OBJ="asm/mx86-out.o" CFLAG="-DOUT -DMD5_ASM -DL_ENDIAN $(CFLAGS)" all | ||
103 | |||
104 | x86-solaris: | ||
105 | $(MAKE) MD5_ASM_OBJ="asm/mx86-sol.o" CFLAG="-DSOL -DMD5_ASM -DL_ENDIAN $(CFLAGS)" all | ||
106 | |||
107 | x86-bdsi: | ||
108 | $(MAKE) MD5_ASM_OBJ="asm/mx86-bdsi.o" CFLAG="-DBDSI -DMD5_ASM -DL_ENDIAN $(CFLAGS)" all | ||
109 | |||
110 | # DO NOT DELETE THIS LINE -- make depend depends on it. | ||
diff --git a/src/lib/libcrypto/md5/asm/m5-win32.asm b/src/lib/libcrypto/md5/asm/m5-win32.asm index 51f5f17ca3..e69de29bb2 100644 --- a/src/lib/libcrypto/md5/asm/m5-win32.asm +++ b/src/lib/libcrypto/md5/asm/m5-win32.asm | |||
@@ -1,687 +0,0 @@ | |||
1 | ; Don't even think of reading this code | ||
2 | ; It was automatically generated by md5-586.pl | ||
3 | ; Which is a perl program used to generate the x86 assember for | ||
4 | ; any of elf, a.out, BSDI,Win32, or Solaris | ||
5 | ; eric <eay@cryptsoft.com> | ||
6 | ; | ||
7 | TITLE md5-586.asm | ||
8 | .386 | ||
9 | .model FLAT | ||
10 | _TEXT SEGMENT | ||
11 | PUBLIC _md5_block_asm_host_order | ||
12 | |||
13 | _md5_block_asm_host_order PROC NEAR | ||
14 | push esi | ||
15 | push edi | ||
16 | mov edi, DWORD PTR 12[esp] | ||
17 | mov esi, DWORD PTR 16[esp] | ||
18 | mov ecx, DWORD PTR 20[esp] | ||
19 | push ebp | ||
20 | shl ecx, 6 | ||
21 | push ebx | ||
22 | add ecx, esi | ||
23 | sub ecx, 64 | ||
24 | mov eax, DWORD PTR [edi] | ||
25 | push ecx | ||
26 | mov ebx, DWORD PTR 4[edi] | ||
27 | mov ecx, DWORD PTR 8[edi] | ||
28 | mov edx, DWORD PTR 12[edi] | ||
29 | L000start: | ||
30 | ; | ||
31 | ; R0 section | ||
32 | mov edi, ecx | ||
33 | mov ebp, DWORD PTR [esi] | ||
34 | ; R0 0 | ||
35 | xor edi, edx | ||
36 | and edi, ebx | ||
37 | lea eax, DWORD PTR 3614090360[ebp*1+eax] | ||
38 | xor edi, edx | ||
39 | add eax, edi | ||
40 | mov edi, ebx | ||
41 | rol eax, 7 | ||
42 | mov ebp, DWORD PTR 4[esi] | ||
43 | add eax, ebx | ||
44 | ; R0 1 | ||
45 | xor edi, ecx | ||
46 | and edi, eax | ||
47 | lea edx, DWORD PTR 3905402710[ebp*1+edx] | ||
48 | xor edi, ecx | ||
49 | add edx, edi | ||
50 | mov edi, eax | ||
51 | rol edx, 12 | ||
52 | mov ebp, DWORD PTR 8[esi] | ||
53 | add edx, eax | ||
54 | ; R0 2 | ||
55 | xor edi, ebx | ||
56 | and edi, edx | ||
57 | lea ecx, DWORD PTR 606105819[ebp*1+ecx] | ||
58 | xor edi, ebx | ||
59 | add ecx, edi | ||
60 | mov edi, edx | ||
61 | rol ecx, 17 | ||
62 | mov ebp, DWORD PTR 12[esi] | ||
63 | add ecx, edx | ||
64 | ; R0 3 | ||
65 | xor edi, eax | ||
66 | and edi, ecx | ||
67 | lea ebx, DWORD PTR 3250441966[ebp*1+ebx] | ||
68 | xor edi, eax | ||
69 | add ebx, edi | ||
70 | mov edi, ecx | ||
71 | rol ebx, 22 | ||
72 | mov ebp, DWORD PTR 16[esi] | ||
73 | add ebx, ecx | ||
74 | ; R0 4 | ||
75 | xor edi, edx | ||
76 | and edi, ebx | ||
77 | lea eax, DWORD PTR 4118548399[ebp*1+eax] | ||
78 | xor edi, edx | ||
79 | add eax, edi | ||
80 | mov edi, ebx | ||
81 | rol eax, 7 | ||
82 | mov ebp, DWORD PTR 20[esi] | ||
83 | add eax, ebx | ||
84 | ; R0 5 | ||
85 | xor edi, ecx | ||
86 | and edi, eax | ||
87 | lea edx, DWORD PTR 1200080426[ebp*1+edx] | ||
88 | xor edi, ecx | ||
89 | add edx, edi | ||
90 | mov edi, eax | ||
91 | rol edx, 12 | ||
92 | mov ebp, DWORD PTR 24[esi] | ||
93 | add edx, eax | ||
94 | ; R0 6 | ||
95 | xor edi, ebx | ||
96 | and edi, edx | ||
97 | lea ecx, DWORD PTR 2821735955[ebp*1+ecx] | ||
98 | xor edi, ebx | ||
99 | add ecx, edi | ||
100 | mov edi, edx | ||
101 | rol ecx, 17 | ||
102 | mov ebp, DWORD PTR 28[esi] | ||
103 | add ecx, edx | ||
104 | ; R0 7 | ||
105 | xor edi, eax | ||
106 | and edi, ecx | ||
107 | lea ebx, DWORD PTR 4249261313[ebp*1+ebx] | ||
108 | xor edi, eax | ||
109 | add ebx, edi | ||
110 | mov edi, ecx | ||
111 | rol ebx, 22 | ||
112 | mov ebp, DWORD PTR 32[esi] | ||
113 | add ebx, ecx | ||
114 | ; R0 8 | ||
115 | xor edi, edx | ||
116 | and edi, ebx | ||
117 | lea eax, DWORD PTR 1770035416[ebp*1+eax] | ||
118 | xor edi, edx | ||
119 | add eax, edi | ||
120 | mov edi, ebx | ||
121 | rol eax, 7 | ||
122 | mov ebp, DWORD PTR 36[esi] | ||
123 | add eax, ebx | ||
124 | ; R0 9 | ||
125 | xor edi, ecx | ||
126 | and edi, eax | ||
127 | lea edx, DWORD PTR 2336552879[ebp*1+edx] | ||
128 | xor edi, ecx | ||
129 | add edx, edi | ||
130 | mov edi, eax | ||
131 | rol edx, 12 | ||
132 | mov ebp, DWORD PTR 40[esi] | ||
133 | add edx, eax | ||
134 | ; R0 10 | ||
135 | xor edi, ebx | ||
136 | and edi, edx | ||
137 | lea ecx, DWORD PTR 4294925233[ebp*1+ecx] | ||
138 | xor edi, ebx | ||
139 | add ecx, edi | ||
140 | mov edi, edx | ||
141 | rol ecx, 17 | ||
142 | mov ebp, DWORD PTR 44[esi] | ||
143 | add ecx, edx | ||
144 | ; R0 11 | ||
145 | xor edi, eax | ||
146 | and edi, ecx | ||
147 | lea ebx, DWORD PTR 2304563134[ebp*1+ebx] | ||
148 | xor edi, eax | ||
149 | add ebx, edi | ||
150 | mov edi, ecx | ||
151 | rol ebx, 22 | ||
152 | mov ebp, DWORD PTR 48[esi] | ||
153 | add ebx, ecx | ||
154 | ; R0 12 | ||
155 | xor edi, edx | ||
156 | and edi, ebx | ||
157 | lea eax, DWORD PTR 1804603682[ebp*1+eax] | ||
158 | xor edi, edx | ||
159 | add eax, edi | ||
160 | mov edi, ebx | ||
161 | rol eax, 7 | ||
162 | mov ebp, DWORD PTR 52[esi] | ||
163 | add eax, ebx | ||
164 | ; R0 13 | ||
165 | xor edi, ecx | ||
166 | and edi, eax | ||
167 | lea edx, DWORD PTR 4254626195[ebp*1+edx] | ||
168 | xor edi, ecx | ||
169 | add edx, edi | ||
170 | mov edi, eax | ||
171 | rol edx, 12 | ||
172 | mov ebp, DWORD PTR 56[esi] | ||
173 | add edx, eax | ||
174 | ; R0 14 | ||
175 | xor edi, ebx | ||
176 | and edi, edx | ||
177 | lea ecx, DWORD PTR 2792965006[ebp*1+ecx] | ||
178 | xor edi, ebx | ||
179 | add ecx, edi | ||
180 | mov edi, edx | ||
181 | rol ecx, 17 | ||
182 | mov ebp, DWORD PTR 60[esi] | ||
183 | add ecx, edx | ||
184 | ; R0 15 | ||
185 | xor edi, eax | ||
186 | and edi, ecx | ||
187 | lea ebx, DWORD PTR 1236535329[ebp*1+ebx] | ||
188 | xor edi, eax | ||
189 | add ebx, edi | ||
190 | mov edi, ecx | ||
191 | rol ebx, 22 | ||
192 | mov ebp, DWORD PTR 4[esi] | ||
193 | add ebx, ecx | ||
194 | ; | ||
195 | ; R1 section | ||
196 | ; R1 16 | ||
197 | lea eax, DWORD PTR 4129170786[ebp*1+eax] | ||
198 | xor edi, ebx | ||
199 | and edi, edx | ||
200 | mov ebp, DWORD PTR 24[esi] | ||
201 | xor edi, ecx | ||
202 | add eax, edi | ||
203 | mov edi, ebx | ||
204 | rol eax, 5 | ||
205 | add eax, ebx | ||
206 | ; R1 17 | ||
207 | lea edx, DWORD PTR 3225465664[ebp*1+edx] | ||
208 | xor edi, eax | ||
209 | and edi, ecx | ||
210 | mov ebp, DWORD PTR 44[esi] | ||
211 | xor edi, ebx | ||
212 | add edx, edi | ||
213 | mov edi, eax | ||
214 | rol edx, 9 | ||
215 | add edx, eax | ||
216 | ; R1 18 | ||
217 | lea ecx, DWORD PTR 643717713[ebp*1+ecx] | ||
218 | xor edi, edx | ||
219 | and edi, ebx | ||
220 | mov ebp, DWORD PTR [esi] | ||
221 | xor edi, eax | ||
222 | add ecx, edi | ||
223 | mov edi, edx | ||
224 | rol ecx, 14 | ||
225 | add ecx, edx | ||
226 | ; R1 19 | ||
227 | lea ebx, DWORD PTR 3921069994[ebp*1+ebx] | ||
228 | xor edi, ecx | ||
229 | and edi, eax | ||
230 | mov ebp, DWORD PTR 20[esi] | ||
231 | xor edi, edx | ||
232 | add ebx, edi | ||
233 | mov edi, ecx | ||
234 | rol ebx, 20 | ||
235 | add ebx, ecx | ||
236 | ; R1 20 | ||
237 | lea eax, DWORD PTR 3593408605[ebp*1+eax] | ||
238 | xor edi, ebx | ||
239 | and edi, edx | ||
240 | mov ebp, DWORD PTR 40[esi] | ||
241 | xor edi, ecx | ||
242 | add eax, edi | ||
243 | mov edi, ebx | ||
244 | rol eax, 5 | ||
245 | add eax, ebx | ||
246 | ; R1 21 | ||
247 | lea edx, DWORD PTR 38016083[ebp*1+edx] | ||
248 | xor edi, eax | ||
249 | and edi, ecx | ||
250 | mov ebp, DWORD PTR 60[esi] | ||
251 | xor edi, ebx | ||
252 | add edx, edi | ||
253 | mov edi, eax | ||
254 | rol edx, 9 | ||
255 | add edx, eax | ||
256 | ; R1 22 | ||
257 | lea ecx, DWORD PTR 3634488961[ebp*1+ecx] | ||
258 | xor edi, edx | ||
259 | and edi, ebx | ||
260 | mov ebp, DWORD PTR 16[esi] | ||
261 | xor edi, eax | ||
262 | add ecx, edi | ||
263 | mov edi, edx | ||
264 | rol ecx, 14 | ||
265 | add ecx, edx | ||
266 | ; R1 23 | ||
267 | lea ebx, DWORD PTR 3889429448[ebp*1+ebx] | ||
268 | xor edi, ecx | ||
269 | and edi, eax | ||
270 | mov ebp, DWORD PTR 36[esi] | ||
271 | xor edi, edx | ||
272 | add ebx, edi | ||
273 | mov edi, ecx | ||
274 | rol ebx, 20 | ||
275 | add ebx, ecx | ||
276 | ; R1 24 | ||
277 | lea eax, DWORD PTR 568446438[ebp*1+eax] | ||
278 | xor edi, ebx | ||
279 | and edi, edx | ||
280 | mov ebp, DWORD PTR 56[esi] | ||
281 | xor edi, ecx | ||
282 | add eax, edi | ||
283 | mov edi, ebx | ||
284 | rol eax, 5 | ||
285 | add eax, ebx | ||
286 | ; R1 25 | ||
287 | lea edx, DWORD PTR 3275163606[ebp*1+edx] | ||
288 | xor edi, eax | ||
289 | and edi, ecx | ||
290 | mov ebp, DWORD PTR 12[esi] | ||
291 | xor edi, ebx | ||
292 | add edx, edi | ||
293 | mov edi, eax | ||
294 | rol edx, 9 | ||
295 | add edx, eax | ||
296 | ; R1 26 | ||
297 | lea ecx, DWORD PTR 4107603335[ebp*1+ecx] | ||
298 | xor edi, edx | ||
299 | and edi, ebx | ||
300 | mov ebp, DWORD PTR 32[esi] | ||
301 | xor edi, eax | ||
302 | add ecx, edi | ||
303 | mov edi, edx | ||
304 | rol ecx, 14 | ||
305 | add ecx, edx | ||
306 | ; R1 27 | ||
307 | lea ebx, DWORD PTR 1163531501[ebp*1+ebx] | ||
308 | xor edi, ecx | ||
309 | and edi, eax | ||
310 | mov ebp, DWORD PTR 52[esi] | ||
311 | xor edi, edx | ||
312 | add ebx, edi | ||
313 | mov edi, ecx | ||
314 | rol ebx, 20 | ||
315 | add ebx, ecx | ||
316 | ; R1 28 | ||
317 | lea eax, DWORD PTR 2850285829[ebp*1+eax] | ||
318 | xor edi, ebx | ||
319 | and edi, edx | ||
320 | mov ebp, DWORD PTR 8[esi] | ||
321 | xor edi, ecx | ||
322 | add eax, edi | ||
323 | mov edi, ebx | ||
324 | rol eax, 5 | ||
325 | add eax, ebx | ||
326 | ; R1 29 | ||
327 | lea edx, DWORD PTR 4243563512[ebp*1+edx] | ||
328 | xor edi, eax | ||
329 | and edi, ecx | ||
330 | mov ebp, DWORD PTR 28[esi] | ||
331 | xor edi, ebx | ||
332 | add edx, edi | ||
333 | mov edi, eax | ||
334 | rol edx, 9 | ||
335 | add edx, eax | ||
336 | ; R1 30 | ||
337 | lea ecx, DWORD PTR 1735328473[ebp*1+ecx] | ||
338 | xor edi, edx | ||
339 | and edi, ebx | ||
340 | mov ebp, DWORD PTR 48[esi] | ||
341 | xor edi, eax | ||
342 | add ecx, edi | ||
343 | mov edi, edx | ||
344 | rol ecx, 14 | ||
345 | add ecx, edx | ||
346 | ; R1 31 | ||
347 | lea ebx, DWORD PTR 2368359562[ebp*1+ebx] | ||
348 | xor edi, ecx | ||
349 | and edi, eax | ||
350 | mov ebp, DWORD PTR 20[esi] | ||
351 | xor edi, edx | ||
352 | add ebx, edi | ||
353 | mov edi, ecx | ||
354 | rol ebx, 20 | ||
355 | add ebx, ecx | ||
356 | ; | ||
357 | ; R2 section | ||
358 | ; R2 32 | ||
359 | xor edi, edx | ||
360 | xor edi, ebx | ||
361 | lea eax, DWORD PTR 4294588738[ebp*1+eax] | ||
362 | add eax, edi | ||
363 | rol eax, 4 | ||
364 | mov ebp, DWORD PTR 32[esi] | ||
365 | mov edi, ebx | ||
366 | ; R2 33 | ||
367 | lea edx, DWORD PTR 2272392833[ebp*1+edx] | ||
368 | add eax, ebx | ||
369 | xor edi, ecx | ||
370 | xor edi, eax | ||
371 | mov ebp, DWORD PTR 44[esi] | ||
372 | add edx, edi | ||
373 | mov edi, eax | ||
374 | rol edx, 11 | ||
375 | add edx, eax | ||
376 | ; R2 34 | ||
377 | xor edi, ebx | ||
378 | xor edi, edx | ||
379 | lea ecx, DWORD PTR 1839030562[ebp*1+ecx] | ||
380 | add ecx, edi | ||
381 | rol ecx, 16 | ||
382 | mov ebp, DWORD PTR 56[esi] | ||
383 | mov edi, edx | ||
384 | ; R2 35 | ||
385 | lea ebx, DWORD PTR 4259657740[ebp*1+ebx] | ||
386 | add ecx, edx | ||
387 | xor edi, eax | ||
388 | xor edi, ecx | ||
389 | mov ebp, DWORD PTR 4[esi] | ||
390 | add ebx, edi | ||
391 | mov edi, ecx | ||
392 | rol ebx, 23 | ||
393 | add ebx, ecx | ||
394 | ; R2 36 | ||
395 | xor edi, edx | ||
396 | xor edi, ebx | ||
397 | lea eax, DWORD PTR 2763975236[ebp*1+eax] | ||
398 | add eax, edi | ||
399 | rol eax, 4 | ||
400 | mov ebp, DWORD PTR 16[esi] | ||
401 | mov edi, ebx | ||
402 | ; R2 37 | ||
403 | lea edx, DWORD PTR 1272893353[ebp*1+edx] | ||
404 | add eax, ebx | ||
405 | xor edi, ecx | ||
406 | xor edi, eax | ||
407 | mov ebp, DWORD PTR 28[esi] | ||
408 | add edx, edi | ||
409 | mov edi, eax | ||
410 | rol edx, 11 | ||
411 | add edx, eax | ||
412 | ; R2 38 | ||
413 | xor edi, ebx | ||
414 | xor edi, edx | ||
415 | lea ecx, DWORD PTR 4139469664[ebp*1+ecx] | ||
416 | add ecx, edi | ||
417 | rol ecx, 16 | ||
418 | mov ebp, DWORD PTR 40[esi] | ||
419 | mov edi, edx | ||
420 | ; R2 39 | ||
421 | lea ebx, DWORD PTR 3200236656[ebp*1+ebx] | ||
422 | add ecx, edx | ||
423 | xor edi, eax | ||
424 | xor edi, ecx | ||
425 | mov ebp, DWORD PTR 52[esi] | ||
426 | add ebx, edi | ||
427 | mov edi, ecx | ||
428 | rol ebx, 23 | ||
429 | add ebx, ecx | ||
430 | ; R2 40 | ||
431 | xor edi, edx | ||
432 | xor edi, ebx | ||
433 | lea eax, DWORD PTR 681279174[ebp*1+eax] | ||
434 | add eax, edi | ||
435 | rol eax, 4 | ||
436 | mov ebp, DWORD PTR [esi] | ||
437 | mov edi, ebx | ||
438 | ; R2 41 | ||
439 | lea edx, DWORD PTR 3936430074[ebp*1+edx] | ||
440 | add eax, ebx | ||
441 | xor edi, ecx | ||
442 | xor edi, eax | ||
443 | mov ebp, DWORD PTR 12[esi] | ||
444 | add edx, edi | ||
445 | mov edi, eax | ||
446 | rol edx, 11 | ||
447 | add edx, eax | ||
448 | ; R2 42 | ||
449 | xor edi, ebx | ||
450 | xor edi, edx | ||
451 | lea ecx, DWORD PTR 3572445317[ebp*1+ecx] | ||
452 | add ecx, edi | ||
453 | rol ecx, 16 | ||
454 | mov ebp, DWORD PTR 24[esi] | ||
455 | mov edi, edx | ||
456 | ; R2 43 | ||
457 | lea ebx, DWORD PTR 76029189[ebp*1+ebx] | ||
458 | add ecx, edx | ||
459 | xor edi, eax | ||
460 | xor edi, ecx | ||
461 | mov ebp, DWORD PTR 36[esi] | ||
462 | add ebx, edi | ||
463 | mov edi, ecx | ||
464 | rol ebx, 23 | ||
465 | add ebx, ecx | ||
466 | ; R2 44 | ||
467 | xor edi, edx | ||
468 | xor edi, ebx | ||
469 | lea eax, DWORD PTR 3654602809[ebp*1+eax] | ||
470 | add eax, edi | ||
471 | rol eax, 4 | ||
472 | mov ebp, DWORD PTR 48[esi] | ||
473 | mov edi, ebx | ||
474 | ; R2 45 | ||
475 | lea edx, DWORD PTR 3873151461[ebp*1+edx] | ||
476 | add eax, ebx | ||
477 | xor edi, ecx | ||
478 | xor edi, eax | ||
479 | mov ebp, DWORD PTR 60[esi] | ||
480 | add edx, edi | ||
481 | mov edi, eax | ||
482 | rol edx, 11 | ||
483 | add edx, eax | ||
484 | ; R2 46 | ||
485 | xor edi, ebx | ||
486 | xor edi, edx | ||
487 | lea ecx, DWORD PTR 530742520[ebp*1+ecx] | ||
488 | add ecx, edi | ||
489 | rol ecx, 16 | ||
490 | mov ebp, DWORD PTR 8[esi] | ||
491 | mov edi, edx | ||
492 | ; R2 47 | ||
493 | lea ebx, DWORD PTR 3299628645[ebp*1+ebx] | ||
494 | add ecx, edx | ||
495 | xor edi, eax | ||
496 | xor edi, ecx | ||
497 | mov ebp, DWORD PTR [esi] | ||
498 | add ebx, edi | ||
499 | mov edi, -1 | ||
500 | rol ebx, 23 | ||
501 | add ebx, ecx | ||
502 | ; | ||
503 | ; R3 section | ||
504 | ; R3 48 | ||
505 | xor edi, edx | ||
506 | or edi, ebx | ||
507 | lea eax, DWORD PTR 4096336452[ebp*1+eax] | ||
508 | xor edi, ecx | ||
509 | mov ebp, DWORD PTR 28[esi] | ||
510 | add eax, edi | ||
511 | mov edi, -1 | ||
512 | rol eax, 6 | ||
513 | xor edi, ecx | ||
514 | add eax, ebx | ||
515 | ; R3 49 | ||
516 | or edi, eax | ||
517 | lea edx, DWORD PTR 1126891415[ebp*1+edx] | ||
518 | xor edi, ebx | ||
519 | mov ebp, DWORD PTR 56[esi] | ||
520 | add edx, edi | ||
521 | mov edi, -1 | ||
522 | rol edx, 10 | ||
523 | xor edi, ebx | ||
524 | add edx, eax | ||
525 | ; R3 50 | ||
526 | or edi, edx | ||
527 | lea ecx, DWORD PTR 2878612391[ebp*1+ecx] | ||
528 | xor edi, eax | ||
529 | mov ebp, DWORD PTR 20[esi] | ||
530 | add ecx, edi | ||
531 | mov edi, -1 | ||
532 | rol ecx, 15 | ||
533 | xor edi, eax | ||
534 | add ecx, edx | ||
535 | ; R3 51 | ||
536 | or edi, ecx | ||
537 | lea ebx, DWORD PTR 4237533241[ebp*1+ebx] | ||
538 | xor edi, edx | ||
539 | mov ebp, DWORD PTR 48[esi] | ||
540 | add ebx, edi | ||
541 | mov edi, -1 | ||
542 | rol ebx, 21 | ||
543 | xor edi, edx | ||
544 | add ebx, ecx | ||
545 | ; R3 52 | ||
546 | or edi, ebx | ||
547 | lea eax, DWORD PTR 1700485571[ebp*1+eax] | ||
548 | xor edi, ecx | ||
549 | mov ebp, DWORD PTR 12[esi] | ||
550 | add eax, edi | ||
551 | mov edi, -1 | ||
552 | rol eax, 6 | ||
553 | xor edi, ecx | ||
554 | add eax, ebx | ||
555 | ; R3 53 | ||
556 | or edi, eax | ||
557 | lea edx, DWORD PTR 2399980690[ebp*1+edx] | ||
558 | xor edi, ebx | ||
559 | mov ebp, DWORD PTR 40[esi] | ||
560 | add edx, edi | ||
561 | mov edi, -1 | ||
562 | rol edx, 10 | ||
563 | xor edi, ebx | ||
564 | add edx, eax | ||
565 | ; R3 54 | ||
566 | or edi, edx | ||
567 | lea ecx, DWORD PTR 4293915773[ebp*1+ecx] | ||
568 | xor edi, eax | ||
569 | mov ebp, DWORD PTR 4[esi] | ||
570 | add ecx, edi | ||
571 | mov edi, -1 | ||
572 | rol ecx, 15 | ||
573 | xor edi, eax | ||
574 | add ecx, edx | ||
575 | ; R3 55 | ||
576 | or edi, ecx | ||
577 | lea ebx, DWORD PTR 2240044497[ebp*1+ebx] | ||
578 | xor edi, edx | ||
579 | mov ebp, DWORD PTR 32[esi] | ||
580 | add ebx, edi | ||
581 | mov edi, -1 | ||
582 | rol ebx, 21 | ||
583 | xor edi, edx | ||
584 | add ebx, ecx | ||
585 | ; R3 56 | ||
586 | or edi, ebx | ||
587 | lea eax, DWORD PTR 1873313359[ebp*1+eax] | ||
588 | xor edi, ecx | ||
589 | mov ebp, DWORD PTR 60[esi] | ||
590 | add eax, edi | ||
591 | mov edi, -1 | ||
592 | rol eax, 6 | ||
593 | xor edi, ecx | ||
594 | add eax, ebx | ||
595 | ; R3 57 | ||
596 | or edi, eax | ||
597 | lea edx, DWORD PTR 4264355552[ebp*1+edx] | ||
598 | xor edi, ebx | ||
599 | mov ebp, DWORD PTR 24[esi] | ||
600 | add edx, edi | ||
601 | mov edi, -1 | ||
602 | rol edx, 10 | ||
603 | xor edi, ebx | ||
604 | add edx, eax | ||
605 | ; R3 58 | ||
606 | or edi, edx | ||
607 | lea ecx, DWORD PTR 2734768916[ebp*1+ecx] | ||
608 | xor edi, eax | ||
609 | mov ebp, DWORD PTR 52[esi] | ||
610 | add ecx, edi | ||
611 | mov edi, -1 | ||
612 | rol ecx, 15 | ||
613 | xor edi, eax | ||
614 | add ecx, edx | ||
615 | ; R3 59 | ||
616 | or edi, ecx | ||
617 | lea ebx, DWORD PTR 1309151649[ebp*1+ebx] | ||
618 | xor edi, edx | ||
619 | mov ebp, DWORD PTR 16[esi] | ||
620 | add ebx, edi | ||
621 | mov edi, -1 | ||
622 | rol ebx, 21 | ||
623 | xor edi, edx | ||
624 | add ebx, ecx | ||
625 | ; R3 60 | ||
626 | or edi, ebx | ||
627 | lea eax, DWORD PTR 4149444226[ebp*1+eax] | ||
628 | xor edi, ecx | ||
629 | mov ebp, DWORD PTR 44[esi] | ||
630 | add eax, edi | ||
631 | mov edi, -1 | ||
632 | rol eax, 6 | ||
633 | xor edi, ecx | ||
634 | add eax, ebx | ||
635 | ; R3 61 | ||
636 | or edi, eax | ||
637 | lea edx, DWORD PTR 3174756917[ebp*1+edx] | ||
638 | xor edi, ebx | ||
639 | mov ebp, DWORD PTR 8[esi] | ||
640 | add edx, edi | ||
641 | mov edi, -1 | ||
642 | rol edx, 10 | ||
643 | xor edi, ebx | ||
644 | add edx, eax | ||
645 | ; R3 62 | ||
646 | or edi, edx | ||
647 | lea ecx, DWORD PTR 718787259[ebp*1+ecx] | ||
648 | xor edi, eax | ||
649 | mov ebp, DWORD PTR 36[esi] | ||
650 | add ecx, edi | ||
651 | mov edi, -1 | ||
652 | rol ecx, 15 | ||
653 | xor edi, eax | ||
654 | add ecx, edx | ||
655 | ; R3 63 | ||
656 | or edi, ecx | ||
657 | lea ebx, DWORD PTR 3951481745[ebp*1+ebx] | ||
658 | xor edi, edx | ||
659 | mov ebp, DWORD PTR 24[esp] | ||
660 | add ebx, edi | ||
661 | add esi, 64 | ||
662 | rol ebx, 21 | ||
663 | mov edi, DWORD PTR [ebp] | ||
664 | add ebx, ecx | ||
665 | add eax, edi | ||
666 | mov edi, DWORD PTR 4[ebp] | ||
667 | add ebx, edi | ||
668 | mov edi, DWORD PTR 8[ebp] | ||
669 | add ecx, edi | ||
670 | mov edi, DWORD PTR 12[ebp] | ||
671 | add edx, edi | ||
672 | mov DWORD PTR [ebp],eax | ||
673 | mov DWORD PTR 4[ebp],ebx | ||
674 | mov edi, DWORD PTR [esp] | ||
675 | mov DWORD PTR 8[ebp],ecx | ||
676 | mov DWORD PTR 12[ebp],edx | ||
677 | cmp edi, esi | ||
678 | jge L000start | ||
679 | pop eax | ||
680 | pop ebx | ||
681 | pop ebp | ||
682 | pop edi | ||
683 | pop esi | ||
684 | ret | ||
685 | _md5_block_asm_host_order ENDP | ||
686 | _TEXT ENDS | ||
687 | END | ||
diff --git a/src/lib/libcrypto/md5/md5_locl.h b/src/lib/libcrypto/md5/md5_locl.h index 06af633228..c912484122 100644 --- a/src/lib/libcrypto/md5/md5_locl.h +++ b/src/lib/libcrypto/md5/md5_locl.h | |||
@@ -135,11 +135,7 @@ void md5_block_data_order (MD5_CTX *c, const void *p,int num); | |||
135 | */ | 135 | */ |
136 | #endif | 136 | #endif |
137 | 137 | ||
138 | #ifndef FLAT_INC | ||
139 | #include "../md32_common.h" | ||
140 | #else | ||
141 | #include "md32_common.h" | 138 | #include "md32_common.h" |
142 | #endif | ||
143 | 139 | ||
144 | /* | 140 | /* |
145 | #define F(x,y,z) (((x) & (y)) | ((~(x)) & (z))) | 141 | #define F(x,y,z) (((x) & (y)) | ((~(x)) & (z))) |
diff --git a/src/lib/libcrypto/mem_dbg.c b/src/lib/libcrypto/mem_dbg.c index 14770c0733..a399485300 100644 --- a/src/lib/libcrypto/mem_dbg.c +++ b/src/lib/libcrypto/mem_dbg.c | |||
@@ -640,19 +640,54 @@ void CRYPTO_mem_leaks(BIO *b) | |||
640 | MEM_LEAK ml; | 640 | MEM_LEAK ml; |
641 | char buf[80]; | 641 | char buf[80]; |
642 | 642 | ||
643 | if (mh == NULL) return; | 643 | if (mh == NULL && amih == NULL) |
644 | return; | ||
644 | ml.bio=b; | 645 | ml.bio=b; |
645 | ml.bytes=0; | 646 | ml.bytes=0; |
646 | ml.chunks=0; | 647 | ml.chunks=0; |
647 | CRYPTO_w_lock(CRYPTO_LOCK_MALLOC2); | 648 | MemCheck_off(); /* obtains CRYPTO_LOCK_MALLOC2 */ |
648 | lh_doall_arg(mh,(void (*)())print_leak,(char *)&ml); | 649 | if (mh != NULL) |
649 | CRYPTO_w_unlock(CRYPTO_LOCK_MALLOC2); | 650 | lh_doall_arg(mh,(void (*)())print_leak,(char *)&ml); |
650 | if (ml.chunks != 0) | 651 | if (ml.chunks != 0) |
651 | { | 652 | { |
652 | sprintf(buf,"%ld bytes leaked in %d chunks\n", | 653 | sprintf(buf,"%ld bytes leaked in %d chunks\n", |
653 | ml.bytes,ml.chunks); | 654 | ml.bytes,ml.chunks); |
654 | BIO_puts(b,buf); | 655 | BIO_puts(b,buf); |
655 | } | 656 | } |
657 | else | ||
658 | { | ||
659 | /* Make sure that, if we found no leaks, memory-leak debugging itself | ||
660 | * does not introduce memory leaks (which might irritate | ||
661 | * external debugging tools). | ||
662 | * (When someone enables leak checking, but does not call | ||
663 | * this function, we declare it to be their fault.) | ||
664 | * | ||
665 | * XXX This should be in CRYPTO_mem_leaks_cb, | ||
666 | * and CRYPTO_mem_leaks should be implemented by | ||
667 | * using CRYPTO_mem_leaks_cb. | ||
668 | * (Also their should be a variant of lh_doall_arg | ||
669 | * that takes a function pointer instead of a void *; | ||
670 | * this would obviate the ugly and illegal | ||
671 | * void_fn_to_char kludge in CRYPTO_mem_leaks_cb. | ||
672 | * Otherwise the code police will come and get us.) | ||
673 | */ | ||
674 | CRYPTO_w_lock(CRYPTO_LOCK_MALLOC); | ||
675 | if (mh != NULL) | ||
676 | { | ||
677 | lh_free(mh); | ||
678 | mh = NULL; | ||
679 | } | ||
680 | if (amih != NULL) | ||
681 | { | ||
682 | if (lh_num_items(amih) == 0) | ||
683 | { | ||
684 | lh_free(amih); | ||
685 | amih = NULL; | ||
686 | } | ||
687 | } | ||
688 | CRYPTO_w_unlock(CRYPTO_LOCK_MALLOC); | ||
689 | } | ||
690 | MemCheck_on(); /* releases CRYPTO_LOCK_MALLOC2 */ | ||
656 | 691 | ||
657 | #if 0 | 692 | #if 0 |
658 | lh_stats_bio(mh,b); | 693 | lh_stats_bio(mh,b); |
diff --git a/src/lib/libcrypto/objects/o_names.c b/src/lib/libcrypto/objects/o_names.c index d654eb220e..d9389a5e5a 100644 --- a/src/lib/libcrypto/objects/o_names.c +++ b/src/lib/libcrypto/objects/o_names.c | |||
@@ -22,7 +22,7 @@ typedef struct name_funcs_st | |||
22 | DECLARE_STACK_OF(NAME_FUNCS) | 22 | DECLARE_STACK_OF(NAME_FUNCS) |
23 | IMPLEMENT_STACK_OF(NAME_FUNCS) | 23 | IMPLEMENT_STACK_OF(NAME_FUNCS) |
24 | 24 | ||
25 | STACK_OF(NAME_FUNCS) *name_funcs_stack; | 25 | static STACK_OF(NAME_FUNCS) *name_funcs_stack; |
26 | 26 | ||
27 | static unsigned long obj_name_hash(OBJ_NAME *a); | 27 | static unsigned long obj_name_hash(OBJ_NAME *a); |
28 | static int obj_name_cmp(OBJ_NAME *a,OBJ_NAME *b); | 28 | static int obj_name_cmp(OBJ_NAME *a,OBJ_NAME *b); |
diff --git a/src/lib/libcrypto/objects/obj_err.c b/src/lib/libcrypto/objects/obj_err.c index cef401db27..7aec0ed47a 100644 --- a/src/lib/libcrypto/objects/obj_err.c +++ b/src/lib/libcrypto/objects/obj_err.c | |||
@@ -54,7 +54,8 @@ | |||
54 | */ | 54 | */ |
55 | 55 | ||
56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes |
57 | * made to it will be overwritten when the script next updates this file. | 57 | * made to it will be overwritten when the script next updates this file, |
58 | * only reason strings will be preserved. | ||
58 | */ | 59 | */ |
59 | 60 | ||
60 | #include <stdio.h> | 61 | #include <stdio.h> |
diff --git a/src/lib/libcrypto/objects/objects.h b/src/lib/libcrypto/objects/objects.h index d1a5ad2502..95c8a21568 100644 --- a/src/lib/libcrypto/objects/objects.h +++ b/src/lib/libcrypto/objects/objects.h | |||
@@ -949,7 +949,7 @@ extern "C" { | |||
949 | #define NID_ad_ca_issuers 179 | 949 | #define NID_ad_ca_issuers 179 |
950 | #define OBJ_ad_ca_issuers OBJ_id_ad,2L | 950 | #define OBJ_ad_ca_issuers OBJ_id_ad,2L |
951 | 951 | ||
952 | #define SN_OSCP_sign "OCSPSigning" | 952 | #define SN_OCSP_sign "OCSPSigning" |
953 | #define LN_OCSP_sign "OCSP Signing" | 953 | #define LN_OCSP_sign "OCSP Signing" |
954 | #define NID_OCSP_sign 180 | 954 | #define NID_OCSP_sign 180 |
955 | #define OBJ_OCSP_sign OBJ_id_kp,9L | 955 | #define OBJ_OCSP_sign OBJ_id_kp,9L |
diff --git a/src/lib/libcrypto/opensslv.h b/src/lib/libcrypto/opensslv.h index 55d5d06cf5..55ec97389f 100644 --- a/src/lib/libcrypto/opensslv.h +++ b/src/lib/libcrypto/opensslv.h | |||
@@ -2,20 +2,31 @@ | |||
2 | #define HEADER_OPENSSLV_H | 2 | #define HEADER_OPENSSLV_H |
3 | 3 | ||
4 | /* Numeric release version identifier: | 4 | /* Numeric release version identifier: |
5 | * MMNNFFRBB: major minor fix final beta/patch | 5 | * MMNNFFPPS: major minor fix patch status |
6 | * The status nibble has one of the values 0 for development, 1 to e for betas | ||
7 | * 1 to 14, and f for release. The patch level is exactly that. | ||
6 | * For example: | 8 | * For example: |
7 | * 0.9.3-dev 0x00903000 | 9 | * 0.9.3-dev 0x00903000 |
8 | * 0.9.3beta1 0x00903001 | 10 | * 0.9.3-beta1 0x00903001 |
9 | * 0.9.3beta2-dev 0x00903002 | 11 | * 0.9.3-beta2-dev 0x00903002 |
10 | * 0.9.3beta2 0x00903002 (same as ...beta2-dev) | 12 | * 0.9.3-beta2 0x00903002 (same as ...beta2-dev) |
11 | * 0.9.3 0x00903100 | 13 | * 0.9.3 0x0090300f |
12 | * 0.9.3a 0x00903101 | 14 | * 0.9.3a 0x0090301f |
13 | * 0.9.4 0x00904100 | 15 | * 0.9.4 0x0090400f |
14 | * 1.2.3z 0x1020311a | 16 | * 1.2.3z 0x102031af |
17 | * | ||
18 | * For continuity reasons (because 0.9.5 is already out, and is coded | ||
19 | * 0x00905100), between 0.9.5 and 0.9.6 the coding of the patch level | ||
20 | * part is slightly different, by setting the highest bit. This means | ||
21 | * that 0.9.5a looks like this: 0x0090581f. At 0.9.6, we can start | ||
22 | * with 0x0090600S... | ||
23 | * | ||
15 | * (Prior to 0.9.3-dev a different scheme was used: 0.9.2b is 0x0922.) | 24 | * (Prior to 0.9.3-dev a different scheme was used: 0.9.2b is 0x0922.) |
25 | * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for | ||
26 | * major minor fix final patch/beta) | ||
16 | */ | 27 | */ |
17 | #define OPENSSL_VERSION_NUMBER 0x00905100L | 28 | #define OPENSSL_VERSION_NUMBER 0x0090581fL |
18 | #define OPENSSL_VERSION_TEXT "OpenSSL 0.9.5 28 Feb 2000" | 29 | #define OPENSSL_VERSION_TEXT "OpenSSL 0.9.5a 1 Apr 2000" |
19 | #define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT | 30 | #define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT |
20 | 31 | ||
21 | #endif /* HEADER_OPENSSLV_H */ | 32 | #endif /* HEADER_OPENSSLV_H */ |
diff --git a/src/lib/libcrypto/pem/pem_err.c b/src/lib/libcrypto/pem/pem_err.c index 642129da20..8b1789b11c 100644 --- a/src/lib/libcrypto/pem/pem_err.c +++ b/src/lib/libcrypto/pem/pem_err.c | |||
@@ -54,7 +54,8 @@ | |||
54 | */ | 54 | */ |
55 | 55 | ||
56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes |
57 | * made to it will be overwritten when the script next updates this file. | 57 | * made to it will be overwritten when the script next updates this file, |
58 | * only reason strings will be preserved. | ||
58 | */ | 59 | */ |
59 | 60 | ||
60 | #include <stdio.h> | 61 | #include <stdio.h> |
diff --git a/src/lib/libcrypto/pem/pem_lib.c b/src/lib/libcrypto/pem/pem_lib.c index 072211ba0f..b5e0a650f8 100644 --- a/src/lib/libcrypto/pem/pem_lib.c +++ b/src/lib/libcrypto/pem/pem_lib.c | |||
@@ -373,7 +373,7 @@ int PEM_ASN1_write_bio(int (*i2d)(), const char *name, BIO *bp, char *x, | |||
373 | kstr=(unsigned char *)buf; | 373 | kstr=(unsigned char *)buf; |
374 | } | 374 | } |
375 | RAND_add(data,i,0);/* put in the RSA key. */ | 375 | RAND_add(data,i,0);/* put in the RSA key. */ |
376 | if (RAND_bytes(iv,8) <= 0) /* Generate a salt */ | 376 | if (RAND_pseudo_bytes(iv,8) < 0) /* Generate a salt */ |
377 | goto err; | 377 | goto err; |
378 | /* The 'iv' is used as the iv and as a salt. It is | 378 | /* The 'iv' is used as the iv and as a salt. It is |
379 | * NOT taken from the BytesToKey function */ | 379 | * NOT taken from the BytesToKey function */ |
diff --git a/src/lib/libcrypto/perlasm/x86asm.pl b/src/lib/libcrypto/perlasm/x86asm.pl index 44e330eb8d..81c6e64e87 100644 --- a/src/lib/libcrypto/perlasm/x86asm.pl +++ b/src/lib/libcrypto/perlasm/x86asm.pl | |||
@@ -18,11 +18,13 @@ sub main'asm_init | |||
18 | ($type,$fn,$i386)=@_; | 18 | ($type,$fn,$i386)=@_; |
19 | $filename=$fn; | 19 | $filename=$fn; |
20 | 20 | ||
21 | $cpp=$sol=$aout=$win32=0; | 21 | $cpp=$sol=$aout=$win32=$gaswin=0; |
22 | if ( ($type eq "elf")) | 22 | if ( ($type eq "elf")) |
23 | { require "x86unix.pl"; } | 23 | { require "x86unix.pl"; } |
24 | elsif ( ($type eq "a.out")) | 24 | elsif ( ($type eq "a.out")) |
25 | { $aout=1; require "x86unix.pl"; } | 25 | { $aout=1; require "x86unix.pl"; } |
26 | elsif ( ($type eq "gaswin")) | ||
27 | { $gaswin=1; $aout=1; require "x86unix.pl"; } | ||
26 | elsif ( ($type eq "sol")) | 28 | elsif ( ($type eq "sol")) |
27 | { $sol=1; require "x86unix.pl"; } | 29 | { $sol=1; require "x86unix.pl"; } |
28 | elsif ( ($type eq "cpp")) | 30 | elsif ( ($type eq "cpp")) |
@@ -50,7 +52,7 @@ EOF | |||
50 | &comment("Don't even think of reading this code"); | 52 | &comment("Don't even think of reading this code"); |
51 | &comment("It was automatically generated by $filename"); | 53 | &comment("It was automatically generated by $filename"); |
52 | &comment("Which is a perl program used to generate the x86 assember for"); | 54 | &comment("Which is a perl program used to generate the x86 assember for"); |
53 | &comment("any of elf, a.out, BSDI,Win32, or Solaris"); | 55 | &comment("any of elf, a.out, BSDI, Win32, gaswin (for GNU as on Win32) or Solaris"); |
54 | &comment("eric <eay\@cryptsoft.com>"); | 56 | &comment("eric <eay\@cryptsoft.com>"); |
55 | &comment(""); | 57 | &comment(""); |
56 | 58 | ||
diff --git a/src/lib/libcrypto/perlasm/x86ms.pl b/src/lib/libcrypto/perlasm/x86ms.pl index 252a57bdb5..206452341d 100644 --- a/src/lib/libcrypto/perlasm/x86ms.pl +++ b/src/lib/libcrypto/perlasm/x86ms.pl | |||
@@ -341,7 +341,7 @@ sub main'set_label | |||
341 | $label{$_[0]}="${label}${_[0]}"; | 341 | $label{$_[0]}="${label}${_[0]}"; |
342 | $label++; | 342 | $label++; |
343 | } | 343 | } |
344 | if((defined $_[1]) && ($_[1] == 1)) | 344 | if((defined $_[2]) && ($_[2] == 1)) |
345 | { | 345 | { |
346 | push(@out,"$label{$_[0]}::\n"); | 346 | push(@out,"$label{$_[0]}::\n"); |
347 | } | 347 | } |
diff --git a/src/lib/libcrypto/perlasm/x86unix.pl b/src/lib/libcrypto/perlasm/x86unix.pl index 60d75f5ce4..309060ea00 100644 --- a/src/lib/libcrypto/perlasm/x86unix.pl +++ b/src/lib/libcrypto/perlasm/x86unix.pl | |||
@@ -292,6 +292,8 @@ EOF | |||
292 | push(@out,$tmp); | 292 | push(@out,$tmp); |
293 | if ($main'cpp) | 293 | if ($main'cpp) |
294 | { $tmp=push(@out,"\tTYPE($func,\@function)\n"); } | 294 | { $tmp=push(@out,"\tTYPE($func,\@function)\n"); } |
295 | elsif ($main'gaswin) | ||
296 | { $tmp=push(@out,"\t.def\t$func;\t.scl\t2;\t.type\t32;\t.endef\n"); } | ||
295 | else { $tmp=push(@out,"\t.type\t$func,\@function\n"); } | 297 | else { $tmp=push(@out,"\t.type\t$func,\@function\n"); } |
296 | push(@out,"$func:\n"); | 298 | push(@out,"$func:\n"); |
297 | $tmp=<<"EOF"; | 299 | $tmp=<<"EOF"; |
@@ -320,6 +322,8 @@ EOF | |||
320 | push(@out,$tmp); | 322 | push(@out,$tmp); |
321 | if ($main'cpp) | 323 | if ($main'cpp) |
322 | { push(@out,"\tTYPE($func,\@function)\n"); } | 324 | { push(@out,"\tTYPE($func,\@function)\n"); } |
325 | elsif ($main'gaswin) | ||
326 | { $tmp=push(@out,"\t.def\t$func;\t.scl\t2;\t.type\t32;\t.endef\n"); } | ||
323 | else { push(@out,"\t.type $func,\@function\n"); } | 327 | else { push(@out,"\t.type $func,\@function\n"); } |
324 | push(@out,"$func:\n"); | 328 | push(@out,"$func:\n"); |
325 | $stack=4; | 329 | $stack=4; |
@@ -342,6 +346,8 @@ EOF | |||
342 | push(@out,$tmp); | 346 | push(@out,$tmp); |
343 | if ($main'cpp) | 347 | if ($main'cpp) |
344 | { push(@out,"\tSIZE($func,.${func}_end-$func)\n"); } | 348 | { push(@out,"\tSIZE($func,.${func}_end-$func)\n"); } |
349 | elsif ($main'gaswin) | ||
350 | { $tmp=push(@out,"\t.align 4\n"); } | ||
345 | else { push(@out,"\t.size\t$func,.${func}_end-$func\n"); } | 351 | else { push(@out,"\t.size\t$func,.${func}_end-$func\n"); } |
346 | push(@out,".ident \"$func\"\n"); | 352 | push(@out,".ident \"$func\"\n"); |
347 | $stack=0; | 353 | $stack=0; |
@@ -371,6 +377,8 @@ sub main'function_end_B | |||
371 | push(@out,".L_${func}_end:\n"); | 377 | push(@out,".L_${func}_end:\n"); |
372 | if ($main'cpp) | 378 | if ($main'cpp) |
373 | { push(@out,"\tSIZE($func,.L_${func}_end-$func)\n"); } | 379 | { push(@out,"\tSIZE($func,.L_${func}_end-$func)\n"); } |
380 | elsif ($main'gaswin) | ||
381 | { push(@out,"\t.align 4\n"); } | ||
374 | else { push(@out,"\t.size\t$func,.L_${func}_end-$func\n"); } | 382 | else { push(@out,"\t.size\t$func,.L_${func}_end-$func\n"); } |
375 | push(@out,".ident \"desasm.pl\"\n"); | 383 | push(@out,".ident \"desasm.pl\"\n"); |
376 | $stack=0; | 384 | $stack=0; |
diff --git a/src/lib/libcrypto/pkcs12/p12_crt.c b/src/lib/libcrypto/pkcs12/p12_crt.c index 56d88b0759..ee8aed54c7 100644 --- a/src/lib/libcrypto/pkcs12/p12_crt.c +++ b/src/lib/libcrypto/pkcs12/p12_crt.c | |||
@@ -61,7 +61,7 @@ | |||
61 | #include <openssl/pkcs12.h> | 61 | #include <openssl/pkcs12.h> |
62 | 62 | ||
63 | PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert, | 63 | PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert, |
64 | STACK *ca, int nid_key, int nid_cert, int iter, int mac_iter, | 64 | STACK_OF(X509) *ca, int nid_key, int nid_cert, int iter, int mac_iter, |
65 | int keytype) | 65 | int keytype) |
66 | { | 66 | { |
67 | PKCS12 *p12; | 67 | PKCS12 *p12; |
@@ -103,8 +103,8 @@ PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert, | |||
103 | 103 | ||
104 | /* Add all other certificates */ | 104 | /* Add all other certificates */ |
105 | if(ca) { | 105 | if(ca) { |
106 | for(i = 0; i < sk_num(ca); i++) { | 106 | for(i = 0; i < sk_X509_num(ca); i++) { |
107 | tcert = (X509 *)sk_value(ca, i); | 107 | tcert = sk_X509_value(ca, i); |
108 | if(!(bag = M_PKCS12_x5092certbag(tcert))) return NULL; | 108 | if(!(bag = M_PKCS12_x5092certbag(tcert))) return NULL; |
109 | if(!sk_push(bags, (char *)bag)) { | 109 | if(!sk_push(bags, (char *)bag)) { |
110 | PKCS12err(PKCS12_F_PKCS12_CREATE,ERR_R_MALLOC_FAILURE); | 110 | PKCS12err(PKCS12_F_PKCS12_CREATE,ERR_R_MALLOC_FAILURE); |
diff --git a/src/lib/libcrypto/pkcs12/p12_key.c b/src/lib/libcrypto/pkcs12/p12_key.c index 02fdd20e2f..b364671ed2 100644 --- a/src/lib/libcrypto/pkcs12/p12_key.c +++ b/src/lib/libcrypto/pkcs12/p12_key.c | |||
@@ -104,6 +104,14 @@ int PKCS12_key_gen_uni (unsigned char *pass, int passlen, unsigned char *salt, | |||
104 | #ifdef DEBUG_KEYGEN | 104 | #ifdef DEBUG_KEYGEN |
105 | unsigned char *tmpout = out; | 105 | unsigned char *tmpout = out; |
106 | int tmpn = n; | 106 | int tmpn = n; |
107 | #endif | ||
108 | |||
109 | if (!pass) { | ||
110 | PKCS12err(PKCS12_F_PKCS12_KEY_GEN_UNI,ERR_R_PASSED_NULL_PARAMETER); | ||
111 | return 0; | ||
112 | } | ||
113 | |||
114 | #ifdef DEBUG_KEYGEN | ||
107 | fprintf(stderr, "KEYGEN DEBUG\n"); | 115 | fprintf(stderr, "KEYGEN DEBUG\n"); |
108 | fprintf(stderr, "ID %d, ITER %d\n", id, iter); | 116 | fprintf(stderr, "ID %d, ITER %d\n", id, iter); |
109 | fprintf(stderr, "Password (length %d):\n", passlen); | 117 | fprintf(stderr, "Password (length %d):\n", passlen); |
diff --git a/src/lib/libcrypto/pkcs12/p12_kiss.c b/src/lib/libcrypto/pkcs12/p12_kiss.c index 08a60556e0..ee257ffbad 100644 --- a/src/lib/libcrypto/pkcs12/p12_kiss.c +++ b/src/lib/libcrypto/pkcs12/p12_kiss.c | |||
@@ -62,9 +62,17 @@ | |||
62 | 62 | ||
63 | /* Simplified PKCS#12 routines */ | 63 | /* Simplified PKCS#12 routines */ |
64 | 64 | ||
65 | static int parse_pk12( PKCS12 *p12, const char *pass, int passlen, EVP_PKEY **pkey, X509 **cert, STACK **ca); | 65 | static int parse_pk12( PKCS12 *p12, const char *pass, int passlen, |
66 | static int parse_bags( STACK *bags, const char *pass, int passlen, EVP_PKEY **pkey, X509 **cert, STACK **ca, ASN1_OCTET_STRING **keyid, char *keymatch); | 66 | EVP_PKEY **pkey, X509 **cert, STACK_OF(X509) **ca); |
67 | static int parse_bag( PKCS12_SAFEBAG *bag, const char *pass, int passlen, EVP_PKEY **pkey, X509 **cert, STACK **ca, ASN1_OCTET_STRING **keyid, char *keymatch); | 67 | |
68 | static int parse_bags( STACK *bags, const char *pass, int passlen, | ||
69 | EVP_PKEY **pkey, X509 **cert, STACK_OF(X509) **ca, | ||
70 | ASN1_OCTET_STRING **keyid, char *keymatch); | ||
71 | |||
72 | static int parse_bag( PKCS12_SAFEBAG *bag, const char *pass, int passlen, | ||
73 | EVP_PKEY **pkey, X509 **cert, STACK_OF(X509) **ca, | ||
74 | ASN1_OCTET_STRING **keyid, char *keymatch); | ||
75 | |||
68 | /* Parse and decrypt a PKCS#12 structure returning user key, user cert | 76 | /* Parse and decrypt a PKCS#12 structure returning user key, user cert |
69 | * and other (CA) certs. Note either ca should be NULL, *ca should be NULL, | 77 | * and other (CA) certs. Note either ca should be NULL, *ca should be NULL, |
70 | * or it should point to a valid STACK structure. pkey and cert can be | 78 | * or it should point to a valid STACK structure. pkey and cert can be |
@@ -72,54 +80,59 @@ static int parse_bag( PKCS12_SAFEBAG *bag, const char *pass, int passlen, EVP_PK | |||
72 | */ | 80 | */ |
73 | 81 | ||
74 | int PKCS12_parse (PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert, | 82 | int PKCS12_parse (PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert, |
75 | STACK **ca) | 83 | STACK_OF(X509) **ca) |
76 | { | 84 | { |
77 | 85 | ||
78 | /* Check for NULL PKCS12 structure */ | 86 | /* Check for NULL PKCS12 structure */ |
79 | |||
80 | if(!p12) { | ||
81 | PKCS12err(PKCS12_F_PKCS12_PARSE,PKCS12_R_INVALID_NULL_PKCS12_POINTER); | ||
82 | return 0; | ||
83 | } | ||
84 | 87 | ||
85 | /* Allocate stack for ca certificates if needed */ | 88 | if(!p12) |
86 | if ((ca != NULL) && (*ca == NULL)) { | 89 | { |
87 | if (!(*ca = sk_new(NULL))) { | 90 | PKCS12err(PKCS12_F_PKCS12_PARSE,PKCS12_R_INVALID_NULL_PKCS12_POINTER); |
88 | PKCS12err(PKCS12_F_PKCS12_PARSE,ERR_R_MALLOC_FAILURE); | ||
89 | return 0; | 91 | return 0; |
90 | } | 92 | } |
91 | } | 93 | |
94 | /* Allocate stack for ca certificates if needed */ | ||
95 | if ((ca != NULL) && (*ca == NULL)) | ||
96 | { | ||
97 | if (!(*ca = sk_X509_new(NULL))) | ||
98 | { | ||
99 | PKCS12err(PKCS12_F_PKCS12_PARSE,ERR_R_MALLOC_FAILURE); | ||
100 | return 0; | ||
101 | } | ||
102 | } | ||
92 | 103 | ||
93 | if(pkey) *pkey = NULL; | 104 | if(pkey) *pkey = NULL; |
94 | if(cert) *cert = NULL; | 105 | if(cert) *cert = NULL; |
95 | 106 | ||
96 | /* Check the mac */ | 107 | /* Check the mac */ |
97 | 108 | ||
98 | if (!PKCS12_verify_mac (p12, pass, -1)) { | 109 | if (!PKCS12_verify_mac (p12, pass, -1)) |
99 | PKCS12err(PKCS12_F_PKCS12_PARSE,PKCS12_R_MAC_VERIFY_FAILURE); | 110 | { |
100 | goto err; | 111 | PKCS12err(PKCS12_F_PKCS12_PARSE,PKCS12_R_MAC_VERIFY_FAILURE); |
101 | } | 112 | goto err; |
113 | } | ||
102 | 114 | ||
103 | if (!parse_pk12 (p12, pass, -1, pkey, cert, ca)) { | 115 | if (!parse_pk12 (p12, pass, -1, pkey, cert, ca)) |
104 | PKCS12err(PKCS12_F_PKCS12_PARSE,PKCS12_R_PARSE_ERROR); | 116 | { |
105 | goto err; | 117 | PKCS12err(PKCS12_F_PKCS12_PARSE,PKCS12_R_PARSE_ERROR); |
106 | } | 118 | goto err; |
119 | } | ||
107 | 120 | ||
108 | return 1; | 121 | return 1; |
109 | 122 | ||
110 | err: | 123 | err: |
111 | 124 | ||
112 | if (pkey && *pkey) EVP_PKEY_free (*pkey); | 125 | if (pkey && *pkey) EVP_PKEY_free (*pkey); |
113 | if (cert && *cert) X509_free (*cert); | 126 | if (cert && *cert) X509_free (*cert); |
114 | if (ca) sk_pop_free (*ca, X509_free); | 127 | if (ca) sk_X509_pop_free (*ca, X509_free); |
115 | return 0; | 128 | return 0; |
116 | 129 | ||
117 | } | 130 | } |
118 | 131 | ||
119 | /* Parse the outer PKCS#12 structure */ | 132 | /* Parse the outer PKCS#12 structure */ |
120 | 133 | ||
121 | static int parse_pk12 (PKCS12 *p12, const char *pass, int passlen, | 134 | static int parse_pk12 (PKCS12 *p12, const char *pass, int passlen, |
122 | EVP_PKEY **pkey, X509 **cert, STACK **ca) | 135 | EVP_PKEY **pkey, X509 **cert, STACK_OF(X509) **ca) |
123 | { | 136 | { |
124 | STACK *asafes, *bags; | 137 | STACK *asafes, *bags; |
125 | int i, bagnid; | 138 | int i, bagnid; |
@@ -154,7 +167,7 @@ static int parse_pk12 (PKCS12 *p12, const char *pass, int passlen, | |||
154 | 167 | ||
155 | 168 | ||
156 | static int parse_bags (STACK *bags, const char *pass, int passlen, | 169 | static int parse_bags (STACK *bags, const char *pass, int passlen, |
157 | EVP_PKEY **pkey, X509 **cert, STACK **ca, | 170 | EVP_PKEY **pkey, X509 **cert, STACK_OF(X509) **ca, |
158 | ASN1_OCTET_STRING **keyid, char *keymatch) | 171 | ASN1_OCTET_STRING **keyid, char *keymatch) |
159 | { | 172 | { |
160 | int i; | 173 | int i; |
@@ -171,7 +184,7 @@ static int parse_bags (STACK *bags, const char *pass, int passlen, | |||
171 | #define MATCH_ALL 0x3 | 184 | #define MATCH_ALL 0x3 |
172 | 185 | ||
173 | static int parse_bag(PKCS12_SAFEBAG *bag, const char *pass, int passlen, | 186 | static int parse_bag(PKCS12_SAFEBAG *bag, const char *pass, int passlen, |
174 | EVP_PKEY **pkey, X509 **cert, STACK **ca, | 187 | EVP_PKEY **pkey, X509 **cert, STACK_OF(X509) **ca, |
175 | ASN1_OCTET_STRING **keyid, | 188 | ASN1_OCTET_STRING **keyid, |
176 | char *keymatch) | 189 | char *keymatch) |
177 | { | 190 | { |
@@ -221,7 +234,10 @@ static int parse_bag(PKCS12_SAFEBAG *bag, const char *pass, int passlen, | |||
221 | if (lkey) { | 234 | if (lkey) { |
222 | *keymatch |= MATCH_CERT; | 235 | *keymatch |= MATCH_CERT; |
223 | if (cert) *cert = x509; | 236 | if (cert) *cert = x509; |
224 | } else if (ca) sk_push (*ca, (char *)x509); | 237 | } else { |
238 | if(ca) sk_X509_push (*ca, x509); | ||
239 | else X509_free(x509); | ||
240 | } | ||
225 | break; | 241 | break; |
226 | 242 | ||
227 | case NID_safeContentsBag: | 243 | case NID_safeContentsBag: |
diff --git a/src/lib/libcrypto/pkcs12/p12_mutl.c b/src/lib/libcrypto/pkcs12/p12_mutl.c index f1094b3840..369257ed4c 100644 --- a/src/lib/libcrypto/pkcs12/p12_mutl.c +++ b/src/lib/libcrypto/pkcs12/p12_mutl.c | |||
@@ -157,7 +157,7 @@ int PKCS12_setup_mac (PKCS12 *p12, int iter, unsigned char *salt, int saltlen, | |||
157 | return 0; | 157 | return 0; |
158 | } | 158 | } |
159 | if (!salt) { | 159 | if (!salt) { |
160 | if (RAND_bytes (p12->mac->salt->data, saltlen) <= 0) | 160 | if (RAND_pseudo_bytes (p12->mac->salt->data, saltlen) < 0) |
161 | return 0; | 161 | return 0; |
162 | } | 162 | } |
163 | else memcpy (p12->mac->salt->data, salt, saltlen); | 163 | else memcpy (p12->mac->salt->data, salt, saltlen); |
diff --git a/src/lib/libcrypto/pkcs12/pk12err.c b/src/lib/libcrypto/pkcs12/pk12err.c index 9d8de10e1e..12db54f49e 100644 --- a/src/lib/libcrypto/pkcs12/pk12err.c +++ b/src/lib/libcrypto/pkcs12/pk12err.c | |||
@@ -54,7 +54,8 @@ | |||
54 | */ | 54 | */ |
55 | 55 | ||
56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes |
57 | * made to it will be overwritten when the script next updates this file. | 57 | * made to it will be overwritten when the script next updates this file, |
58 | * only reason strings will be preserved. | ||
58 | */ | 59 | */ |
59 | 60 | ||
60 | #include <stdio.h> | 61 | #include <stdio.h> |
diff --git a/src/lib/libcrypto/pkcs12/pkcs12.h b/src/lib/libcrypto/pkcs12/pkcs12.h index 254000fa12..dad356c00f 100644 --- a/src/lib/libcrypto/pkcs12/pkcs12.h +++ b/src/lib/libcrypto/pkcs12/pkcs12.h | |||
@@ -265,9 +265,9 @@ void PKCS12_SAFEBAG_free(PKCS12_SAFEBAG *a); | |||
265 | void ERR_load_PKCS12_strings(void); | 265 | void ERR_load_PKCS12_strings(void); |
266 | void PKCS12_PBE_add(void); | 266 | void PKCS12_PBE_add(void); |
267 | int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert, | 267 | int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert, |
268 | STACK **ca); | 268 | STACK_OF(X509) **ca); |
269 | PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert, | 269 | PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert, |
270 | STACK *ca, int nid_key, int nid_cert, int iter, | 270 | STACK_OF(X509) *ca, int nid_key, int nid_cert, int iter, |
271 | int mac_iter, int keytype); | 271 | int mac_iter, int keytype); |
272 | int i2d_PKCS12_bio(BIO *bp, PKCS12 *p12); | 272 | int i2d_PKCS12_bio(BIO *bp, PKCS12 *p12); |
273 | int i2d_PKCS12_fp(FILE *fp, PKCS12 *p12); | 273 | int i2d_PKCS12_fp(FILE *fp, PKCS12 *p12); |
diff --git a/src/lib/libcrypto/pkcs7/README b/src/lib/libcrypto/pkcs7/README index 27001c6970..e69de29bb2 100644 --- a/src/lib/libcrypto/pkcs7/README +++ b/src/lib/libcrypto/pkcs7/README | |||
@@ -1,5 +0,0 @@ | |||
1 | WARNING | ||
2 | |||
3 | Everything in this directory is experimental and is subject to change. | ||
4 | |||
5 | Do not rely on the stuff in here not changing in the next release | ||
diff --git a/src/lib/libcrypto/pkcs7/pk7_doit.c b/src/lib/libcrypto/pkcs7/pk7_doit.c index 80ac5e34b4..4ab24a86f5 100644 --- a/src/lib/libcrypto/pkcs7/pk7_doit.c +++ b/src/lib/libcrypto/pkcs7/pk7_doit.c | |||
@@ -699,6 +699,7 @@ int PKCS7_dataVerify(X509_STORE *cert_store, X509_STORE_CTX *ctx, BIO *bio, | |||
699 | if (i <= 0) | 699 | if (i <= 0) |
700 | { | 700 | { |
701 | PKCS7err(PKCS7_F_PKCS7_DATAVERIFY,ERR_R_X509_LIB); | 701 | PKCS7err(PKCS7_F_PKCS7_DATAVERIFY,ERR_R_X509_LIB); |
702 | X509_STORE_CTX_cleanup(ctx); | ||
702 | goto err; | 703 | goto err; |
703 | } | 704 | } |
704 | X509_STORE_CTX_cleanup(ctx); | 705 | X509_STORE_CTX_cleanup(ctx); |
diff --git a/src/lib/libcrypto/pkcs7/pkcs7err.c b/src/lib/libcrypto/pkcs7/pkcs7err.c index 813a8af9ed..8ded8913db 100644 --- a/src/lib/libcrypto/pkcs7/pkcs7err.c +++ b/src/lib/libcrypto/pkcs7/pkcs7err.c | |||
@@ -54,7 +54,8 @@ | |||
54 | */ | 54 | */ |
55 | 55 | ||
56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes |
57 | * made to it will be overwritten when the script next updates this file. | 57 | * made to it will be overwritten when the script next updates this file, |
58 | * only reason strings will be preserved. | ||
58 | */ | 59 | */ |
59 | 60 | ||
60 | #include <stdio.h> | 61 | #include <stdio.h> |
diff --git a/src/lib/libcrypto/rand/md_rand.c b/src/lib/libcrypto/rand/md_rand.c index 6b158f0349..da4258c479 100644 --- a/src/lib/libcrypto/rand/md_rand.c +++ b/src/lib/libcrypto/rand/md_rand.c | |||
@@ -55,6 +55,59 @@ | |||
55 | * copied and put under another distribution licence | 55 | * copied and put under another distribution licence |
56 | * [including the GNU Public Licence.] | 56 | * [including the GNU Public Licence.] |
57 | */ | 57 | */ |
58 | /* ==================================================================== | ||
59 | * Copyright (c) 1998-2000 The OpenSSL Project. All rights reserved. | ||
60 | * | ||
61 | * Redistribution and use in source and binary forms, with or without | ||
62 | * modification, are permitted provided that the following conditions | ||
63 | * are met: | ||
64 | * | ||
65 | * 1. Redistributions of source code must retain the above copyright | ||
66 | * notice, this list of conditions and the following disclaimer. | ||
67 | * | ||
68 | * 2. Redistributions in binary form must reproduce the above copyright | ||
69 | * notice, this list of conditions and the following disclaimer in | ||
70 | * the documentation and/or other materials provided with the | ||
71 | * distribution. | ||
72 | * | ||
73 | * 3. All advertising materials mentioning features or use of this | ||
74 | * software must display the following acknowledgment: | ||
75 | * "This product includes software developed by the OpenSSL Project | ||
76 | * for use in the OpenSSL Toolkit. (http://www.openssl.org/)" | ||
77 | * | ||
78 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
79 | * endorse or promote products derived from this software without | ||
80 | * prior written permission. For written permission, please contact | ||
81 | * openssl-core@openssl.org. | ||
82 | * | ||
83 | * 5. Products derived from this software may not be called "OpenSSL" | ||
84 | * nor may "OpenSSL" appear in their names without prior written | ||
85 | * permission of the OpenSSL Project. | ||
86 | * | ||
87 | * 6. Redistributions of any form whatsoever must retain the following | ||
88 | * acknowledgment: | ||
89 | * "This product includes software developed by the OpenSSL Project | ||
90 | * for use in the OpenSSL Toolkit (http://www.openssl.org/)" | ||
91 | * | ||
92 | * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
93 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
94 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
95 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
96 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
97 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
98 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
99 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
100 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
101 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
102 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
103 | * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
104 | * ==================================================================== | ||
105 | * | ||
106 | * This product includes cryptographic software written by Eric Young | ||
107 | * (eay@cryptsoft.com). This product includes software written by Tim | ||
108 | * Hudson (tjh@cryptsoft.com). | ||
109 | * | ||
110 | */ | ||
58 | 111 | ||
59 | #define ENTROPY_NEEDED 16 /* require 128 bits = 16 bytes of randomness */ | 112 | #define ENTROPY_NEEDED 16 /* require 128 bits = 16 bytes of randomness */ |
60 | 113 | ||
@@ -130,6 +183,10 @@ | |||
130 | 183 | ||
131 | #include <openssl/rand.h> | 184 | #include <openssl/rand.h> |
132 | 185 | ||
186 | #ifdef BN_DEBUG | ||
187 | # define PREDICT | ||
188 | #endif | ||
189 | |||
133 | /* #define NORAND 1 */ | 190 | /* #define NORAND 1 */ |
134 | /* #define PREDICT 1 */ | 191 | /* #define PREDICT 1 */ |
135 | 192 | ||
@@ -141,6 +198,10 @@ static long md_count[2]={0,0}; | |||
141 | static double entropy=0; | 198 | static double entropy=0; |
142 | static int initialized=0; | 199 | static int initialized=0; |
143 | 200 | ||
201 | #ifdef PREDICT | ||
202 | int rand_predictable=0; | ||
203 | #endif | ||
204 | |||
144 | const char *RAND_version="RAND" OPENSSL_VERSION_PTEXT; | 205 | const char *RAND_version="RAND" OPENSSL_VERSION_PTEXT; |
145 | 206 | ||
146 | static void ssleay_rand_cleanup(void); | 207 | static void ssleay_rand_cleanup(void); |
@@ -148,6 +209,7 @@ static void ssleay_rand_seed(const void *buf, int num); | |||
148 | static void ssleay_rand_add(const void *buf, int num, double add_entropy); | 209 | static void ssleay_rand_add(const void *buf, int num, double add_entropy); |
149 | static int ssleay_rand_bytes(unsigned char *buf, int num); | 210 | static int ssleay_rand_bytes(unsigned char *buf, int num); |
150 | static int ssleay_rand_pseudo_bytes(unsigned char *buf, int num); | 211 | static int ssleay_rand_pseudo_bytes(unsigned char *buf, int num); |
212 | static int ssleay_rand_status(void); | ||
151 | 213 | ||
152 | RAND_METHOD rand_ssleay_meth={ | 214 | RAND_METHOD rand_ssleay_meth={ |
153 | ssleay_rand_seed, | 215 | ssleay_rand_seed, |
@@ -155,6 +217,7 @@ RAND_METHOD rand_ssleay_meth={ | |||
155 | ssleay_rand_cleanup, | 217 | ssleay_rand_cleanup, |
156 | ssleay_rand_add, | 218 | ssleay_rand_add, |
157 | ssleay_rand_pseudo_bytes, | 219 | ssleay_rand_pseudo_bytes, |
220 | ssleay_rand_status | ||
158 | }; | 221 | }; |
159 | 222 | ||
160 | RAND_METHOD *RAND_SSLeay(void) | 223 | RAND_METHOD *RAND_SSLeay(void) |
@@ -306,6 +369,10 @@ static void ssleay_rand_initialize(void) | |||
306 | FILE *fh; | 369 | FILE *fh; |
307 | #endif | 370 | #endif |
308 | 371 | ||
372 | #ifdef NORAND | ||
373 | return; | ||
374 | #endif | ||
375 | |||
309 | CRYPTO_w_unlock(CRYPTO_LOCK_RAND); | 376 | CRYPTO_w_unlock(CRYPTO_LOCK_RAND); |
310 | /* put in some default random data, we need more than just this */ | 377 | /* put in some default random data, we need more than just this */ |
311 | #ifndef GETPID_IS_MEANINGLESS | 378 | #ifndef GETPID_IS_MEANINGLESS |
@@ -354,13 +421,14 @@ static int ssleay_rand_bytes(unsigned char *buf, int num) | |||
354 | #endif | 421 | #endif |
355 | 422 | ||
356 | #ifdef PREDICT | 423 | #ifdef PREDICT |
357 | { | 424 | if (rand_predictable) |
358 | static unsigned char val=0; | 425 | { |
426 | static unsigned char val=0; | ||
359 | 427 | ||
360 | for (i=0; i<num; i++) | 428 | for (i=0; i<num; i++) |
361 | buf[i]=val++; | 429 | buf[i]=val++; |
362 | return(1); | 430 | return(1); |
363 | } | 431 | } |
364 | #endif | 432 | #endif |
365 | 433 | ||
366 | /* | 434 | /* |
@@ -489,17 +557,66 @@ static int ssleay_rand_pseudo_bytes(unsigned char *buf, int num) | |||
489 | return (ret); | 557 | return (ret); |
490 | } | 558 | } |
491 | 559 | ||
492 | int RAND_status(void) | 560 | static int ssleay_rand_status(void) |
493 | { | 561 | { |
562 | int ret; | ||
563 | |||
564 | CRYPTO_w_lock(CRYPTO_LOCK_RAND); | ||
565 | |||
494 | if (!initialized) | 566 | if (!initialized) |
495 | ssleay_rand_initialize(); | 567 | ssleay_rand_initialize(); |
496 | return (entropy >= ENTROPY_NEEDED); | 568 | ret = entropy >= ENTROPY_NEEDED; |
569 | |||
570 | CRYPTO_w_unlock(CRYPTO_LOCK_RAND); | ||
571 | |||
572 | return ret; | ||
497 | } | 573 | } |
498 | 574 | ||
499 | #ifdef WINDOWS | 575 | #ifdef WINDOWS |
500 | #include <windows.h> | 576 | #include <windows.h> |
501 | #include <openssl/rand.h> | 577 | #include <openssl/rand.h> |
502 | 578 | ||
579 | int RAND_event(UINT iMsg, WPARAM wParam, LPARAM lParam) | ||
580 | { | ||
581 | double add_entropy=0; | ||
582 | SYSTEMTIME t; | ||
583 | |||
584 | switch (iMsg) | ||
585 | { | ||
586 | case WM_KEYDOWN: | ||
587 | { | ||
588 | static WPARAM key; | ||
589 | if (key != wParam) | ||
590 | add_entropy = 0.05; | ||
591 | key = wParam; | ||
592 | } | ||
593 | break; | ||
594 | case WM_MOUSEMOVE: | ||
595 | { | ||
596 | static int lastx,lasty,lastdx,lastdy; | ||
597 | int x,y,dx,dy; | ||
598 | |||
599 | x=LOWORD(lParam); | ||
600 | y=HIWORD(lParam); | ||
601 | dx=lastx-x; | ||
602 | dy=lasty-y; | ||
603 | if (dx != 0 && dy != 0 && dx-lastdx != 0 && dy-lastdy != 0) | ||
604 | add_entropy=.2; | ||
605 | lastx=x, lasty=y; | ||
606 | lastdx=dx, lastdy=dy; | ||
607 | } | ||
608 | break; | ||
609 | } | ||
610 | |||
611 | GetSystemTime(&t); | ||
612 | RAND_add(&iMsg, sizeof(iMsg), add_entropy); | ||
613 | RAND_add(&wParam, sizeof(wParam), 0); | ||
614 | RAND_add(&lParam, sizeof(lParam), 0); | ||
615 | RAND_add(&t, sizeof(t), 0); | ||
616 | |||
617 | return (RAND_status()); | ||
618 | } | ||
619 | |||
503 | /***************************************************************************** | 620 | /***************************************************************************** |
504 | * Initialisation function for the SSL random generator. Takes the contents | 621 | * Initialisation function for the SSL random generator. Takes the contents |
505 | * of the screen as random seed. | 622 | * of the screen as random seed. |
diff --git a/src/lib/libcrypto/rand/rand.h b/src/lib/libcrypto/rand/rand.h index 28f45ec052..2973ee90e4 100644 --- a/src/lib/libcrypto/rand/rand.h +++ b/src/lib/libcrypto/rand/rand.h | |||
@@ -70,8 +70,13 @@ typedef struct rand_meth_st | |||
70 | void (*cleanup)(void); | 70 | void (*cleanup)(void); |
71 | void (*add)(const void *buf, int num, double entropy); | 71 | void (*add)(const void *buf, int num, double entropy); |
72 | int (*pseudorand)(unsigned char *buf, int num); | 72 | int (*pseudorand)(unsigned char *buf, int num); |
73 | int (*status)(void); | ||
73 | } RAND_METHOD; | 74 | } RAND_METHOD; |
74 | 75 | ||
76 | #ifdef BN_DEBUG | ||
77 | extern int rand_predictable; | ||
78 | #endif | ||
79 | |||
75 | void RAND_set_rand_method(RAND_METHOD *meth); | 80 | void RAND_set_rand_method(RAND_METHOD *meth); |
76 | RAND_METHOD *RAND_get_rand_method(void ); | 81 | RAND_METHOD *RAND_get_rand_method(void ); |
77 | RAND_METHOD *RAND_SSLeay(void); | 82 | RAND_METHOD *RAND_SSLeay(void); |
@@ -85,8 +90,10 @@ int RAND_write_file(const char *file); | |||
85 | const char *RAND_file_name(char *file,int num); | 90 | const char *RAND_file_name(char *file,int num); |
86 | int RAND_status(void); | 91 | int RAND_status(void); |
87 | int RAND_egd(const char *path); | 92 | int RAND_egd(const char *path); |
88 | #ifdef WINDOWS | 93 | #if defined(WINDOWS) || defined(WIN32) |
94 | #include <windows.h> | ||
89 | void RAND_screen(void); | 95 | void RAND_screen(void); |
96 | int RAND_event(UINT, WPARAM, LPARAM); | ||
90 | #endif | 97 | #endif |
91 | void ERR_load_RAND_strings(void); | 98 | void ERR_load_RAND_strings(void); |
92 | 99 | ||
diff --git a/src/lib/libcrypto/rand/rand_egd.c b/src/lib/libcrypto/rand/rand_egd.c index d834408bd4..380c7828c3 100644 --- a/src/lib/libcrypto/rand/rand_egd.c +++ b/src/lib/libcrypto/rand/rand_egd.c | |||
@@ -97,7 +97,7 @@ int RAND_egd(const char *path) | |||
97 | buf[1] = 255; | 97 | buf[1] = 255; |
98 | write(fd, buf, 2); | 98 | write(fd, buf, 2); |
99 | if (read(fd, buf, 1) != 1) goto err; | 99 | if (read(fd, buf, 1) != 1) goto err; |
100 | if (buf[0] == 0) goto err; | 100 | if (buf[0] == 0) goto err; |
101 | num = read(fd, buf, 255); | 101 | num = read(fd, buf, 255); |
102 | if (num < 1) goto err; | 102 | if (num < 1) goto err; |
103 | RAND_seed(buf, num); | 103 | RAND_seed(buf, num); |
diff --git a/src/lib/libcrypto/rand/rand_err.c b/src/lib/libcrypto/rand/rand_err.c index d1263edf80..1af0aa0b8a 100644 --- a/src/lib/libcrypto/rand/rand_err.c +++ b/src/lib/libcrypto/rand/rand_err.c | |||
@@ -54,7 +54,8 @@ | |||
54 | */ | 54 | */ |
55 | 55 | ||
56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes |
57 | * made to it will be overwritten when the script next updates this file. | 57 | * made to it will be overwritten when the script next updates this file, |
58 | * only reason strings will be preserved. | ||
58 | */ | 59 | */ |
59 | 60 | ||
60 | #include <stdio.h> | 61 | #include <stdio.h> |
@@ -71,7 +72,7 @@ static ERR_STRING_DATA RAND_str_functs[]= | |||
71 | 72 | ||
72 | static ERR_STRING_DATA RAND_str_reasons[]= | 73 | static ERR_STRING_DATA RAND_str_reasons[]= |
73 | { | 74 | { |
74 | {RAND_R_PRNG_NOT_SEEDED ,"prng not seeded"}, | 75 | {RAND_R_PRNG_NOT_SEEDED ,"PRNG not seeded"}, |
75 | {0,NULL} | 76 | {0,NULL} |
76 | }; | 77 | }; |
77 | 78 | ||
diff --git a/src/lib/libcrypto/rand/rand_lib.c b/src/lib/libcrypto/rand/rand_lib.c index b09a300c46..7da74aab0e 100644 --- a/src/lib/libcrypto/rand/rand_lib.c +++ b/src/lib/libcrypto/rand/rand_lib.c | |||
@@ -108,3 +108,10 @@ int RAND_pseudo_bytes(unsigned char *buf, int num) | |||
108 | return rand_meth->pseudorand(buf,num); | 108 | return rand_meth->pseudorand(buf,num); |
109 | return(-1); | 109 | return(-1); |
110 | } | 110 | } |
111 | |||
112 | int RAND_status(void) | ||
113 | { | ||
114 | if (rand_meth != NULL) | ||
115 | return rand_meth->status(); | ||
116 | return 0; | ||
117 | } | ||
diff --git a/src/lib/libcrypto/rand/randfile.c b/src/lib/libcrypto/rand/randfile.c index 658a8d6b65..9ff3974cc7 100644 --- a/src/lib/libcrypto/rand/randfile.c +++ b/src/lib/libcrypto/rand/randfile.c | |||
@@ -133,35 +133,20 @@ int RAND_write_file(const char *file) | |||
133 | int i,ret=0,err=0; | 133 | int i,ret=0,err=0; |
134 | FILE *out = NULL; | 134 | FILE *out = NULL; |
135 | int n; | 135 | int n; |
136 | 136 | ||
137 | #ifdef VMS | 137 | #if defined(O_CREAT) && defined(O_EXCL) && !defined(WIN32) |
138 | /* Under VMS, fopen(file, "wb") will create a new version of the | 138 | /* For some reason Win32 can't write to files created this way */ |
139 | same file. This is not good, so let's try updating an existing | 139 | |
140 | one, and create file only if it doesn't already exist. */ | 140 | /* chmod(..., 0600) is too late to protect the file, |
141 | /* At the same time, if we just update a file, we also need to | 141 | * permissions should be restrictive from the start */ |
142 | truncate it, and unfortunately, ftruncate() and truncate() do | 142 | int fd = open(file, O_CREAT | O_EXCL, 0600); |
143 | not exist everywhere. All that remains is to delete old versions | 143 | if (fd != -1) |
144 | of the random data file (done at the end). */ | 144 | out = fdopen(fd, "wb"); |
145 | #if 0 | ||
146 | out=fopen(file,"rb+"); | ||
147 | if (out == NULL && errno != ENOENT) | ||
148 | goto err; | ||
149 | #endif | ||
150 | #endif | 145 | #endif |
146 | if (out == NULL) | ||
147 | out = fopen(file,"wb"); | ||
148 | if (out == NULL) goto err; | ||
151 | 149 | ||
152 | if (out == NULL) | ||
153 | { | ||
154 | #if defined O_CREAT && defined O_EXCL | ||
155 | /* chmod(..., 0600) is too late to protect the file, | ||
156 | * permissions should be restrictive from the start */ | ||
157 | int fd = open(file, O_CREAT | O_EXCL, 0600); | ||
158 | if (fd != -1) | ||
159 | out = fdopen(fd, "wb"); | ||
160 | #else | ||
161 | out=fopen(file,"wb"); | ||
162 | #endif | ||
163 | } | ||
164 | if (out == NULL) goto err; | ||
165 | #ifndef NO_CHMOD | 150 | #ifndef NO_CHMOD |
166 | chmod(file,0600); | 151 | chmod(file,0600); |
167 | #endif | 152 | #endif |
@@ -180,14 +165,8 @@ int RAND_write_file(const char *file) | |||
180 | } | 165 | } |
181 | ret+=i; | 166 | ret+=i; |
182 | if (n <= 0) break; | 167 | if (n <= 0) break; |
183 | } | 168 | } |
184 | #ifdef VMS | 169 | #ifdef VMS |
185 | /* We may have updated an existing file using mode "rb+", | ||
186 | * now remove any old extra bytes */ | ||
187 | #if 0 | ||
188 | if (ret > 0) | ||
189 | ftruncate(fileno(out), ret); | ||
190 | #else | ||
191 | /* Try to delete older versions of the file, until there aren't | 170 | /* Try to delete older versions of the file, until there aren't |
192 | any */ | 171 | any */ |
193 | { | 172 | { |
@@ -205,8 +184,7 @@ int RAND_write_file(const char *file) | |||
205 | some point... */ | 184 | some point... */ |
206 | } | 185 | } |
207 | } | 186 | } |
208 | #endif | 187 | #endif /* VMS */ |
209 | #endif | ||
210 | 188 | ||
211 | fclose(out); | 189 | fclose(out); |
212 | memset(buf,0,BUFSIZE); | 190 | memset(buf,0,BUFSIZE); |
diff --git a/src/lib/libcrypto/rc2/Makefile.uni b/src/lib/libcrypto/rc2/Makefile.uni index 4dc20c6fcf..e69de29bb2 100644 --- a/src/lib/libcrypto/rc2/Makefile.uni +++ b/src/lib/libcrypto/rc2/Makefile.uni | |||
@@ -1,73 +0,0 @@ | |||
1 | # Targets | ||
2 | # make - twidle the options yourself :-) | ||
3 | # make cc - standard cc options | ||
4 | # make gcc - standard gcc options | ||
5 | |||
6 | DIR= rc2 | ||
7 | TOP= . | ||
8 | CC= gcc | ||
9 | CFLAG= -O3 -fomit-frame-pointer | ||
10 | |||
11 | CPP= $(CC) -E | ||
12 | INCLUDES= | ||
13 | INSTALLTOP=/usr/local/lib | ||
14 | MAKE= make | ||
15 | MAKEDEPEND= makedepend | ||
16 | MAKEFILE= Makefile.uni | ||
17 | AR= ar r | ||
18 | RANLIB= ranlib | ||
19 | |||
20 | IDEA_ENC=rc2_cbc.o | ||
21 | |||
22 | CFLAGS= $(INCLUDES) $(CFLAG) | ||
23 | |||
24 | GENERAL=Makefile | ||
25 | TEST=rc2test | ||
26 | APPS=rc2speed | ||
27 | |||
28 | LIB=librc2.a | ||
29 | LIBSRC=rc2_skey.c rc2_ecb.c rc2_cbc.c rc2cfb64.c rc2ofb64.c | ||
30 | LIBOBJ=rc2_skey.o rc2_ecb.o $(IDEA_ENC) rc2cfb64.o rc2ofb64.o | ||
31 | |||
32 | SRC= $(LIBSRC) | ||
33 | |||
34 | EXHEADER= rc2.h | ||
35 | HEADER= rc2_locl.h $(EXHEADER) | ||
36 | |||
37 | ALL= $(GENERAL) $(SRC) $(HEADER) | ||
38 | |||
39 | all: $(LIB) $(TEST) $(APPS) | ||
40 | |||
41 | $(LIB): $(LIBOBJ) | ||
42 | $(AR) $(LIB) $(LIBOBJ) | ||
43 | $(RANLIB) $(LIB) | ||
44 | |||
45 | test: $(TEST) | ||
46 | ./$(TEST) | ||
47 | |||
48 | $(TEST): $(TEST).c $(LIB) | ||
49 | $(CC) -o $(TEST) $(CFLAGS) $(TEST).c $(LIB) | ||
50 | |||
51 | $(APPS): $(APPS).c $(LIB) | ||
52 | $(CC) -o $(APPS) $(CFLAGS) $(APPS).c $(LIB) | ||
53 | |||
54 | lint: | ||
55 | lint -DLINT $(INCLUDES) $(SRC)>fluff | ||
56 | |||
57 | depend: | ||
58 | $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) | ||
59 | |||
60 | dclean: | ||
61 | perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new | ||
62 | mv -f Makefile.new $(MAKEFILE) | ||
63 | |||
64 | clean: | ||
65 | /bin/rm -f $(LIB) $(TEST) $(APPS) *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff | ||
66 | |||
67 | cc: | ||
68 | $(MAKE) CC="cc" CFLAG="-O" all | ||
69 | |||
70 | gcc: | ||
71 | $(MAKE) CC="gcc" CFLAGS="-O3 -fomit-frame-pointer" all | ||
72 | |||
73 | # DO NOT DELETE THIS LINE -- make depend depends on it. | ||
diff --git a/src/lib/libcrypto/rc4/Makefile.ssl b/src/lib/libcrypto/rc4/Makefile.ssl index 2ea95f0298..8d2a795c22 100644 --- a/src/lib/libcrypto/rc4/Makefile.ssl +++ b/src/lib/libcrypto/rc4/Makefile.ssl | |||
@@ -5,6 +5,7 @@ | |||
5 | DIR= rc4 | 5 | DIR= rc4 |
6 | TOP= ../.. | 6 | TOP= ../.. |
7 | CC= cc | 7 | CC= cc |
8 | CPP= $(CC) -E | ||
8 | INCLUDES= | 9 | INCLUDES= |
9 | CFLAG=-g | 10 | CFLAG=-g |
10 | INSTALL_PREFIX= | 11 | INSTALL_PREFIX= |
@@ -51,7 +52,7 @@ lib: $(LIBOBJ) | |||
51 | 52 | ||
52 | # elf | 53 | # elf |
53 | asm/rx86-elf.o: asm/rx86unix.cpp | 54 | asm/rx86-elf.o: asm/rx86unix.cpp |
54 | $(CPP) -DELF asm/rx86unix.cpp | as -o asm/rx86-elf.o | 55 | $(CPP) -DELF -x c asm/rx86unix.cpp | as -o asm/rx86-elf.o |
55 | 56 | ||
56 | # solaris | 57 | # solaris |
57 | asm/rx86-sol.o: asm/rx86unix.cpp | 58 | asm/rx86-sol.o: asm/rx86unix.cpp |
@@ -67,7 +68,7 @@ asm/rx86-out.o: asm/rx86unix.cpp | |||
67 | asm/rx86bsdi.o: asm/rx86unix.cpp | 68 | asm/rx86bsdi.o: asm/rx86unix.cpp |
68 | $(CPP) -DBSDI asm/rx86unix.cpp | sed 's/ :/:/' | as -o asm/rx86bsdi.o | 69 | $(CPP) -DBSDI asm/rx86unix.cpp | sed 's/ :/:/' | as -o asm/rx86bsdi.o |
69 | 70 | ||
70 | asm/rx86unix.cpp: asm/rc4-586.pl | 71 | asm/rx86unix.cpp: asm/rc4-586.pl ../perlasm/x86asm.pl |
71 | (cd asm; $(PERL) rc4-586.pl cpp >rx86unix.cpp) | 72 | (cd asm; $(PERL) rc4-586.pl cpp >rx86unix.cpp) |
72 | 73 | ||
73 | files: | 74 | files: |
diff --git a/src/lib/libcrypto/rc4/Makefile.uni b/src/lib/libcrypto/rc4/Makefile.uni index 855d9e50f3..e69de29bb2 100644 --- a/src/lib/libcrypto/rc4/Makefile.uni +++ b/src/lib/libcrypto/rc4/Makefile.uni | |||
@@ -1,103 +0,0 @@ | |||
1 | # Targets | ||
2 | # make - twidle the options yourself :-) | ||
3 | # make cc - standard cc options | ||
4 | # make gcc - standard gcc options | ||
5 | # make x86-elf - linux-elf etc | ||
6 | # make x86-out - linux-a.out, FreeBSD etc | ||
7 | # make x86-solaris | ||
8 | # make x86-bdsi | ||
9 | |||
10 | DIR= rc4 | ||
11 | TOP= . | ||
12 | CC= gcc | ||
13 | CFLAG= -O3 -fomit-frame-pointer | ||
14 | |||
15 | CPP= $(CC) -E | ||
16 | INCLUDES= | ||
17 | INSTALLTOP=/usr/local/lib | ||
18 | MAKE= make | ||
19 | MAKEDEPEND= makedepend | ||
20 | MAKEFILE= Makefile.uni | ||
21 | AR= ar r | ||
22 | RANLIB= ranlib | ||
23 | |||
24 | RC4_ENC=rc4_enc.o | ||
25 | # or use | ||
26 | #RC4_ENC=asm/rx86-elf.o | ||
27 | #RC4_ENC=asm/rx86-out.o | ||
28 | #RC4_ENC=asm/rx86-sol.o | ||
29 | #RC4_ENC=asm/rx86bdsi.o | ||
30 | |||
31 | CFLAGS= $(INCLUDES) $(CFLAG) | ||
32 | |||
33 | GENERAL=Makefile | ||
34 | TEST=rc4test | ||
35 | APPS=rc4speed | ||
36 | |||
37 | LIB=librc4.a | ||
38 | LIBSRC=rc4_skey.c rc4_enc.c | ||
39 | LIBOBJ=rc4_skey.o $(RC4_ENC) | ||
40 | |||
41 | SRC= $(LIBSRC) | ||
42 | |||
43 | EXHEADER= rc4.h | ||
44 | HEADER= $(EXHEADER) rc4_locl.h | ||
45 | |||
46 | ALL= $(GENERAL) $(SRC) $(HEADER) | ||
47 | |||
48 | all: $(LIB) $(TEST) $(APPS) | ||
49 | |||
50 | $(LIB): $(LIBOBJ) | ||
51 | $(AR) $(LIB) $(LIBOBJ) | ||
52 | $(RANLIB) $(LIB) | ||
53 | |||
54 | # elf | ||
55 | asm/rx86-elf.o: asm/rx86unix.cpp | ||
56 | $(CPP) -DELF asm/rx86unix.cpp | as -o asm/rx86-elf.o | ||
57 | |||
58 | # solaris | ||
59 | asm/rx86-sol.o: asm/rx86unix.cpp | ||
60 | $(CC) -E -DSOL asm/rx86unix.cpp | sed 's/^#.*//' > asm/rx86-sol.s | ||
61 | as -o asm/rx86-sol.o asm/rx86-sol.s | ||
62 | rm -f asm/rx86-sol.s | ||
63 | |||
64 | # a.out | ||
65 | asm/rx86-out.o: asm/rx86unix.cpp | ||
66 | $(CPP) -DOUT asm/rx86unix.cpp | as -o asm/rx86-out.o | ||
67 | |||
68 | # bsdi | ||
69 | asm/rx86bsdi.o: asm/rx86unix.cpp | ||
70 | $(CPP) -DBSDI asm/rx86unix.cpp | as -o asm/rx86bsdi.o | ||
71 | |||
72 | asm/rx86unix.cpp: | ||
73 | (cd asm; perl rc4-586.pl cpp >rx86unix.cpp) | ||
74 | |||
75 | test: $(TEST) | ||
76 | ./$(TEST) | ||
77 | |||
78 | $(TEST): $(TEST).c $(LIB) | ||
79 | $(CC) -o $(TEST) $(CFLAGS) $(TEST).c $(LIB) | ||
80 | |||
81 | $(APPS): $(APPS).c $(LIB) | ||
82 | $(CC) -o $(APPS) $(CFLAGS) $(APPS).c $(LIB) | ||
83 | |||
84 | lint: | ||
85 | lint -DLINT $(INCLUDES) $(SRC)>fluff | ||
86 | |||
87 | depend: | ||
88 | $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) | ||
89 | |||
90 | dclean: | ||
91 | perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new | ||
92 | mv -f Makefile.new $(MAKEFILE) | ||
93 | |||
94 | clean: | ||
95 | /bin/rm -f $(LIB) $(TEST) $(APPS) *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff | ||
96 | |||
97 | cc: | ||
98 | $(MAKE) CC="cc" CFLAG="-O" all | ||
99 | |||
100 | gcc: | ||
101 | $(MAKE) CC="gcc" CFLAGS="-O3 -fomit-frame-pointer" all | ||
102 | |||
103 | # DO NOT DELETE THIS LINE -- make depend depends on it. | ||
diff --git a/src/lib/libcrypto/rc4/asm/r4-win32.asm b/src/lib/libcrypto/rc4/asm/r4-win32.asm index 70b0f7484c..e69de29bb2 100644 --- a/src/lib/libcrypto/rc4/asm/r4-win32.asm +++ b/src/lib/libcrypto/rc4/asm/r4-win32.asm | |||
@@ -1,314 +0,0 @@ | |||
1 | ; Don't even think of reading this code | ||
2 | ; It was automatically generated by rc4-586.pl | ||
3 | ; Which is a perl program used to generate the x86 assember for | ||
4 | ; any of elf, a.out, BSDI,Win32, or Solaris | ||
5 | ; eric <eay@cryptsoft.com> | ||
6 | ; | ||
7 | TITLE rc4-586.asm | ||
8 | .386 | ||
9 | .model FLAT | ||
10 | _TEXT SEGMENT | ||
11 | PUBLIC _RC4 | ||
12 | |||
13 | _RC4 PROC NEAR | ||
14 | ; | ||
15 | push ebp | ||
16 | push ebx | ||
17 | mov ebp, DWORD PTR 12[esp] | ||
18 | mov ebx, DWORD PTR 16[esp] | ||
19 | push esi | ||
20 | push edi | ||
21 | mov ecx, DWORD PTR [ebp] | ||
22 | mov edx, DWORD PTR 4[ebp] | ||
23 | mov esi, DWORD PTR 28[esp] | ||
24 | inc ecx | ||
25 | sub esp, 12 | ||
26 | add ebp, 8 | ||
27 | and ecx, 255 | ||
28 | lea ebx, DWORD PTR [esi+ebx-8] | ||
29 | mov edi, DWORD PTR 44[esp] | ||
30 | mov DWORD PTR 8[esp],ebx | ||
31 | mov eax, DWORD PTR [ecx*4+ebp] | ||
32 | cmp ebx, esi | ||
33 | jl $L000end | ||
34 | L001start: | ||
35 | add esi, 8 | ||
36 | ; Round 0 | ||
37 | add edx, eax | ||
38 | and edx, 255 | ||
39 | inc ecx | ||
40 | mov ebx, DWORD PTR [edx*4+ebp] | ||
41 | mov DWORD PTR [ecx*4+ebp-4],ebx | ||
42 | add ebx, eax | ||
43 | and ecx, 255 | ||
44 | and ebx, 255 | ||
45 | mov DWORD PTR [edx*4+ebp],eax | ||
46 | nop | ||
47 | mov ebx, DWORD PTR [ebx*4+ebp] | ||
48 | mov eax, DWORD PTR [ecx*4+ebp] | ||
49 | mov BYTE PTR [esp], bl | ||
50 | ; Round 1 | ||
51 | add edx, eax | ||
52 | and edx, 255 | ||
53 | inc ecx | ||
54 | mov ebx, DWORD PTR [edx*4+ebp] | ||
55 | mov DWORD PTR [ecx*4+ebp-4],ebx | ||
56 | add ebx, eax | ||
57 | and ecx, 255 | ||
58 | and ebx, 255 | ||
59 | mov DWORD PTR [edx*4+ebp],eax | ||
60 | nop | ||
61 | mov ebx, DWORD PTR [ebx*4+ebp] | ||
62 | mov eax, DWORD PTR [ecx*4+ebp] | ||
63 | mov BYTE PTR 1[esp],bl | ||
64 | ; Round 2 | ||
65 | add edx, eax | ||
66 | and edx, 255 | ||
67 | inc ecx | ||
68 | mov ebx, DWORD PTR [edx*4+ebp] | ||
69 | mov DWORD PTR [ecx*4+ebp-4],ebx | ||
70 | add ebx, eax | ||
71 | and ecx, 255 | ||
72 | and ebx, 255 | ||
73 | mov DWORD PTR [edx*4+ebp],eax | ||
74 | nop | ||
75 | mov ebx, DWORD PTR [ebx*4+ebp] | ||
76 | mov eax, DWORD PTR [ecx*4+ebp] | ||
77 | mov BYTE PTR 2[esp],bl | ||
78 | ; Round 3 | ||
79 | add edx, eax | ||
80 | and edx, 255 | ||
81 | inc ecx | ||
82 | mov ebx, DWORD PTR [edx*4+ebp] | ||
83 | mov DWORD PTR [ecx*4+ebp-4],ebx | ||
84 | add ebx, eax | ||
85 | and ecx, 255 | ||
86 | and ebx, 255 | ||
87 | mov DWORD PTR [edx*4+ebp],eax | ||
88 | nop | ||
89 | mov ebx, DWORD PTR [ebx*4+ebp] | ||
90 | mov eax, DWORD PTR [ecx*4+ebp] | ||
91 | mov BYTE PTR 3[esp],bl | ||
92 | ; Round 4 | ||
93 | add edx, eax | ||
94 | and edx, 255 | ||
95 | inc ecx | ||
96 | mov ebx, DWORD PTR [edx*4+ebp] | ||
97 | mov DWORD PTR [ecx*4+ebp-4],ebx | ||
98 | add ebx, eax | ||
99 | and ecx, 255 | ||
100 | and ebx, 255 | ||
101 | mov DWORD PTR [edx*4+ebp],eax | ||
102 | nop | ||
103 | mov ebx, DWORD PTR [ebx*4+ebp] | ||
104 | mov eax, DWORD PTR [ecx*4+ebp] | ||
105 | mov BYTE PTR 4[esp],bl | ||
106 | ; Round 5 | ||
107 | add edx, eax | ||
108 | and edx, 255 | ||
109 | inc ecx | ||
110 | mov ebx, DWORD PTR [edx*4+ebp] | ||
111 | mov DWORD PTR [ecx*4+ebp-4],ebx | ||
112 | add ebx, eax | ||
113 | and ecx, 255 | ||
114 | and ebx, 255 | ||
115 | mov DWORD PTR [edx*4+ebp],eax | ||
116 | nop | ||
117 | mov ebx, DWORD PTR [ebx*4+ebp] | ||
118 | mov eax, DWORD PTR [ecx*4+ebp] | ||
119 | mov BYTE PTR 5[esp],bl | ||
120 | ; Round 6 | ||
121 | add edx, eax | ||
122 | and edx, 255 | ||
123 | inc ecx | ||
124 | mov ebx, DWORD PTR [edx*4+ebp] | ||
125 | mov DWORD PTR [ecx*4+ebp-4],ebx | ||
126 | add ebx, eax | ||
127 | and ecx, 255 | ||
128 | and ebx, 255 | ||
129 | mov DWORD PTR [edx*4+ebp],eax | ||
130 | nop | ||
131 | mov ebx, DWORD PTR [ebx*4+ebp] | ||
132 | mov eax, DWORD PTR [ecx*4+ebp] | ||
133 | mov BYTE PTR 6[esp],bl | ||
134 | ; Round 7 | ||
135 | add edx, eax | ||
136 | and edx, 255 | ||
137 | inc ecx | ||
138 | mov ebx, DWORD PTR [edx*4+ebp] | ||
139 | mov DWORD PTR [ecx*4+ebp-4],ebx | ||
140 | add ebx, eax | ||
141 | and ecx, 255 | ||
142 | and ebx, 255 | ||
143 | mov DWORD PTR [edx*4+ebp],eax | ||
144 | nop | ||
145 | mov ebx, DWORD PTR [ebx*4+ebp] | ||
146 | add edi, 8 | ||
147 | mov BYTE PTR 7[esp],bl | ||
148 | ; apply the cipher text | ||
149 | mov eax, DWORD PTR [esp] | ||
150 | mov ebx, DWORD PTR [esi-8] | ||
151 | xor eax, ebx | ||
152 | mov ebx, DWORD PTR [esi-4] | ||
153 | mov DWORD PTR [edi-8],eax | ||
154 | mov eax, DWORD PTR 4[esp] | ||
155 | xor eax, ebx | ||
156 | mov ebx, DWORD PTR 8[esp] | ||
157 | mov DWORD PTR [edi-4],eax | ||
158 | mov eax, DWORD PTR [ecx*4+ebp] | ||
159 | cmp esi, ebx | ||
160 | jle L001start | ||
161 | $L000end: | ||
162 | ; Round 0 | ||
163 | add ebx, 8 | ||
164 | inc esi | ||
165 | cmp ebx, esi | ||
166 | jl $L002finished | ||
167 | mov DWORD PTR 8[esp],ebx | ||
168 | add edx, eax | ||
169 | and edx, 255 | ||
170 | inc ecx | ||
171 | mov ebx, DWORD PTR [edx*4+ebp] | ||
172 | mov DWORD PTR [ecx*4+ebp-4],ebx | ||
173 | add ebx, eax | ||
174 | and ecx, 255 | ||
175 | and ebx, 255 | ||
176 | mov DWORD PTR [edx*4+ebp],eax | ||
177 | nop | ||
178 | mov ebx, DWORD PTR [ebx*4+ebp] | ||
179 | mov eax, DWORD PTR [ecx*4+ebp] | ||
180 | mov bh, BYTE PTR [esi-1] | ||
181 | xor bl, bh | ||
182 | mov BYTE PTR [edi], bl | ||
183 | ; Round 1 | ||
184 | mov ebx, DWORD PTR 8[esp] | ||
185 | cmp ebx, esi | ||
186 | jle $L002finished | ||
187 | inc esi | ||
188 | add edx, eax | ||
189 | and edx, 255 | ||
190 | inc ecx | ||
191 | mov ebx, DWORD PTR [edx*4+ebp] | ||
192 | mov DWORD PTR [ecx*4+ebp-4],ebx | ||
193 | add ebx, eax | ||
194 | and ecx, 255 | ||
195 | and ebx, 255 | ||
196 | mov DWORD PTR [edx*4+ebp],eax | ||
197 | nop | ||
198 | mov ebx, DWORD PTR [ebx*4+ebp] | ||
199 | mov eax, DWORD PTR [ecx*4+ebp] | ||
200 | mov bh, BYTE PTR [esi-1] | ||
201 | xor bl, bh | ||
202 | mov BYTE PTR 1[edi],bl | ||
203 | ; Round 2 | ||
204 | mov ebx, DWORD PTR 8[esp] | ||
205 | cmp ebx, esi | ||
206 | jle $L002finished | ||
207 | inc esi | ||
208 | add edx, eax | ||
209 | and edx, 255 | ||
210 | inc ecx | ||
211 | mov ebx, DWORD PTR [edx*4+ebp] | ||
212 | mov DWORD PTR [ecx*4+ebp-4],ebx | ||
213 | add ebx, eax | ||
214 | and ecx, 255 | ||
215 | and ebx, 255 | ||
216 | mov DWORD PTR [edx*4+ebp],eax | ||
217 | nop | ||
218 | mov ebx, DWORD PTR [ebx*4+ebp] | ||
219 | mov eax, DWORD PTR [ecx*4+ebp] | ||
220 | mov bh, BYTE PTR [esi-1] | ||
221 | xor bl, bh | ||
222 | mov BYTE PTR 2[edi],bl | ||
223 | ; Round 3 | ||
224 | mov ebx, DWORD PTR 8[esp] | ||
225 | cmp ebx, esi | ||
226 | jle $L002finished | ||
227 | inc esi | ||
228 | add edx, eax | ||
229 | and edx, 255 | ||
230 | inc ecx | ||
231 | mov ebx, DWORD PTR [edx*4+ebp] | ||
232 | mov DWORD PTR [ecx*4+ebp-4],ebx | ||
233 | add ebx, eax | ||
234 | and ecx, 255 | ||
235 | and ebx, 255 | ||
236 | mov DWORD PTR [edx*4+ebp],eax | ||
237 | nop | ||
238 | mov ebx, DWORD PTR [ebx*4+ebp] | ||
239 | mov eax, DWORD PTR [ecx*4+ebp] | ||
240 | mov bh, BYTE PTR [esi-1] | ||
241 | xor bl, bh | ||
242 | mov BYTE PTR 3[edi],bl | ||
243 | ; Round 4 | ||
244 | mov ebx, DWORD PTR 8[esp] | ||
245 | cmp ebx, esi | ||
246 | jle $L002finished | ||
247 | inc esi | ||
248 | add edx, eax | ||
249 | and edx, 255 | ||
250 | inc ecx | ||
251 | mov ebx, DWORD PTR [edx*4+ebp] | ||
252 | mov DWORD PTR [ecx*4+ebp-4],ebx | ||
253 | add ebx, eax | ||
254 | and ecx, 255 | ||
255 | and ebx, 255 | ||
256 | mov DWORD PTR [edx*4+ebp],eax | ||
257 | nop | ||
258 | mov ebx, DWORD PTR [ebx*4+ebp] | ||
259 | mov eax, DWORD PTR [ecx*4+ebp] | ||
260 | mov bh, BYTE PTR [esi-1] | ||
261 | xor bl, bh | ||
262 | mov BYTE PTR 4[edi],bl | ||
263 | ; Round 5 | ||
264 | mov ebx, DWORD PTR 8[esp] | ||
265 | cmp ebx, esi | ||
266 | jle $L002finished | ||
267 | inc esi | ||
268 | add edx, eax | ||
269 | and edx, 255 | ||
270 | inc ecx | ||
271 | mov ebx, DWORD PTR [edx*4+ebp] | ||
272 | mov DWORD PTR [ecx*4+ebp-4],ebx | ||
273 | add ebx, eax | ||
274 | and ecx, 255 | ||
275 | and ebx, 255 | ||
276 | mov DWORD PTR [edx*4+ebp],eax | ||
277 | nop | ||
278 | mov ebx, DWORD PTR [ebx*4+ebp] | ||
279 | mov eax, DWORD PTR [ecx*4+ebp] | ||
280 | mov bh, BYTE PTR [esi-1] | ||
281 | xor bl, bh | ||
282 | mov BYTE PTR 5[edi],bl | ||
283 | ; Round 6 | ||
284 | mov ebx, DWORD PTR 8[esp] | ||
285 | cmp ebx, esi | ||
286 | jle $L002finished | ||
287 | inc esi | ||
288 | add edx, eax | ||
289 | and edx, 255 | ||
290 | inc ecx | ||
291 | mov ebx, DWORD PTR [edx*4+ebp] | ||
292 | mov DWORD PTR [ecx*4+ebp-4],ebx | ||
293 | add ebx, eax | ||
294 | and ecx, 255 | ||
295 | and ebx, 255 | ||
296 | mov DWORD PTR [edx*4+ebp],eax | ||
297 | nop | ||
298 | mov ebx, DWORD PTR [ebx*4+ebp] | ||
299 | mov bh, BYTE PTR [esi-1] | ||
300 | xor bl, bh | ||
301 | mov BYTE PTR 6[edi],bl | ||
302 | $L002finished: | ||
303 | dec ecx | ||
304 | add esp, 12 | ||
305 | mov DWORD PTR [ebp-4],edx | ||
306 | mov BYTE PTR [ebp-8],cl | ||
307 | pop edi | ||
308 | pop esi | ||
309 | pop ebx | ||
310 | pop ebp | ||
311 | ret | ||
312 | _RC4 ENDP | ||
313 | _TEXT ENDS | ||
314 | END | ||
diff --git a/src/lib/libcrypto/rc5/Makefile.ssl b/src/lib/libcrypto/rc5/Makefile.ssl index 35abb9d0d1..5a54a162ba 100644 --- a/src/lib/libcrypto/rc5/Makefile.ssl +++ b/src/lib/libcrypto/rc5/Makefile.ssl | |||
@@ -49,7 +49,7 @@ lib: $(LIBOBJ) | |||
49 | 49 | ||
50 | # elf | 50 | # elf |
51 | asm/r586-elf.o: asm/r586unix.cpp | 51 | asm/r586-elf.o: asm/r586unix.cpp |
52 | $(CPP) -DELF asm/r586unix.cpp | as -o asm/r586-elf.o | 52 | $(CPP) -DELF -x c asm/r586unix.cpp | as -o asm/r586-elf.o |
53 | 53 | ||
54 | # solaris | 54 | # solaris |
55 | asm/r586-sol.o: asm/r586unix.cpp | 55 | asm/r586-sol.o: asm/r586unix.cpp |
@@ -65,7 +65,7 @@ asm/r586-out.o: asm/r586unix.cpp | |||
65 | asm/r586bsdi.o: asm/r586unix.cpp | 65 | asm/r586bsdi.o: asm/r586unix.cpp |
66 | $(CPP) -DBSDI asm/r586unix.cpp | sed 's/ :/:/' | as -o asm/r586bsdi.o | 66 | $(CPP) -DBSDI asm/r586unix.cpp | sed 's/ :/:/' | as -o asm/r586bsdi.o |
67 | 67 | ||
68 | asm/r586unix.cpp: | 68 | asm/r586unix.cpp: asm/rc5-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl |
69 | (cd asm; $(PERL) rc5-586.pl cpp >r586unix.cpp) | 69 | (cd asm; $(PERL) rc5-586.pl cpp >r586unix.cpp) |
70 | 70 | ||
71 | files: | 71 | files: |
diff --git a/src/lib/libcrypto/rc5/Makefile.uni b/src/lib/libcrypto/rc5/Makefile.uni index 4dc20c6fcf..e69de29bb2 100644 --- a/src/lib/libcrypto/rc5/Makefile.uni +++ b/src/lib/libcrypto/rc5/Makefile.uni | |||
@@ -1,73 +0,0 @@ | |||
1 | # Targets | ||
2 | # make - twidle the options yourself :-) | ||
3 | # make cc - standard cc options | ||
4 | # make gcc - standard gcc options | ||
5 | |||
6 | DIR= rc2 | ||
7 | TOP= . | ||
8 | CC= gcc | ||
9 | CFLAG= -O3 -fomit-frame-pointer | ||
10 | |||
11 | CPP= $(CC) -E | ||
12 | INCLUDES= | ||
13 | INSTALLTOP=/usr/local/lib | ||
14 | MAKE= make | ||
15 | MAKEDEPEND= makedepend | ||
16 | MAKEFILE= Makefile.uni | ||
17 | AR= ar r | ||
18 | RANLIB= ranlib | ||
19 | |||
20 | IDEA_ENC=rc2_cbc.o | ||
21 | |||
22 | CFLAGS= $(INCLUDES) $(CFLAG) | ||
23 | |||
24 | GENERAL=Makefile | ||
25 | TEST=rc2test | ||
26 | APPS=rc2speed | ||
27 | |||
28 | LIB=librc2.a | ||
29 | LIBSRC=rc2_skey.c rc2_ecb.c rc2_cbc.c rc2cfb64.c rc2ofb64.c | ||
30 | LIBOBJ=rc2_skey.o rc2_ecb.o $(IDEA_ENC) rc2cfb64.o rc2ofb64.o | ||
31 | |||
32 | SRC= $(LIBSRC) | ||
33 | |||
34 | EXHEADER= rc2.h | ||
35 | HEADER= rc2_locl.h $(EXHEADER) | ||
36 | |||
37 | ALL= $(GENERAL) $(SRC) $(HEADER) | ||
38 | |||
39 | all: $(LIB) $(TEST) $(APPS) | ||
40 | |||
41 | $(LIB): $(LIBOBJ) | ||
42 | $(AR) $(LIB) $(LIBOBJ) | ||
43 | $(RANLIB) $(LIB) | ||
44 | |||
45 | test: $(TEST) | ||
46 | ./$(TEST) | ||
47 | |||
48 | $(TEST): $(TEST).c $(LIB) | ||
49 | $(CC) -o $(TEST) $(CFLAGS) $(TEST).c $(LIB) | ||
50 | |||
51 | $(APPS): $(APPS).c $(LIB) | ||
52 | $(CC) -o $(APPS) $(CFLAGS) $(APPS).c $(LIB) | ||
53 | |||
54 | lint: | ||
55 | lint -DLINT $(INCLUDES) $(SRC)>fluff | ||
56 | |||
57 | depend: | ||
58 | $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) | ||
59 | |||
60 | dclean: | ||
61 | perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new | ||
62 | mv -f Makefile.new $(MAKEFILE) | ||
63 | |||
64 | clean: | ||
65 | /bin/rm -f $(LIB) $(TEST) $(APPS) *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff | ||
66 | |||
67 | cc: | ||
68 | $(MAKE) CC="cc" CFLAG="-O" all | ||
69 | |||
70 | gcc: | ||
71 | $(MAKE) CC="gcc" CFLAGS="-O3 -fomit-frame-pointer" all | ||
72 | |||
73 | # DO NOT DELETE THIS LINE -- make depend depends on it. | ||
diff --git a/src/lib/libcrypto/rc5/asm/r5-win32.asm b/src/lib/libcrypto/rc5/asm/r5-win32.asm index f43d3711f0..e69de29bb2 100644 --- a/src/lib/libcrypto/rc5/asm/r5-win32.asm +++ b/src/lib/libcrypto/rc5/asm/r5-win32.asm | |||
@@ -1,574 +0,0 @@ | |||
1 | ; Don't even think of reading this code | ||
2 | ; It was automatically generated by rc5-586.pl | ||
3 | ; Which is a perl program used to generate the x86 assember for | ||
4 | ; any of elf, a.out, BSDI,Win32, or Solaris | ||
5 | ; eric <eay@cryptsoft.com> | ||
6 | ; | ||
7 | TITLE rc5-586.asm | ||
8 | .386 | ||
9 | .model FLAT | ||
10 | _TEXT SEGMENT | ||
11 | PUBLIC _RC5_32_encrypt | ||
12 | |||
13 | _RC5_32_encrypt PROC NEAR | ||
14 | ; | ||
15 | push ebp | ||
16 | push esi | ||
17 | push edi | ||
18 | mov edx, DWORD PTR 16[esp] | ||
19 | mov ebp, DWORD PTR 20[esp] | ||
20 | ; Load the 2 words | ||
21 | mov edi, DWORD PTR [edx] | ||
22 | mov esi, DWORD PTR 4[edx] | ||
23 | push ebx | ||
24 | mov ebx, DWORD PTR [ebp] | ||
25 | add edi, DWORD PTR 4[ebp] | ||
26 | add esi, DWORD PTR 8[ebp] | ||
27 | xor edi, esi | ||
28 | mov eax, DWORD PTR 12[ebp] | ||
29 | mov ecx, esi | ||
30 | rol edi, cl | ||
31 | add edi, eax | ||
32 | xor esi, edi | ||
33 | mov eax, DWORD PTR 16[ebp] | ||
34 | mov ecx, edi | ||
35 | rol esi, cl | ||
36 | add esi, eax | ||
37 | xor edi, esi | ||
38 | mov eax, DWORD PTR 20[ebp] | ||
39 | mov ecx, esi | ||
40 | rol edi, cl | ||
41 | add edi, eax | ||
42 | xor esi, edi | ||
43 | mov eax, DWORD PTR 24[ebp] | ||
44 | mov ecx, edi | ||
45 | rol esi, cl | ||
46 | add esi, eax | ||
47 | xor edi, esi | ||
48 | mov eax, DWORD PTR 28[ebp] | ||
49 | mov ecx, esi | ||
50 | rol edi, cl | ||
51 | add edi, eax | ||
52 | xor esi, edi | ||
53 | mov eax, DWORD PTR 32[ebp] | ||
54 | mov ecx, edi | ||
55 | rol esi, cl | ||
56 | add esi, eax | ||
57 | xor edi, esi | ||
58 | mov eax, DWORD PTR 36[ebp] | ||
59 | mov ecx, esi | ||
60 | rol edi, cl | ||
61 | add edi, eax | ||
62 | xor esi, edi | ||
63 | mov eax, DWORD PTR 40[ebp] | ||
64 | mov ecx, edi | ||
65 | rol esi, cl | ||
66 | add esi, eax | ||
67 | xor edi, esi | ||
68 | mov eax, DWORD PTR 44[ebp] | ||
69 | mov ecx, esi | ||
70 | rol edi, cl | ||
71 | add edi, eax | ||
72 | xor esi, edi | ||
73 | mov eax, DWORD PTR 48[ebp] | ||
74 | mov ecx, edi | ||
75 | rol esi, cl | ||
76 | add esi, eax | ||
77 | xor edi, esi | ||
78 | mov eax, DWORD PTR 52[ebp] | ||
79 | mov ecx, esi | ||
80 | rol edi, cl | ||
81 | add edi, eax | ||
82 | xor esi, edi | ||
83 | mov eax, DWORD PTR 56[ebp] | ||
84 | mov ecx, edi | ||
85 | rol esi, cl | ||
86 | add esi, eax | ||
87 | xor edi, esi | ||
88 | mov eax, DWORD PTR 60[ebp] | ||
89 | mov ecx, esi | ||
90 | rol edi, cl | ||
91 | add edi, eax | ||
92 | xor esi, edi | ||
93 | mov eax, DWORD PTR 64[ebp] | ||
94 | mov ecx, edi | ||
95 | rol esi, cl | ||
96 | add esi, eax | ||
97 | xor edi, esi | ||
98 | mov eax, DWORD PTR 68[ebp] | ||
99 | mov ecx, esi | ||
100 | rol edi, cl | ||
101 | add edi, eax | ||
102 | xor esi, edi | ||
103 | mov eax, DWORD PTR 72[ebp] | ||
104 | mov ecx, edi | ||
105 | rol esi, cl | ||
106 | add esi, eax | ||
107 | cmp ebx, 8 | ||
108 | je $L000rc5_exit | ||
109 | xor edi, esi | ||
110 | mov eax, DWORD PTR 76[ebp] | ||
111 | mov ecx, esi | ||
112 | rol edi, cl | ||
113 | add edi, eax | ||
114 | xor esi, edi | ||
115 | mov eax, DWORD PTR 80[ebp] | ||
116 | mov ecx, edi | ||
117 | rol esi, cl | ||
118 | add esi, eax | ||
119 | xor edi, esi | ||
120 | mov eax, DWORD PTR 84[ebp] | ||
121 | mov ecx, esi | ||
122 | rol edi, cl | ||
123 | add edi, eax | ||
124 | xor esi, edi | ||
125 | mov eax, DWORD PTR 88[ebp] | ||
126 | mov ecx, edi | ||
127 | rol esi, cl | ||
128 | add esi, eax | ||
129 | xor edi, esi | ||
130 | mov eax, DWORD PTR 92[ebp] | ||
131 | mov ecx, esi | ||
132 | rol edi, cl | ||
133 | add edi, eax | ||
134 | xor esi, edi | ||
135 | mov eax, DWORD PTR 96[ebp] | ||
136 | mov ecx, edi | ||
137 | rol esi, cl | ||
138 | add esi, eax | ||
139 | xor edi, esi | ||
140 | mov eax, DWORD PTR 100[ebp] | ||
141 | mov ecx, esi | ||
142 | rol edi, cl | ||
143 | add edi, eax | ||
144 | xor esi, edi | ||
145 | mov eax, DWORD PTR 104[ebp] | ||
146 | mov ecx, edi | ||
147 | rol esi, cl | ||
148 | add esi, eax | ||
149 | cmp ebx, 12 | ||
150 | je $L000rc5_exit | ||
151 | xor edi, esi | ||
152 | mov eax, DWORD PTR 108[ebp] | ||
153 | mov ecx, esi | ||
154 | rol edi, cl | ||
155 | add edi, eax | ||
156 | xor esi, edi | ||
157 | mov eax, DWORD PTR 112[ebp] | ||
158 | mov ecx, edi | ||
159 | rol esi, cl | ||
160 | add esi, eax | ||
161 | xor edi, esi | ||
162 | mov eax, DWORD PTR 116[ebp] | ||
163 | mov ecx, esi | ||
164 | rol edi, cl | ||
165 | add edi, eax | ||
166 | xor esi, edi | ||
167 | mov eax, DWORD PTR 120[ebp] | ||
168 | mov ecx, edi | ||
169 | rol esi, cl | ||
170 | add esi, eax | ||
171 | xor edi, esi | ||
172 | mov eax, DWORD PTR 124[ebp] | ||
173 | mov ecx, esi | ||
174 | rol edi, cl | ||
175 | add edi, eax | ||
176 | xor esi, edi | ||
177 | mov eax, DWORD PTR 128[ebp] | ||
178 | mov ecx, edi | ||
179 | rol esi, cl | ||
180 | add esi, eax | ||
181 | xor edi, esi | ||
182 | mov eax, DWORD PTR 132[ebp] | ||
183 | mov ecx, esi | ||
184 | rol edi, cl | ||
185 | add edi, eax | ||
186 | xor esi, edi | ||
187 | mov eax, DWORD PTR 136[ebp] | ||
188 | mov ecx, edi | ||
189 | rol esi, cl | ||
190 | add esi, eax | ||
191 | $L000rc5_exit: | ||
192 | mov DWORD PTR [edx],edi | ||
193 | mov DWORD PTR 4[edx],esi | ||
194 | pop ebx | ||
195 | pop edi | ||
196 | pop esi | ||
197 | pop ebp | ||
198 | ret | ||
199 | _RC5_32_encrypt ENDP | ||
200 | _TEXT ENDS | ||
201 | _TEXT SEGMENT | ||
202 | PUBLIC _RC5_32_decrypt | ||
203 | |||
204 | _RC5_32_decrypt PROC NEAR | ||
205 | ; | ||
206 | push ebp | ||
207 | push esi | ||
208 | push edi | ||
209 | mov edx, DWORD PTR 16[esp] | ||
210 | mov ebp, DWORD PTR 20[esp] | ||
211 | ; Load the 2 words | ||
212 | mov edi, DWORD PTR [edx] | ||
213 | mov esi, DWORD PTR 4[edx] | ||
214 | push ebx | ||
215 | mov ebx, DWORD PTR [ebp] | ||
216 | cmp ebx, 12 | ||
217 | je $L001rc5_dec_12 | ||
218 | cmp ebx, 8 | ||
219 | je $L002rc5_dec_8 | ||
220 | mov eax, DWORD PTR 136[ebp] | ||
221 | sub esi, eax | ||
222 | mov ecx, edi | ||
223 | ror esi, cl | ||
224 | xor esi, edi | ||
225 | mov eax, DWORD PTR 132[ebp] | ||
226 | sub edi, eax | ||
227 | mov ecx, esi | ||
228 | ror edi, cl | ||
229 | xor edi, esi | ||
230 | mov eax, DWORD PTR 128[ebp] | ||
231 | sub esi, eax | ||
232 | mov ecx, edi | ||
233 | ror esi, cl | ||
234 | xor esi, edi | ||
235 | mov eax, DWORD PTR 124[ebp] | ||
236 | sub edi, eax | ||
237 | mov ecx, esi | ||
238 | ror edi, cl | ||
239 | xor edi, esi | ||
240 | mov eax, DWORD PTR 120[ebp] | ||
241 | sub esi, eax | ||
242 | mov ecx, edi | ||
243 | ror esi, cl | ||
244 | xor esi, edi | ||
245 | mov eax, DWORD PTR 116[ebp] | ||
246 | sub edi, eax | ||
247 | mov ecx, esi | ||
248 | ror edi, cl | ||
249 | xor edi, esi | ||
250 | mov eax, DWORD PTR 112[ebp] | ||
251 | sub esi, eax | ||
252 | mov ecx, edi | ||
253 | ror esi, cl | ||
254 | xor esi, edi | ||
255 | mov eax, DWORD PTR 108[ebp] | ||
256 | sub edi, eax | ||
257 | mov ecx, esi | ||
258 | ror edi, cl | ||
259 | xor edi, esi | ||
260 | $L001rc5_dec_12: | ||
261 | mov eax, DWORD PTR 104[ebp] | ||
262 | sub esi, eax | ||
263 | mov ecx, edi | ||
264 | ror esi, cl | ||
265 | xor esi, edi | ||
266 | mov eax, DWORD PTR 100[ebp] | ||
267 | sub edi, eax | ||
268 | mov ecx, esi | ||
269 | ror edi, cl | ||
270 | xor edi, esi | ||
271 | mov eax, DWORD PTR 96[ebp] | ||
272 | sub esi, eax | ||
273 | mov ecx, edi | ||
274 | ror esi, cl | ||
275 | xor esi, edi | ||
276 | mov eax, DWORD PTR 92[ebp] | ||
277 | sub edi, eax | ||
278 | mov ecx, esi | ||
279 | ror edi, cl | ||
280 | xor edi, esi | ||
281 | mov eax, DWORD PTR 88[ebp] | ||
282 | sub esi, eax | ||
283 | mov ecx, edi | ||
284 | ror esi, cl | ||
285 | xor esi, edi | ||
286 | mov eax, DWORD PTR 84[ebp] | ||
287 | sub edi, eax | ||
288 | mov ecx, esi | ||
289 | ror edi, cl | ||
290 | xor edi, esi | ||
291 | mov eax, DWORD PTR 80[ebp] | ||
292 | sub esi, eax | ||
293 | mov ecx, edi | ||
294 | ror esi, cl | ||
295 | xor esi, edi | ||
296 | mov eax, DWORD PTR 76[ebp] | ||
297 | sub edi, eax | ||
298 | mov ecx, esi | ||
299 | ror edi, cl | ||
300 | xor edi, esi | ||
301 | $L002rc5_dec_8: | ||
302 | mov eax, DWORD PTR 72[ebp] | ||
303 | sub esi, eax | ||
304 | mov ecx, edi | ||
305 | ror esi, cl | ||
306 | xor esi, edi | ||
307 | mov eax, DWORD PTR 68[ebp] | ||
308 | sub edi, eax | ||
309 | mov ecx, esi | ||
310 | ror edi, cl | ||
311 | xor edi, esi | ||
312 | mov eax, DWORD PTR 64[ebp] | ||
313 | sub esi, eax | ||
314 | mov ecx, edi | ||
315 | ror esi, cl | ||
316 | xor esi, edi | ||
317 | mov eax, DWORD PTR 60[ebp] | ||
318 | sub edi, eax | ||
319 | mov ecx, esi | ||
320 | ror edi, cl | ||
321 | xor edi, esi | ||
322 | mov eax, DWORD PTR 56[ebp] | ||
323 | sub esi, eax | ||
324 | mov ecx, edi | ||
325 | ror esi, cl | ||
326 | xor esi, edi | ||
327 | mov eax, DWORD PTR 52[ebp] | ||
328 | sub edi, eax | ||
329 | mov ecx, esi | ||
330 | ror edi, cl | ||
331 | xor edi, esi | ||
332 | mov eax, DWORD PTR 48[ebp] | ||
333 | sub esi, eax | ||
334 | mov ecx, edi | ||
335 | ror esi, cl | ||
336 | xor esi, edi | ||
337 | mov eax, DWORD PTR 44[ebp] | ||
338 | sub edi, eax | ||
339 | mov ecx, esi | ||
340 | ror edi, cl | ||
341 | xor edi, esi | ||
342 | mov eax, DWORD PTR 40[ebp] | ||
343 | sub esi, eax | ||
344 | mov ecx, edi | ||
345 | ror esi, cl | ||
346 | xor esi, edi | ||
347 | mov eax, DWORD PTR 36[ebp] | ||
348 | sub edi, eax | ||
349 | mov ecx, esi | ||
350 | ror edi, cl | ||
351 | xor edi, esi | ||
352 | mov eax, DWORD PTR 32[ebp] | ||
353 | sub esi, eax | ||
354 | mov ecx, edi | ||
355 | ror esi, cl | ||
356 | xor esi, edi | ||
357 | mov eax, DWORD PTR 28[ebp] | ||
358 | sub edi, eax | ||
359 | mov ecx, esi | ||
360 | ror edi, cl | ||
361 | xor edi, esi | ||
362 | mov eax, DWORD PTR 24[ebp] | ||
363 | sub esi, eax | ||
364 | mov ecx, edi | ||
365 | ror esi, cl | ||
366 | xor esi, edi | ||
367 | mov eax, DWORD PTR 20[ebp] | ||
368 | sub edi, eax | ||
369 | mov ecx, esi | ||
370 | ror edi, cl | ||
371 | xor edi, esi | ||
372 | mov eax, DWORD PTR 16[ebp] | ||
373 | sub esi, eax | ||
374 | mov ecx, edi | ||
375 | ror esi, cl | ||
376 | xor esi, edi | ||
377 | mov eax, DWORD PTR 12[ebp] | ||
378 | sub edi, eax | ||
379 | mov ecx, esi | ||
380 | ror edi, cl | ||
381 | xor edi, esi | ||
382 | sub esi, DWORD PTR 8[ebp] | ||
383 | sub edi, DWORD PTR 4[ebp] | ||
384 | L003rc5_exit: | ||
385 | mov DWORD PTR [edx],edi | ||
386 | mov DWORD PTR 4[edx],esi | ||
387 | pop ebx | ||
388 | pop edi | ||
389 | pop esi | ||
390 | pop ebp | ||
391 | ret | ||
392 | _RC5_32_decrypt ENDP | ||
393 | _TEXT ENDS | ||
394 | _TEXT SEGMENT | ||
395 | PUBLIC _RC5_32_cbc_encrypt | ||
396 | |||
397 | _RC5_32_cbc_encrypt PROC NEAR | ||
398 | ; | ||
399 | push ebp | ||
400 | push ebx | ||
401 | push esi | ||
402 | push edi | ||
403 | mov ebp, DWORD PTR 28[esp] | ||
404 | ; getting iv ptr from parameter 4 | ||
405 | mov ebx, DWORD PTR 36[esp] | ||
406 | mov esi, DWORD PTR [ebx] | ||
407 | mov edi, DWORD PTR 4[ebx] | ||
408 | push edi | ||
409 | push esi | ||
410 | push edi | ||
411 | push esi | ||
412 | mov ebx, esp | ||
413 | mov esi, DWORD PTR 36[esp] | ||
414 | mov edi, DWORD PTR 40[esp] | ||
415 | ; getting encrypt flag from parameter 5 | ||
416 | mov ecx, DWORD PTR 56[esp] | ||
417 | ; get and push parameter 3 | ||
418 | mov eax, DWORD PTR 48[esp] | ||
419 | push eax | ||
420 | push ebx | ||
421 | cmp ecx, 0 | ||
422 | jz $L004decrypt | ||
423 | and ebp, 4294967288 | ||
424 | mov eax, DWORD PTR 8[esp] | ||
425 | mov ebx, DWORD PTR 12[esp] | ||
426 | jz $L005encrypt_finish | ||
427 | L006encrypt_loop: | ||
428 | mov ecx, DWORD PTR [esi] | ||
429 | mov edx, DWORD PTR 4[esi] | ||
430 | xor eax, ecx | ||
431 | xor ebx, edx | ||
432 | mov DWORD PTR 8[esp],eax | ||
433 | mov DWORD PTR 12[esp],ebx | ||
434 | call _RC5_32_encrypt | ||
435 | mov eax, DWORD PTR 8[esp] | ||
436 | mov ebx, DWORD PTR 12[esp] | ||
437 | mov DWORD PTR [edi],eax | ||
438 | mov DWORD PTR 4[edi],ebx | ||
439 | add esi, 8 | ||
440 | add edi, 8 | ||
441 | sub ebp, 8 | ||
442 | jnz L006encrypt_loop | ||
443 | $L005encrypt_finish: | ||
444 | mov ebp, DWORD PTR 52[esp] | ||
445 | and ebp, 7 | ||
446 | jz $L007finish | ||
447 | xor ecx, ecx | ||
448 | xor edx, edx | ||
449 | mov ebp, DWORD PTR $L008cbc_enc_jmp_table[ebp*4] | ||
450 | jmp ebp | ||
451 | L009ej7: | ||
452 | mov dh, BYTE PTR 6[esi] | ||
453 | shl edx, 8 | ||
454 | L010ej6: | ||
455 | mov dh, BYTE PTR 5[esi] | ||
456 | L011ej5: | ||
457 | mov dl, BYTE PTR 4[esi] | ||
458 | L012ej4: | ||
459 | mov ecx, DWORD PTR [esi] | ||
460 | jmp $L013ejend | ||
461 | L014ej3: | ||
462 | mov ch, BYTE PTR 2[esi] | ||
463 | shl ecx, 8 | ||
464 | L015ej2: | ||
465 | mov ch, BYTE PTR 1[esi] | ||
466 | L016ej1: | ||
467 | mov cl, BYTE PTR [esi] | ||
468 | $L013ejend: | ||
469 | xor eax, ecx | ||
470 | xor ebx, edx | ||
471 | mov DWORD PTR 8[esp],eax | ||
472 | mov DWORD PTR 12[esp],ebx | ||
473 | call _RC5_32_encrypt | ||
474 | mov eax, DWORD PTR 8[esp] | ||
475 | mov ebx, DWORD PTR 12[esp] | ||
476 | mov DWORD PTR [edi],eax | ||
477 | mov DWORD PTR 4[edi],ebx | ||
478 | jmp $L007finish | ||
479 | $L004decrypt: | ||
480 | and ebp, 4294967288 | ||
481 | mov eax, DWORD PTR 16[esp] | ||
482 | mov ebx, DWORD PTR 20[esp] | ||
483 | jz $L017decrypt_finish | ||
484 | L018decrypt_loop: | ||
485 | mov eax, DWORD PTR [esi] | ||
486 | mov ebx, DWORD PTR 4[esi] | ||
487 | mov DWORD PTR 8[esp],eax | ||
488 | mov DWORD PTR 12[esp],ebx | ||
489 | call _RC5_32_decrypt | ||
490 | mov eax, DWORD PTR 8[esp] | ||
491 | mov ebx, DWORD PTR 12[esp] | ||
492 | mov ecx, DWORD PTR 16[esp] | ||
493 | mov edx, DWORD PTR 20[esp] | ||
494 | xor ecx, eax | ||
495 | xor edx, ebx | ||
496 | mov eax, DWORD PTR [esi] | ||
497 | mov ebx, DWORD PTR 4[esi] | ||
498 | mov DWORD PTR [edi],ecx | ||
499 | mov DWORD PTR 4[edi],edx | ||
500 | mov DWORD PTR 16[esp],eax | ||
501 | mov DWORD PTR 20[esp],ebx | ||
502 | add esi, 8 | ||
503 | add edi, 8 | ||
504 | sub ebp, 8 | ||
505 | jnz L018decrypt_loop | ||
506 | $L017decrypt_finish: | ||
507 | mov ebp, DWORD PTR 52[esp] | ||
508 | and ebp, 7 | ||
509 | jz $L007finish | ||
510 | mov eax, DWORD PTR [esi] | ||
511 | mov ebx, DWORD PTR 4[esi] | ||
512 | mov DWORD PTR 8[esp],eax | ||
513 | mov DWORD PTR 12[esp],ebx | ||
514 | call _RC5_32_decrypt | ||
515 | mov eax, DWORD PTR 8[esp] | ||
516 | mov ebx, DWORD PTR 12[esp] | ||
517 | mov ecx, DWORD PTR 16[esp] | ||
518 | mov edx, DWORD PTR 20[esp] | ||
519 | xor ecx, eax | ||
520 | xor edx, ebx | ||
521 | mov eax, DWORD PTR [esi] | ||
522 | mov ebx, DWORD PTR 4[esi] | ||
523 | L019dj7: | ||
524 | ror edx, 16 | ||
525 | mov BYTE PTR 6[edi],dl | ||
526 | shr edx, 16 | ||
527 | L020dj6: | ||
528 | mov BYTE PTR 5[edi],dh | ||
529 | L021dj5: | ||
530 | mov BYTE PTR 4[edi],dl | ||
531 | L022dj4: | ||
532 | mov DWORD PTR [edi],ecx | ||
533 | jmp $L023djend | ||
534 | L024dj3: | ||
535 | ror ecx, 16 | ||
536 | mov BYTE PTR 2[edi],cl | ||
537 | shl ecx, 16 | ||
538 | L025dj2: | ||
539 | mov BYTE PTR 1[esi],ch | ||
540 | L026dj1: | ||
541 | mov BYTE PTR [esi], cl | ||
542 | $L023djend: | ||
543 | jmp $L007finish | ||
544 | $L007finish: | ||
545 | mov ecx, DWORD PTR 60[esp] | ||
546 | add esp, 24 | ||
547 | mov DWORD PTR [ecx],eax | ||
548 | mov DWORD PTR 4[ecx],ebx | ||
549 | pop edi | ||
550 | pop esi | ||
551 | pop ebx | ||
552 | pop ebp | ||
553 | ret | ||
554 | $L008cbc_enc_jmp_table: | ||
555 | DD 0 | ||
556 | DD L016ej1 | ||
557 | DD L015ej2 | ||
558 | DD L014ej3 | ||
559 | DD L012ej4 | ||
560 | DD L011ej5 | ||
561 | DD L010ej6 | ||
562 | DD L009ej7 | ||
563 | L027cbc_dec_jmp_table: | ||
564 | DD 0 | ||
565 | DD L026dj1 | ||
566 | DD L025dj2 | ||
567 | DD L024dj3 | ||
568 | DD L022dj4 | ||
569 | DD L021dj5 | ||
570 | DD L020dj6 | ||
571 | DD L019dj7 | ||
572 | _RC5_32_cbc_encrypt ENDP | ||
573 | _TEXT ENDS | ||
574 | END | ||
diff --git a/src/lib/libcrypto/ripemd/Makefile.ssl b/src/lib/libcrypto/ripemd/Makefile.ssl index c6153d4361..6ada9f067b 100644 --- a/src/lib/libcrypto/ripemd/Makefile.ssl +++ b/src/lib/libcrypto/ripemd/Makefile.ssl | |||
@@ -47,7 +47,7 @@ lib: $(LIBOBJ) | |||
47 | 47 | ||
48 | # elf | 48 | # elf |
49 | asm/rm86-elf.o: asm/rm86unix.cpp | 49 | asm/rm86-elf.o: asm/rm86unix.cpp |
50 | $(CPP) -DELF asm/rm86unix.cpp | as -o asm/rm86-elf.o | 50 | $(CPP) -DELF -x c asm/rm86unix.cpp | as -o asm/rm86-elf.o |
51 | 51 | ||
52 | # solaris | 52 | # solaris |
53 | asm/rm86-sol.o: asm/rm86unix.cpp | 53 | asm/rm86-sol.o: asm/rm86unix.cpp |
@@ -63,7 +63,7 @@ asm/rm86-out.o: asm/rm86unix.cpp | |||
63 | asm/rm86bsdi.o: asm/rm86unix.cpp | 63 | asm/rm86bsdi.o: asm/rm86unix.cpp |
64 | $(CPP) -DBSDI asm/rm86unix.cpp | sed 's/ :/:/' | as -o asm/rm86bsdi.o | 64 | $(CPP) -DBSDI asm/rm86unix.cpp | sed 's/ :/:/' | as -o asm/rm86bsdi.o |
65 | 65 | ||
66 | asm/rm86unix.cpp: asm/rmd-586.pl | 66 | asm/rm86unix.cpp: asm/rmd-586.pl ../perlasm/x86asm.pl |
67 | (cd asm; $(PERL) rmd-586.pl cpp >rm86unix.cpp) | 67 | (cd asm; $(PERL) rmd-586.pl cpp >rm86unix.cpp) |
68 | 68 | ||
69 | files: | 69 | files: |
diff --git a/src/lib/libcrypto/ripemd/Makefile.uni b/src/lib/libcrypto/ripemd/Makefile.uni index 5310020eb1..e69de29bb2 100644 --- a/src/lib/libcrypto/ripemd/Makefile.uni +++ b/src/lib/libcrypto/ripemd/Makefile.uni | |||
@@ -1,109 +0,0 @@ | |||
1 | # Targets | ||
2 | # make - twidle the options yourself :-) | ||
3 | # make cc - standard cc options | ||
4 | # make gcc - standard gcc options | ||
5 | # make x86-elf - linux-elf etc | ||
6 | # make x86-out - linux-a.out, FreeBSD etc | ||
7 | # make x86-solaris | ||
8 | # make x86-bdsi | ||
9 | |||
10 | DIR= md5 | ||
11 | TOP= . | ||
12 | CC= gcc | ||
13 | CFLAG= -O3 -fomit-frame-pointer | ||
14 | |||
15 | CPP= $(CC) -E | ||
16 | INCLUDES= | ||
17 | INSTALLTOP=/usr/local/lib | ||
18 | MAKE= make | ||
19 | MAKEDEPEND= makedepend | ||
20 | MAKEFILE= Makefile.uni | ||
21 | AR= ar r | ||
22 | |||
23 | MD5_ASM_OBJ= | ||
24 | |||
25 | CFLAGS= $(INCLUDES) $(CFLAG) | ||
26 | |||
27 | GENERAL=Makefile | ||
28 | TEST=md5test | ||
29 | APPS=md5 | ||
30 | |||
31 | LIB=libmd5.a | ||
32 | LIBSRC=md5_dgst.c md5_one.c | ||
33 | LIBOBJ=md5_dgst.o md5_one.o $(MD5_ASM_OBJ) | ||
34 | |||
35 | SRC= $(LIBSRC) | ||
36 | |||
37 | EXHEADER= md5.h | ||
38 | HEADER= md5_locl.h $(EXHEADER) | ||
39 | |||
40 | ALL= $(GENERAL) $(SRC) $(HEADER) | ||
41 | |||
42 | all: $(LIB) $(TEST) $(APPS) | ||
43 | |||
44 | $(LIB): $(LIBOBJ) | ||
45 | $(AR) $(LIB) $(LIBOBJ) | ||
46 | $(RANLIB) $(LIB) | ||
47 | |||
48 | # elf | ||
49 | asm/mx86-elf.o: asm/mx86unix.cpp | ||
50 | $(CPP) -DELF asm/mx86unix.cpp | as -o asm/mx86-elf.o | ||
51 | |||
52 | # solaris | ||
53 | asm/mx86-sol.o: asm/mx86unix.cpp | ||
54 | $(CC) -E -DSOL asm/mx86unix.cpp | sed 's/^#.*//' > asm/mx86-sol.s | ||
55 | as -o asm/mx86-sol.o asm/mx86-sol.s | ||
56 | rm -f asm/mx86-sol.s | ||
57 | |||
58 | # a.out | ||
59 | asm/mx86-out.o: asm/mx86unix.cpp | ||
60 | $(CPP) -DOUT asm/mx86unix.cpp | as -o asm/mx86-out.o | ||
61 | |||
62 | # bsdi | ||
63 | asm/mx86bsdi.o: asm/mx86unix.cpp | ||
64 | $(CPP) -DBSDI asm/mx86unix.cpp | as -o asm/mx86bsdi.o | ||
65 | |||
66 | asm/mx86unix.cpp: | ||
67 | (cd asm; perl md5-586.pl cpp >mx86unix.cpp) | ||
68 | |||
69 | test: $(TEST) | ||
70 | ./$(TEST) | ||
71 | |||
72 | $(TEST): $(TEST).c $(LIB) | ||
73 | $(CC) -o $(TEST) $(CFLAGS) $(TEST).c $(LIB) | ||
74 | |||
75 | $(APPS): $(APPS).c $(LIB) | ||
76 | $(CC) -o $(APPS) $(CFLAGS) $(APPS).c $(LIB) | ||
77 | |||
78 | lint: | ||
79 | lint -DLINT $(INCLUDES) $(SRC)>fluff | ||
80 | |||
81 | depend: | ||
82 | $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) | ||
83 | |||
84 | dclean: | ||
85 | perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new | ||
86 | mv -f Makefile.new $(MAKEFILE) | ||
87 | |||
88 | clean: | ||
89 | /bin/rm -f $(LIB) $(TEST) $(APPS) *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff | ||
90 | |||
91 | cc: | ||
92 | $(MAKE) MD5_ASM_OBJ="" CC="cc" CFLAG="-O" all | ||
93 | |||
94 | gcc: | ||
95 | $(MAKE) MD5_ASM_OBJ="" CC="gcc" CFLAGS="-O3 -fomit-frame-pointer" all | ||
96 | |||
97 | x86-elf: | ||
98 | $(MAKE) MD5_ASM_OBJ="asm/mx86-elf.o" CFLAG="-DELF -DMD5_ASM -DL_ENDIAN $(CFLAGS)" all | ||
99 | |||
100 | x86-out: | ||
101 | $(MAKE) MD5_ASM_OBJ="asm/mx86-out.o" CFLAG="-DOUT -DMD5_ASM -DL_ENDIAN $(CFLAGS)" all | ||
102 | |||
103 | x86-solaris: | ||
104 | $(MAKE) MD5_ASM_OBJ="asm/mx86-sol.o" CFLAG="-DSOL -DMD5_ASM -DL_ENDIAN $(CFLAGS)" all | ||
105 | |||
106 | x86-bdsi: | ||
107 | $(MAKE) MD5_ASM_OBJ="asm/mx86-bdsi.o" CFLAG="-DBDSI -DMD5_ASM -DL_ENDIAN $(CFLAGS)" all | ||
108 | |||
109 | # DO NOT DELETE THIS LINE -- make depend depends on it. | ||
diff --git a/src/lib/libcrypto/ripemd/asm/rm-win32.asm b/src/lib/libcrypto/ripemd/asm/rm-win32.asm index f07d517857..e69de29bb2 100644 --- a/src/lib/libcrypto/ripemd/asm/rm-win32.asm +++ b/src/lib/libcrypto/ripemd/asm/rm-win32.asm | |||
@@ -1,1973 +0,0 @@ | |||
1 | ; Don't even think of reading this code | ||
2 | ; It was automatically generated by rmd-586.pl | ||
3 | ; Which is a perl program used to generate the x86 assember for | ||
4 | ; any of elf, a.out, BSDI,Win32, or Solaris | ||
5 | ; eric <eay@cryptsoft.com> | ||
6 | ; | ||
7 | TITLE rmd-586.asm | ||
8 | .386 | ||
9 | .model FLAT | ||
10 | _TEXT SEGMENT | ||
11 | PUBLIC _ripemd160_block_asm_host_order | ||
12 | |||
13 | _ripemd160_block_asm_host_order PROC NEAR | ||
14 | mov edx, DWORD PTR 4[esp] | ||
15 | mov eax, DWORD PTR 8[esp] | ||
16 | push esi | ||
17 | mov ecx, DWORD PTR [edx] | ||
18 | push edi | ||
19 | mov esi, DWORD PTR 4[edx] | ||
20 | push ebp | ||
21 | mov edi, DWORD PTR 8[edx] | ||
22 | push ebx | ||
23 | sub esp, 108 | ||
24 | L000start: | ||
25 | ; | ||
26 | mov ebx, DWORD PTR [eax] | ||
27 | mov ebp, DWORD PTR 4[eax] | ||
28 | mov DWORD PTR [esp],ebx | ||
29 | mov DWORD PTR 4[esp],ebp | ||
30 | mov ebx, DWORD PTR 8[eax] | ||
31 | mov ebp, DWORD PTR 12[eax] | ||
32 | mov DWORD PTR 8[esp],ebx | ||
33 | mov DWORD PTR 12[esp],ebp | ||
34 | mov ebx, DWORD PTR 16[eax] | ||
35 | mov ebp, DWORD PTR 20[eax] | ||
36 | mov DWORD PTR 16[esp],ebx | ||
37 | mov DWORD PTR 20[esp],ebp | ||
38 | mov ebx, DWORD PTR 24[eax] | ||
39 | mov ebp, DWORD PTR 28[eax] | ||
40 | mov DWORD PTR 24[esp],ebx | ||
41 | mov DWORD PTR 28[esp],ebp | ||
42 | mov ebx, DWORD PTR 32[eax] | ||
43 | mov ebp, DWORD PTR 36[eax] | ||
44 | mov DWORD PTR 32[esp],ebx | ||
45 | mov DWORD PTR 36[esp],ebp | ||
46 | mov ebx, DWORD PTR 40[eax] | ||
47 | mov ebp, DWORD PTR 44[eax] | ||
48 | mov DWORD PTR 40[esp],ebx | ||
49 | mov DWORD PTR 44[esp],ebp | ||
50 | mov ebx, DWORD PTR 48[eax] | ||
51 | mov ebp, DWORD PTR 52[eax] | ||
52 | mov DWORD PTR 48[esp],ebx | ||
53 | mov DWORD PTR 52[esp],ebp | ||
54 | mov ebx, DWORD PTR 56[eax] | ||
55 | mov ebp, DWORD PTR 60[eax] | ||
56 | mov DWORD PTR 56[esp],ebx | ||
57 | mov DWORD PTR 60[esp],ebp | ||
58 | mov eax, edi | ||
59 | mov ebx, DWORD PTR 12[edx] | ||
60 | mov ebp, DWORD PTR 16[edx] | ||
61 | ; 0 | ||
62 | xor eax, ebx | ||
63 | mov edx, DWORD PTR [esp] | ||
64 | xor eax, esi | ||
65 | add ecx, edx | ||
66 | rol edi, 10 | ||
67 | add ecx, eax | ||
68 | mov eax, esi | ||
69 | rol ecx, 11 | ||
70 | add ecx, ebp | ||
71 | ; 1 | ||
72 | xor eax, edi | ||
73 | mov edx, DWORD PTR 4[esp] | ||
74 | xor eax, ecx | ||
75 | add ebp, eax | ||
76 | mov eax, ecx | ||
77 | rol esi, 10 | ||
78 | add ebp, edx | ||
79 | xor eax, esi | ||
80 | rol ebp, 14 | ||
81 | add ebp, ebx | ||
82 | ; 2 | ||
83 | mov edx, DWORD PTR 8[esp] | ||
84 | xor eax, ebp | ||
85 | add ebx, edx | ||
86 | rol ecx, 10 | ||
87 | add ebx, eax | ||
88 | mov eax, ebp | ||
89 | rol ebx, 15 | ||
90 | add ebx, edi | ||
91 | ; 3 | ||
92 | xor eax, ecx | ||
93 | mov edx, DWORD PTR 12[esp] | ||
94 | xor eax, ebx | ||
95 | add edi, eax | ||
96 | mov eax, ebx | ||
97 | rol ebp, 10 | ||
98 | add edi, edx | ||
99 | xor eax, ebp | ||
100 | rol edi, 12 | ||
101 | add edi, esi | ||
102 | ; 4 | ||
103 | mov edx, DWORD PTR 16[esp] | ||
104 | xor eax, edi | ||
105 | add esi, edx | ||
106 | rol ebx, 10 | ||
107 | add esi, eax | ||
108 | mov eax, edi | ||
109 | rol esi, 5 | ||
110 | add esi, ecx | ||
111 | ; 5 | ||
112 | xor eax, ebx | ||
113 | mov edx, DWORD PTR 20[esp] | ||
114 | xor eax, esi | ||
115 | add ecx, eax | ||
116 | mov eax, esi | ||
117 | rol edi, 10 | ||
118 | add ecx, edx | ||
119 | xor eax, edi | ||
120 | rol ecx, 8 | ||
121 | add ecx, ebp | ||
122 | ; 6 | ||
123 | mov edx, DWORD PTR 24[esp] | ||
124 | xor eax, ecx | ||
125 | add ebp, edx | ||
126 | rol esi, 10 | ||
127 | add ebp, eax | ||
128 | mov eax, ecx | ||
129 | rol ebp, 7 | ||
130 | add ebp, ebx | ||
131 | ; 7 | ||
132 | xor eax, esi | ||
133 | mov edx, DWORD PTR 28[esp] | ||
134 | xor eax, ebp | ||
135 | add ebx, eax | ||
136 | mov eax, ebp | ||
137 | rol ecx, 10 | ||
138 | add ebx, edx | ||
139 | xor eax, ecx | ||
140 | rol ebx, 9 | ||
141 | add ebx, edi | ||
142 | ; 8 | ||
143 | mov edx, DWORD PTR 32[esp] | ||
144 | xor eax, ebx | ||
145 | add edi, edx | ||
146 | rol ebp, 10 | ||
147 | add edi, eax | ||
148 | mov eax, ebx | ||
149 | rol edi, 11 | ||
150 | add edi, esi | ||
151 | ; 9 | ||
152 | xor eax, ebp | ||
153 | mov edx, DWORD PTR 36[esp] | ||
154 | xor eax, edi | ||
155 | add esi, eax | ||
156 | mov eax, edi | ||
157 | rol ebx, 10 | ||
158 | add esi, edx | ||
159 | xor eax, ebx | ||
160 | rol esi, 13 | ||
161 | add esi, ecx | ||
162 | ; 10 | ||
163 | mov edx, DWORD PTR 40[esp] | ||
164 | xor eax, esi | ||
165 | add ecx, edx | ||
166 | rol edi, 10 | ||
167 | add ecx, eax | ||
168 | mov eax, esi | ||
169 | rol ecx, 14 | ||
170 | add ecx, ebp | ||
171 | ; 11 | ||
172 | xor eax, edi | ||
173 | mov edx, DWORD PTR 44[esp] | ||
174 | xor eax, ecx | ||
175 | add ebp, eax | ||
176 | mov eax, ecx | ||
177 | rol esi, 10 | ||
178 | add ebp, edx | ||
179 | xor eax, esi | ||
180 | rol ebp, 15 | ||
181 | add ebp, ebx | ||
182 | ; 12 | ||
183 | mov edx, DWORD PTR 48[esp] | ||
184 | xor eax, ebp | ||
185 | add ebx, edx | ||
186 | rol ecx, 10 | ||
187 | add ebx, eax | ||
188 | mov eax, ebp | ||
189 | rol ebx, 6 | ||
190 | add ebx, edi | ||
191 | ; 13 | ||
192 | xor eax, ecx | ||
193 | mov edx, DWORD PTR 52[esp] | ||
194 | xor eax, ebx | ||
195 | add edi, eax | ||
196 | mov eax, ebx | ||
197 | rol ebp, 10 | ||
198 | add edi, edx | ||
199 | xor eax, ebp | ||
200 | rol edi, 7 | ||
201 | add edi, esi | ||
202 | ; 14 | ||
203 | mov edx, DWORD PTR 56[esp] | ||
204 | xor eax, edi | ||
205 | add esi, edx | ||
206 | rol ebx, 10 | ||
207 | add esi, eax | ||
208 | mov eax, edi | ||
209 | rol esi, 9 | ||
210 | add esi, ecx | ||
211 | ; 15 | ||
212 | xor eax, ebx | ||
213 | mov edx, DWORD PTR 60[esp] | ||
214 | xor eax, esi | ||
215 | add ecx, eax | ||
216 | mov eax, -1 | ||
217 | rol edi, 10 | ||
218 | add ecx, edx | ||
219 | mov edx, DWORD PTR 28[esp] | ||
220 | rol ecx, 8 | ||
221 | add ecx, ebp | ||
222 | ; 16 | ||
223 | add ebp, edx | ||
224 | mov edx, esi | ||
225 | sub eax, ecx | ||
226 | and edx, ecx | ||
227 | and eax, edi | ||
228 | or edx, eax | ||
229 | mov eax, DWORD PTR 16[esp] | ||
230 | rol esi, 10 | ||
231 | lea ebp, DWORD PTR 1518500249[edx*1+ebp] | ||
232 | mov edx, -1 | ||
233 | rol ebp, 7 | ||
234 | add ebp, ebx | ||
235 | ; 17 | ||
236 | add ebx, eax | ||
237 | mov eax, ecx | ||
238 | sub edx, ebp | ||
239 | and eax, ebp | ||
240 | and edx, esi | ||
241 | or eax, edx | ||
242 | mov edx, DWORD PTR 52[esp] | ||
243 | rol ecx, 10 | ||
244 | lea ebx, DWORD PTR 1518500249[eax*1+ebx] | ||
245 | mov eax, -1 | ||
246 | rol ebx, 6 | ||
247 | add ebx, edi | ||
248 | ; 18 | ||
249 | add edi, edx | ||
250 | mov edx, ebp | ||
251 | sub eax, ebx | ||
252 | and edx, ebx | ||
253 | and eax, ecx | ||
254 | or edx, eax | ||
255 | mov eax, DWORD PTR 4[esp] | ||
256 | rol ebp, 10 | ||
257 | lea edi, DWORD PTR 1518500249[edx*1+edi] | ||
258 | mov edx, -1 | ||
259 | rol edi, 8 | ||
260 | add edi, esi | ||
261 | ; 19 | ||
262 | add esi, eax | ||
263 | mov eax, ebx | ||
264 | sub edx, edi | ||
265 | and eax, edi | ||
266 | and edx, ebp | ||
267 | or eax, edx | ||
268 | mov edx, DWORD PTR 40[esp] | ||
269 | rol ebx, 10 | ||
270 | lea esi, DWORD PTR 1518500249[eax*1+esi] | ||
271 | mov eax, -1 | ||
272 | rol esi, 13 | ||
273 | add esi, ecx | ||
274 | ; 20 | ||
275 | add ecx, edx | ||
276 | mov edx, edi | ||
277 | sub eax, esi | ||
278 | and edx, esi | ||
279 | and eax, ebx | ||
280 | or edx, eax | ||
281 | mov eax, DWORD PTR 24[esp] | ||
282 | rol edi, 10 | ||
283 | lea ecx, DWORD PTR 1518500249[edx*1+ecx] | ||
284 | mov edx, -1 | ||
285 | rol ecx, 11 | ||
286 | add ecx, ebp | ||
287 | ; 21 | ||
288 | add ebp, eax | ||
289 | mov eax, esi | ||
290 | sub edx, ecx | ||
291 | and eax, ecx | ||
292 | and edx, edi | ||
293 | or eax, edx | ||
294 | mov edx, DWORD PTR 60[esp] | ||
295 | rol esi, 10 | ||
296 | lea ebp, DWORD PTR 1518500249[eax*1+ebp] | ||
297 | mov eax, -1 | ||
298 | rol ebp, 9 | ||
299 | add ebp, ebx | ||
300 | ; 22 | ||
301 | add ebx, edx | ||
302 | mov edx, ecx | ||
303 | sub eax, ebp | ||
304 | and edx, ebp | ||
305 | and eax, esi | ||
306 | or edx, eax | ||
307 | mov eax, DWORD PTR 12[esp] | ||
308 | rol ecx, 10 | ||
309 | lea ebx, DWORD PTR 1518500249[edx*1+ebx] | ||
310 | mov edx, -1 | ||
311 | rol ebx, 7 | ||
312 | add ebx, edi | ||
313 | ; 23 | ||
314 | add edi, eax | ||
315 | mov eax, ebp | ||
316 | sub edx, ebx | ||
317 | and eax, ebx | ||
318 | and edx, ecx | ||
319 | or eax, edx | ||
320 | mov edx, DWORD PTR 48[esp] | ||
321 | rol ebp, 10 | ||
322 | lea edi, DWORD PTR 1518500249[eax*1+edi] | ||
323 | mov eax, -1 | ||
324 | rol edi, 15 | ||
325 | add edi, esi | ||
326 | ; 24 | ||
327 | add esi, edx | ||
328 | mov edx, ebx | ||
329 | sub eax, edi | ||
330 | and edx, edi | ||
331 | and eax, ebp | ||
332 | or edx, eax | ||
333 | mov eax, DWORD PTR [esp] | ||
334 | rol ebx, 10 | ||
335 | lea esi, DWORD PTR 1518500249[edx*1+esi] | ||
336 | mov edx, -1 | ||
337 | rol esi, 7 | ||
338 | add esi, ecx | ||
339 | ; 25 | ||
340 | add ecx, eax | ||
341 | mov eax, edi | ||
342 | sub edx, esi | ||
343 | and eax, esi | ||
344 | and edx, ebx | ||
345 | or eax, edx | ||
346 | mov edx, DWORD PTR 36[esp] | ||
347 | rol edi, 10 | ||
348 | lea ecx, DWORD PTR 1518500249[eax*1+ecx] | ||
349 | mov eax, -1 | ||
350 | rol ecx, 12 | ||
351 | add ecx, ebp | ||
352 | ; 26 | ||
353 | add ebp, edx | ||
354 | mov edx, esi | ||
355 | sub eax, ecx | ||
356 | and edx, ecx | ||
357 | and eax, edi | ||
358 | or edx, eax | ||
359 | mov eax, DWORD PTR 20[esp] | ||
360 | rol esi, 10 | ||
361 | lea ebp, DWORD PTR 1518500249[edx*1+ebp] | ||
362 | mov edx, -1 | ||
363 | rol ebp, 15 | ||
364 | add ebp, ebx | ||
365 | ; 27 | ||
366 | add ebx, eax | ||
367 | mov eax, ecx | ||
368 | sub edx, ebp | ||
369 | and eax, ebp | ||
370 | and edx, esi | ||
371 | or eax, edx | ||
372 | mov edx, DWORD PTR 8[esp] | ||
373 | rol ecx, 10 | ||
374 | lea ebx, DWORD PTR 1518500249[eax*1+ebx] | ||
375 | mov eax, -1 | ||
376 | rol ebx, 9 | ||
377 | add ebx, edi | ||
378 | ; 28 | ||
379 | add edi, edx | ||
380 | mov edx, ebp | ||
381 | sub eax, ebx | ||
382 | and edx, ebx | ||
383 | and eax, ecx | ||
384 | or edx, eax | ||
385 | mov eax, DWORD PTR 56[esp] | ||
386 | rol ebp, 10 | ||
387 | lea edi, DWORD PTR 1518500249[edx*1+edi] | ||
388 | mov edx, -1 | ||
389 | rol edi, 11 | ||
390 | add edi, esi | ||
391 | ; 29 | ||
392 | add esi, eax | ||
393 | mov eax, ebx | ||
394 | sub edx, edi | ||
395 | and eax, edi | ||
396 | and edx, ebp | ||
397 | or eax, edx | ||
398 | mov edx, DWORD PTR 44[esp] | ||
399 | rol ebx, 10 | ||
400 | lea esi, DWORD PTR 1518500249[eax*1+esi] | ||
401 | mov eax, -1 | ||
402 | rol esi, 7 | ||
403 | add esi, ecx | ||
404 | ; 30 | ||
405 | add ecx, edx | ||
406 | mov edx, edi | ||
407 | sub eax, esi | ||
408 | and edx, esi | ||
409 | and eax, ebx | ||
410 | or edx, eax | ||
411 | mov eax, DWORD PTR 32[esp] | ||
412 | rol edi, 10 | ||
413 | lea ecx, DWORD PTR 1518500249[edx*1+ecx] | ||
414 | mov edx, -1 | ||
415 | rol ecx, 13 | ||
416 | add ecx, ebp | ||
417 | ; 31 | ||
418 | add ebp, eax | ||
419 | mov eax, esi | ||
420 | sub edx, ecx | ||
421 | and eax, ecx | ||
422 | and edx, edi | ||
423 | or eax, edx | ||
424 | mov edx, -1 | ||
425 | rol esi, 10 | ||
426 | lea ebp, DWORD PTR 1518500249[eax*1+ebp] | ||
427 | sub edx, ecx | ||
428 | rol ebp, 12 | ||
429 | add ebp, ebx | ||
430 | ; 32 | ||
431 | mov eax, DWORD PTR 12[esp] | ||
432 | or edx, ebp | ||
433 | add ebx, eax | ||
434 | xor edx, esi | ||
435 | mov eax, -1 | ||
436 | rol ecx, 10 | ||
437 | lea ebx, DWORD PTR 1859775393[edx*1+ebx] | ||
438 | sub eax, ebp | ||
439 | rol ebx, 11 | ||
440 | add ebx, edi | ||
441 | ; 33 | ||
442 | mov edx, DWORD PTR 40[esp] | ||
443 | or eax, ebx | ||
444 | add edi, edx | ||
445 | xor eax, ecx | ||
446 | mov edx, -1 | ||
447 | rol ebp, 10 | ||
448 | lea edi, DWORD PTR 1859775393[eax*1+edi] | ||
449 | sub edx, ebx | ||
450 | rol edi, 13 | ||
451 | add edi, esi | ||
452 | ; 34 | ||
453 | mov eax, DWORD PTR 56[esp] | ||
454 | or edx, edi | ||
455 | add esi, eax | ||
456 | xor edx, ebp | ||
457 | mov eax, -1 | ||
458 | rol ebx, 10 | ||
459 | lea esi, DWORD PTR 1859775393[edx*1+esi] | ||
460 | sub eax, edi | ||
461 | rol esi, 6 | ||
462 | add esi, ecx | ||
463 | ; 35 | ||
464 | mov edx, DWORD PTR 16[esp] | ||
465 | or eax, esi | ||
466 | add ecx, edx | ||
467 | xor eax, ebx | ||
468 | mov edx, -1 | ||
469 | rol edi, 10 | ||
470 | lea ecx, DWORD PTR 1859775393[eax*1+ecx] | ||
471 | sub edx, esi | ||
472 | rol ecx, 7 | ||
473 | add ecx, ebp | ||
474 | ; 36 | ||
475 | mov eax, DWORD PTR 36[esp] | ||
476 | or edx, ecx | ||
477 | add ebp, eax | ||
478 | xor edx, edi | ||
479 | mov eax, -1 | ||
480 | rol esi, 10 | ||
481 | lea ebp, DWORD PTR 1859775393[edx*1+ebp] | ||
482 | sub eax, ecx | ||
483 | rol ebp, 14 | ||
484 | add ebp, ebx | ||
485 | ; 37 | ||
486 | mov edx, DWORD PTR 60[esp] | ||
487 | or eax, ebp | ||
488 | add ebx, edx | ||
489 | xor eax, esi | ||
490 | mov edx, -1 | ||
491 | rol ecx, 10 | ||
492 | lea ebx, DWORD PTR 1859775393[eax*1+ebx] | ||
493 | sub edx, ebp | ||
494 | rol ebx, 9 | ||
495 | add ebx, edi | ||
496 | ; 38 | ||
497 | mov eax, DWORD PTR 32[esp] | ||
498 | or edx, ebx | ||
499 | add edi, eax | ||
500 | xor edx, ecx | ||
501 | mov eax, -1 | ||
502 | rol ebp, 10 | ||
503 | lea edi, DWORD PTR 1859775393[edx*1+edi] | ||
504 | sub eax, ebx | ||
505 | rol edi, 13 | ||
506 | add edi, esi | ||
507 | ; 39 | ||
508 | mov edx, DWORD PTR 4[esp] | ||
509 | or eax, edi | ||
510 | add esi, edx | ||
511 | xor eax, ebp | ||
512 | mov edx, -1 | ||
513 | rol ebx, 10 | ||
514 | lea esi, DWORD PTR 1859775393[eax*1+esi] | ||
515 | sub edx, edi | ||
516 | rol esi, 15 | ||
517 | add esi, ecx | ||
518 | ; 40 | ||
519 | mov eax, DWORD PTR 8[esp] | ||
520 | or edx, esi | ||
521 | add ecx, eax | ||
522 | xor edx, ebx | ||
523 | mov eax, -1 | ||
524 | rol edi, 10 | ||
525 | lea ecx, DWORD PTR 1859775393[edx*1+ecx] | ||
526 | sub eax, esi | ||
527 | rol ecx, 14 | ||
528 | add ecx, ebp | ||
529 | ; 41 | ||
530 | mov edx, DWORD PTR 28[esp] | ||
531 | or eax, ecx | ||
532 | add ebp, edx | ||
533 | xor eax, edi | ||
534 | mov edx, -1 | ||
535 | rol esi, 10 | ||
536 | lea ebp, DWORD PTR 1859775393[eax*1+ebp] | ||
537 | sub edx, ecx | ||
538 | rol ebp, 8 | ||
539 | add ebp, ebx | ||
540 | ; 42 | ||
541 | mov eax, DWORD PTR [esp] | ||
542 | or edx, ebp | ||
543 | add ebx, eax | ||
544 | xor edx, esi | ||
545 | mov eax, -1 | ||
546 | rol ecx, 10 | ||
547 | lea ebx, DWORD PTR 1859775393[edx*1+ebx] | ||
548 | sub eax, ebp | ||
549 | rol ebx, 13 | ||
550 | add ebx, edi | ||
551 | ; 43 | ||
552 | mov edx, DWORD PTR 24[esp] | ||
553 | or eax, ebx | ||
554 | add edi, edx | ||
555 | xor eax, ecx | ||
556 | mov edx, -1 | ||
557 | rol ebp, 10 | ||
558 | lea edi, DWORD PTR 1859775393[eax*1+edi] | ||
559 | sub edx, ebx | ||
560 | rol edi, 6 | ||
561 | add edi, esi | ||
562 | ; 44 | ||
563 | mov eax, DWORD PTR 52[esp] | ||
564 | or edx, edi | ||
565 | add esi, eax | ||
566 | xor edx, ebp | ||
567 | mov eax, -1 | ||
568 | rol ebx, 10 | ||
569 | lea esi, DWORD PTR 1859775393[edx*1+esi] | ||
570 | sub eax, edi | ||
571 | rol esi, 5 | ||
572 | add esi, ecx | ||
573 | ; 45 | ||
574 | mov edx, DWORD PTR 44[esp] | ||
575 | or eax, esi | ||
576 | add ecx, edx | ||
577 | xor eax, ebx | ||
578 | mov edx, -1 | ||
579 | rol edi, 10 | ||
580 | lea ecx, DWORD PTR 1859775393[eax*1+ecx] | ||
581 | sub edx, esi | ||
582 | rol ecx, 12 | ||
583 | add ecx, ebp | ||
584 | ; 46 | ||
585 | mov eax, DWORD PTR 20[esp] | ||
586 | or edx, ecx | ||
587 | add ebp, eax | ||
588 | xor edx, edi | ||
589 | mov eax, -1 | ||
590 | rol esi, 10 | ||
591 | lea ebp, DWORD PTR 1859775393[edx*1+ebp] | ||
592 | sub eax, ecx | ||
593 | rol ebp, 7 | ||
594 | add ebp, ebx | ||
595 | ; 47 | ||
596 | mov edx, DWORD PTR 48[esp] | ||
597 | or eax, ebp | ||
598 | add ebx, edx | ||
599 | xor eax, esi | ||
600 | mov edx, -1 | ||
601 | rol ecx, 10 | ||
602 | lea ebx, DWORD PTR 1859775393[eax*1+ebx] | ||
603 | mov eax, ecx | ||
604 | rol ebx, 5 | ||
605 | add ebx, edi | ||
606 | ; 48 | ||
607 | sub edx, ecx | ||
608 | and eax, ebx | ||
609 | and edx, ebp | ||
610 | or edx, eax | ||
611 | mov eax, DWORD PTR 4[esp] | ||
612 | rol ebp, 10 | ||
613 | lea edi, DWORD PTR 2400959708[edx+edi] | ||
614 | mov edx, -1 | ||
615 | add edi, eax | ||
616 | mov eax, ebp | ||
617 | rol edi, 11 | ||
618 | add edi, esi | ||
619 | ; 49 | ||
620 | sub edx, ebp | ||
621 | and eax, edi | ||
622 | and edx, ebx | ||
623 | or edx, eax | ||
624 | mov eax, DWORD PTR 36[esp] | ||
625 | rol ebx, 10 | ||
626 | lea esi, DWORD PTR 2400959708[edx+esi] | ||
627 | mov edx, -1 | ||
628 | add esi, eax | ||
629 | mov eax, ebx | ||
630 | rol esi, 12 | ||
631 | add esi, ecx | ||
632 | ; 50 | ||
633 | sub edx, ebx | ||
634 | and eax, esi | ||
635 | and edx, edi | ||
636 | or edx, eax | ||
637 | mov eax, DWORD PTR 44[esp] | ||
638 | rol edi, 10 | ||
639 | lea ecx, DWORD PTR 2400959708[edx+ecx] | ||
640 | mov edx, -1 | ||
641 | add ecx, eax | ||
642 | mov eax, edi | ||
643 | rol ecx, 14 | ||
644 | add ecx, ebp | ||
645 | ; 51 | ||
646 | sub edx, edi | ||
647 | and eax, ecx | ||
648 | and edx, esi | ||
649 | or edx, eax | ||
650 | mov eax, DWORD PTR 40[esp] | ||
651 | rol esi, 10 | ||
652 | lea ebp, DWORD PTR 2400959708[edx+ebp] | ||
653 | mov edx, -1 | ||
654 | add ebp, eax | ||
655 | mov eax, esi | ||
656 | rol ebp, 15 | ||
657 | add ebp, ebx | ||
658 | ; 52 | ||
659 | sub edx, esi | ||
660 | and eax, ebp | ||
661 | and edx, ecx | ||
662 | or edx, eax | ||
663 | mov eax, DWORD PTR [esp] | ||
664 | rol ecx, 10 | ||
665 | lea ebx, DWORD PTR 2400959708[edx+ebx] | ||
666 | mov edx, -1 | ||
667 | add ebx, eax | ||
668 | mov eax, ecx | ||
669 | rol ebx, 14 | ||
670 | add ebx, edi | ||
671 | ; 53 | ||
672 | sub edx, ecx | ||
673 | and eax, ebx | ||
674 | and edx, ebp | ||
675 | or edx, eax | ||
676 | mov eax, DWORD PTR 32[esp] | ||
677 | rol ebp, 10 | ||
678 | lea edi, DWORD PTR 2400959708[edx+edi] | ||
679 | mov edx, -1 | ||
680 | add edi, eax | ||
681 | mov eax, ebp | ||
682 | rol edi, 15 | ||
683 | add edi, esi | ||
684 | ; 54 | ||
685 | sub edx, ebp | ||
686 | and eax, edi | ||
687 | and edx, ebx | ||
688 | or edx, eax | ||
689 | mov eax, DWORD PTR 48[esp] | ||
690 | rol ebx, 10 | ||
691 | lea esi, DWORD PTR 2400959708[edx+esi] | ||
692 | mov edx, -1 | ||
693 | add esi, eax | ||
694 | mov eax, ebx | ||
695 | rol esi, 9 | ||
696 | add esi, ecx | ||
697 | ; 55 | ||
698 | sub edx, ebx | ||
699 | and eax, esi | ||
700 | and edx, edi | ||
701 | or edx, eax | ||
702 | mov eax, DWORD PTR 16[esp] | ||
703 | rol edi, 10 | ||
704 | lea ecx, DWORD PTR 2400959708[edx+ecx] | ||
705 | mov edx, -1 | ||
706 | add ecx, eax | ||
707 | mov eax, edi | ||
708 | rol ecx, 8 | ||
709 | add ecx, ebp | ||
710 | ; 56 | ||
711 | sub edx, edi | ||
712 | and eax, ecx | ||
713 | and edx, esi | ||
714 | or edx, eax | ||
715 | mov eax, DWORD PTR 52[esp] | ||
716 | rol esi, 10 | ||
717 | lea ebp, DWORD PTR 2400959708[edx+ebp] | ||
718 | mov edx, -1 | ||
719 | add ebp, eax | ||
720 | mov eax, esi | ||
721 | rol ebp, 9 | ||
722 | add ebp, ebx | ||
723 | ; 57 | ||
724 | sub edx, esi | ||
725 | and eax, ebp | ||
726 | and edx, ecx | ||
727 | or edx, eax | ||
728 | mov eax, DWORD PTR 12[esp] | ||
729 | rol ecx, 10 | ||
730 | lea ebx, DWORD PTR 2400959708[edx+ebx] | ||
731 | mov edx, -1 | ||
732 | add ebx, eax | ||
733 | mov eax, ecx | ||
734 | rol ebx, 14 | ||
735 | add ebx, edi | ||
736 | ; 58 | ||
737 | sub edx, ecx | ||
738 | and eax, ebx | ||
739 | and edx, ebp | ||
740 | or edx, eax | ||
741 | mov eax, DWORD PTR 28[esp] | ||
742 | rol ebp, 10 | ||
743 | lea edi, DWORD PTR 2400959708[edx+edi] | ||
744 | mov edx, -1 | ||
745 | add edi, eax | ||
746 | mov eax, ebp | ||
747 | rol edi, 5 | ||
748 | add edi, esi | ||
749 | ; 59 | ||
750 | sub edx, ebp | ||
751 | and eax, edi | ||
752 | and edx, ebx | ||
753 | or edx, eax | ||
754 | mov eax, DWORD PTR 60[esp] | ||
755 | rol ebx, 10 | ||
756 | lea esi, DWORD PTR 2400959708[edx+esi] | ||
757 | mov edx, -1 | ||
758 | add esi, eax | ||
759 | mov eax, ebx | ||
760 | rol esi, 6 | ||
761 | add esi, ecx | ||
762 | ; 60 | ||
763 | sub edx, ebx | ||
764 | and eax, esi | ||
765 | and edx, edi | ||
766 | or edx, eax | ||
767 | mov eax, DWORD PTR 56[esp] | ||
768 | rol edi, 10 | ||
769 | lea ecx, DWORD PTR 2400959708[edx+ecx] | ||
770 | mov edx, -1 | ||
771 | add ecx, eax | ||
772 | mov eax, edi | ||
773 | rol ecx, 8 | ||
774 | add ecx, ebp | ||
775 | ; 61 | ||
776 | sub edx, edi | ||
777 | and eax, ecx | ||
778 | and edx, esi | ||
779 | or edx, eax | ||
780 | mov eax, DWORD PTR 20[esp] | ||
781 | rol esi, 10 | ||
782 | lea ebp, DWORD PTR 2400959708[edx+ebp] | ||
783 | mov edx, -1 | ||
784 | add ebp, eax | ||
785 | mov eax, esi | ||
786 | rol ebp, 6 | ||
787 | add ebp, ebx | ||
788 | ; 62 | ||
789 | sub edx, esi | ||
790 | and eax, ebp | ||
791 | and edx, ecx | ||
792 | or edx, eax | ||
793 | mov eax, DWORD PTR 24[esp] | ||
794 | rol ecx, 10 | ||
795 | lea ebx, DWORD PTR 2400959708[edx+ebx] | ||
796 | mov edx, -1 | ||
797 | add ebx, eax | ||
798 | mov eax, ecx | ||
799 | rol ebx, 5 | ||
800 | add ebx, edi | ||
801 | ; 63 | ||
802 | sub edx, ecx | ||
803 | and eax, ebx | ||
804 | and edx, ebp | ||
805 | or edx, eax | ||
806 | mov eax, DWORD PTR 8[esp] | ||
807 | rol ebp, 10 | ||
808 | lea edi, DWORD PTR 2400959708[edx+edi] | ||
809 | mov edx, -1 | ||
810 | add edi, eax | ||
811 | sub edx, ebp | ||
812 | rol edi, 12 | ||
813 | add edi, esi | ||
814 | ; 64 | ||
815 | mov eax, DWORD PTR 16[esp] | ||
816 | or edx, ebx | ||
817 | add esi, eax | ||
818 | xor edx, edi | ||
819 | mov eax, -1 | ||
820 | rol ebx, 10 | ||
821 | lea esi, DWORD PTR 2840853838[edx*1+esi] | ||
822 | sub eax, ebx | ||
823 | rol esi, 9 | ||
824 | add esi, ecx | ||
825 | ; 65 | ||
826 | mov edx, DWORD PTR [esp] | ||
827 | or eax, edi | ||
828 | add ecx, edx | ||
829 | xor eax, esi | ||
830 | mov edx, -1 | ||
831 | rol edi, 10 | ||
832 | lea ecx, DWORD PTR 2840853838[eax*1+ecx] | ||
833 | sub edx, edi | ||
834 | rol ecx, 15 | ||
835 | add ecx, ebp | ||
836 | ; 66 | ||
837 | mov eax, DWORD PTR 20[esp] | ||
838 | or edx, esi | ||
839 | add ebp, eax | ||
840 | xor edx, ecx | ||
841 | mov eax, -1 | ||
842 | rol esi, 10 | ||
843 | lea ebp, DWORD PTR 2840853838[edx*1+ebp] | ||
844 | sub eax, esi | ||
845 | rol ebp, 5 | ||
846 | add ebp, ebx | ||
847 | ; 67 | ||
848 | mov edx, DWORD PTR 36[esp] | ||
849 | or eax, ecx | ||
850 | add ebx, edx | ||
851 | xor eax, ebp | ||
852 | mov edx, -1 | ||
853 | rol ecx, 10 | ||
854 | lea ebx, DWORD PTR 2840853838[eax*1+ebx] | ||
855 | sub edx, ecx | ||
856 | rol ebx, 11 | ||
857 | add ebx, edi | ||
858 | ; 68 | ||
859 | mov eax, DWORD PTR 28[esp] | ||
860 | or edx, ebp | ||
861 | add edi, eax | ||
862 | xor edx, ebx | ||
863 | mov eax, -1 | ||
864 | rol ebp, 10 | ||
865 | lea edi, DWORD PTR 2840853838[edx*1+edi] | ||
866 | sub eax, ebp | ||
867 | rol edi, 6 | ||
868 | add edi, esi | ||
869 | ; 69 | ||
870 | mov edx, DWORD PTR 48[esp] | ||
871 | or eax, ebx | ||
872 | add esi, edx | ||
873 | xor eax, edi | ||
874 | mov edx, -1 | ||
875 | rol ebx, 10 | ||
876 | lea esi, DWORD PTR 2840853838[eax*1+esi] | ||
877 | sub edx, ebx | ||
878 | rol esi, 8 | ||
879 | add esi, ecx | ||
880 | ; 70 | ||
881 | mov eax, DWORD PTR 8[esp] | ||
882 | or edx, edi | ||
883 | add ecx, eax | ||
884 | xor edx, esi | ||
885 | mov eax, -1 | ||
886 | rol edi, 10 | ||
887 | lea ecx, DWORD PTR 2840853838[edx*1+ecx] | ||
888 | sub eax, edi | ||
889 | rol ecx, 13 | ||
890 | add ecx, ebp | ||
891 | ; 71 | ||
892 | mov edx, DWORD PTR 40[esp] | ||
893 | or eax, esi | ||
894 | add ebp, edx | ||
895 | xor eax, ecx | ||
896 | mov edx, -1 | ||
897 | rol esi, 10 | ||
898 | lea ebp, DWORD PTR 2840853838[eax*1+ebp] | ||
899 | sub edx, esi | ||
900 | rol ebp, 12 | ||
901 | add ebp, ebx | ||
902 | ; 72 | ||
903 | mov eax, DWORD PTR 56[esp] | ||
904 | or edx, ecx | ||
905 | add ebx, eax | ||
906 | xor edx, ebp | ||
907 | mov eax, -1 | ||
908 | rol ecx, 10 | ||
909 | lea ebx, DWORD PTR 2840853838[edx*1+ebx] | ||
910 | sub eax, ecx | ||
911 | rol ebx, 5 | ||
912 | add ebx, edi | ||
913 | ; 73 | ||
914 | mov edx, DWORD PTR 4[esp] | ||
915 | or eax, ebp | ||
916 | add edi, edx | ||
917 | xor eax, ebx | ||
918 | mov edx, -1 | ||
919 | rol ebp, 10 | ||
920 | lea edi, DWORD PTR 2840853838[eax*1+edi] | ||
921 | sub edx, ebp | ||
922 | rol edi, 12 | ||
923 | add edi, esi | ||
924 | ; 74 | ||
925 | mov eax, DWORD PTR 12[esp] | ||
926 | or edx, ebx | ||
927 | add esi, eax | ||
928 | xor edx, edi | ||
929 | mov eax, -1 | ||
930 | rol ebx, 10 | ||
931 | lea esi, DWORD PTR 2840853838[edx*1+esi] | ||
932 | sub eax, ebx | ||
933 | rol esi, 13 | ||
934 | add esi, ecx | ||
935 | ; 75 | ||
936 | mov edx, DWORD PTR 32[esp] | ||
937 | or eax, edi | ||
938 | add ecx, edx | ||
939 | xor eax, esi | ||
940 | mov edx, -1 | ||
941 | rol edi, 10 | ||
942 | lea ecx, DWORD PTR 2840853838[eax*1+ecx] | ||
943 | sub edx, edi | ||
944 | rol ecx, 14 | ||
945 | add ecx, ebp | ||
946 | ; 76 | ||
947 | mov eax, DWORD PTR 44[esp] | ||
948 | or edx, esi | ||
949 | add ebp, eax | ||
950 | xor edx, ecx | ||
951 | mov eax, -1 | ||
952 | rol esi, 10 | ||
953 | lea ebp, DWORD PTR 2840853838[edx*1+ebp] | ||
954 | sub eax, esi | ||
955 | rol ebp, 11 | ||
956 | add ebp, ebx | ||
957 | ; 77 | ||
958 | mov edx, DWORD PTR 24[esp] | ||
959 | or eax, ecx | ||
960 | add ebx, edx | ||
961 | xor eax, ebp | ||
962 | mov edx, -1 | ||
963 | rol ecx, 10 | ||
964 | lea ebx, DWORD PTR 2840853838[eax*1+ebx] | ||
965 | sub edx, ecx | ||
966 | rol ebx, 8 | ||
967 | add ebx, edi | ||
968 | ; 78 | ||
969 | mov eax, DWORD PTR 60[esp] | ||
970 | or edx, ebp | ||
971 | add edi, eax | ||
972 | xor edx, ebx | ||
973 | mov eax, -1 | ||
974 | rol ebp, 10 | ||
975 | lea edi, DWORD PTR 2840853838[edx*1+edi] | ||
976 | sub eax, ebp | ||
977 | rol edi, 5 | ||
978 | add edi, esi | ||
979 | ; 79 | ||
980 | mov edx, DWORD PTR 52[esp] | ||
981 | or eax, ebx | ||
982 | add esi, edx | ||
983 | xor eax, edi | ||
984 | mov edx, DWORD PTR 128[esp] | ||
985 | rol ebx, 10 | ||
986 | lea esi, DWORD PTR 2840853838[eax*1+esi] | ||
987 | mov DWORD PTR 64[esp],ecx | ||
988 | rol esi, 6 | ||
989 | add esi, ecx | ||
990 | mov ecx, DWORD PTR [edx] | ||
991 | mov DWORD PTR 68[esp],esi | ||
992 | mov DWORD PTR 72[esp],edi | ||
993 | mov esi, DWORD PTR 4[edx] | ||
994 | mov DWORD PTR 76[esp],ebx | ||
995 | mov edi, DWORD PTR 8[edx] | ||
996 | mov DWORD PTR 80[esp],ebp | ||
997 | mov ebx, DWORD PTR 12[edx] | ||
998 | mov ebp, DWORD PTR 16[edx] | ||
999 | ; 80 | ||
1000 | mov edx, -1 | ||
1001 | sub edx, ebx | ||
1002 | mov eax, DWORD PTR 20[esp] | ||
1003 | or edx, edi | ||
1004 | add ecx, eax | ||
1005 | xor edx, esi | ||
1006 | mov eax, -1 | ||
1007 | rol edi, 10 | ||
1008 | lea ecx, DWORD PTR 1352829926[edx*1+ecx] | ||
1009 | sub eax, edi | ||
1010 | rol ecx, 8 | ||
1011 | add ecx, ebp | ||
1012 | ; 81 | ||
1013 | mov edx, DWORD PTR 56[esp] | ||
1014 | or eax, esi | ||
1015 | add ebp, edx | ||
1016 | xor eax, ecx | ||
1017 | mov edx, -1 | ||
1018 | rol esi, 10 | ||
1019 | lea ebp, DWORD PTR 1352829926[eax*1+ebp] | ||
1020 | sub edx, esi | ||
1021 | rol ebp, 9 | ||
1022 | add ebp, ebx | ||
1023 | ; 82 | ||
1024 | mov eax, DWORD PTR 28[esp] | ||
1025 | or edx, ecx | ||
1026 | add ebx, eax | ||
1027 | xor edx, ebp | ||
1028 | mov eax, -1 | ||
1029 | rol ecx, 10 | ||
1030 | lea ebx, DWORD PTR 1352829926[edx*1+ebx] | ||
1031 | sub eax, ecx | ||
1032 | rol ebx, 9 | ||
1033 | add ebx, edi | ||
1034 | ; 83 | ||
1035 | mov edx, DWORD PTR [esp] | ||
1036 | or eax, ebp | ||
1037 | add edi, edx | ||
1038 | xor eax, ebx | ||
1039 | mov edx, -1 | ||
1040 | rol ebp, 10 | ||
1041 | lea edi, DWORD PTR 1352829926[eax*1+edi] | ||
1042 | sub edx, ebp | ||
1043 | rol edi, 11 | ||
1044 | add edi, esi | ||
1045 | ; 84 | ||
1046 | mov eax, DWORD PTR 36[esp] | ||
1047 | or edx, ebx | ||
1048 | add esi, eax | ||
1049 | xor edx, edi | ||
1050 | mov eax, -1 | ||
1051 | rol ebx, 10 | ||
1052 | lea esi, DWORD PTR 1352829926[edx*1+esi] | ||
1053 | sub eax, ebx | ||
1054 | rol esi, 13 | ||
1055 | add esi, ecx | ||
1056 | ; 85 | ||
1057 | mov edx, DWORD PTR 8[esp] | ||
1058 | or eax, edi | ||
1059 | add ecx, edx | ||
1060 | xor eax, esi | ||
1061 | mov edx, -1 | ||
1062 | rol edi, 10 | ||
1063 | lea ecx, DWORD PTR 1352829926[eax*1+ecx] | ||
1064 | sub edx, edi | ||
1065 | rol ecx, 15 | ||
1066 | add ecx, ebp | ||
1067 | ; 86 | ||
1068 | mov eax, DWORD PTR 44[esp] | ||
1069 | or edx, esi | ||
1070 | add ebp, eax | ||
1071 | xor edx, ecx | ||
1072 | mov eax, -1 | ||
1073 | rol esi, 10 | ||
1074 | lea ebp, DWORD PTR 1352829926[edx*1+ebp] | ||
1075 | sub eax, esi | ||
1076 | rol ebp, 15 | ||
1077 | add ebp, ebx | ||
1078 | ; 87 | ||
1079 | mov edx, DWORD PTR 16[esp] | ||
1080 | or eax, ecx | ||
1081 | add ebx, edx | ||
1082 | xor eax, ebp | ||
1083 | mov edx, -1 | ||
1084 | rol ecx, 10 | ||
1085 | lea ebx, DWORD PTR 1352829926[eax*1+ebx] | ||
1086 | sub edx, ecx | ||
1087 | rol ebx, 5 | ||
1088 | add ebx, edi | ||
1089 | ; 88 | ||
1090 | mov eax, DWORD PTR 52[esp] | ||
1091 | or edx, ebp | ||
1092 | add edi, eax | ||
1093 | xor edx, ebx | ||
1094 | mov eax, -1 | ||
1095 | rol ebp, 10 | ||
1096 | lea edi, DWORD PTR 1352829926[edx*1+edi] | ||
1097 | sub eax, ebp | ||
1098 | rol edi, 7 | ||
1099 | add edi, esi | ||
1100 | ; 89 | ||
1101 | mov edx, DWORD PTR 24[esp] | ||
1102 | or eax, ebx | ||
1103 | add esi, edx | ||
1104 | xor eax, edi | ||
1105 | mov edx, -1 | ||
1106 | rol ebx, 10 | ||
1107 | lea esi, DWORD PTR 1352829926[eax*1+esi] | ||
1108 | sub edx, ebx | ||
1109 | rol esi, 7 | ||
1110 | add esi, ecx | ||
1111 | ; 90 | ||
1112 | mov eax, DWORD PTR 60[esp] | ||
1113 | or edx, edi | ||
1114 | add ecx, eax | ||
1115 | xor edx, esi | ||
1116 | mov eax, -1 | ||
1117 | rol edi, 10 | ||
1118 | lea ecx, DWORD PTR 1352829926[edx*1+ecx] | ||
1119 | sub eax, edi | ||
1120 | rol ecx, 8 | ||
1121 | add ecx, ebp | ||
1122 | ; 91 | ||
1123 | mov edx, DWORD PTR 32[esp] | ||
1124 | or eax, esi | ||
1125 | add ebp, edx | ||
1126 | xor eax, ecx | ||
1127 | mov edx, -1 | ||
1128 | rol esi, 10 | ||
1129 | lea ebp, DWORD PTR 1352829926[eax*1+ebp] | ||
1130 | sub edx, esi | ||
1131 | rol ebp, 11 | ||
1132 | add ebp, ebx | ||
1133 | ; 92 | ||
1134 | mov eax, DWORD PTR 4[esp] | ||
1135 | or edx, ecx | ||
1136 | add ebx, eax | ||
1137 | xor edx, ebp | ||
1138 | mov eax, -1 | ||
1139 | rol ecx, 10 | ||
1140 | lea ebx, DWORD PTR 1352829926[edx*1+ebx] | ||
1141 | sub eax, ecx | ||
1142 | rol ebx, 14 | ||
1143 | add ebx, edi | ||
1144 | ; 93 | ||
1145 | mov edx, DWORD PTR 40[esp] | ||
1146 | or eax, ebp | ||
1147 | add edi, edx | ||
1148 | xor eax, ebx | ||
1149 | mov edx, -1 | ||
1150 | rol ebp, 10 | ||
1151 | lea edi, DWORD PTR 1352829926[eax*1+edi] | ||
1152 | sub edx, ebp | ||
1153 | rol edi, 14 | ||
1154 | add edi, esi | ||
1155 | ; 94 | ||
1156 | mov eax, DWORD PTR 12[esp] | ||
1157 | or edx, ebx | ||
1158 | add esi, eax | ||
1159 | xor edx, edi | ||
1160 | mov eax, -1 | ||
1161 | rol ebx, 10 | ||
1162 | lea esi, DWORD PTR 1352829926[edx*1+esi] | ||
1163 | sub eax, ebx | ||
1164 | rol esi, 12 | ||
1165 | add esi, ecx | ||
1166 | ; 95 | ||
1167 | mov edx, DWORD PTR 48[esp] | ||
1168 | or eax, edi | ||
1169 | add ecx, edx | ||
1170 | xor eax, esi | ||
1171 | mov edx, -1 | ||
1172 | rol edi, 10 | ||
1173 | lea ecx, DWORD PTR 1352829926[eax*1+ecx] | ||
1174 | mov eax, edi | ||
1175 | rol ecx, 6 | ||
1176 | add ecx, ebp | ||
1177 | ; 96 | ||
1178 | sub edx, edi | ||
1179 | and eax, ecx | ||
1180 | and edx, esi | ||
1181 | or edx, eax | ||
1182 | mov eax, DWORD PTR 24[esp] | ||
1183 | rol esi, 10 | ||
1184 | lea ebp, DWORD PTR 1548603684[edx+ebp] | ||
1185 | mov edx, -1 | ||
1186 | add ebp, eax | ||
1187 | mov eax, esi | ||
1188 | rol ebp, 9 | ||
1189 | add ebp, ebx | ||
1190 | ; 97 | ||
1191 | sub edx, esi | ||
1192 | and eax, ebp | ||
1193 | and edx, ecx | ||
1194 | or edx, eax | ||
1195 | mov eax, DWORD PTR 44[esp] | ||
1196 | rol ecx, 10 | ||
1197 | lea ebx, DWORD PTR 1548603684[edx+ebx] | ||
1198 | mov edx, -1 | ||
1199 | add ebx, eax | ||
1200 | mov eax, ecx | ||
1201 | rol ebx, 13 | ||
1202 | add ebx, edi | ||
1203 | ; 98 | ||
1204 | sub edx, ecx | ||
1205 | and eax, ebx | ||
1206 | and edx, ebp | ||
1207 | or edx, eax | ||
1208 | mov eax, DWORD PTR 12[esp] | ||
1209 | rol ebp, 10 | ||
1210 | lea edi, DWORD PTR 1548603684[edx+edi] | ||
1211 | mov edx, -1 | ||
1212 | add edi, eax | ||
1213 | mov eax, ebp | ||
1214 | rol edi, 15 | ||
1215 | add edi, esi | ||
1216 | ; 99 | ||
1217 | sub edx, ebp | ||
1218 | and eax, edi | ||
1219 | and edx, ebx | ||
1220 | or edx, eax | ||
1221 | mov eax, DWORD PTR 28[esp] | ||
1222 | rol ebx, 10 | ||
1223 | lea esi, DWORD PTR 1548603684[edx+esi] | ||
1224 | mov edx, -1 | ||
1225 | add esi, eax | ||
1226 | mov eax, ebx | ||
1227 | rol esi, 7 | ||
1228 | add esi, ecx | ||
1229 | ; 100 | ||
1230 | sub edx, ebx | ||
1231 | and eax, esi | ||
1232 | and edx, edi | ||
1233 | or edx, eax | ||
1234 | mov eax, DWORD PTR [esp] | ||
1235 | rol edi, 10 | ||
1236 | lea ecx, DWORD PTR 1548603684[edx+ecx] | ||
1237 | mov edx, -1 | ||
1238 | add ecx, eax | ||
1239 | mov eax, edi | ||
1240 | rol ecx, 12 | ||
1241 | add ecx, ebp | ||
1242 | ; 101 | ||
1243 | sub edx, edi | ||
1244 | and eax, ecx | ||
1245 | and edx, esi | ||
1246 | or edx, eax | ||
1247 | mov eax, DWORD PTR 52[esp] | ||
1248 | rol esi, 10 | ||
1249 | lea ebp, DWORD PTR 1548603684[edx+ebp] | ||
1250 | mov edx, -1 | ||
1251 | add ebp, eax | ||
1252 | mov eax, esi | ||
1253 | rol ebp, 8 | ||
1254 | add ebp, ebx | ||
1255 | ; 102 | ||
1256 | sub edx, esi | ||
1257 | and eax, ebp | ||
1258 | and edx, ecx | ||
1259 | or edx, eax | ||
1260 | mov eax, DWORD PTR 20[esp] | ||
1261 | rol ecx, 10 | ||
1262 | lea ebx, DWORD PTR 1548603684[edx+ebx] | ||
1263 | mov edx, -1 | ||
1264 | add ebx, eax | ||
1265 | mov eax, ecx | ||
1266 | rol ebx, 9 | ||
1267 | add ebx, edi | ||
1268 | ; 103 | ||
1269 | sub edx, ecx | ||
1270 | and eax, ebx | ||
1271 | and edx, ebp | ||
1272 | or edx, eax | ||
1273 | mov eax, DWORD PTR 40[esp] | ||
1274 | rol ebp, 10 | ||
1275 | lea edi, DWORD PTR 1548603684[edx+edi] | ||
1276 | mov edx, -1 | ||
1277 | add edi, eax | ||
1278 | mov eax, ebp | ||
1279 | rol edi, 11 | ||
1280 | add edi, esi | ||
1281 | ; 104 | ||
1282 | sub edx, ebp | ||
1283 | and eax, edi | ||
1284 | and edx, ebx | ||
1285 | or edx, eax | ||
1286 | mov eax, DWORD PTR 56[esp] | ||
1287 | rol ebx, 10 | ||
1288 | lea esi, DWORD PTR 1548603684[edx+esi] | ||
1289 | mov edx, -1 | ||
1290 | add esi, eax | ||
1291 | mov eax, ebx | ||
1292 | rol esi, 7 | ||
1293 | add esi, ecx | ||
1294 | ; 105 | ||
1295 | sub edx, ebx | ||
1296 | and eax, esi | ||
1297 | and edx, edi | ||
1298 | or edx, eax | ||
1299 | mov eax, DWORD PTR 60[esp] | ||
1300 | rol edi, 10 | ||
1301 | lea ecx, DWORD PTR 1548603684[edx+ecx] | ||
1302 | mov edx, -1 | ||
1303 | add ecx, eax | ||
1304 | mov eax, edi | ||
1305 | rol ecx, 7 | ||
1306 | add ecx, ebp | ||
1307 | ; 106 | ||
1308 | sub edx, edi | ||
1309 | and eax, ecx | ||
1310 | and edx, esi | ||
1311 | or edx, eax | ||
1312 | mov eax, DWORD PTR 32[esp] | ||
1313 | rol esi, 10 | ||
1314 | lea ebp, DWORD PTR 1548603684[edx+ebp] | ||
1315 | mov edx, -1 | ||
1316 | add ebp, eax | ||
1317 | mov eax, esi | ||
1318 | rol ebp, 12 | ||
1319 | add ebp, ebx | ||
1320 | ; 107 | ||
1321 | sub edx, esi | ||
1322 | and eax, ebp | ||
1323 | and edx, ecx | ||
1324 | or edx, eax | ||
1325 | mov eax, DWORD PTR 48[esp] | ||
1326 | rol ecx, 10 | ||
1327 | lea ebx, DWORD PTR 1548603684[edx+ebx] | ||
1328 | mov edx, -1 | ||
1329 | add ebx, eax | ||
1330 | mov eax, ecx | ||
1331 | rol ebx, 7 | ||
1332 | add ebx, edi | ||
1333 | ; 108 | ||
1334 | sub edx, ecx | ||
1335 | and eax, ebx | ||
1336 | and edx, ebp | ||
1337 | or edx, eax | ||
1338 | mov eax, DWORD PTR 16[esp] | ||
1339 | rol ebp, 10 | ||
1340 | lea edi, DWORD PTR 1548603684[edx+edi] | ||
1341 | mov edx, -1 | ||
1342 | add edi, eax | ||
1343 | mov eax, ebp | ||
1344 | rol edi, 6 | ||
1345 | add edi, esi | ||
1346 | ; 109 | ||
1347 | sub edx, ebp | ||
1348 | and eax, edi | ||
1349 | and edx, ebx | ||
1350 | or edx, eax | ||
1351 | mov eax, DWORD PTR 36[esp] | ||
1352 | rol ebx, 10 | ||
1353 | lea esi, DWORD PTR 1548603684[edx+esi] | ||
1354 | mov edx, -1 | ||
1355 | add esi, eax | ||
1356 | mov eax, ebx | ||
1357 | rol esi, 15 | ||
1358 | add esi, ecx | ||
1359 | ; 110 | ||
1360 | sub edx, ebx | ||
1361 | and eax, esi | ||
1362 | and edx, edi | ||
1363 | or edx, eax | ||
1364 | mov eax, DWORD PTR 4[esp] | ||
1365 | rol edi, 10 | ||
1366 | lea ecx, DWORD PTR 1548603684[edx+ecx] | ||
1367 | mov edx, -1 | ||
1368 | add ecx, eax | ||
1369 | mov eax, edi | ||
1370 | rol ecx, 13 | ||
1371 | add ecx, ebp | ||
1372 | ; 111 | ||
1373 | sub edx, edi | ||
1374 | and eax, ecx | ||
1375 | and edx, esi | ||
1376 | or edx, eax | ||
1377 | mov eax, DWORD PTR 8[esp] | ||
1378 | rol esi, 10 | ||
1379 | lea ebp, DWORD PTR 1548603684[edx+ebp] | ||
1380 | mov edx, -1 | ||
1381 | add ebp, eax | ||
1382 | sub edx, ecx | ||
1383 | rol ebp, 11 | ||
1384 | add ebp, ebx | ||
1385 | ; 112 | ||
1386 | mov eax, DWORD PTR 60[esp] | ||
1387 | or edx, ebp | ||
1388 | add ebx, eax | ||
1389 | xor edx, esi | ||
1390 | mov eax, -1 | ||
1391 | rol ecx, 10 | ||
1392 | lea ebx, DWORD PTR 1836072691[edx*1+ebx] | ||
1393 | sub eax, ebp | ||
1394 | rol ebx, 9 | ||
1395 | add ebx, edi | ||
1396 | ; 113 | ||
1397 | mov edx, DWORD PTR 20[esp] | ||
1398 | or eax, ebx | ||
1399 | add edi, edx | ||
1400 | xor eax, ecx | ||
1401 | mov edx, -1 | ||
1402 | rol ebp, 10 | ||
1403 | lea edi, DWORD PTR 1836072691[eax*1+edi] | ||
1404 | sub edx, ebx | ||
1405 | rol edi, 7 | ||
1406 | add edi, esi | ||
1407 | ; 114 | ||
1408 | mov eax, DWORD PTR 4[esp] | ||
1409 | or edx, edi | ||
1410 | add esi, eax | ||
1411 | xor edx, ebp | ||
1412 | mov eax, -1 | ||
1413 | rol ebx, 10 | ||
1414 | lea esi, DWORD PTR 1836072691[edx*1+esi] | ||
1415 | sub eax, edi | ||
1416 | rol esi, 15 | ||
1417 | add esi, ecx | ||
1418 | ; 115 | ||
1419 | mov edx, DWORD PTR 12[esp] | ||
1420 | or eax, esi | ||
1421 | add ecx, edx | ||
1422 | xor eax, ebx | ||
1423 | mov edx, -1 | ||
1424 | rol edi, 10 | ||
1425 | lea ecx, DWORD PTR 1836072691[eax*1+ecx] | ||
1426 | sub edx, esi | ||
1427 | rol ecx, 11 | ||
1428 | add ecx, ebp | ||
1429 | ; 116 | ||
1430 | mov eax, DWORD PTR 28[esp] | ||
1431 | or edx, ecx | ||
1432 | add ebp, eax | ||
1433 | xor edx, edi | ||
1434 | mov eax, -1 | ||
1435 | rol esi, 10 | ||
1436 | lea ebp, DWORD PTR 1836072691[edx*1+ebp] | ||
1437 | sub eax, ecx | ||
1438 | rol ebp, 8 | ||
1439 | add ebp, ebx | ||
1440 | ; 117 | ||
1441 | mov edx, DWORD PTR 56[esp] | ||
1442 | or eax, ebp | ||
1443 | add ebx, edx | ||
1444 | xor eax, esi | ||
1445 | mov edx, -1 | ||
1446 | rol ecx, 10 | ||
1447 | lea ebx, DWORD PTR 1836072691[eax*1+ebx] | ||
1448 | sub edx, ebp | ||
1449 | rol ebx, 6 | ||
1450 | add ebx, edi | ||
1451 | ; 118 | ||
1452 | mov eax, DWORD PTR 24[esp] | ||
1453 | or edx, ebx | ||
1454 | add edi, eax | ||
1455 | xor edx, ecx | ||
1456 | mov eax, -1 | ||
1457 | rol ebp, 10 | ||
1458 | lea edi, DWORD PTR 1836072691[edx*1+edi] | ||
1459 | sub eax, ebx | ||
1460 | rol edi, 6 | ||
1461 | add edi, esi | ||
1462 | ; 119 | ||
1463 | mov edx, DWORD PTR 36[esp] | ||
1464 | or eax, edi | ||
1465 | add esi, edx | ||
1466 | xor eax, ebp | ||
1467 | mov edx, -1 | ||
1468 | rol ebx, 10 | ||
1469 | lea esi, DWORD PTR 1836072691[eax*1+esi] | ||
1470 | sub edx, edi | ||
1471 | rol esi, 14 | ||
1472 | add esi, ecx | ||
1473 | ; 120 | ||
1474 | mov eax, DWORD PTR 44[esp] | ||
1475 | or edx, esi | ||
1476 | add ecx, eax | ||
1477 | xor edx, ebx | ||
1478 | mov eax, -1 | ||
1479 | rol edi, 10 | ||
1480 | lea ecx, DWORD PTR 1836072691[edx*1+ecx] | ||
1481 | sub eax, esi | ||
1482 | rol ecx, 12 | ||
1483 | add ecx, ebp | ||
1484 | ; 121 | ||
1485 | mov edx, DWORD PTR 32[esp] | ||
1486 | or eax, ecx | ||
1487 | add ebp, edx | ||
1488 | xor eax, edi | ||
1489 | mov edx, -1 | ||
1490 | rol esi, 10 | ||
1491 | lea ebp, DWORD PTR 1836072691[eax*1+ebp] | ||
1492 | sub edx, ecx | ||
1493 | rol ebp, 13 | ||
1494 | add ebp, ebx | ||
1495 | ; 122 | ||
1496 | mov eax, DWORD PTR 48[esp] | ||
1497 | or edx, ebp | ||
1498 | add ebx, eax | ||
1499 | xor edx, esi | ||
1500 | mov eax, -1 | ||
1501 | rol ecx, 10 | ||
1502 | lea ebx, DWORD PTR 1836072691[edx*1+ebx] | ||
1503 | sub eax, ebp | ||
1504 | rol ebx, 5 | ||
1505 | add ebx, edi | ||
1506 | ; 123 | ||
1507 | mov edx, DWORD PTR 8[esp] | ||
1508 | or eax, ebx | ||
1509 | add edi, edx | ||
1510 | xor eax, ecx | ||
1511 | mov edx, -1 | ||
1512 | rol ebp, 10 | ||
1513 | lea edi, DWORD PTR 1836072691[eax*1+edi] | ||
1514 | sub edx, ebx | ||
1515 | rol edi, 14 | ||
1516 | add edi, esi | ||
1517 | ; 124 | ||
1518 | mov eax, DWORD PTR 40[esp] | ||
1519 | or edx, edi | ||
1520 | add esi, eax | ||
1521 | xor edx, ebp | ||
1522 | mov eax, -1 | ||
1523 | rol ebx, 10 | ||
1524 | lea esi, DWORD PTR 1836072691[edx*1+esi] | ||
1525 | sub eax, edi | ||
1526 | rol esi, 13 | ||
1527 | add esi, ecx | ||
1528 | ; 125 | ||
1529 | mov edx, DWORD PTR [esp] | ||
1530 | or eax, esi | ||
1531 | add ecx, edx | ||
1532 | xor eax, ebx | ||
1533 | mov edx, -1 | ||
1534 | rol edi, 10 | ||
1535 | lea ecx, DWORD PTR 1836072691[eax*1+ecx] | ||
1536 | sub edx, esi | ||
1537 | rol ecx, 13 | ||
1538 | add ecx, ebp | ||
1539 | ; 126 | ||
1540 | mov eax, DWORD PTR 16[esp] | ||
1541 | or edx, ecx | ||
1542 | add ebp, eax | ||
1543 | xor edx, edi | ||
1544 | mov eax, -1 | ||
1545 | rol esi, 10 | ||
1546 | lea ebp, DWORD PTR 1836072691[edx*1+ebp] | ||
1547 | sub eax, ecx | ||
1548 | rol ebp, 7 | ||
1549 | add ebp, ebx | ||
1550 | ; 127 | ||
1551 | mov edx, DWORD PTR 52[esp] | ||
1552 | or eax, ebp | ||
1553 | add ebx, edx | ||
1554 | xor eax, esi | ||
1555 | mov edx, DWORD PTR 32[esp] | ||
1556 | rol ecx, 10 | ||
1557 | lea ebx, DWORD PTR 1836072691[eax*1+ebx] | ||
1558 | mov eax, -1 | ||
1559 | rol ebx, 5 | ||
1560 | add ebx, edi | ||
1561 | ; 128 | ||
1562 | add edi, edx | ||
1563 | mov edx, ebp | ||
1564 | sub eax, ebx | ||
1565 | and edx, ebx | ||
1566 | and eax, ecx | ||
1567 | or edx, eax | ||
1568 | mov eax, DWORD PTR 24[esp] | ||
1569 | rol ebp, 10 | ||
1570 | lea edi, DWORD PTR 2053994217[edx*1+edi] | ||
1571 | mov edx, -1 | ||
1572 | rol edi, 15 | ||
1573 | add edi, esi | ||
1574 | ; 129 | ||
1575 | add esi, eax | ||
1576 | mov eax, ebx | ||
1577 | sub edx, edi | ||
1578 | and eax, edi | ||
1579 | and edx, ebp | ||
1580 | or eax, edx | ||
1581 | mov edx, DWORD PTR 16[esp] | ||
1582 | rol ebx, 10 | ||
1583 | lea esi, DWORD PTR 2053994217[eax*1+esi] | ||
1584 | mov eax, -1 | ||
1585 | rol esi, 5 | ||
1586 | add esi, ecx | ||
1587 | ; 130 | ||
1588 | add ecx, edx | ||
1589 | mov edx, edi | ||
1590 | sub eax, esi | ||
1591 | and edx, esi | ||
1592 | and eax, ebx | ||
1593 | or edx, eax | ||
1594 | mov eax, DWORD PTR 4[esp] | ||
1595 | rol edi, 10 | ||
1596 | lea ecx, DWORD PTR 2053994217[edx*1+ecx] | ||
1597 | mov edx, -1 | ||
1598 | rol ecx, 8 | ||
1599 | add ecx, ebp | ||
1600 | ; 131 | ||
1601 | add ebp, eax | ||
1602 | mov eax, esi | ||
1603 | sub edx, ecx | ||
1604 | and eax, ecx | ||
1605 | and edx, edi | ||
1606 | or eax, edx | ||
1607 | mov edx, DWORD PTR 12[esp] | ||
1608 | rol esi, 10 | ||
1609 | lea ebp, DWORD PTR 2053994217[eax*1+ebp] | ||
1610 | mov eax, -1 | ||
1611 | rol ebp, 11 | ||
1612 | add ebp, ebx | ||
1613 | ; 132 | ||
1614 | add ebx, edx | ||
1615 | mov edx, ecx | ||
1616 | sub eax, ebp | ||
1617 | and edx, ebp | ||
1618 | and eax, esi | ||
1619 | or edx, eax | ||
1620 | mov eax, DWORD PTR 44[esp] | ||
1621 | rol ecx, 10 | ||
1622 | lea ebx, DWORD PTR 2053994217[edx*1+ebx] | ||
1623 | mov edx, -1 | ||
1624 | rol ebx, 14 | ||
1625 | add ebx, edi | ||
1626 | ; 133 | ||
1627 | add edi, eax | ||
1628 | mov eax, ebp | ||
1629 | sub edx, ebx | ||
1630 | and eax, ebx | ||
1631 | and edx, ecx | ||
1632 | or eax, edx | ||
1633 | mov edx, DWORD PTR 60[esp] | ||
1634 | rol ebp, 10 | ||
1635 | lea edi, DWORD PTR 2053994217[eax*1+edi] | ||
1636 | mov eax, -1 | ||
1637 | rol edi, 14 | ||
1638 | add edi, esi | ||
1639 | ; 134 | ||
1640 | add esi, edx | ||
1641 | mov edx, ebx | ||
1642 | sub eax, edi | ||
1643 | and edx, edi | ||
1644 | and eax, ebp | ||
1645 | or edx, eax | ||
1646 | mov eax, DWORD PTR [esp] | ||
1647 | rol ebx, 10 | ||
1648 | lea esi, DWORD PTR 2053994217[edx*1+esi] | ||
1649 | mov edx, -1 | ||
1650 | rol esi, 6 | ||
1651 | add esi, ecx | ||
1652 | ; 135 | ||
1653 | add ecx, eax | ||
1654 | mov eax, edi | ||
1655 | sub edx, esi | ||
1656 | and eax, esi | ||
1657 | and edx, ebx | ||
1658 | or eax, edx | ||
1659 | mov edx, DWORD PTR 20[esp] | ||
1660 | rol edi, 10 | ||
1661 | lea ecx, DWORD PTR 2053994217[eax*1+ecx] | ||
1662 | mov eax, -1 | ||
1663 | rol ecx, 14 | ||
1664 | add ecx, ebp | ||
1665 | ; 136 | ||
1666 | add ebp, edx | ||
1667 | mov edx, esi | ||
1668 | sub eax, ecx | ||
1669 | and edx, ecx | ||
1670 | and eax, edi | ||
1671 | or edx, eax | ||
1672 | mov eax, DWORD PTR 48[esp] | ||
1673 | rol esi, 10 | ||
1674 | lea ebp, DWORD PTR 2053994217[edx*1+ebp] | ||
1675 | mov edx, -1 | ||
1676 | rol ebp, 6 | ||
1677 | add ebp, ebx | ||
1678 | ; 137 | ||
1679 | add ebx, eax | ||
1680 | mov eax, ecx | ||
1681 | sub edx, ebp | ||
1682 | and eax, ebp | ||
1683 | and edx, esi | ||
1684 | or eax, edx | ||
1685 | mov edx, DWORD PTR 8[esp] | ||
1686 | rol ecx, 10 | ||
1687 | lea ebx, DWORD PTR 2053994217[eax*1+ebx] | ||
1688 | mov eax, -1 | ||
1689 | rol ebx, 9 | ||
1690 | add ebx, edi | ||
1691 | ; 138 | ||
1692 | add edi, edx | ||
1693 | mov edx, ebp | ||
1694 | sub eax, ebx | ||
1695 | and edx, ebx | ||
1696 | and eax, ecx | ||
1697 | or edx, eax | ||
1698 | mov eax, DWORD PTR 52[esp] | ||
1699 | rol ebp, 10 | ||
1700 | lea edi, DWORD PTR 2053994217[edx*1+edi] | ||
1701 | mov edx, -1 | ||
1702 | rol edi, 12 | ||
1703 | add edi, esi | ||
1704 | ; 139 | ||
1705 | add esi, eax | ||
1706 | mov eax, ebx | ||
1707 | sub edx, edi | ||
1708 | and eax, edi | ||
1709 | and edx, ebp | ||
1710 | or eax, edx | ||
1711 | mov edx, DWORD PTR 36[esp] | ||
1712 | rol ebx, 10 | ||
1713 | lea esi, DWORD PTR 2053994217[eax*1+esi] | ||
1714 | mov eax, -1 | ||
1715 | rol esi, 9 | ||
1716 | add esi, ecx | ||
1717 | ; 140 | ||
1718 | add ecx, edx | ||
1719 | mov edx, edi | ||
1720 | sub eax, esi | ||
1721 | and edx, esi | ||
1722 | and eax, ebx | ||
1723 | or edx, eax | ||
1724 | mov eax, DWORD PTR 28[esp] | ||
1725 | rol edi, 10 | ||
1726 | lea ecx, DWORD PTR 2053994217[edx*1+ecx] | ||
1727 | mov edx, -1 | ||
1728 | rol ecx, 12 | ||
1729 | add ecx, ebp | ||
1730 | ; 141 | ||
1731 | add ebp, eax | ||
1732 | mov eax, esi | ||
1733 | sub edx, ecx | ||
1734 | and eax, ecx | ||
1735 | and edx, edi | ||
1736 | or eax, edx | ||
1737 | mov edx, DWORD PTR 40[esp] | ||
1738 | rol esi, 10 | ||
1739 | lea ebp, DWORD PTR 2053994217[eax*1+ebp] | ||
1740 | mov eax, -1 | ||
1741 | rol ebp, 5 | ||
1742 | add ebp, ebx | ||
1743 | ; 142 | ||
1744 | add ebx, edx | ||
1745 | mov edx, ecx | ||
1746 | sub eax, ebp | ||
1747 | and edx, ebp | ||
1748 | and eax, esi | ||
1749 | or edx, eax | ||
1750 | mov eax, DWORD PTR 56[esp] | ||
1751 | rol ecx, 10 | ||
1752 | lea ebx, DWORD PTR 2053994217[edx*1+ebx] | ||
1753 | mov edx, -1 | ||
1754 | rol ebx, 15 | ||
1755 | add ebx, edi | ||
1756 | ; 143 | ||
1757 | add edi, eax | ||
1758 | mov eax, ebp | ||
1759 | sub edx, ebx | ||
1760 | and eax, ebx | ||
1761 | and edx, ecx | ||
1762 | or edx, eax | ||
1763 | mov eax, ebx | ||
1764 | rol ebp, 10 | ||
1765 | lea edi, DWORD PTR 2053994217[edx*1+edi] | ||
1766 | xor eax, ebp | ||
1767 | rol edi, 8 | ||
1768 | add edi, esi | ||
1769 | ; 144 | ||
1770 | mov edx, DWORD PTR 48[esp] | ||
1771 | xor eax, edi | ||
1772 | add esi, edx | ||
1773 | rol ebx, 10 | ||
1774 | add esi, eax | ||
1775 | mov eax, edi | ||
1776 | rol esi, 8 | ||
1777 | add esi, ecx | ||
1778 | ; 145 | ||
1779 | xor eax, ebx | ||
1780 | mov edx, DWORD PTR 60[esp] | ||
1781 | xor eax, esi | ||
1782 | add ecx, eax | ||
1783 | mov eax, esi | ||
1784 | rol edi, 10 | ||
1785 | add ecx, edx | ||
1786 | xor eax, edi | ||
1787 | rol ecx, 5 | ||
1788 | add ecx, ebp | ||
1789 | ; 146 | ||
1790 | mov edx, DWORD PTR 40[esp] | ||
1791 | xor eax, ecx | ||
1792 | add ebp, edx | ||
1793 | rol esi, 10 | ||
1794 | add ebp, eax | ||
1795 | mov eax, ecx | ||
1796 | rol ebp, 12 | ||
1797 | add ebp, ebx | ||
1798 | ; 147 | ||
1799 | xor eax, esi | ||
1800 | mov edx, DWORD PTR 16[esp] | ||
1801 | xor eax, ebp | ||
1802 | add ebx, eax | ||
1803 | mov eax, ebp | ||
1804 | rol ecx, 10 | ||
1805 | add ebx, edx | ||
1806 | xor eax, ecx | ||
1807 | rol ebx, 9 | ||
1808 | add ebx, edi | ||
1809 | ; 148 | ||
1810 | mov edx, DWORD PTR 4[esp] | ||
1811 | xor eax, ebx | ||
1812 | add edi, edx | ||
1813 | rol ebp, 10 | ||
1814 | add edi, eax | ||
1815 | mov eax, ebx | ||
1816 | rol edi, 12 | ||
1817 | add edi, esi | ||
1818 | ; 149 | ||
1819 | xor eax, ebp | ||
1820 | mov edx, DWORD PTR 20[esp] | ||
1821 | xor eax, edi | ||
1822 | add esi, eax | ||
1823 | mov eax, edi | ||
1824 | rol ebx, 10 | ||
1825 | add esi, edx | ||
1826 | xor eax, ebx | ||
1827 | rol esi, 5 | ||
1828 | add esi, ecx | ||
1829 | ; 150 | ||
1830 | mov edx, DWORD PTR 32[esp] | ||
1831 | xor eax, esi | ||
1832 | add ecx, edx | ||
1833 | rol edi, 10 | ||
1834 | add ecx, eax | ||
1835 | mov eax, esi | ||
1836 | rol ecx, 14 | ||
1837 | add ecx, ebp | ||
1838 | ; 151 | ||
1839 | xor eax, edi | ||
1840 | mov edx, DWORD PTR 28[esp] | ||
1841 | xor eax, ecx | ||
1842 | add ebp, eax | ||
1843 | mov eax, ecx | ||
1844 | rol esi, 10 | ||
1845 | add ebp, edx | ||
1846 | xor eax, esi | ||
1847 | rol ebp, 6 | ||
1848 | add ebp, ebx | ||
1849 | ; 152 | ||
1850 | mov edx, DWORD PTR 24[esp] | ||
1851 | xor eax, ebp | ||
1852 | add ebx, edx | ||
1853 | rol ecx, 10 | ||
1854 | add ebx, eax | ||
1855 | mov eax, ebp | ||
1856 | rol ebx, 8 | ||
1857 | add ebx, edi | ||
1858 | ; 153 | ||
1859 | xor eax, ecx | ||
1860 | mov edx, DWORD PTR 8[esp] | ||
1861 | xor eax, ebx | ||
1862 | add edi, eax | ||
1863 | mov eax, ebx | ||
1864 | rol ebp, 10 | ||
1865 | add edi, edx | ||
1866 | xor eax, ebp | ||
1867 | rol edi, 13 | ||
1868 | add edi, esi | ||
1869 | ; 154 | ||
1870 | mov edx, DWORD PTR 52[esp] | ||
1871 | xor eax, edi | ||
1872 | add esi, edx | ||
1873 | rol ebx, 10 | ||
1874 | add esi, eax | ||
1875 | mov eax, edi | ||
1876 | rol esi, 6 | ||
1877 | add esi, ecx | ||
1878 | ; 155 | ||
1879 | xor eax, ebx | ||
1880 | mov edx, DWORD PTR 56[esp] | ||
1881 | xor eax, esi | ||
1882 | add ecx, eax | ||
1883 | mov eax, esi | ||
1884 | rol edi, 10 | ||
1885 | add ecx, edx | ||
1886 | xor eax, edi | ||
1887 | rol ecx, 5 | ||
1888 | add ecx, ebp | ||
1889 | ; 156 | ||
1890 | mov edx, DWORD PTR [esp] | ||
1891 | xor eax, ecx | ||
1892 | add ebp, edx | ||
1893 | rol esi, 10 | ||
1894 | add ebp, eax | ||
1895 | mov eax, ecx | ||
1896 | rol ebp, 15 | ||
1897 | add ebp, ebx | ||
1898 | ; 157 | ||
1899 | xor eax, esi | ||
1900 | mov edx, DWORD PTR 12[esp] | ||
1901 | xor eax, ebp | ||
1902 | add ebx, eax | ||
1903 | mov eax, ebp | ||
1904 | rol ecx, 10 | ||
1905 | add ebx, edx | ||
1906 | xor eax, ecx | ||
1907 | rol ebx, 13 | ||
1908 | add ebx, edi | ||
1909 | ; 158 | ||
1910 | mov edx, DWORD PTR 36[esp] | ||
1911 | xor eax, ebx | ||
1912 | add edi, edx | ||
1913 | rol ebp, 10 | ||
1914 | add edi, eax | ||
1915 | mov eax, ebx | ||
1916 | rol edi, 11 | ||
1917 | add edi, esi | ||
1918 | ; 159 | ||
1919 | xor eax, ebp | ||
1920 | mov edx, DWORD PTR 44[esp] | ||
1921 | xor eax, edi | ||
1922 | add esi, eax | ||
1923 | rol ebx, 10 | ||
1924 | add esi, edx | ||
1925 | mov edx, DWORD PTR 128[esp] | ||
1926 | rol esi, 11 | ||
1927 | add esi, ecx | ||
1928 | mov eax, DWORD PTR 4[edx] | ||
1929 | add ebx, eax | ||
1930 | mov eax, DWORD PTR 72[esp] | ||
1931 | add ebx, eax | ||
1932 | mov eax, DWORD PTR 8[edx] | ||
1933 | add ebp, eax | ||
1934 | mov eax, DWORD PTR 76[esp] | ||
1935 | add ebp, eax | ||
1936 | mov eax, DWORD PTR 12[edx] | ||
1937 | add ecx, eax | ||
1938 | mov eax, DWORD PTR 80[esp] | ||
1939 | add ecx, eax | ||
1940 | mov eax, DWORD PTR 16[edx] | ||
1941 | add esi, eax | ||
1942 | mov eax, DWORD PTR 64[esp] | ||
1943 | add esi, eax | ||
1944 | mov eax, DWORD PTR [edx] | ||
1945 | add edi, eax | ||
1946 | mov eax, DWORD PTR 68[esp] | ||
1947 | add edi, eax | ||
1948 | mov eax, DWORD PTR 136[esp] | ||
1949 | mov DWORD PTR [edx],ebx | ||
1950 | mov DWORD PTR 4[edx],ebp | ||
1951 | mov DWORD PTR 8[edx],ecx | ||
1952 | sub eax, 1 | ||
1953 | mov DWORD PTR 12[edx],esi | ||
1954 | mov DWORD PTR 16[edx],edi | ||
1955 | jle $L001get_out | ||
1956 | mov DWORD PTR 136[esp],eax | ||
1957 | mov edi, ecx | ||
1958 | mov eax, DWORD PTR 132[esp] | ||
1959 | mov ecx, ebx | ||
1960 | add eax, 64 | ||
1961 | mov esi, ebp | ||
1962 | mov DWORD PTR 132[esp],eax | ||
1963 | jmp L000start | ||
1964 | $L001get_out: | ||
1965 | add esp, 108 | ||
1966 | pop ebx | ||
1967 | pop ebp | ||
1968 | pop edi | ||
1969 | pop esi | ||
1970 | ret | ||
1971 | _ripemd160_block_asm_host_order ENDP | ||
1972 | _TEXT ENDS | ||
1973 | END | ||
diff --git a/src/lib/libcrypto/ripemd/rmd_locl.h b/src/lib/libcrypto/ripemd/rmd_locl.h index 145cf316b9..f537b88867 100644 --- a/src/lib/libcrypto/ripemd/rmd_locl.h +++ b/src/lib/libcrypto/ripemd/rmd_locl.h | |||
@@ -106,11 +106,7 @@ void ripemd160_block_data_order (RIPEMD160_CTX *c, const void *p,int num); | |||
106 | #define HASH_BLOCK_DATA_ORDER ripemd160_block_data_order | 106 | #define HASH_BLOCK_DATA_ORDER ripemd160_block_data_order |
107 | #endif | 107 | #endif |
108 | 108 | ||
109 | #ifndef FLAT_INC | ||
110 | #include "../md32_common.h" | ||
111 | #else | ||
112 | #include "md32_common.h" | 109 | #include "md32_common.h" |
113 | #endif | ||
114 | 110 | ||
115 | #if 0 | 111 | #if 0 |
116 | #define F1(x,y,z) ((x)^(y)^(z)) | 112 | #define F1(x,y,z) ((x)^(y)^(z)) |
diff --git a/src/lib/libcrypto/rsa/rsa_err.c b/src/lib/libcrypto/rsa/rsa_err.c index 5cfbea2b03..1cde7c0da4 100644 --- a/src/lib/libcrypto/rsa/rsa_err.c +++ b/src/lib/libcrypto/rsa/rsa_err.c | |||
@@ -54,7 +54,8 @@ | |||
54 | */ | 54 | */ |
55 | 55 | ||
56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes |
57 | * made to it will be overwritten when the script next updates this file. | 57 | * made to it will be overwritten when the script next updates this file, |
58 | * only reason strings will be preserved. | ||
58 | */ | 59 | */ |
59 | 60 | ||
60 | #include <stdio.h> | 61 | #include <stdio.h> |
diff --git a/src/lib/libcrypto/sha/Makefile.ssl b/src/lib/libcrypto/sha/Makefile.ssl index 79ef43aa34..72acd8f046 100644 --- a/src/lib/libcrypto/sha/Makefile.ssl +++ b/src/lib/libcrypto/sha/Makefile.ssl | |||
@@ -5,6 +5,7 @@ | |||
5 | DIR= sha | 5 | DIR= sha |
6 | TOP= ../.. | 6 | TOP= ../.. |
7 | CC= cc | 7 | CC= cc |
8 | CPP= $(CC) -E | ||
8 | INCLUDES= | 9 | INCLUDES= |
9 | CFLAG=-g | 10 | CFLAG=-g |
10 | INSTALL_PREFIX= | 11 | INSTALL_PREFIX= |
@@ -46,7 +47,7 @@ lib: $(LIBOBJ) | |||
46 | 47 | ||
47 | # elf | 48 | # elf |
48 | asm/sx86-elf.o: asm/sx86unix.cpp | 49 | asm/sx86-elf.o: asm/sx86unix.cpp |
49 | $(CPP) -DELF asm/sx86unix.cpp | as -o asm/sx86-elf.o | 50 | $(CPP) -DELF -x c asm/sx86unix.cpp | as -o asm/sx86-elf.o |
50 | 51 | ||
51 | # solaris | 52 | # solaris |
52 | asm/sx86-sol.o: asm/sx86unix.cpp | 53 | asm/sx86-sol.o: asm/sx86unix.cpp |
@@ -62,7 +63,7 @@ asm/sx86-out.o: asm/sx86unix.cpp | |||
62 | asm/sx86bsdi.o: asm/sx86unix.cpp | 63 | asm/sx86bsdi.o: asm/sx86unix.cpp |
63 | $(CPP) -DBSDI asm/sx86unix.cpp | sed 's/ :/:/' | as -o asm/sx86bsdi.o | 64 | $(CPP) -DBSDI asm/sx86unix.cpp | sed 's/ :/:/' | as -o asm/sx86bsdi.o |
64 | 65 | ||
65 | asm/sx86unix.cpp: | 66 | asm/sx86unix.cpp: asm/sha1-586.pl ../perlasm/x86asm.pl |
66 | (cd asm; $(PERL) sha1-586.pl cpp $(PROCESSOR) >sx86unix.cpp) | 67 | (cd asm; $(PERL) sha1-586.pl cpp $(PROCESSOR) >sx86unix.cpp) |
67 | 68 | ||
68 | files: | 69 | files: |
diff --git a/src/lib/libcrypto/sha/Makefile.uni b/src/lib/libcrypto/sha/Makefile.uni index b7ec5caa4e..e69de29bb2 100644 --- a/src/lib/libcrypto/sha/Makefile.uni +++ b/src/lib/libcrypto/sha/Makefile.uni | |||
@@ -1,122 +0,0 @@ | |||
1 | # Targets | ||
2 | # make - twidle the options yourself :-) | ||
3 | # make cc - standard cc options | ||
4 | # make gcc - standard gcc options | ||
5 | # make x86-elf - linux-elf etc | ||
6 | # make x86-out - linux-a.out, FreeBSD etc | ||
7 | # make x86-solaris | ||
8 | # make x86-bdsi | ||
9 | |||
10 | DIR= sha | ||
11 | TOP= . | ||
12 | CC= gcc | ||
13 | CFLAG= -O3 -fomit-frame-pointer | ||
14 | |||
15 | CPP= $(CC) -E | ||
16 | INCLUDES= | ||
17 | INSTALLTOP=/usr/local/lib | ||
18 | MAKE= make | ||
19 | MAKEDEPEND= makedepend | ||
20 | MAKEFILE= Makefile.uni | ||
21 | AR= ar r | ||
22 | |||
23 | SHA_ASM_OBJ= | ||
24 | |||
25 | CFLAGS= $(INCLUDES) $(CFLAG) | ||
26 | |||
27 | GENERAL=Makefile | ||
28 | |||
29 | TEST1=shatest | ||
30 | TEST2=sha1test | ||
31 | APP1=sha | ||
32 | APP2=sha1 | ||
33 | |||
34 | TEST=$(TEST1) $(TEST2) | ||
35 | APPS=$(APP1) $(APP2) | ||
36 | |||
37 | LIB=libsha.a | ||
38 | LIBSRC=sha_dgst.c sha1dgst.c sha_one.c sha1_one.c | ||
39 | LIBOBJ=sha_dgst.o sha1dgst.o sha_one.o sha1_one.o $(SHA_ASM_OBJ) | ||
40 | |||
41 | SRC= $(LIBSRC) | ||
42 | |||
43 | EXHEADER= sha.h | ||
44 | HEADER= sha_locl.h $(EXHEADER) | ||
45 | |||
46 | ALL= $(GENERAL) $(SRC) $(HEADER) | ||
47 | |||
48 | all: $(LIB) $(TEST) $(APPS) | ||
49 | |||
50 | $(LIB): $(LIBOBJ) | ||
51 | $(AR) $(LIB) $(LIBOBJ) | ||
52 | $(RANLIB) $(LIB) | ||
53 | |||
54 | # elf | ||
55 | asm/sx86-elf.o: asm/sx86unix.cpp | ||
56 | $(CPP) -DELF asm/sx86unix.cpp | as -o asm/sx86-elf.o | ||
57 | |||
58 | # solaris | ||
59 | asm/sx86-sol.o: asm/sx86unix.cpp | ||
60 | $(CC) -E -DSOL asm/sx86unix.cpp | sed 's/^#.*//' > asm/sx86-sol.s | ||
61 | as -o asm/sx86-sol.o asm/sx86-sol.s | ||
62 | rm -f asm/sx86-sol.s | ||
63 | |||
64 | # a.out | ||
65 | asm/sx86-out.o: asm/sx86unix.cpp | ||
66 | $(CPP) -DOUT asm/sx86unix.cpp | as -o asm/sx86-out.o | ||
67 | |||
68 | # bsdi | ||
69 | asm/sx86bsdi.o: asm/sx86unix.cpp | ||
70 | $(CPP) -DBSDI asm/sx86unix.cpp | as -o asm/sx86bsdi.o | ||
71 | |||
72 | asm/sx86unix.cpp: | ||
73 | (cd asm; perl sha1-586.pl cpp >sx86unix.cpp) | ||
74 | |||
75 | test: $(TEST) | ||
76 | ./$(TEST1) | ||
77 | ./$(TEST2) | ||
78 | |||
79 | $(TEST1): $(TEST1).c $(LIB) | ||
80 | $(CC) -o $(TEST1) $(CFLAGS) $(TEST1).c $(LIB) | ||
81 | |||
82 | $(TEST2): $(TEST2).c $(LIB) | ||
83 | $(CC) -o $(TEST2) $(CFLAGS) $(TEST2).c $(LIB) | ||
84 | |||
85 | $(APP1): $(APP1).c $(LIB) | ||
86 | $(CC) -o $(APP1) $(CFLAGS) $(APP1).c $(LIB) | ||
87 | |||
88 | $(APP2): $(APP2).c $(LIB) | ||
89 | $(CC) -o $(APP2) $(CFLAGS) $(APP2).c $(LIB) | ||
90 | |||
91 | lint: | ||
92 | lint -DLINT $(INCLUDES) $(SRC)>fluff | ||
93 | |||
94 | depend: | ||
95 | $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) | ||
96 | |||
97 | dclean: | ||
98 | perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new | ||
99 | mv -f Makefile.new $(MAKEFILE) | ||
100 | |||
101 | clean: | ||
102 | /bin/rm -f $(LIB) $(TEST) $(APPS) *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff | ||
103 | |||
104 | cc: | ||
105 | $(MAKE) SHA_ASM_OBJ="" CC="cc" CFLAG="-O" all | ||
106 | |||
107 | gcc: | ||
108 | $(MAKE) SHA_ASM_OBJ="" CC="gcc" CFLAGS="-O3 -fomit-frame-pointer" all | ||
109 | |||
110 | x86-elf: | ||
111 | $(MAKE) SHA_ASM_OBJ="asm/sx86-elf.o" CFLAG="-DELF -DSHA1_ASM -DL_ENDIAN $(CFLAGS)" all | ||
112 | |||
113 | x86-out: | ||
114 | $(MAKE) SHA_ASM_OBJ="asm/sx86-out.o" CFLAG="-DOUT -DSHA1_ASM -DL_ENDIAN $(CFLAGS)" all | ||
115 | |||
116 | x86-solaris: | ||
117 | $(MAKE) SHA_ASM_OBJ="asm/sx86-sol.o" CFLAG="-DSOL -DSHA1_ASM -DL_ENDIAN $(CFLAGS)" all | ||
118 | |||
119 | x86-bdsi: | ||
120 | $(MAKE) SHA_ASM_OBJ="asm/sx86-bdsi.o" CFLAG="-DBDSI -DSHA1_ASM -DL_ENDIAN $(CFLAGS)" all | ||
121 | |||
122 | # DO NOT DELETE THIS LINE -- make depend depends on it. | ||
diff --git a/src/lib/libcrypto/sha/asm/s1-win32.asm b/src/lib/libcrypto/sha/asm/s1-win32.asm index 699afdb022..e69de29bb2 100644 --- a/src/lib/libcrypto/sha/asm/s1-win32.asm +++ b/src/lib/libcrypto/sha/asm/s1-win32.asm | |||
@@ -1,1716 +0,0 @@ | |||
1 | ; Don't even think of reading this code | ||
2 | ; It was automatically generated by sha1-586.pl | ||
3 | ; Which is a perl program used to generate the x86 assember for | ||
4 | ; any of elf, a.out, BSDI,Win32, or Solaris | ||
5 | ; eric <eay@cryptsoft.com> | ||
6 | ; | ||
7 | TITLE sha1-586.asm | ||
8 | .486 | ||
9 | .model FLAT | ||
10 | _TEXT SEGMENT | ||
11 | PUBLIC _sha1_block_asm_data_order | ||
12 | |||
13 | _sha1_block_asm_data_order PROC NEAR | ||
14 | mov ecx, DWORD PTR 12[esp] | ||
15 | push esi | ||
16 | shl ecx, 6 | ||
17 | mov esi, DWORD PTR 12[esp] | ||
18 | push ebp | ||
19 | add ecx, esi | ||
20 | push ebx | ||
21 | mov ebp, DWORD PTR 16[esp] | ||
22 | push edi | ||
23 | mov edx, DWORD PTR 12[ebp] | ||
24 | sub esp, 108 | ||
25 | mov edi, DWORD PTR 16[ebp] | ||
26 | mov ebx, DWORD PTR 8[ebp] | ||
27 | mov DWORD PTR 68[esp],ecx | ||
28 | ; First we need to setup the X array | ||
29 | L000start: | ||
30 | ; First, load the words onto the stack in network byte order | ||
31 | mov eax, DWORD PTR [esi] | ||
32 | mov ecx, DWORD PTR 4[esi] | ||
33 | bswap eax | ||
34 | bswap ecx | ||
35 | mov DWORD PTR [esp],eax | ||
36 | mov DWORD PTR 4[esp],ecx | ||
37 | mov eax, DWORD PTR 8[esi] | ||
38 | mov ecx, DWORD PTR 12[esi] | ||
39 | bswap eax | ||
40 | bswap ecx | ||
41 | mov DWORD PTR 8[esp],eax | ||
42 | mov DWORD PTR 12[esp],ecx | ||
43 | mov eax, DWORD PTR 16[esi] | ||
44 | mov ecx, DWORD PTR 20[esi] | ||
45 | bswap eax | ||
46 | bswap ecx | ||
47 | mov DWORD PTR 16[esp],eax | ||
48 | mov DWORD PTR 20[esp],ecx | ||
49 | mov eax, DWORD PTR 24[esi] | ||
50 | mov ecx, DWORD PTR 28[esi] | ||
51 | bswap eax | ||
52 | bswap ecx | ||
53 | mov DWORD PTR 24[esp],eax | ||
54 | mov DWORD PTR 28[esp],ecx | ||
55 | mov eax, DWORD PTR 32[esi] | ||
56 | mov ecx, DWORD PTR 36[esi] | ||
57 | bswap eax | ||
58 | bswap ecx | ||
59 | mov DWORD PTR 32[esp],eax | ||
60 | mov DWORD PTR 36[esp],ecx | ||
61 | mov eax, DWORD PTR 40[esi] | ||
62 | mov ecx, DWORD PTR 44[esi] | ||
63 | bswap eax | ||
64 | bswap ecx | ||
65 | mov DWORD PTR 40[esp],eax | ||
66 | mov DWORD PTR 44[esp],ecx | ||
67 | mov eax, DWORD PTR 48[esi] | ||
68 | mov ecx, DWORD PTR 52[esi] | ||
69 | bswap eax | ||
70 | bswap ecx | ||
71 | mov DWORD PTR 48[esp],eax | ||
72 | mov DWORD PTR 52[esp],ecx | ||
73 | mov eax, DWORD PTR 56[esi] | ||
74 | mov ecx, DWORD PTR 60[esi] | ||
75 | bswap eax | ||
76 | bswap ecx | ||
77 | mov DWORD PTR 56[esp],eax | ||
78 | mov DWORD PTR 60[esp],ecx | ||
79 | ; We now have the X array on the stack | ||
80 | ; starting at sp-4 | ||
81 | mov DWORD PTR 132[esp],esi | ||
82 | L001shortcut: | ||
83 | ; | ||
84 | ; Start processing | ||
85 | mov eax, DWORD PTR [ebp] | ||
86 | mov ecx, DWORD PTR 4[ebp] | ||
87 | ; 00_15 0 | ||
88 | mov esi, ebx | ||
89 | mov ebp, eax | ||
90 | xor esi, edx | ||
91 | rol ebp, 5 | ||
92 | and esi, ecx | ||
93 | add ebp, edi | ||
94 | ror ecx, 1 | ||
95 | mov edi, DWORD PTR [esp] | ||
96 | ror ecx, 1 | ||
97 | xor esi, edx | ||
98 | lea ebp, DWORD PTR 1518500249[edi*1+ebp] | ||
99 | mov edi, ecx | ||
100 | add esi, ebp | ||
101 | xor edi, ebx | ||
102 | mov ebp, esi | ||
103 | and edi, eax | ||
104 | rol ebp, 5 | ||
105 | add ebp, edx | ||
106 | mov edx, DWORD PTR 4[esp] | ||
107 | ror eax, 1 | ||
108 | xor edi, ebx | ||
109 | ror eax, 1 | ||
110 | lea ebp, DWORD PTR 1518500249[edx*1+ebp] | ||
111 | add edi, ebp | ||
112 | ; 00_15 2 | ||
113 | mov edx, eax | ||
114 | mov ebp, edi | ||
115 | xor edx, ecx | ||
116 | rol ebp, 5 | ||
117 | and edx, esi | ||
118 | add ebp, ebx | ||
119 | ror esi, 1 | ||
120 | mov ebx, DWORD PTR 8[esp] | ||
121 | ror esi, 1 | ||
122 | xor edx, ecx | ||
123 | lea ebp, DWORD PTR 1518500249[ebx*1+ebp] | ||
124 | mov ebx, esi | ||
125 | add edx, ebp | ||
126 | xor ebx, eax | ||
127 | mov ebp, edx | ||
128 | and ebx, edi | ||
129 | rol ebp, 5 | ||
130 | add ebp, ecx | ||
131 | mov ecx, DWORD PTR 12[esp] | ||
132 | ror edi, 1 | ||
133 | xor ebx, eax | ||
134 | ror edi, 1 | ||
135 | lea ebp, DWORD PTR 1518500249[ecx*1+ebp] | ||
136 | add ebx, ebp | ||
137 | ; 00_15 4 | ||
138 | mov ecx, edi | ||
139 | mov ebp, ebx | ||
140 | xor ecx, esi | ||
141 | rol ebp, 5 | ||
142 | and ecx, edx | ||
143 | add ebp, eax | ||
144 | ror edx, 1 | ||
145 | mov eax, DWORD PTR 16[esp] | ||
146 | ror edx, 1 | ||
147 | xor ecx, esi | ||
148 | lea ebp, DWORD PTR 1518500249[eax*1+ebp] | ||
149 | mov eax, edx | ||
150 | add ecx, ebp | ||
151 | xor eax, edi | ||
152 | mov ebp, ecx | ||
153 | and eax, ebx | ||
154 | rol ebp, 5 | ||
155 | add ebp, esi | ||
156 | mov esi, DWORD PTR 20[esp] | ||
157 | ror ebx, 1 | ||
158 | xor eax, edi | ||
159 | ror ebx, 1 | ||
160 | lea ebp, DWORD PTR 1518500249[esi*1+ebp] | ||
161 | add eax, ebp | ||
162 | ; 00_15 6 | ||
163 | mov esi, ebx | ||
164 | mov ebp, eax | ||
165 | xor esi, edx | ||
166 | rol ebp, 5 | ||
167 | and esi, ecx | ||
168 | add ebp, edi | ||
169 | ror ecx, 1 | ||
170 | mov edi, DWORD PTR 24[esp] | ||
171 | ror ecx, 1 | ||
172 | xor esi, edx | ||
173 | lea ebp, DWORD PTR 1518500249[edi*1+ebp] | ||
174 | mov edi, ecx | ||
175 | add esi, ebp | ||
176 | xor edi, ebx | ||
177 | mov ebp, esi | ||
178 | and edi, eax | ||
179 | rol ebp, 5 | ||
180 | add ebp, edx | ||
181 | mov edx, DWORD PTR 28[esp] | ||
182 | ror eax, 1 | ||
183 | xor edi, ebx | ||
184 | ror eax, 1 | ||
185 | lea ebp, DWORD PTR 1518500249[edx*1+ebp] | ||
186 | add edi, ebp | ||
187 | ; 00_15 8 | ||
188 | mov edx, eax | ||
189 | mov ebp, edi | ||
190 | xor edx, ecx | ||
191 | rol ebp, 5 | ||
192 | and edx, esi | ||
193 | add ebp, ebx | ||
194 | ror esi, 1 | ||
195 | mov ebx, DWORD PTR 32[esp] | ||
196 | ror esi, 1 | ||
197 | xor edx, ecx | ||
198 | lea ebp, DWORD PTR 1518500249[ebx*1+ebp] | ||
199 | mov ebx, esi | ||
200 | add edx, ebp | ||
201 | xor ebx, eax | ||
202 | mov ebp, edx | ||
203 | and ebx, edi | ||
204 | rol ebp, 5 | ||
205 | add ebp, ecx | ||
206 | mov ecx, DWORD PTR 36[esp] | ||
207 | ror edi, 1 | ||
208 | xor ebx, eax | ||
209 | ror edi, 1 | ||
210 | lea ebp, DWORD PTR 1518500249[ecx*1+ebp] | ||
211 | add ebx, ebp | ||
212 | ; 00_15 10 | ||
213 | mov ecx, edi | ||
214 | mov ebp, ebx | ||
215 | xor ecx, esi | ||
216 | rol ebp, 5 | ||
217 | and ecx, edx | ||
218 | add ebp, eax | ||
219 | ror edx, 1 | ||
220 | mov eax, DWORD PTR 40[esp] | ||
221 | ror edx, 1 | ||
222 | xor ecx, esi | ||
223 | lea ebp, DWORD PTR 1518500249[eax*1+ebp] | ||
224 | mov eax, edx | ||
225 | add ecx, ebp | ||
226 | xor eax, edi | ||
227 | mov ebp, ecx | ||
228 | and eax, ebx | ||
229 | rol ebp, 5 | ||
230 | add ebp, esi | ||
231 | mov esi, DWORD PTR 44[esp] | ||
232 | ror ebx, 1 | ||
233 | xor eax, edi | ||
234 | ror ebx, 1 | ||
235 | lea ebp, DWORD PTR 1518500249[esi*1+ebp] | ||
236 | add eax, ebp | ||
237 | ; 00_15 12 | ||
238 | mov esi, ebx | ||
239 | mov ebp, eax | ||
240 | xor esi, edx | ||
241 | rol ebp, 5 | ||
242 | and esi, ecx | ||
243 | add ebp, edi | ||
244 | ror ecx, 1 | ||
245 | mov edi, DWORD PTR 48[esp] | ||
246 | ror ecx, 1 | ||
247 | xor esi, edx | ||
248 | lea ebp, DWORD PTR 1518500249[edi*1+ebp] | ||
249 | mov edi, ecx | ||
250 | add esi, ebp | ||
251 | xor edi, ebx | ||
252 | mov ebp, esi | ||
253 | and edi, eax | ||
254 | rol ebp, 5 | ||
255 | add ebp, edx | ||
256 | mov edx, DWORD PTR 52[esp] | ||
257 | ror eax, 1 | ||
258 | xor edi, ebx | ||
259 | ror eax, 1 | ||
260 | lea ebp, DWORD PTR 1518500249[edx*1+ebp] | ||
261 | add edi, ebp | ||
262 | ; 00_15 14 | ||
263 | mov edx, eax | ||
264 | mov ebp, edi | ||
265 | xor edx, ecx | ||
266 | rol ebp, 5 | ||
267 | and edx, esi | ||
268 | add ebp, ebx | ||
269 | ror esi, 1 | ||
270 | mov ebx, DWORD PTR 56[esp] | ||
271 | ror esi, 1 | ||
272 | xor edx, ecx | ||
273 | lea ebp, DWORD PTR 1518500249[ebx*1+ebp] | ||
274 | mov ebx, esi | ||
275 | add edx, ebp | ||
276 | xor ebx, eax | ||
277 | mov ebp, edx | ||
278 | and ebx, edi | ||
279 | rol ebp, 5 | ||
280 | add ebp, ecx | ||
281 | mov ecx, DWORD PTR 60[esp] | ||
282 | ror edi, 1 | ||
283 | xor ebx, eax | ||
284 | ror edi, 1 | ||
285 | lea ebp, DWORD PTR 1518500249[ecx*1+ebp] | ||
286 | add ebx, ebp | ||
287 | ; 16_19 16 | ||
288 | nop | ||
289 | mov ebp, DWORD PTR [esp] | ||
290 | mov ecx, DWORD PTR 8[esp] | ||
291 | xor ecx, ebp | ||
292 | mov ebp, DWORD PTR 32[esp] | ||
293 | xor ecx, ebp | ||
294 | mov ebp, DWORD PTR 52[esp] | ||
295 | xor ecx, ebp | ||
296 | mov ebp, edi | ||
297 | rol ecx, 1 | ||
298 | xor ebp, esi | ||
299 | mov DWORD PTR [esp],ecx | ||
300 | and ebp, edx | ||
301 | lea ecx, DWORD PTR 1518500249[eax*1+ecx] | ||
302 | xor ebp, esi | ||
303 | mov eax, ebx | ||
304 | add ecx, ebp | ||
305 | rol eax, 5 | ||
306 | ror edx, 1 | ||
307 | add ecx, eax | ||
308 | mov eax, DWORD PTR 4[esp] | ||
309 | mov ebp, DWORD PTR 12[esp] | ||
310 | xor eax, ebp | ||
311 | mov ebp, DWORD PTR 36[esp] | ||
312 | xor eax, ebp | ||
313 | mov ebp, DWORD PTR 56[esp] | ||
314 | ror edx, 1 | ||
315 | xor eax, ebp | ||
316 | rol eax, 1 | ||
317 | mov ebp, edx | ||
318 | xor ebp, edi | ||
319 | mov DWORD PTR 4[esp],eax | ||
320 | and ebp, ebx | ||
321 | lea eax, DWORD PTR 1518500249[esi*1+eax] | ||
322 | xor ebp, edi | ||
323 | mov esi, ecx | ||
324 | rol esi, 5 | ||
325 | ror ebx, 1 | ||
326 | add eax, esi | ||
327 | ror ebx, 1 | ||
328 | add eax, ebp | ||
329 | ; 16_19 18 | ||
330 | mov ebp, DWORD PTR 8[esp] | ||
331 | mov esi, DWORD PTR 16[esp] | ||
332 | xor esi, ebp | ||
333 | mov ebp, DWORD PTR 40[esp] | ||
334 | xor esi, ebp | ||
335 | mov ebp, DWORD PTR 60[esp] | ||
336 | xor esi, ebp | ||
337 | mov ebp, ebx | ||
338 | rol esi, 1 | ||
339 | xor ebp, edx | ||
340 | mov DWORD PTR 8[esp],esi | ||
341 | and ebp, ecx | ||
342 | lea esi, DWORD PTR 1518500249[edi*1+esi] | ||
343 | xor ebp, edx | ||
344 | mov edi, eax | ||
345 | add esi, ebp | ||
346 | rol edi, 5 | ||
347 | ror ecx, 1 | ||
348 | add esi, edi | ||
349 | mov edi, DWORD PTR 12[esp] | ||
350 | mov ebp, DWORD PTR 20[esp] | ||
351 | xor edi, ebp | ||
352 | mov ebp, DWORD PTR 44[esp] | ||
353 | xor edi, ebp | ||
354 | mov ebp, DWORD PTR [esp] | ||
355 | ror ecx, 1 | ||
356 | xor edi, ebp | ||
357 | rol edi, 1 | ||
358 | mov ebp, ecx | ||
359 | xor ebp, ebx | ||
360 | mov DWORD PTR 12[esp],edi | ||
361 | and ebp, eax | ||
362 | lea edi, DWORD PTR 1518500249[edx*1+edi] | ||
363 | xor ebp, ebx | ||
364 | mov edx, esi | ||
365 | rol edx, 5 | ||
366 | ror eax, 1 | ||
367 | add edi, edx | ||
368 | ror eax, 1 | ||
369 | add edi, ebp | ||
370 | ; 20_39 20 | ||
371 | mov edx, DWORD PTR 16[esp] | ||
372 | mov ebp, DWORD PTR 24[esp] | ||
373 | xor edx, ebp | ||
374 | mov ebp, DWORD PTR 48[esp] | ||
375 | xor edx, ebp | ||
376 | mov ebp, DWORD PTR 4[esp] | ||
377 | xor edx, ebp | ||
378 | mov ebp, esi | ||
379 | rol edx, 1 | ||
380 | xor ebp, eax | ||
381 | mov DWORD PTR 16[esp],edx | ||
382 | xor ebp, ecx | ||
383 | lea edx, DWORD PTR 1859775393[ebx*1+edx] | ||
384 | mov ebx, edi | ||
385 | rol ebx, 5 | ||
386 | ror esi, 1 | ||
387 | add ebx, ebp | ||
388 | ror esi, 1 | ||
389 | add edx, ebx | ||
390 | ; 20_39 21 | ||
391 | mov ebx, DWORD PTR 20[esp] | ||
392 | mov ebp, DWORD PTR 28[esp] | ||
393 | xor ebx, ebp | ||
394 | mov ebp, DWORD PTR 52[esp] | ||
395 | xor ebx, ebp | ||
396 | mov ebp, DWORD PTR 8[esp] | ||
397 | xor ebx, ebp | ||
398 | mov ebp, edi | ||
399 | rol ebx, 1 | ||
400 | xor ebp, esi | ||
401 | mov DWORD PTR 20[esp],ebx | ||
402 | xor ebp, eax | ||
403 | lea ebx, DWORD PTR 1859775393[ecx*1+ebx] | ||
404 | mov ecx, edx | ||
405 | rol ecx, 5 | ||
406 | ror edi, 1 | ||
407 | add ecx, ebp | ||
408 | ror edi, 1 | ||
409 | add ebx, ecx | ||
410 | ; 20_39 22 | ||
411 | mov ecx, DWORD PTR 24[esp] | ||
412 | mov ebp, DWORD PTR 32[esp] | ||
413 | xor ecx, ebp | ||
414 | mov ebp, DWORD PTR 56[esp] | ||
415 | xor ecx, ebp | ||
416 | mov ebp, DWORD PTR 12[esp] | ||
417 | xor ecx, ebp | ||
418 | mov ebp, edx | ||
419 | rol ecx, 1 | ||
420 | xor ebp, edi | ||
421 | mov DWORD PTR 24[esp],ecx | ||
422 | xor ebp, esi | ||
423 | lea ecx, DWORD PTR 1859775393[eax*1+ecx] | ||
424 | mov eax, ebx | ||
425 | rol eax, 5 | ||
426 | ror edx, 1 | ||
427 | add eax, ebp | ||
428 | ror edx, 1 | ||
429 | add ecx, eax | ||
430 | ; 20_39 23 | ||
431 | mov eax, DWORD PTR 28[esp] | ||
432 | mov ebp, DWORD PTR 36[esp] | ||
433 | xor eax, ebp | ||
434 | mov ebp, DWORD PTR 60[esp] | ||
435 | xor eax, ebp | ||
436 | mov ebp, DWORD PTR 16[esp] | ||
437 | xor eax, ebp | ||
438 | mov ebp, ebx | ||
439 | rol eax, 1 | ||
440 | xor ebp, edx | ||
441 | mov DWORD PTR 28[esp],eax | ||
442 | xor ebp, edi | ||
443 | lea eax, DWORD PTR 1859775393[esi*1+eax] | ||
444 | mov esi, ecx | ||
445 | rol esi, 5 | ||
446 | ror ebx, 1 | ||
447 | add esi, ebp | ||
448 | ror ebx, 1 | ||
449 | add eax, esi | ||
450 | ; 20_39 24 | ||
451 | mov esi, DWORD PTR 32[esp] | ||
452 | mov ebp, DWORD PTR 40[esp] | ||
453 | xor esi, ebp | ||
454 | mov ebp, DWORD PTR [esp] | ||
455 | xor esi, ebp | ||
456 | mov ebp, DWORD PTR 20[esp] | ||
457 | xor esi, ebp | ||
458 | mov ebp, ecx | ||
459 | rol esi, 1 | ||
460 | xor ebp, ebx | ||
461 | mov DWORD PTR 32[esp],esi | ||
462 | xor ebp, edx | ||
463 | lea esi, DWORD PTR 1859775393[edi*1+esi] | ||
464 | mov edi, eax | ||
465 | rol edi, 5 | ||
466 | ror ecx, 1 | ||
467 | add edi, ebp | ||
468 | ror ecx, 1 | ||
469 | add esi, edi | ||
470 | ; 20_39 25 | ||
471 | mov edi, DWORD PTR 36[esp] | ||
472 | mov ebp, DWORD PTR 44[esp] | ||
473 | xor edi, ebp | ||
474 | mov ebp, DWORD PTR 4[esp] | ||
475 | xor edi, ebp | ||
476 | mov ebp, DWORD PTR 24[esp] | ||
477 | xor edi, ebp | ||
478 | mov ebp, eax | ||
479 | rol edi, 1 | ||
480 | xor ebp, ecx | ||
481 | mov DWORD PTR 36[esp],edi | ||
482 | xor ebp, ebx | ||
483 | lea edi, DWORD PTR 1859775393[edx*1+edi] | ||
484 | mov edx, esi | ||
485 | rol edx, 5 | ||
486 | ror eax, 1 | ||
487 | add edx, ebp | ||
488 | ror eax, 1 | ||
489 | add edi, edx | ||
490 | ; 20_39 26 | ||
491 | mov edx, DWORD PTR 40[esp] | ||
492 | mov ebp, DWORD PTR 48[esp] | ||
493 | xor edx, ebp | ||
494 | mov ebp, DWORD PTR 8[esp] | ||
495 | xor edx, ebp | ||
496 | mov ebp, DWORD PTR 28[esp] | ||
497 | xor edx, ebp | ||
498 | mov ebp, esi | ||
499 | rol edx, 1 | ||
500 | xor ebp, eax | ||
501 | mov DWORD PTR 40[esp],edx | ||
502 | xor ebp, ecx | ||
503 | lea edx, DWORD PTR 1859775393[ebx*1+edx] | ||
504 | mov ebx, edi | ||
505 | rol ebx, 5 | ||
506 | ror esi, 1 | ||
507 | add ebx, ebp | ||
508 | ror esi, 1 | ||
509 | add edx, ebx | ||
510 | ; 20_39 27 | ||
511 | mov ebx, DWORD PTR 44[esp] | ||
512 | mov ebp, DWORD PTR 52[esp] | ||
513 | xor ebx, ebp | ||
514 | mov ebp, DWORD PTR 12[esp] | ||
515 | xor ebx, ebp | ||
516 | mov ebp, DWORD PTR 32[esp] | ||
517 | xor ebx, ebp | ||
518 | mov ebp, edi | ||
519 | rol ebx, 1 | ||
520 | xor ebp, esi | ||
521 | mov DWORD PTR 44[esp],ebx | ||
522 | xor ebp, eax | ||
523 | lea ebx, DWORD PTR 1859775393[ecx*1+ebx] | ||
524 | mov ecx, edx | ||
525 | rol ecx, 5 | ||
526 | ror edi, 1 | ||
527 | add ecx, ebp | ||
528 | ror edi, 1 | ||
529 | add ebx, ecx | ||
530 | ; 20_39 28 | ||
531 | mov ecx, DWORD PTR 48[esp] | ||
532 | mov ebp, DWORD PTR 56[esp] | ||
533 | xor ecx, ebp | ||
534 | mov ebp, DWORD PTR 16[esp] | ||
535 | xor ecx, ebp | ||
536 | mov ebp, DWORD PTR 36[esp] | ||
537 | xor ecx, ebp | ||
538 | mov ebp, edx | ||
539 | rol ecx, 1 | ||
540 | xor ebp, edi | ||
541 | mov DWORD PTR 48[esp],ecx | ||
542 | xor ebp, esi | ||
543 | lea ecx, DWORD PTR 1859775393[eax*1+ecx] | ||
544 | mov eax, ebx | ||
545 | rol eax, 5 | ||
546 | ror edx, 1 | ||
547 | add eax, ebp | ||
548 | ror edx, 1 | ||
549 | add ecx, eax | ||
550 | ; 20_39 29 | ||
551 | mov eax, DWORD PTR 52[esp] | ||
552 | mov ebp, DWORD PTR 60[esp] | ||
553 | xor eax, ebp | ||
554 | mov ebp, DWORD PTR 20[esp] | ||
555 | xor eax, ebp | ||
556 | mov ebp, DWORD PTR 40[esp] | ||
557 | xor eax, ebp | ||
558 | mov ebp, ebx | ||
559 | rol eax, 1 | ||
560 | xor ebp, edx | ||
561 | mov DWORD PTR 52[esp],eax | ||
562 | xor ebp, edi | ||
563 | lea eax, DWORD PTR 1859775393[esi*1+eax] | ||
564 | mov esi, ecx | ||
565 | rol esi, 5 | ||
566 | ror ebx, 1 | ||
567 | add esi, ebp | ||
568 | ror ebx, 1 | ||
569 | add eax, esi | ||
570 | ; 20_39 30 | ||
571 | mov esi, DWORD PTR 56[esp] | ||
572 | mov ebp, DWORD PTR [esp] | ||
573 | xor esi, ebp | ||
574 | mov ebp, DWORD PTR 24[esp] | ||
575 | xor esi, ebp | ||
576 | mov ebp, DWORD PTR 44[esp] | ||
577 | xor esi, ebp | ||
578 | mov ebp, ecx | ||
579 | rol esi, 1 | ||
580 | xor ebp, ebx | ||
581 | mov DWORD PTR 56[esp],esi | ||
582 | xor ebp, edx | ||
583 | lea esi, DWORD PTR 1859775393[edi*1+esi] | ||
584 | mov edi, eax | ||
585 | rol edi, 5 | ||
586 | ror ecx, 1 | ||
587 | add edi, ebp | ||
588 | ror ecx, 1 | ||
589 | add esi, edi | ||
590 | ; 20_39 31 | ||
591 | mov edi, DWORD PTR 60[esp] | ||
592 | mov ebp, DWORD PTR 4[esp] | ||
593 | xor edi, ebp | ||
594 | mov ebp, DWORD PTR 28[esp] | ||
595 | xor edi, ebp | ||
596 | mov ebp, DWORD PTR 48[esp] | ||
597 | xor edi, ebp | ||
598 | mov ebp, eax | ||
599 | rol edi, 1 | ||
600 | xor ebp, ecx | ||
601 | mov DWORD PTR 60[esp],edi | ||
602 | xor ebp, ebx | ||
603 | lea edi, DWORD PTR 1859775393[edx*1+edi] | ||
604 | mov edx, esi | ||
605 | rol edx, 5 | ||
606 | ror eax, 1 | ||
607 | add edx, ebp | ||
608 | ror eax, 1 | ||
609 | add edi, edx | ||
610 | ; 20_39 32 | ||
611 | mov edx, DWORD PTR [esp] | ||
612 | mov ebp, DWORD PTR 8[esp] | ||
613 | xor edx, ebp | ||
614 | mov ebp, DWORD PTR 32[esp] | ||
615 | xor edx, ebp | ||
616 | mov ebp, DWORD PTR 52[esp] | ||
617 | xor edx, ebp | ||
618 | mov ebp, esi | ||
619 | rol edx, 1 | ||
620 | xor ebp, eax | ||
621 | mov DWORD PTR [esp],edx | ||
622 | xor ebp, ecx | ||
623 | lea edx, DWORD PTR 1859775393[ebx*1+edx] | ||
624 | mov ebx, edi | ||
625 | rol ebx, 5 | ||
626 | ror esi, 1 | ||
627 | add ebx, ebp | ||
628 | ror esi, 1 | ||
629 | add edx, ebx | ||
630 | ; 20_39 33 | ||
631 | mov ebx, DWORD PTR 4[esp] | ||
632 | mov ebp, DWORD PTR 12[esp] | ||
633 | xor ebx, ebp | ||
634 | mov ebp, DWORD PTR 36[esp] | ||
635 | xor ebx, ebp | ||
636 | mov ebp, DWORD PTR 56[esp] | ||
637 | xor ebx, ebp | ||
638 | mov ebp, edi | ||
639 | rol ebx, 1 | ||
640 | xor ebp, esi | ||
641 | mov DWORD PTR 4[esp],ebx | ||
642 | xor ebp, eax | ||
643 | lea ebx, DWORD PTR 1859775393[ecx*1+ebx] | ||
644 | mov ecx, edx | ||
645 | rol ecx, 5 | ||
646 | ror edi, 1 | ||
647 | add ecx, ebp | ||
648 | ror edi, 1 | ||
649 | add ebx, ecx | ||
650 | ; 20_39 34 | ||
651 | mov ecx, DWORD PTR 8[esp] | ||
652 | mov ebp, DWORD PTR 16[esp] | ||
653 | xor ecx, ebp | ||
654 | mov ebp, DWORD PTR 40[esp] | ||
655 | xor ecx, ebp | ||
656 | mov ebp, DWORD PTR 60[esp] | ||
657 | xor ecx, ebp | ||
658 | mov ebp, edx | ||
659 | rol ecx, 1 | ||
660 | xor ebp, edi | ||
661 | mov DWORD PTR 8[esp],ecx | ||
662 | xor ebp, esi | ||
663 | lea ecx, DWORD PTR 1859775393[eax*1+ecx] | ||
664 | mov eax, ebx | ||
665 | rol eax, 5 | ||
666 | ror edx, 1 | ||
667 | add eax, ebp | ||
668 | ror edx, 1 | ||
669 | add ecx, eax | ||
670 | ; 20_39 35 | ||
671 | mov eax, DWORD PTR 12[esp] | ||
672 | mov ebp, DWORD PTR 20[esp] | ||
673 | xor eax, ebp | ||
674 | mov ebp, DWORD PTR 44[esp] | ||
675 | xor eax, ebp | ||
676 | mov ebp, DWORD PTR [esp] | ||
677 | xor eax, ebp | ||
678 | mov ebp, ebx | ||
679 | rol eax, 1 | ||
680 | xor ebp, edx | ||
681 | mov DWORD PTR 12[esp],eax | ||
682 | xor ebp, edi | ||
683 | lea eax, DWORD PTR 1859775393[esi*1+eax] | ||
684 | mov esi, ecx | ||
685 | rol esi, 5 | ||
686 | ror ebx, 1 | ||
687 | add esi, ebp | ||
688 | ror ebx, 1 | ||
689 | add eax, esi | ||
690 | ; 20_39 36 | ||
691 | mov esi, DWORD PTR 16[esp] | ||
692 | mov ebp, DWORD PTR 24[esp] | ||
693 | xor esi, ebp | ||
694 | mov ebp, DWORD PTR 48[esp] | ||
695 | xor esi, ebp | ||
696 | mov ebp, DWORD PTR 4[esp] | ||
697 | xor esi, ebp | ||
698 | mov ebp, ecx | ||
699 | rol esi, 1 | ||
700 | xor ebp, ebx | ||
701 | mov DWORD PTR 16[esp],esi | ||
702 | xor ebp, edx | ||
703 | lea esi, DWORD PTR 1859775393[edi*1+esi] | ||
704 | mov edi, eax | ||
705 | rol edi, 5 | ||
706 | ror ecx, 1 | ||
707 | add edi, ebp | ||
708 | ror ecx, 1 | ||
709 | add esi, edi | ||
710 | ; 20_39 37 | ||
711 | mov edi, DWORD PTR 20[esp] | ||
712 | mov ebp, DWORD PTR 28[esp] | ||
713 | xor edi, ebp | ||
714 | mov ebp, DWORD PTR 52[esp] | ||
715 | xor edi, ebp | ||
716 | mov ebp, DWORD PTR 8[esp] | ||
717 | xor edi, ebp | ||
718 | mov ebp, eax | ||
719 | rol edi, 1 | ||
720 | xor ebp, ecx | ||
721 | mov DWORD PTR 20[esp],edi | ||
722 | xor ebp, ebx | ||
723 | lea edi, DWORD PTR 1859775393[edx*1+edi] | ||
724 | mov edx, esi | ||
725 | rol edx, 5 | ||
726 | ror eax, 1 | ||
727 | add edx, ebp | ||
728 | ror eax, 1 | ||
729 | add edi, edx | ||
730 | ; 20_39 38 | ||
731 | mov edx, DWORD PTR 24[esp] | ||
732 | mov ebp, DWORD PTR 32[esp] | ||
733 | xor edx, ebp | ||
734 | mov ebp, DWORD PTR 56[esp] | ||
735 | xor edx, ebp | ||
736 | mov ebp, DWORD PTR 12[esp] | ||
737 | xor edx, ebp | ||
738 | mov ebp, esi | ||
739 | rol edx, 1 | ||
740 | xor ebp, eax | ||
741 | mov DWORD PTR 24[esp],edx | ||
742 | xor ebp, ecx | ||
743 | lea edx, DWORD PTR 1859775393[ebx*1+edx] | ||
744 | mov ebx, edi | ||
745 | rol ebx, 5 | ||
746 | ror esi, 1 | ||
747 | add ebx, ebp | ||
748 | ror esi, 1 | ||
749 | add edx, ebx | ||
750 | ; 20_39 39 | ||
751 | mov ebx, DWORD PTR 28[esp] | ||
752 | mov ebp, DWORD PTR 36[esp] | ||
753 | xor ebx, ebp | ||
754 | mov ebp, DWORD PTR 60[esp] | ||
755 | xor ebx, ebp | ||
756 | mov ebp, DWORD PTR 16[esp] | ||
757 | xor ebx, ebp | ||
758 | mov ebp, edi | ||
759 | rol ebx, 1 | ||
760 | xor ebp, esi | ||
761 | mov DWORD PTR 28[esp],ebx | ||
762 | xor ebp, eax | ||
763 | lea ebx, DWORD PTR 1859775393[ecx*1+ebx] | ||
764 | mov ecx, edx | ||
765 | rol ecx, 5 | ||
766 | ror edi, 1 | ||
767 | add ecx, ebp | ||
768 | ror edi, 1 | ||
769 | add ebx, ecx | ||
770 | ; 40_59 40 | ||
771 | mov ecx, DWORD PTR 32[esp] | ||
772 | mov ebp, DWORD PTR 40[esp] | ||
773 | xor ecx, ebp | ||
774 | mov ebp, DWORD PTR [esp] | ||
775 | xor ecx, ebp | ||
776 | mov ebp, DWORD PTR 20[esp] | ||
777 | xor ecx, ebp | ||
778 | mov ebp, edx | ||
779 | rol ecx, 1 | ||
780 | or ebp, edi | ||
781 | mov DWORD PTR 32[esp],ecx | ||
782 | and ebp, esi | ||
783 | lea ecx, DWORD PTR 2400959708[eax*1+ecx] | ||
784 | mov eax, edx | ||
785 | ror edx, 1 | ||
786 | and eax, edi | ||
787 | or ebp, eax | ||
788 | mov eax, ebx | ||
789 | rol eax, 5 | ||
790 | add ebp, eax | ||
791 | mov eax, DWORD PTR 36[esp] | ||
792 | add ecx, ebp | ||
793 | mov ebp, DWORD PTR 44[esp] | ||
794 | xor eax, ebp | ||
795 | mov ebp, DWORD PTR 4[esp] | ||
796 | xor eax, ebp | ||
797 | mov ebp, DWORD PTR 24[esp] | ||
798 | ror edx, 1 | ||
799 | xor eax, ebp | ||
800 | rol eax, 1 | ||
801 | mov ebp, ebx | ||
802 | mov DWORD PTR 36[esp],eax | ||
803 | or ebp, edx | ||
804 | lea eax, DWORD PTR 2400959708[esi*1+eax] | ||
805 | mov esi, ebx | ||
806 | and ebp, edi | ||
807 | and esi, edx | ||
808 | or ebp, esi | ||
809 | mov esi, ecx | ||
810 | rol esi, 5 | ||
811 | ror ebx, 1 | ||
812 | add ebp, esi | ||
813 | ror ebx, 1 | ||
814 | add eax, ebp | ||
815 | ; 40_59 41 | ||
816 | ; 40_59 42 | ||
817 | mov esi, DWORD PTR 40[esp] | ||
818 | mov ebp, DWORD PTR 48[esp] | ||
819 | xor esi, ebp | ||
820 | mov ebp, DWORD PTR 8[esp] | ||
821 | xor esi, ebp | ||
822 | mov ebp, DWORD PTR 28[esp] | ||
823 | xor esi, ebp | ||
824 | mov ebp, ecx | ||
825 | rol esi, 1 | ||
826 | or ebp, ebx | ||
827 | mov DWORD PTR 40[esp],esi | ||
828 | and ebp, edx | ||
829 | lea esi, DWORD PTR 2400959708[edi*1+esi] | ||
830 | mov edi, ecx | ||
831 | ror ecx, 1 | ||
832 | and edi, ebx | ||
833 | or ebp, edi | ||
834 | mov edi, eax | ||
835 | rol edi, 5 | ||
836 | add ebp, edi | ||
837 | mov edi, DWORD PTR 44[esp] | ||
838 | add esi, ebp | ||
839 | mov ebp, DWORD PTR 52[esp] | ||
840 | xor edi, ebp | ||
841 | mov ebp, DWORD PTR 12[esp] | ||
842 | xor edi, ebp | ||
843 | mov ebp, DWORD PTR 32[esp] | ||
844 | ror ecx, 1 | ||
845 | xor edi, ebp | ||
846 | rol edi, 1 | ||
847 | mov ebp, eax | ||
848 | mov DWORD PTR 44[esp],edi | ||
849 | or ebp, ecx | ||
850 | lea edi, DWORD PTR 2400959708[edx*1+edi] | ||
851 | mov edx, eax | ||
852 | and ebp, ebx | ||
853 | and edx, ecx | ||
854 | or ebp, edx | ||
855 | mov edx, esi | ||
856 | rol edx, 5 | ||
857 | ror eax, 1 | ||
858 | add ebp, edx | ||
859 | ror eax, 1 | ||
860 | add edi, ebp | ||
861 | ; 40_59 43 | ||
862 | ; 40_59 44 | ||
863 | mov edx, DWORD PTR 48[esp] | ||
864 | mov ebp, DWORD PTR 56[esp] | ||
865 | xor edx, ebp | ||
866 | mov ebp, DWORD PTR 16[esp] | ||
867 | xor edx, ebp | ||
868 | mov ebp, DWORD PTR 36[esp] | ||
869 | xor edx, ebp | ||
870 | mov ebp, esi | ||
871 | rol edx, 1 | ||
872 | or ebp, eax | ||
873 | mov DWORD PTR 48[esp],edx | ||
874 | and ebp, ecx | ||
875 | lea edx, DWORD PTR 2400959708[ebx*1+edx] | ||
876 | mov ebx, esi | ||
877 | ror esi, 1 | ||
878 | and ebx, eax | ||
879 | or ebp, ebx | ||
880 | mov ebx, edi | ||
881 | rol ebx, 5 | ||
882 | add ebp, ebx | ||
883 | mov ebx, DWORD PTR 52[esp] | ||
884 | add edx, ebp | ||
885 | mov ebp, DWORD PTR 60[esp] | ||
886 | xor ebx, ebp | ||
887 | mov ebp, DWORD PTR 20[esp] | ||
888 | xor ebx, ebp | ||
889 | mov ebp, DWORD PTR 40[esp] | ||
890 | ror esi, 1 | ||
891 | xor ebx, ebp | ||
892 | rol ebx, 1 | ||
893 | mov ebp, edi | ||
894 | mov DWORD PTR 52[esp],ebx | ||
895 | or ebp, esi | ||
896 | lea ebx, DWORD PTR 2400959708[ecx*1+ebx] | ||
897 | mov ecx, edi | ||
898 | and ebp, eax | ||
899 | and ecx, esi | ||
900 | or ebp, ecx | ||
901 | mov ecx, edx | ||
902 | rol ecx, 5 | ||
903 | ror edi, 1 | ||
904 | add ebp, ecx | ||
905 | ror edi, 1 | ||
906 | add ebx, ebp | ||
907 | ; 40_59 45 | ||
908 | ; 40_59 46 | ||
909 | mov ecx, DWORD PTR 56[esp] | ||
910 | mov ebp, DWORD PTR [esp] | ||
911 | xor ecx, ebp | ||
912 | mov ebp, DWORD PTR 24[esp] | ||
913 | xor ecx, ebp | ||
914 | mov ebp, DWORD PTR 44[esp] | ||
915 | xor ecx, ebp | ||
916 | mov ebp, edx | ||
917 | rol ecx, 1 | ||
918 | or ebp, edi | ||
919 | mov DWORD PTR 56[esp],ecx | ||
920 | and ebp, esi | ||
921 | lea ecx, DWORD PTR 2400959708[eax*1+ecx] | ||
922 | mov eax, edx | ||
923 | ror edx, 1 | ||
924 | and eax, edi | ||
925 | or ebp, eax | ||
926 | mov eax, ebx | ||
927 | rol eax, 5 | ||
928 | add ebp, eax | ||
929 | mov eax, DWORD PTR 60[esp] | ||
930 | add ecx, ebp | ||
931 | mov ebp, DWORD PTR 4[esp] | ||
932 | xor eax, ebp | ||
933 | mov ebp, DWORD PTR 28[esp] | ||
934 | xor eax, ebp | ||
935 | mov ebp, DWORD PTR 48[esp] | ||
936 | ror edx, 1 | ||
937 | xor eax, ebp | ||
938 | rol eax, 1 | ||
939 | mov ebp, ebx | ||
940 | mov DWORD PTR 60[esp],eax | ||
941 | or ebp, edx | ||
942 | lea eax, DWORD PTR 2400959708[esi*1+eax] | ||
943 | mov esi, ebx | ||
944 | and ebp, edi | ||
945 | and esi, edx | ||
946 | or ebp, esi | ||
947 | mov esi, ecx | ||
948 | rol esi, 5 | ||
949 | ror ebx, 1 | ||
950 | add ebp, esi | ||
951 | ror ebx, 1 | ||
952 | add eax, ebp | ||
953 | ; 40_59 47 | ||
954 | ; 40_59 48 | ||
955 | mov esi, DWORD PTR [esp] | ||
956 | mov ebp, DWORD PTR 8[esp] | ||
957 | xor esi, ebp | ||
958 | mov ebp, DWORD PTR 32[esp] | ||
959 | xor esi, ebp | ||
960 | mov ebp, DWORD PTR 52[esp] | ||
961 | xor esi, ebp | ||
962 | mov ebp, ecx | ||
963 | rol esi, 1 | ||
964 | or ebp, ebx | ||
965 | mov DWORD PTR [esp],esi | ||
966 | and ebp, edx | ||
967 | lea esi, DWORD PTR 2400959708[edi*1+esi] | ||
968 | mov edi, ecx | ||
969 | ror ecx, 1 | ||
970 | and edi, ebx | ||
971 | or ebp, edi | ||
972 | mov edi, eax | ||
973 | rol edi, 5 | ||
974 | add ebp, edi | ||
975 | mov edi, DWORD PTR 4[esp] | ||
976 | add esi, ebp | ||
977 | mov ebp, DWORD PTR 12[esp] | ||
978 | xor edi, ebp | ||
979 | mov ebp, DWORD PTR 36[esp] | ||
980 | xor edi, ebp | ||
981 | mov ebp, DWORD PTR 56[esp] | ||
982 | ror ecx, 1 | ||
983 | xor edi, ebp | ||
984 | rol edi, 1 | ||
985 | mov ebp, eax | ||
986 | mov DWORD PTR 4[esp],edi | ||
987 | or ebp, ecx | ||
988 | lea edi, DWORD PTR 2400959708[edx*1+edi] | ||
989 | mov edx, eax | ||
990 | and ebp, ebx | ||
991 | and edx, ecx | ||
992 | or ebp, edx | ||
993 | mov edx, esi | ||
994 | rol edx, 5 | ||
995 | ror eax, 1 | ||
996 | add ebp, edx | ||
997 | ror eax, 1 | ||
998 | add edi, ebp | ||
999 | ; 40_59 49 | ||
1000 | ; 40_59 50 | ||
1001 | mov edx, DWORD PTR 8[esp] | ||
1002 | mov ebp, DWORD PTR 16[esp] | ||
1003 | xor edx, ebp | ||
1004 | mov ebp, DWORD PTR 40[esp] | ||
1005 | xor edx, ebp | ||
1006 | mov ebp, DWORD PTR 60[esp] | ||
1007 | xor edx, ebp | ||
1008 | mov ebp, esi | ||
1009 | rol edx, 1 | ||
1010 | or ebp, eax | ||
1011 | mov DWORD PTR 8[esp],edx | ||
1012 | and ebp, ecx | ||
1013 | lea edx, DWORD PTR 2400959708[ebx*1+edx] | ||
1014 | mov ebx, esi | ||
1015 | ror esi, 1 | ||
1016 | and ebx, eax | ||
1017 | or ebp, ebx | ||
1018 | mov ebx, edi | ||
1019 | rol ebx, 5 | ||
1020 | add ebp, ebx | ||
1021 | mov ebx, DWORD PTR 12[esp] | ||
1022 | add edx, ebp | ||
1023 | mov ebp, DWORD PTR 20[esp] | ||
1024 | xor ebx, ebp | ||
1025 | mov ebp, DWORD PTR 44[esp] | ||
1026 | xor ebx, ebp | ||
1027 | mov ebp, DWORD PTR [esp] | ||
1028 | ror esi, 1 | ||
1029 | xor ebx, ebp | ||
1030 | rol ebx, 1 | ||
1031 | mov ebp, edi | ||
1032 | mov DWORD PTR 12[esp],ebx | ||
1033 | or ebp, esi | ||
1034 | lea ebx, DWORD PTR 2400959708[ecx*1+ebx] | ||
1035 | mov ecx, edi | ||
1036 | and ebp, eax | ||
1037 | and ecx, esi | ||
1038 | or ebp, ecx | ||
1039 | mov ecx, edx | ||
1040 | rol ecx, 5 | ||
1041 | ror edi, 1 | ||
1042 | add ebp, ecx | ||
1043 | ror edi, 1 | ||
1044 | add ebx, ebp | ||
1045 | ; 40_59 51 | ||
1046 | ; 40_59 52 | ||
1047 | mov ecx, DWORD PTR 16[esp] | ||
1048 | mov ebp, DWORD PTR 24[esp] | ||
1049 | xor ecx, ebp | ||
1050 | mov ebp, DWORD PTR 48[esp] | ||
1051 | xor ecx, ebp | ||
1052 | mov ebp, DWORD PTR 4[esp] | ||
1053 | xor ecx, ebp | ||
1054 | mov ebp, edx | ||
1055 | rol ecx, 1 | ||
1056 | or ebp, edi | ||
1057 | mov DWORD PTR 16[esp],ecx | ||
1058 | and ebp, esi | ||
1059 | lea ecx, DWORD PTR 2400959708[eax*1+ecx] | ||
1060 | mov eax, edx | ||
1061 | ror edx, 1 | ||
1062 | and eax, edi | ||
1063 | or ebp, eax | ||
1064 | mov eax, ebx | ||
1065 | rol eax, 5 | ||
1066 | add ebp, eax | ||
1067 | mov eax, DWORD PTR 20[esp] | ||
1068 | add ecx, ebp | ||
1069 | mov ebp, DWORD PTR 28[esp] | ||
1070 | xor eax, ebp | ||
1071 | mov ebp, DWORD PTR 52[esp] | ||
1072 | xor eax, ebp | ||
1073 | mov ebp, DWORD PTR 8[esp] | ||
1074 | ror edx, 1 | ||
1075 | xor eax, ebp | ||
1076 | rol eax, 1 | ||
1077 | mov ebp, ebx | ||
1078 | mov DWORD PTR 20[esp],eax | ||
1079 | or ebp, edx | ||
1080 | lea eax, DWORD PTR 2400959708[esi*1+eax] | ||
1081 | mov esi, ebx | ||
1082 | and ebp, edi | ||
1083 | and esi, edx | ||
1084 | or ebp, esi | ||
1085 | mov esi, ecx | ||
1086 | rol esi, 5 | ||
1087 | ror ebx, 1 | ||
1088 | add ebp, esi | ||
1089 | ror ebx, 1 | ||
1090 | add eax, ebp | ||
1091 | ; 40_59 53 | ||
1092 | ; 40_59 54 | ||
1093 | mov esi, DWORD PTR 24[esp] | ||
1094 | mov ebp, DWORD PTR 32[esp] | ||
1095 | xor esi, ebp | ||
1096 | mov ebp, DWORD PTR 56[esp] | ||
1097 | xor esi, ebp | ||
1098 | mov ebp, DWORD PTR 12[esp] | ||
1099 | xor esi, ebp | ||
1100 | mov ebp, ecx | ||
1101 | rol esi, 1 | ||
1102 | or ebp, ebx | ||
1103 | mov DWORD PTR 24[esp],esi | ||
1104 | and ebp, edx | ||
1105 | lea esi, DWORD PTR 2400959708[edi*1+esi] | ||
1106 | mov edi, ecx | ||
1107 | ror ecx, 1 | ||
1108 | and edi, ebx | ||
1109 | or ebp, edi | ||
1110 | mov edi, eax | ||
1111 | rol edi, 5 | ||
1112 | add ebp, edi | ||
1113 | mov edi, DWORD PTR 28[esp] | ||
1114 | add esi, ebp | ||
1115 | mov ebp, DWORD PTR 36[esp] | ||
1116 | xor edi, ebp | ||
1117 | mov ebp, DWORD PTR 60[esp] | ||
1118 | xor edi, ebp | ||
1119 | mov ebp, DWORD PTR 16[esp] | ||
1120 | ror ecx, 1 | ||
1121 | xor edi, ebp | ||
1122 | rol edi, 1 | ||
1123 | mov ebp, eax | ||
1124 | mov DWORD PTR 28[esp],edi | ||
1125 | or ebp, ecx | ||
1126 | lea edi, DWORD PTR 2400959708[edx*1+edi] | ||
1127 | mov edx, eax | ||
1128 | and ebp, ebx | ||
1129 | and edx, ecx | ||
1130 | or ebp, edx | ||
1131 | mov edx, esi | ||
1132 | rol edx, 5 | ||
1133 | ror eax, 1 | ||
1134 | add ebp, edx | ||
1135 | ror eax, 1 | ||
1136 | add edi, ebp | ||
1137 | ; 40_59 55 | ||
1138 | ; 40_59 56 | ||
1139 | mov edx, DWORD PTR 32[esp] | ||
1140 | mov ebp, DWORD PTR 40[esp] | ||
1141 | xor edx, ebp | ||
1142 | mov ebp, DWORD PTR [esp] | ||
1143 | xor edx, ebp | ||
1144 | mov ebp, DWORD PTR 20[esp] | ||
1145 | xor edx, ebp | ||
1146 | mov ebp, esi | ||
1147 | rol edx, 1 | ||
1148 | or ebp, eax | ||
1149 | mov DWORD PTR 32[esp],edx | ||
1150 | and ebp, ecx | ||
1151 | lea edx, DWORD PTR 2400959708[ebx*1+edx] | ||
1152 | mov ebx, esi | ||
1153 | ror esi, 1 | ||
1154 | and ebx, eax | ||
1155 | or ebp, ebx | ||
1156 | mov ebx, edi | ||
1157 | rol ebx, 5 | ||
1158 | add ebp, ebx | ||
1159 | mov ebx, DWORD PTR 36[esp] | ||
1160 | add edx, ebp | ||
1161 | mov ebp, DWORD PTR 44[esp] | ||
1162 | xor ebx, ebp | ||
1163 | mov ebp, DWORD PTR 4[esp] | ||
1164 | xor ebx, ebp | ||
1165 | mov ebp, DWORD PTR 24[esp] | ||
1166 | ror esi, 1 | ||
1167 | xor ebx, ebp | ||
1168 | rol ebx, 1 | ||
1169 | mov ebp, edi | ||
1170 | mov DWORD PTR 36[esp],ebx | ||
1171 | or ebp, esi | ||
1172 | lea ebx, DWORD PTR 2400959708[ecx*1+ebx] | ||
1173 | mov ecx, edi | ||
1174 | and ebp, eax | ||
1175 | and ecx, esi | ||
1176 | or ebp, ecx | ||
1177 | mov ecx, edx | ||
1178 | rol ecx, 5 | ||
1179 | ror edi, 1 | ||
1180 | add ebp, ecx | ||
1181 | ror edi, 1 | ||
1182 | add ebx, ebp | ||
1183 | ; 40_59 57 | ||
1184 | ; 40_59 58 | ||
1185 | mov ecx, DWORD PTR 40[esp] | ||
1186 | mov ebp, DWORD PTR 48[esp] | ||
1187 | xor ecx, ebp | ||
1188 | mov ebp, DWORD PTR 8[esp] | ||
1189 | xor ecx, ebp | ||
1190 | mov ebp, DWORD PTR 28[esp] | ||
1191 | xor ecx, ebp | ||
1192 | mov ebp, edx | ||
1193 | rol ecx, 1 | ||
1194 | or ebp, edi | ||
1195 | mov DWORD PTR 40[esp],ecx | ||
1196 | and ebp, esi | ||
1197 | lea ecx, DWORD PTR 2400959708[eax*1+ecx] | ||
1198 | mov eax, edx | ||
1199 | ror edx, 1 | ||
1200 | and eax, edi | ||
1201 | or ebp, eax | ||
1202 | mov eax, ebx | ||
1203 | rol eax, 5 | ||
1204 | add ebp, eax | ||
1205 | mov eax, DWORD PTR 44[esp] | ||
1206 | add ecx, ebp | ||
1207 | mov ebp, DWORD PTR 52[esp] | ||
1208 | xor eax, ebp | ||
1209 | mov ebp, DWORD PTR 12[esp] | ||
1210 | xor eax, ebp | ||
1211 | mov ebp, DWORD PTR 32[esp] | ||
1212 | ror edx, 1 | ||
1213 | xor eax, ebp | ||
1214 | rol eax, 1 | ||
1215 | mov ebp, ebx | ||
1216 | mov DWORD PTR 44[esp],eax | ||
1217 | or ebp, edx | ||
1218 | lea eax, DWORD PTR 2400959708[esi*1+eax] | ||
1219 | mov esi, ebx | ||
1220 | and ebp, edi | ||
1221 | and esi, edx | ||
1222 | or ebp, esi | ||
1223 | mov esi, ecx | ||
1224 | rol esi, 5 | ||
1225 | ror ebx, 1 | ||
1226 | add ebp, esi | ||
1227 | ror ebx, 1 | ||
1228 | add eax, ebp | ||
1229 | ; 40_59 59 | ||
1230 | ; 20_39 60 | ||
1231 | mov esi, DWORD PTR 48[esp] | ||
1232 | mov ebp, DWORD PTR 56[esp] | ||
1233 | xor esi, ebp | ||
1234 | mov ebp, DWORD PTR 16[esp] | ||
1235 | xor esi, ebp | ||
1236 | mov ebp, DWORD PTR 36[esp] | ||
1237 | xor esi, ebp | ||
1238 | mov ebp, ecx | ||
1239 | rol esi, 1 | ||
1240 | xor ebp, ebx | ||
1241 | mov DWORD PTR 48[esp],esi | ||
1242 | xor ebp, edx | ||
1243 | lea esi, DWORD PTR 3395469782[edi*1+esi] | ||
1244 | mov edi, eax | ||
1245 | rol edi, 5 | ||
1246 | ror ecx, 1 | ||
1247 | add edi, ebp | ||
1248 | ror ecx, 1 | ||
1249 | add esi, edi | ||
1250 | ; 20_39 61 | ||
1251 | mov edi, DWORD PTR 52[esp] | ||
1252 | mov ebp, DWORD PTR 60[esp] | ||
1253 | xor edi, ebp | ||
1254 | mov ebp, DWORD PTR 20[esp] | ||
1255 | xor edi, ebp | ||
1256 | mov ebp, DWORD PTR 40[esp] | ||
1257 | xor edi, ebp | ||
1258 | mov ebp, eax | ||
1259 | rol edi, 1 | ||
1260 | xor ebp, ecx | ||
1261 | mov DWORD PTR 52[esp],edi | ||
1262 | xor ebp, ebx | ||
1263 | lea edi, DWORD PTR 3395469782[edx*1+edi] | ||
1264 | mov edx, esi | ||
1265 | rol edx, 5 | ||
1266 | ror eax, 1 | ||
1267 | add edx, ebp | ||
1268 | ror eax, 1 | ||
1269 | add edi, edx | ||
1270 | ; 20_39 62 | ||
1271 | mov edx, DWORD PTR 56[esp] | ||
1272 | mov ebp, DWORD PTR [esp] | ||
1273 | xor edx, ebp | ||
1274 | mov ebp, DWORD PTR 24[esp] | ||
1275 | xor edx, ebp | ||
1276 | mov ebp, DWORD PTR 44[esp] | ||
1277 | xor edx, ebp | ||
1278 | mov ebp, esi | ||
1279 | rol edx, 1 | ||
1280 | xor ebp, eax | ||
1281 | mov DWORD PTR 56[esp],edx | ||
1282 | xor ebp, ecx | ||
1283 | lea edx, DWORD PTR 3395469782[ebx*1+edx] | ||
1284 | mov ebx, edi | ||
1285 | rol ebx, 5 | ||
1286 | ror esi, 1 | ||
1287 | add ebx, ebp | ||
1288 | ror esi, 1 | ||
1289 | add edx, ebx | ||
1290 | ; 20_39 63 | ||
1291 | mov ebx, DWORD PTR 60[esp] | ||
1292 | mov ebp, DWORD PTR 4[esp] | ||
1293 | xor ebx, ebp | ||
1294 | mov ebp, DWORD PTR 28[esp] | ||
1295 | xor ebx, ebp | ||
1296 | mov ebp, DWORD PTR 48[esp] | ||
1297 | xor ebx, ebp | ||
1298 | mov ebp, edi | ||
1299 | rol ebx, 1 | ||
1300 | xor ebp, esi | ||
1301 | mov DWORD PTR 60[esp],ebx | ||
1302 | xor ebp, eax | ||
1303 | lea ebx, DWORD PTR 3395469782[ecx*1+ebx] | ||
1304 | mov ecx, edx | ||
1305 | rol ecx, 5 | ||
1306 | ror edi, 1 | ||
1307 | add ecx, ebp | ||
1308 | ror edi, 1 | ||
1309 | add ebx, ecx | ||
1310 | ; 20_39 64 | ||
1311 | mov ecx, DWORD PTR [esp] | ||
1312 | mov ebp, DWORD PTR 8[esp] | ||
1313 | xor ecx, ebp | ||
1314 | mov ebp, DWORD PTR 32[esp] | ||
1315 | xor ecx, ebp | ||
1316 | mov ebp, DWORD PTR 52[esp] | ||
1317 | xor ecx, ebp | ||
1318 | mov ebp, edx | ||
1319 | rol ecx, 1 | ||
1320 | xor ebp, edi | ||
1321 | mov DWORD PTR [esp],ecx | ||
1322 | xor ebp, esi | ||
1323 | lea ecx, DWORD PTR 3395469782[eax*1+ecx] | ||
1324 | mov eax, ebx | ||
1325 | rol eax, 5 | ||
1326 | ror edx, 1 | ||
1327 | add eax, ebp | ||
1328 | ror edx, 1 | ||
1329 | add ecx, eax | ||
1330 | ; 20_39 65 | ||
1331 | mov eax, DWORD PTR 4[esp] | ||
1332 | mov ebp, DWORD PTR 12[esp] | ||
1333 | xor eax, ebp | ||
1334 | mov ebp, DWORD PTR 36[esp] | ||
1335 | xor eax, ebp | ||
1336 | mov ebp, DWORD PTR 56[esp] | ||
1337 | xor eax, ebp | ||
1338 | mov ebp, ebx | ||
1339 | rol eax, 1 | ||
1340 | xor ebp, edx | ||
1341 | mov DWORD PTR 4[esp],eax | ||
1342 | xor ebp, edi | ||
1343 | lea eax, DWORD PTR 3395469782[esi*1+eax] | ||
1344 | mov esi, ecx | ||
1345 | rol esi, 5 | ||
1346 | ror ebx, 1 | ||
1347 | add esi, ebp | ||
1348 | ror ebx, 1 | ||
1349 | add eax, esi | ||
1350 | ; 20_39 66 | ||
1351 | mov esi, DWORD PTR 8[esp] | ||
1352 | mov ebp, DWORD PTR 16[esp] | ||
1353 | xor esi, ebp | ||
1354 | mov ebp, DWORD PTR 40[esp] | ||
1355 | xor esi, ebp | ||
1356 | mov ebp, DWORD PTR 60[esp] | ||
1357 | xor esi, ebp | ||
1358 | mov ebp, ecx | ||
1359 | rol esi, 1 | ||
1360 | xor ebp, ebx | ||
1361 | mov DWORD PTR 8[esp],esi | ||
1362 | xor ebp, edx | ||
1363 | lea esi, DWORD PTR 3395469782[edi*1+esi] | ||
1364 | mov edi, eax | ||
1365 | rol edi, 5 | ||
1366 | ror ecx, 1 | ||
1367 | add edi, ebp | ||
1368 | ror ecx, 1 | ||
1369 | add esi, edi | ||
1370 | ; 20_39 67 | ||
1371 | mov edi, DWORD PTR 12[esp] | ||
1372 | mov ebp, DWORD PTR 20[esp] | ||
1373 | xor edi, ebp | ||
1374 | mov ebp, DWORD PTR 44[esp] | ||
1375 | xor edi, ebp | ||
1376 | mov ebp, DWORD PTR [esp] | ||
1377 | xor edi, ebp | ||
1378 | mov ebp, eax | ||
1379 | rol edi, 1 | ||
1380 | xor ebp, ecx | ||
1381 | mov DWORD PTR 12[esp],edi | ||
1382 | xor ebp, ebx | ||
1383 | lea edi, DWORD PTR 3395469782[edx*1+edi] | ||
1384 | mov edx, esi | ||
1385 | rol edx, 5 | ||
1386 | ror eax, 1 | ||
1387 | add edx, ebp | ||
1388 | ror eax, 1 | ||
1389 | add edi, edx | ||
1390 | ; 20_39 68 | ||
1391 | mov edx, DWORD PTR 16[esp] | ||
1392 | mov ebp, DWORD PTR 24[esp] | ||
1393 | xor edx, ebp | ||
1394 | mov ebp, DWORD PTR 48[esp] | ||
1395 | xor edx, ebp | ||
1396 | mov ebp, DWORD PTR 4[esp] | ||
1397 | xor edx, ebp | ||
1398 | mov ebp, esi | ||
1399 | rol edx, 1 | ||
1400 | xor ebp, eax | ||
1401 | mov DWORD PTR 16[esp],edx | ||
1402 | xor ebp, ecx | ||
1403 | lea edx, DWORD PTR 3395469782[ebx*1+edx] | ||
1404 | mov ebx, edi | ||
1405 | rol ebx, 5 | ||
1406 | ror esi, 1 | ||
1407 | add ebx, ebp | ||
1408 | ror esi, 1 | ||
1409 | add edx, ebx | ||
1410 | ; 20_39 69 | ||
1411 | mov ebx, DWORD PTR 20[esp] | ||
1412 | mov ebp, DWORD PTR 28[esp] | ||
1413 | xor ebx, ebp | ||
1414 | mov ebp, DWORD PTR 52[esp] | ||
1415 | xor ebx, ebp | ||
1416 | mov ebp, DWORD PTR 8[esp] | ||
1417 | xor ebx, ebp | ||
1418 | mov ebp, edi | ||
1419 | rol ebx, 1 | ||
1420 | xor ebp, esi | ||
1421 | mov DWORD PTR 20[esp],ebx | ||
1422 | xor ebp, eax | ||
1423 | lea ebx, DWORD PTR 3395469782[ecx*1+ebx] | ||
1424 | mov ecx, edx | ||
1425 | rol ecx, 5 | ||
1426 | ror edi, 1 | ||
1427 | add ecx, ebp | ||
1428 | ror edi, 1 | ||
1429 | add ebx, ecx | ||
1430 | ; 20_39 70 | ||
1431 | mov ecx, DWORD PTR 24[esp] | ||
1432 | mov ebp, DWORD PTR 32[esp] | ||
1433 | xor ecx, ebp | ||
1434 | mov ebp, DWORD PTR 56[esp] | ||
1435 | xor ecx, ebp | ||
1436 | mov ebp, DWORD PTR 12[esp] | ||
1437 | xor ecx, ebp | ||
1438 | mov ebp, edx | ||
1439 | rol ecx, 1 | ||
1440 | xor ebp, edi | ||
1441 | mov DWORD PTR 24[esp],ecx | ||
1442 | xor ebp, esi | ||
1443 | lea ecx, DWORD PTR 3395469782[eax*1+ecx] | ||
1444 | mov eax, ebx | ||
1445 | rol eax, 5 | ||
1446 | ror edx, 1 | ||
1447 | add eax, ebp | ||
1448 | ror edx, 1 | ||
1449 | add ecx, eax | ||
1450 | ; 20_39 71 | ||
1451 | mov eax, DWORD PTR 28[esp] | ||
1452 | mov ebp, DWORD PTR 36[esp] | ||
1453 | xor eax, ebp | ||
1454 | mov ebp, DWORD PTR 60[esp] | ||
1455 | xor eax, ebp | ||
1456 | mov ebp, DWORD PTR 16[esp] | ||
1457 | xor eax, ebp | ||
1458 | mov ebp, ebx | ||
1459 | rol eax, 1 | ||
1460 | xor ebp, edx | ||
1461 | mov DWORD PTR 28[esp],eax | ||
1462 | xor ebp, edi | ||
1463 | lea eax, DWORD PTR 3395469782[esi*1+eax] | ||
1464 | mov esi, ecx | ||
1465 | rol esi, 5 | ||
1466 | ror ebx, 1 | ||
1467 | add esi, ebp | ||
1468 | ror ebx, 1 | ||
1469 | add eax, esi | ||
1470 | ; 20_39 72 | ||
1471 | mov esi, DWORD PTR 32[esp] | ||
1472 | mov ebp, DWORD PTR 40[esp] | ||
1473 | xor esi, ebp | ||
1474 | mov ebp, DWORD PTR [esp] | ||
1475 | xor esi, ebp | ||
1476 | mov ebp, DWORD PTR 20[esp] | ||
1477 | xor esi, ebp | ||
1478 | mov ebp, ecx | ||
1479 | rol esi, 1 | ||
1480 | xor ebp, ebx | ||
1481 | mov DWORD PTR 32[esp],esi | ||
1482 | xor ebp, edx | ||
1483 | lea esi, DWORD PTR 3395469782[edi*1+esi] | ||
1484 | mov edi, eax | ||
1485 | rol edi, 5 | ||
1486 | ror ecx, 1 | ||
1487 | add edi, ebp | ||
1488 | ror ecx, 1 | ||
1489 | add esi, edi | ||
1490 | ; 20_39 73 | ||
1491 | mov edi, DWORD PTR 36[esp] | ||
1492 | mov ebp, DWORD PTR 44[esp] | ||
1493 | xor edi, ebp | ||
1494 | mov ebp, DWORD PTR 4[esp] | ||
1495 | xor edi, ebp | ||
1496 | mov ebp, DWORD PTR 24[esp] | ||
1497 | xor edi, ebp | ||
1498 | mov ebp, eax | ||
1499 | rol edi, 1 | ||
1500 | xor ebp, ecx | ||
1501 | mov DWORD PTR 36[esp],edi | ||
1502 | xor ebp, ebx | ||
1503 | lea edi, DWORD PTR 3395469782[edx*1+edi] | ||
1504 | mov edx, esi | ||
1505 | rol edx, 5 | ||
1506 | ror eax, 1 | ||
1507 | add edx, ebp | ||
1508 | ror eax, 1 | ||
1509 | add edi, edx | ||
1510 | ; 20_39 74 | ||
1511 | mov edx, DWORD PTR 40[esp] | ||
1512 | mov ebp, DWORD PTR 48[esp] | ||
1513 | xor edx, ebp | ||
1514 | mov ebp, DWORD PTR 8[esp] | ||
1515 | xor edx, ebp | ||
1516 | mov ebp, DWORD PTR 28[esp] | ||
1517 | xor edx, ebp | ||
1518 | mov ebp, esi | ||
1519 | rol edx, 1 | ||
1520 | xor ebp, eax | ||
1521 | mov DWORD PTR 40[esp],edx | ||
1522 | xor ebp, ecx | ||
1523 | lea edx, DWORD PTR 3395469782[ebx*1+edx] | ||
1524 | mov ebx, edi | ||
1525 | rol ebx, 5 | ||
1526 | ror esi, 1 | ||
1527 | add ebx, ebp | ||
1528 | ror esi, 1 | ||
1529 | add edx, ebx | ||
1530 | ; 20_39 75 | ||
1531 | mov ebx, DWORD PTR 44[esp] | ||
1532 | mov ebp, DWORD PTR 52[esp] | ||
1533 | xor ebx, ebp | ||
1534 | mov ebp, DWORD PTR 12[esp] | ||
1535 | xor ebx, ebp | ||
1536 | mov ebp, DWORD PTR 32[esp] | ||
1537 | xor ebx, ebp | ||
1538 | mov ebp, edi | ||
1539 | rol ebx, 1 | ||
1540 | xor ebp, esi | ||
1541 | mov DWORD PTR 44[esp],ebx | ||
1542 | xor ebp, eax | ||
1543 | lea ebx, DWORD PTR 3395469782[ecx*1+ebx] | ||
1544 | mov ecx, edx | ||
1545 | rol ecx, 5 | ||
1546 | ror edi, 1 | ||
1547 | add ecx, ebp | ||
1548 | ror edi, 1 | ||
1549 | add ebx, ecx | ||
1550 | ; 20_39 76 | ||
1551 | mov ecx, DWORD PTR 48[esp] | ||
1552 | mov ebp, DWORD PTR 56[esp] | ||
1553 | xor ecx, ebp | ||
1554 | mov ebp, DWORD PTR 16[esp] | ||
1555 | xor ecx, ebp | ||
1556 | mov ebp, DWORD PTR 36[esp] | ||
1557 | xor ecx, ebp | ||
1558 | mov ebp, edx | ||
1559 | rol ecx, 1 | ||
1560 | xor ebp, edi | ||
1561 | mov DWORD PTR 48[esp],ecx | ||
1562 | xor ebp, esi | ||
1563 | lea ecx, DWORD PTR 3395469782[eax*1+ecx] | ||
1564 | mov eax, ebx | ||
1565 | rol eax, 5 | ||
1566 | ror edx, 1 | ||
1567 | add eax, ebp | ||
1568 | ror edx, 1 | ||
1569 | add ecx, eax | ||
1570 | ; 20_39 77 | ||
1571 | mov eax, DWORD PTR 52[esp] | ||
1572 | mov ebp, DWORD PTR 60[esp] | ||
1573 | xor eax, ebp | ||
1574 | mov ebp, DWORD PTR 20[esp] | ||
1575 | xor eax, ebp | ||
1576 | mov ebp, DWORD PTR 40[esp] | ||
1577 | xor eax, ebp | ||
1578 | mov ebp, ebx | ||
1579 | rol eax, 1 | ||
1580 | xor ebp, edx | ||
1581 | mov DWORD PTR 52[esp],eax | ||
1582 | xor ebp, edi | ||
1583 | lea eax, DWORD PTR 3395469782[esi*1+eax] | ||
1584 | mov esi, ecx | ||
1585 | rol esi, 5 | ||
1586 | ror ebx, 1 | ||
1587 | add esi, ebp | ||
1588 | ror ebx, 1 | ||
1589 | add eax, esi | ||
1590 | ; 20_39 78 | ||
1591 | mov esi, DWORD PTR 56[esp] | ||
1592 | mov ebp, DWORD PTR [esp] | ||
1593 | xor esi, ebp | ||
1594 | mov ebp, DWORD PTR 24[esp] | ||
1595 | xor esi, ebp | ||
1596 | mov ebp, DWORD PTR 44[esp] | ||
1597 | xor esi, ebp | ||
1598 | mov ebp, ecx | ||
1599 | rol esi, 1 | ||
1600 | xor ebp, ebx | ||
1601 | mov DWORD PTR 56[esp],esi | ||
1602 | xor ebp, edx | ||
1603 | lea esi, DWORD PTR 3395469782[edi*1+esi] | ||
1604 | mov edi, eax | ||
1605 | rol edi, 5 | ||
1606 | ror ecx, 1 | ||
1607 | add edi, ebp | ||
1608 | ror ecx, 1 | ||
1609 | add esi, edi | ||
1610 | ; 20_39 79 | ||
1611 | mov edi, DWORD PTR 60[esp] | ||
1612 | mov ebp, DWORD PTR 4[esp] | ||
1613 | xor edi, ebp | ||
1614 | mov ebp, DWORD PTR 28[esp] | ||
1615 | xor edi, ebp | ||
1616 | mov ebp, DWORD PTR 48[esp] | ||
1617 | xor edi, ebp | ||
1618 | mov ebp, eax | ||
1619 | rol edi, 1 | ||
1620 | xor ebp, ecx | ||
1621 | mov DWORD PTR 60[esp],edi | ||
1622 | xor ebp, ebx | ||
1623 | lea edi, DWORD PTR 3395469782[edx*1+edi] | ||
1624 | mov edx, esi | ||
1625 | rol edx, 5 | ||
1626 | add edx, ebp | ||
1627 | mov ebp, DWORD PTR 128[esp] | ||
1628 | ror eax, 1 | ||
1629 | add edi, edx | ||
1630 | ror eax, 1 | ||
1631 | ; End processing | ||
1632 | ; | ||
1633 | mov edx, DWORD PTR 12[ebp] | ||
1634 | add edx, ecx | ||
1635 | mov ecx, DWORD PTR 4[ebp] | ||
1636 | add ecx, esi | ||
1637 | mov esi, eax | ||
1638 | mov eax, DWORD PTR [ebp] | ||
1639 | mov DWORD PTR 12[ebp],edx | ||
1640 | add eax, edi | ||
1641 | mov edi, DWORD PTR 16[ebp] | ||
1642 | add edi, ebx | ||
1643 | mov ebx, DWORD PTR 8[ebp] | ||
1644 | add ebx, esi | ||
1645 | mov DWORD PTR [ebp],eax | ||
1646 | mov esi, DWORD PTR 132[esp] | ||
1647 | mov DWORD PTR 8[ebp],ebx | ||
1648 | add esi, 64 | ||
1649 | mov eax, DWORD PTR 68[esp] | ||
1650 | mov DWORD PTR 16[ebp],edi | ||
1651 | cmp esi, eax | ||
1652 | mov DWORD PTR 4[ebp],ecx | ||
1653 | jl L000start | ||
1654 | add esp, 108 | ||
1655 | pop edi | ||
1656 | pop ebx | ||
1657 | pop ebp | ||
1658 | pop esi | ||
1659 | ret | ||
1660 | _TEXT SEGMENT | ||
1661 | PUBLIC _sha1_block_asm_host_order | ||
1662 | |||
1663 | _sha1_block_asm_host_order PROC NEAR | ||
1664 | mov ecx, DWORD PTR 12[esp] | ||
1665 | push esi | ||
1666 | shl ecx, 6 | ||
1667 | mov esi, DWORD PTR 12[esp] | ||
1668 | push ebp | ||
1669 | add ecx, esi | ||
1670 | push ebx | ||
1671 | mov ebp, DWORD PTR 16[esp] | ||
1672 | push edi | ||
1673 | mov edx, DWORD PTR 12[ebp] | ||
1674 | sub esp, 108 | ||
1675 | mov edi, DWORD PTR 16[ebp] | ||
1676 | mov ebx, DWORD PTR 8[ebp] | ||
1677 | mov DWORD PTR 68[esp],ecx | ||
1678 | ; First we need to setup the X array | ||
1679 | mov eax, DWORD PTR [esi] | ||
1680 | mov ecx, DWORD PTR 4[esi] | ||
1681 | mov DWORD PTR [esp],eax | ||
1682 | mov DWORD PTR 4[esp],ecx | ||
1683 | mov eax, DWORD PTR 8[esi] | ||
1684 | mov ecx, DWORD PTR 12[esi] | ||
1685 | mov DWORD PTR 8[esp],eax | ||
1686 | mov DWORD PTR 12[esp],ecx | ||
1687 | mov eax, DWORD PTR 16[esi] | ||
1688 | mov ecx, DWORD PTR 20[esi] | ||
1689 | mov DWORD PTR 16[esp],eax | ||
1690 | mov DWORD PTR 20[esp],ecx | ||
1691 | mov eax, DWORD PTR 24[esi] | ||
1692 | mov ecx, DWORD PTR 28[esi] | ||
1693 | mov DWORD PTR 24[esp],eax | ||
1694 | mov DWORD PTR 28[esp],ecx | ||
1695 | mov eax, DWORD PTR 32[esi] | ||
1696 | mov ecx, DWORD PTR 36[esi] | ||
1697 | mov DWORD PTR 32[esp],eax | ||
1698 | mov DWORD PTR 36[esp],ecx | ||
1699 | mov eax, DWORD PTR 40[esi] | ||
1700 | mov ecx, DWORD PTR 44[esi] | ||
1701 | mov DWORD PTR 40[esp],eax | ||
1702 | mov DWORD PTR 44[esp],ecx | ||
1703 | mov eax, DWORD PTR 48[esi] | ||
1704 | mov ecx, DWORD PTR 52[esi] | ||
1705 | mov DWORD PTR 48[esp],eax | ||
1706 | mov DWORD PTR 52[esp],ecx | ||
1707 | mov eax, DWORD PTR 56[esi] | ||
1708 | mov ecx, DWORD PTR 60[esi] | ||
1709 | mov DWORD PTR 56[esp],eax | ||
1710 | mov DWORD PTR 60[esp],ecx | ||
1711 | jmp L001shortcut | ||
1712 | _sha1_block_asm_host_order ENDP | ||
1713 | _TEXT ENDS | ||
1714 | _sha1_block_asm_data_order ENDP | ||
1715 | _TEXT ENDS | ||
1716 | END | ||
diff --git a/src/lib/libcrypto/sha/asm/sha1-586.pl b/src/lib/libcrypto/sha/asm/sha1-586.pl index 48d9192a4e..09df993ecd 100644 --- a/src/lib/libcrypto/sha/asm/sha1-586.pl +++ b/src/lib/libcrypto/sha/asm/sha1-586.pl | |||
@@ -392,7 +392,7 @@ sub sha1_block_data | |||
392 | &X_expand("esi"); | 392 | &X_expand("esi"); |
393 | &mov(&wparam(1),"esi"); | 393 | &mov(&wparam(1),"esi"); |
394 | 394 | ||
395 | &set_label("shortcut", 1); | 395 | &set_label("shortcut", 0, 1); |
396 | &comment(""); | 396 | &comment(""); |
397 | &comment("Start processing"); | 397 | &comment("Start processing"); |
398 | 398 | ||
diff --git a/src/lib/libcrypto/sha/sha_locl.h b/src/lib/libcrypto/sha/sha_locl.h index 3e6f489b87..2f8aef83f3 100644 --- a/src/lib/libcrypto/sha/sha_locl.h +++ b/src/lib/libcrypto/sha/sha_locl.h | |||
@@ -130,11 +130,7 @@ | |||
130 | # error "Either SHA_0 or SHA_1 must be defined." | 130 | # error "Either SHA_0 or SHA_1 must be defined." |
131 | #endif | 131 | #endif |
132 | 132 | ||
133 | #ifndef FLAT_INC | ||
134 | #include "../md32_common.h" | ||
135 | #else | ||
136 | #include "md32_common.h" | 133 | #include "md32_common.h" |
137 | #endif | ||
138 | 134 | ||
139 | #define INIT_DATA_h0 0x67452301UL | 135 | #define INIT_DATA_h0 0x67452301UL |
140 | #define INIT_DATA_h1 0xefcdab89UL | 136 | #define INIT_DATA_h1 0xefcdab89UL |
diff --git a/src/lib/libcrypto/util/libeay.num b/src/lib/libcrypto/util/libeay.num index e3818ef6e4..f611d6b283 100644 --- a/src/lib/libcrypto/util/libeay.num +++ b/src/lib/libcrypto/util/libeay.num | |||
@@ -2227,3 +2227,6 @@ BIO_callback_ctrl 2252 | |||
2227 | RAND_egd 2253 | 2227 | RAND_egd 2253 |
2228 | RAND_status 2254 | 2228 | RAND_status 2254 |
2229 | bn_dump1 2255 | 2229 | bn_dump1 2255 |
2230 | des_check_key_parity 2256 | ||
2231 | lh_num_items 2257 | ||
2232 | RAND_event 2258 | ||
diff --git a/src/lib/libcrypto/util/mk1mf.pl b/src/lib/libcrypto/util/mk1mf.pl index 6fbf3ceca6..100d76f279 100644 --- a/src/lib/libcrypto/util/mk1mf.pl +++ b/src/lib/libcrypto/util/mk1mf.pl | |||
@@ -8,6 +8,7 @@ | |||
8 | $INSTALLTOP="/usr/local/ssl"; | 8 | $INSTALLTOP="/usr/local/ssl"; |
9 | $OPTIONS=""; | 9 | $OPTIONS=""; |
10 | $ssl_version=""; | 10 | $ssl_version=""; |
11 | $banner="\t\@echo Building OpenSSL"; | ||
11 | 12 | ||
12 | open(IN,"<Makefile.ssl") || die "unable to open Makefile.ssl!\n"; | 13 | open(IN,"<Makefile.ssl") || die "unable to open Makefile.ssl!\n"; |
13 | while(<IN>) { | 14 | while(<IN>) { |
@@ -59,6 +60,7 @@ and [options] can be one of | |||
59 | just-ssl - remove all non-ssl keys/digest | 60 | just-ssl - remove all non-ssl keys/digest |
60 | no-asm - No x86 asm | 61 | no-asm - No x86 asm |
61 | nasm - Use NASM for x86 asm | 62 | nasm - Use NASM for x86 asm |
63 | gaswin - Use GNU as with Mingw32 | ||
62 | no-socks - No socket code | 64 | no-socks - No socket code |
63 | no-err - No error strings | 65 | no-err - No error strings |
64 | dll/shlib - Build shared libraries (MS) | 66 | dll/shlib - Build shared libraries (MS) |
@@ -850,6 +852,7 @@ sub read_options | |||
850 | elsif (/^no-hmac$/) { $no_hmac=1; } | 852 | elsif (/^no-hmac$/) { $no_hmac=1; } |
851 | elsif (/^no-asm$/) { $no_asm=1; } | 853 | elsif (/^no-asm$/) { $no_asm=1; } |
852 | elsif (/^nasm$/) { $nasm=1; } | 854 | elsif (/^nasm$/) { $nasm=1; } |
855 | elsif (/^gaswin$/) { $gaswin=1; } | ||
853 | elsif (/^no-ssl2$/) { $no_ssl2=1; } | 856 | elsif (/^no-ssl2$/) { $no_ssl2=1; } |
854 | elsif (/^no-ssl3$/) { $no_ssl3=1; } | 857 | elsif (/^no-ssl3$/) { $no_ssl3=1; } |
855 | elsif (/^no-err$/) { $no_err=1; } | 858 | elsif (/^no-err$/) { $no_err=1; } |
diff --git a/src/lib/libcrypto/util/mkerr.pl b/src/lib/libcrypto/util/mkerr.pl index ebc059ef22..8e18f3c2df 100644 --- a/src/lib/libcrypto/util/mkerr.pl +++ b/src/lib/libcrypto/util/mkerr.pl | |||
@@ -284,6 +284,17 @@ EOF | |||
284 | 284 | ||
285 | # Rewrite the C source file containing the error details. | 285 | # Rewrite the C source file containing the error details. |
286 | 286 | ||
287 | # First, read any existing reason string definitions: | ||
288 | my %err_reason_strings; | ||
289 | if (open(IN,"<$cfile")) { | ||
290 | while (<IN>) { | ||
291 | if (/\b(${lib}_R_\w*)\b.*\"(.*)\"/) { | ||
292 | $err_reason_strings{$1} = $2; | ||
293 | } | ||
294 | } | ||
295 | close(IN); | ||
296 | } | ||
297 | |||
287 | my $hincf; | 298 | my $hincf; |
288 | if($static) { | 299 | if($static) { |
289 | $hfile =~ /([^\/]+)$/; | 300 | $hfile =~ /([^\/]+)$/; |
@@ -352,7 +363,8 @@ EOF | |||
352 | */ | 363 | */ |
353 | 364 | ||
354 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | 365 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes |
355 | * made to it will be overwritten when the script next updates this file. | 366 | * made to it will be overwritten when the script next updates this file, |
367 | * only reason strings will be preserved. | ||
356 | */ | 368 | */ |
357 | 369 | ||
358 | #include <stdio.h> | 370 | #include <stdio.h> |
@@ -385,9 +397,13 @@ EOF | |||
385 | foreach $i (@reasons) { | 397 | foreach $i (@reasons) { |
386 | my $rn; | 398 | my $rn; |
387 | my $nspc = 0; | 399 | my $nspc = 0; |
388 | $i =~ /^${lib}_R_(\S+)$/; | 400 | if (exists $err_reason_strings{$i}) { |
389 | $rn = $1; | 401 | $rn = $err_reason_strings{$i}; |
390 | $rn =~ tr/_[A-Z]/ [a-z]/; | 402 | } else { |
403 | $i =~ /^${lib}_R_(\S+)$/; | ||
404 | $rn = $1; | ||
405 | $rn =~ tr/_[A-Z]/ [a-z]/; | ||
406 | } | ||
391 | $nspc = 40 - length($i) unless length($i) > 40; | 407 | $nspc = 40 - length($i) unless length($i) > 40; |
392 | $nspc = " " x $nspc; | 408 | $nspc = " " x $nspc; |
393 | print OUT "{${i}${nspc},\"$rn\"},\n"; | 409 | print OUT "{${i}${nspc},\"$rn\"},\n"; |
@@ -465,7 +481,7 @@ EOF | |||
465 | } | 481 | } |
466 | 482 | ||
467 | close OUT; | 483 | close OUT; |
468 | 484 | undef %err_reason_strings; | |
469 | } | 485 | } |
470 | 486 | ||
471 | if($debug && defined(%notrans)) { | 487 | if($debug && defined(%notrans)) { |
diff --git a/src/lib/libcrypto/util/pl/BC-32.pl b/src/lib/libcrypto/util/pl/BC-32.pl index df6e2c742e..7f57809a16 100644 --- a/src/lib/libcrypto/util/pl/BC-32.pl +++ b/src/lib/libcrypto/util/pl/BC-32.pl | |||
@@ -109,7 +109,7 @@ sub do_lib_rule | |||
109 | { | 109 | { |
110 | # $ret.="\t\$(RM) \$(O_$Name)\n"; | 110 | # $ret.="\t\$(RM) \$(O_$Name)\n"; |
111 | $ret.="\techo LIB $<\n"; | 111 | $ret.="\techo LIB $<\n"; |
112 | $ret.="\t\$(MKLIB) $lfile$target \$(addprefix +, $objs)\n"; | 112 | $ret.="\t&\$(MKLIB) $lfile$target -+\$**\n"; |
113 | } | 113 | } |
114 | else | 114 | else |
115 | { | 115 | { |
diff --git a/src/lib/libcrypto/util/pl/Mingw32.pl b/src/lib/libcrypto/util/pl/Mingw32.pl index 585cacd820..c687d9b118 100644 --- a/src/lib/libcrypto/util/pl/Mingw32.pl +++ b/src/lib/libcrypto/util/pl/Mingw32.pl | |||
@@ -21,6 +21,30 @@ if ($debug) | |||
21 | else | 21 | else |
22 | { $cflags="-DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall"; } | 22 | { $cflags="-DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall"; } |
23 | 23 | ||
24 | if ($gaswin and !$no_asm) | ||
25 | { | ||
26 | $bn_asm_obj='$(OBJ_D)/bn-win32.o'; | ||
27 | $bn_asm_src='crypto/bn/asm/bn-win32.s'; | ||
28 | $des_enc_obj='$(OBJ_D)/d-win32.o $(OBJ_D)/y-win32.o'; | ||
29 | $des_enc_src='crypto/des/asm/d-win32.s crypto/des/asm/y-win32.s'; | ||
30 | $bf_enc_obj='$(OBJ_D)/b-win32.o'; | ||
31 | $bf_enc_src='crypto/bf/asm/b-win32.s'; | ||
32 | # $cast_enc_obj='$(OBJ_D)/c-win32.o'; | ||
33 | # $cast_enc_src='crypto/cast/asm/c-win32.s'; | ||
34 | $rc4_enc_obj='$(OBJ_D)/r4-win32.o'; | ||
35 | $rc4_enc_src='crypto/rc4/asm/r4-win32.s'; | ||
36 | $rc5_enc_obj='$(OBJ_D)/r5-win32.o'; | ||
37 | $rc5_enc_src='crypto/rc5/asm/r5-win32.s'; | ||
38 | $md5_asm_obj='$(OBJ_D)/m5-win32.o'; | ||
39 | $md5_asm_src='crypto/md5/asm/m5-win32.s'; | ||
40 | $rmd160_asm_obj='$(OBJ_D)/rm-win32.o'; | ||
41 | $rmd160_asm_src='crypto/ripemd/asm/rm-win32.s'; | ||
42 | $sha1_asm_obj='$(OBJ_D)/s1-win32.o'; | ||
43 | $sha1_asm_src='crypto/sha/asm/s1-win32.s'; | ||
44 | $cflags.=" -DBN_ASM -DMD5_ASM -DSHA1_ASM"; | ||
45 | } | ||
46 | |||
47 | |||
24 | $obj='.o'; | 48 | $obj='.o'; |
25 | $ofile='-o '; | 49 | $ofile='-o '; |
26 | 50 | ||
@@ -76,4 +100,3 @@ sub do_link_rule | |||
76 | return($ret); | 100 | return($ret); |
77 | } | 101 | } |
78 | 1; | 102 | 1; |
79 | |||
diff --git a/src/lib/libcrypto/util/selftest.pl b/src/lib/libcrypto/util/selftest.pl index 91e962a312..04b4425d7e 100644 --- a/src/lib/libcrypto/util/selftest.pl +++ b/src/lib/libcrypto/util/selftest.pl | |||
@@ -25,7 +25,7 @@ open(OUT,">$report") or die; | |||
25 | print OUT "OpenSSL self-test report:\n\n"; | 25 | print OUT "OpenSSL self-test report:\n\n"; |
26 | 26 | ||
27 | $uname=`uname -a`; | 27 | $uname=`uname -a`; |
28 | $uname="??" if $uname eq ""; | 28 | $uname="??\n" if $uname eq ""; |
29 | 29 | ||
30 | $c=`sh config -t`; | 30 | $c=`sh config -t`; |
31 | foreach $_ (split("\n",$c)) { | 31 | foreach $_ (split("\n",$c)) { |
@@ -83,6 +83,11 @@ if (open(TEST,">cctest.c")) { | |||
83 | print OUT "Compiler doesn't work.\n"; | 83 | print OUT "Compiler doesn't work.\n"; |
84 | goto err; | 84 | goto err; |
85 | } | 85 | } |
86 | system("ar r cctest.a /dev/null"); | ||
87 | if (not -f "cctest.a") { | ||
88 | print OUT "Check your archive tool (ar).\n"; | ||
89 | goto err; | ||
90 | } | ||
86 | } else { | 91 | } else { |
87 | print OUT "Can't create cctest.c\n"; | 92 | print OUT "Can't create cctest.c\n"; |
88 | } | 93 | } |
@@ -129,14 +134,14 @@ if (/no-/) | |||
129 | } | 134 | } |
130 | 135 | ||
131 | print "Running make test...\n"; | 136 | print "Running make test...\n"; |
132 | if (system("make test 2>&1 | tee make.log") > 255) | 137 | if (system("make test 2>&1 | tee maketest.log") > 255) |
133 | { | 138 | { |
134 | print OUT "make test failed!\n"; | 139 | print OUT "make test failed!\n"; |
135 | } else { | 140 | } else { |
136 | $ok=1; | 141 | $ok=1; |
137 | } | 142 | } |
138 | 143 | ||
139 | if ($ok and open(IN,"<make.log")) { | 144 | if ($ok and open(IN,"<maketest.log")) { |
140 | while (<IN>) { | 145 | while (<IN>) { |
141 | $ok=2 if /^platform: $platform/; | 146 | $ok=2 if /^platform: $platform/; |
142 | } | 147 | } |
@@ -155,6 +160,15 @@ if ($ok != 2) { | |||
155 | } else { | 160 | } else { |
156 | print OUT "make.log not found!\n"; | 161 | print OUT "make.log not found!\n"; |
157 | } | 162 | } |
163 | if (open(IN,"<maketest.log")) { | ||
164 | while (<IN>) { | ||
165 | print OUT; | ||
166 | } | ||
167 | close(IN); | ||
168 | print OUT $sep; | ||
169 | } else { | ||
170 | print OUT "maketest.log not found!\n"; | ||
171 | } | ||
158 | } else { | 172 | } else { |
159 | print OUT "Test passed.\n"; | 173 | print OUT "Test passed.\n"; |
160 | } | 174 | } |
diff --git a/src/lib/libcrypto/util/sep_lib.sh b/src/lib/libcrypto/util/sep_lib.sh index 34c2c9f8ba..e69de29bb2 100644 --- a/src/lib/libcrypto/util/sep_lib.sh +++ b/src/lib/libcrypto/util/sep_lib.sh | |||
@@ -1,34 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | cwd=`pwd` | ||
4 | /bin/rm -fr tmp/* | ||
5 | |||
6 | cd crypto/des | ||
7 | make -f Makefile.uni tar | ||
8 | make -f Makefile.uni tar_lit | ||
9 | /bin/mv libdes.tgz $cwd/tmp | ||
10 | /bin/mv libdes-l.tgz $cwd/tmp | ||
11 | cd $cwd | ||
12 | |||
13 | for name in md5 sha cast bf idea rc4 rc2 | ||
14 | do | ||
15 | echo doing $name | ||
16 | (cd crypto; tar cfh - $name)|(cd tmp; tar xf -) | ||
17 | cd tmp/$name | ||
18 | /bin/rm -f Makefile | ||
19 | /bin/rm -f Makefile.ssl | ||
20 | /bin/rm -f Makefile.ssl.orig | ||
21 | /bin/rm -f *.old | ||
22 | /bin/mv Makefile.uni Makefile | ||
23 | |||
24 | if [ -d asm ]; then | ||
25 | mkdir asm/perlasm | ||
26 | cp $cwd/crypto/perlasm/*.pl asm/perlasm | ||
27 | fi | ||
28 | cd .. | ||
29 | tar cf - $name|gzip >$name.tgz | ||
30 | # /bin/rm -fr $name | ||
31 | cd $cwd | ||
32 | done | ||
33 | |||
34 | |||
diff --git a/src/lib/libcrypto/x509/x509.h b/src/lib/libcrypto/x509/x509.h index d3336d9ceb..0192272e7c 100644 --- a/src/lib/libcrypto/x509/x509.h +++ b/src/lib/libcrypto/x509/x509.h | |||
@@ -284,7 +284,9 @@ DECLARE_STACK_OF(X509_TRUST) | |||
284 | 284 | ||
285 | /* standard trust ids */ | 285 | /* standard trust ids */ |
286 | 286 | ||
287 | #define X509_TRUST_ANY 1 | 287 | #define X509_TRUST_DEFAULT -1 /* Only valid in purpose settings */ |
288 | |||
289 | #define X509_TRUST_COMPAT 1 | ||
288 | #define X509_TRUST_SSL_CLIENT 2 | 290 | #define X509_TRUST_SSL_CLIENT 2 |
289 | #define X509_TRUST_SSL_SERVER 3 | 291 | #define X509_TRUST_SSL_SERVER 3 |
290 | #define X509_TRUST_EMAIL 4 | 292 | #define X509_TRUST_EMAIL 4 |
diff --git a/src/lib/libcrypto/x509/x509_err.c b/src/lib/libcrypto/x509/x509_err.c index fdedbdac34..848add56e9 100644 --- a/src/lib/libcrypto/x509/x509_err.c +++ b/src/lib/libcrypto/x509/x509_err.c | |||
@@ -54,7 +54,8 @@ | |||
54 | */ | 54 | */ |
55 | 55 | ||
56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes |
57 | * made to it will be overwritten when the script next updates this file. | 57 | * made to it will be overwritten when the script next updates this file, |
58 | * only reason strings will be preserved. | ||
58 | */ | 59 | */ |
59 | 60 | ||
60 | #include <stdio.h> | 61 | #include <stdio.h> |
diff --git a/src/lib/libcrypto/x509/x509_trs.c b/src/lib/libcrypto/x509/x509_trs.c index 9f7d67952d..c779aaf94d 100644 --- a/src/lib/libcrypto/x509/x509_trs.c +++ b/src/lib/libcrypto/x509/x509_trs.c | |||
@@ -65,7 +65,7 @@ static int tr_cmp(X509_TRUST **a, X509_TRUST **b); | |||
65 | static void trtable_free(X509_TRUST *p); | 65 | static void trtable_free(X509_TRUST *p); |
66 | 66 | ||
67 | static int trust_1oidany(X509_TRUST *trust, X509 *x, int flags); | 67 | static int trust_1oidany(X509_TRUST *trust, X509 *x, int flags); |
68 | static int trust_any(X509_TRUST *trust, X509 *x, int flags); | 68 | static int trust_compat(X509_TRUST *trust, X509 *x, int flags); |
69 | 69 | ||
70 | static int obj_trust(int id, X509 *x, int flags); | 70 | static int obj_trust(int id, X509 *x, int flags); |
71 | static int (*default_trust)(int id, X509 *x, int flags) = obj_trust; | 71 | static int (*default_trust)(int id, X509 *x, int flags) = obj_trust; |
@@ -76,7 +76,7 @@ static int (*default_trust)(int id, X509 *x, int flags) = obj_trust; | |||
76 | */ | 76 | */ |
77 | 77 | ||
78 | static X509_TRUST trstandard[] = { | 78 | static X509_TRUST trstandard[] = { |
79 | {X509_TRUST_ANY, 0, trust_any, "Any", 0, NULL}, | 79 | {X509_TRUST_COMPAT, 0, trust_compat, "compatible", 0, NULL}, |
80 | {X509_TRUST_SSL_CLIENT, 0, trust_1oidany, "SSL Client", NID_client_auth, NULL}, | 80 | {X509_TRUST_SSL_CLIENT, 0, trust_1oidany, "SSL Client", NID_client_auth, NULL}, |
81 | {X509_TRUST_SSL_SERVER, 0, trust_1oidany, "SSL Client", NID_server_auth, NULL}, | 81 | {X509_TRUST_SSL_SERVER, 0, trust_1oidany, "SSL Client", NID_server_auth, NULL}, |
82 | {X509_TRUST_EMAIL, 0, trust_1oidany, "S/MIME email", NID_email_protect, NULL}, | 82 | {X509_TRUST_EMAIL, 0, trust_1oidany, "S/MIME email", NID_email_protect, NULL}, |
@@ -107,8 +107,8 @@ int X509_check_trust(X509 *x, int id, int flags) | |||
107 | X509_TRUST *pt; | 107 | X509_TRUST *pt; |
108 | int idx; | 108 | int idx; |
109 | if(id == -1) return 1; | 109 | if(id == -1) return 1; |
110 | if(!(idx = X509_TRUST_get_by_id(id))) | 110 | idx = X509_TRUST_get_by_id(id); |
111 | return default_trust(id, x, flags); | 111 | if(idx == -1) return default_trust(id, x, flags); |
112 | pt = X509_TRUST_get0(idx); | 112 | pt = X509_TRUST_get0(idx); |
113 | return pt->check_trust(pt, x, flags); | 113 | return pt->check_trust(pt, x, flags); |
114 | } | 114 | } |
@@ -230,6 +230,11 @@ static int trust_1oidany(X509_TRUST *trust, X509 *x, int flags) | |||
230 | /* we don't have any trust settings: for compatibility | 230 | /* we don't have any trust settings: for compatibility |
231 | * we return trusted if it is self signed | 231 | * we return trusted if it is self signed |
232 | */ | 232 | */ |
233 | return trust_compat(trust, x, flags); | ||
234 | } | ||
235 | |||
236 | static int trust_compat(X509_TRUST *trust, X509 *x, int flags) | ||
237 | { | ||
233 | X509_check_purpose(x, -1, 0); | 238 | X509_check_purpose(x, -1, 0); |
234 | if(x->ex_flags & EXFLAG_SS) return X509_TRUST_TRUSTED; | 239 | if(x->ex_flags & EXFLAG_SS) return X509_TRUST_TRUSTED; |
235 | else return X509_TRUST_UNTRUSTED; | 240 | else return X509_TRUST_UNTRUSTED; |
@@ -257,7 +262,3 @@ static int obj_trust(int id, X509 *x, int flags) | |||
257 | return X509_TRUST_UNTRUSTED; | 262 | return X509_TRUST_UNTRUSTED; |
258 | } | 263 | } |
259 | 264 | ||
260 | static int trust_any(X509_TRUST *trust, X509 *x, int flags) | ||
261 | { | ||
262 | return X509_TRUST_TRUSTED; | ||
263 | } | ||
diff --git a/src/lib/libcrypto/x509/x509_vfy.c b/src/lib/libcrypto/x509/x509_vfy.c index 4fdff54124..3ddb2303d3 100644 --- a/src/lib/libcrypto/x509/x509_vfy.c +++ b/src/lib/libcrypto/x509/x509_vfy.c | |||
@@ -436,11 +436,14 @@ static int internal_verify(X509_STORE_CTX *ctx) | |||
436 | } | 436 | } |
437 | if (X509_verify(xs,pkey) <= 0) | 437 | if (X509_verify(xs,pkey) <= 0) |
438 | { | 438 | { |
439 | EVP_PKEY_free(pkey); | ||
440 | ctx->error=X509_V_ERR_CERT_SIGNATURE_FAILURE; | 439 | ctx->error=X509_V_ERR_CERT_SIGNATURE_FAILURE; |
441 | ctx->current_cert=xs; | 440 | ctx->current_cert=xs; |
442 | ok=(*cb)(0,ctx); | 441 | ok=(*cb)(0,ctx); |
443 | if (!ok) goto end; | 442 | if (!ok) |
443 | { | ||
444 | EVP_PKEY_free(pkey); | ||
445 | goto end; | ||
446 | } | ||
444 | } | 447 | } |
445 | EVP_PKEY_free(pkey); | 448 | EVP_PKEY_free(pkey); |
446 | pkey=NULL; | 449 | pkey=NULL; |
@@ -768,18 +771,25 @@ int X509_STORE_CTX_purpose_inherit(X509_STORE_CTX *ctx, int def_purpose, | |||
768 | if(!purpose) purpose = def_purpose; | 771 | if(!purpose) purpose = def_purpose; |
769 | /* If we have a purpose then check it is valid */ | 772 | /* If we have a purpose then check it is valid */ |
770 | if(purpose) { | 773 | if(purpose) { |
774 | X509_PURPOSE *ptmp; | ||
771 | idx = X509_PURPOSE_get_by_id(purpose); | 775 | idx = X509_PURPOSE_get_by_id(purpose); |
772 | if(idx == -1) { | 776 | if(idx == -1) { |
773 | X509err(X509_F_X509_STORE_CTX_PURPOSE_INHERIT, | 777 | X509err(X509_F_X509_STORE_CTX_PURPOSE_INHERIT, |
774 | X509_R_UNKNOWN_PURPOSE_ID); | 778 | X509_R_UNKNOWN_PURPOSE_ID); |
775 | return 0; | 779 | return 0; |
776 | } | 780 | } |
777 | /* If trust not set then get from purpose default */ | 781 | ptmp = X509_PURPOSE_get0(idx); |
778 | if(!trust) { | 782 | if(ptmp->trust == X509_TRUST_DEFAULT) { |
779 | X509_PURPOSE *ptmp; | 783 | idx = X509_PURPOSE_get_by_id(def_purpose); |
784 | if(idx == -1) { | ||
785 | X509err(X509_F_X509_STORE_CTX_PURPOSE_INHERIT, | ||
786 | X509_R_UNKNOWN_PURPOSE_ID); | ||
787 | return 0; | ||
788 | } | ||
780 | ptmp = X509_PURPOSE_get0(idx); | 789 | ptmp = X509_PURPOSE_get0(idx); |
781 | trust = ptmp->trust; | ||
782 | } | 790 | } |
791 | /* If trust not set then get from purpose default */ | ||
792 | if(!trust) trust = ptmp->trust; | ||
783 | } | 793 | } |
784 | if(trust) { | 794 | if(trust) { |
785 | idx = X509_TRUST_get_by_id(trust); | 795 | idx = X509_TRUST_get_by_id(trust); |
diff --git a/src/lib/libcrypto/x509/x509name.c b/src/lib/libcrypto/x509/x509name.c index cf2382d42c..4c20e03ece 100644 --- a/src/lib/libcrypto/x509/x509name.c +++ b/src/lib/libcrypto/x509/x509name.c | |||
@@ -352,7 +352,7 @@ int X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *ne, int type, | |||
352 | int i; | 352 | int i; |
353 | 353 | ||
354 | if ((ne == NULL) || ((bytes == NULL) && (len != 0))) return(0); | 354 | if ((ne == NULL) || ((bytes == NULL) && (len != 0))) return(0); |
355 | if(type & MBSTRING_FLAG) | 355 | if((type > 0) && (type & MBSTRING_FLAG)) |
356 | return ASN1_STRING_set_by_NID(&ne->value, bytes, | 356 | return ASN1_STRING_set_by_NID(&ne->value, bytes, |
357 | len, type, | 357 | len, type, |
358 | OBJ_obj2nid(ne->object)) ? 1 : 0; | 358 | OBJ_obj2nid(ne->object)) ? 1 : 0; |
diff --git a/src/lib/libcrypto/x509v3/v3_purp.c b/src/lib/libcrypto/x509v3/v3_purp.c index b7494ebcd5..5594a1d64f 100644 --- a/src/lib/libcrypto/x509v3/v3_purp.c +++ b/src/lib/libcrypto/x509v3/v3_purp.c | |||
@@ -71,6 +71,7 @@ static int purpose_smime(X509 *x, int ca); | |||
71 | static int check_purpose_smime_sign(X509_PURPOSE *xp, X509 *x, int ca); | 71 | static int check_purpose_smime_sign(X509_PURPOSE *xp, X509 *x, int ca); |
72 | static int check_purpose_smime_encrypt(X509_PURPOSE *xp, X509 *x, int ca); | 72 | static int check_purpose_smime_encrypt(X509_PURPOSE *xp, X509 *x, int ca); |
73 | static int check_purpose_crl_sign(X509_PURPOSE *xp, X509 *x, int ca); | 73 | static int check_purpose_crl_sign(X509_PURPOSE *xp, X509 *x, int ca); |
74 | static int no_check(X509_PURPOSE *xp, X509 *x, int ca); | ||
74 | 75 | ||
75 | static int xp_cmp(X509_PURPOSE **a, X509_PURPOSE **b); | 76 | static int xp_cmp(X509_PURPOSE **a, X509_PURPOSE **b); |
76 | static void xptable_free(X509_PURPOSE *p); | 77 | static void xptable_free(X509_PURPOSE *p); |
@@ -81,7 +82,8 @@ static X509_PURPOSE xstandard[] = { | |||
81 | {X509_PURPOSE_NS_SSL_SERVER, X509_TRUST_SSL_SERVER, 0, check_purpose_ns_ssl_server, "Netscape SSL server", "nssslserver", NULL}, | 82 | {X509_PURPOSE_NS_SSL_SERVER, X509_TRUST_SSL_SERVER, 0, check_purpose_ns_ssl_server, "Netscape SSL server", "nssslserver", NULL}, |
82 | {X509_PURPOSE_SMIME_SIGN, X509_TRUST_EMAIL, 0, check_purpose_smime_sign, "S/MIME signing", "smimesign", NULL}, | 83 | {X509_PURPOSE_SMIME_SIGN, X509_TRUST_EMAIL, 0, check_purpose_smime_sign, "S/MIME signing", "smimesign", NULL}, |
83 | {X509_PURPOSE_SMIME_ENCRYPT, X509_TRUST_EMAIL, 0, check_purpose_smime_encrypt, "S/MIME encryption", "smimeencrypt", NULL}, | 84 | {X509_PURPOSE_SMIME_ENCRYPT, X509_TRUST_EMAIL, 0, check_purpose_smime_encrypt, "S/MIME encryption", "smimeencrypt", NULL}, |
84 | {X509_PURPOSE_CRL_SIGN, X509_TRUST_ANY, 0, check_purpose_crl_sign, "CRL signing", "crlsign", NULL}, | 85 | {X509_PURPOSE_CRL_SIGN, X509_TRUST_COMPAT, 0, check_purpose_crl_sign, "CRL signing", "crlsign", NULL}, |
86 | {X509_PURPOSE_ANY, X509_TRUST_DEFAULT, 0, no_check, "Any Purpose", "any", NULL}, | ||
85 | }; | 87 | }; |
86 | 88 | ||
87 | #define X509_PURPOSE_COUNT (sizeof(xstandard)/sizeof(X509_PURPOSE)) | 89 | #define X509_PURPOSE_COUNT (sizeof(xstandard)/sizeof(X509_PURPOSE)) |
@@ -454,3 +456,8 @@ static int check_purpose_crl_sign(X509_PURPOSE *xp, X509 *x, int ca) | |||
454 | if(ku_reject(x, KU_CRL_SIGN)) return 0; | 456 | if(ku_reject(x, KU_CRL_SIGN)) return 0; |
455 | return 1; | 457 | return 1; |
456 | } | 458 | } |
459 | |||
460 | static int no_check(X509_PURPOSE *xp, X509 *x, int ca) | ||
461 | { | ||
462 | return 1; | ||
463 | } | ||
diff --git a/src/lib/libcrypto/x509v3/v3err.c b/src/lib/libcrypto/x509v3/v3err.c index b7d4e350c4..aa4a605dc4 100644 --- a/src/lib/libcrypto/x509v3/v3err.c +++ b/src/lib/libcrypto/x509v3/v3err.c | |||
@@ -54,7 +54,8 @@ | |||
54 | */ | 54 | */ |
55 | 55 | ||
56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes |
57 | * made to it will be overwritten when the script next updates this file. | 57 | * made to it will be overwritten when the script next updates this file, |
58 | * only reason strings will be preserved. | ||
58 | */ | 59 | */ |
59 | 60 | ||
60 | #include <stdio.h> | 61 | #include <stdio.h> |
diff --git a/src/lib/libcrypto/x509v3/x509v3.h b/src/lib/libcrypto/x509v3/x509v3.h index fe01755797..96ceb7c4fb 100644 --- a/src/lib/libcrypto/x509v3/x509v3.h +++ b/src/lib/libcrypto/x509v3/x509v3.h | |||
@@ -179,8 +179,8 @@ union { | |||
179 | } GENERAL_NAME; | 179 | } GENERAL_NAME; |
180 | 180 | ||
181 | typedef struct ACCESS_DESCRIPTION_st { | 181 | typedef struct ACCESS_DESCRIPTION_st { |
182 | ASN1_OBJECT *method; | 182 | ASN1_OBJECT *method; |
183 | GENERAL_NAME *location; | 183 | GENERAL_NAME *location; |
184 | } ACCESS_DESCRIPTION; | 184 | } ACCESS_DESCRIPTION; |
185 | 185 | ||
186 | DECLARE_STACK_OF(GENERAL_NAME) | 186 | DECLARE_STACK_OF(GENERAL_NAME) |
@@ -344,9 +344,10 @@ typedef struct x509_purpose_st { | |||
344 | #define X509_PURPOSE_SMIME_SIGN 4 | 344 | #define X509_PURPOSE_SMIME_SIGN 4 |
345 | #define X509_PURPOSE_SMIME_ENCRYPT 5 | 345 | #define X509_PURPOSE_SMIME_ENCRYPT 5 |
346 | #define X509_PURPOSE_CRL_SIGN 6 | 346 | #define X509_PURPOSE_CRL_SIGN 6 |
347 | #define X509_PURPOSE_ANY 7 | ||
347 | 348 | ||
348 | #define X509_PURPOSE_MIN 1 | 349 | #define X509_PURPOSE_MIN 1 |
349 | #define X509_PURPOSE_MAX 6 | 350 | #define X509_PURPOSE_MAX 7 |
350 | 351 | ||
351 | DECLARE_STACK_OF(X509_PURPOSE) | 352 | DECLARE_STACK_OF(X509_PURPOSE) |
352 | 353 | ||
diff --git a/src/lib/libssl/s3_clnt.c b/src/lib/libssl/s3_clnt.c index 279d2c0198..0c8f551f73 100644 --- a/src/lib/libssl/s3_clnt.c +++ b/src/lib/libssl/s3_clnt.c | |||
@@ -772,6 +772,8 @@ static int ssl3_get_server_certificate(SSL *s) | |||
772 | s->session->sess_cert=sc; | 772 | s->session->sess_cert=sc; |
773 | 773 | ||
774 | sc->cert_chain=sk; | 774 | sc->cert_chain=sk; |
775 | /* Inconsistency alert: cert_chain does include the peer's | ||
776 | * certificate, which we don't include in s3_srvr.c */ | ||
775 | x=sk_X509_value(sk,0); | 777 | x=sk_X509_value(sk,0); |
776 | sk=NULL; | 778 | sk=NULL; |
777 | 779 | ||
diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c index c4b49aaedf..7ada26cbb6 100644 --- a/src/lib/libssl/s3_lib.c +++ b/src/lib/libssl/s3_lib.c | |||
@@ -771,14 +771,16 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, char *parg) | |||
771 | case SSL_CTRL_SET_TMP_RSA: | 771 | case SSL_CTRL_SET_TMP_RSA: |
772 | { | 772 | { |
773 | RSA *rsa = (RSA *)parg; | 773 | RSA *rsa = (RSA *)parg; |
774 | if (rsa == NULL) { | 774 | if (rsa == NULL) |
775 | { | ||
775 | SSLerr(SSL_F_SSL3_CTRL, ERR_R_PASSED_NULL_PARAMETER); | 776 | SSLerr(SSL_F_SSL3_CTRL, ERR_R_PASSED_NULL_PARAMETER); |
776 | return(ret); | 777 | return(ret); |
777 | } | 778 | } |
778 | if ((rsa = RSAPrivateKey_dup(rsa)) == NULL) { | 779 | if ((rsa = RSAPrivateKey_dup(rsa)) == NULL) |
780 | { | ||
779 | SSLerr(SSL_F_SSL3_CTRL, ERR_R_RSA_LIB); | 781 | SSLerr(SSL_F_SSL3_CTRL, ERR_R_RSA_LIB); |
780 | return(ret); | 782 | return(ret); |
781 | } | 783 | } |
782 | if (s->cert->rsa_tmp != NULL) | 784 | if (s->cert->rsa_tmp != NULL) |
783 | RSA_free(s->cert->rsa_tmp); | 785 | RSA_free(s->cert->rsa_tmp); |
784 | s->cert->rsa_tmp = rsa; | 786 | s->cert->rsa_tmp = rsa; |
@@ -796,19 +798,25 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, char *parg) | |||
796 | case SSL_CTRL_SET_TMP_DH: | 798 | case SSL_CTRL_SET_TMP_DH: |
797 | { | 799 | { |
798 | DH *dh = (DH *)parg; | 800 | DH *dh = (DH *)parg; |
799 | if (dh == NULL) { | 801 | if (dh == NULL) |
802 | { | ||
800 | SSLerr(SSL_F_SSL3_CTRL, ERR_R_PASSED_NULL_PARAMETER); | 803 | SSLerr(SSL_F_SSL3_CTRL, ERR_R_PASSED_NULL_PARAMETER); |
801 | return(ret); | 804 | return(ret); |
802 | } | 805 | } |
803 | if ((dh = DHparams_dup(dh)) == NULL) { | 806 | if ((dh = DHparams_dup(dh)) == NULL) |
804 | SSLerr(SSL_F_SSL3_CTRL, ERR_R_DH_LIB); | 807 | { |
805 | return(ret); | ||
806 | } | ||
807 | if (!DH_generate_key(dh)) { | ||
808 | DH_free(dh); | ||
809 | SSLerr(SSL_F_SSL3_CTRL, ERR_R_DH_LIB); | 808 | SSLerr(SSL_F_SSL3_CTRL, ERR_R_DH_LIB); |
810 | return(ret); | 809 | return(ret); |
811 | } | 810 | } |
811 | if (!(s->options & SSL_OP_SINGLE_DH_USE)) | ||
812 | { | ||
813 | if (!DH_generate_key(dh)) | ||
814 | { | ||
815 | DH_free(dh); | ||
816 | SSLerr(SSL_F_SSL3_CTRL, ERR_R_DH_LIB); | ||
817 | return(ret); | ||
818 | } | ||
819 | } | ||
812 | if (s->cert->dh_tmp != NULL) | 820 | if (s->cert->dh_tmp != NULL) |
813 | DH_free(s->cert->dh_tmp); | 821 | DH_free(s->cert->dh_tmp); |
814 | s->cert->dh_tmp = dh; | 822 | s->cert->dh_tmp = dh; |
@@ -843,8 +851,8 @@ long ssl3_callback_ctrl(SSL *s, int cmd, void (*fp)()) | |||
843 | 0) | 851 | 0) |
844 | { | 852 | { |
845 | if (!ssl_cert_inst(&s->cert)) | 853 | if (!ssl_cert_inst(&s->cert)) |
846 | { | 854 | { |
847 | SSLerr(SSL_F_SSL3_CTRL, ERR_R_MALLOC_FAILURE); | 855 | SSLerr(SSL_F_SSL3_CALLBACK_CTRL, ERR_R_MALLOC_FAILURE); |
848 | return(0); | 856 | return(0); |
849 | } | 857 | } |
850 | } | 858 | } |
@@ -929,23 +937,26 @@ long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, char *parg) | |||
929 | case SSL_CTRL_SET_TMP_DH: | 937 | case SSL_CTRL_SET_TMP_DH: |
930 | { | 938 | { |
931 | DH *new=NULL,*dh; | 939 | DH *new=NULL,*dh; |
932 | int rret=0; | ||
933 | 940 | ||
934 | dh=(DH *)parg; | 941 | dh=(DH *)parg; |
935 | if ( ((new=DHparams_dup(dh)) == NULL) || | 942 | if ((new=DHparams_dup(dh)) == NULL) |
936 | (!DH_generate_key(new))) | ||
937 | { | 943 | { |
938 | SSLerr(SSL_F_SSL3_CTX_CTRL,ERR_R_DH_LIB); | 944 | SSLerr(SSL_F_SSL3_CTX_CTRL,ERR_R_DH_LIB); |
939 | if (new != NULL) DH_free(new); | 945 | return 0; |
940 | } | 946 | } |
941 | else | 947 | if (!(ctx->options & SSL_OP_SINGLE_DH_USE)) |
942 | { | 948 | { |
943 | if (cert->dh_tmp != NULL) | 949 | if (!DH_generate_key(new)) |
944 | DH_free(cert->dh_tmp); | 950 | { |
945 | cert->dh_tmp=new; | 951 | SSLerr(SSL_F_SSL3_CTX_CTRL,ERR_R_DH_LIB); |
946 | rret=1; | 952 | DH_free(new); |
953 | return 0; | ||
954 | } | ||
947 | } | 955 | } |
948 | return(rret); | 956 | if (cert->dh_tmp != NULL) |
957 | DH_free(cert->dh_tmp); | ||
958 | cert->dh_tmp=new; | ||
959 | return 1; | ||
949 | } | 960 | } |
950 | /*break; */ | 961 | /*break; */ |
951 | case SSL_CTRL_SET_TMP_DH_CB: | 962 | case SSL_CTRL_SET_TMP_DH_CB: |
diff --git a/src/lib/libssl/s3_srvr.c b/src/lib/libssl/s3_srvr.c index 90806e2d99..e23ca20bd3 100644 --- a/src/lib/libssl/s3_srvr.c +++ b/src/lib/libssl/s3_srvr.c | |||
@@ -1698,6 +1698,8 @@ static int ssl3_get_client_certificate(SSL *s) | |||
1698 | if (s->session->sess_cert->cert_chain != NULL) | 1698 | if (s->session->sess_cert->cert_chain != NULL) |
1699 | sk_X509_pop_free(s->session->sess_cert->cert_chain, X509_free); | 1699 | sk_X509_pop_free(s->session->sess_cert->cert_chain, X509_free); |
1700 | s->session->sess_cert->cert_chain=sk; | 1700 | s->session->sess_cert->cert_chain=sk; |
1701 | /* Inconsistency alert: cert_chain does *not* include the | ||
1702 | * peer's own certificate, while we do include it in s3_clnt.c */ | ||
1701 | 1703 | ||
1702 | sk=NULL; | 1704 | sk=NULL; |
1703 | 1705 | ||
diff --git a/src/lib/libssl/src/MacOS/GetHTTPS.src/GetHTTPS.cpp b/src/lib/libssl/src/MacOS/GetHTTPS.src/GetHTTPS.cpp index ed8e1cc962..d62dc50473 100644 --- a/src/lib/libssl/src/MacOS/GetHTTPS.src/GetHTTPS.cpp +++ b/src/lib/libssl/src/MacOS/GetHTTPS.src/GetHTTPS.cpp | |||
@@ -19,6 +19,7 @@ | |||
19 | * are installed! Use the AppleScript applet in the "openssl-0.9.4" folder to do this! | 19 | * are installed! Use the AppleScript applet in the "openssl-0.9.4" folder to do this! |
20 | */ | 20 | */ |
21 | /* modified to seed the PRNG */ | 21 | /* modified to seed the PRNG */ |
22 | /* modified to use CRandomizer for seeding */ | ||
22 | 23 | ||
23 | 24 | ||
24 | // Include some funky libs I've developed over time | 25 | // Include some funky libs I've developed over time |
@@ -26,14 +27,13 @@ | |||
26 | #include "CPStringUtils.hpp" | 27 | #include "CPStringUtils.hpp" |
27 | #include "ErrorHandling.hpp" | 28 | #include "ErrorHandling.hpp" |
28 | #include "MacSocket.h" | 29 | #include "MacSocket.h" |
29 | 30 | #include "Randomizer.h" | |
30 | 31 | ||
31 | // We use the OpenSSL implementation of SSL.... | 32 | // We use the OpenSSL implementation of SSL.... |
32 | // This was a lot of work to finally get going, though you wouldn't know it by the results! | 33 | // This was a lot of work to finally get going, though you wouldn't know it by the results! |
33 | 34 | ||
34 | #include <openssl/ssl.h> | 35 | #include <openssl/ssl.h> |
35 | #include <openssl/err.h> | 36 | #include <openssl/err.h> |
36 | #include <openssl/rand.h> | ||
37 | 37 | ||
38 | #include <timer.h> | 38 | #include <timer.h> |
39 | 39 | ||
@@ -48,10 +48,6 @@ | |||
48 | 48 | ||
49 | OSErr MyMacSocket_IdleWaitCallback(void *inUserRefPtr); | 49 | OSErr MyMacSocket_IdleWaitCallback(void *inUserRefPtr); |
50 | 50 | ||
51 | |||
52 | |||
53 | |||
54 | |||
55 | // My idle-wait callback. Doesn't do much, does it? Silly cooperative multitasking. | 51 | // My idle-wait callback. Doesn't do much, does it? Silly cooperative multitasking. |
56 | 52 | ||
57 | OSErr MyMacSocket_IdleWaitCallback(void *inUserRefPtr) | 53 | OSErr MyMacSocket_IdleWaitCallback(void *inUserRefPtr) |
@@ -59,31 +55,33 @@ OSErr MyMacSocket_IdleWaitCallback(void *inUserRefPtr) | |||
59 | #pragma unused(inUserRefPtr) | 55 | #pragma unused(inUserRefPtr) |
60 | 56 | ||
61 | EventRecord theEvent; | 57 | EventRecord theEvent; |
62 | |||
63 | ::EventAvail(everyEvent,&theEvent); | 58 | ::EventAvail(everyEvent,&theEvent); |
59 | |||
60 | CRandomizer *randomizer = (CRandomizer*)inUserRefPtr; | ||
61 | if (randomizer) | ||
62 | randomizer->PeriodicAction(); | ||
64 | 63 | ||
65 | return(noErr); | 64 | return(noErr); |
66 | } | 65 | } |
67 | 66 | ||
68 | 67 | ||
69 | |||
70 | // Finally! | 68 | // Finally! |
71 | 69 | ||
72 | void main(void) | 70 | void main(void) |
73 | { | 71 | { |
74 | OSErr errCode; | 72 | OSErr errCode; |
75 | int theSocket = -1; | 73 | int theSocket = -1; |
76 | int theTimeout = 30; | 74 | int theTimeout = 30; |
77 | 75 | ||
78 | SSL_CTX *ssl_ctx = nil; | 76 | SSL_CTX *ssl_ctx = nil; |
79 | SSL *ssl = nil; | 77 | SSL *ssl = nil; |
80 | 78 | ||
81 | char tempString[256]; | 79 | char tempString[256]; |
82 | UnsignedWide microTickCount; | 80 | UnsignedWide microTickCount; |
83 | |||
84 | #warning -- USE A TRUE RANDOM SEED, AND ADD ENTROPY WHENEVER POSSIBLE. -- | ||
85 | const char seed[] = "uyq9,7-b(VHGT^%$&^F/,876;,;./lkJHGFUY{PO*"; // Just gobbledygook | ||
86 | 81 | ||
82 | |||
83 | CRandomizer randomizer; | ||
84 | |||
87 | printf("OpenSSL Demo by Roy Wood, roy@centricsystems.ca\n\n"); | 85 | printf("OpenSSL Demo by Roy Wood, roy@centricsystems.ca\n\n"); |
88 | 86 | ||
89 | BailIfError(errCode = MacSocket_Startup()); | 87 | BailIfError(errCode = MacSocket_Startup()); |
@@ -92,7 +90,7 @@ const char seed[] = "uyq9,7-b(VHGT^%$&^F/,876;,;./lkJHGFUY{PO*"; // Just gobbled | |||
92 | 90 | ||
93 | // Create a socket-like object | 91 | // Create a socket-like object |
94 | 92 | ||
95 | BailIfError(errCode = MacSocket_socket(&theSocket,false,theTimeout * 60,MyMacSocket_IdleWaitCallback,nil)); | 93 | BailIfError(errCode = MacSocket_socket(&theSocket,false,theTimeout * 60,MyMacSocket_IdleWaitCallback,&randomizer)); |
96 | 94 | ||
97 | 95 | ||
98 | // Set up the connect string and try to connect | 96 | // Set up the connect string and try to connect |
@@ -118,10 +116,6 @@ const char seed[] = "uyq9,7-b(VHGT^%$&^F/,876;,;./lkJHGFUY{PO*"; // Just gobbled | |||
118 | // ssl_ctx = SSL_CTX_new(SSLv3_client_method()); | 116 | // ssl_ctx = SSL_CTX_new(SSLv3_client_method()); |
119 | 117 | ||
120 | 118 | ||
121 | RAND_seed (seed, sizeof (seed)); | ||
122 | Microseconds (µTickCount); | ||
123 | RAND_add (µTickCount, sizeof (microTickCount), 0); // Entropy is actually > 0, needs an estimate | ||
124 | |||
125 | // Create an SSL thingey and try to negotiate the connection | 119 | // Create an SSL thingey and try to negotiate the connection |
126 | 120 | ||
127 | ssl = SSL_new(ssl_ctx); | 121 | ssl = SSL_new(ssl_ctx); |
diff --git a/src/lib/libssl/src/MacOS/OpenSSL.mcp.hqx b/src/lib/libssl/src/MacOS/OpenSSL.mcp.hqx index 2efa49ac01..c357ea5af9 100644 --- a/src/lib/libssl/src/MacOS/OpenSSL.mcp.hqx +++ b/src/lib/libssl/src/MacOS/OpenSSL.mcp.hqx | |||
@@ -1,7 +1,7 @@ | |||
1 | (This file must be converted with BinHex 4.0) | 1 | (This file must be converted with BinHex 4.0) |
2 | 2 | ||
3 | :#dp`C@j68d`ZE@0`!%e08(*$9dP&!!!!!j)H!!!!!)X-Bfp[E!!!!!-!!!%S!!0 | 3 | :#dp`C@j68d`ZE@0`!%e08(*$9dP&!!!!!jeU!!!!!0U2Bfp[E!!!!!-!!!%S!!1 |
4 | ipJ!$HKi!!"J!!!!"!!%#!3!!!!!!!!!!!%0[C'9ABA*bD@pb)&"bEfTPBh3!!!! | 4 | %3J!$K@S!!"J!!!!"!!%#!3!!!!!!!!!!!%0[C'9ABA*bD@pb)&"bEfTPBh3!!!! |
5 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 5 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
6 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 6 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
7 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 7 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -299,38 +299,38 @@ MAhGbDA3ZB`"`09pMFR"d,Q-!F$9IBh*`G$)ZB`"`-6*IER"KFbjM!("V0epKG(4 | |||
299 | b,Q-!F'XhAfeTE@8ZB`"`DcGIFfeTE@8ZB`"bFf&IBfKV,Q-!FR0KAfjeE'`ZB`" | 299 | b,Q-!F'XhAfeTE@8ZB`"`DcGIFfeTE@8ZB`"bFf&IBfKV,Q-!FR0KAfjeE'`ZB`" |
300 | MGQ9bFfP[ELjM!%038h4bD@jR9A4TE(-ZBh"`!%9bFQpb5'&ZC'aTEQFZBh"`!%G | 300 | MGQ9bFfP[ELjM!%038h4bD@jR9A4TE(-ZBh"`!%9bFQpb5'&ZC'aTEQFZBh"`!%G |
301 | PG%K89&"6,Q0`F!"0B@06Ef0VCA3ZBh"`!'ePE9pNBQFZB`"36&0dFQPZCdCeEQ0 | 301 | PG%K89&"6,Q0`F!"0B@06Ef0VCA3ZBh"`!'ePE9pNBQFZB`"36&0dFQPZCdCeEQ0 |
302 | c8&"$,QaTBJ"LEPpMG(JZB`"bB@jNAf9bFLjM!(J!BA"`FbjM!'&`F&pbB@jN,Q- | 302 | c8&"$,QaTBJ"LEPpMG(JZB`"bB@jNAf9bFLjM!&*KEQ4[E@PkCA)ZBh"`!(J!BA" |
303 | !BA0Z-A"KFR-ZB`"MB5jM!'0TF'KPFR-ZB`"MFQ`ZB`"MFQ`bF$FZB`"NCh0d,Q- | 303 | `FbjM!'&`F&pbB@jN,Q-!BA0Z-A"KFR-ZB`"MB5jM!'0TF'KPFR-ZB`"MFQ`ZB`" |
304 | !C'JZB`"NFf%ZB`"NFf&`BA*KE5jM!'9ZBbjM!'9bFR0dFLjM!'GPEQ4S,Q-!Cf9 | 304 | MFQ`bF$FZB`"NCh0d,Q-!C'JZB`"NFf%ZB`"NFf&`BA*KE5jM!'9ZBbjM!'9bFR0 |
305 | ZC(0K,Q-!Cf9ZFR0K,Q-!ER0PF5jM!'p`C@jcFf`ZB`"`Df0c-6)ZB`"`Df0c0bj | 305 | dFLjM!'GPEQ4S,Q-!Cf9ZC(0K,Q-!Cf9ZFR0K,Q-!ER0PF5jM!'p`C@jcFf`ZB`" |
306 | M!("VBh-i,Q-!FQ9a,Q-!FR0K,Q-!Ff9cFepTC#jM!(0YD@eP,Q-!Fh"PC@3ZB`" | 306 | `Df0c-6)ZB`"`Df0c0bjM!("VBh-i,Q-!FQ9a,Q-!FR0K,Q-!Ff9cFepTC#jM!(0 |
307 | cF'YKBbjM!(0IBf)ZB`"cAf0XD@9ZG#jM!(0IFf9bGQ9b,Q-!FepcEf0VCA3ZB`" | 307 | YD@eP,Q-!Fh"PC@3ZB`"cF'YKBbjM!(0IBf)ZB`"cAf0XD@9ZG#jM!(0IFf9bGQ9 |
308 | fCA*TCRNZB`"fCA*cD@pZ,Q-!H$8`15jM!(0IG'PYC5jM!%G98dPI5@jTG#jMF(! | 308 | b,Q-!FepcEf0VCA3ZB`"fCA*TCRNZB`"fCA*cD@pZ,Q-!H$8`15jM!(0IG'PYC5j |
309 | !4e9659p$Eh*P,P"33bj-D@)!4e9659p08d`Z8&"$,NaTBJ"(990*Ae0*6e9B,P" | 309 | M!%G98dPI5@jTG#jMF(!!4e9659p$Eh*P,P"33bj-D@)!4e9659p08d`Z8&"$,Na |
310 | 33bj-D@)!6'PL8e0-,P"33bj-D@)!6'PL3h*jF(4[,P"33bj-D@)!6@&M6e-ZE'P | 310 | TBJ"(990*Ae0*6e9B,P"33bj-D@)!1NaTBP066#j38%-Z6'PL!$T-D@*$FRP`G'm |
311 | L!%e66#"5G@jdD@eP0MK,,NaTBJ"2F'9Z9("d5@jPG#j[!%p`C@j8FQ&ZFh"[FR3 | 311 | Z8&"$,NaTBJ"0B@028bjXD@)!690-)&*eER4TE@8f1%XZ6'PL!%p`C@j8F(4*EQ9 |
312 | ZE`"2F'9Z9(*KER0`Eh*d3A"`,Qm!690-)&0*6e9B,MBi5bj-D@)!690-)%-Z0MK | 312 | d,Qm!6h"PEP4bB@jcF'pbG#j[!%p`C@j8FQ&ZFh"[FR4"F(!ZE`"08d`J8dP299J |
313 | ,)%CK+$4TAcKN+5j-D@)!6@&dD%aTBMBi5b"'B5JdD9miC#NZ6'PL!%CTFR0d)&0 | 313 | Z0MK,,NaTBJ"08d`J3bif1%XJ4Q%S0'PI1'3T,NaTBJ"0BA4S6'PL0MK,)%CK+$4 |
314 | PCfePER3!4e9659p$Eh*P,MBi5bj-D@)!4e9659p08d`Z0MK,,NaTBJ"(990*Ae0 | 314 | TAcKN+5j-D@)!4QPbFh3J8f9RE@9ZG!"(990*Ad0[FQ8Z0MK,,NaTBJ"(990*Ade |
315 | *6e9B,MBi5bj-D@)!6'PL3h*jF(4[,MBiDb"'B5JdD9miC#NZ6'PL!%aTBP066#i | 315 | 66#if1%XZ6'PL!%G98dPI8dP299JZ0MK,,NaTBJ!k6'PL3h*jF(4[,MBiDb"'B5J |
316 | f1%XJ4Q%S0'PI1'3T,NaTBJ"(CA4)9&438b"38%-!6h"PEP066#"38%-!4f9d5&4 | 316 | dD9miC#NZ6'PL!%aTBP066#if1%XJ4Q%S0'PI1'3T,NaTBJ"(CA4)9&438b"38%- |
317 | 88&-J0MK,!%aTBP066#!f1%X!6h"PEP066#!f1'X!6'PL8e0-)&"33`"-D@*$FRP | 317 | !6h"PEP066#"38%-!4f9d5&488&-J0MK,!%aTBP066#!f1%X!6h"PEP066#!f1'X |
318 | `G'mJ8&"$!%aTBN0bHA"dEb!f1%X!1NGPG%K89&"6+&"33bN!6'PL)%PYF'pbG#" | 318 | !6'PL8e0-)&"33`"-D@*$FRP`G'mJ8&"$!%aTBN0bHA"dEb!f1%X!1NGPG%K89&" |
319 | 38%-!3Q&XE'p[EL")C@a`!%eA)%-[3bXV)&"33`"(B@eP3fpNC5"$EfjfCA*dCA) | 319 | 6+&"33bN!6'PL)%PYF'pbG#"38%-!3Q&XE'p[EL")C@a`!%eA)%-[3bXV)&"33`" |
320 | !4QaPH#"3FQ9`FQpMCA0cEh)!69FJ8'&cBf&X)&"33`"5CAS!8&"$3A0Y!%*TFfp | 320 | (B@eP3fpNC5"$EfjfCA*dCA)!4QaPH#"3FQ9`FQpMCA0cEh)!69FJ8'&cBf&X)&" |
321 | Z)&"bCA"bEf0PFh0[FJ"B3dp'4L"*EA"[FR3J8&"$!&"&4L"*EA"[FR3J8&"$!$T | 321 | 33`"5CAS!8&"$3A0Y!%*TFfpZ)&"bCA"bEf0PFh0[FJ"B3dp'4L"*EA"[FR3J8&" |
322 | 2F'9Z8e0-!$T(CA4)9&438bJf1%XT!%aTBL"*EA"[FR3J0MK,!%e39b"*EA"[FR3 | 322 | $!&"&4L"*EA"[FR3J8&"$!$T2F'9Z8e0-!$T(CA4)9&438bJf1%XT!%aTBL"*EA" |
323 | J0MK,!%eA)%-[3bXV)$Bi5`"09b"3BA0MB@`J0MK,!&"&4L"*EA"[FR3J0MK,!$T | 323 | [FR3J0MK,!%e39b"*EA"[FR3J0MK,!%eA)%-[3bXV)$Bi5`"09b"3BA0MB@`J0MK |
324 | -D@*68d`Z0MK,)%CK+$4TAcKN+5j-D@)!1Np`C@j68d`S0MKV+3!k6'PL8e0-,P" | 324 | ,!&"&4L"*EA"[FR3J0MK,!$T-D@*68d`Z0MK,)%CK+$4TAcKN+5j-D@)!1Np`C@j |
325 | 33bj-D@)!1NaTBN0bHA"dEbj38%-Z6'PL!$T-D@*$FRP`G'mZ0MKV)%CK+$4TAcK | 325 | 68d`S0MKV+3"0B@028b"38%-J6'PZDf9b!%eKBdp6)$Bi5b"-D@jVCA)!8fpeFQ0 |
326 | N+5j-D@)!6@&M6e-J8&"$)%aTEQYPFJ"0B@028b!f1%XJ6'PZDf9b!&0[GA*MC5" | 326 | P)&4bC@9c!%0eFh4[E5",CAPhEh*NF`""Bf0PFh-J8'&dD(-!9'&bCf9d)&0PG(4 |
327 | 8FQ9PF`"$GA0dEfdJ5f9jGfpbC(-!3@0MCA0c)&"KG'Kc!&4KFQGPG#"6CA4dD@j | 327 | TEQGc!%CTE'8J6@&`F'PZCh-!3R9TE'3J4AKdFQ&c!%4PBR9RCf9b)&*eER4TE@8 |
328 | RF`"'D@aP)%eKF("TEQGc!%*eD@aN)%9iG(*KF`"%C@*eCfGPFL"5G@jdD@eP!%4 | 328 | !4'9LG@GRCA)J9'&bCf9d!%-[3bXV)%0[EA"TE'9b!%-[3bXV)&GKFQjTEQGc!&" |
329 | PBR9RCf9b)&4KFQGPG!"$,d-V+b"$Efe`D@aPFJ"$,d-V+b"ABA*ZD@jRF`"38%- | 329 | 33b"$Ef4P4f9Z!&"33b"%DA0KFh0PE@*XCA)!8&"$)%GXEf*KE#"2F(4TE@PkCA) |
330 | J3fpNC8GPEJ"38%-J4'PcBA0cC@eLE'9b!&"33b"(E'pLB@`J6h"dD@eTHQ9b!&" | 330 | !8&"$)%aTEQYPFJ"38%-J8%9'!&"33b"3FQpUC@0d!&"33d&cE5"3B@jPE!"5CAS |
331 | 33b"-D@jVCA)!8&"$)&"&4J"38%-J8(*[DQ9MG!"38%0"FfdJ8'&ZC@`!8Q9k)%0 | 331 | J3fpYF'PXCA)!0MK,)%0[C'9(C@i!0MK,)%4TFf&cFf9YBQaPFJ!f1%XJ4fa[BQ& |
332 | [EA"TE'9b!$Bi5b"$Ef4P4f9Z!$Bi5b"%DA0KFh0PE@*XCA)!0MK,)%GXEf*KE#" | 332 | X)%p`G'PYDATPFJ!f1%XJ6'PZDf9b!$Bi5b"3FQpUC@0d!%0'66Bi5`!!!!!!!!! |
333 | 2F(4TE@PkCA)!0MK,)%aTEQYPFJ!f1%XJ8(*[DQ9MG!"$4Ndf1%X!!!!!!!!!!!! | 333 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
334 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 334 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
335 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 335 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
336 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 336 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -443,50 +443,50 @@ k!!!"2J!!!!!!!!b&!!!"2`!!!!!!!!b3!!!!!8!!!!!!!!!-QJ!!!8%!!!!!!!! | |||
443 | !%#S!!!'D!!!!!!!!%$8!!!'E!!!!!!!!%%!!!!'F!!!!!!!!%%`!!!'G!!!!!!! | 443 | !%#S!!!'D!!!!!!!!%$8!!!'E!!!!!!!!%%!!!!'F!!!!!!!!%%`!!!'G!!!!!!! |
444 | !%&B!!!'H!!!!!!!!%'%!!!'I!!!!!!!!%'`!!!'J!!!!!!!!%(i!!!'K!!!!!!! | 444 | !%&B!!!'H!!!!!!!!%'%!!!'I!!!!!!!!%'`!!!'J!!!!!!!!%(i!!!'K!!!!!!! |
445 | !%*!!!!!"SJ!!!!!!!"#G!!!"S`!!!!!!!"#V!!!"T!!!!!!!!"#e!!!"T3!!!!! | 445 | !%*!!!!!"SJ!!!!!!!"#G!!!"S`!!!!!!!"#V!!!"T!!!!!!!!"#e!!!"T3!!!!! |
446 | !!"$+!!!"TJ!!!!!!!"$6!!!"T`!!!!!!!"$H!!!"U!!!!!!!!"$J!!!"U3!!!!! | 446 | !!"$+!!!"TJ!!!!!!!"$6!!!"T`!!!!!!!"$H!!!"U!!!!!!!!"$Y!!!"U3!!!!! |
447 | !!"$R!!!"UJ!!!!!!!"$b!!!"U`!!!!!!!"$p!!!"V!!!!!!!!"%#!!!"V3!!!!! | 447 | !!"$[!!!"UJ!!!!!!!"$f!!!"U`!!!!!!!"%"!!!"V!!!!!!!!"%-!!!"V3!!!!! |
448 | !!"%-!!!"VJ!!!!!!!"%5!!!"V`!!!!!!!"%E!!!"X!!!!!!!!"%L!!!"X3!!!!! | 448 | !!"%4!!!"VJ!!!!!!!"%E!!!"V`!!!!!!!"%K!!!"X!!!!!!!!"%U!!!"X3!!!!! |
449 | !!"%R!!!"XJ!!!!!!!"%Y!!!"X`!!!!!!!"%i!!!"Y!!!!!!!!"%q!!!"Y3!!!!! | 449 | !!"%a!!!"XJ!!!!!!!"%f!!!"X`!!!!!!!"%m!!!"Y!!!!!!!!"&(!!!"Y3!!!!! |
450 | !!"&(!!!"YJ!!!!!!!"&2!!!"Y`!!!!!!!"&B!!!"Z!!!!!!!!"&K!!!"Z3!!!!! | 450 | !!"&0!!!"YJ!!!!!!!"&@!!!"Y`!!!!!!!"&H!!!"Z!!!!!!!!"&R!!!"Z3!!!!! |
451 | !!"&S!!!"ZJ!!!!!!!"&b!!!"Z`!!!!!!!"&l!!!"[!!!!!!!!"'$!!!"[3!!!!! | 451 | !!"&`!!!"ZJ!!!!!!!"&h!!!"Z`!!!!!!!"'"!!!"[!!!!!!!!"'+!!!"[3!!!!! |
452 | !!"',!!!"[J!!!!!!!"'4!!!"[`!!!!!!!"'A!!!"`!!!!!!!!"'K!!!"`3!!!!! | 452 | !!"'5!!!"[J!!!!!!!"'D!!!"[`!!!!!!!"'J!!!"`!!!!!!!!"'Q!!!"`3!!!!! |
453 | !!"'T!!!"`J!!!!!!!"'a!!!"``!!!!!!!"'j!!!"a!!!!!!!!"(!!!!"a3!!!!! | 453 | !!"'`!!!"`J!!!!!!!"'i!!!"``!!!!!!!"(!!!!"a!!!!!!!!"()!!!"a3!!!!! |
454 | !!"(,!!!"aJ!!!!!!!"(@!!!"a`!!!!!!!"(K!!!"b!!!!!!!!"(U!!!"b3!!!!! | 454 | !!"(2!!!"aJ!!!!!!!"(D!!!"a`!!!!!!!"(P!!!"b!!!!!!!!"(`!!!"b3!!!!! |
455 | !!"(d!!!"bJ!!!!!!!"(l!!!"b`!!!!!!!")%!!!"c!!!!!!!!")5!!!"c3!!!!! | 455 | !!"(j!!!"bJ!!!!!!!")$!!!"b`!!!!!!!")+!!!"c!!!!!!!!")6!!!"c3!!!!! |
456 | !!")N!!!"cJ!!!!!!!")e!!!"c`!!!!!!!"*)!!!"d!!!!!!!!"*A!!!"d3!!!!! | 456 | !!")K!!!"cJ!!!!!!!")c!!!"c`!!!!!!!"*%!!!"d!!!!!!!!"*A!!!"d3!!!!! |
457 | !!"*T!!!"dJ!!!!!!!"*c!!!"d`!!!!!!!"+'!!!"e!!!!!!!!"+8!!!"e3!!!!! | 457 | !!"*R!!!"dJ!!!!!!!"*k!!!"d`!!!!!!!"+%!!!"e!!!!!!!!"+A!!!"e3!!!!! |
458 | !!"+N!!!"eJ!!!!!!!"+h!!!"e`!!!!!!!",*!!!"f!!!!!!!!",K!!!"f3!!!!! | 458 | !!"+P!!!"eJ!!!!!!!"+e!!!"e`!!!!!!!",)!!!"f!!!!!!!!",D!!!"f3!!!!! |
459 | !!",k!!!"fJ!!!!!!!"-)!!!"f`!!!!!!!"-D!!!"h!!!!!!!!"-V!!!"h3!!!!! | 459 | !!",b!!!"fJ!!!!!!!"-,!!!"f`!!!!!!!"-C!!!"h!!!!!!!!"-V!!!"h3!!!!! |
460 | !!"-q!!!"hJ!!!!!!!"0D!!!"h`!!!!!!!"0c!!!"i!!!!!!!!"1!!!!"i3!!!!! | 460 | !!"-m!!!"hJ!!!!!!!"02!!!"h`!!!!!!!"0X!!!"i!!!!!!!!"1&!!!"i3!!!!! |
461 | !!"1-!!!"iJ!!!!!!!"1C!!!"i`!!!!!!!"1N!!!"j!!!!!!!!"1`!!!"j3!!!!! | 461 | !!"15!!!"iJ!!!!!!!"1H!!!"i`!!!!!!!"1V!!!"j!!!!!!!!"1f!!!"j3!!!!! |
462 | !!"1l!!!"jJ!!!!!!!"2*!!!"j`!!!!!!!"2A!!!"k!!!!!!!!"2Q!!!"k3!!!!! | 462 | !!"2#!!!"jJ!!!!!!!"20!!!"j`!!!!!!!"2E!!!"k!!!!!!!!"2T!!!"k3!!!!! |
463 | !!"2e!!!"kJ!!!!!!!"3#!!!"k`!!!!!!!"32!!!"l!!!!!!!!"3L!!!"l3!!!!! | 463 | !!"2i!!!"kJ!!!!!!!"3(!!!"k`!!!!!!!"38!!!"l!!!!!!!!"3K!!!"l3!!!!! |
464 | !!"3d!!!"lJ!!!!!!!"4#!!!"l`!!!!!!!"4'!!!"m!!!!!!!!"40!!!"m3!!!!! | 464 | !!"3d!!!"lJ!!!!!!!"4'!!!"l`!!!!!!!"48!!!"m!!!!!!!!"4B!!!"m3!!!!! |
465 | !!"4J!!!"mJ!!!!!!!"4a!!!"m`!!!!!!!"5!!!!"p!!!!!!!!"5*!!!"p3!!!!! | 465 | !!"4I!!!"mJ!!!!!!!"4b!!!"m`!!!!!!!"5$!!!"p!!!!!!!!"55!!!"p3!!!!! |
466 | !!"5B!!!"pJ!!!!!!!"5R!!!"p`!!!!!!!"5f!!!"q!!!!!!!!"6$!!!"q3!!!!! | 466 | !!"5E!!!"pJ!!!!!!!"5U!!!"p`!!!!!!!"5j!!!"q!!!!!!!!"6)!!!"q3!!!!! |
467 | !!"64!!!"qJ!!!!!!!"6J!!!"q`!!!!!!!"6k!!!"r!!!!!!!!"8)!!!"r3!!!!! | 467 | !!"69!!!"qJ!!!!!!!"6M!!!"q`!!!!!!!"6b!!!"r!!!!!!!!"8-!!!"r3!!!!! |
468 | !!"8B!!!"rJ!!!!!!!"8V!!!"r`!!!!!!!"9)!!!#!!!!!!!!!"9C!!!#!3!!!!! | 468 | !!"8D!!!"rJ!!!!!!!"8V!!!"r`!!!!!!!"8m!!!#!!!!!!!!!"9*!!!#!3!!!!! |
469 | !!"9U!!!#!J!!!!!!!"9h!!!#!`!!!!!!!"@(!!!#"!!!!!!!!"@8!!!#"3!!!!! | 469 | !!"9C!!!#!J!!!!!!!"9Q!!!#!`!!!!!!!"9f!!!#"!!!!!!!!"@%!!!#"3!!!!! |
470 | !!"@N!!!#"J!!!!!!!"@b!!!#"`!!!!!!!"@r!!!##!!!!!!!!"A3!!!##3!!!!! | 470 | !!"@4!!!#"J!!!!!!!"@L!!!#"`!!!!!!!"@b!!!##!!!!!!!!"A"!!!##3!!!!! |
471 | !!"AJ!!!##J!!!!!!!"A[!!!##`!!!!!!!"Aq!!!#$!!!!!!!!"B+!!!#$3!!!!! | 471 | !!"A3!!!##J!!!!!!!"AF!!!##`!!!!!!!"AY!!!#$!!!!!!!!"B#!!!#$3!!!!! |
472 | !!"BE!!!#$J!!!!!!!"B`!!!#$`!!!!!!!"Bl!!!#%!!!!!!!!"C$!!!#%3!!!!! | 472 | !!"B0!!!#$J!!!!!!!"B9!!!#$`!!!!!!!"BK!!!#%!!!!!!!!"BZ!!!#%3!!!!! |
473 | !!"C2!!!#%J!!!!!!!"CF!!!#%`!!!!!!!"CT!!!#&!!!!!!!!"Ce!!!#&3!!!!! | 473 | !!"Bl!!!#%J!!!!!!!"C(!!!#%`!!!!!!!"CB!!!#&!!!!!!!!"CY!!!#&3!!!!! |
474 | !!"D'!!!#&J!!!!!!!"DE!!!#&`!!!!!!!"DQ!!!#'!!!!!!!!"Db!!!#'3!!!!! | 474 | !!"Ci!!!#&J!!!!!!!"D%!!!#&`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
475 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
476 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!$!!!!$!!!!!- | ||
477 | !!!!-Y0ifDrrrqUS!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
478 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
479 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
480 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
481 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
475 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 482 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
476 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!3!!!!) | ||
477 | !!!!$!!!!"!!!!!8!!!!'!!!!"`!!!!J!!!!*!!!!,3!!!!S!!!!,!!!!$!!!!!d | ||
478 | !!!!1!!!!$`!!!"!!!!!4!!!!%J!!!"-!!!!8!!!!&3!!!"B!!!!A!!!!'!!!!"N | ||
479 | !!!!D!!!!'`!!!"`!!!!G!!!!(J!!!"m!!!!J!!!!)3!!!#)!!!!M!!!!*!!!!#8 | ||
480 | !!!!Q!!!!*`!!!#J!!!!T!!!!+J!!!#X!!!!X!!!!,J!!!#m!!!!`!!!!-3!!!$) | ||
481 | !!!!c!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
482 | !!!!!!!!!0!!!!%!#!!!!!J!!0!!!!!!!!!!"!!!!!J!!!!-!!!!%!!!!"3!!!!B | ||
483 | !!!!(!!!!#!!!!!N!!!!+!!!!#`!!!!`!!!!0!!!!$J!!!!m!!!!3!!!!%3!!!") | ||
484 | !!!!@!!!!'`!!!"J!!!!C!!!!'J!!!"`!!!!G!!!!&`!!!"-!!!!8!!!!&3!!!"m | ||
485 | !!!!H!!!!)!!!!#!&!!!!"3!!)!!!!KN!!!)J!!!@Z3!!'!!!!!)C!!!!!!!!!!! | ||
486 | !!!!!!!!!!!!!!!!!!!!#!!!#!!!!!J%!!!&P!!!![!!!!'m!!!&Q!!!!F!!!!(% | ||
487 | !!!"b!!!!F`!!!(3!!!"e!!!!GJ!!!(F!!!"i!!!!H3!!!(S!!!"l!!!!I!!!!B! | ||
488 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 483 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
489 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 484 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
485 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
486 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
487 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
488 | !!!!!!!!!!!!!!!!!!!!!!!!#&`!!!L!!!"D,!!!B!!!!!KF!!!!!!!!!!!!!!!! | ||
489 | !!!!!9%9B9!!!!!)!!!(q!!!"r`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
490 | !!!!!!!)!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 490 | !!!!!!!)!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
491 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 491 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
492 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 492 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -702,7 +702,7 @@ i)%4&3P9()$Bi5`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
702 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 702 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
703 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%!!3!!#8ePFQGP)%peG!!!!!!!!!! | 703 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%!!3!!#8ePFQGP)%peG!!!!!!!!!! |
704 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!$m | 704 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!$m |
705 | r2cp"8&"-!!%"!!!%)#!J)!15Jf!$G0pi!`1Yi!!&!J%!!3%!!3%"!!!"!!!!!!! | 705 | r2cp"8&"-!!%"!!!%)#!J)!1ARe!$GYpi!`@Z%!!&!J%!!3%!!3%"!!!"!!!!!!! |
706 | !!!%"!3%!!3%!!3!""!!!!!!!!!!!!!!(!3%!!3!!!3!!!!!!!!!!!!!!!!!!!!! | 706 | !!!%"!3%!!3%!!3!""!!!!!!!!!!!!!!(!3%!!3!!!3!!!!!!!!!!!!!!!!!!!!! |
707 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" | 707 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" |
708 | IAh0dBA*d!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 708 | IAh0dBA*d!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -1081,8 +1081,8 @@ l!!!"H`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!3!"I!!!!A`#!3! | |||
1081 | !!!!!!!!!!3!"T!!!!D3#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!% | 1081 | !!!!!!!!!!3!"T!!!!D3#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!% |
1082 | !!D8!!!'P!J%!!!!!!!%!!3-!!!!!!!!!!!!!!!!"!!!!!!!!!!!"!!'Q!!!"TJ) | 1082 | !!D8!!!'P!J%!!!!!!!%!!3-!!!!!!!!!!!!!!!!"!!!!!!!!!!!"!!'Q!!!"TJ) |
1083 | "!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!3!"T`!!!DF#!3!!!!!!!3! | 1083 | "!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!3!"T`!!!DF#!3!!!!!!!3! |
1084 | "!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1084 | "!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!%!!DJ!!!'S!J%!!!!!!!%!!3%!!!!!!!! |
1085 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1085 | !!!!!!!!"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1086 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1086 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1087 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1087 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1088 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1088 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -1137,46 +1137,46 @@ l!!!"H`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!3!"I!!!!A`#!3! | |||
1137 | !!!&m!!!"I3!!!Ai!!!&r!!!"J!!!!B%!!!'#!!!"J`!!!B3!!!'&!!!"KJ!!!BF | 1137 | !!!&m!!!"I3!!!Ai!!!&r!!!"J!!!!B%!!!'#!!!"J`!!!B3!!!'&!!!"KJ!!!BF |
1138 | !!!')!!!"L3!!!BS!!!',!!!"M!!!!Bd!!!'1!!!"M`!!!C!!!!!"N3!!!C)!!!' | 1138 | !!!')!!!"L3!!!BS!!!',!!!"M!!!!Bd!!!'1!!!"M`!!!C!!!!!"N3!!!C)!!!' |
1139 | 6!!!"P!!!!C8!!!'@!!!"P`!!!CJ!!!'C!!!"QJ!!!CX!!!'F!!!"R3!!!Ci!!!' | 1139 | 6!!!"P!!!!C8!!!'@!!!"P`!!!CJ!!!'C!!!"QJ!!!CX!!!'F!!!"R3!!!Ci!!!' |
1140 | I!!!"S!!!!D%!!!'L!!!"S`!!!D3!!!'P!!!"TJ!!!!!!!!!!!!!!!!!!!!!!!!! | 1140 | I!!!"S!!!!D%!!!'L!!!"S`!!!D3!!!'P!!!"TJ!!!DF!!!!!!!!!!!!!!!!!!!! |
1141 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1141 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1142 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'R!!!"`!%!!!!"!!' | 1142 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'S!!!"`!%!!!!"!!' |
1143 | R!3!"SJ%!!D-"!!'K!3!"S!%!!!X"!!!-!3!!#J%!!!d"!!!1!3!!$`%!!"!"!!! | 1143 | S!3!"SJ%!!D-"!!'S!3!"S3%!!D!"!!!,!3!!$!%!!!S"!!!0!3!!$J%!!!m"!!! |
1144 | 4!3!!%J%!!"-"!!!8!3!!&3%!!"B"!!!A!3!!'!%!!"N"!!!D!3!!'`%!!"`"!!! | 1144 | 3!3!!%3%!!")"!!!6!3!!&!%!!"8"!!!@!3!!&`%!!"J"!!!C!3!!'J%!!"X"!!! |
1145 | G!3!!(J%!!"m"!!!J!3!!)3%!!#)"!!!M!3!!*!%!!#8"!!!Q!3!!*`%!!#J"!!! | 1145 | F!3!!(3%!!"i"!!!I!3!!)!%!!#%"!!!L!3!!)`%!!#3"!!!P!3!!*J%!!#F"!!! |
1146 | T!3!!+J%!!#X"!!!X!3!!,3%!!#i"!!![!3!!-!%!!$%"!!!b!3!!-`%!!$3"!!! | 1146 | S!3!!+3%!!#S"!!!V!3!!,!%!!#d"!!!Z!3!!,`%!!$!"!!!a!3!!-J%!!$-"!!! |
1147 | e!3!!0J%!!$F"!!!i!3!!13%!!$S"!!!l!3!!2!%!!$d"!!!q!3!!2`%!!%!"!!" | 1147 | d!3!!03%!!$B"!!!h!3!!1!%!!$N"!!!k!3!!1`%!!$`"!!!p!3!!2J%!!$m"!!" |
1148 | "!3!!3J%!!%-"!!"%!3!!43%!!%B"!!"(!3!!5!%!!%N"!!"+!3!!5`%!!%`"!!" | 1148 | !!3!!33%!!%)"!!"$!3!!4!%!!%8"!!"'!3!!4`%!!%J"!!"*!3!!5J%!!%X"!!" |
1149 | 0!3!!6J%!!%m"!!"3!3!!83%!!&)"!!"6!3!!9!%!!&8"!!"@!3!!9`%!!&J"!!" | 1149 | -!3!!63%!!%i"!!"2!3!!8!%!!&%"!!"5!3!!8`%!!&3"!!"9!3!!9J%!!&F"!!" |
1150 | C!3!!@J%!!&X"!!"F!3!!A3%!!&i"!!"I!3!!B!%!!'%"!!"L!3!!B`%!!'3"!!" | 1150 | B!3!!@3%!!&S"!!"E!3!!A!%!!&d"!!"H!3!!A`%!!'!"!!"K!3!!BJ%!!'-"!!" |
1151 | P!3!!CJ%!!'F"!!"S!3!!D3%!!'S"!!"V!3!!E!%!!'d"!!"Z!3!!E`%!!(!"!!" | 1151 | N!3!!C3%!!'B"!!"R!3!!D!%!!'N"!!"U!3!!D`%!!'`"!!"Y!3!!EJ%!!'m"!!" |
1152 | a!3!!FJ%!!(-"!!"d!3!!G3%!!(B"!!"h!3!!H!%!!(N"!!"k!3!!H`%!!(`"!!" | 1152 | `!3!!F3%!!()"!!"c!3!!G!%!!(8"!!"f!3!!G`%!!(J"!!"j!3!!HJ%!!(X"!!" |
1153 | p!3!!IJ%!!(m"!!#!!3!!J3%!!))"!!#$!3!!K!%!!)8"!!#'!3!!K`%!!)J"!!' | 1153 | m!3!!I3%!!(i"!!"r!3!!J!%!!)%"!!##!3!!J`%!!)3"!!#&!3!!KJ%!!)F"!!# |
1154 | Q!3!!L3%!!)S"!!#,!3!!M!%!!)d"!!#1!3!!M`%!!*!!!3!!N3%!!*)"!!#6!3! | 1154 | )!3!!L3%!!)S"!!#,!3!!M!%!!)d"!!#1!3!!M`%!!*!!!3!"TJ%!!*%"!!#5!3! |
1155 | !P!%!!*8"!!#@!3!!P`%!!*J"!!#C!3!!QJ%!!*X"!!#F!3!!R3%!!*i"!!#I!3! | 1155 | !N`%!!*3"!!#9!3!!PJ%!!*F"!!#B!3!!Q3%!!*S"!!#E!3!!R!%!!*d"!!#H!3! |
1156 | !S!%!!+%"!!#L!3!!S`%!!+3"!!#P!3!!TJ%!!+F"!!#S!3!!U3%!!+S"!!#V!3! | 1156 | !R`%!!+!"!!#K!3!!SJ%!!+-"!!#N!3!!T3%!!+B"!!#R!3!!U!%!!+N"!!#U!3! |
1157 | !V!%!!+d"!!#Z!3!!V`%!!,!"!!#a!3!!XJ%!!,-"!!#d!3!!Y3%!!,B"!!#h!3! | 1157 | !U`%!!+`"!!#Y!3!!VJ%!!+m"!!#`!3!!X3%!!,)"!!#c!3!!Y!%!!,8"!!#f!3! |
1158 | !Z!%!!,N"!!#k!3!!Z`%!!,`"!!#p!3!![J%!!,m"!!$!!3!!`3%!!-)"!!$$!3! | 1158 | !Y`%!!,J"!!#j!3!!ZJ%!!,X"!!#m!3!![3%!!,i"!!#r!3!!`!%!!-%"!!$#!3! |
1159 | !a!%!!-8"!!$'!3!!a`%!!-J"!!$*!3!!bJ%!!-X"!!$-!3!!c3%!!-i"!!$2!3! | 1159 | !``%!!-3"!!$&!3!!aJ%!!-F"!!$)!3!!b3%!!-S"!!$,!3!!c!%!!-d"!!$1!3! |
1160 | !d!%!!0%"!!$5!3!!d`%!!03"!!$9!3!!eJ%!!0F"!!$B!3!!f3%!!0S"!!$E!3! | 1160 | !c`%!!0!"!!$4!3!!dJ%!!0-"!!$8!3!!e3%!!0B"!!$A!3!!f!%!!0N"!!$D!3! |
1161 | !h!%!!0d"!!$H!3!!h`%!!1!"!!$K!3!!iJ%!!1-"!!$N!3!!j3%!!1B"!!$R!3! | 1161 | !f`%!!0`"!!$G!3!!hJ%!!0m"!!$J!3!!i3%!!1)"!!$M!3!!j!%!!18"!!$Q!3! |
1162 | !k!%!!1N"!!$U!3!!k`%!!1`"!!$Y!3!!lJ%!!1m"!!$`!3!!m3%!!2)"!!$c!3! | 1162 | !j`%!!1J"!!$T!3!!kJ%!!1X"!!$X!3!!l3%!!1i"!!$[!3!!m!%!!2%"!!$b!3! |
1163 | !p!%!!28"!!$f!3!!p`%!!2J"!!$j!3!!qJ%!!2X"!!$m!3!!r3%!!2i"!!$r!3! | 1163 | !m`%!!23"!!$e!3!!pJ%!!2F"!!$i!3!!q3%!!2S"!!$l!3!!r!%!!2d"!!$q!3! |
1164 | "!!%!!3%"!!%#!3!"!`%!!33"!!%&!3!""J%!!3F"!!%)!3!"#3%!!3S"!!%,!3! | 1164 | !r`%!!3!"!!%"!3!"!J%!!3-"!!%%!3!""3%!!3B"!!%(!3!"#!%!!3N"!!%+!3! |
1165 | "$!%!!3d"!!%1!3!"$`%!!4!"!!%4!3!"%J%!!4-"!!%8!3!"&3%!!4B"!!%A!3! | 1165 | "#`%!!3`"!!%0!3!"$J%!!3m"!!%3!3!"%3%!!4)"!!%6!3!"&!%!!48"!!%@!3! |
1166 | "'!%!!4N"!!%D!3!"'`%!!4`"!!%G!3!"(J%!!4m"!!%J!3!")3%!!5)"!!%M!3! | 1166 | "&`%!!4J"!!%C!3!"'J%!!4X"!!%F!3!"(3%!!4i"!!%I!3!")!%!!5%"!!%L!3! |
1167 | "*!%!!58"!!%Q!3!"*`%!!5J"!!%T!3!"+J%!!5X"!!%X!3!",3%!!5i"!!%[!3! | 1167 | ")`%!!53"!!%P!3!"*J%!!5F"!!%S!3!"+3%!!5S"!!%V!3!",!%!!5d"!!%Z!3! |
1168 | "-!%!!6%"!!%b!3!"-`%!!63"!!%e!3!"T`%!!6B"!!%h!3!"1!%!!6N"!!%k!3! | 1168 | ",`%!!6!"!!%a!3!"-J%!!6-"!!%d!3!"03%!!6B"!!'R!3!"0`%!!6J"!!%j!3! |
1169 | "1`%!!6`"!!%p!3!"2J%!!6m"!!&!!3!"33%!!8)"!!&$!3!"4!%!!88"!!&'!3! | 1169 | "1J%!!6X"!!%m!3!"23%!!6i"!!%r!3!"3!%!!8%"!!&#!3!"3`%!!83"!!&&!3! |
1170 | "4`%!!8J"!!&*!3!"5J%!!8X"!!&-!3!"63%!!8i"!!&2!3!"8!%!!9%"!!&5!3! | 1170 | "4J%!!8F"!!&)!3!"53%!!8S"!!&,!3!"6!%!!8d"!!&1!3!"6`%!!9!"!!&4!3! |
1171 | "8`%!!93"!!&9!3!"9J%!!9F"!!&B!3!"@3%!!9S"!!&E!3!"A!%!!9d"!!&H!3! | 1171 | "8J%!!9-"!!&8!3!"93%!!9B"!!&A!3!"@!%!!9N"!!&D!3!"@`%!!9`"!!&G!3! |
1172 | "A`%!!@!"!!&K!3!"BJ%!!@-"!!&N!3!"C3%!!@B"!!&R!3!"D!%!!@N"!!&U!3! | 1172 | "AJ%!!9m"!!&J!3!"B3%!!@)"!!&M!3!"C!%!!@8"!!&Q!3!"C`%!!@J"!!&T!3! |
1173 | "D`%!!@`"!!&Y!3!"EJ%!!@m"!!&`!3!"F3%!!A)"!!&c!3!"G!%!!A8"!!&f!3! | 1173 | "DJ%!!@X"!!&X!3!"E3%!!@i"!!&[!3!"F!%!!A%"!!&b!3!"F`%!!A3"!!&e!3! |
1174 | "G`%!!AJ"!!&j!3!"HJ%!!AX"!!&m!3!"I3%!!Ai"!!'!!3!"J3%!!B)"!!'$!3! | 1174 | "GJ%!!AF"!!&i!3!"H3%!!AS"!!&l!3!"I!%!!Ad"!!&q!3!"J!%!!B%"!!'#!3! |
1175 | "K!%!!B8"!!''!3!"K`%!!BJ"!!'*!3!"LJ%!!BX"!!'-!3!"M3%!!Bi"!!'2!3! | 1175 | "J`%!!B3"!!'&!3!"KJ%!!BF"!!')!3!"L3%!!BS"!!',!3!"M!%!!Bd"!!'1!3! |
1176 | "N!!"!!'4!3!"NJ%!!C-"!!'8!3!"P3%!!CB"!!'A!3!"Q!%!!CN"!!'D!3!"Q`% | 1176 | "M`%!!C!!!3!"N3%!!C)"!!'6!3!"P!%!!C8"!!'@!3!"P`%!!CJ"!!'C!3!"QJ% |
1177 | !!C`"!!'G!3!"RJ%!!Cm"!!'N!3!"I`%!!!%"!!!%!3!!!`%!!!)"!!!*!3!!"3% | 1177 | !!CX"!!'F!3!"R3%!!Ci"!!'I!3!"T!%!!Am"!!!"!3!!"!%!!!-"!!!#!3!!#3% |
1178 | !!!B"!!!(!3!!#!%!!D8!!!'S!!%!+!!!!#!$NFQ3!$mr!!!!!!!!!!!!!!14bC! | 1178 | !!!8"!!!'!3!!"`%!!!J"!!'P!!!"U3!"!#J!!!!JrrrjT!!""!!!!!!!!!!!!!! |
1179 | !!!)!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1179 | !!!!!!J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1180 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1180 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1181 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1181 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1182 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1182 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -1186,8 +1186,8 @@ Q!3!!L3%!!)S"!!#,!3!!M!%!!)d"!!#1!3!!M`%!!*!!!3!!N3%!!*)"!!#6!3! | |||
1186 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1186 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1187 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1187 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1188 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1188 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1189 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%!!6T)HA"PFN0 | 1189 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!3!"1NKjF'9 |
1190 | KFQ3!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1190 | b3f&bC!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1191 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1191 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1192 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1192 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1193 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1193 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -1197,14 +1197,14 @@ KFQ3!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
1197 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1197 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1198 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1198 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1199 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1199 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1200 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!#`MlJ!!!!!!!!!3!#`NI | 1200 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!,#2Z!!!!!!!!!"!!, |
1201 | `!!)!!!!!!!!!!!!!!X)fJ!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1201 | #4r!!!J!!!!!!!!!!!!!#`MD!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1202 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1202 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1203 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1203 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1204 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1204 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1205 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1205 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1206 | !!!)!!!%!!!!!"3!!Irm!!!!!Irm!!!!!Irm!!!!!Irm!!!!-!!%!!J!'!!!!"8! | 1206 | !!!!!!J!!!3!!!!!&!!"rr`!!!!"rr`!!!!"rr`!!!!"rr`!!!!`!!3!#!!B!!!! |
1207 | !!!J!!3!"1J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1207 | &3!!!#!!"!!%k!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1208 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1208 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1209 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1209 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1210 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1210 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -1214,9 +1214,8 @@ KFQ3!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
1214 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1214 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1215 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1215 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1216 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1216 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1217 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!% | ||
1218 | !!!$rrrrr!!!!!`!"!!%k1J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1219 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1217 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1218 | !!3!!!2rrrrm!!!!$!!%!!6Sk!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1220 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1219 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1221 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1220 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1222 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1221 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -1226,8 +1225,8 @@ KFQ3!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
1226 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1225 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1227 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1226 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1228 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1227 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1229 | !!!!!!!!!!3!!!2rrrrm!!!!%!!%!!6SkD@jME(9NC6S!!!!!!!!!!!!!!!!!!!! | ||
1230 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1228 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1229 | !!!!!!!!!!!!"!!!!rrrrr`!!!!3!!3!"1MTTEQ0XG@4P1J!!!!!!!!!!!!!!!!! | ||
1231 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1230 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1232 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1231 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1233 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1232 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -1237,8 +1236,8 @@ KFQ3!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
1237 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1236 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1238 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1237 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1239 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1238 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1240 | !!!!!!!!!!!!!!!!!!!!!!!!!rrrrrd!!!!)!!3!"1J!!!!!!!!!!!!!!!!!!!!! | ||
1241 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1239 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1240 | !!!!!!!!!!!!!!!!!!!!!!!!!!!$rrrrr3!!!!J!"!!%k!!!!!!!!!!!!!!!!!!! | ||
1242 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1241 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1243 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1242 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1244 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1243 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -1248,9 +1247,9 @@ KFQ3!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
1248 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1247 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1249 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1248 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1250 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1249 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1251 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!$rrrrr3!!!!`!"!!%k1MT(990*1QP | ||
1252 | ZBfaeC'8k!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1253 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1250 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1251 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!2rrrrp!!!!$!!%!!6Sk1NG98dN | ||
1252 | kD@jME(9NC6S!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1254 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1253 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1255 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1254 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1256 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1255 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -1259,9 +1258,9 @@ ZBfaeC'8k!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
1259 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1258 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1260 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1259 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1261 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1260 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1262 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!2rrrrp!!!!%!!%!!6S | ||
1263 | k1NG98dNkE'PL1J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1264 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1261 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1262 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!rrrrrd!!!!3!!3! | ||
1263 | "1MSk4e9656TXD@)k!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1265 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1264 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1266 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1265 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1267 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1266 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -1270,9 +1269,9 @@ k1NG98dNkE'PL1J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
1270 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1269 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1271 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1270 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1272 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1271 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1273 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!rrrrrd! | ||
1274 | !!!8!!J!"1NeKBdp6)&0eF("[FR3k!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1275 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1272 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1273 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!$rrrr | ||
1274 | r3!!!"3!#!!%k6@&M6e-J8h9`F'pbG$S!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1276 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1275 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1277 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1276 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1278 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1277 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -1281,10 +1280,9 @@ k1NG98dNkE'PL1J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
1281 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1280 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1282 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1281 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1283 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1282 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1284 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!% | ||
1285 | !!!$rrrrr3!!!"J!#!!%k690-1J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1286 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1283 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1287 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1284 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1285 | !!3!!!2rrrrp!!!!'!!)!!6T08d`k!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1288 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1286 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1289 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1287 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1290 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1288 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -1293,9 +1291,9 @@ k1NG98dNkE'PL1J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
1293 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1291 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1294 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1292 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1295 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1293 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1296 | !!!!!!!!!!3!!!2rrrrp!!!!(!!S!!%eKBdp6)&"33b"-D@jVCA)!!!!!!!!!!!! | ||
1297 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1294 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1298 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1295 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1296 | !!!!!!!!!!!!"!!!!rrrrrd!!!!F!#J!!6@&M6e-J8&"$)%aTEQYPFJ!!!!!!!!! | ||
1299 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1297 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1300 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1298 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1301 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1299 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -1309,14 +1307,14 @@ k1NG98dNkE'PL1J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
1309 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1307 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1310 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1308 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1311 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1309 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1312 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%p`C@j68d`J8&"$!!!!!!!!!!!!!!!!!!! | ||
1313 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1310 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1314 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1311 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1312 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!6h"PEP066#"38%-!!!!!!!!!!!!!!!! | ||
1315 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1313 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1316 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1314 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1317 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!3!"1J!!!!! | ||
1318 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1315 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1319 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1316 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1317 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"!!%k!!! | ||
1320 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1318 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1321 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1319 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1322 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1320 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -1325,61 +1323,61 @@ k1NG98dNkE'PL1J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
1325 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1323 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1326 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1324 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1327 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1325 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1328 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!J!"6@&M6e- | ||
1329 | J8&"$)%aTEQYPFJ!!!!!!!!!!!!!!!!!!!!!!(N&38%`!!!!!!!!!!!!!!!!!!!! | ||
1330 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1326 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1331 | !B!!!!%&`F'`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1332 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!B!!!!%e06%)!!!!!!!!!!!!!!!!!!!! | ||
1333 | !!!!!!!!!!!!!!!!!!!!!!%aTBL"*EA"[FR3J8&"$!!!!!!!!!!!!!!!!!!!!!!! | ||
1334 | !!!!!!%e36%B!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%aTBL"*EA" | ||
1335 | [FR3J8&"$!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%eA3d3!!!!!!!!!!!!!!!!!!!! | ||
1336 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1327 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1337 | !B!!!!&*68N-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1328 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!#!!&0B@0 |
1338 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!B!!!!&4&@&3ZBQJ!!!!!!!!!!!!!!!! | 1329 | 28b"38%-J6'PZDf9b!!!!!!!!!!!!!!!!!!!!!!!H39"36!!!!!!!!!!!!!!!!!! |
1339 | !!!!!!!!!!!!!!!!!!!!!!%*KE'a[EfiJ5'9XF!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1340 | !!!!!!&4&@&3ZB`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%eA)%-[3bX | ||
1341 | V)&"33`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!&4&@&3ZBbXV!!!!!!!!!!!!!!! | ||
1342 | !!!!!!!!!!!!!!!!!!!!!!%eA)%-[3bXV)&"33`!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1343 | !!!!!!&4&@&3ZBf-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%eA)%-[3bX | ||
1344 | V)&"33`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!&4&@&3ZBh!!!!!!!!!!!!!!!!! | ||
1345 | !!!!!!!!!!!!!!!!!!!!!!%eA)%-[3bXV)&"33`!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1346 | !!!!!!&4&@&3ZBh"`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%eA)%-[3bX | ||
1347 | V)&"33`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!&4&@&3ZCAK`!!!!!!!!!!!!!!! | ||
1348 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1330 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1349 | !!!!!!&4&@&3ZCf-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%GKE@9$Ef4 | 1331 | !!!"J!!!!3A"`E!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1350 | P)%0[ERCPFR4PFJ!!!!!!!!!!!!!!!!!!3!!!!&4&@&3ZD!!!!!!!!!!!!!!!!!! | 1332 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"J!!!!68e-3J!!!!!!!!!!!!!!!!! |
1351 | !!!!!!!!!!!!!!!!!!!!!!%eA)%-[3bXV)&"33`!!!!!!!!!!!!!!!!!!!!!!!!! | 1333 | !!!!!!!!!!!!!!!!!!!!!!!!!6'PL)%PYF'pbG#"38%-!!!!!!!!!!!!!!!!!!!! |
1352 | !%!!!!&4&@&3ZE!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%CXCAJJ8(* | 1334 | !!!!!!!!!69"-4J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!6'PL)%P |
1353 | PF(*[Bf9cFfpb!!!!!!!!!!!!!!!!!!!!J!!!!&4&@&3ZF!!!!!!!!!!!!!!!!!! | 1335 | YF'pbG#"38%-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!69G$4!!!!!!!!!!!!!!!!!! |
1354 | !!!!!!!!!!!!!!!!!!!!!!%eA)&"KFf0KE#"38%-!!!!!!!!!!!!!!!!!!!!!!!! | ||
1355 | !!!!!!&4&@&3ZF'&c!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%eA)&"KFf0 | ||
1356 | KE#"38%-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!&4&@&3ZF'0S!!!!!!!!!!!!!!! | ||
1357 | !!!!!!!!!!!!!!!!!!!!!!%eA)%-[3bXV)&"33`!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1358 | !J!!!!&4&@&3ZF'0S+bX!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%eA)%-[3bX | ||
1359 | V)&"33`!!!!!!!!!!!!!!!!!!!!!!!!!!J!!!!&4&@&3ZF("e!!!!!!!!!!!!!!! | ||
1360 | !!!!!!!!!!!!!!!!!!!!!!%eA)&"KFf0KE#"38%-!!!!!!!!!!!!!!!!!!!!!!!! | ||
1361 | !J!!!!&4&@&3ZFJ!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!&*PHJ!!!!! | ||
1362 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!&4&@&3ZF`!!!!!!!!!!!!!!!!! | ||
1363 | !!!!!!!!!!!!!!!!!!!!!!&"33d&cE3!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1364 | !!!!!!&4&@&3ZH3!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%*TFfpZ)&" | ||
1365 | bCA"bEf0PFh0[FJ!!!!!!!!!!!!!!!!!!J!!!!&K$6dB!!!!!!!!!!!!!!!!!!!! | ||
1366 | !!!!!!!!!!!!!!!!!!!!!!&K$6dC')%PYF'pbG#"38%-!!!!!!!!!!!!!!!!!!!! | ||
1367 | !!!!!!'4[Bh8!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1368 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!B!!!!(*cFQ-!!!!!!!!!!!!!!!!!!!! | ||
1369 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1336 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1370 | !B!!!!(0SE')!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!&"&4L"*EA" | 1337 | !!!"J!!!!8P053`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1371 | [FR3J8&"$!!!!!!!!!!!!!!!!!!!!!!!!!!!!!(0dG@)!!!!!!!!!!!!!!!!!!!! | 1338 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"J!!!!9%9B9#jLD!!!!!!!!!!!!!! |
1372 | !!!!!!!!!!!!!!!!!!!!!!&"&4L"*EA"[FR3J8&"$!!!!!!!!!!!!!!!!!!!!!!! | 1339 | !!!!!!!!!!!!!!!!!!!!!!!!!3Q&XE'p[EL")C@a`!!!!!!!!!!!!!!!!!!!!!!! |
1373 | !!!!!!!!!!!!ZC'pM!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1340 | !!!!!!!!!9%9B9#jM!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!69FJ3bp |
1374 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!8!!!!!!&!3%!!3!!!!!!!!!!!!!!!!! | 1341 | $+bXJ8&"$!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!9%9B9#jM+bX!!!!!!!!!!!! |
1342 | !!!!!!!!!!!!!!!!!!!!!!!!!69FJ3bp$+bXJ8&"$!!!!!!!!!!!!!!!!!!!!!!! | ||
1343 | !!!!!!!!!9%9B9#jMB`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!69FJ3bp | ||
1344 | $+bXJ8&"$!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!9%9B9#jMF!!!!!!!!!!!!!! | ||
1345 | !!!!!!!!!!!!!!!!!!!!!!!!!69FJ3bp$+bXJ8&"$!!!!!!!!!!!!!!!!!!!!!!! | ||
1346 | !!!!!!!!!9%9B9#jMF(!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!69FJ3bp | ||
1347 | $+bXJ8&"$!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!9%9B9#jPH(!!!!!!!!!!!!! | ||
1375 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1348 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1349 | !!!!!!!!!9%9B9#jRB`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!4f&YC80 | ||
1350 | [C'8J3fpZGQ9bG'9b!!!!!!!!!!!!!!!!!!"!!!!!9%9B9#jS!!!!!!!!!!!!!!! | ||
1351 | !!!!!!!!!!!!!!!!!!!!!!!!!69FJ3bp$+bXJ8&"$!!!!!!!!!!!!!!!!!!!!!!! | ||
1352 | !!!!3!!!!9%9B9#jX!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!4QaPH#" | ||
1353 | 3FQ9`FQpMCA0cEh)!!!!!!!!!!!!!!!!!!!#!!!!!9%9B9#j`!!!!!!!!!!!!!!! | ||
1354 | !!!!!!!!!!!!!!!!!!!!!!!!!69FJ8'&cBf&X)&"33`!!!!!!!!!!!!!!!!!!!!! | ||
1355 | !!!!!!!!!9%9B9#j`BA-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!69FJ8'& | ||
1356 | cBf&X)&"33`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!9%9B9#j`BfJ!!!!!!!!!!!! | ||
1357 | !!!!!!!!!!!!!!!!!!!!!!!!!69FJ3bp$+bXJ8&"$!!!!!!!!!!!!!!!!!!!!!!! | ||
1358 | !!!#!!!!!9%9B9#j`BfJV+`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!69FJ3bp | ||
1359 | $+bXJ8&"$!!!!!!!!!!!!!!!!!!!!!!!!!!#!!!!!9%9B9#j`F(8!!!!!!!!!!!! | ||
1360 | !!!!!!!!!!!!!!!!!!!!!!!!!69FJ8'&cBf&X)&"33`!!!!!!!!!!!!!!!!!!!!! | ||
1361 | !!!#!!!!!9%9B9#jb!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!8Q9k!!! | ||
1362 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!9%9B9#jc!!!!!!!!!!!!!!! | ||
1363 | !!!!!!!!!!!!!!!!!!!!!!!!!8&"$3A0Y!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1364 | !!!!!!!!!9%9B9#jj!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!3QPcEfi | ||
1365 | J8(*PF(*[Bf9cFfpb!!!!!!!!!!!!!!!!!!#!!!!!@%024J!!!!!!!!!!!!!!!!! | ||
1366 | !!!!!!!!!!!!!!!!!!!!!!!!!@%024NBJ5@e`Eh*d)&"33`!!!!!!!!!!!!!!!!! | ||
1367 | !!!!!!!!!C'pMG3!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1368 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"J!!!!FR0bB`!!!!!!!!!!!!!!!!! | ||
1376 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1369 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1370 | !!!"J!!!!FfKXBJ!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!8%9')%P | ||
1371 | YF'pbG#"38%-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!Fh4eBJ!!!!!!!!!!!!!!!!! | ||
1372 | !!!!!!!!!!!!!!!!!!!!!!!!!8%9')%PYF'pbG#"38%-!!!!!!!!!!!!!!!!!!!! | ||
1373 | !!!!!!!!!!!!!!#jNEf-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1374 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"3!!!!!!8"!3!"!!!!!!!!!!!!!!! | ||
1377 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1375 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1378 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1376 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1379 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1377 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1380 | !!!!!!!B!!!!!!3!!!!!&!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1381 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1378 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1382 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1379 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1380 | !!!!!!!!!"J!!!!!"!!!!!!8!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1383 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1381 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1384 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1382 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1385 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1383 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -1388,107 +1386,104 @@ bCA"bEf0PFh0[FJ!!!!!!!!!!!!!!!!!!J!!!!&K$6dB!!!!!!!!!!!!!!!!!!!! | |||
1388 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1386 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1389 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1387 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1390 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1388 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1391 | !!!!!!!!!!!!!!!!!!!!!!3%!!'eKD@i!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1392 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1389 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1393 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1390 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1391 | !!!!!!!!!!!!!!!!!!!!!!!!"!3!!E@&TEJ!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1394 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1392 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1395 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1393 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1396 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!#!%!!3!!!!%"!3% | ||
1397 | "!!%"!!!!!!!"!3!!!3%!!3!!!3!"!!!!!!!!!!!!#!%!!3%!!3%!!!!"!!!*!!! | ||
1398 | A6@&M6e-J9'p[E'*[H#"%48*94b!f1%X!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1399 | !!!!!!!!!!!!!!!!!!!!!2cmr2d&38%`!!!'!@-!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1400 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1394 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1401 | r2cmr!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!B!!!!!!!!!!!!!!!!! | ||
1402 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1395 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1403 | !!!!!!!!!!!!!!!!!!!!!!!!!$3!"!!!!!!!9AdeA49*,8ep(990*Ah"bC@CTH#j | 1396 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!)!3!"!!!!!3% |
1404 | S!!!!!!!!!!!!!!!!!3!!!3!!!!!!!3!!!!!!!!!!!!!&!3%"!!!"!3!"!!!!!!3 | 1397 | "!3%!!3%!!!!!!!%"!!!"!3!"!!!"!!%!!!!!!!!!!!!)!3!"!3!"!3!!!!%!!!N |
1405 | !!!!!!!!!!!!!!!!!!!!!!3!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1398 | !!"G0B@028b"8EfpXBQpi)%4&3P9()$Bi5`!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1399 | !!!!!!!!!!!!!!!!!!!!!!!!r2cmr39"36!!!!B"B`!!!!!!!!!!!!!!!!!!!!!! | ||
1406 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1400 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1401 | !!$mr2cm!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"J!!!!!!!!!!!!!! | ||
1407 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1402 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1403 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!0!!%!!!!!!"9I69G&8NY6AdG98dPIF(*PCQP | ||
1404 | i,QJ!!!!!!!!!!!!!!!!"!!!"!!!!!!!"!!!!!!!!!!!!!!8"!3%!!!%"!!%!!!! | ||
1405 | !"!!!!!!!!!!!!!!!!!!!!!!"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1408 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1406 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1409 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1407 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1410 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1408 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1411 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1409 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1412 | !!!!!AepcG'&bG!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1413 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1410 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1414 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"!!%!!!P0CA* | ||
1415 | RC5"2GA3!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1416 | !!!!!!!!!!!!!!!!r2cmr39"36!!"!3!!"#!J)#!$NS0J!h6IH!-$VH!!"3)"!!% | ||
1417 | "!!%"!3!!!3!!!!!!!!!"!3%"!!%"!!%!!33!!!!!!!!!!!!!"`%"!!%!!!%!!!! | ||
1418 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1411 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1419 | !!!!!!!!!!!!!!!!!AepcG'&bG!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1412 | !!!!!!!"IAh0dBA*d!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1420 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1413 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1421 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!J | 1414 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%!!3!!#8e |
1415 | PFQGP)%peG!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1416 | !!!!!!!!!!!!!!!!!!$mr2cp"8&"-!!%"!!!%)#!J)!1ARe!$GYpi!`@Z%!!&!J% | ||
1417 | !!3%!!3%"!!!"!!!!!!!!!!%"!3%!!3%!!3!""!!!!!!!!!!!!!!(!3%!!3!!!3! | ||
1422 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1418 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1419 | !!!!!!!!!!!!!!!!!!!"IAh0dBA*d!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1423 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1420 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1424 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1421 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1422 | !#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1425 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1423 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1426 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1424 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1427 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!&!!!(6h"PEP0 | ||
1428 | 66!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!$mr2cp"8&"-!!!%!!!!"!!!!!"!!!" | ||
1429 | B`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1430 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1425 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1431 | !!!!"2cmr2`!!!!!!!!!#!!!!!J!#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1432 | !!!!!!!!!!!!!!!!!!J"3!!%!!3!"!!%!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1433 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1426 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1427 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!8!!!G2F'9 | ||
1428 | Z8e0-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!2cmr2d&38%`!!!3!!!!%!!!!!%! | ||
1429 | !!&M!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1434 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1430 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1431 | !!!!!!!%r2cmr!!!!!!!!!!)!!!!#!!)!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1432 | !!!!!!!!!!!!!!!!!!!!#!&!!!3!"!!%!!3!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1435 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1433 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1436 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1434 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1437 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!&#G$6d4&*b! | ||
1438 | R4%&835FJ*e"*3e3R!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1439 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1435 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1440 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1436 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1437 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!8*d024%8 | ||
1438 | R)#G%394"*b!R8%P$9#F!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1441 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1439 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1442 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1440 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1443 | !!!!!!!!!!!!!!K-!!!)8!!!#&3!!!KB!!!)A!!!"p!!!!HF!!!(q!!!"r3!!!IS | ||
1444 | !!!(m!!!"m`!!!IX!!!)$!!!"U!!!!DN!!!'U!!!!,!!!!#d!!!!Z!!!!,`!!!$! | ||
1445 | !!!!a!!!!-J!!!$-!!!!d!!!!03!!!$B!!!!h!!!!1!!!!$N!!!!k!!!!1`!!!BF | ||
1446 | !!!!m!!!!23!!!$i!!!!r!!!!3!!!!%%!!!',!!!!3J!!!%-!!!"%!!!!43!!!%B | ||
1447 | !!!"(!!!"k3!!!Am!!!"p!!!!IJ!!!(m!!!'5!!!"N3!!!)!!!!#"!!!!c!!!!B` | ||
1448 | !!!$0!!!!JJ!!!)-!!!$1!!!!c`!!!!N!!!(`!!!!K3!!!)B!!!#(!!!"T3!!!)J | ||
1449 | !!!#*!!!!LJ!!!)X!!!#-!!!!M3!!!)i!!!#2!!!!N!!!!!#4!!!!NJ!!!*-!!!# | ||
1450 | 8!!!!P3!!!*B!!!#A!!!"N`!!!Bi!!!'2!!!"M3!!!C!!!!!!K!!!!*J!!!#C!!! | ||
1451 | #"J!!!93!!!&9!!!"P!!!!BB!!!)*!!!##J!!!DX!!!#N!!!!T3!!!+B!!!#R!!! | ||
1452 | !U!!!!KJ!!!'X!!!!R`!!!+)!!!#M!!!"R`!!!AS!!!'Y!!!"VJ!!!AX!!!)#!!! | ||
1453 | "RJ!!!0!!!!#D!!!!Q`!!!*`!!!#G!!!!S!!!!*i!!!#K!!!!5!!!!%N!!!"+!!! | ||
1454 | !5`!!!%`!!!"0!!!!6J!!!%m!!!)(!!!##!!!!+N!!!'[!!!"X!!!!,d!!!#q!!! | ||
1455 | ![`!!!-!!!!$"!!!!d3!!!E%!!!'b!!!!`J!!!--!!!$%!!!!a3!!!-B!!!'"!!! | ||
1456 | !a`!!!-J!!!#U!!!!U`!!!+`!!!'c!!!!dJ!!!+d!!!'9!!!!b3!!!D!!!!'d!!! | ||
1457 | !bJ!!!-X!!!"3!!!!d`!!!03!!!$9!!!!eJ!!!0F!!!$B!!!"I!!!!0N!!!$D!!! | ||
1458 | !f`!!!0`!!!$G!!!!hJ!!!0m!!!$J!!!!i3!!!1)!!!$M!!!!j!!!!18!!!$Q!!! | ||
1459 | !j`!!!1J!!!$T!!!!kJ!!!1X!!!$X!!!!l3!!!1i!!!$[!!!!m!!!!2%!!!$b!!! | ||
1460 | !m`!!!23!!!$e!!!!pJ!!!2F!!!#Z!!!!V`!!!J8!!!(C!!!"l!!!!&%!!!"5!!! | ||
1461 | !8`!!!HX!!!'e!!!"YJ!!!EF!!!(K!!!"h`!!!D%!!!(D!!!"c!!!!FX!!!(E!!! | ||
1462 | "c3!!!G`!!!(1!!!"#3!!!&3!!!"9!!!!9J!!!&F!!!"B!!!!@3!!!&S!!!"E!!! | ||
1463 | !!3!!!3S!!!%,!!!"$!!!!3d!!!%1!!!"$`!!!4!!!!(e!!!"k!!!!HB!!!(P!!! | ||
1464 | "h3!!!G!!!!(L!!!"j!!!!Gi!!!(2!!!#!!!!!Im!!!(4!!!"SJ!!!!)!!!(B!!! | ||
1465 | "%3!!!4)!!!%6!!!"&!!!!48!!!%@!!!"-`!!!Ad!!!'M!!!"pJ!!!GF!!!!!!!! | ||
1466 | "dJ!!!!-!!!(@!!!"IJ!!!IF!!!(U!!!"q!!!!Hd!!!$i!!!!q3!!!2S!!!$l!!! | ||
1467 | !r!!!!2d!!!$q!!!!r`!!!3!!!!%"!!!"Z!!!!&`!!!"G!!!"&`!!!4J!!!%C!!! | ||
1468 | !X!!!!,%!!!#b!!!"i`!!!H!!!!'j!!!"d`!!!!3!!!!&!!!"e!!!!G8!!!!'!!! | ||
1469 | !"`!!!4S!!!%K!!!")J!!!5-!!!%N!!!"*3!!!5B!!!%R!!!"+!!!!5N!!!%U!!! | ||
1470 | "+`!!!5`!!!'B!!!",3!!!5i!!!'@!!!"P`!!!&i!!!"I!!!!B!!!!'%!!!"L!!! | ||
1471 | !B`!!!'3!!!"P!!!!CJ!!!'F!!!"S!!!!D3!!!'S!!!#c!!!"q3!!!I)!!!%E!!! | ||
1472 | "(!!!!4d!!!%H!!!"(`!!!5!!!!%[!!!"Q3!!!6!!!!%a!!!"QJ!!!CX!!!'k!!! | ||
1473 | "Z`!!!6)!!!'m!!!"T!!!!JX!!!)-!!!#$3!!!Ji!!!)2!!!#%!!!!Hm!!!)4!!! | ||
1474 | "!J!!!3-!!!%%!!!""3!!!3B!!!%(!!!"#!!!!,3!!!%d!!!"TJ!!!,8!!!%e!!! | ||
1475 | "0J!!!6F!!!%i!!!"13!!!6S!!!%l!!!"2!!!!6d!!!%q!!!"2`!!!8!!!!&"!!! | ||
1476 | !YJ!!!,F!!!'p!!!"lJ!!!K)!!!&#!!!"3`!!!,J!!!'q!!!"R!!!!83!!!&&!!! | ||
1477 | "4J!!!8F!!!&)!!!"R3!!!8N!!!&+!!!"5`!!!8`!!!&0!!!!#J!!!!X!!!!-!!! | ||
1478 | !$3!!!!i!!!!2!!!!%!!!!"%!!!!5!!!!%`!!!"3!!!!9!!!!&J!!!"F!!!!B!!! | ||
1479 | !'3!!!"S!!!!E!!!"[`!!!,N!!!&1!!!"6`!!!9!!!!&4!!!"`!!!!J%!!!("!!! | ||
1480 | "`J!!!"`!!!!G!!!!(J!!!"m!!!!J!!!!)3!!!#)!!!!M!!!!*!!!!#8!!!!Q!!! | ||
1481 | "8J!!!,S!!!#l!!!"``!!!F3!!!(&!!!"aJ!!!FS!!!!R!!!!+!!!!#N!!!!U!!! | ||
1482 | !+`!!!J3!!!!)!!!"8`!!!BS!!!"V!!!!E!!!!'d!!!')!!!!EJ!!!BN!!!&R!!! | ||
1483 | "D!!!!@N!!!&U!!!"D`!!!@`!!!&Y!!!"EJ!!!@m!!!&`!!!"F3!!!A)!!!'&!!! | ||
1484 | "F`!!!A3!!!&e!!!"GJ!!!B3!!!&h!!!"H!!!!AN!!!((!!!"b!!!!DF!!!(*!!! | ||
1485 | "9J!!!9F!!!'#!!!"@!!!!9N!!!&D!!!"@`!!!9`!!!&G!!!"AJ!!!9m!!!&J!!! | ||
1486 | "B3!!!@)!!!'$!!!"B`!!!@3!!!&P!!!![!!!!I%!!!"[!!!"CJ!!!(!!!!"a!!! | ||
1487 | !FJ!!!(-!!!"d!!!!G3!!!(B!!!"h!!!!H!!!!(N!!!"k!!!!H`!!!(`!!!'!!!! | ||
1488 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!-!!!!-!!!!!`!!!!bdhb6,!!! | ||
1489 | qh3!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1490 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1441 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1491 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1442 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1443 | !!!!!!!!!!!!!!J!!!3!!!!%#!3!!!!!!!3!"!`!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1444 | !!!)!!!)!!!!#!J%!!!!!!!%!!3-!!!!!!!!!!!!!!!!%!!!!!!!!!!!#!!!$!!! | ||
1445 | !!`)"!!!!!!!"!!%$!!!!!!!!!!!!!!!!"!!!!!!!!!!!!J!!"!!!!!3#!3!!!!! | ||
1446 | !!3!"!`!!!!!!!!!!!!!!!!!!!!!!!!!!!!)!!!8!!!!&!J%!!!!!!!%!!3-!!!! | ||
1447 | !!!!!!!!!!!!"!!!!!!!!!!!#!!!'!!!!"J)"!!!!!!!"!!%$!!!!!!!!!!!!!!! | ||
1448 | !"3!!!!!!!!!!!J!!"`!!!!F#!3!!!!!!!3!"!`!!!!!!!!!!!!!!!!%!!!!!!!! | ||
1449 | !!!)!!!J!!!!)!J%!!!!!!!%!!3-!!!!!!!!!!!!!!!!&!!!!!!!!!!!#!!!*!!! | ||
1450 | !#3)"!!!!!!!"!!%$!!!!!!!!!!!!!!!!"3!!!!!!!!!!!J!!#J!!!Am#!3!!!!! | ||
1451 | !!3!"!`!!!!!!!!!!!!!!!!%!!!!!!!!!!!)!!!X!!!'U!J%!!!!!!!%!!3%!!!! | ||
1452 | !!!!!!!!!!!!"!!!!!!!!!!!#!!!-!!!"U`)"!!!!!!!"!!%"!!!!!!!!!!!!!!! | ||
1453 | !!3!!!!!!!!!!!J!!$3!!!D`#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!! | ||
1454 | !!!)!!!i!!!'Y!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!#!!!2!!! | ||
1455 | "VJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!J!!%!!!!Dm#!3!!!!! | ||
1456 | !!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!)!!"%!!!'`!J%!!!!!!!%!!3%!!!! | ||
1457 | !!!!!!!!!!!!"!!!!!!!!!!!#!!!5!!!"X3)"!!!!!!!"!!%"!!!!!!!!!!!!!!! | ||
1458 | !!3!!!!!!!!!!!J!!%`!!!E)#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!! | ||
1459 | !!!)!!"3!!!'c!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!#!!!9!!! | ||
1460 | "Y!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!J!!&J!!!E8#!3!!!!! | ||
1461 | !!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!)!!"F!!!'f!J%!!!!!!!%!!3%!!!! | ||
1462 | !!!!!!!!!!!!"!!!!!!!!!!!#!!!B!!!"Y`)"!!!!!!!"!!%"!!!!!!!!!!!!!!! | ||
1463 | !!3!!!!!!!!!!!J!!'3!!!EJ#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!! | ||
1464 | !!!)!!"S!!!'j!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!#!!!E!!! | ||
1465 | "ZJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!J!!(!!!!EX#!3!!!!! | ||
1466 | !!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!)!!"d!!!'m!J%!!!!!!!%!!3%!!!! | ||
1467 | !!!!!!!!!!!!"!!!!!!!!!!!#!!!H!!!"[3)"!!!!!!!"!!%"!!!!!!!!!!!!!!! | ||
1468 | !!3!!!!!!!!!!!J!!(`!!!Ei#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!! | ||
1469 | !!!)!!#!!!!'r!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!#!!!K!!! | ||
1470 | "`!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!J!!)J!!!F%#!3!!!!! | ||
1471 | !!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!)!!#-!!!(#!J%!!!!!!!%!!3%!!!! | ||
1472 | !!!!!!!!!!!!"!!!!!!!!!!!#!!!N!!!"``)"!!!!!!!"!!%"!!!!!!!!!!!!!!! | ||
1473 | !!3!!!!!!!!!!!J!!*3!!!F3#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!! | ||
1474 | !!!)!!#B!!!(&!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!#!!!R!!! | ||
1475 | "aJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!J!!+!!!!FF#!3!!!!! | ||
1476 | !!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!)!!#N!!!()!J%!!!!!!!%!!3%!!!! | ||
1477 | !!!!!!!!!!!!"!!!!!!!!!!!#!!!U!!!"b3)"!!!!!!!"!!%"!!!!!!!!!!!!!!! | ||
1478 | !!3!!!!!!!!!!!J!!+`!!!FS#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!! | ||
1479 | !!!)!!#`!!!(,!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!#!!!Y!!! | ||
1480 | "c!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!J!!,J!!!D8#!3!!!!! | ||
1481 | !!3!"!`!!!!!!!!!!!!!!!!%!!!!!!!!!!!)!!#m!!!(0!J%!!!!!!!%!!3%!!!! | ||
1482 | !!!!!!!!!!!!"!!!!!!!!!!!#!!!`!!!"cJ)"!!!!!!!"!!%$!!!!!!!!!!!!!!! | ||
1483 | !!3!!!!!!!!!!!J!!-3!!!Fm#!3!!!!!!!3!"!`!!!!!!!!!!!!!!!!%!!!!!!!! | ||
1484 | !!!)!!$)!!!(3!J%!!!!!!!%!!3-!!!!!!!!!!!!!!!!"!!!!!!!!!!!#!!!c!!! | ||
1485 | "d33"!!!!!!!!!!%$!!!!!!!!!!!!!!!!J3!!!!!!!!!!!J!!0!!!!G)%!3!!!!! | ||
1486 | !!!!"!`!!!!!!!!!!!!!!!)%!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1492 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1487 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1493 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1488 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1494 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1489 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -1497,15 +1492,19 @@ qh3!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
1497 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1492 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1498 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1493 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1499 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1494 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1500 | !!!!!!!!!!!!U!!!!+`!!!#`!!!!Z!!!!,`!!!$!!!!!a!!!!-J!!!$-!!!!!!!! | 1495 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1496 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"!!!!!J!!!!-!!!!%!!! | ||
1497 | !"3!!!!B!!!!(!!!!#!!!!!N!!!!Y!!!!#J!!!!X!!!!-!!!!$3!!!!i!!!!2!!! | ||
1498 | !%!!!!"%!!!!5!!!!%`!!!"3!!!!9!!!!&J!!!"F!!!!B!!!!'3!!!"S!!!!E!!! | ||
1499 | !(!!!!"d!!!!H!!!!(`!!!#!!!!!K!!!!)J!!!#-!!!!N!!!!*3!!!#B!!!!R!!! | ||
1500 | !+!!!!#N!!!!U!!!!+`!!!#`!!!!Z!!!!,`!!!$!!!!!a!!!!-J!!!$-!!!!!!!! | ||
1501 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!d!!! | 1501 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!d!!! |
1502 | !3!)!!!!#!!!d!J!!(!)!!"d#!!!H!J!!(`)!!#!#!!!K!J!!)J)!!#-#!!!N!J! | 1502 | !3!)!!!!#!!!d!J!!(!)!!"d#!!!H!J!!(`)!!#!#!!!K!J!!)J)!!#-#!!!N!J! |
1503 | !*3)!!#B#!!!R!J!!+!)!!#N#!!!U!J!!+`)!!#`#!!!Y!J!!#`)!!!`#!!!0!J! | 1503 | !*3)!!#B#!!!R!J!!+!)!!#N#!!!U!J!!+`)!!#`#!!!Y!J!!#`)!!!`#!!!0!J! |
1504 | !$J)!!!m#!!!3!J!!%3)!!")#!!!6!J!!&!)!!"8#!!!@!J!!&`)!!"J#!!!C!J! | 1504 | !$J)!!!m#!!!3!J!!%3)!!")#!!!6!J!!&!)!!"8#!!!@!J!!&`)!!"J#!!!C!J! |
1505 | !'J)!!"X#!!!c!J!!0!)!!#m#!!!`!J!!-J)!!$%#!!!+!J!!!3)!!!3#!!!$!J! | 1505 | !'J)!!"X#!!!c!J!!0!)!!#m#!!!`!J!!-J)!!$%#!!!+!J!!!3)!!!3#!!!$!J! |
1506 | !!J)!!!N#!!!&!J!!"J)!!!F#!!!)!J!!,J!!!DJ!!3!S!!!!)!14bC!!2cm!!!! | 1506 | !!J)!!!N#!!!&!J!!"J)!!!F#!!!)!J!!,J!!!DN!!3!S!J!!%`)!!"3#!!!9!J! |
1507 | !!!!!!!!!!j(*N!!!!J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1507 | !&J)!!"F#!!!B!!)!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1508 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1509 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1508 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1510 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1509 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1511 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1510 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -1525,15 +1524,15 @@ qh3!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
1525 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1524 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1526 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1525 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1527 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1526 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1528 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!,#2Z! | ||
1529 | !!!!!!!!"!!,#4r!!!J!!!!!!!!!!!!!#`MD!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1530 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1527 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1528 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!#`MlJ!!! | ||
1529 | !!!!!!3!#`NI`!!)!!!!!!!!!!!!!!X)fJ!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1531 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1530 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1532 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1531 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1533 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1532 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1534 | !!!!!!!!!!!!!!!!!!J!!!3!!!!!&!!"rr`!!!!"rr`!!!!"rr`!!!!"rr`!!!!` | ||
1535 | !!3!#!!3!!!!&3!!!"J!"!!%k!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1536 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1533 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1534 | !!!!!!!!!!!!!!!)!!!%!!!!!"3!!Irm!!!!!Irm!!!!!Irm!!!!!Irm!!!!-!!% | ||
1535 | !!J!%!!!!"8!!!!B!!3!"1J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1537 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1536 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1538 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1537 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1539 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1538 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -1543,8 +1542,8 @@ qh3!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
1543 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1542 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1544 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1543 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1545 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1544 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1546 | !!!!!!!!!!!!!!3!!!2rrrrm!!!!$!!%!!6Sk!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1547 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1545 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1546 | !!!!!!!!!!!%!!!$rrrrr!!!!!`!"!!%k1J!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1548 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1547 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1549 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1548 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1550 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1549 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -1554,8 +1553,8 @@ qh3!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
1554 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1553 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1555 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1554 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1556 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1555 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1557 | !!!!!!!!!!!!!!!!!!!!!!!!"!!!!rrrrr`!!!!3!!3!"1MTTEQ0XG@4P1J!!!!! | ||
1558 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1556 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1557 | !!!!!!!!!!!!!!!!!!!!!!3!!!2rrrrm!!!!%!!%!!6SkD@jME(9NC6S!!!!!!!! | ||
1559 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1558 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1560 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1559 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1561 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1560 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -1565,8 +1564,8 @@ qh3!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
1565 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1564 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1566 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1565 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1567 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1566 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1568 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!$rrrrr3!!!!J!"!!%k!!!!!!! | ||
1569 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1567 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1568 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!rrrrrd!!!!)!!3!"1J!!!!!!!!! | ||
1570 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1569 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1571 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1570 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1572 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1571 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -1576,9 +1575,9 @@ qh3!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
1576 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1575 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1577 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1576 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1578 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1577 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1579 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!2rrrrp!!!!$!!) | ||
1580 | !!6T0B@028b"6GA"`Eh*d1J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1581 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1578 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1579 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!$rrrrr3!!!!`!#!!% | ||
1580 | k6@&M6e-J8h9`F'pbG$S!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1582 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1581 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1583 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1582 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1584 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1583 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -1587,23 +1586,20 @@ qh3!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
1587 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1586 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1588 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1587 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1589 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1588 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1590 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"!!!!rrr | ||
1591 | rrd!!!!3!!J!"1Ne66$S!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1592 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1593 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1594 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1595 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1589 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1590 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!3!!!2rrrrp | ||
1591 | !!!!%!!)!!6T08d`k!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1596 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1592 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1597 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1593 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1598 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1594 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1599 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1595 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1600 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1596 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1601 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1597 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1602 | !!!%!!!$rrrrr3!!!"3!+!!"0B@028b!f1%XJ6'PZDf9b!!!!!!!!!!!!!!!!!!! | ||
1603 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1598 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1604 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1599 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1605 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1600 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1606 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1601 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1602 | "!!!!rrrrrd!!!!8!#J!!6@&M6e-J0MK,)%aTEQYPFJ!!!!!!!!!!!!!!!!!!!!! | ||
1607 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1603 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1608 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1604 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1609 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1605 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -1615,594 +1611,591 @@ rrd!!!!3!!J!"1Ne66$S!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
1615 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1611 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1616 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1612 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1617 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1613 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1618 | !!!!!!!!!!!!!!!!!!!!!!!"(CA4)9&438b!f1%X!!!!!!!!!!!!!!!!!!!!!!!! | ||
1619 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1614 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1620 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1615 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1621 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1616 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1622 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1617 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1623 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%!!6S!!!!!!!!!!!! | 1618 | !!!!!!!!!!!!!!!!!!!!!4f9d5&488&-J0MK,!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1624 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1619 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1625 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1620 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1626 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1621 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1627 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1622 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1623 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"!!%k!!!!!!!!!!!!!!! | ||
1628 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1624 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1629 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1625 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1630 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1626 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1631 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1627 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1632 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1628 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1633 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1629 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1634 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!)!!8eKBdp6)$Bi5b" | ||
1635 | -D@jVCA)!!!!!!!!!!!!!!!!!!!!!!#""8&"-!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1636 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'!!!!" | ||
1637 | "F("X!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1638 | !!!!!!!!!!!!!!!!!!!!!!!!!!'!!!!"068a#!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1639 | !!!!!!!!!!!!!!!"-D@)J5@e`Eh*d)$Bi5`!!!!!!!!!!!!!!!!!!!!!!!!!!!!" | ||
1640 | 08%a'!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"-D@)J5@e`Eh*d)$B | ||
1641 | i5`!!!!!!!!!!!!!!!!!!!!!!!!!!!!"09d0%!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1642 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'!!!!" | ||
1643 | 23NSJ!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"08&FJ5@e`Eh*d)$B | ||
1644 | i5`!!!!!!!!!!!!!!!!!!!!!!!!!!!!"36'pL!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1645 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'!!!!" | ||
1646 | 58e*$!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1647 | !!!!!!!!!!!!!!!!!!!!!!!!!!'!!!!"849K8,Q*S!!!!!!!!!!!!!!!!!!!!!!! | ||
1648 | !!!!!!!!!!!!!!!"#B@aXEfpZ)%KPE(!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" | ||
1649 | 849K8,Q-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"09b"$,d-V+b!f1%X | ||
1650 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"849K8,Q-V+`!!!!!!!!!!!!!!!!!!!!! | ||
1651 | !!!!!!!!!!!!!!!"09b"$,d-V+b!f1%X!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" | ||
1652 | 849K8,Q0M!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"09b"$,d-V+b!f1%X | ||
1653 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"849K8,Q0`!!!!!!!!!!!!!!!!!!!!!!! | ||
1654 | !!!!!!!!!!!!!!!"09b"$,d-V+b!f1%X!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" | ||
1655 | 849K8,Q0`F!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"09b"$,d-V+b!f1%X | ||
1656 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"849K8,Q9iF!!!!!!!!!!!!!!!!!!!!!! | ||
1657 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" | ||
1658 | 849K8,QGM!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"(B@eP3fpNC5"$Efj | ||
1659 | fCA*dCA)!!!!!!!!!!!!!!!!!!%!!!!"849K8,QJ!!!!!!!!!!!!!!!!!!!!!!!! | ||
1660 | !!!!!!!!!!!!!!!"09b"$,d-V+b!f1%X!!!!!!!!!!!!!!!!!!!!!!!!!!"!!!!" | ||
1661 | 849K8,Q`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"'E'9i)&"bCA"bEf0 | ||
1662 | PFh0[FJ!!!!!!!!!!!!!!!!!!!)!!!!"849K8,R!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1663 | !!!!!!!!!!!!!!!"09b"3BA0MB@`J0MK,!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" | ||
1664 | 849K8,R"KF`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"09b"3BA0MB@`J0MK | ||
1665 | ,!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"849K8,R"MD!!!!!!!!!!!!!!!!!!!!!! | ||
1666 | !!!!!!!!!!!!!!!"09b"$,d-V+b!f1%X!!!!!!!!!!!!!!!!!!!!!!!!!!)!!!!" | ||
1667 | 849K8,R"MD#XV!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"09b"$,d-V+b!f1%X | ||
1668 | !!!!!!!!!!!!!!!!!!!!!!!!!!)!!!!"849K8,R"`G3!!!!!!!!!!!!!!!!!!!!! | ||
1669 | !!!!!!!!!!!!!!!"09b"3BA0MB@`J0MK,!!!!!!!!!!!!!!!!!!!!!!!!!)!!!!" | ||
1670 | 849K8,R)!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"5CAS!!!!!!!!!!!! | ||
1671 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"849K8,R0PC`!!!!!!!!!!!!!!!!!!!!! | ||
1672 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" | ||
1673 | 849K8,RN!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"#DA0[EL"3FQ9`FQp | ||
1674 | MCA0cEh)!!!!!!!!!!!!!!!!!!)!!!!"NEf0e!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1675 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'!!!!" | ||
1676 | bFh*M!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1677 | !!!!!!!!!!!!!!!!!!!!!!!!!!'!!!!"cD'aL!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1678 | !!!!!!!!!!!!!!!"348BJ5@e`Eh*d)$Bi5`!!!!!!!!!!!!!!!!!!!!!!!!!!!!" | ||
1679 | cG(9L!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"348BJ5@e`Eh*d)$B | ||
1680 | i5`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!,Q4[B`!!!!!!!!!!!!!!!!!!!!! | ||
1681 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!&!!!!! | ||
1682 | !!!!!,R*cFQ-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1683 | !!!!!!!!!!!!!!!!!!!!!!!!!!'!!!!!!"3%"!!%!!!!!!!!!!!!!!!!!!!!!!!! | ||
1684 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1685 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1686 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1687 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1630 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1688 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1631 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1689 | '!!!!!!%!!!!!"3!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1690 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1632 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1691 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1633 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1634 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!#!!&0B@028b!f1%XJ6'P | ||
1635 | ZDf9b!!!!!!!!!!!!!!!!!!!!!!!J39"36!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1636 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"J!!!!3A" | ||
1637 | `E!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1638 | !!!!!!!!!!!!!!!!!!!!!!!"J!!!!68e-3J!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1639 | !!!!!!!!!!!!!6'PL)%PYF'pbG#!f1%X!!!!!!!!!!!!!!!!!!!!!!!!!!!!!69" | ||
1640 | -4J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!6'PL)%PYF'pbG#!f1%X | ||
1641 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!69G$4!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1642 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"J!!!!6d* | ||
1643 | +)!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!69"A)%PYF'pbG#!f1%X | ||
1644 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!8%a[BJ!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1645 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"J!!!!8P0 | ||
1646 | 53`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1647 | !!!!!!!!!!!!!!!!!!!!!!!"J!!!!9%9B9#jLD!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1648 | !!!!!!!!!!!!!3Q&XE'p[EL")C@a`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!9%9 | ||
1649 | B9#jM!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!69FJ3bp$+bXJ0MK,!!! | ||
1650 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!9%9B9#jM+bX!!!!!!!!!!!!!!!!!!!!!!!! | ||
1651 | !!!!!!!!!!!!!69FJ3bp$+bXJ0MK,!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!9%9 | ||
1652 | B9#jMB`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!69FJ3bp$+bXJ0MK,!!! | ||
1653 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!9%9B9#jMF!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1654 | !!!!!!!!!!!!!69FJ3bp$+bXJ0MK,!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!9%9 | ||
1655 | B9#jMF(!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!69FJ3bp$+bXJ0MK,!!! | ||
1656 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!9%9B9#jPH(!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1657 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!9%9 | ||
1658 | B9#jRB`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!4f&YC80[C'8J3fpZGQ9 | ||
1659 | bG'9b!!!!!!!!!!!!!!!!!!"!!!!!9%9B9#jS!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1660 | !!!!!!!!!!!!!69FJ3bp$+bXJ0MK,!!!!!!!!!!!!!!!!!!!!!!!!!!!3!!!!9%9 | ||
1661 | B9#jX!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!4QaPH#"3FQ9`FQpMCA0 | ||
1662 | cEh)!!!!!!!!!!!!!!!!!!!#!!!!!9%9B9#j`!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1663 | !!!!!!!!!!!!!69FJ8'&cBf&X)$Bi5`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!9%9 | ||
1664 | B9#j`BA-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!69FJ8'&cBf&X)$Bi5`! | ||
1665 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!9%9B9#j`BfJ!!!!!!!!!!!!!!!!!!!!!!!! | ||
1666 | !!!!!!!!!!!!!69FJ3bp$+bXJ0MK,!!!!!!!!!!!!!!!!!!!!!!!!!!#!!!!!9%9 | ||
1667 | B9#j`BfJV+`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!69FJ3bp$+bXJ0MK,!!! | ||
1668 | !!!!!!!!!!!!!!!!!!!!!!!#!!!!!9%9B9#j`F(8!!!!!!!!!!!!!!!!!!!!!!!! | ||
1669 | !!!!!!!!!!!!!69FJ8'&cBf&X)$Bi5`!!!!!!!!!!!!!!!!!!!!!!!!#!!!!!9%9 | ||
1670 | B9#jb!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!8Q9k!!!!!!!!!!!!!!! | ||
1671 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!9%9B9#jcC@F!!!!!!!!!!!!!!!!!!!!!!!! | ||
1672 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!9%9 | ||
1673 | B9#jj!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!3QPcEfiJ8(*PF(*[Bf9 | ||
1674 | cFfpb!!!!!!!!!!!!!!!!!!#!!!!!C'pMG3!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1675 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"J!!!!FR0 | ||
1676 | bB`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1677 | !!!!!!!!!!!!!!!!!!!!!!!"J!!!!FfKXBJ!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1678 | !!!!!!!!!!!!!8%9')%PYF'pbG#!f1%X!!!!!!!!!!!!!!!!!!!!!!!!!!!!!Fh4 | ||
1679 | eBJ!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!8%9')%PYF'pbG#!f1%X | ||
1680 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!#jNEf-!!!!!!!!!!!!!!!!!!!!!!!! | ||
1681 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"3!!!!!!! | ||
1682 | !!#jbFh*M!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1683 | !!!!!!!!!!!!!!!!!!!!!!!"J!!!!!!8"!3!"!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1692 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1684 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1693 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1685 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1694 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1686 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1695 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1687 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1688 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"J! | ||
1689 | !!!!"!!!!!!8!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1696 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1690 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1697 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1691 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1698 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1692 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1699 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1693 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1700 | !!!!!!!!!!!!!!!%"!!"YB@PZ!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1701 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1694 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1702 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1695 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1703 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1696 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1704 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1697 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1705 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!J"!3%!!!!"!3%!!!%"!3! | ||
1706 | !!!!!!3%!!!%"!!%!!!%%!!!!!!!!!!!!!!J"!!%"!!%"!!!!!3!!#3!!$8GPG%K | ||
1707 | 89&"6+$Bi5bN!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1708 | !!!!!!!!!!!!!!$mr2cp"8&"-!!!#!&M!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1709 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!2cmr2`! | ||
1710 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!)!!!!!!!!!!!!!!!!!!!!!!!! | ||
1711 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1698 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1712 | !!!!!!!!!!!!!!!!!!!d!!3!!!!!!%&p09d955e0IF(*PCQPi,QJ!!!!!!!!!!!! | ||
1713 | !!!!!!!!!!!%!!!!!!!!!!!%!!!!!!!!!!!!!"3%"!3!!!3%!!3!!!!!%!!!!!!! | ||
1714 | !!!!!!!!!!!!!!!%!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1715 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1699 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1700 | !!!!!!!!!!!!"!3!!E@&TEJ!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1716 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1701 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1717 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1702 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1718 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1703 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1719 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1704 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1720 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!&p | 1705 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!)!3%"!!!!!3%"!!!"!3%!!!! |
1721 | IFh4KFR3!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1706 | !!!%"!!!"!3!"!!!""!!!!!!!!!!!!!!)!3!"!3!"!3!!!!%!!!N!!!e(CA4)9&4 |
1707 | 38bJf1%XT!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1708 | !!!!!!!!!!!!r2cmr39"36!!!!J"B`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1709 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!$mr2cm!!!! | ||
1710 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!#!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1722 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1711 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1723 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!3!"!!!*6@9bCf8J6h9 | 1712 | !!!!!!!!!!!!!!!!0!!%!!!!!!""I69G&8NY6Ah"bC@CTH#jS!!!!!!!!!!!!!!! |
1724 | d!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1713 | !!!!!!!!"!!!!!!!!!!!"!!!!!!!!!!!!!!8"!3%!!!%"!!%!!!!!"!!!!!!!!!! |
1725 | !!!!!!!!!2cmr2d&38%`!!3%!!!3J)#!J!j+$B!0dhhJ$!khJ!!8#!3!"!3!"!3% | 1714 | !!!!!!!!!!!!"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1726 | !!!%!!!!!!!!!!3%"!3!"!3!"!!%%!!!!!!!!!!!!!!F"!3!"!!!"!!!!!!!!!!! | ||
1727 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1728 | !!!!!!!!!!&pIFh4KFR3!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1729 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1730 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!)!!!!!!! | ||
1731 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1732 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1733 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1734 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1735 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1736 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"3!!#%GPG%K89&"6!!! | ||
1737 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!r2cmr39"36!!!"!!!!!3!!!!!3!!!@-!!!!! | ||
1738 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1739 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!6m | ||
1740 | r2cm!!!!!!!!!!J!!!!)!!J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1741 | !!!!!!!!!!!)!8!!"!!%!!3!"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1742 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1743 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1744 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1745 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1746 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"3R3dp%45FJ*d4"9%% | ||
1747 | R)#G35808*`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1748 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1749 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1750 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1751 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1752 | !!!!$!!!"!!!!#J)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!!J! | ||
1753 | !!!X#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!!-!!!!-!J%!!!! | ||
1754 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!!%!!!!$3)"!!!!!!!"!!%"!!! | ||
1755 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!!"3!!!!i#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1756 | !!!%!!!!!!!!!!!-!!!B!!!!2!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1757 | !!!!$!!!(!!!!%!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!#!! | ||
1758 | !!"%#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!!N!!!!5!J%!!!! | ||
1759 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!!+!!!!%`)"!!!!!!!"!!%"!!! | ||
1760 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!!#`!!!"3#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1761 | !!!%!!!!!!!!!!!-!!!`!!!!9!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1762 | !!!!$!!!0!!!!&J)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!$J! | ||
1763 | !!"F#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!!m!!!!B!J%!!!! | ||
1764 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!!3!!!!'3)"!!!!!!!"!!%"!!! | ||
1765 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!!%3!!!"S#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1766 | !!!%!!!!!!!!!!!-!!")!!!!E!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1767 | !!!!$!!!6!!!!(!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!&!! | ||
1768 | !!"d#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!"8!!!!H!J%!!!! | ||
1769 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!!@!!!!(`)"!!!!!!!"!!%"!!! | ||
1770 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!!&`!!!#!#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1771 | !!!%!!!!!!!!!!!-!!"J!!!!K!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1772 | !!!!$!!!C!!!!)J)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!'J! | ||
1773 | !!#-#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!"X!!!!N!J%!!!! | ||
1774 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!!F!!!!*3)"!!!!!!!"!!%"!!! | ||
1775 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!!(3!!!#B#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1776 | !!!%!!!!!!!!!!!-!!"i!!!!R!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1777 | !!!!$!!!I!!!!+!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!)!! | ||
1778 | !!#N#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!#%!!!!U!J%!!!! | ||
1779 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!!L!!!!+`)"!!!!!!!"!!%"!!! | ||
1780 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!!)`!!!#`#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1781 | !!!%!!!!!!!!!!!-!!#3!!!!Y!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1782 | !!!!$!!!P!!!!,J)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!*J! | ||
1783 | !!#m#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!#F!!!!`!J%!!!! | ||
1784 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!!S!!!!-3)"!!!!!!!"!!%"!!! | ||
1785 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!!+3!!!$)#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1786 | !!!%!!!!!!!!!!!-!!#S!!!!c!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1787 | !!!!$!!!V!!!!0!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!,!! | ||
1788 | !!$8#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!#d!!!!f!J%!!!! | ||
1789 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!!Z!!!!0`)"!!!!!!!"!!%"!!! | ||
1790 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!!,`!!!$J#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1791 | !!!%!!!!!!!!!!!-!!$!!!!!j!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1792 | !!!!$!!!a!!!!1J)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!-J! | ||
1793 | !!$X#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!$-!!!!m!J%!!!! | ||
1794 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!!d!!!!23)"!!!!!!!"!!%"!!! | ||
1795 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!!03!!!$i#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1796 | !!!%!!!!!!!!!!!-!!$B!!!!r!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1797 | !!!!$!!!h!!!!3!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!1!! | ||
1798 | !!%%#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!$N!!!"#!J%!!!! | ||
1799 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!!k!!!!3`)"!!!!!!!"!!%"!!! | ||
1800 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!!1`!!!%3#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1801 | !!!%!!!!!!!!!!!-!!$`!!!"&!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1802 | !!!!$!!!p!!!!4J)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!2J! | ||
1803 | !!%F#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!$m!!!")!J%!!!! | ||
1804 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!"!!!!!53)"!!!!!!!"!!%"!!! | ||
1805 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!!33!!!%S#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1806 | !!!%!!!!!!!!!!!-!!%)!!!",!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1807 | !!!!$!!"$!!!!6!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!4!! | ||
1808 | !!%d#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!%8!!!"1!J%!!!! | ||
1809 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!"'!!!!6`)"!!!!!!!"!!%"!!! | ||
1810 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!!4`!!!&!#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1811 | !!!%!!!!!!!!!!!-!!%J!!!"4!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1812 | !!!!$!!"*!!!!8J)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!5J! | ||
1813 | !!&-#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!%X!!!"8!J%!!!! | ||
1814 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!"-!!!!93)"!!!!!!!"!!%"!!! | ||
1815 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!!63!!!&B#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1816 | !!!%!!!!!!!!!!!-!!%i!!!"A!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1817 | !!!!$!!"2!!!!@!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!8!! | ||
1818 | !!&N#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!&%!!!"D!J%!!!! | ||
1819 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!"5!!!!@`)"!!!!!!!"!!%"!!! | ||
1820 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!!8`!!!&`#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1821 | !!!%!!!!!!!!!!!-!!&3!!!"G!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1822 | !!!!$!!"9!!!!AJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!9J! | ||
1823 | !!&m#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!&F!!!"J!J%!!!! | ||
1824 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!"B!!!!B3)"!!!!!!!"!!%"!!! | ||
1825 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!!@3!!!')#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1826 | !!!%!!!!!!!!!!!-!!&S!!!"M!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1827 | !!!!$!!"E!!!!C!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!A!! | ||
1828 | !!'8#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!&d!!!"Q!J%!!!! | ||
1829 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!"H!!!!C`)"!!!!!!!"!!%"!!! | ||
1830 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!!A`!!!'J#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1831 | !!!%!!!!!!!!!!!-!!'!!!!"T!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1832 | !!!!$!!"K!!!!DJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!BJ! | ||
1833 | !!'X#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!'-!!!"X!J%!!!! | ||
1834 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!"N!!!!E3)"!!!!!!!"!!%"!!! | ||
1835 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!!C3!!!'i#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1836 | !!!%!!!!!!!!!!!-!!'B!!!"[!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1837 | !!!!$!!"R!!!!F!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!D!! | ||
1838 | !!(%#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!'N!!!"b!J%!!!! | ||
1839 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!"U!!!!F`)"!!!!!!!"!!%"!!! | ||
1840 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!!D`!!!(3#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1841 | !!!%!!!!!!!!!!!-!!'`!!!"e!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1842 | !!!!$!!"Y!!!!GJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!EJ! | ||
1843 | !!(F#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!'m!!!"i!J%!!!! | ||
1844 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!"`!!!!H3)"!!!!!!!"!!%"!!! | ||
1845 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!!F3!!!(S#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1846 | !!!%!!!!!!!!!!!-!!()!!!"l!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1847 | !!!!$!!"c!!!!I!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!G!! | ||
1848 | !!(d#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!(8!!!"q!J%!!!! | ||
1849 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!"f!!!!I`)"!!!!!!!"!!%"!!! | ||
1850 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!!G`!!!)!#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1851 | !!!%!!!!!!!!!!!-!!(J!!!#"!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1852 | !!!!$!!"j!!!!JJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!HJ! | ||
1853 | !!)-#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!(X!!!#%!J%!!!! | ||
1854 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!"m!!!!K3)"!!!!!!!"!!%"!!! | ||
1855 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!!I3!!!)B#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1856 | !!!%!!!!!!!!!!!-!!(i!!!#(!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1857 | !!!!$!!"r!!!!L!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!J!! | ||
1858 | !!)N#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!)%!!!#+!J%!!!! | ||
1859 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!##!!!!L`)"!!!!!!!"!!%"!!! | ||
1860 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!!J`!!!)`#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1861 | !!!%!!!!!!!!!!!-!!)3!!!#0!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1862 | !!!!$!!#&!!!!MJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!KJ! | ||
1863 | !!)m#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!)F!!!#3!!)"!!! | ||
1864 | !!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!L!!!!*%#!3!!!!!!!3!"!3! | ||
1865 | !!!!!!!!!!!!!!!%!!!!!!!!!!!-!!)N!!!#5!J%!!!!!!!%!!3%!!!!!!!!!!!! | ||
1866 | !!!!"!!!!!!!!!!!$!!#+!!!!N`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!! | ||
1867 | !!!!!!`!!L`!!!*3#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!)` | ||
1868 | !!!#9!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!#0!!!!PJ)"!!! | ||
1869 | !!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!MJ!!!*F#!3!!!!!!!3!"!3! | ||
1870 | !!!!!!!!!!!!!!!%!!!!!!!!!!!-!!)m!!!#B!J%!!!!!!!%!!3%!!!!!!!!!!!! | ||
1871 | !!!!"!!!!!!!!!!!$!!#3!!!!!*N#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
1872 | !!!!!!!-!!*%!!!#D!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!# | ||
1873 | 5!!!!Q`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!N`!!!*`#!3! | ||
1874 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!*3!!!#G!J%!!!!!!!%!!3% | ||
1875 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!#9!!!!RJ)"!!!!!!!"!!%"!!!!!!!!!!! | ||
1876 | !!!!!!3!!!!!!!!!!!`!!PJ!!!*m#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
1877 | !!!!!!!-!!*F!!!#J!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!# | ||
1878 | B!!!!S3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!Q3!!!+)#!3! | ||
1879 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!*S!!!#M!J%!!!!!!!%!!3% | ||
1880 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!#E!!!!T!)"!!!!!!!"!!%"!!!!!!!!!!! | ||
1881 | !!!!!!3!!!!!!!!!!!`!!R!!!!+8#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
1882 | !!!!!!!-!!*d!!!#Q!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!# | ||
1883 | H!!!!T`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!R`!!!+J#!3! | ||
1884 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!+!!!!#T!J%!!!!!!!%!!3% | ||
1885 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!#K!!!!UJ)"!!!!!!!"!!%"!!!!!!!!!!! | ||
1886 | !!!!!!3!!!!!!!!!!!`!!SJ!!!+X#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
1887 | !!!!!!!-!!+-!!!#X!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!# | ||
1888 | N!!!!V3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!T3!!!+i#!3! | ||
1889 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!+B!!!#[!J%!!!!!!!%!!3% | ||
1890 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!#R!!!!X!)"!!!!!!!"!!%"!!!!!!!!!!! | ||
1891 | !!!!!!3!!!!!!!!!!!`!!U!!!!,%#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
1892 | !!!!!!!-!!+N!!!#b!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!# | ||
1893 | U!!!!X`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!U`!!!,3#!3! | ||
1894 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!+`!!!#e!J%!!!!!!!%!!3% | ||
1895 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!#Y!!!!YJ)"!!!!!!!"!!%"!!!!!!!!!!! | ||
1896 | !!!!!!3!!!!!!!!!!!`!!VJ!!!,F#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
1897 | !!!!!!!-!!+m!!!#i!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!# | ||
1898 | `!!!!Z3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!X3!!!,S#!3! | ||
1899 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!,)!!!#l!J%!!!!!!!%!!3% | ||
1900 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!#c!!!![!)"!!!!!!!"!!%"!!!!!!!!!!! | ||
1901 | !!!!!!3!!!!!!!!!!!`!!Y!!!!,d#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
1902 | !!!!!!!-!!,8!!!#q!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!# | ||
1903 | f!!!![`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!Y`!!!-!#!3! | ||
1904 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!,J!!!$"!J%!!!!!!!%!!3% | ||
1905 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!#j!!!!`J)"!!!!!!!"!!%"!!!!!!!!!!! | ||
1906 | !!!!!!3!!!!!!!!!!!`!!ZJ!!!--#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
1907 | !!!!!!!-!!,X!!!$%!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!# | ||
1908 | m!!!!a3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!![3!!!-B#!3! | ||
1909 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!,i!!!$(!J%!!!!!!!%!!3% | ||
1910 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!#r!!!!b!)"!!!!!!!"!!%"!!!!!!!!!!! | ||
1911 | !!!!!!3!!!!!!!!!!!`!!`!!!!-N#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
1912 | !!!!!!!-!!-%!!!$+!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!$ | ||
1913 | #!!!!b`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!``!!!-`#!3! | ||
1914 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!-3!!!$0!J%!!!!!!!%!!3% | ||
1915 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!$&!!!!cJ)"!!!!!!!"!!%"!!!!!!!!!!! | ||
1916 | !!!!!!3!!!!!!!!!!!`!!aJ!!!-m#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
1917 | !!!!!!!-!!-F!!!$3!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!$ | ||
1918 | )!!!!d3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!b3!!!0)#!3! | ||
1919 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!-S!!!$6!J%!!!!!!!%!!3% | ||
1920 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!$,!!!!e!)"!!!!!!!"!!%"!!!!!!!!!!! | ||
1921 | !!!!!!3!!!!!!!!!!!`!!c!!!!08#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
1922 | !!!!!!!-!!-d!!!$@!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!$ | ||
1923 | 1!!!!e`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!c`!!!0J#!3! | ||
1924 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!0!!!!$C!J%!!!!!!!%!!3% | ||
1925 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!$4!!!!fJ)"!!!!!!!"!!%"!!!!!!!!!!! | ||
1926 | !!!!!!3!!!!!!!!!!!`!!dJ!!!0X#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
1927 | !!!!!!!-!!0-!!!$F!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!$ | ||
1928 | 8!!!!h3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!e3!!!0i#!3! | ||
1929 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!0B!!!$I!J%!!!!!!!%!!3% | ||
1930 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!$A!!!!i!)"!!!!!!!"!!%"!!!!!!!!!!! | ||
1931 | !!!!!!3!!!!!!!!!!!`!!f!!!!1%#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
1932 | !!!!!!!-!!0N!!!$L!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!$ | ||
1933 | D!!!!i`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!f`!!!13#!3! | ||
1934 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!0`!!!$P!J%!!!!!!!%!!3% | ||
1935 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!$G!!!!jJ)"!!!!!!!"!!%"!!!!!!!!!!! | ||
1936 | !!!!!!3!!!!!!!!!!!`!!hJ!!!1F#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
1937 | !!!!!!!-!!0m!!!$S!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!$ | ||
1938 | J!!!!k3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!i3!!!1S#!3! | ||
1939 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!1)!!!$V!J%!!!!!!!%!!3% | ||
1940 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!$M!!!!l!)"!!!!!!!"!!%"!!!!!!!!!!! | ||
1941 | !!!!!!3!!!!!!!!!!!`!!j!!!!1d#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
1942 | !!!!!!!-!!18!!!$Z!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!$ | ||
1943 | Q!!!!l`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!j`!!!2!#!3! | ||
1944 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!1J!!!$a!J%!!!!!!!%!!3% | ||
1945 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!$T!!!!mJ)"!!!!!!!"!!%"!!!!!!!!!!! | ||
1946 | !!!!!!3!!!!!!!!!!!`!!kJ!!!2-#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
1947 | !!!!!!!-!!1X!!!$d!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!$ | ||
1948 | X!!!!p3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!l3!!!2B#!3! | ||
1949 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!1i!!!$h!J%!!!!!!!%!!3% | ||
1950 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!$[!!!!q!)"!!!!!!!"!!%"!!!!!!!!!!! | ||
1951 | !!!!!!3!!!!!!!!!!!`!!m!!!!2N#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
1952 | !!!!!!!-!!2%!!!$k!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!$ | ||
1953 | b!!!!q`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!m`!!!2`#!3! | ||
1954 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!23!!!$p!J%!!!!!!!%!!3% | ||
1955 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!$e!!!!rJ)"!!!!!!!"!!%"!!!!!!!!!!! | ||
1956 | !!!!!!3!!!!!!!!!!!`!!pJ!!!2m#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
1957 | !!!!!!!-!!2F!!!%!!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!$ | ||
1958 | i!!!"!3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!q3!!!3)#!3! | ||
1959 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!2S!!!%$!J%!!!!!!!%!!3% | ||
1960 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!$l!!!""!)"!!!!!!!"!!%"!!!!!!!!!!! | ||
1961 | !!!!!!3!!!!!!!!!!!`!!r!!!!38#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
1962 | !!!!!!!-!!2d!!!%'!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!$ | ||
1963 | q!!!""`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!r`!!!3J#!3! | ||
1964 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!3!!!!%*!J%!!!!!!!%!!3% | ||
1965 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!%"!!!"#J)"!!!!!!!"!!%"!!!!!!!!!!! | ||
1966 | !!!!!!3!!!!!!!!!!!`!"!J!!!3X#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
1967 | !!!!!!!-!!3-!!!%-!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!% | ||
1968 | %!!!"$3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!""3!!!3i#!3! | ||
1969 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!3B!!!%2!J%!!!!!!!%!!3% | ||
1970 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!%(!!!"%!)"!!!!!!!"!!%"!!!!!!!!!!! | ||
1971 | !!!!!!3!!!!!!!!!!!`!"#!!!!4%#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
1972 | !!!!!!!-!!3N!!!%5!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!% | ||
1973 | +!!!"%`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"#`!!!43#!3! | ||
1974 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!3`!!!%9!J%!!!!!!!%!!3% | ||
1975 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!%0!!!"&J)"!!!!!!!"!!%"!!!!!!!!!!! | ||
1976 | !!!!!!3!!!!!!!!!!!`!"$J!!!4F#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
1977 | !!!!!!!-!!3m!!!%B!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!% | ||
1978 | 3!!!"'3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"%3!!!4S#!3! | ||
1979 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!4)!!!%E!J%!!!!!!!%!!3% | ||
1980 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!%6!!!"(!)"!!!!!!!"!!%"!!!!!!!!!!! | ||
1981 | !!!!!!3!!!!!!!!!!!`!"&!!!!4d#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
1982 | !!!!!!!-!!48!!!%H!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!% | ||
1983 | @!!!"(`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"&`!!!5!#!3! | ||
1984 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!4J!!!%K!J%!!!!!!!%!!3% | ||
1985 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!%C!!!")J)"!!!!!!!"!!%"!!!!!!!!!!! | ||
1986 | !!!!!!3!!!!!!!!!!!`!"'J!!!5-#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
1987 | !!!!!!!-!!4X!!!%N!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!% | ||
1988 | F!!!"*3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"(3!!!5B#!3! | ||
1989 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!4i!!!%R!J%!!!!!!!%!!3% | ||
1990 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!%I!!!"+!)"!!!!!!!"!!%"!!!!!!!!!!! | ||
1991 | !!!!!!3!!!!!!!!!!!`!")!!!!5N#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
1992 | !!!!!!!-!!5%!!!%U!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!% | ||
1993 | L!!!"+`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!")`!!!5`#!3! | ||
1994 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!53!!!%Y!J%!!!!!!!%!!3% | ||
1995 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!%P!!!",J)"!!!!!!!"!!%"!!!!!!!!!!! | ||
1996 | !!!!!!3!!!!!!!!!!!`!"*J!!!5m#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
1997 | !!!!!!!-!!5F!!!%`!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!% | ||
1998 | S!!!"-3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"+3!!!6)#!3! | ||
1999 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!5S!!!%c!J%!!!!!!!%!!3% | ||
2000 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!%V!!!"0!)"!!!!!!!"!!%"!!!!!!!!!!! | ||
2001 | !!!!!!3!!!!!!!!!!!`!",!!!!68#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
2002 | !!!!!!!-!!5d!!!%f!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!% | ||
2003 | Z!!!"0`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!",`!!!6J#!3! | ||
2004 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!6!!!!%j!J%!!!!!!!%!!3% | ||
2005 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!%a!!!"1J)"!!!!!!!"!!%"!!!!!!!!!!! | ||
2006 | !!!!!!3!!!!!!!!!!!`!"-J!!!6X#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
2007 | !!!!!!!-!!6-!!!%m!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!% | ||
2008 | d!!!"23)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"03!!!6i#!3! | ||
2009 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!6B!!!%r!J%!!!!!!!%!!3% | ||
2010 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!%h!!!"3!)"!!!!!!!"!!%"!!!!!!!!!!! | ||
2011 | !!!!!!3!!!!!!!!!!!`!"1!!!!8%#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
2012 | !!!!!!!-!!6N!!!&#!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!% | ||
2013 | k!!!"3`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"1`!!!83#!3! | ||
2014 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!6`!!!&&!J%!!!!!!!%!!3% | ||
2015 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!%p!!!"4J)"!!!!!!!"!!%"!!!!!!!!!!! | ||
2016 | !!!!!!3!!!!!!!!!!!`!"2J!!!8F#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
2017 | !!!!!!!-!!6m!!!&)!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!& | ||
2018 | !!!!"53)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"33!!!8S#!3! | ||
2019 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!8)!!!&,!J%!!!!!!!%!!3% | ||
2020 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!&$!!!"6!)"!!!!!!!"!!%"!!!!!!!!!!! | ||
2021 | !!!!!!3!!!!!!!!!!!`!"4!!!!8d#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
2022 | !!!!!!!-!!88!!!&1!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!& | ||
2023 | '!!!"6`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"4`!!!9!#!3! | ||
2024 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!8J!!!&4!J%!!!!!!!%!!3% | ||
2025 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!&*!!!"8J)"!!!!!!!"!!%"!!!!!!!!!!! | ||
2026 | !!!!!!3!!!!!!!!!!!`!"5J!!!9-#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
2027 | !!!!!!!-!!8X!!!&8!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!& | ||
2028 | -!!!"93)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"63!!!9B#!3! | ||
2029 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!8i!!!&A!J%!!!!!!!%!!3% | ||
2030 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!&2!!!"@!)"!!!!!!!"!!%"!!!!!!!!!!! | ||
2031 | !!!!!!3!!!!!!!!!!!`!"8!!!!9N#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
2032 | !!!!!!!-!!9%!!!&D!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!& | ||
2033 | 5!!!"@`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"8`!!!9`#!3! | ||
2034 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!93!!!&G!J%!!!!!!!%!!3% | ||
2035 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!&9!!!"AJ)"!!!!!!!"!!%"!!!!!!!!!!! | ||
2036 | !!!!!!3!!!!!!!!!!!`!"9J!!!9m#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
2037 | !!!!!!!-!!9F!!!&J!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!& | ||
2038 | B!!!"B3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"@3!!!@)#!3! | ||
2039 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!9S!!!&M!J%!!!!!!!%!!3% | ||
2040 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!&E!!!"C!)"!!!!!!!"!!%"!!!!!!!!!!! | ||
2041 | !!!!!!3!!!!!!!!!!!`!"A!!!!@8#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
2042 | !!!!!!!-!!9d!!!&Q!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!& | ||
2043 | H!!!"C`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"A`!!!@J#!3! | ||
2044 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!@!!!!&T!J%!!!!!!!%!!3% | ||
2045 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!&K!!!"DJ)"!!!!!!!"!!%"!!!!!!!!!!! | ||
2046 | !!!!!!3!!!!!!!!!!!`!"BJ!!!@X#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
2047 | !!!!!!!-!!@-!!!&X!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!& | ||
2048 | N!!!"E3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"C3!!!@i#!3! | ||
2049 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!@B!!!&[!J%!!!!!!!%!!3% | ||
2050 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!&R!!!"F!)"!!!!!!!"!!%"!!!!!!!!!!! | ||
2051 | !!!!!!3!!!!!!!!!!!`!"D!!!!A%#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
2052 | !!!!!!!-!!@N!!!&b!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!& | ||
2053 | U!!!"F`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"D`!!!A3#!3! | ||
2054 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!@`!!!&e!J%!!!!!!!%!!3% | ||
2055 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!&Y!!!"GJ)"!!!!!!!"!!%"!!!!!!!!!!! | ||
2056 | !!!!!!3!!!!!!!!!!!`!"EJ!!!AF#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
2057 | !!!!!!!-!!@m!!!&i!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!& | ||
2058 | `!!!"H3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"F3!!!AS#!3! | ||
2059 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!A)!!!&l!J%!!!!!!!%!!3% | ||
2060 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!&c!!!"I!)"!!!!!!!"!!%"!!!!!!!!!!! | ||
2061 | !!!!!!3!!!!!!!!!!!`!"G!!!!Ad#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
2062 | !!!!!!!-!!A8!!!&q!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!& | ||
2063 | f!!!"J!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"G`!!!B%#!3! | ||
2064 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!AJ!!!'#!J%!!!!!!!%!!3% | ||
2065 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!&j!!!"J`)"!!!!!!!"!!%"!!!!!!!!!!! | ||
2066 | !!!!!!3!!!!!!!!!!!`!"HJ!!!B3#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
2067 | !!!!!!!-!!AX!!!'&!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!& | ||
2068 | m!!!"KJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"I3!!!BF#!3! | ||
2069 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!Ai!!!')!J%!!!!!!!%!!3% | ||
2070 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!&r!!!"L3)"!!!!!!!"!!%"!!!!!!!!!!! | ||
2071 | !!!!!!3!!!!!!!!!!!`!"J!!!!BS#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
2072 | !!!!!!!-!!B%!!!',!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!' | ||
2073 | #!!!"M!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"J`!!!Bd#!3! | ||
2074 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!B3!!!'1!J%!!!!!!!%!!3% | ||
2075 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!'&!!!"M`)"!!!!!!!"!!%"!!!!!!!!!!! | ||
2076 | !!!!!!3!!!!!!!!!!!`!"KJ!!!C!!!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!! | ||
2077 | !!!!!!!!$!!'(!!!"N3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`! | ||
2078 | "L!!!!C)#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!BN!!!'6!J% | ||
2079 | !!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!'+!!!"P!)"!!!!!!!"!!% | ||
2080 | "!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"L`!!!C8#!3!!!!!!!3!"!3!!!!!!!!! | ||
2081 | !!!!!!!%!!!!!!!!!!!-!!B`!!!'@!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!! | ||
2082 | !!!!!!!!$!!'0!!!"P`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`! | ||
2083 | "MJ!!!CJ#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!Bm!!!'C!J% | ||
2084 | !!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!'3!!!!!CS#!3!!!!!!!3! | ||
2085 | "!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!C%!!!'E!J%!!!!!!!%!!3%!!!!!!!! | ||
2086 | !!!!!!!!"!!!!!!!!!!!$!!'5!!!"R!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3! | ||
2087 | !!!!!!!!!!`!"N`!!!Cd#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!- | ||
2088 | !!C3!!!'H!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!'9!!!"R`) | ||
2089 | "!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"PJ!!!D!#!3!!!!!!!3! | ||
2090 | "!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!CF!!!'K!J%!!!!!!!%!!3%!!!!!!!! | ||
2091 | !!!!!!!!"!!!!!!!!!!!$!!'B!!!"SJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3! | ||
2092 | !!!!!!!!!!`!"Q3!!!D-#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!- | ||
2093 | !!CS!!!(5!J%!!!!!!!%!!3-!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!'E!!!"d`) | ||
2094 | "!!!!!!!"!!%$!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"R!!!!G3#!3!!!!!!!3! | ||
2095 | "!`!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!Cd!!!(9!J%!!!!!!!%!!3-!!!!!!!! | ||
2096 | !!!!!!!!"!!!!!!!!!!!$!!'H!!!"T!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3! | ||
2097 | !!!!!!!!!!`!"R`!!!GB#!3!!!!!!!3!"!`!!!!!!!!!!!!!!!!%!!!!!!!!!!!- | ||
2098 | !!D!!!!(A!J%!!!!!!!%!!3-!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!'K!!!"f!) | ||
2099 | "!!!!!!!"!!%$!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"SJ!!!GN#!3!!!!!!!3! | ||
2100 | "!`!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!D-!!!'Q!J%!!!!!!!%!!3%!!!!!!!! | ||
2101 | !!!!!!!!"!!!!!!!!!!!$!!'N!!!"T`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3! | ||
2102 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2103 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2104 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2105 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2106 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2107 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2108 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2109 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2110 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2111 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2112 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2113 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2114 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2115 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2116 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2117 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2118 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2119 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2120 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2121 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2122 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2123 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2124 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2125 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"!!!!!J!!!!-!!!!%!!!!"3! | ||
2126 | !!!B!!!!(!!!!#!!!!!N!!!!+!!!!#`!!!!`!!!!0!!!!$J!!!!m!!!!3!!!!%3! | ||
2127 | !!")!!!!6!!!!&!!!!"8!!!!@!!!!&`!!!"J!!!!C!!!!'J!!!"X!!!!F!!!!(3! | ||
2128 | !!"i!!!!I!!!!)!!!!#%!!!!L!!!!)`!!!#3!!!!P!!!!*J!!!#F!!!!S!!!!+3! | ||
2129 | !!#S!!!!V!!!!,!!!!#d!!!!Z!!!!,`!!!$!!!!!a!!!!-J!!!$-!!!!d!!!!03! | ||
2130 | !!$B!!!!h!!!!1!!!!$N!!!!k!!!!1`!!!$`!!!!p!!!!2J!!!$m!!!"!!!!!33! | ||
2131 | !!%)!!!"$!!!!4!!!!%8!!!"'!!!!4`!!!%J!!!"*!!!!5J!!!%X!!!"-!!!!63! | ||
2132 | !!%i!!!"2!!!!8!!!!&%!!!"5!!!!8`!!!&3!!!"9!!!!9J!!!&F!!!"B!!!!@3! | ||
2133 | !!&S!!!"E!!!!A!!!!&d!!!"H!!!!A`!!!'!!!!"K!!!!BJ!!!'-!!!"N!!!!C3! | ||
2134 | !!'B!!!"R!!!!D!!!!'N!!!"U!!!!D`!!!'`!!!"Y!!!!EJ!!!'m!!!"`!!!!F3! | ||
2135 | !!()!!!"c!!!!G!!!!(8!!!"f!!!!G`!!!(J!!!"j!!!!HJ!!!(X!!!"m!!!!I3! | ||
2136 | !!(i!!!"r!!!!J!!!!)%!!!##!!!!J`!!!)3!!!#&!!!!KJ!!!)F!!!#)!!!!L3! | ||
2137 | !!)S!!!#,!!!!M!!!!)d!!!#1!!!!M`!!!*!!!!!!N3!!!*)!!!#6!!!!P!!!!*8 | ||
2138 | !!!#@!!!!P`!!!*J!!!#C!!!!QJ!!!*X!!!#F!!!!R3!!!*i!!!#I!!!!S!!!!+% | ||
2139 | !!!#L!!!!S`!!!+3!!!#P!!!!TJ!!!+F!!!#S!!!!U3!!!+S!!!#V!!!!V!!!!+d | ||
2140 | !!!#Z!!!!V`!!!,!!!!#a!!!!XJ!!!,-!!!#d!!!!Y3!!!,B!!!#h!!!!Z!!!!,N | ||
2141 | !!!#k!!!!Z`!!!,`!!!#p!!!![J!!!,m!!!$!!!!!`3!!!-)!!!$$!!!!a!!!!-8 | ||
2142 | !!!$'!!!!a`!!!-J!!!$*!!!!bJ!!!-X!!!$-!!!!c3!!!-i!!!$2!!!!d!!!!0% | ||
2143 | !!!$5!!!!d`!!!03!!!$9!!!!eJ!!!0F!!!$B!!!!f3!!!0S!!!$E!!!!h!!!!0d | ||
2144 | !!!$H!!!!h`!!!1!!!!$K!!!!iJ!!!1-!!!$N!!!!j3!!!1B!!!$R!!!!k!!!!1N | ||
2145 | !!!$U!!!!k`!!!1`!!!$Y!!!!lJ!!!1m!!!$`!!!!m3!!!2)!!!$c!!!!p!!!!28 | ||
2146 | !!!$f!!!!p`!!!2J!!!$j!!!!qJ!!!2X!!!$m!!!!r3!!!2i!!!$r!!!"!!!!!3% | ||
2147 | !!!%#!!!"!`!!!33!!!%&!!!""J!!!3F!!!%)!!!"#3!!!3S!!!%,!!!"$!!!!3d | ||
2148 | !!!%1!!!"$`!!!4!!!!%4!!!"%J!!!4-!!!%8!!!"&3!!!4B!!!%A!!!"'!!!!4N | ||
2149 | !!!%D!!!"'`!!!4`!!!%G!!!"(J!!!4m!!!%J!!!")3!!!5)!!!%M!!!"*!!!!58 | ||
2150 | !!!%Q!!!"*`!!!5J!!!%T!!!"+J!!!5X!!!%X!!!",3!!!5i!!!%[!!!"-!!!!6% | ||
2151 | !!!%b!!!"-`!!!63!!!%e!!!"0J!!!6F!!!%i!!!"13!!!6S!!!%l!!!"2!!!!6d | ||
2152 | !!!%q!!!"2`!!!8!!!!&"!!!"3J!!!8-!!!&%!!!"43!!!8B!!!&(!!!"5!!!!8N | ||
2153 | !!!&+!!!"5`!!!8`!!!&0!!!"6J!!!8m!!!&3!!!"83!!!9)!!!&6!!!"9!!!!98 | ||
2154 | !!!&@!!!"9`!!!9J!!!&C!!!"@J!!!9X!!!&F!!!"A3!!!9i!!!&I!!!"B!!!!@% | ||
2155 | !!!&L!!!"B`!!!@3!!!&P!!!"CJ!!!@F!!!&S!!!"D3!!!@S!!!&V!!!"E!!!!@d | ||
2156 | !!!&Z!!!"E`!!!A!!!!&a!!!"FJ!!!A-!!!&d!!!"G3!!!AB!!!&h!!!"H!!!!AN | ||
2157 | !!!&k!!!"H`!!!A`!!!&p!!!"IJ!!!Am!!!'!!!!"J3!!!B)!!!'$!!!"K!!!!B8 | ||
2158 | !!!''!!!"K`!!!BJ!!!'*!!!"LJ!!!BX!!!'-!!!"M3!!!Bi!!!'2!!!"N!!!!!' | ||
2159 | 4!!!"NJ!!!C-!!!'8!!!"P3!!!CB!!!'A!!!"Q!!!!Cd!!!'L!!!"S`!!!CN!!!' | ||
2160 | D!!!"Q`!!!C`!!!'H!!!"R`!!!D!!!!'K!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2161 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1715 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2162 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!D3!!!( | ||
2163 | !!`!!!!-!!D3!!!(D!!%!(!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!-!!CJ$!!' | ||
2164 | C!`!"P`-!!CB$!!!#!`!!!`-!!!%$!!!%!`!!"3-!!!B$!!!(!`!!#!-!!!N$!!! | ||
2165 | +!`!!#`-!!!`$!!!0!`!!$J-!!!m$!!!3!`!!%3-!!")$!!!6!`!!&!-!!"8$!!! | ||
2166 | @!`!!&`-!!"J$!!!C!`!!'J-!!"X$!!!F!`!!(3-!!"i$!!!I!`!!)!-!!#%$!!! | ||
2167 | L!`!!)`-!!#3$!!!P!`!!*J-!!#F$!!!S!`!!+3-!!#S$!!!V!`!!,!-!!#d$!!! | ||
2168 | Z!`!!,`-!!$!$!!!a!`!!-J-!!$-$!!!d!`!!03-!!$B$!!!h!`!!1!-!!$N$!!! | ||
2169 | k!`!!1`-!!$`$!!!p!`!!2J-!!$m$!!"!!`!!33-!!%)$!!"$!`!!4!-!!%8$!!" | ||
2170 | '!`!!4`-!!%J$!!"*!`!!5J-!!%X$!!"-!`!!63-!!%i$!!"2!`!!8!-!!&%$!!" | ||
2171 | 5!`!!8`-!!&3$!!"9!`!!9J-!!&F$!!"B!`!!@3-!!&S$!!"E!`!!A!-!!&d$!!" | ||
2172 | H!`!!A`-!!'!$!!"K!`!!BJ-!!'-$!!"N!`!!C3-!!'B$!!"R!`!!D!-!!'N$!!" | ||
2173 | U!`!!D`-!!'`$!!"Y!`!!EJ-!!'m$!!"`!`!!F3-!!()$!!"c!`!!G!-!!(8$!!" | ||
2174 | f!`!!G`-!!(J$!!"j!`!!HJ-!!(X$!!"m!`!!I3-!!(i$!!"r!`!"S`-!!)!$!!# | ||
2175 | "!`!!JJ-!!)-$!!#%!`!!K3-!!)B$!!#(!`!!L!-!!)N$!!#+!`!!L`-!!)`$!!# | ||
2176 | 0!`!!MJ-!!)m$!!#3!!-!!*%$!!#5!`!!N`-!!*3$!!#9!`!!PJ-!!*F$!!#B!`! | ||
2177 | !Q3-!!*S$!!#E!`!!R!-!!*d$!!#H!`!!R`-!!+!$!!#K!`!!SJ-!!+-$!!#N!`! | ||
2178 | !T3-!!+B$!!#R!`!!U!-!!+N$!!#U!`!!U`-!!+`$!!#Y!`!!VJ-!!+m$!!#`!`! | ||
2179 | !X3-!!,)$!!#c!`!!Y!-!!,8$!!#f!`!!Y`-!!,J$!!#j!`!!ZJ-!!,X$!!#m!`! | ||
2180 | ![3-!!,i$!!#r!`!!`!-!!-%$!!$#!`!!``-!!-3$!!$&!`!!aJ-!!-F$!!$)!`! | ||
2181 | !b3-!!-S$!!$,!`!!c!-!!-d$!!$1!`!!c`-!!0!$!!$4!`!!dJ-!!0-$!!$8!`! | ||
2182 | !e3-!!0B$!!$A!`!!f!-!!0N$!!$D!`!!f`-!!0`$!!$G!`!!hJ-!!0m$!!$J!`! | ||
2183 | !i3-!!1)$!!$M!`!!j!-!!18$!!$Q!`!!j`-!!1J$!!$T!`!!kJ-!!1X$!!$X!`! | ||
2184 | !l3-!!1i$!!$[!`!!m!-!!2%$!!$b!`!!m`-!!23$!!$e!`!!pJ-!!2F$!!$i!`! | ||
2185 | !q3-!!2S$!!$l!`!!r!-!!2d$!!$q!`!!r`-!!3!$!!%"!`!"!J-!!3-$!!%%!`! | ||
2186 | ""3-!!3B$!!%(!`!"#!-!!3N$!!%+!`!"#`-!!3`$!!%0!`!"$J-!!3m$!!%3!`! | ||
2187 | "%3-!!4)$!!%6!`!"&!-!!48$!!%@!`!"&`-!!4J$!!%C!`!"'J-!!4X$!!%F!`! | ||
2188 | "(3-!!4i$!!%I!`!")!-!!5%$!!%L!`!")`-!!53$!!%P!`!"*J-!!5F$!!%S!`! | ||
2189 | "+3-!!5S$!!%V!`!",!-!!D3$!!%Y!`!",J-!!5m$!!%`!`!"-3-!!6)$!!%c!`! | ||
2190 | "0!-!!68$!!%f!`!"0`-!!6J$!!%j!`!"1J-!!6X$!!%m!`!"23-!!6i$!!%r!`! | ||
2191 | "3!-!!8%$!!&#!`!"3`-!!83$!!&&!`!"4J-!!8F$!!&)!`!"53-!!8S$!!&,!`! | ||
2192 | "6!-!!8d$!!&1!`!"6`-!!9!$!!&4!`!"8J-!!9-$!!&8!`!"93-!!9B$!!&A!`! | ||
2193 | "@!-!!9N$!!&D!`!"@`-!!9`$!!&G!`!"AJ-!!9m$!!&J!`!"B3-!!@)$!!&M!`! | ||
2194 | "C!-!!@8$!!&Q!`!"C`-!!@J$!!&T!`!"DJ-!!@X$!!&X!`!"E3-!!@i$!!&[!`! | ||
2195 | "F!-!!A%$!!&b!`!"F`-!!A3$!!&e!`!"GJ-!!AF$!!&i!`!"H3-!!AS$!!&l!`! | ||
2196 | "I!-!!Ad$!!&q!`!"I`-!!B!$!!'"!`!"JJ-!!B-$!!'%!`!"K3-!!BB$!!'(!`! | ||
2197 | "L!-!!BN$!!'+!`!"L`-!!B`$!!'0!`!"MJ-!!Bm$!!'3!!-!!C%$!!'5!`!"N`- | ||
2198 | !!C3$!!'9!`!"RJ-!!D!$!!'K!`!"Q`-!!D)$!!'D!`!"R!-!!Cd$!!'I!!)!!!! | ||
2199 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1716 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2200 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1717 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2201 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1718 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2202 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1719 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1720 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"IAh0 | ||
1721 | dBA*d!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2203 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1722 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1723 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%!!3!!#8ePFQGP)%peG!! | ||
2204 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 1724 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
1725 | !!!!!!$mr2cp"8&"-!!%"!!!%)#!J)!1ARe!$GYpi!`@Z%!!&!J%!!3%!!3%"!!! | ||
1726 | "!!!!!!!!!!%"!3%!!3%!!3!""!!!!!!!!!!!!!!(!3%!!3!!!3!!!!!!!!!!!!! | ||
1727 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1728 | !!!!!!!"IAh0dBA*d!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1729 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1730 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!#!!!!!!!!!! | ||
1731 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1732 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1733 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1734 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1735 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1736 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!8!!!K(CA4)9&438`!!!!! | ||
1737 | !!!!!!!!!!!!!!!!!!!!!!!!!2cmr2d&38%`!!!3!!!!%!!!!!%!!!&M!!!!!!!! | ||
1738 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1739 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%r2cm | ||
1740 | r!!!!!!!!!!)!!!!#!!)!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1741 | !!!!!!!!#!&!!!3!"!!%!!3!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1742 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1743 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1744 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1745 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1746 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!8*d024%8R)#G%394"*b! | ||
1747 | R8%P$9#F!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1748 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1749 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1750 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1751 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
1752 | !!`!!!3!!!!S#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!!)!!!! | ||
1753 | ,!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!!$!!!!$!)"!!!!!!! | ||
1754 | "!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!"!!!!!d#!3!!!!!!!3!"!3!!!!! | ||
1755 | !!!!!!!!!!!%!!!!!!!!!!!-!!!8!!!!1!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!! | ||
1756 | "!!!!!!!!!!!$!!!'!!!!$`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!! | ||
1757 | !!`!!"`!!!"!#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!!J!!!! | ||
1758 | 4!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!!*!!!!%J)"!!!!!!! | ||
1759 | "!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!#J!!!"-#!3!!!!!!!3!"!3!!!!! | ||
1760 | !!!!!!!!!!!%!!!!!!!!!!!-!!!X!!!!8!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!! | ||
1761 | "!!!!!!!!!!!$!!!-!!!!&3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!! | ||
1762 | !!`!!$3!!!"B#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!!i!!!! | ||
1763 | A!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!!2!!!!'!)"!!!!!!! | ||
1764 | "!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!%!!!!"N#!3!!!!!!!3!"!3!!!!! | ||
1765 | !!!!!!!!!!!%!!!!!!!!!!!-!!"%!!!!D!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!! | ||
1766 | "!!!!!!!!!!!$!!!5!!!!'`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!! | ||
1767 | !!`!!%`!!!"`#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!"3!!!! | ||
1768 | G!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!!9!!!!(J)"!!!!!!! | ||
1769 | "!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!&J!!!"m#!3!!!!!!!3!"!3!!!!! | ||
1770 | !!!!!!!!!!!%!!!!!!!!!!!-!!"F!!!!J!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!! | ||
1771 | "!!!!!!!!!!!$!!!B!!!!)3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!! | ||
1772 | !!`!!'3!!!#)#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!"S!!!! | ||
1773 | M!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!!E!!!!*!)"!!!!!!! | ||
1774 | "!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!(!!!!#8#!3!!!!!!!3!"!3!!!!! | ||
1775 | !!!!!!!!!!!%!!!!!!!!!!!-!!"d!!!!Q!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!! | ||
1776 | "!!!!!!!!!!!$!!!H!!!!*`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!! | ||
1777 | !!`!!(`!!!#J#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!#!!!!! | ||
1778 | T!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!!K!!!!+J)"!!!!!!! | ||
1779 | "!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!)J!!!#X#!3!!!!!!!3!"!3!!!!! | ||
1780 | !!!!!!!!!!!%!!!!!!!!!!!-!!#-!!!!X!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!! | ||
1781 | "!!!!!!!!!!!$!!!N!!!!,3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!! | ||
1782 | !!`!!*3!!!#i#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!#B!!!! | ||
1783 | [!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!!R!!!!-!)"!!!!!!! | ||
1784 | "!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!+!!!!$%#!3!!!!!!!3!"!3!!!!! | ||
1785 | !!!!!!!!!!!%!!!!!!!!!!!-!!#N!!!!b!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!! | ||
1786 | "!!!!!!!!!!!$!!!U!!!!-`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!! | ||
1787 | !!`!!+`!!!$3#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!#`!!!! | ||
1788 | e!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!!Y!!!!0J)"!!!!!!! | ||
1789 | "!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!,J!!!$F#!3!!!!!!!3!"!3!!!!! | ||
1790 | !!!!!!!!!!!%!!!!!!!!!!!-!!#m!!!!i!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!! | ||
1791 | "!!!!!!!!!!!$!!!`!!!!13)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!! | ||
1792 | !!`!!-3!!!$S#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!$)!!!! | ||
1793 | l!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!!c!!!!2!)"!!!!!!! | ||
1794 | "!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!0!!!!$d#!3!!!!!!!3!"!3!!!!! | ||
1795 | !!!!!!!!!!!%!!!!!!!!!!!-!!$8!!!!q!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!! | ||
1796 | "!!!!!!!!!!!$!!!f!!!!2`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!! | ||
1797 | !!`!!0`!!!%!#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!$J!!!" | ||
1798 | "!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!!j!!!!3J)"!!!!!!! | ||
1799 | "!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!1J!!!%-#!3!!!!!!!3!"!3!!!!! | ||
1800 | !!!!!!!!!!!%!!!!!!!!!!!-!!$X!!!"%!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!! | ||
1801 | "!!!!!!!!!!!$!!!m!!!!43)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!! | ||
1802 | !!`!!23!!!%B#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!$i!!!" | ||
1803 | (!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!!r!!!!5!)"!!!!!!! | ||
1804 | "!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!3!!!!%N#!3!!!!!!!3!"!3!!!!! | ||
1805 | !!!!!!!!!!!%!!!!!!!!!!!-!!%%!!!"+!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!! | ||
1806 | "!!!!!!!!!!!$!!"#!!!!5`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!! | ||
1807 | !!`!!3`!!!%`#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!%3!!!" | ||
1808 | 0!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!"&!!!!6J)"!!!!!!! | ||
1809 | "!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!4J!!!%m#!3!!!!!!!3!"!3!!!!! | ||
1810 | !!!!!!!!!!!%!!!!!!!!!!!-!!%F!!!"3!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!! | ||
1811 | "!!!!!!!!!!!$!!")!!!!83)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!! | ||
1812 | !!`!!53!!!&)#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!%S!!!" | ||
1813 | 6!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!",!!!!9!)"!!!!!!! | ||
1814 | "!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!6!!!!&8#!3!!!!!!!3!"!3!!!!! | ||
1815 | !!!!!!!!!!!%!!!!!!!!!!!-!!%d!!!"@!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!! | ||
1816 | "!!!!!!!!!!!$!!"1!!!!9`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!! | ||
1817 | !!`!!6`!!!&J#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!&!!!!" | ||
1818 | C!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!"4!!!!@J)"!!!!!!! | ||
1819 | "!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!8J!!!&X#!3!!!!!!!3!"!3!!!!! | ||
1820 | !!!!!!!!!!!%!!!!!!!!!!!-!!&-!!!"F!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!! | ||
1821 | "!!!!!!!!!!!$!!"8!!!!A3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!! | ||
1822 | !!`!!93!!!&i#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!&B!!!" | ||
1823 | I!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!"A!!!!B!)"!!!!!!! | ||
1824 | "!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!@!!!!'%#!3!!!!!!!3!"!3!!!!! | ||
1825 | !!!!!!!!!!!%!!!!!!!!!!!-!!&N!!!"L!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!! | ||
1826 | "!!!!!!!!!!!$!!"D!!!!B`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!! | ||
1827 | !!`!!@`!!!'3#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!&`!!!" | ||
1828 | P!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!"G!!!!CJ)"!!!!!!! | ||
1829 | "!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!AJ!!!'F#!3!!!!!!!3!"!3!!!!! | ||
1830 | !!!!!!!!!!!%!!!!!!!!!!!-!!&m!!!"S!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!! | ||
1831 | "!!!!!!!!!!!$!!"J!!!!D3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!! | ||
1832 | !!`!!B3!!!'S#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!')!!!" | ||
1833 | V!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!"M!!!!E!)"!!!!!!! | ||
1834 | "!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!C!!!!'d#!3!!!!!!!3!"!3!!!!! | ||
1835 | !!!!!!!!!!!%!!!!!!!!!!!-!!'8!!!"Z!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!! | ||
1836 | "!!!!!!!!!!!$!!"Q!!!!E`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!! | ||
1837 | !!`!!C`!!!(!#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!'J!!!" | ||
1838 | a!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!"T!!!!FJ)"!!!!!!! | ||
1839 | "!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!DJ!!!(-#!3!!!!!!!3!"!3!!!!! | ||
1840 | !!!!!!!!!!!%!!!!!!!!!!!-!!'X!!!"d!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!! | ||
1841 | "!!!!!!!!!!!$!!"X!!!!G3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!! | ||
1842 | !!`!!E3!!!(B#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!'i!!!" | ||
1843 | h!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!"[!!!!H!)"!!!!!!! | ||
1844 | "!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!F!!!!(N#!3!!!!!!!3!"!3!!!!! | ||
1845 | !!!!!!!!!!!%!!!!!!!!!!!-!!(%!!!"k!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!! | ||
1846 | "!!!!!!!!!!!$!!"b!!!!H`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!! | ||
1847 | !!`!!F`!!!(`#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!(3!!!" | ||
1848 | p!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!"e!!!!IJ)"!!!!!!! | ||
1849 | "!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!GJ!!!(m#!3!!!!!!!3!"!3!!!!! | ||
1850 | !!!!!!!!!!!%!!!!!!!!!!!-!!(F!!!#!!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!! | ||
1851 | "!!!!!!!!!!!$!!"i!!!!J3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!! | ||
1852 | !!`!!H3!!!))#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!(S!!!# | ||
1853 | $!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!"l!!!!K!)"!!!!!!! | ||
1854 | "!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!I!!!!)8#!3!!!!!!!3!"!3!!!!! | ||
1855 | !!!!!!!!!!!%!!!!!!!!!!!-!!(d!!!#'!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!! | ||
1856 | "!!!!!!!!!!!$!!"q!!!!K`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!! | ||
1857 | !!`!!I`!!!)J#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!)!!!!# | ||
1858 | *!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!#"!!!!LJ)"!!!!!!! | ||
1859 | "!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!JJ!!!)X#!3!!!!!!!3!"!3!!!!! | ||
1860 | !!!!!!!!!!!%!!!!!!!!!!!-!!)-!!!#-!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!! | ||
1861 | "!!!!!!!!!!!$!!#%!!!!M3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!! | ||
1862 | !!`!!K3!!!)i#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!)B!!!# | ||
1863 | 2!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!#(!!!!N!!#!3!!!!! | ||
1864 | !!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!)J!!!#4!J%!!!!!!!%!!3%!!!! | ||
1865 | !!!!!!!!!!!!"!!!!!!!!!!!$!!#*!!!!NJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!! | ||
1866 | !!3!!!!!!!!!!!`!!LJ!!!*-#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!! | ||
1867 | !!!-!!)X!!!#8!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!#-!!! | ||
1868 | !P3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!M3!!!*B#!3!!!!! | ||
1869 | !!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!)i!!!#A!J%!!!!!!!%!!3%!!!! | ||
1870 | !!!!!!!!!!!!"!!!!!!!!!!!$!!#2!!!!Q!)"!!!!!!!"!!%"!!!!!!!!!!!!!!! | ||
1871 | !!3!!!!!!!!!!!`!!N!!!!!#C!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1872 | !!!!$!!#4!!!!QJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!NJ! | ||
1873 | !!*X#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!*-!!!#F!J%!!!! | ||
1874 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!#8!!!!R3)"!!!!!!!"!!%"!!! | ||
1875 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!!P3!!!*i#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1876 | !!!%!!!!!!!!!!!-!!*B!!!#I!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1877 | !!!!$!!#A!!!!S!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!Q!! | ||
1878 | !!+%#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!*N!!!#L!J%!!!! | ||
1879 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!#D!!!!S`)"!!!!!!!"!!%"!!! | ||
1880 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!!Q`!!!+3#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1881 | !!!%!!!!!!!!!!!-!!*`!!!#P!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1882 | !!!!$!!#G!!!!TJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!RJ! | ||
1883 | !!+F#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!*m!!!#S!J%!!!! | ||
1884 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!#J!!!!U3)"!!!!!!!"!!%"!!! | ||
1885 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!!S3!!!+S#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1886 | !!!%!!!!!!!!!!!-!!+)!!!#V!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1887 | !!!!$!!#M!!!!V!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!T!! | ||
1888 | !!+d#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!+8!!!#Z!J%!!!! | ||
1889 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!#Q!!!!V`)"!!!!!!!"!!%"!!! | ||
1890 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!!T`!!!,!#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1891 | !!!%!!!!!!!!!!!-!!+J!!!#a!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1892 | !!!!$!!#T!!!!XJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!UJ! | ||
1893 | !!,-#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!+X!!!#d!J%!!!! | ||
1894 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!#X!!!!Y3)"!!!!!!!"!!%"!!! | ||
1895 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!!V3!!!,B#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1896 | !!!%!!!!!!!!!!!-!!+i!!!#h!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1897 | !!!!$!!#[!!!!Z!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!X!! | ||
1898 | !!,N#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!,%!!!#k!J%!!!! | ||
1899 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!#b!!!!Z`)"!!!!!!!"!!%"!!! | ||
1900 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!!X`!!!,`#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1901 | !!!%!!!!!!!!!!!-!!,3!!!#p!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1902 | !!!!$!!#e!!!![J)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!YJ! | ||
1903 | !!,m#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!,F!!!$!!J%!!!! | ||
1904 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!#i!!!!`3)"!!!!!!!"!!%"!!! | ||
1905 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!!Z3!!!-)#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1906 | !!!%!!!!!!!!!!!-!!,S!!!$$!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1907 | !!!!$!!#l!!!!a!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!![!! | ||
1908 | !!-8#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!,d!!!$'!J%!!!! | ||
1909 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!#q!!!!a`)"!!!!!!!"!!%"!!! | ||
1910 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!![`!!!-J#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1911 | !!!%!!!!!!!!!!!-!!-!!!!$*!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1912 | !!!!$!!$"!!!!bJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!`J! | ||
1913 | !!-X#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!--!!!$-!J%!!!! | ||
1914 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!$%!!!!c3)"!!!!!!!"!!%"!!! | ||
1915 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!!a3!!!-i#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1916 | !!!%!!!!!!!!!!!-!!-B!!!$2!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1917 | !!!!$!!$(!!!!d!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!b!! | ||
1918 | !!0%#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!-N!!!$5!J%!!!! | ||
1919 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!$+!!!!d`)"!!!!!!!"!!%"!!! | ||
1920 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!!b`!!!03#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1921 | !!!%!!!!!!!!!!!-!!-`!!!$9!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1922 | !!!!$!!$0!!!!eJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!cJ! | ||
1923 | !!0F#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!-m!!!$B!J%!!!! | ||
1924 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!$3!!!!f3)"!!!!!!!"!!%"!!! | ||
1925 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!!d3!!!0S#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1926 | !!!%!!!!!!!!!!!-!!0)!!!$E!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1927 | !!!!$!!$6!!!!h!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!e!! | ||
1928 | !!0d#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!08!!!$H!J%!!!! | ||
1929 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!$@!!!!h`)"!!!!!!!"!!%"!!! | ||
1930 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!!e`!!!1!#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1931 | !!!%!!!!!!!!!!!-!!0J!!!$K!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1932 | !!!!$!!$C!!!!iJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!fJ! | ||
1933 | !!1-#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!0X!!!$N!J%!!!! | ||
1934 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!$F!!!!j3)"!!!!!!!"!!%"!!! | ||
1935 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!!h3!!!1B#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1936 | !!!%!!!!!!!!!!!-!!0i!!!$R!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1937 | !!!!$!!$I!!!!k!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!i!! | ||
1938 | !!1N#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!1%!!!$U!J%!!!! | ||
1939 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!$L!!!!k`)"!!!!!!!"!!%"!!! | ||
1940 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!!i`!!!1`#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1941 | !!!%!!!!!!!!!!!-!!13!!!$Y!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1942 | !!!!$!!$P!!!!lJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!jJ! | ||
1943 | !!1m#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!1F!!!$`!J%!!!! | ||
1944 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!$S!!!!m3)"!!!!!!!"!!%"!!! | ||
1945 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!!k3!!!2)#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1946 | !!!%!!!!!!!!!!!-!!1S!!!$c!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1947 | !!!!$!!$V!!!!p!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!l!! | ||
1948 | !!28#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!1d!!!$f!J%!!!! | ||
1949 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!$Z!!!!p`)"!!!!!!!"!!%"!!! | ||
1950 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!!l`!!!2J#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1951 | !!!%!!!!!!!!!!!-!!2!!!!$j!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1952 | !!!!$!!$a!!!!qJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!mJ! | ||
1953 | !!2X#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!2-!!!$m!J%!!!! | ||
1954 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!$d!!!!r3)"!!!!!!!"!!%"!!! | ||
1955 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!!p3!!!2i#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1956 | !!!%!!!!!!!!!!!-!!2B!!!$r!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1957 | !!!!$!!$h!!!"!!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!q!! | ||
1958 | !!3%#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!2N!!!%#!J%!!!! | ||
1959 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!$k!!!"!`)"!!!!!!!"!!%"!!! | ||
1960 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!!q`!!!33#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1961 | !!!%!!!!!!!!!!!-!!2`!!!%&!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1962 | !!!!$!!$p!!!""J)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!!rJ! | ||
1963 | !!3F#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!2m!!!%)!J%!!!! | ||
1964 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!%!!!!"#3)"!!!!!!!"!!%"!!! | ||
1965 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!"!3!!!3S#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1966 | !!!%!!!!!!!!!!!-!!3)!!!%,!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1967 | !!!!$!!%$!!!"$!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!""!! | ||
1968 | !!3d#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!38!!!%1!J%!!!! | ||
1969 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!%'!!!"$`)"!!!!!!!"!!%"!!! | ||
1970 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!""`!!!4!#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1971 | !!!%!!!!!!!!!!!-!!3J!!!%4!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1972 | !!!!$!!%*!!!"%J)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"#J! | ||
1973 | !!4-#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!3X!!!%8!J%!!!! | ||
1974 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!%-!!!"&3)"!!!!!!!"!!%"!!! | ||
1975 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!"$3!!!4B#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1976 | !!!%!!!!!!!!!!!-!!3i!!!%A!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1977 | !!!!$!!%2!!!"'!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"%!! | ||
1978 | !!4N#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!4%!!!%D!J%!!!! | ||
1979 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!%5!!!"'`)"!!!!!!!"!!%"!!! | ||
1980 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!"%`!!!4`#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1981 | !!!%!!!!!!!!!!!-!!43!!!%G!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1982 | !!!!$!!%9!!!"(J)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"&J! | ||
1983 | !!4m#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!4F!!!%J!J%!!!! | ||
1984 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!%B!!!")3)"!!!!!!!"!!%"!!! | ||
1985 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!"'3!!!5)#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1986 | !!!%!!!!!!!!!!!-!!4S!!!%M!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1987 | !!!!$!!%E!!!"*!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"(!! | ||
1988 | !!58#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!4d!!!%Q!J%!!!! | ||
1989 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!%H!!!"*`)"!!!!!!!"!!%"!!! | ||
1990 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!"(`!!!5J#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1991 | !!!%!!!!!!!!!!!-!!5!!!!%T!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1992 | !!!!$!!%K!!!"+J)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!")J! | ||
1993 | !!5X#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!5-!!!%X!J%!!!! | ||
1994 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!%N!!!",3)"!!!!!!!"!!%"!!! | ||
1995 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!"*3!!!5i#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
1996 | !!!%!!!!!!!!!!!-!!5B!!!%[!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
1997 | !!!!$!!%R!!!"-!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"+!! | ||
1998 | !!6%#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!5N!!!%b!J%!!!! | ||
1999 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!%U!!!"-`)"!!!!!!!"!!%"!!! | ||
2000 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!"+`!!!63#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
2001 | !!!%!!!!!!!!!!!-!!5`!!!%e!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
2002 | !!!!$!!%Y!!!"0J)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!",J! | ||
2003 | !!6F#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!5m!!!%i!J%!!!! | ||
2004 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!%`!!!"13)"!!!!!!!"!!%"!!! | ||
2005 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!"-3!!!6S#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
2006 | !!!%!!!!!!!!!!!-!!6)!!!%l!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
2007 | !!!!$!!%c!!!"2!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"0!! | ||
2008 | !!6d#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!68!!!%q!J%!!!! | ||
2009 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!%f!!!"2`)"!!!!!!!"!!%"!!! | ||
2010 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!"0`!!!8!#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
2011 | !!!%!!!!!!!!!!!-!!6J!!!&"!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
2012 | !!!!$!!%j!!!"3J)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"1J! | ||
2013 | !!8-#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!6X!!!&%!J%!!!! | ||
2014 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!%m!!!"43)"!!!!!!!"!!%"!!! | ||
2015 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!"23!!!8B#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
2016 | !!!%!!!!!!!!!!!-!!6i!!!&(!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
2017 | !!!!$!!%r!!!"5!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"3!! | ||
2018 | !!8N#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!8%!!!&+!J%!!!! | ||
2019 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!&#!!!"5`)"!!!!!!!"!!%"!!! | ||
2020 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!"3`!!!8`#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
2021 | !!!%!!!!!!!!!!!-!!83!!!&0!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
2022 | !!!!$!!&&!!!"6J)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"4J! | ||
2023 | !!8m#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!8F!!!&3!J%!!!! | ||
2024 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!&)!!!"83)"!!!!!!!"!!%"!!! | ||
2025 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!"53!!!9)#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
2026 | !!!%!!!!!!!!!!!-!!8S!!!&6!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
2027 | !!!!$!!&,!!!"9!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"6!! | ||
2028 | !!98#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!8d!!!&@!J%!!!! | ||
2029 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!&1!!!"9`)"!!!!!!!"!!%"!!! | ||
2030 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!"6`!!!9J#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
2031 | !!!%!!!!!!!!!!!-!!9!!!!&C!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
2032 | !!!!$!!&4!!!"@J)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"8J! | ||
2033 | !!9X#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!9-!!!&F!J%!!!! | ||
2034 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!&8!!!"A3)"!!!!!!!"!!%"!!! | ||
2035 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!"93!!!9i#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
2036 | !!!%!!!!!!!!!!!-!!9B!!!&I!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
2037 | !!!!$!!&A!!!"B!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"@!! | ||
2038 | !!@%#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!9N!!!&L!J%!!!! | ||
2039 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!&D!!!"B`)"!!!!!!!"!!%"!!! | ||
2040 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!"@`!!!@3#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
2041 | !!!%!!!!!!!!!!!-!!9`!!!&P!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
2042 | !!!!$!!&G!!!"CJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"AJ! | ||
2043 | !!@F#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!9m!!!&S!J%!!!! | ||
2044 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!&J!!!"D3)"!!!!!!!"!!%"!!! | ||
2045 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!"B3!!!@S#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
2046 | !!!%!!!!!!!!!!!-!!@)!!!&V!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
2047 | !!!!$!!&M!!!"E!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"C!! | ||
2048 | !!@d#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!@8!!!&Z!J%!!!! | ||
2049 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!&Q!!!"E`)"!!!!!!!"!!%"!!! | ||
2050 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!"C`!!!A!#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
2051 | !!!%!!!!!!!!!!!-!!@J!!!&a!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
2052 | !!!!$!!&T!!!"FJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"DJ! | ||
2053 | !!A-#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!@X!!!&d!J%!!!! | ||
2054 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!&X!!!"G3)"!!!!!!!"!!%"!!! | ||
2055 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!"E3!!!AB#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
2056 | !!!%!!!!!!!!!!!-!!@i!!!&h!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
2057 | !!!!$!!&[!!!"H!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"F!! | ||
2058 | !!AN#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!A%!!!&k!J%!!!! | ||
2059 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!&b!!!"H`)"!!!!!!!"!!%"!!! | ||
2060 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!"F`!!!A`#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
2061 | !!!%!!!!!!!!!!!-!!A3!!!&p!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
2062 | !!!!$!!&e!!!"IJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"GJ! | ||
2063 | !!B!#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!AF!!!'"!J%!!!! | ||
2064 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!&i!!!"JJ)"!!!!!!!"!!%"!!! | ||
2065 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!"H3!!!B-#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
2066 | !!!%!!!!!!!!!!!-!!AS!!!'%!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
2067 | !!!!$!!&l!!!"K3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"I!! | ||
2068 | !!BB#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!Ad!!!'(!J%!!!! | ||
2069 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!&q!!!"L!)"!!!!!!!"!!%"!!! | ||
2070 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!"I`!!!BN#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
2071 | !!!%!!!!!!!!!!!-!!B!!!!'+!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
2072 | !!!!$!!'"!!!"L`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"JJ! | ||
2073 | !!B`#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!B-!!!'0!J%!!!! | ||
2074 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!'%!!!"MJ)"!!!!!!!"!!%"!!! | ||
2075 | !!!!!!!!!!!!!!3!!!!!!!!!!!`!"K3!!!Bm#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
2076 | !!!%!!!!!!!!!!!-!!BB!!!'3!!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!! | ||
2077 | !!!!!!`!"K`!!!C%#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!BJ | ||
2078 | !!!'5!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!'*!!!"N`)"!!! | ||
2079 | !!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"LJ!!!C3#!3!!!!!!!3!"!3! | ||
2080 | !!!!!!!!!!!!!!!%!!!!!!!!!!!-!!BX!!!'9!J%!!!!!!!%!!3%!!!!!!!!!!!! | ||
2081 | !!!!"!!!!!!!!!!!$!!'-!!!"PJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!! | ||
2082 | !!!!!!`!"M3!!!CF#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!Bi | ||
2083 | !!!'B!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!'2!!!"Q3)"!!! | ||
2084 | !!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"N!!!!!'D!J%!!!!!!!%!!3% | ||
2085 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!'4!!!"Q`)"!!!!!!!"!!%"!!!!!!!!!!! | ||
2086 | !!!!!!3!!!!!!!!!!!`!"NJ!!!C`#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
2087 | !!!!!!!-!!C-!!!'G!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!' | ||
2088 | 8!!!"RJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"P3!!!Cm#!3! | ||
2089 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!CB!!!'J!J%!!!!!!!%!!3% | ||
2090 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!'A!!!"S3)"!!!!!!!"!!%"!!!!!!!!!!! | ||
2091 | !!!!!!3!!!!!!!!!!!`!"Q!!!!D)#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
2092 | !!!!!!!-!!CN!!!'M!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!' | ||
2093 | D!!!"d`)"!!!!!!!"!!%$!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"Q`!!!G3#!3! | ||
2094 | !!!!!!3!"!`!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!C`!!!(9!J%!!!!!!!%!!3- | ||
2095 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!'G!!!"eJ)"!!!!!!!"!!%$!!!!!!!!!!! | ||
2096 | !!!!!!3!!!!!!!!!!!`!"RJ!!!D3#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
2097 | !!!!!!!-!!Cm!!!(A!J%!!!!!!!%!!3-!!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!' | ||
2098 | J!!!"f!)"!!!!!!!"!!%$!!!!!!!!!!!!!!!!!3!!!!!!!!!!!`!"S3!!!GN#!3! | ||
2099 | !!!!!!3!"!`!!!!!!!!!!!!!!!!%!!!!!!!!!!!-!!D)!!!(D!J%!!!!!!!%!!3- | ||
2100 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!$!!'M!!!"TJ)"!!!!!!!"!!%"!!!!!!!!!!! | ||
2101 | !!!!!!3!!!!!!!!!!!`!"T!!!!DF#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
2102 | !!!!!!!-!!D8!!!'S!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!!!!! | ||
2103 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2104 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2105 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2106 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2107 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2108 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2109 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2110 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2111 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2112 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2113 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2114 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2115 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2116 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2117 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2118 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2119 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2120 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2121 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2122 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2123 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2124 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2125 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!3!!!!)!!!!$!!!!"!!!!!8!!!! | ||
2126 | '!!!!"`!!!!J!!!!*!!!!#J!!!!X!!!!-!!!!$3!!!!i!!!!2!!!!%!!!!"%!!!! | ||
2127 | 5!!!!%`!!!"3!!!!9!!!!&J!!!"F!!!!B!!!!'3!!!"S!!!!E!!!!(!!!!"d!!!! | ||
2128 | H!!!!(`!!!#!!!!!K!!!!)J!!!#-!!!!N!!!!*3!!!#B!!!!R!!!!+!!!!#N!!!! | ||
2129 | U!!!!+`!!!#`!!!!Y!!!!,J!!!#m!!!!`!!!!-3!!!$)!!!!c!!!!0!!!!$8!!!! | ||
2130 | f!!!!0`!!!$J!!!!j!!!!1J!!!$X!!!!m!!!!23!!!$i!!!!r!!!!3!!!!%%!!!" | ||
2131 | #!!!!3`!!!%3!!!"&!!!!4J!!!%F!!!")!!!!53!!!%S!!!",!!!!6!!!!%d!!!" | ||
2132 | 1!!!!6`!!!&!!!!"4!!!!8J!!!&-!!!"8!!!!93!!!&B!!!"A!!!!@!!!!&N!!!" | ||
2133 | D!!!!@`!!!&`!!!"G!!!!AJ!!!&m!!!"J!!!!B3!!!')!!!"M!!!!C!!!!'8!!!" | ||
2134 | Q!!!!C`!!!'J!!!"T!!!!DJ!!!'X!!!"X!!!!E3!!!'i!!!"[!!!!F!!!!(%!!!" | ||
2135 | b!!!!F`!!!(3!!!"e!!!!GJ!!!(F!!!"i!!!!H3!!!(S!!!"l!!!!I!!!!(d!!!" | ||
2136 | q!!!!I`!!!)!!!!#"!!!!JJ!!!)-!!!#%!!!!K3!!!)B!!!#(!!!!L!!!!)N!!!# | ||
2137 | +!!!!L`!!!)`!!!#0!!!!MJ!!!)m!!!#3!!!!!*%!!!#5!!!!N`!!!*3!!!#9!!! | ||
2138 | !PJ!!!*F!!!#B!!!!Q3!!!*S!!!#E!!!!R!!!!*d!!!#H!!!!R`!!!+!!!!#K!!! | ||
2139 | !SJ!!!+-!!!#N!!!!T3!!!+B!!!#R!!!!U!!!!+N!!!#U!!!!U`!!!+`!!!#Y!!! | ||
2140 | !VJ!!!+m!!!#`!!!!X3!!!,)!!!#c!!!!Y!!!!,8!!!#f!!!!Y`!!!,J!!!#j!!! | ||
2141 | !ZJ!!!,X!!!#m!!!![3!!!,i!!!#r!!!!`!!!!-%!!!$#!!!!``!!!-3!!!$&!!! | ||
2142 | !aJ!!!-F!!!$)!!!!b3!!!-S!!!$,!!!!c!!!!-d!!!$1!!!!c`!!!0!!!!$4!!! | ||
2143 | !dJ!!!0-!!!$8!!!!e3!!!0B!!!$A!!!!f!!!!0N!!!$D!!!!f`!!!0`!!!$G!!! | ||
2144 | !hJ!!!0m!!!$J!!!!i3!!!1)!!!$M!!!!j!!!!18!!!$Q!!!!j`!!!1J!!!$T!!! | ||
2145 | !kJ!!!1X!!!$X!!!!l3!!!1i!!!$[!!!!m!!!!2%!!!$b!!!!m`!!!23!!!$e!!! | ||
2146 | !pJ!!!2F!!!$i!!!!q3!!!2S!!!$l!!!!r!!!!2d!!!$q!!!!r`!!!3!!!!%"!!! | ||
2147 | "!J!!!3-!!!%%!!!""3!!!3B!!!%(!!!"#!!!!3N!!!%+!!!"#`!!!3`!!!%0!!! | ||
2148 | "$J!!!3m!!!%3!!!"%3!!!4)!!!%6!!!"&!!!!48!!!%@!!!"&`!!!4J!!!%C!!! | ||
2149 | "'J!!!4X!!!%F!!!"(3!!!4i!!!%I!!!")!!!!5%!!!%L!!!")`!!!53!!!%P!!! | ||
2150 | "*J!!!5F!!!%S!!!"+3!!!5S!!!%V!!!",!!!!5d!!!%Z!!!",`!!!6!!!!%a!!! | ||
2151 | "-J!!!6-!!!%d!!!"03!!!6B!!!%h!!!"1!!!!6N!!!%k!!!"1`!!!6`!!!%p!!! | ||
2152 | "2J!!!6m!!!&!!!!"33!!!8)!!!&$!!!"4!!!!88!!!&'!!!"4`!!!8J!!!&*!!! | ||
2153 | "5J!!!8X!!!&-!!!"63!!!8i!!!&2!!!"8!!!!9%!!!&5!!!"8`!!!93!!!&9!!! | ||
2154 | "9J!!!9F!!!&B!!!"@3!!!9S!!!&E!!!"A!!!!9d!!!&H!!!"A`!!!@!!!!&K!!! | ||
2155 | "BJ!!!@-!!!&N!!!"C3!!!@B!!!&R!!!"D!!!!@N!!!&U!!!"D`!!!@`!!!&Y!!! | ||
2156 | "EJ!!!@m!!!&`!!!"F3!!!A)!!!&c!!!"G!!!!A8!!!&f!!!"G`!!!AJ!!!&j!!! | ||
2157 | "HJ!!!AX!!!&m!!!"I3!!!Ai!!!&r!!!"J!!!!B%!!!'#!!!"J`!!!B3!!!'&!!! | ||
2158 | "KJ!!!BF!!!')!!!"L3!!!BS!!!',!!!"M!!!!Bd!!!'1!!!"M`!!!C!!!!!"N3! | ||
2159 | !!C)!!!'6!!!"P!!!!C8!!!'@!!!"P`!!!CJ!!!'G!!!"SJ!!!D-!!!'N!!!"Q3! | ||
2160 | !!CS!!!'E!!!"R!!!!Ci!!!'I!!!"S!!!!D%!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2205 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2161 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2162 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'P!!!"`!- | ||
2163 | !!!!$!!'P!!!"f`!"!"`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!$!!'B!`!"Q3- | ||
2164 | !!D8$!!'A!`!"PJ-!!!)$!!!$!`!!!3-!!!3$!!!&!`!!"J-!!!F$!!!)!`!!#3- | ||
2165 | !!!S$!!!,!`!!$!-!!!d$!!!1!`!!$`-!!"!$!!!4!`!!%J-!!"-$!!!8!`!!&3- | ||
2166 | !!"B$!!!A!`!!'!-!!"N$!!!D!`!!'`-!!"`$!!!G!`!!(J-!!"m$!!!J!`!!)3- | ||
2167 | !!#)$!!!M!`!!*!-!!#8$!!!Q!`!!*`-!!#J$!!!T!`!!+J-!!#X$!!!X!`!!,3- | ||
2168 | !!#i$!!![!`!!-!-!!$%$!!!b!`!!-`-!!$3$!!!e!`!!0J-!!$F$!!!i!`!!13- | ||
2169 | !!$S$!!!l!`!!2!-!!$d$!!!q!`!!2`-!!%!$!!""!`!!3J-!!%-$!!"%!`!!43- | ||
2170 | !!%B$!!"(!`!!5!-!!%N$!!"+!`!!5`-!!%`$!!"0!`!!6J-!!%m$!!"3!`!!83- | ||
2171 | !!&)$!!"6!`!!9!-!!&8$!!"@!`!!9`-!!&J$!!"C!`!!@J-!!&X$!!"F!`!!A3- | ||
2172 | !!&i$!!"I!`!!B!-!!'%$!!"L!`!!B`-!!'3$!!"P!`!!CJ-!!'F$!!"S!`!!D3- | ||
2173 | !!'S$!!"V!`!!E!-!!'d$!!"Z!`!!E`-!!(!$!!"a!`!!FJ-!!(-$!!"d!`!!G3- | ||
2174 | !!(B$!!"h!`!!H!-!!(N$!!"k!`!!H`-!!(`$!!"p!`!!IJ-!!(m$!!#!!`!!J3- | ||
2175 | !!))$!!#$!`!!K!-!!)8$!!'M!`!!KJ-!!)F$!!#)!`!!L3-!!)S$!!#,!`!!M!- | ||
2176 | !!)d$!!#1!`!!M`-!!*!!!`!!N3-!!*)$!!#6!`!!P!-!!*8$!!#@!`!!P`-!!*J | ||
2177 | $!!#C!`!!QJ-!!*X$!!#F!`!!R3-!!*i$!!#I!`!!S!-!!+%$!!#L!`!!S`-!!+3 | ||
2178 | $!!#P!`!!TJ-!!+F$!!#S!`!!U3-!!+S$!!#V!`!!V!-!!+d$!!#Z!`!!V`-!!,! | ||
2179 | $!!#a!`!!XJ-!!,-$!!#d!`!!Y3-!!,B$!!#h!`!!Z!-!!,N$!!#k!`!!Z`-!!,` | ||
2180 | $!!#p!`!![J-!!,m$!!$!!`!!`3-!!-)$!!$$!`!!a!-!!-8$!!$'!`!!a`-!!-J | ||
2181 | $!!$*!`!!bJ-!!-X$!!$-!`!!c3-!!-i$!!$2!`!!d!-!!0%$!!$5!`!!d`-!!03 | ||
2182 | $!!$9!`!!eJ-!!0F$!!$B!`!!f3-!!0S$!!$E!`!!h!-!!0d$!!$H!`!!h`-!!1! | ||
2183 | $!!$K!`!!iJ-!!1-$!!$N!`!!j3-!!1B$!!$R!`!!k!-!!1N$!!$U!`!!k`-!!1` | ||
2184 | $!!$Y!`!!lJ-!!1m$!!$`!`!!m3-!!2)$!!$c!`!!p!-!!28$!!$f!`!!p`-!!2J | ||
2185 | $!!$j!`!!qJ-!!2X$!!$m!`!!r3-!!2i$!!$r!`!"!!-!!3%$!!%#!`!"!`-!!33 | ||
2186 | $!!%&!`!""J-!!3F$!!%)!`!"#3-!!3S$!!%,!`!"$!-!!3d$!!%1!`!"$`-!!4! | ||
2187 | $!!%4!`!"%J-!!4-$!!%8!`!"&3-!!4B$!!%A!`!"'!-!!4N$!!%D!`!"'`-!!4` | ||
2188 | $!!%G!`!"(J-!!4m$!!%J!`!")3-!!5)$!!%M!`!"*!-!!58$!!%Q!`!"*`-!!5J | ||
2189 | $!!%T!`!"+J-!!5X$!!%X!`!",3-!!D3$!!%Z!`!",`-!!6!$!!%a!`!"-J-!!6- | ||
2190 | $!!%d!`!"03-!!6B$!!%h!`!"1!-!!6N$!!%k!`!"1`-!!6`$!!%p!`!"2J-!!6m | ||
2191 | $!!&!!`!"33-!!8)$!!&$!`!"4!-!!88$!!&'!`!"4`-!!8J$!!&*!`!"5J-!!8X | ||
2192 | $!!&-!`!"63-!!8i$!!&2!`!"8!-!!9%$!!&5!`!"8`-!!93$!!&9!`!"9J-!!9F | ||
2193 | $!!&B!`!"@3-!!9S$!!&E!`!"A!-!!9d$!!&H!`!"A`-!!@!$!!&K!`!"BJ-!!@- | ||
2194 | $!!&N!`!"C3-!!@B$!!&R!`!"D!-!!@N$!!&U!`!"D`-!!@`$!!&Y!`!"EJ-!!@m | ||
2195 | $!!&`!`!"F3-!!A)$!!&c!`!"G!-!!A8$!!&f!`!"G`-!!AJ$!!&j!`!"HJ-!!AX | ||
2196 | $!!&m!`!"I3-!!Ai$!!&r!`!"J!-!!B%$!!'#!`!"J`-!!B3$!!'&!`!"KJ-!!BF | ||
2197 | $!!')!`!"L3-!!BS$!!',!`!"M!-!!Bd$!!'1!`!"M`-!!C!!!`!"N3-!!C)$!!' | ||
2198 | 6!`!"P!-!!C8$!!'H!`!"S!-!!D%$!!'E!`!"SJ-!!CS$!!'F!`!"R3-!!Cm!!J! | ||
2206 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2199 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2207 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2200 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2208 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2201 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -2217,25 +2210,23 @@ f!`!!G`-!!(J$!!"j!`!!HJ-!!(X$!!"m!`!!I3-!!(i$!!"r!`!"S`-!!)!$!!# | |||
2217 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2210 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2218 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2211 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2219 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2212 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2220 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!#`MlJ!!!!!!!!!3!#`NI`!!)!!!! | ||
2221 | !!!!!!!!!!X)fJ!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2222 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2213 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2223 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2214 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2224 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2215 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2225 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!)!!!% | ||
2226 | !!!!!"3!!Irm!!!!!Irm!!!!!Irm!!!!!Irm!!!!-!!%!!J!'!!!!"8!!!!J!!3! | ||
2227 | "1J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2228 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2216 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2229 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2217 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2230 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2218 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2231 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2219 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2220 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!,#2Z!!!!!!!!!"!!,#4r!!!J! | ||
2221 | !!!!!!!!!!!!#`MD!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2232 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2222 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2233 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2223 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2234 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2224 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2225 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!J! | ||
2226 | !!3!!!!!&!!"rr`!!!!"rr`!!!!"rr`!!!!"rr`!!!!`!!3!#!!B!!!!&3!!!#!! | ||
2227 | "!!%k!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2235 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2228 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2236 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2229 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2237 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%!!!$rrrr | ||
2238 | r!!!!!`!"!!%k1J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2239 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2230 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2240 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2231 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2241 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2232 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -2243,10 +2234,11 @@ r!!!!!`!"!!%k1J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
2243 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2234 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2244 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2235 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2245 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2236 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2237 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!3!!!2r | ||
2238 | rrrm!!!!$!!%!!6Sk!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2246 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2239 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2247 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2240 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2248 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2241 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2249 | !!3!!!2rrrrm!!!!%!!%!!6SkD@jME(9NC6S!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2250 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2242 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2251 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2243 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2252 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2244 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -2254,10 +2246,10 @@ r!!!!!`!"!!%k1J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
2254 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2246 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2255 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2247 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2256 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2248 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2249 | !!!!"!!!!rrrrr`!!!!3!!3!"1MTTEQ0XG@4P1J!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2257 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2250 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2258 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2251 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2259 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2252 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2260 | !!!!!!!!!!!!!!!!!rrrrrd!!!!)!!3!"1J!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2261 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2253 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2262 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2254 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2263 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2255 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -2265,11 +2257,10 @@ r!!!!!`!"!!%k1J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
2265 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2257 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2266 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2258 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2267 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2259 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2260 | !!!!!!!!!!!!!!!!!!!$rrrrr3!!!!J!"!!%k!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2268 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2261 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2269 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2262 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2270 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2263 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2271 | !!!!!!!!!!!!!!!!!!!!!!!!!!!$rrrrr3!!!!`!"!!%k1MT(990*1QPZBfaeC'8 | ||
2272 | k!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2273 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2264 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2274 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2265 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2275 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2266 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -2277,10 +2268,10 @@ k!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
2277 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2268 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2278 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2269 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2279 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2270 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2271 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!2rrrrp!!!!$!!%!!6Sk1NG98dNkD@jME(9 | ||
2272 | NC6S!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2280 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2273 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2281 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2274 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2282 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!2rrrrp!!!!%!!%!!6Sk1NG98dN | ||
2283 | kE'PL1J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2284 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2275 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2285 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2276 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2286 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2277 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -2288,10 +2279,10 @@ kE'PL1J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
2288 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2279 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2289 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2280 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2290 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2281 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2282 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!rrrrrd!!!!3!!3!"1MSk4e9 | ||
2283 | 656TXD@)k!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2291 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2284 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2292 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2285 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2293 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!rrrrrd!!!!8!!J! | ||
2294 | "1NeKBdp6)&0eF("[FR3k!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2295 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2286 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2296 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2287 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2297 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2288 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -2299,10 +2290,10 @@ kE'PL1J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
2299 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2290 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2300 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2291 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2301 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2292 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2293 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!$rrrrr3!!!"3! | ||
2294 | #!!%k6@&M6e-J8h9`F'pbG$S!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2302 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2295 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2303 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2296 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2304 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%!!!$rrrr | ||
2305 | r3!!!"J!#!!%k690-1J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2306 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2297 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2307 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2298 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2308 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2299 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -2310,10 +2301,11 @@ r3!!!"J!#!!%k690-1J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
2310 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2301 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2311 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2302 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2312 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2303 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2304 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!3!!!2r | ||
2305 | rrrp!!!!'!!)!!6T08d`k!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2313 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2306 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2314 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2307 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2315 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2308 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2316 | !!3!!!2rrrrp!!!!(!!S!!%eKBdp6)$Bi5b"-D@jVCA)!!!!!!!!!!!!!!!!!!!! | ||
2317 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2309 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2318 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2310 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2319 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2311 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -2321,6 +2313,7 @@ r3!!!"J!#!!%k690-1J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
2321 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2313 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2322 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2314 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2323 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2315 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2316 | !!!!"!!!!rrrrrd!!!!F!#J!!6@&M6e-J0MK,)%aTEQYPFJ!!!!!!!!!!!!!!!!! | ||
2324 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2317 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2325 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2318 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2326 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2319 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -2329,171 +2322,177 @@ r3!!!"J!#!!%k690-1J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
2329 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2322 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2330 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2323 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2331 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2324 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2332 | !!!!!!!!!!!!!!!!!!!!!!%aTBP066#!f1%X!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2333 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2325 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2334 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2326 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2335 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2327 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2336 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2328 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2337 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!3!"1J!!!!!!!!!!!!! | ||
2338 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2329 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2339 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2330 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2340 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2331 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2332 | !!!!!!!!!!!!!!!!!!!!!!!!!6'PL8e0-)$Bi5`!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2341 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2333 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2342 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2334 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2343 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2335 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2344 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2336 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2337 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"!!%k!!!!!!!!!!! | ||
2345 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2338 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2346 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2339 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2347 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2340 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2348 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!J!"6@&M6e-J0MK,)%a | ||
2349 | TEQYPFJ!!!!!!!!!!!!!!!!!!!!!!)%&38%`!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2350 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!B!!!!%& | ||
2351 | `F'`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2352 | !!!!!!!!!!!!!!!!!!!!!!!!!B!!!!%e06%)!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2353 | !!!!!!!!!!!!!!%aTBL"*EA"[FR3J0MK,!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%e | ||
2354 | 36%B!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%aTBL"*EA"[FR3J0MK | ||
2355 | ,!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%eA3d3!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2356 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!B!!!!%p | ||
2357 | #5L!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%e39b"*EA"[FR3J0MK | ||
2358 | ,!!!!!!!!!!!!!!!!!!!!!!!!!!!!!&"-Ef)!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2359 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!B!!!!&* | ||
2360 | 68N-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2361 | !!!!!!!!!!!!!!!!!!!!!!!!!B!!!!&4&@&3ZBQJ!!!!!!!!!!!!!!!!!!!!!!!! | ||
2362 | !!!!!!!!!!!!!!%*KE'a[EfiJ5'9XF!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!&4 | ||
2363 | &@&3ZB`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%eA)%-[3bXV)$Bi5`! | ||
2364 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!&4&@&3ZBbXV!!!!!!!!!!!!!!!!!!!!!!! | ||
2365 | !!!!!!!!!!!!!!%eA)%-[3bXV)$Bi5`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!&4 | ||
2366 | &@&3ZBf-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%eA)%-[3bXV)$Bi5`! | ||
2367 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!&4&@&3ZBh!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2368 | !!!!!!!!!!!!!!%eA)%-[3bXV)$Bi5`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!&4 | ||
2369 | &@&3ZBh"`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%eA)%-[3bXV)$Bi5`! | ||
2370 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!&4&@&3ZCAK`!!!!!!!!!!!!!!!!!!!!!!! | ||
2371 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!&4 | ||
2372 | &@&3ZCf-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%GKE@9$Ef4P)%0[ERC | ||
2373 | PFR4PFJ!!!!!!!!!!!!!!!!!!3!!!!&4&@&3ZD!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2374 | !!!!!!!!!!!!!!%eA)%-[3bXV)$Bi5`!!!!!!!!!!!!!!!!!!!!!!!!!!%!!!!&4 | ||
2375 | &@&3ZE!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%CXCAJJ8(*PF(*[Bf9 | ||
2376 | cFfpb!!!!!!!!!!!!!!!!!!!!J!!!!&4&@&3ZF!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2377 | !!!!!!!!!!!!!!%eA)&"KFf0KE#!f1%X!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!&4 | ||
2378 | &@&3ZF'&c!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%eA)&"KFf0KE#!f1%X | ||
2379 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!&4&@&3ZF'0S!!!!!!!!!!!!!!!!!!!!!!! | ||
2380 | !!!!!!!!!!!!!!%eA)%-[3bXV)$Bi5`!!!!!!!!!!!!!!!!!!!!!!!!!!J!!!!&4 | ||
2381 | &@&3ZF'0S+bX!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%eA)%-[3bXV)$Bi5`! | ||
2382 | !!!!!!!!!!!!!!!!!!!!!!!!!J!!!!&4&@&3ZF("e!!!!!!!!!!!!!!!!!!!!!!! | ||
2383 | !!!!!!!!!!!!!!%eA)&"KFf0KE#!f1%X!!!!!!!!!!!!!!!!!!!!!!!!!J!!!!&4 | ||
2384 | &@&3ZFJ!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!&*PHJ!!!!!!!!!!!!! | ||
2385 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!&4&@&3ZFf9R!!!!!!!!!!!!!!!!!!!!!!! | ||
2386 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!&4 | ||
2387 | &@&3ZH3!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%*TFfpZ)&"bCA"bEf0 | ||
2388 | PFh0[FJ!!!!!!!!!!!!!!!!!!J!!!!'4[Bh8!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2389 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!B!!!!(* | ||
2390 | cFQ-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2391 | !!!!!!!!!!!!!!!!!!!!!!!!!B!!!!(0SE')!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2392 | !!!!!!!!!!!!!!&"&4L"*EA"[FR3J0MK,!!!!!!!!!!!!!!!!!!!!!!!!!!!!!(0 | ||
2393 | dG@)!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!&"&4L"*EA"[FR3J0MK | ||
2394 | ,!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!ZC'pM!!!!!!!!!!!!!!!!!!!!!!! | ||
2395 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!8!!!!!! | ||
2396 | !!!!ZFR0bB`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2397 | !!!!!!!!!!!!!!!!!!!!!!!!!B!!!!!!&!3%!!3!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2398 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2341 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2399 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2342 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2400 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2343 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2401 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2344 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2402 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!B | ||
2403 | !!!!!!3!!!!!&!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2404 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2345 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2405 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2346 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2406 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2347 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2348 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!#!!&0B@028b!f1%X | ||
2349 | J6'PZDf9b!!!!!!!!!!!!!!!!!!!!!!!J39"36!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2350 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"J!!! | ||
2351 | !3A"`E!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2352 | !!!!!!!!!!!!!!!!!!!!!!!!!!!"J!!!!68e-3J!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2353 | !!!!!!!!!!!!!!!!!6'PL)%PYF'pbG#!f1%X!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2354 | !69"-4J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!6'PL)%PYF'pbG#! | ||
2355 | f1%X!!!!!!!!!!!!!!!!!!!!!!!!!!!!!69G$4!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2356 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"J!!! | ||
2357 | !6d*+)!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!69"A)%PYF'pbG#! | ||
2358 | f1%X!!!!!!!!!!!!!!!!!!!!!!!!!!!!!8%a[BJ!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2359 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"J!!! | ||
2360 | !8P053`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2361 | !!!!!!!!!!!!!!!!!!!!!!!!!!!"J!!!!9%9B9#jLD!!!!!!!!!!!!!!!!!!!!!! | ||
2362 | !!!!!!!!!!!!!!!!!3Q&XE'p[EL")C@a`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2363 | !9%9B9#jM!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!69FJ3bp$+bXJ0MK | ||
2364 | ,!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!9%9B9#jM+bX!!!!!!!!!!!!!!!!!!!! | ||
2365 | !!!!!!!!!!!!!!!!!69FJ3bp$+bXJ0MK,!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2366 | !9%9B9#jMB`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!69FJ3bp$+bXJ0MK | ||
2367 | ,!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!9%9B9#jMF!!!!!!!!!!!!!!!!!!!!!! | ||
2368 | !!!!!!!!!!!!!!!!!69FJ3bp$+bXJ0MK,!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2369 | !9%9B9#jMF(!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!69FJ3bp$+bXJ0MK | ||
2370 | ,!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!9%9B9#jPH(!!!!!!!!!!!!!!!!!!!!! | ||
2407 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2371 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2372 | !9%9B9#jRB`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!4f&YC80[C'8J3fp | ||
2373 | ZGQ9bG'9b!!!!!!!!!!!!!!!!!!"!!!!!9%9B9#jS!!!!!!!!!!!!!!!!!!!!!!! | ||
2374 | !!!!!!!!!!!!!!!!!69FJ3bp$+bXJ0MK,!!!!!!!!!!!!!!!!!!!!!!!!!!!3!!! | ||
2375 | !9%9B9#jX!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!4QaPH#"3FQ9`FQp | ||
2376 | MCA0cEh)!!!!!!!!!!!!!!!!!!!#!!!!!9%9B9#j`!!!!!!!!!!!!!!!!!!!!!!! | ||
2377 | !!!!!!!!!!!!!!!!!69FJ8'&cBf&X)$Bi5`!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2378 | !9%9B9#j`BA-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!69FJ8'&cBf&X)$B | ||
2379 | i5`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!9%9B9#j`BfJ!!!!!!!!!!!!!!!!!!!! | ||
2380 | !!!!!!!!!!!!!!!!!69FJ3bp$+bXJ0MK,!!!!!!!!!!!!!!!!!!!!!!!!!!#!!!! | ||
2381 | !9%9B9#j`BfJV+`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!69FJ3bp$+bXJ0MK | ||
2382 | ,!!!!!!!!!!!!!!!!!!!!!!!!!!#!!!!!9%9B9#j`F(8!!!!!!!!!!!!!!!!!!!! | ||
2383 | !!!!!!!!!!!!!!!!!69FJ8'&cBf&X)$Bi5`!!!!!!!!!!!!!!!!!!!!!!!!#!!!! | ||
2384 | !9%9B9#jb!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!8Q9k!!!!!!!!!!! | ||
2385 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!9%9B9#jcC@F!!!!!!!!!!!!!!!!!!!! | ||
2408 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2386 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2387 | !9%9B9#jj!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!3QPcEfiJ8(*PF(* | ||
2388 | [Bf9cFfpb!!!!!!!!!!!!!!!!!!#!!!!!C'pMG3!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2389 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"J!!! | ||
2390 | !FR0bB`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2391 | !!!!!!!!!!!!!!!!!!!!!!!!!!!"J!!!!FfKXBJ!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2392 | !!!!!!!!!!!!!!!!!8%9')%PYF'pbG#!f1%X!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2393 | !Fh4eBJ!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!8%9')%PYF'pbG#! | ||
2394 | f1%X!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!#jNEf-!!!!!!!!!!!!!!!!!!!! | ||
2395 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"3!!! | ||
2396 | !!!!!!#jbFh*M!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2397 | !!!!!!!!!!!!!!!!!!!!!!!!!!!"J!!!!!!8"!3!"!!!!!!!!!!!!!!!!!!!!!!! | ||
2409 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2398 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2410 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2399 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2411 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2400 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2412 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2401 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2413 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2402 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2414 | !!!!!!!!!!!!!!3%!!'eKD@i!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2403 | !"J!!!!!"!!!!!!8!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2415 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2404 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2416 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2405 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2417 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2406 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2418 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2407 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2419 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!#!%"!3!!!!%"!3!!!3%"!!! | ||
2420 | !!!!"!3!!!3%!!3!!!33!!!!!!!!!!!!!#!%!!3%!!3%!!!!"!!!*!!-B6'PL8e0 | ||
2421 | -,MBi5b"'B5JdD9miC#NZ6'PL!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2422 | !!!!!!!!!!!!!2cmr2cmr2cm!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2423 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!r2cmr!!! | ||
2424 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2408 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2425 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2409 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2426 | !!!!!!!!!!!!!!!!!$3!"!!!!!!!9AdeA49*,8ep(990*Ah"bC@CTH#jS!!!!!!! | ||
2427 | !!!!!!!!!!3!!!!!!!!!!!3!!!!!!!!!!!!!&!3%"!!!"!3!"!!!!!!3!!!!!!!! | ||
2428 | !!!!!!!!!!!!!!3!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2429 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2410 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2430 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2411 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2431 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2412 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2432 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2413 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2414 | !!!!!!!!!!!!!!!!"!3!!E@&TEJ!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2433 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2415 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2434 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!Aep | ||
2435 | cG'&bG!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2436 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2416 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2437 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"!!%!!!P0CA*RC5"2GA3 | ||
2438 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2417 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2439 | !!!!!!!!r2cmr39"36!!"!3!!"#!J)#!$NS0J!h6IH!-$VH!!"3)"!!%"!!%"!3! | ||
2440 | !!3!!!!!!!!!"!3%"!!%"!!%!!33!!!!!!!!!!!!!"`%"!!%!!!%!!!!!!!!!!!! | ||
2441 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2418 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2442 | !!!!!!!!!AepcG'&bG!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2419 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!)!3%"!!!!!3%"!!!"!3% |
2420 | !!!!!!!%"!!!"!3!"!!!""!!!!!!!!!!!!!!)!3!"!3!"!3!!!!%!!!N!!aK-D@* | ||
2421 | 68d`Z0MK,)%CK+$4TAcKN+5j-D@)!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2422 | !!!!!!!!!!!!!!!!r2cmr2cmr2`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2423 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!$mr2cm | ||
2443 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2424 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2444 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!J!!!!!!!! | ||
2445 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2425 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2426 | !!!!!!!!!!!!!!!!!!!!0!!%!!!!!!"9I69G&8NY6AdG98dPIF(*PCQPi,QJ!!!! | ||
2427 | !!!!!!!!!!!!"!!!!!!!!!!!"!!!!!!!!!!!!!!8"!3%!!!%"!!%!!!!!"!!!!!! | ||
2428 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2446 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2429 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2447 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2430 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2448 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2431 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2449 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2432 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2450 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!&!!!)4f9d5&488&-!!!! | ||
2451 | !!!!!!!!!!!!!!!!!!!!!!!!!!$mr2cp"8&"-!!!%!!!!"!!!!!"!!!"B`!!!!!! | ||
2452 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2433 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2453 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"2cm | 2434 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" |
2454 | r2`!!!!!!!!!#!!!!!J!#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2435 | IAh0dBA*d!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2455 | !!!!!!!!!!J"3!!%!!3!"!!%!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2456 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2436 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2437 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%!!3!!#8ePFQGP)%p | ||
2438 | eG!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2439 | !!!!!!!!!!$mr2cp"8&"-!!%"!!!%)#!J)!1ARe!$GYpi!`@Z%!!&!J%!!3%!!3% | ||
2440 | "!!!"!!!!!!!!!!%"!3%!!3%!!3!""!!!!!!!!!!!!!!(!3%!!3!!!3!!!!!!!!! | ||
2457 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2441 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2442 | !!!!!!!!!!!"IAh0dBA*d!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2458 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2443 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2444 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!#!!!!!! | ||
2459 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2445 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2460 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!&#G$6d4&*b!R4%&835F | ||
2461 | J*e"*3e3R!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2462 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2446 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2463 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2447 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2464 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2448 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2465 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2449 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2466 | !!!3!!!%!!!!+!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!%!!!#!!! | 2450 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!8!!!K(CA4)9&438`! |
2467 | !#`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!"!!!!`!!!!`#!3!!!!! | 2451 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!2cmr2d&38%`!!!3!!!!%!!!!!%!!!&M!!!! |
2468 | !!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!3!!!3!!!!0!J%!!!!!!!%!!3%!!!! | ||
2469 | !!!!!!!!!!!!"!!!!!!!!!!!%!!!&!!!!$J)"!!!!!!!"!!%"!!!!!!!!!!!!!!! | ||
2470 | !!3!!!!!!!!!!"!!!"J!!!!m#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!! | ||
2471 | !!!3!!!F!!!!3!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!%!!!)!!! | ||
2472 | !%3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!"!!!#3!!!")#!3!!!!! | ||
2473 | !!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!3!!!S!!!!6!J%!!!!!!!%!!3%!!!! | ||
2474 | !!!!!!!!!!!!"!!!!!!!!!!!%!!!,!!!!&!)"!!!!!!!"!!%"!!!!!!!!!!!!!!! | ||
2475 | !!3!!!!!!!!!!"!!!$!!!!"8#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!! | ||
2476 | !!!3!!!d!!!!@!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!%!!!1!!! | ||
2477 | !&`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!"!!!$`!!!"J#!3!!!!! | ||
2478 | !!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!3!!"!!!!!C!J%!!!!!!!%!!3%!!!! | ||
2479 | !!!!!!!!!!!!"!!!!!!!!!!!%!!!4!!!!'J)"!!!!!!!"!!%"!!!!!!!!!!!!!!! | ||
2480 | !!3!!!!!!!!!!"!!!%J!!!"X#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!! | ||
2481 | !!!3!!"-!!!!F!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!%!!!8!!! | ||
2482 | !(3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!"!!!&3!!!"i#!3!!!!! | ||
2483 | !!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!3!!"B!!!!I!J%!!!!!!!%!!3%!!!! | ||
2484 | !!!!!!!!!!!!"!!!!!!!!!!!%!!!A!!!!)!)"!!!!!!!"!!%"!!!!!!!!!!!!!!! | ||
2485 | !!3!!!!!!!!!!"!!!'!!!!#%#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!! | ||
2486 | !!!3!!"N!!!!L!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!%!!!D!!! | ||
2487 | !)`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!"!!!'`!!!#3#!3!!!!! | ||
2488 | !!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!3!!"`!!!!P!J%!!!!!!!%!!3%!!!! | ||
2489 | !!!!!!!!!!!!"!!!!!!!!!!!%!!!G!!!!*J)"!!!!!!!"!!%"!!!!!!!!!!!!!!! | ||
2490 | !!3!!!!!!!!!!"!!!(J!!!#F#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!! | ||
2491 | !!!3!!"m!!!!S!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!%!!!J!!! | ||
2492 | !+3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!"!!!)3!!!#S#!3!!!!! | ||
2493 | !!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!3!!#)!!!!V!J%!!!!!!!%!!3%!!!! | ||
2494 | !!!!!!!!!!!!"!!!!!!!!!!!%!!!M!!!!,!)"!!!!!!!"!!%"!!!!!!!!!!!!!!! | ||
2495 | !!3!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2496 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2452 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2453 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!% | ||
2454 | r2cmr!!!!!!!!!!)!!!!#!!)!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2455 | !!!!!!!!!!!!#!&!!!3!"!!%!!3!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2456 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2457 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2458 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2459 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2460 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!8*d024%8R)#G%394 | ||
2461 | "*b!R8%P$9#F!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2462 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2463 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2464 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2465 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2466 | !!!!!"!!!!3!!!!S#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!3!!!) | ||
2467 | !!!!,!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!%!!!$!!!!$!)"!!! | ||
2468 | !!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!"!!!"!!!!!d#!3!!!!!!!3!"!3! | ||
2469 | !!!!!!!!!!!!!!!%!!!!!!!!!!!3!!!8!!!!1!J%!!!!!!!%!!3%!!!!!!!!!!!! | ||
2470 | !!!!"!!!!!!!!!!!%!!!'!!!!$`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!! | ||
2471 | !!!!!"!!!"`!!!"!#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!3!!!J | ||
2472 | !!!!4!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!%!!!*!!!!%J)"!!! | ||
2473 | !!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!"!!!#J!!!"-#!3!!!!!!!3!"!3! | ||
2474 | !!!!!!!!!!!!!!!%!!!!!!!!!!!3!!!X!!!!8!J%!!!!!!!%!!3%!!!!!!!!!!!! | ||
2475 | !!!!"!!!!!!!!!!!%!!!-!!!!&3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!! | ||
2476 | !!!!!"!!!$3!!!"B#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!3!!!i | ||
2477 | !!!!A!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!%!!!2!!!!'!)"!!! | ||
2478 | !!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!"!!!%!!!!"N#!3!!!!!!!3!"!3! | ||
2479 | !!!!!!!!!!!!!!!%!!!!!!!!!!!3!!"%!!!!D!J%!!!!!!!%!!3%!!!!!!!!!!!! | ||
2480 | !!!!"!!!!!!!!!!!%!!!5!!!!'`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!! | ||
2481 | !!!!!"!!!%`!!!"`#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!3!!"3 | ||
2482 | !!!!G!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!%!!!9!!!!(J)"!!! | ||
2483 | !!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!"!!!&J!!!"m#!3!!!!!!!3!"!3! | ||
2484 | !!!!!!!!!!!!!!!%!!!!!!!!!!!3!!"F!!!!J!J%!!!!!!!%!!3%!!!!!!!!!!!! | ||
2485 | !!!!"!!!!!!!!!!!%!!!B!!!!)3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!! | ||
2486 | !!!!!"!!!'3!!!#)#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!3!!"S | ||
2487 | !!!!M!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!%!!!E!!!!*!)"!!! | ||
2488 | !!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!"!!!(!!!!#8#!3!!!!!!!3!"!3! | ||
2489 | !!!!!!!!!!!!!!!%!!!!!!!!!!!3!!"d!!!!Q!J%!!!!!!!%!!3%!!!!!!!!!!!! | ||
2490 | !!!!"!!!!!!!!!!!%!!!H!!!!*`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!! | ||
2491 | !!!!!"!!!(`!!!#J#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!3!!#! | ||
2492 | !!!!T!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!%!!!K!!!!+J)"!!! | ||
2493 | !!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!"!!!)J!!!#X#!3!!!!!!!3!"!3! | ||
2494 | !!!!!!!!!!!!!!!%!!!!!!!!!!!3!!#-!!!!X!J%!!!!!!!%!!3%!!!!!!!!!!!! | ||
2495 | !!!!"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2497 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2496 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2498 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2497 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2499 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2498 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -2516,17 +2515,17 @@ J*e"*3e3R!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
2516 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2515 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2517 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2516 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2518 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2517 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2519 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!3!!!!)!!!!$!!!!"!!!!!8!!!!'!!! | ||
2520 | !"`!!!!J!!!!*!!!!#J!!!!X!!!!-!!!!$3!!!!i!!!!2!!!!%!!!!"%!!!!5!!! | ||
2521 | !%`!!!"3!!!!9!!!!&J!!!"F!!!!B!!!!'3!!!"S!!!!E!!!!(!!!!"d!!!!H!!! | ||
2522 | !(`!!!#!!!!!K!!!!)J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2523 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2518 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2524 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!)`!!!%!%!!!!"!! | 2519 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"!!!!!J!!!!-!!!!%!!!!"3!!!!B |
2525 | !)`!!!GS!!3!F!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"!!!"33!!!3%!!!$"!! | 2520 | !!!!(!!!!#!!!!!N!!!!+!!!!#`!!!!`!!!!0!!!!$J!!!!m!!!!3!!!!%3!!!") |
2526 | !!J3!!!B%!!!,"!!!#J3!!!N%!!!)"!!!"`3!!!`%!!!5"!!!%33!!"!%!!!2"!! | 2521 | !!!!6!!!!&!!!!"8!!!!@!!!!&`!!!"J!!!!C!!!!'J!!!"X!!!!F!!!!(3!!!"i |
2527 | !$33!!!i%!!!6"!!!)J3!!#%%!!!J"!!!(`3!!#-%!!!""!!!&!3!!"8%!!!@"!! | 2522 | !!!!I!!!!)!!!!#%!!!!L!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2528 | !&`3!!"J%!!!C"!!!'J3!!"X%!!!F"!!!(33!!"i!!J!!!!!!!!!!!!!!!!!!!!! | ||
2529 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2523 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2524 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!M!!!!3!3!!!! | ||
2525 | %!!!M!!!"f`!"!"`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%!!!&"!!!"!3!!!- | ||
2526 | %!!!#"!!!"J3!!!X%!!!+"!!!#33!!!J%!!!("!!!$!3!!")%!!!4"!!!%!3!!!m | ||
2527 | %!!!0"!!!$J3!!"-%!!!L"!!!)33!!#!%!!!I"!!!)`3!!!%%!!!8"!!!&33!!"B | ||
2528 | %!!!A"!!!'!3!!"N%!!!D"!!!'`3!!"`%!!!G"!!!(J!#!!!!!!!!!!!!!!!!!!! | ||
2530 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2529 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2531 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2530 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2532 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2531 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -2547,14 +2546,14 @@ J*e"*3e3R!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
2547 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2546 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2548 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2547 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2549 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2548 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2550 | !!!!!!!!!!!!!!!!!!!,#2Z!!!!!!!!!"!!,#4r!!!J!!!!!!!!!!!!!#`MD!!!! | ||
2551 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2549 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2550 | !!!!!!!!!!!!!!!!!!!!!!X)qi!!!!!!!!!%!!X*(m!!#!!!!!!!!!!!!!!,#0S! | ||
2552 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2551 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2553 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2552 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2554 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2553 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2555 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!J!!!3!!!!!&!!"rr`!!!!" | ||
2556 | rr`!!!!"rr`!!!!"rr`!!!!`!!3!#!!B!!!!&3!!!#!!"!!%k!!!!!!!!!!!!!!! | ||
2557 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2554 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2555 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!#!!!"!!!!!!8!!(rr!!! | ||
2556 | !!(rr!!!!!(rr!!!!!(rr!!!!$!!"!!)!"J!!!!9!!!!)!!%!!6S!!!!!!!!!!!! | ||
2558 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2557 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2559 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2558 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2560 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2559 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -2564,8 +2563,8 @@ rr`!!!!"rr`!!!!"rr`!!!!`!!3!#!!B!!!!&3!!!#!!"!!%k!!!!!!!!!!!!!!! | |||
2564 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2563 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2565 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2564 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2566 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2565 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2567 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!3!!!2rrrrm!!!!$!!%!!6Sk!!! | ||
2568 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2566 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2567 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"!!!!rrrrr`!!!!-!!3!"1MS | ||
2569 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2568 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2570 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2569 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2571 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2570 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -2575,9 +2574,9 @@ rr`!!!!"rr`!!!!"rr`!!!!`!!3!#!!B!!!!&3!!!#!!"!!%k!!!!!!!!!!!!!!! | |||
2575 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2574 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2576 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2575 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2577 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2576 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2578 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"!!!!rrrrr`!!!!3 | ||
2579 | !!3!"1MTTEQ0XG@4P1J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2580 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2577 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2578 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%!!!$rrrrr!!! | ||
2579 | !"!!"!!%k1QPZBfaeC'8k!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2581 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2580 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2582 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2581 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2583 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2582 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -2586,10 +2585,9 @@ rr`!!!!"rr`!!!!"rr`!!!!`!!3!#!!B!!!!&3!!!#!!"!!%k!!!!!!!!!!!!!!! | |||
2586 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2585 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2587 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2586 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2588 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2587 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2589 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!$ | ||
2590 | rrrrr3!!!!J!"!!%k!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2591 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2588 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2592 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2589 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2590 | !!2rrrrp!!!!#!!%!!6S!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2593 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2591 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2594 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2592 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2595 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2593 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -2598,9 +2596,9 @@ rrrrr3!!!!J!"!!%k!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
2598 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2596 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2599 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2597 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2600 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2598 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2601 | !!!!!!!!!!2rrrrp!!!!$!!%!!6Sk1NG98dNkD@jME(9NC6S!!!!!!!!!!!!!!!! | ||
2602 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2599 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2603 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2600 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2601 | !!!!!!!!!!!!!rrrrrd!!!!-!!3!"1MSk4e9656TTEQ0XG@4P1J!!!!!!!!!!!!! | ||
2604 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2602 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2605 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2603 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2606 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2604 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -2609,9 +2607,9 @@ rrrrr3!!!!J!"!!%k!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
2609 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2607 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2610 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2608 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2611 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2609 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2612 | !!!!!!!!!!!!!!!!!!!!!rrrrrd!!!!3!!3!"1MSk4e9656TXD@)k!!!!!!!!!!! | ||
2613 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2610 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2614 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2611 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2612 | !!!!!!!!!!!!!!!!!!!!!!!$rrrrr3!!!"!!"!!%k1MT(990*1QaTBMS!!!!!!!! | ||
2615 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2613 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2616 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2614 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2617 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2615 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -2620,10 +2618,10 @@ rrrrr3!!!!J!"!!%k!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
2620 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2618 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2621 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2619 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2622 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2620 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2623 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!$rrrrr3!!!"3!#!!%k6@&M6e-J8h9`F'p | ||
2624 | bG$S!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2625 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2621 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2626 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2622 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2623 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!2rrrrp!!!!&!!)!!6T0B@028b"6GA" | ||
2624 | `Eh*d1J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2627 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2625 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2628 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2626 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2629 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2627 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -2631,10 +2629,10 @@ bG$S!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
2631 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2629 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2632 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2630 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2633 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2631 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2634 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!3!!!2rrrrp!!!!'!!)!!6T08d` | ||
2635 | k!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2636 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2632 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2637 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2633 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2634 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"!!!!rrrrrd!!!!B!!J!"1Ne | ||
2635 | 66$S!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2638 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2636 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2639 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2637 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2640 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2638 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -2642,10 +2640,10 @@ k!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
2642 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2640 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2643 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2641 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2644 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2642 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2645 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"!!!!rrrrrd!!!!F | ||
2646 | !#J!!6@&M6e-J0MK,)%aTEQYPFJ!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2647 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2643 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2648 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2644 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2645 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%!!!$rrrrr3!! | ||
2646 | !"`!+!!"0B@028b!f1%XJ6'PZDf9b!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2649 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2647 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2650 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2648 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2651 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2649 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -2659,14 +2657,14 @@ k!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
2659 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2657 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2660 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2658 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2661 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2659 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2662 | !!!!!6h"PEP066#!f1'X!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2663 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2660 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2664 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2661 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2662 | !!!!!!!"2F'9Z8e0-)$BiD`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2665 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2663 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2666 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2664 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2667 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!"!!%k!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2668 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2665 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2669 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2666 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2667 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%!!6S!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2670 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2668 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2671 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2669 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2672 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2670 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -2675,63 +2673,63 @@ k!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
2675 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2673 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2676 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2674 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2677 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2675 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2678 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!#!!&0B@028b!f1%XJ6'PZDf9b!!!!!!!!!!! | ||
2679 | !!!!!!!!!!!!J39"36!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2680 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"J!!!!3A"`E!!!!!!!!!!!!!! | ||
2681 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2676 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2682 | !!!!!!!"J!!!!68e-3J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!6'P | ||
2683 | L)%PYF'pbG#!f1%X!!!!!!!!!!!!!!!!!!!!!!!!!!!!!69"-4J!!!!!!!!!!!!! | ||
2684 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!6'PL)%PYF'pbG#!f1%X!!!!!!!!!!!!!!!! | ||
2685 | !!!!!!!!!!!!!69G$4!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2686 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"J!!!!6d*+)!!!!!!!!!!!!!! | ||
2687 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!69"A)%PYF'pbG#!f1%X!!!!!!!!!!!!!!!! | ||
2688 | !!!!!!!!!!!!!8%a[BJ!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2689 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"J!!!!8P053`!!!!!!!!!!!!! | ||
2690 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2677 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2691 | !!!!!!!"J!!!!9%9B9#jLD!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!3Q& | 2678 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!)!!8eKBdp6)$Bi5b"-D@jVCA)!!!!!!!! |
2692 | XE'p[EL")C@a`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!9%9B9#jM!!!!!!!!!!! | 2679 | !!!!!!!!!!!!!!#""8&"-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2693 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!69FJ3bp$+bXJ0MK,!!!!!!!!!!!!!!!!!!! | 2680 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'!!!!""F("X!!!!!!!!!!! |
2694 | !!!!!!!!!!!!!9%9B9#jM+bX!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!69F | ||
2695 | J3bp$+bXJ0MK,!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!9%9B9#jMB`!!!!!!!!! | ||
2696 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!69FJ3bp$+bXJ0MK,!!!!!!!!!!!!!!!!!!! | ||
2697 | !!!!!!!!!!!!!9%9B9#jMF!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!69F | ||
2698 | J3bp$+bXJ0MK,!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!9%9B9#jMF(!!!!!!!!! | ||
2699 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!69FJ3bp$+bXJ0MK,!!!!!!!!!!!!!!!!!!! | ||
2700 | !!!!!!!!!!!!!9%9B9#jPH(!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2701 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!9%9B9#jRB`!!!!!!!!! | ||
2702 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!4f&YC80[C'8J3fpZGQ9bG'9b!!!!!!!!!!! | ||
2703 | !!!!!!!"!!!!!9%9B9#jS!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!69F | ||
2704 | J3bp$+bXJ0MK,!!!!!!!!!!!!!!!!!!!!!!!!!!!3!!!!9%9B9#jX!!!!!!!!!!! | ||
2705 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!4QaPH#"3FQ9`FQpMCA0cEh)!!!!!!!!!!!! | ||
2706 | !!!!!!!#!!!!!9%9B9#j`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!69F | ||
2707 | J8'&cBf&X)$Bi5`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!9%9B9#j`BA-!!!!!!!! | ||
2708 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!69FJ8'&cBf&X)$Bi5`!!!!!!!!!!!!!!!!! | ||
2709 | !!!!!!!!!!!!!9%9B9#j`BfJ!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!69F | ||
2710 | J3bp$+bXJ0MK,!!!!!!!!!!!!!!!!!!!!!!!!!!#!!!!!9%9B9#j`BfJV+`!!!!! | ||
2711 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!69FJ3bp$+bXJ0MK,!!!!!!!!!!!!!!!!!!! | ||
2712 | !!!!!!!#!!!!!9%9B9#j`F(8!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!69F | ||
2713 | J8'&cBf&X)$Bi5`!!!!!!!!!!!!!!!!!!!!!!!!#!!!!!9%9B9#jb!!!!!!!!!!! | ||
2714 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!8Q9k!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2715 | !!!!!!!!!!!!!9%9B9#jcC@F!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2716 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!9%9B9#jj!!!!!!!!!!! | ||
2717 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!3QPcEfiJ8(*PF(*[Bf9cFfpb!!!!!!!!!!! | ||
2718 | !!!!!!!#!!!!!C'pMG3!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2719 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"J!!!!FR0bB`!!!!!!!!!!!!! | ||
2720 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2681 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2721 | !!!!!!!"J!!!!FfKXBJ!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!8%9 | 2682 | !!!!!!!!!!'!!!!"068a#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" |
2722 | ')%PYF'pbG#!f1%X!!!!!!!!!!!!!!!!!!!!!!!!!!!!!Fh4eBJ!!!!!!!!!!!!! | 2683 | -D@)J5@e`Eh*d)$Bi5`!!!!!!!!!!!!!!!!!!!!!!!!!!!!"08%a'!!!!!!!!!!! |
2723 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!8%9')%PYF'pbG#!f1%X!!!!!!!!!!!!!!!! | 2684 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"-D@)J5@e`Eh*d)$Bi5`!!!!!!!!!!!!! |
2724 | !!!!!!!!!!!!!!!!!!#jNEf-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2685 | !!!!!!!!!!!!!!!"09d0%!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2725 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"3!!!!!!!!!#jbFh*M!!!!!!! | 2686 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'!!!!"23NSJ!!!!!!!!!!! |
2687 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"08&FJ5@e`Eh*d)$Bi5`!!!!!!!!!!!!! | ||
2688 | !!!!!!!!!!!!!!!"36'pL!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2689 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'!!!!"58e*$!!!!!!!!!!! | ||
2726 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2690 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2727 | !!!!!!!"J!!!!!!8"!3!"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2691 | !!!!!!!!!!'!!!!"849K8,Q*S!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" |
2692 | #B@aXEfpZ)%KPE(!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"849K8,Q-!!!!!!!! | ||
2693 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"09b"$,d-V+b!f1%X!!!!!!!!!!!!!!!! | ||
2694 | !!!!!!!!!!!!!!!"849K8,Q-V+`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" | ||
2695 | 09b"$,d-V+b!f1%X!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"849K8,Q0M!!!!!!! | ||
2696 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"09b"$,d-V+b!f1%X!!!!!!!!!!!!!!!! | ||
2697 | !!!!!!!!!!!!!!!"849K8,Q0`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" | ||
2698 | 09b"$,d-V+b!f1%X!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"849K8,Q0`F!!!!!! | ||
2699 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"09b"$,d-V+b!f1%X!!!!!!!!!!!!!!!! | ||
2700 | !!!!!!!!!!!!!!!"849K8,Q9iF!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2701 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"849K8,QGM!!!!!!! | ||
2702 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"(B@eP3fpNC5"$EfjfCA*dCA)!!!!!!!! | ||
2703 | !!!!!!!!!!%!!!!"849K8,QJ!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" | ||
2704 | 09b"$,d-V+b!f1%X!!!!!!!!!!!!!!!!!!!!!!!!!!"!!!!"849K8,Q`!!!!!!!! | ||
2705 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"'E'9i)&"bCA"bEf0PFh0[FJ!!!!!!!!! | ||
2706 | !!!!!!!!!!)!!!!"849K8,R!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" | ||
2707 | 09b"3BA0MB@`J0MK,!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"849K8,R"KF`!!!!! | ||
2708 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"09b"3BA0MB@`J0MK,!!!!!!!!!!!!!!! | ||
2709 | !!!!!!!!!!!!!!!"849K8,R"MD!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" | ||
2710 | 09b"$,d-V+b!f1%X!!!!!!!!!!!!!!!!!!!!!!!!!!)!!!!"849K8,R"MD#XV!!! | ||
2711 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"09b"$,d-V+b!f1%X!!!!!!!!!!!!!!!! | ||
2712 | !!!!!!!!!!)!!!!"849K8,R"`G3!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" | ||
2713 | 09b"3BA0MB@`J0MK,!!!!!!!!!!!!!!!!!!!!!!!!!)!!!!"849K8,R)!!!!!!!! | ||
2714 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"5CAS!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2715 | !!!!!!!!!!!!!!!"849K8,R0PC`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2716 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"849K8,RN!!!!!!!! | ||
2717 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"#DA0[EL"3FQ9`FQpMCA0cEh)!!!!!!!! | ||
2718 | !!!!!!!!!!)!!!!"NEf0e!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2719 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'!!!!"bFh*M!!!!!!!!!!! | ||
2728 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2720 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2721 | !!!!!!!!!!'!!!!"cD'aL!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" | ||
2722 | 348BJ5@e`Eh*d)$Bi5`!!!!!!!!!!!!!!!!!!!!!!!!!!!!"cG(9L!!!!!!!!!!! | ||
2723 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"348BJ5@e`Eh*d)$Bi5`!!!!!!!!!!!!! | ||
2724 | !!!!!!!!!!!!!!!!!!!!!,Q4[B`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2725 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!&!!!!!!!!!!,R*cFQ-!!!! | ||
2729 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2726 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2727 | !!!!!!!!!!'!!!!!!"3%"!!%!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2730 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2728 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2731 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2729 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2732 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"J!!!!!"!!!!!!8!!!! | ||
2733 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2730 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2734 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2731 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2732 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'!!!!!!%!!!!!"3! | ||
2735 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2733 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2736 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2734 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2737 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2735 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -2740,94 +2738,94 @@ J8'&cBf&X)$Bi5`!!!!!!!!!!!!!!!!!!!!!!!!#!!!!!9%9B9#jb!!!!!!!!!!! | |||
2740 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2738 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2741 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2739 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2742 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2740 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2743 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"!3! | ||
2744 | !E@&TEJ!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2745 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2741 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2746 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2742 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2743 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!% | ||
2744 | "!!"YB@PZ!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2747 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2745 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2748 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2746 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2749 | !!!!!!!!!!!!!!!!!!!!!!!!)!3!"!!!!!3%"!!!"!3%!!!!!!!%"!!!"!3!"!!! | ||
2750 | ""!!!!!!!!!!!!!!)!3!"!3!"!3!!!!%!!!N!!!a2F'9Z8e0-+$BiDbN!!!!!!!! | ||
2751 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!r2cm | ||
2752 | r39"36!!!!J"B`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2753 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!$mr2cm!!!!!!!!!!!!!!!!!!!! | ||
2754 | !!!!!!!!!!!!!!!!!!!!#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2755 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2747 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2756 | 0!!%!!!!!!"9I69G&8NY6AdG98dPIF(*PCQPi,QJ!!!!!!!!!!!!!!!!"!!!!!!! | ||
2757 | !!!!"!!!!!!!!!!!!!!8"!3%!!!%"!!%!!!!!"!!!!!!!!!!!!!!!!!!!!!!"!!! | ||
2758 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2748 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2749 | !!!!!!!!!!!!!!!!!!!!!!!!!!!J"!!%!!!!"!3%!!!%"!3!!!!!!!3%!!!%"!!% | ||
2750 | !!!%%!!!!!!!!!!!!!!J"!!%"!!%"!!!!!3!!#3!!$%p`C@j68d`S0MKV+3!!!!! | ||
2751 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!$m | ||
2752 | r2cp"8&"-!!!#!&M!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2753 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!2cmr2`!!!!!!!!!!!!!!!!! | ||
2754 | !!!!!!!!!!!!!!!!!!!!!!!)!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2759 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2755 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2756 | !!!d!!3!!!!!!&9p09d955e0I4e9659p`FQ9QDAJZD!!!!!!!!!!!!!!!!!%!!!! | ||
2757 | !!!!!!!%!!!!!!!!!!!!!"3%"!3!!!3%!!3!!!!!%!!!!!!!!!!!!!!!!!!!!!!% | ||
2760 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2758 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2761 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2759 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2762 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2760 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2763 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2761 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2764 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"IAh0dBA*d!!!!!!!!!!! | ||
2765 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2762 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2766 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2763 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2767 | !!!!!!!!!!!!!!!!!!!!!!!!!!!%!!3!!#8ePFQGP)%peG!!!!!!!!!!!!!!!!!! | 2764 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!&pIFh4KFR3!!!!!!!! |
2768 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!$mr2cp"8&" | ||
2769 | -!!%"!!!%)#!J)!15Jf!$G0pi!`1Yi!!&!J%!!3%!!3%"!!!"!!!!!!!!!!%"!3% | ||
2770 | !!3%!!3!""!!!!!!!!!!!!!!(!3%!!3!!!3!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2771 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"IAh0dBA* | ||
2772 | d!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2773 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2765 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2774 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!#!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2775 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2766 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2767 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!3!"!!!*6@9bCf8J6h9d!!!!!!!!!!!!!!! | ||
2768 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!2cmr2d& | ||
2769 | 38%`!!3%!!!3J)#!J!jHI8!0fhhJ$"Di3!!8#!3!"!3!"!3%!!!%!!!!!!!!!!3% | ||
2770 | "!3!"!3!"!!%%!!!!!!!!!!!!!!F"!3!"!!!"!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2771 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!&pIFh4 | ||
2772 | KFR3!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2776 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2773 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2774 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!)!!!!!!!!!!!!!!!!!!!!!!! | ||
2777 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2775 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2778 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2776 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2779 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2777 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2780 | !!!!!!!!!!!!!!!!!!!!!!!!!!!8!!!G2F'9Z8e0-!!!!!!!!!!!!!!!!!!!!!!! | ||
2781 | !!!!!!!!!2cmr2d&38%`!!!3!!!!%!!!!!%!!!&M!!!!!!!!!!!!!!!!!!!!!!!! | ||
2782 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2778 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2783 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%r2cmr!!!!!!!!!!)!!!! | ||
2784 | #!!)!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!#!&!!!3! | ||
2785 | "!!%!!3!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2786 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2779 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2780 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!"3!!"dp`C@j68d`!!!!!!!!!!!!!!!!!!!! | ||
2781 | !!!!!!!!!!!!r2cmr39"36!!!"!!!!!3!!!!!3!!!@-!!!!!!!!!!!!!!!!!!!!! | ||
2787 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2782 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2783 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!6mr2cm!!!!!!!!!!J! | ||
2784 | !!!)!!J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!)!8!! | ||
2785 | "!!%!!3!"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2788 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2786 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2789 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2787 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2790 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!8*d024%8R)#G%394"*b!R8%P$9#F!!!!!!!! | ||
2791 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2788 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2792 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2789 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2790 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"3R3dp%45FJ*d4"9%%R)#G35808*`!!!!! | ||
2793 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2791 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2794 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2792 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2795 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"3!!!3!!!ES#!3! | ||
2796 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!8!!!)!!!'l!J%!!!!!!!%!!3% | ||
2797 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!&!!!$!!!"[!)"!!!!!!!"!!%"!!!!!!!!!!! | ||
2798 | !!!!!!3!!!!!!!!!!"3!!"!!!!Ed#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
2799 | !!!!!!!8!!!8!!!'q!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!&!!! | ||
2800 | '!!!"[`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!"3!!"`!!!F!#!3! | ||
2801 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!8!!!J!!!("!J%!!!!!!!%!!3% | ||
2802 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!&!!!*!!!"`J)"!!!!!!!"!!%"!!!!!!!!!!! | ||
2803 | !!!!!!3!!!!!!!!!!"3!!#J!!!F-#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
2804 | !!!!!!!8!!!X!!!(%!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!&!!! | ||
2805 | -!!!"a3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!"3!!$3!!!FB#!3! | ||
2806 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!8!!!i!!!((!J%!!!!!!!%!!3% | ||
2807 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!&!!!2!!!"b!)"!!!!!!!"!!%"!!!!!!!!!!! | ||
2808 | !!!!!!3!!!!!!!!!!"3!!%!!!!FN#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
2809 | !!!!!!!8!!"%!!!(+!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!&!!! | ||
2810 | 5!!!"b`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!"3!!%`!!!F`#!3! | ||
2811 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!8!!"3!!!(E!J%!!!!!!!%!!3- | ||
2812 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!&!!!9!!!"h!)"!!!!!!!"!!%$!!!!!!!!!!! | ||
2813 | !!!!!!3!!!!!!!!!!"3!!&J!!!Gd#!3!!!!!!!3!"!`!!!!!!!!!!!!!!!!%!!!! | ||
2814 | !!!!!!!8!!"F!!!(5!J%!!!!!!!%!!3-!!!!!!!!!!!!!!!!"!!!!!!!!!!!&!!! | ||
2815 | B!!!"f3)"!!!!!!!"!!%$!!!!!!!!!!!!!!!!!3!!!!!!!!!!"3!!'3!!!G3#!3! | ||
2816 | !!!!!!3!"!`!!!!!!!!!!!!!!!!%!!!!!!!!!!!8!!"S!!!(9!J%!!!!!!!%!!3- | ||
2817 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!&!!!E!!!"eJ)"!!!!!!!"!!%$!!!!!!!!!!! | ||
2818 | !!!!!!3!!!!!!!!!!"3!!(!!!!G-#!3!!!!!!!3!"!`!!!!!!!!!!!!!!!!%!!!! | ||
2819 | !!!!!!!8!!"d!!!(A!J%!!!!!!!%!!3-!!!!!!!!!!!!!!!!"!!!!!!!!!!!&!!! | ||
2820 | H!!!"f!)"!!!!!!!"!!%$!!!!!!!!!!!!!!!!!3!!!!!!!!!!"3!!(`!!!Im%!3! | ||
2821 | !!!!!!!!"!`!!!!!!!!!!!!!!!)%!!!!!!!!!!!8!!#!!!!(I!J%!!!!!!!%!!3- | ||
2822 | !!!!!!!!!!!!!!!#"!!!!!!!!!!!!!!!!!!!!!3!!!!)!!!!$!!!!"!!!!!8!!!! | ||
2823 | '!!!!"`!!!!J!!!!*!!!!#J!!!!X!!!!-!!!!$3!!!!i!!!!2!!!!%!!!!"%!!!! | ||
2824 | 5!!!!&J!!!"X!!!!B!!!!'3!!!"S!!!!F!!!!(3!!!"F!!!!6!!!!&!!!!"8!!!! | ||
2825 | H!!!!(`!!!#!!!!!J"3!!!!8!!#!!!!(D!!%!(!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2826 | !!!!!!!8!!!%&!!!#"3!!!`8!!!3&!!!&"3!!"J8!!!F&!!!)"3!!#38!!!S&!!! | ||
2827 | ,"3!!$!8!!!d&!!!1"3!!$`8!!"!&!!!4"3!!%J8!!#!&!!!I"3!!%`8!!"3&!!! | ||
2828 | 9"3!!&J8!!"d&!!!H"3!!(!8!!"J&!!!A"3!!'38!!"S&!!!E!!)!!!!!!!!!!!! | ||
2829 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2793 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2830 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2794 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2795 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!&!!!"!!!"Z`) | ||
2796 | "!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!"3!!!J!!!E`#!3!!!!!!!3! | ||
2797 | "!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!8!!!-!!!'p!J%!!!!!!!%!!3%!!!!!!!! | ||
2798 | !!!!!!!!"!!!!!!!!!!!&!!!%!!!"[J)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3! | ||
2799 | !!!!!!!!!"3!!"3!!!Em#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!8 | ||
2800 | !!!B!!!(!!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!&!!!(!!!"`3) | ||
2801 | "!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!"3!!#!!!!F)#!3!!!!!!!3! | ||
2802 | "!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!8!!!N!!!($!J%!!!!!!!%!!3%!!!!!!!! | ||
2803 | !!!!!!!!"!!!!!!!!!!!&!!!+!!!"a!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3! | ||
2804 | !!!!!!!!!"3!!#`!!!F8#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!8 | ||
2805 | !!!`!!!('!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!&!!!0!!!"a`) | ||
2806 | "!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!"3!!$J!!!FJ#!3!!!!!!!3! | ||
2807 | "!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!8!!!m!!!(*!J%!!!!!!!%!!3%!!!!!!!! | ||
2808 | !!!!!!!!"!!!!!!!!!!!&!!!3!!!"bJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3! | ||
2809 | !!!!!!!!!"3!!%3!!!FX#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!8 | ||
2810 | !!")!!!(-!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!&!!!6!!!"c3) | ||
2811 | "!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!"3!!&!!!!G`#!3!!!!!!!3! | ||
2812 | "!`!!!!!!!!!!!!!!!!%!!!!!!!!!!!8!!"8!!!(G!J%!!!!!!!%!!3-!!!!!!!! | ||
2813 | !!!!!!!!"!!!!!!!!!!!&!!!@!!!"hJ)"!!!!!!!"!!%$!!!!!!!!!!!!!!!!!3! | ||
2814 | !!!!!!!!!"3!!&`!!!G-#!3!!!!!!!3!"!`!!!!!!!!!!!!!!!!%!!!!!!!!!!!8 | ||
2815 | !!"J!!!(D!J%!!!!!!!%!!3-!!!!!!!!!!!!!!!!"!!!!!!!!!!!&!!!C!!!"e3) | ||
2816 | "!!!!!!!"!!%$!!!!!!!!!!!!!!!!!3!!!!!!!!!!"3!!'J!!!GB#!3!!!!!!!3! | ||
2817 | "!`!!!!!!!!!!!!!!!!%!!!!!!!!!!!8!!"X!!!(A!J%!!!!!!!%!!3-!!!!!!!! | ||
2818 | !!!!!!!!"!!!!!!!!!!!&!!!F!!!"e!)"!!!!!!!"!!%$!!!!!!!!!!!!!!!!!3! | ||
2819 | !!!!!!!!!"3!!(3!!!GJ#!3!!!!!!!3!"!`!!!!!!!!!!!!!!!!%!!!!!!!!!!!8 | ||
2820 | !!"i!!!(C!J%!!!!!!!%!!3-!!!!!!!!!!!!!!!!"!!!!!!!!!!!&!!!I!!!"h`3 | ||
2821 | "!!!!!!!!!!%$!!!!!!!!!!!!!!!!J3!!!!!!!!!!"3!!)!!!!H!#!3!!!!!!!3! | ||
2822 | "!`!!!!!!!!!!!!!!!)%!!!!!!!!!!!!!!!!!!!!"!!!!!J!!!!-!!!!%!!!!"3! | ||
2823 | !!!B!!!!(!!!!#!!!!!N!!!!+!!!!#`!!!!`!!!!0!!!!$J!!!!m!!!!3!!!!%3! | ||
2824 | !!")!!!!@!!!!'`!!!"J!!!!C!!!!'J!!!"`!!!!G!!!!&`!!!"-!!!!8!!!!&3! | ||
2825 | !!"i!!!!I!!!!)!!!!#!&!!!!"3!!)!!!!GX!!3!F!!!!!!!!!!!!!!!!!!!!!!! | ||
2826 | !!!!!!!!!"3!!!38!!!)&!!!$"3!!"!8!!!8&!!!'"3!!"`8!!!J&!!!*"3!!#J8 | ||
2827 | !!!X&!!!-"3!!$38!!!i&!!!2"3!!%!8!!"%&!!!5"3!!)!8!!"m&!!!6"3!!&!8 | ||
2828 | !!"8&!!!@"3!!(38!!"i&!!!F"3!!'!8!!"F&!!!C"3!!'J8!!"X!!J!!!!!!!!! | ||
2831 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2829 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2832 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2830 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2833 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2831 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -2847,15 +2845,15 @@ H!!!!(`!!!#!!!!!J"3!!!!8!!#!!!!(D!!%!(!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
2847 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2845 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2848 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2846 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2849 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2847 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2850 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!#`MlJ!!!!!!!!!3!#`NI`!!)!!!!!!!!!!!! | ||
2851 | !!X)fJ!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2852 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2848 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2853 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2849 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2850 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!,#2Z!!!!!!!!!"!!,#4r!!!J!!!!!!!!! | ||
2851 | !!!!#`MD!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2854 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2852 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2855 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!)!!!%!!!!!"3! | ||
2856 | !Irm!!!!!Irm!!!!!Irm!!!!!Irm!!!!-!!%!!J!'!!!!"8!!!!J!!3!"1J!!!!! | ||
2857 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2853 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2858 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2854 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2855 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!J!!!3!!!!! | ||
2856 | &!!"rr`!!!!"rr`!!!!"rr`!!!!"rr`!!!!`!!3!#!!B!!!!&3!!!#!!"!!%k!!! | ||
2859 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2857 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2860 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2858 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2861 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2859 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -2864,10 +2862,10 @@ H!!!!(`!!!#!!!!!J"3!!!!8!!#!!!!(D!!%!(!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
2864 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2862 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2865 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2863 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2866 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2864 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2867 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%!!!$rrrrr!!!!!`! | ||
2868 | "!!%k1J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2869 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2865 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2870 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2866 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2867 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!3!!!2rrrrm!!!! | ||
2868 | $!!%!!6Sk!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2871 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2869 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2872 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2870 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2873 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2871 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -2875,10 +2873,10 @@ H!!!!(`!!!#!!!!!J"3!!!!8!!#!!!!(D!!%!(!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
2875 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2873 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2876 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2874 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2877 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2875 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2878 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!3!!!2r | ||
2879 | rrrm!!!!%!!%!!6SkD@jME(9NC6S!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2880 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2876 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2881 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2877 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2878 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"!!! | ||
2879 | !rrrrr`!!!!3!!3!"1MTTEQ0XG@4P1J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2882 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2880 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2883 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2881 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2884 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2882 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -2887,9 +2885,9 @@ rrrm!!!!%!!%!!6SkD@jME(9NC6S!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
2887 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2885 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2888 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2886 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2889 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2887 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2890 | !!!!!!!!!rrrrrd!!!!)!!3!"1J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2891 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2888 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2892 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2889 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2890 | !!!!!!!!!!!$rrrrr3!!!!J!"!!%k!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2893 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2891 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2894 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2892 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2895 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2893 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -2898,9 +2896,9 @@ rrrm!!!!%!!%!!6SkD@jME(9NC6S!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
2898 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2896 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2899 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2897 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2900 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2898 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2901 | !!!!!!!!!!!!!!!!!!!$rrrrr3!!!!`!"!!%k1MT(990*1QPZBfaeC'8k!!!!!!! | ||
2902 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2899 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2903 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2900 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2901 | !!!!!!!!!!!!!!!!!!!!!!2rrrrp!!!!$!!%!!6Sk1NG98dNkD@jME(9NC6S!!!! | ||
2904 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2902 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2905 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2903 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2906 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2904 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -2909,9 +2907,10 @@ rrrm!!!!%!!%!!6SkD@jME(9NC6S!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
2909 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2907 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2910 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2908 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2911 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2909 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2912 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!2rrrrp!!!!%!!%!!6Sk1NG98dNkE'PL1J! | ||
2913 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2910 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2914 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2911 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2912 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!rrrrrd!!!!3!!3!"1MSk4e9656TXD@) | ||
2913 | k!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2915 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2914 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2916 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2915 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2917 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2916 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -2920,9 +2919,9 @@ rrrm!!!!%!!%!!6SkD@jME(9NC6S!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
2920 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2919 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2921 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2920 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2922 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2921 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2923 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!rrrrrd!!!!8!!J!"1NeKBdp | ||
2924 | 6)&0eF("[FR3k!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2925 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2922 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2923 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!$rrrrr3!!!"3!#!!%k6@& | ||
2924 | M6e-J8h9`F'pbG$S!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2926 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2925 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2927 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2926 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2928 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2927 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -2931,9 +2930,9 @@ rrrm!!!!%!!%!!6SkD@jME(9NC6S!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
2931 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2930 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2932 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2931 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2933 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2932 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2934 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%!!!$rrrrr3!!!"J! | ||
2935 | #!!%k690-1J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2936 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2933 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2934 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!3!!!2rrrrp!!!! | ||
2935 | '!!)!!6T08d`k!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2937 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2936 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2938 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2937 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2939 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2938 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -2942,9 +2941,9 @@ rrrm!!!!%!!%!!6SkD@jME(9NC6S!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
2942 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2941 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2943 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2942 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2944 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2943 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2945 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!3!!!2r | ||
2946 | rrrp!!!!(!!S!!%eKBdp6)&"33b"-D@jVCA)!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2947 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2944 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2945 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"!!! | ||
2946 | !rrrrrd!!!!F!#J!!6@&M6e-J8&"$)%aTEQYPFJ!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2948 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2947 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2949 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2948 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2950 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2949 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -2959,13 +2958,13 @@ rrrp!!!!(!!S!!%eKBdp6)&"33b"-D@jVCA)!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
2959 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2958 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2960 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2959 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2961 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2960 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2962 | !!!!!!!!!!!!!!%aTBP066#"38%-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2963 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2961 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2962 | !!!!!!!!!!!!!!!!!6'PL8e0-)&"33`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2964 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2963 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2965 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2964 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2966 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2965 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2967 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!3!"1J!!!!!!!!!!!!!!!!!!!!! | ||
2968 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2966 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2967 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"!!%k!!!!!!!!!!!!!!!!!!! | ||
2969 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2968 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2970 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2969 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2971 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2970 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -2975,60 +2974,60 @@ rrrp!!!!(!!S!!%eKBdp6)&"33b"-D@jVCA)!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
2975 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2974 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2976 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2975 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2977 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2976 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2978 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!J!"6@&M6e-J8&"$)%aTEQYPFJ! | ||
2979 | !!!!!!!!!!!!!!!!!!!!!(N&38%`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2980 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!B!!!!%&`F'`!!!! | ||
2981 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2977 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2982 | !!!!!!!!!!!!!!!!!B!!!!%e06%)!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2978 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!#!!&0B@028b"38%-J6'PZDf9 |
2983 | !!!!!!%aTBL"*EA"[FR3J8&"$!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%e36%B!!!! | 2979 | b!!!!!!!!!!!!!!!!!!!!!!!H39"36!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2984 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%aTBL"*EA"[FR3J8&"$!!!!!!! | 2980 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"J!!!!3A"`E!! |
2985 | !!!!!!!!!!!!!!!!!!!!!!%eA3d3!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2986 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!B!!!!&*68N-!!!! | ||
2987 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2981 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2988 | !!!!!!!!!!!!!!!!!B!!!!&4&@&3ZBQJ!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2982 | !!!!!!!!!!!!!!!!!!!"J!!!!68e-3J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2989 | !!!!!!%*KE'a[EfiJ5'9XF!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!&4&@&3ZB`! | 2983 | !!!!!!!!!6'PL)%PYF'pbG#"38%-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!69"-4J! |
2990 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%eA)%-[3bXV)&"33`!!!!!!!!! | 2984 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!6'PL)%PYF'pbG#"38%-!!!! |
2991 | !!!!!!!!!!!!!!!!!!!!!!&4&@&3ZBbXV!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2985 | !!!!!!!!!!!!!!!!!!!!!!!!!69G$4!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2992 | !!!!!!%eA)%-[3bXV)&"33`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!&4&@&3ZBf- | 2986 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"J!!!!8P053`! |
2993 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%eA)%-[3bXV)&"33`!!!!!!!!! | ||
2994 | !!!!!!!!!!!!!!!!!!!!!!&4&@&3ZBh!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2995 | !!!!!!%eA)%-[3bXV)&"33`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!&4&@&3ZBh" | ||
2996 | `!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%eA)%-[3bXV)&"33`!!!!!!!!! | ||
2997 | !!!!!!!!!!!!!!!!!!!!!!&4&@&3ZCAK`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2998 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!&4&@&3ZCf- | ||
2999 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%GKE@9$Ef4P)%0[ERCPFR4PFJ! | ||
3000 | !!!!!!!!!!!!!!!!!3!!!!&4&@&3ZD!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3001 | !!!!!!%eA)%-[3bXV)&"33`!!!!!!!!!!!!!!!!!!!!!!!!!!%!!!!&4&@&3ZE!! | ||
3002 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%CXCAJJ8(*PF(*[Bf9cFfpb!!! | ||
3003 | !!!!!!!!!!!!!!!!!J!!!!&4&@&3ZF!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3004 | !!!!!!%eA)&"KFf0KE#"38%-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!&4&@&3ZF'& | ||
3005 | c!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%eA)&"KFf0KE#"38%-!!!!!!!! | ||
3006 | !!!!!!!!!!!!!!!!!!!!!!&4&@&3ZF'0S!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3007 | !!!!!!%eA)%-[3bXV)&"33`!!!!!!!!!!!!!!!!!!!!!!!!!!J!!!!&4&@&3ZF'0 | ||
3008 | S+bX!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%eA)%-[3bXV)&"33`!!!!!!!!! | ||
3009 | !!!!!!!!!!!!!!!!!J!!!!&4&@&3ZF("e!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3010 | !!!!!!%eA)&"KFf0KE#"38%-!!!!!!!!!!!!!!!!!!!!!!!!!J!!!!&4&@&3ZFJ! | ||
3011 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!&*PHJ!!!!!!!!!!!!!!!!!!!!! | ||
3012 | !!!!!!!!!!!!!!!!!!!!!!&4&@&3ZF`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3013 | !!!!!!&"33d&cE3!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!&4&@&3ZH3! | ||
3014 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%*TFfpZ)&"bCA"bEf0PFh0[FJ! | ||
3015 | !!!!!!!!!!!!!!!!!J!!!!&K$6dB!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3016 | !!!!!!&K$6dC')%PYF'pbG#"38%-!!!!!!!!!!!!!!!!!!!!!!!!!!'4[Bh8!!!! | ||
3017 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2987 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3018 | !!!!!!!!!!!!!!!!!B!!!!(*cFQ-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2988 | !!!!!!!!!!!!!!!!!!!"J!!!!9%9B9#jLD!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3019 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!B!!!!(0SE')!!!! | 2989 | !!!!!!!!!3Q&XE'p[EL")C@a`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!9%9B9#j |
3020 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!&"&4L"*EA"[FR3J8&"$!!!!!!! | 2990 | M!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!69FJ3bp$+bXJ8&"$!!!!!!! |
3021 | !!!!!!!!!!!!!!!!!!!!!!(0dG@)!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2991 | !!!!!!!!!!!!!!!!!!!!!!!!!9%9B9#jM+bX!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3022 | !!!!!!&"&4L"*EA"[FR3J8&"$!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!ZC'p | 2992 | !!!!!!!!!69FJ3bp$+bXJ8&"$!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!9%9B9#j |
3023 | M!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2993 | MB`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!69FJ3bp$+bXJ8&"$!!!!!!! |
3024 | !!!!!!!!!!!!!!!!!8!!!!!!&!3%!!3!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2994 | !!!!!!!!!!!!!!!!!!!!!!!!!9%9B9#jMF!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
2995 | !!!!!!!!!69FJ3bp$+bXJ8&"$!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!9%9B9#j | ||
2996 | MF(!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!69FJ3bp$+bXJ8&"$!!!!!!! | ||
2997 | !!!!!!!!!!!!!!!!!!!!!!!!!9%9B9#jPH(!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
2998 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!9%9B9#j | ||
2999 | RB`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!4f&YC80[C'8J3fpZGQ9bG'9 | ||
3000 | b!!!!!!!!!!!!!!!!!!"!!!!!9%9B9#jS!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3001 | !!!!!!!!!69FJ3bp$+bXJ8&"$!!!!!!!!!!!!!!!!!!!!!!!!!!!3!!!!9%9B9#j | ||
3002 | X!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!4QaPH#"3FQ9`FQpMCA0cEh) | ||
3003 | !!!!!!!!!!!!!!!!!!!#!!!!!9%9B9#j`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3004 | !!!!!!!!!69FJ8'&cBf&X)&"33`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!9%9B9#j | ||
3005 | `BA-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!69FJ8'&cBf&X)&"33`!!!!! | ||
3006 | !!!!!!!!!!!!!!!!!!!!!!!!!9%9B9#j`BfJ!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3007 | !!!!!!!!!69FJ3bp$+bXJ8&"$!!!!!!!!!!!!!!!!!!!!!!!!!!#!!!!!9%9B9#j | ||
3008 | `BfJV+`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!69FJ3bp$+bXJ8&"$!!!!!!! | ||
3009 | !!!!!!!!!!!!!!!!!!!#!!!!!9%9B9#j`F(8!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3010 | !!!!!!!!!69FJ8'&cBf&X)&"33`!!!!!!!!!!!!!!!!!!!!!!!!#!!!!!9%9B9#j | ||
3011 | b!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!8Q9k!!!!!!!!!!!!!!!!!!! | ||
3012 | !!!!!!!!!!!!!!!!!!!!!!!!!9%9B9#jc!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3013 | !!!!!!!!!8&"$3A0Y!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!9%9B9#j | ||
3014 | j!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!3QPcEfiJ8(*PF(*[Bf9cFfp | ||
3015 | b!!!!!!!!!!!!!!!!!!#!!!!!@%024J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3016 | !!!!!!!!!@%024NBJ5@e`Eh*d)&"33`!!!!!!!!!!!!!!!!!!!!!!!!!!C'pMG3! | ||
3025 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3017 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3018 | !!!!!!!!!!!!!!!!!!!"J!!!!FR0bB`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3019 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"J!!!!FfKXBJ! | ||
3020 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!8%9')%PYF'pbG#"38%-!!!! | ||
3021 | !!!!!!!!!!!!!!!!!!!!!!!!!Fh4eBJ!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3022 | !!!!!!!!!8%9')%PYF'pbG#"38%-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!#j | ||
3023 | NEf-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3024 | !!!!!!!!!!!!!!!!!!!"3!!!!!!8"!3!"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3026 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3025 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3027 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3026 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3028 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3027 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3029 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!B!!!!!!3! | ||
3030 | !!!!&!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3031 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3028 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3029 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"J!!!!! | ||
3030 | "!!!!!!8!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3032 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3031 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3033 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3032 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3034 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3033 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -3038,87 +3037,88 @@ M!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
3038 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3037 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3039 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3038 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3040 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3039 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3041 | !!!!!!3%!!'eKD@i!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3042 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3040 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3041 | !!!!!!!!"!3!!E@&TEJ!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3043 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3042 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3044 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3043 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3045 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3044 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3046 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!#!%"!3!!!!%"!3!!!3%"!!!!!!!"!3! | ||
3047 | !!3%!!3!!!33!!!!!!!!!!!!!#!%!!3%!!3%!!!!"!!!*!!-B6'PL8e0-,MBi5b" | ||
3048 | 'B5JiD9mdC#NZ6'PL!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3049 | !!!!!2cmr2cmr2cm!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3050 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!r2cmr!!!!!!!!!!! | ||
3051 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3045 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3046 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!)!3%"!!!!!3%"!!!"!3%!!!!!!!% | ||
3047 | "!!!"!3!"!!!""!!!!!!!!!!!!!!)!3!"!3!"!3!!!!%!!!N!!aK-D@*68d`Z0MK | ||
3048 | ,)%CK+$KTAc4N+5j-D@)!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3049 | !!!!!!!!r2cmr2cmr2`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3050 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!$mr2cm!!!!!!!! | ||
3052 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3051 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3053 | !!!!!!!!!$3!"!!!!!!!9AdeA49*,8ep(990*Ah"bC@CTH#jS!!!!!!!!!!!!!!! | ||
3054 | !!3!!!3!!!!!!!3!!!!!!!!!!!!!&!3%"!!!"!3!"!!!!!!3!!!!!!!!!!!!!!!! | ||
3055 | !!!!!!3!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3056 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3052 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3053 | !!!!!!!!!!!!0!!%!!!!!!"9I69G&8NY6AdG98dPIF(*PCQPi,QJ!!!!!!!!!!!! | ||
3054 | !!!!"!!!"!!!!!!!"!!!!!!!!!!!!!!8"!3%!!!%"!!%!!!!!"!!!!!!!!!!!!!! | ||
3055 | !!!!!!!!"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3057 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3056 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3058 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3057 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3059 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3058 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3060 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3059 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3061 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!AepcG'&bG!! | ||
3062 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3060 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3061 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"IAh0dBA* | ||
3062 | d!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3063 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3063 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3064 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"!!%!!!P0CA*RC5"2GA3!!!!!!!! | 3064 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%!!3!!#8ePFQGP)%peG!!!!!! |
3065 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3065 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3066 | r2cmr39"36!!"!3!!"#!J)#!$NS0J!h6IH!-$VH!!"3)"!!%"!!%"!3!!!3!!!!! | 3066 | !!$mr2cp"8&"-!!%"!!!%)#!J)!1ARe!$GYpi!`@Z%!!&!J%!!3%!!3%"!!!"!!! |
3067 | !!!!"!3%"!!%"!!%!!33!!!!!!!!!!!!!"`%"!!%!!!%!!!!!!!!!!!!!!!!!!!! | 3067 | !!!!!!!%"!3%!!3%!!3!""!!!!!!!!!!!!!!(!3%!!3!!!3!!!!!!!!!!!!!!!!! |
3068 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3068 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3069 | !AepcG'&bG!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3069 | !!!"IAh0dBA*d!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3070 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3070 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3071 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!J!!!!!!!!!!!!!!!! | 3071 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!#!!!!!!!!!!!!!! |
3072 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3072 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3073 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3073 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3074 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3074 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3075 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3075 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3076 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3076 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3077 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!&!!-16'PL8e0-,P"33bj-D@)!!!! | 3077 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!8!!`j-D@*68d`Z8&"$,NaTBJ! |
3078 | !!!!!!!!!!!!!!!!!!$mr2cmr2cmr!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3078 | !!!!!!!!!!!!!!!!!!!!!2cmr2cmr2cm!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3079 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3079 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3080 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"2cmr2`!!!!! | 3080 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%r2cmr!!! |
3081 | !!!!#!!!!!J!#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3081 | !!!!!!!)!!!!#!!)!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3082 | !!J"3!!%!!3!"!!%!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3082 | !!!!#!&!!!3!"!!%!!3!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3083 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3083 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3084 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3084 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3085 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3085 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3086 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3086 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3087 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!&#G$6d4&*b!R4%&835FJ*e"*3e3 | 3087 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!8*d024%8R)#G%394"*b!R8%P |
3088 | R!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3088 | $9#F!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3089 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3089 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3090 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3090 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3091 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3091 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3092 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!B!!!% | 3092 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"J! |
3093 | !!!!+!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!'!!!#!!!!#`)"!!! | 3093 | !!3!!!!S#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!B!!!)!!!!,!J% |
3094 | !!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!"J!!!`!!!!`#!3!!!!!!!3!"!3! | 3094 | !!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!'!!!$!!!!$!)"!!!!!!!"!!% |
3095 | !!!!!!!!!!!!!!!%!!!!!!!!!!!B!!!3!!!!0!J%!!!!!!!%!!3%!!!!!!!!!!!! | 3095 | "!!!!!!!!!!!!!!!!!3!!!!!!!!!!"J!!"!!!!!d#!3!!!!!!!3!"!3!!!!!!!!! |
3096 | !!!!"!!!!!!!!!!!'!!!&!!!!$J)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!! | 3096 | !!!!!!!%!!!!!!!!!!!B!!!8!!!!1!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!! |
3097 | !!!!!"J!!"J!!!!m#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!B!!!F | 3097 | !!!!!!!!'!!!'!!!!$`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!"J! |
3098 | !!!!3!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!'!!!)!!!!%3)"!!! | 3098 | !"`!!!"!#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!B!!!J!!!!4!J% |
3099 | !!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!"J!!#3!!!")#!3!!!!!!!3!"!3! | 3099 | !!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!'!!!*!!!!%J)"!!!!!!!"!!% |
3100 | !!!!!!!!!!!!!!!%!!!!!!!!!!!B!!!S!!!!6!J%!!!!!!!%!!3%!!!!!!!!!!!! | 3100 | "!!!!!!!!!!!!!!!!!3!!!!!!!!!!"J!!#J!!!"-#!3!!!!!!!3!"!3!!!!!!!!! |
3101 | !!!!"!!!!!!!!!!!'!!!,!!!!&!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!! | 3101 | !!!!!!!%!!!!!!!!!!!B!!!X!!!!8!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!! |
3102 | !!!!!"J!!$!!!!"8#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!B!!!d | 3102 | !!!!!!!!'!!!-!!!!&3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!"J! |
3103 | !!!!@!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!'!!!1!!!!&`)"!!! | 3103 | !$3!!!"B#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!B!!!i!!!!A!J% |
3104 | !!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!"J!!$`!!!"J#!3!!!!!!!3!"!3! | 3104 | !!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!'!!!2!!!!'!)"!!!!!!!"!!% |
3105 | !!!!!!!!!!!!!!!%!!!!!!!!!!!B!!"!!!!!C!J%!!!!!!!%!!3%!!!!!!!!!!!! | 3105 | "!!!!!!!!!!!!!!!!!3!!!!!!!!!!"J!!%!!!!"N#!3!!!!!!!3!"!3!!!!!!!!! |
3106 | !!!!"!!!!!!!!!!!'!!!4!!!!'J)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!! | 3106 | !!!!!!!%!!!!!!!!!!!B!!"%!!!!D!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!! |
3107 | !!!!!"J!!%J!!!"X#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!B!!"- | 3107 | !!!!!!!!'!!!5!!!!'`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!"J! |
3108 | !!!!F!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!'!!!8!!!!(3)"!!! | 3108 | !%`!!!"`#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!B!!"3!!!!G!J% |
3109 | !!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!"J!!&3!!!"i#!3!!!!!!!3!"!3! | 3109 | !!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!'!!!9!!!!(J)"!!!!!!!"!!% |
3110 | !!!!!!!!!!!!!!!%!!!!!!!!!!!B!!"B!!!!I!J%!!!!!!!%!!3%!!!!!!!!!!!! | 3110 | "!!!!!!!!!!!!!!!!!3!!!!!!!!!!"J!!&J!!!"m#!3!!!!!!!3!"!3!!!!!!!!! |
3111 | !!!!"!!!!!!!!!!!'!!!A!!!!)!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!! | 3111 | !!!!!!!%!!!!!!!!!!!B!!"F!!!!J!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!! |
3112 | !!!!!"J!!'!!!!#%#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!B!!"N | 3112 | !!!!!!!!'!!!B!!!!)3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!"J! |
3113 | !!!!L!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!'!!!D!!!!)`)"!!! | 3113 | !'3!!!#)#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!B!!"S!!!!M!J% |
3114 | !!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!"J!!'`!!!#3#!3!!!!!!!3!"!3! | 3114 | !!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!'!!!E!!!!*!)"!!!!!!!"!!% |
3115 | !!!!!!!!!!!!!!!%!!!!!!!!!!!B!!"`!!!!P!J%!!!!!!!%!!3%!!!!!!!!!!!! | 3115 | "!!!!!!!!!!!!!!!!!3!!!!!!!!!!"J!!(!!!!#8#!3!!!!!!!3!"!3!!!!!!!!! |
3116 | !!!!"!!!!!!!!!!!'!!!G!!!!*J)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!! | 3116 | !!!!!!!%!!!!!!!!!!!B!!"d!!!!Q!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!! |
3117 | !!!!!"J!!(J!!!#F#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!B!!"m | 3117 | !!!!!!!!'!!!H!!!!*`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!"J! |
3118 | !!!!S!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!'!!!J!!!!+3)"!!! | 3118 | !(`!!!#J#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!B!!#!!!!!T!J% |
3119 | !!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!"J!!)3!!!#S#!3!!!!!!!3!"!3! | 3119 | !!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!'!!!K!!!!+J)"!!!!!!!"!!% |
3120 | !!!!!!!!!!!!!!!%!!!!!!!!!!!B!!#)!!!!V!J%!!!!!!!%!!3%!!!!!!!!!!!! | 3120 | "!!!!!!!!!!!!!!!!!3!!!!!!!!!!"J!!)J!!!#X#!3!!!!!!!3!"!3!!!!!!!!! |
3121 | !!!!"!!!!!!!!!!!'!!!M!!!!,!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!! | 3121 | !!!!!!!%!!!!!!!!!!!B!!#-!!!!X!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!! |
3122 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3122 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3123 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3123 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3124 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3124 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -3143,16 +3143,16 @@ R!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
3143 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3143 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3144 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3144 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3145 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3145 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3146 | !!!!!!!!!!!!!!!!!!!!!!!!!!3!!!!)!!!!$!!!!"!!!!!8!!!!'!!!!"`!!!!J | 3146 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!"!!!!!J!!!!-!!!!%!!!!"3!!!!B!!!!(!!! |
3147 | !!!!*!!!!#J!!!!X!!!!-!!!!$3!!!!i!!!!2!!!!%!!!!"%!!!!5!!!!%`!!!"3 | 3147 | !#!!!!!N!!!!+!!!!#`!!!!`!!!!0!!!!$J!!!!m!!!!3!!!!%3!!!")!!!!6!!! |
3148 | !!!!9!!!!&J!!!"F!!!!B!!!!'3!!!"S!!!!E!!!!(!!!!"d!!!!H!!!!(`!!!#! | 3148 | !&!!!!"8!!!!@!!!!&`!!!"J!!!!C!!!!'J!!!"X!!!!F!!!!(3!!!"i!!!!I!!! |
3149 | !!!!K!!!!)J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3149 | !)!!!!#%!!!!L!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3150 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3150 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3151 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!)`!!!%!'!!!!"J!!)`B!!!8 | 3151 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!M!!!!3!B!!!!'!!!M"J! |
3152 | '!!!%"J!!!`B!!!)'!!!'"J!!#`B!!!S'!!!*"J!!#!B!!!F'!!!-"J!!%JB!!"% | 3152 | !"3B!!!3'!!!$"J!!!JB!!!B'!!!,"J!!#JB!!!N'!!!)"J!!"`B!!!`'!!!5"J! |
3153 | '!!!3"J!!$`B!!!d'!!!1"J!!%`B!!#)'!!!K"J!!)!B!!"m'!!!M"J!!!3B!!"3 | 3153 | !%3B!!"!'!!!2"J!!$3B!!!i'!!!6"J!!)JB!!#%'!!!J"J!!(`B!!#-'!!!""J! |
3154 | '!!!9"J!!&JB!!"F'!!!B"J!!'3B!!"S'!!!E"J!!(!B!!"d'!!!H!!!"U!!"!#J | 3154 | !&!B!!"8'!!!@"J!!&`B!!"J'!!!C"J!!'JB!!"X'!!!F"J!!(3B!!"i!!!'T!!% |
3155 | !!!!J!j(*N!!r2`!!!!!!!!!!!!!$NFQ3!!!#!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3155 | !+!!!!!!$Pj@!!!!!!!!!Irm!!!%!!!"j`!!#!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3156 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3156 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3157 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3157 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3158 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3158 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -3390,7 +3390,7 @@ Z!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
3390 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3390 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3391 | !!!!!!!!!!!!!!!!!!!!!!3!"!!!*6@9bCf8J6h9d!!!!!!!!!!!!!!!!!!!!!!! | 3391 | !!!!!!!!!!!!!!!!!!!!!!3!"!!!*6@9bCf8J6h9d!!!!!!!!!!!!!!!!!!!!!!! |
3392 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!2cmr2d&38%`!!3% | 3392 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!2cmr2d&38%`!!3% |
3393 | !!!3J)#!J!j+$B!0dhhJ$!khJ!!8#!3!"!3!"!3%!!!%!!!!!!!!!!3%"!3!"!3! | 3393 | !!!3J)#!J!jHI8!0fhhJ$"Di3!!8#!3!"!3!"!3%!!!%!!!!!!!!!!3%"!3!"!3! |
3394 | "!!%%!!!!!!!!!!!!!!F"!3!"!!!"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3394 | "!!%%!!!!!!!!!!!!!!F"!3!"!!!"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3395 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!&pIFh4KFR3!!!! | 3395 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!&pIFh4KFR3!!!! |
3396 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3396 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -3776,8 +3776,8 @@ M"`!!*!F!!#8(!!!Q"`!!*`F!!#J(!!!T"`!!+JF!!#X(!!!X"`!!,3F!!#i(!!! | |||
3776 | ["`!!-!F!!$%(!!!b"`!!-`F!!$3(!!!e"`!!0JF!!$F(!!!i"`!!13F!!$S(!!! | 3776 | ["`!!-!F!!$%(!!!b"`!!-`F!!$3(!!!e"`!!0JF!!$F(!!!i"`!!13F!!$S(!!! |
3777 | l"`!!2!F!!$d(!!!q"`!!2`F!!%!(!!"""`!!3JF!!%-(!!"%"`!!43F!!%B(!!" | 3777 | l"`!!2!F!!$d(!!!q"`!!2`F!!%!(!!"""`!!3JF!!%-(!!"%"`!!43F!!%B(!!" |
3778 | ("`!!5!F!!%N(!!"+"`!!5`F!!%`(!!"0"`!!6JF!!%m(!!"3"`!!83F!!&)(!!" | 3778 | ("`!!5!F!!%N(!!"+"`!!5`F!!%`(!!"0"`!!6JF!!%m(!!"3"`!!83F!!&)(!!" |
3779 | 6"`!!9!F!!&8(!!"@"`!!9`F!!&J(!!"C"`!!@JF!!&X(!!"F"`!"G!F!!&d(!!" | 3779 | 6"`!!9!F!!&8(!!"@"`!!9`F!!&J(!!"C"`!!@JF!!&X(!!"F"`!!A3F!!&i(!!" |
3780 | H"`!!A`F!!'!(!!"K"`!!BJF!!'-(!!"N"`!!C3F!!'B(!!"R"`!!D!F!!'N(!!" | 3780 | I"`!!B!F!!'%(!!"L"`!"G!F!!'-(!!"N"`!!C3F!!'B(!!"R"`!!D!F!!'N(!!" |
3781 | U"`!!D`F!!'`(!!"Y"`!!EJF!!'m(!!"`"`!!F3F!!()(!!"c"`!!G!F!!(8(!!" | 3781 | U"`!!D`F!!'`(!!"Y"`!!EJF!!'m(!!"`"`!!F3F!!()(!!"c"`!!G!F!!(8(!!" |
3782 | f"`!!G`F!!(J(!!"j"`!!HJF!!(X(!!"m"`!!I3F!!(i(!!"r"`!!J!F!!)%(!!# | 3782 | f"`!!G`F!!(J(!!"j"`!!HJF!!(X(!!"m"`!!I3F!!(i(!!"r"`!!J!F!!)%(!!# |
3783 | #"`!!J`F!!)3(!!#&"`!!KJF!!)F(!!#)"`!!L3F!!)S(!!#,"`!!M!F!!)d(!!# | 3783 | #"`!!J`F!!)3(!!#&"`!!KJF!!)F(!!#)"`!!L3F!!)S(!!#,"`!!M!F!!)d(!!# |
@@ -3791,7 +3791,7 @@ f"`!!G`F!!(J(!!"j"`!!HJF!!(X(!!"m"`!!I3F!!(i(!!"r"`!!J!F!!)%(!!# | |||
3791 | !iJF!!1-(!!$N"`!!j3F!!1B(!!$R"`!!k!F!!1N(!!$U"`!!k`F!!1`(!!$Y"`! | 3791 | !iJF!!1-(!!$N"`!!j3F!!1B(!!$R"`!!k!F!!1N(!!$U"`!!k`F!!1`(!!$Y"`! |
3792 | !lJF!!1m(!!$`"`!!m3F!!2)(!!$c"`!!p!F!!28(!!$f"`!!p`F!!2J(!!$j"`! | 3792 | !lJF!!1m(!!$`"`!!m3F!!2)(!!$c"`!!p!F!!28(!!$f"`!!p`F!!2J(!!$j"`! |
3793 | !qJF!!2X(!!$m"`!!r3F!!2i(!!$r"`!"!!F!!3%(!!%#"`!"!`F!!33(!!%&"`! | 3793 | !qJF!!2X(!!$m"`!!r3F!!2i(!!$r"`!"!!F!!3%(!!%#"`!"!`F!!33(!!%&"`! |
3794 | ""JF!!3F(!!%)"`!"#3F!!A8(!!%+"`!"#`F!!3`(!!%0"`!"$JF!!3m(!!%3"`! | 3794 | ""JF!!3F(!!%)"`!"#3F!!3S(!!&e"`!"#`F!!3`(!!%0"`!"$JF!!3m(!!%3"`! |
3795 | "%3F!!4)(!!%6"`!"&!F!!48(!!%@"`!"&`F!!4J(!!%C"`!"'JF!!4X(!!%F"`! | 3795 | "%3F!!4)(!!%6"`!"&!F!!48(!!%@"`!"&`F!!4J(!!%C"`!"'JF!!4X(!!%F"`! |
3796 | "(3F!!4i(!!%I"`!")!F!!5%(!!%L"`!")`F!!53(!!%P"`!"*JF!!5F(!!%S"`! | 3796 | "(3F!!4i(!!%I"`!")!F!!5%(!!%L"`!")`F!!53(!!%P"`!"*JF!!5F(!!%S"`! |
3797 | "+3F!!5S(!!%V"`!",!F!!5d(!!%Z"`!",`F!!6!(!!%a"`!"-JF!!6-(!!%d"`! | 3797 | "+3F!!5S(!!%V"`!",!F!!5d(!!%Z"`!",`F!!6!(!!%a"`!"-JF!!6-(!!%d"`! |
@@ -3800,7 +3800,7 @@ f"`!!G`F!!(J(!!"j"`!!HJF!!(X(!!"m"`!!I3F!!(i(!!"r"`!!J!F!!)%(!!# | |||
3800 | "63F!!8i(!!&2"`!"8!F!!9%(!!&5"`!"8`F!!93(!!&9"`!"9JF!!9F(!!&B"`! | 3800 | "63F!!8i(!!&2"`!"8!F!!9%(!!&5"`!"8`F!!93(!!&9"`!"9JF!!9F(!!&B"`! |
3801 | "@3F!!9S(!!&E"`!"A!F!!9d(!!&H"`!"A`F!!@!(!!&K"`!"BJF!!@-(!!&N"`! | 3801 | "@3F!!9S(!!&E"`!"A!F!!9d(!!&H"`!"A`F!!@!(!!&K"`!"BJF!!@-(!!&N"`! |
3802 | "C3F!!@B(!!&R"`!"D!F!!@N(!!&U"`!"D`F!!@`(!!&Y"`!"EJF!!@m(!!&`"`! | 3802 | "C3F!!@B(!!&R"`!"D!F!!@N(!!&U"`!"D`F!!@`(!!&Y"`!"EJF!!@m(!!&`"`! |
3803 | "F3F!!A)(!!&c!!!"U!!"!#J!!!!J!j(*N!!r2`!!!!!!!!!!!!!$NFQ3!!!#!!! | 3803 | "F3F!!A)(!!&c!!!"U3!"!#J!!!!!!jH9J!!!!!!!!(rr!!!"!!!!HF!!!J!!!!! |
3804 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3804 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3805 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3805 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3806 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3806 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -3822,25 +3822,15 @@ f"`!!G`F!!(J(!!"j"`!!HJF!!(X(!!"m"`!!I3F!!(i(!!"r"`!!J!F!!)%(!!# | |||
3822 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3822 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3823 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3823 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3824 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3824 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3825 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!X)qi!!!!!!!!!%!!X*(m!!#!!! | 3825 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!,#2Z!!!!!!!!!"!!,#4r!!!J!!!!! |
3826 | !!!!!!!!!!!,#0S!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3826 | !!!!!!!!#`MD!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3827 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3828 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3829 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3830 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!#!!! | ||
3831 | "!!!!!!8!!(rr!!!!!(rr!!!!!(rr!!!!!(rr!!!!$!!"!!)!"J!!!!9!!!!)!!% | ||
3832 | !!6S!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3833 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3834 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3835 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3836 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3837 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3838 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3827 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3839 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3828 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3840 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3829 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3830 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!J!!!3! | ||
3831 | !!!!&!!"rr`!!!!"rr`!!!!"rr`!!!!"rr`!!!!`!!3!#!!B!!!!&3!!!#!!"!!% | ||
3832 | k!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3841 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3833 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3842 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"!!!!rrr | ||
3843 | rr`!!!!-!!3!"1MS!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3844 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3834 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3845 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3835 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3846 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3836 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -3849,9 +3839,10 @@ rr`!!!!-!!3!"1MS!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
3849 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3839 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3850 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3840 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3851 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3841 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3842 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!3!!!2rrrrm | ||
3843 | !!!!$!!%!!6Sk!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3852 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3844 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3853 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3845 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3854 | !!!%!!!$rrrrr!!!!"!!"!!%k1QPZBfaeC'8k!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3855 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3846 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3856 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3847 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3857 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3848 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -3860,9 +3851,9 @@ rr`!!!!-!!3!"1MS!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
3860 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3851 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3861 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3852 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3862 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3853 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3854 | "!!!!rrrrr`!!!!3!!3!"1MTTEQ0XG@4P1J!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3863 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3855 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3864 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3856 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3865 | !!!!!!!!!!!!!!!!!!2rrrrp!!!!#!!%!!6S!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3866 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3857 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3867 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3858 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3868 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3859 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -3871,10 +3862,9 @@ rr`!!!!-!!3!"1MS!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
3871 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3862 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3872 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3863 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3873 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3864 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3865 | !!!!!!!!!!!!!!!$rrrrr3!!!!J!"!!%k!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3874 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3866 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3875 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3867 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3876 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!rrrrrd!!!!-!!3!"1MSk4e9656TTEQ0XG@4 | ||
3877 | P1J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3878 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3868 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3879 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3869 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3880 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3870 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -3883,9 +3873,8 @@ P1J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
3883 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3873 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3884 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3874 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3885 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3875 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3876 | !!!!!!!!!!!!!!!!!!!!!!!!!!2rrrrp!!!!$!!%!!6Sk1NG98dNkD@jME(9NC6S | ||
3886 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3877 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3887 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!$rrrrr3!!!"!!"!!%k1MT(990 | ||
3888 | *1QaTBMS!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3889 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3878 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3890 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3879 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3891 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3880 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -3895,8 +3884,8 @@ P1J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
3895 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3884 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3896 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3885 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3897 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3886 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3898 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!2rrrrp!!!!&!!) | 3887 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!rrrrrd!!!!3!!3!"1MSk4e9656T |
3899 | !!6T0B@028b"6GA"`Eh*d1J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3888 | XD@)k!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3900 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3889 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3901 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3890 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3902 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3891 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -3906,8 +3895,8 @@ P1J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
3906 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3895 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3907 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3896 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3908 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3897 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3909 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"!!!!rrr | 3898 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!$rrrrr3!!!"3!#!!% |
3910 | rrd!!!!B!!J!"1Ne66$S!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3899 | k6@&M6e-J8h9`F'pbG$S!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3911 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3900 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3912 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3901 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3913 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3902 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -3917,8 +3906,9 @@ rrd!!!!B!!J!"1Ne66$S!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
3917 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3906 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3918 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3907 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3919 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3908 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3909 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!3!!!2rrrrp | ||
3910 | !!!!'!!)!!6T08d`k!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3920 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3911 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3921 | !!!%!!!$rrrrr3!!!"`!+!!"0B@028b!f1%XJ6'PZDf9b!!!!!!!!!!!!!!!!!!! | ||
3922 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3912 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3923 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3913 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3924 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3914 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -3928,739 +3918,541 @@ rrd!!!!B!!J!"1Ne66$S!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
3928 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3918 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3929 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3919 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3930 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3920 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3921 | "!!!!rrrrrd!!!!F!#J!!6@&M6e-J0MK,)%aTEQYPFJ!!!!!!!!!!!!!!!!!!!!! | ||
3931 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3922 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3932 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3923 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3933 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3924 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3934 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3925 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3935 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3926 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3936 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3927 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3937 | !!!!!!!!!!!!!!!!!!!!!!!"-D@*$FRP`G'mJ0MK,!!!!!!!!!!!!!!!!!!!!!!! | ||
3938 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3928 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3939 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3929 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3940 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3930 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3941 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3931 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3942 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%!!6S!!!!!!!!!!!! | ||
3943 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3932 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3944 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3933 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3945 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3934 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3946 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3935 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3947 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3936 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3937 | !!!!!!!!!!!!!!!!!!!!!6'PL3h*jF(4[)$Bi5`!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3948 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3938 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3949 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3939 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3950 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3940 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3951 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3941 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3952 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3942 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"!!%k!!!!!!!!!!!!!!! |
3953 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!)!!8eKBdp6)$Bi5b" | ||
3954 | -D@jVCA)!!!!!!!!!!!!!!!!!!!!!!#""8&"-!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3955 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'!!!!" | ||
3956 | "F("X!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3957 | !!!!!!!!!!!!!!!!!!!!!!!!!!'!!!!"068a#!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3958 | !!!!!!!!!!!!!!!"-D@)J5@e`Eh*d)$Bi5`!!!!!!!!!!!!!!!!!!!!!!!!!!!!" | ||
3959 | 08%a'!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"-D@)J5@e`Eh*d)$B | ||
3960 | i5`!!!!!!!!!!!!!!!!!!!!!!!!!!!!"09d0%!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3961 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'!!!!" | ||
3962 | 23NSJ!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"08&FJ5@e`Eh*d)$B | ||
3963 | i5`!!!!!!!!!!!!!!!!!!!!!!!!!!!!"36'pL!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3964 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'!!!!" | ||
3965 | 58e*$!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3966 | !!!!!!!!!!!!!!!!!!!!!!!!!!'!!!!"849K8,Q*S!!!!!!!!!!!!!!!!!!!!!!! | ||
3967 | !!!!!!!!!!!!!!!"#B@aXEfpZ)%KPE(!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" | ||
3968 | 849K8,Q-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"09b"$,d-V+b!f1%X | ||
3969 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"849K8,Q-V+`!!!!!!!!!!!!!!!!!!!!! | ||
3970 | !!!!!!!!!!!!!!!"09b"$,d-V+b!f1%X!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" | ||
3971 | 849K8,Q0M!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"09b"$,d-V+b!f1%X | ||
3972 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"849K8,Q0`!!!!!!!!!!!!!!!!!!!!!!! | ||
3973 | !!!!!!!!!!!!!!!"09b"$,d-V+b!f1%X!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" | ||
3974 | 849K8,Q0`F!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"09b"$,d-V+b!f1%X | ||
3975 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"849K8,Q9iF!!!!!!!!!!!!!!!!!!!!!! | ||
3976 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" | ||
3977 | 849K8,QGM!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"(B@eP3fpNC5"$Efj | ||
3978 | fCA*dCA)!!!!!!!!!!!!!!!!!!%!!!!"849K8,QJ!!!!!!!!!!!!!!!!!!!!!!!! | ||
3979 | !!!!!!!!!!!!!!!"09b"$,d-V+b!f1%X!!!!!!!!!!!!!!!!!!!!!!!!!!"!!!!" | ||
3980 | 849K8,Q`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"'E'9i)&"bCA"bEf0 | ||
3981 | PFh0[FJ!!!!!!!!!!!!!!!!!!!)!!!!"849K8,R!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3982 | !!!!!!!!!!!!!!!"09b"3BA0MB@`J0MK,!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" | ||
3983 | 849K8,R"KF`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"09b"3BA0MB@`J0MK | ||
3984 | ,!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"849K8,R"MD!!!!!!!!!!!!!!!!!!!!!! | ||
3985 | !!!!!!!!!!!!!!!"09b"$,d-V+b!f1%X!!!!!!!!!!!!!!!!!!!!!!!!!!)!!!!" | ||
3986 | 849K8,R"MD#XV!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"09b"$,d-V+b!f1%X | ||
3987 | !!!!!!!!!!!!!!!!!!!!!!!!!!)!!!!"849K8,R"`G3!!!!!!!!!!!!!!!!!!!!! | ||
3988 | !!!!!!!!!!!!!!!"09b"3BA0MB@`J0MK,!!!!!!!!!!!!!!!!!!!!!!!!!)!!!!" | ||
3989 | 849K8,R)!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"5CAS!!!!!!!!!!!! | ||
3990 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"849K8,R0PC`!!!!!!!!!!!!!!!!!!!!! | ||
3991 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" | ||
3992 | 849K8,RN!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"#DA0[EL"3FQ9`FQp | ||
3993 | MCA0cEh)!!!!!!!!!!!!!!!!!!)!!!!"NEf0e!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3994 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'!!!!" | ||
3995 | bFh*M!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3996 | !!!!!!!!!!!!!!!!!!!!!!!!!!'!!!!"cD'aL!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3997 | !!!!!!!!!!!!!!!"348BJ5@e`Eh*d)$Bi5`!!!!!!!!!!!!!!!!!!!!!!!!!!!!" | ||
3998 | cG(9L!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"348BJ5@e`Eh*d)$B | ||
3999 | i5`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!,Q4[B`!!!!!!!!!!!!!!!!!!!!! | ||
4000 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!&!!!!! | ||
4001 | !!!!!,R*cFQ-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4002 | !!!!!!!!!!!!!!!!!!!!!!!!!!'!!!!!!"3%"!!%!!!!!!!!!!!!!!!!!!!!!!!! | ||
4003 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3943 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4004 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3944 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4005 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3945 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4006 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3946 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4007 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3947 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4008 | '!!!!!!%!!!!!"3!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4009 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3948 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4010 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3949 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4011 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3950 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4012 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3951 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4013 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 3952 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
3953 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!#!!&0B@028b!f1%XJ6'P | ||
3954 | ZDf9b!!!!!!!!!!!!!!!!!!!!!!!J39"36!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3955 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"J!!!!3A" | ||
3956 | `E!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3957 | !!!!!!!!!!!!!!!!!!!!!!!"J!!!!68e-3J!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3958 | !!!!!!!!!!!!!6'PL)%PYF'pbG#!f1%X!!!!!!!!!!!!!!!!!!!!!!!!!!!!!69" | ||
3959 | -4J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!6'PL)%PYF'pbG#!f1%X | ||
3960 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!69G$4!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3961 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"J!!!!6d* | ||
3962 | +)!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!69"A)%PYF'pbG#!f1%X | ||
3963 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!8%a[BJ!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3964 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"J!!!!8P0 | ||
3965 | 53`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3966 | !!!!!!!!!!!!!!!!!!!!!!!"J!!!!9%9B9#jLD!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3967 | !!!!!!!!!!!!!3Q&XE'p[EL")C@a`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!9%9 | ||
3968 | B9#jM!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!69FJ3bp$+bXJ0MK,!!! | ||
3969 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!9%9B9#jM+bX!!!!!!!!!!!!!!!!!!!!!!!! | ||
3970 | !!!!!!!!!!!!!69FJ3bp$+bXJ0MK,!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!9%9 | ||
3971 | B9#jMB`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!69FJ3bp$+bXJ0MK,!!! | ||
3972 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!9%9B9#jMF!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3973 | !!!!!!!!!!!!!69FJ3bp$+bXJ0MK,!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!9%9 | ||
3974 | B9#jMF(!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!69FJ3bp$+bXJ0MK,!!! | ||
3975 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!9%9B9#jPH(!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3976 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!9%9 | ||
3977 | B9#jRB`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!4f&YC80[C'8J3fpZGQ9 | ||
3978 | bG'9b!!!!!!!!!!!!!!!!!!"!!!!!9%9B9#jS!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3979 | !!!!!!!!!!!!!69FJ3bp$+bXJ0MK,!!!!!!!!!!!!!!!!!!!!!!!!!!!3!!!!9%9 | ||
3980 | B9#jX!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!4QaPH#"3FQ9`FQpMCA0 | ||
3981 | cEh)!!!!!!!!!!!!!!!!!!!#!!!!!9%9B9#j`!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3982 | !!!!!!!!!!!!!69FJ8'&cBf&X)$Bi5`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!9%9 | ||
3983 | B9#j`BA-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!69FJ8'&cBf&X)$Bi5`! | ||
3984 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!9%9B9#j`BfJ!!!!!!!!!!!!!!!!!!!!!!!! | ||
3985 | !!!!!!!!!!!!!69FJ3bp$+bXJ0MK,!!!!!!!!!!!!!!!!!!!!!!!!!!#!!!!!9%9 | ||
3986 | B9#j`BfJV+`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!69FJ3bp$+bXJ0MK,!!! | ||
3987 | !!!!!!!!!!!!!!!!!!!!!!!#!!!!!9%9B9#j`F(8!!!!!!!!!!!!!!!!!!!!!!!! | ||
3988 | !!!!!!!!!!!!!69FJ8'&cBf&X)$Bi5`!!!!!!!!!!!!!!!!!!!!!!!!#!!!!!9%9 | ||
3989 | B9#jb!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!8Q9k!!!!!!!!!!!!!!! | ||
3990 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!9%9B9#jcC@F!!!!!!!!!!!!!!!!!!!!!!!! | ||
3991 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!9%9 | ||
3992 | B9#jj!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!3QPcEfiJ8(*PF(*[Bf9 | ||
3993 | cFfpb!!!!!!!!!!!!!!!!!!#!!!!!C'pMG3!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3994 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"J!!!!FR0 | ||
3995 | bB`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3996 | !!!!!!!!!!!!!!!!!!!!!!!"J!!!!FfKXBJ!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
3997 | !!!!!!!!!!!!!8%9')%PYF'pbG#!f1%X!!!!!!!!!!!!!!!!!!!!!!!!!!!!!Fh4 | ||
3998 | eBJ!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!8%9')%PYF'pbG#!f1%X | ||
3999 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!#jNEf-!!!!!!!!!!!!!!!!!!!!!!!! | ||
4000 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"3!!!!!!! | ||
4001 | !!#jbFh*M!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4002 | !!!!!!!!!!!!!!!!!!!!!!!"J!!!!!!8"!3!"!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4014 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4003 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4015 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4004 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4016 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4005 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4017 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4006 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4007 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"J! | ||
4008 | !!!!"!!!!!!8!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4018 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4009 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4019 | !!!!!!!!!!!!!!!%"!!"YB@PZ!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4020 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4010 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4021 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4011 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4022 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4012 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4023 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4013 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4024 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!J"!!%!!!!"!3%!!!%"!3! | ||
4025 | !!!!!!3%!!!%"!!%!!!%%!!!!!!!!!!!!!!J"!!%"!!%"!!!!!3!!#3!$'daTBN0 | ||
4026 | bHA"dEbif1'XJ4Q%S0'PI1'3T,NaTBJ!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4027 | !!!!!!!!!!!!!!$mr2cmr2cmr!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4028 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!2cmr2`! | ||
4029 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4014 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4030 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4015 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4031 | !!!!!!!!!!!!!!!!!!!d!!3!!!!!!&9p09d955e0I4e9659p`FQ9QDAJZD!!!!!! | ||
4032 | !!!!!!!!!!!%!!!!!!!!!!!%!!!!!!!!!!!!!"3%"!3!!!3%!!3!!!!!%!!!!!!! | ||
4033 | !!!!!!!!!!!!!!!%!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4034 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4016 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4035 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4017 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4036 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4018 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4019 | !!!!!!!!!!!!"!3!!E@&TEJ!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4037 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4020 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4038 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4021 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4039 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!&p | ||
4040 | IFh4KFR3!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4041 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4022 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4042 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!3!"!!!*6@9bCf8J6h9 | ||
4043 | d!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4044 | !!!!!!!!!2cmr2d&38%`!!3%!!!3J)#!J!j+$B!0dhhJ$!khJ!!8#!3!"!3!"!3% | ||
4045 | !!!%!!!!!!!!!!3%"!3!"!3!"!!%%!!!!!!!!!!!!!!F"!3!"!!!"!!!!!!!!!!! | ||
4046 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4047 | !!!!!!!!!!&pIFh4KFR3!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4048 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4049 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!)!!!!!!! | ||
4050 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4051 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4052 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4053 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4054 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4055 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"3!!"dp`C@j68d`!!!! | ||
4056 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!r2cmr39"36!!!"!!!!!3!!!!!3!!!@-!!!!! | ||
4057 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4058 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!6m | ||
4059 | r2cm!!!!!!!!!!J!!!!)!!J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4060 | !!!!!!!!!!!)!8!!"!!%!!3!"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4061 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4062 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4063 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4064 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4065 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"3R3dp%45FJ*d4"9%% | ||
4066 | R)#G35808*`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4067 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4068 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4069 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4070 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4071 | !!!!)!!!"!!!!,3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!!J! | ||
4072 | !!#i#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!!-!!!![!J%!!!! | ||
4073 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!!%!!!!-!)"!!!!!!!"!!%"!!! | ||
4074 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!!"3!!!$%#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4075 | !!!%!!!!!!!!!!!J!!!B!!!!b!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4076 | !!!!)!!!(!!!!-`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!#!! | ||
4077 | !!$3#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!!N!!!!e!J%!!!! | ||
4078 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!!+!!!!0J)"!!!!!!!"!!%"!!! | ||
4079 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!!#`!!!$F#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4080 | !!!%!!!!!!!!!!!J!!!`!!!!i!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4081 | !!!!)!!!0!!!!13)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!$J! | ||
4082 | !!$S#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!!m!!!!l!J%!!!! | ||
4083 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!!3!!!!2!)"!!!!!!!"!!%"!!! | ||
4084 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!!%3!!!$d#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4085 | !!!%!!!!!!!!!!!J!!")!!!!q!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4086 | !!!!)!!!6!!!!2`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!&!! | ||
4087 | !!%!#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!"8!!!""!J%!!!! | ||
4088 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!!@!!!!3J)"!!!!!!!"!!%"!!! | ||
4089 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!!&`!!!%-#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4090 | !!!%!!!!!!!!!!!J!!"J!!!"%!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4091 | !!!!)!!!C!!!!43)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!'J! | ||
4092 | !!%B#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!"X!!!"(!J%!!!! | ||
4093 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!!F!!!!5!)"!!!!!!!"!!%"!!! | ||
4094 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!!(3!!!%N#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4095 | !!!%!!!!!!!!!!!J!!"i!!!"+!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4096 | !!!!)!!!I!!!!5`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!)!! | ||
4097 | !!%`#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!#%!!!"0!J%!!!! | ||
4098 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!!L!!!!6J)"!!!!!!!"!!%"!!! | ||
4099 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!!)`!!!%m#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4100 | !!!%!!!!!!!!!!!J!!#3!!!"3!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4101 | !!!!)!!!P!!!!83)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!*J! | ||
4102 | !!&)#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!#F!!!"6!J%!!!! | ||
4103 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!!S!!!!9!)"!!!!!!!"!!%"!!! | ||
4104 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!!+3!!!&8#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4105 | !!!%!!!!!!!!!!!J!!#S!!!"@!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4106 | !!!!)!!!V!!!!9`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!,!! | ||
4107 | !!&J#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!#d!!!"C!J%!!!! | ||
4108 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!!Z!!!!@J)"!!!!!!!"!!%"!!! | ||
4109 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!!,`!!!&X#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4110 | !!!%!!!!!!!!!!!J!!$!!!!"F!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4111 | !!!!)!!!a!!!!A3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!-J! | ||
4112 | !!&i#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!$-!!!"I!J%!!!! | ||
4113 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!!d!!!!B!)"!!!!!!!"!!%"!!! | ||
4114 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!!03!!!'%#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4115 | !!!%!!!!!!!!!!!J!!$B!!!"L!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4116 | !!!!)!!!h!!!!B`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!1!! | ||
4117 | !!'3#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!$N!!!"P!J%!!!! | ||
4118 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!!k!!!!CJ)"!!!!!!!"!!%"!!! | ||
4119 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!!1`!!!'F#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4120 | !!!%!!!!!!!!!!!J!!$`!!!"S!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4121 | !!!!)!!!p!!!!D3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!2J! | ||
4122 | !!'S#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!$m!!!"V!J%!!!! | ||
4123 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!"!!!!!E!)"!!!!!!!"!!%"!!! | ||
4124 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!!33!!!'d#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4125 | !!!%!!!!!!!!!!!J!!%)!!!"Z!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4126 | !!!!)!!"$!!!!E`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!4!! | ||
4127 | !!(!#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!%8!!!"a!J%!!!! | ||
4128 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!"'!!!!FJ)"!!!!!!!"!!%"!!! | ||
4129 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!!4`!!!(-#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4130 | !!!%!!!!!!!!!!!J!!%J!!!"d!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4131 | !!!!)!!"*!!!!G3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!5J! | ||
4132 | !!(B#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!%X!!!"h!J%!!!! | ||
4133 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!"-!!!!H!)"!!!!!!!"!!%"!!! | ||
4134 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!!63!!!(N#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4135 | !!!%!!!!!!!!!!!J!!%i!!!"k!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4136 | !!!!)!!"2!!!!H`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!8!! | ||
4137 | !!(`#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!&%!!!"p!J%!!!! | ||
4138 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!"5!!!!IJ)"!!!!!!!"!!%"!!! | ||
4139 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!!8`!!!(m#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4140 | !!!%!!!!!!!!!!!J!!&3!!!#!!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4141 | !!!!)!!"9!!!!J3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!9J! | ||
4142 | !!))#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!&F!!!#$!J%!!!! | ||
4143 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!"B!!!!K!)"!!!!!!!"!!%"!!! | ||
4144 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!!@3!!!)8#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4145 | !!!%!!!!!!!!!!!J!!&S!!!#'!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4146 | !!!!)!!"E!!!!K`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!A!! | ||
4147 | !!)J#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!&d!!!#*!J%!!!! | ||
4148 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!"H!!!!LJ)"!!!!!!!"!!%"!!! | ||
4149 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!!A`!!!)X#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4150 | !!!%!!!!!!!!!!!J!!'!!!!#-!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4151 | !!!!)!!"K!!!!M3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!BJ! | ||
4152 | !!)i#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!'-!!!#2!J%!!!! | ||
4153 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!"N!!!!N!!#!3!!!!!!!3!"!3! | ||
4154 | !!!!!!!!!!!!!!!%!!!!!!!!!!!J!!'8!!!#4!J%!!!!!!!%!!3%!!!!!!!!!!!! | ||
4155 | !!!!"!!!!!!!!!!!)!!"Q!!!!NJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!! | ||
4156 | !!!!!#!!!C`!!!*-#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!'J | ||
4157 | !!!#8!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!"T!!!!P3)"!!! | ||
4158 | !!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!DJ!!!*B#!3!!!!!!!3!"!3! | ||
4159 | !!!!!!!!!!!!!!!%!!!!!!!!!!!J!!'X!!!#A!J%!!!!!!!%!!3%!!!!!!!!!!!! | ||
4160 | !!!!"!!!!!!!!!!!)!!"X!!!!Q!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!! | ||
4161 | !!!!!#!!!E3!!!*N#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!'i | ||
4162 | !!!#D!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!"[!!!!Q`)"!!! | ||
4163 | !!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!F!!!!*`#!3!!!!!!!3!"!3! | ||
4164 | !!!!!!!!!!!!!!!%!!!!!!!!!!!J!!(%!!!#G!J%!!!!!!!%!!3%!!!!!!!!!!!! | ||
4165 | !!!!"!!!!!!!!!!!)!!"b!!!!RJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!! | ||
4166 | !!!!!#!!!F`!!!*m#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!(3 | ||
4167 | !!!#J!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!"e!!!!S3)"!!! | ||
4168 | !!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!GJ!!!+)#!3!!!!!!!3!"!3! | ||
4169 | !!!!!!!!!!!!!!!%!!!!!!!!!!!J!!(F!!!#M!J%!!!!!!!%!!3%!!!!!!!!!!!! | ||
4170 | !!!!"!!!!!!!!!!!)!!"i!!!!T!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!! | ||
4171 | !!!!!#!!!H3!!!+8#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!(S | ||
4172 | !!!#Q!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!"l!!!!T`)"!!! | ||
4173 | !!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!I!!!!+J#!3!!!!!!!3!"!3! | ||
4174 | !!!!!!!!!!!!!!!%!!!!!!!!!!!J!!(d!!!#T!J%!!!!!!!%!!3%!!!!!!!!!!!! | ||
4175 | !!!!"!!!!!!!!!!!)!!"q!!!!UJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!! | ||
4176 | !!!!!#!!!I`!!!+X#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!)! | ||
4177 | !!!#X!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!#"!!!!V3)"!!! | ||
4178 | !!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!JJ!!!+i#!3!!!!!!!3!"!3! | ||
4179 | !!!!!!!!!!!!!!!%!!!!!!!!!!!J!!)-!!!#[!J%!!!!!!!%!!3%!!!!!!!!!!!! | ||
4180 | !!!!"!!!!!!!!!!!)!!#%!!!!X!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!! | ||
4181 | !!!!!#!!!K3!!!,%#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!)B | ||
4182 | !!!#b!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!#(!!!!X`)"!!! | ||
4183 | !!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!L!!!!,3#!3!!!!!!!3!"!3! | ||
4184 | !!!!!!!!!!!!!!!%!!!!!!!!!!!J!!)N!!!#e!J%!!!!!!!%!!3%!!!!!!!!!!!! | ||
4185 | !!!!"!!!!!!!!!!!)!!#+!!!!YJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!! | ||
4186 | !!!!!#!!!L`!!!,F#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!)` | ||
4187 | !!!#i!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!#0!!!!Z3)"!!! | ||
4188 | !!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!MJ!!!,S#!3!!!!!!!3!"!3! | ||
4189 | !!!!!!!!!!!!!!!%!!!!!!!!!!!J!!)m!!!#l!J%!!!!!!!%!!3%!!!!!!!!!!!! | ||
4190 | !!!!"!!!!!!!!!!!)!!#3!!!!!,`#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
4191 | !!!!!!!J!!*%!!!#p!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!# | ||
4192 | 5!!!![J)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!N`!!!,m#!3! | ||
4193 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!*3!!!$!!J%!!!!!!!%!!3% | ||
4194 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!#9!!!!`3)"!!!!!!!"!!%"!!!!!!!!!!! | ||
4195 | !!!!!!3!!!!!!!!!!#!!!PJ!!!-)#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
4196 | !!!!!!!J!!*F!!!$$!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!# | ||
4197 | B!!!!a!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!Q3!!!-8#!3! | ||
4198 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!*S!!!$'!J%!!!!!!!%!!3% | ||
4199 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!#E!!!!a`)"!!!!!!!"!!%"!!!!!!!!!!! | ||
4200 | !!!!!!3!!!!!!!!!!#!!!R!!!!-J#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
4201 | !!!!!!!J!!*d!!!$*!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!# | ||
4202 | H!!!!bJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!R`!!!-X#!3! | ||
4203 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!+!!!!$-!J%!!!!!!!%!!3% | ||
4204 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!#K!!!!c3)"!!!!!!!"!!%"!!!!!!!!!!! | ||
4205 | !!!!!!3!!!!!!!!!!#!!!SJ!!!-i#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
4206 | !!!!!!!J!!+-!!!$2!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!# | ||
4207 | N!!!!d!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!T3!!!0%#!3! | ||
4208 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!+B!!!$5!J%!!!!!!!%!!3% | ||
4209 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!#R!!!!d`)"!!!!!!!"!!%"!!!!!!!!!!! | ||
4210 | !!!!!!3!!!!!!!!!!#!!!U!!!!03#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
4211 | !!!!!!!J!!+N!!!$9!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!# | ||
4212 | U!!!!eJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!U`!!!0F#!3! | ||
4213 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!+`!!!$B!J%!!!!!!!%!!3% | ||
4214 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!#Y!!!!f3)"!!!!!!!"!!%"!!!!!!!!!!! | ||
4215 | !!!!!!3!!!!!!!!!!#!!!VJ!!!0S#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
4216 | !!!!!!!J!!+m!!!$E!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!# | ||
4217 | `!!!!h!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!X3!!!0d#!3! | ||
4218 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!,)!!!$H!J%!!!!!!!%!!3% | ||
4219 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!#c!!!!h`)"!!!!!!!"!!%"!!!!!!!!!!! | ||
4220 | !!!!!!3!!!!!!!!!!#!!!Y!!!!1!#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
4221 | !!!!!!!J!!,8!!!$K!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!# | ||
4222 | f!!!!iJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!Y`!!!1-#!3! | ||
4223 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!,J!!!$N!J%!!!!!!!%!!3% | ||
4224 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!#j!!!!j3)"!!!!!!!"!!%"!!!!!!!!!!! | ||
4225 | !!!!!!3!!!!!!!!!!#!!!ZJ!!!1B#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
4226 | !!!!!!!J!!,X!!!$R!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!# | ||
4227 | m!!!!k!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!![3!!!1N#!3! | ||
4228 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!,i!!!$U!J%!!!!!!!%!!3% | ||
4229 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!#r!!!!k`)"!!!!!!!"!!%"!!!!!!!!!!! | ||
4230 | !!!!!!3!!!!!!!!!!#!!!`!!!!1`#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
4231 | !!!!!!!J!!-%!!!$Y!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!$ | ||
4232 | #!!!!lJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!``!!!1m#!3! | ||
4233 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!-3!!!$`!J%!!!!!!!%!!3% | ||
4234 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!$&!!!!m3)"!!!!!!!"!!%"!!!!!!!!!!! | ||
4235 | !!!!!!3!!!!!!!!!!#!!!aJ!!!2)#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
4236 | !!!!!!!J!!-F!!!$c!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!$ | ||
4237 | )!!!!p!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!b3!!!28#!3! | ||
4238 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!-S!!!$f!J%!!!!!!!%!!3% | ||
4239 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!$,!!!!p`)"!!!!!!!"!!%"!!!!!!!!!!! | ||
4240 | !!!!!!3!!!!!!!!!!#!!!c!!!!2J#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
4241 | !!!!!!!J!!-d!!!$j!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!$ | ||
4242 | 1!!!!qJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!c`!!!2X#!3! | ||
4243 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!0!!!!$m!J%!!!!!!!%!!3% | ||
4244 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!$4!!!!r3)"!!!!!!!"!!%"!!!!!!!!!!! | ||
4245 | !!!!!!3!!!!!!!!!!#!!!dJ!!!2i#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
4246 | !!!!!!!J!!0-!!!$r!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!$ | ||
4247 | 8!!!"!!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!e3!!!3%#!3! | ||
4248 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!0B!!!%#!J%!!!!!!!%!!3% | ||
4249 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!$A!!!"!`)"!!!!!!!"!!%"!!!!!!!!!!! | ||
4250 | !!!!!!3!!!!!!!!!!#!!!f!!!!33#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
4251 | !!!!!!!J!!0N!!!%&!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!$ | ||
4252 | D!!!""J)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!f`!!!3F#!3! | ||
4253 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!0`!!!%)!J%!!!!!!!%!!3% | ||
4254 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!$G!!!"#3)"!!!!!!!"!!%"!!!!!!!!!!! | ||
4255 | !!!!!!3!!!!!!!!!!#!!!hJ!!!3S#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
4256 | !!!!!!!J!!0m!!!%,!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!$ | ||
4257 | J!!!"$!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!i3!!!3d#!3! | ||
4258 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!1)!!!%1!J%!!!!!!!%!!3% | ||
4259 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!$M!!!"$`)"!!!!!!!"!!%"!!!!!!!!!!! | ||
4260 | !!!!!!3!!!!!!!!!!#!!!j!!!!4!#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
4261 | !!!!!!!J!!18!!!%4!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!$ | ||
4262 | Q!!!"%J)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!j`!!!4-#!3! | ||
4263 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!1J!!!%8!J%!!!!!!!%!!3% | ||
4264 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!$T!!!"&3)"!!!!!!!"!!%"!!!!!!!!!!! | ||
4265 | !!!!!!3!!!!!!!!!!#!!!kJ!!!4B#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
4266 | !!!!!!!J!!1X!!!%A!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!$ | ||
4267 | X!!!"'!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!l3!!!4N#!3! | ||
4268 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!1i!!!%D!J%!!!!!!!%!!3% | ||
4269 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!$[!!!"'`)"!!!!!!!"!!%"!!!!!!!!!!! | ||
4270 | !!!!!!3!!!!!!!!!!#!!!m!!!!4`#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
4271 | !!!!!!!J!!2%!!!%G!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!$ | ||
4272 | b!!!"(J)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!m`!!!4m#!3! | ||
4273 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!23!!!%J!J%!!!!!!!%!!3% | ||
4274 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!$e!!!")3)"!!!!!!!"!!%"!!!!!!!!!!! | ||
4275 | !!!!!!3!!!!!!!!!!#!!!pJ!!!5)#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
4276 | !!!!!!!J!!2F!!!%M!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!$ | ||
4277 | i!!!"*!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!q3!!!58#!3! | ||
4278 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!2S!!!%Q!J%!!!!!!!%!!3% | ||
4279 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!$l!!!"*`)"!!!!!!!"!!%"!!!!!!!!!!! | ||
4280 | !!!!!!3!!!!!!!!!!#!!!r!!!!5J#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
4281 | !!!!!!!J!!2d!!!%T!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!$ | ||
4282 | q!!!"+J)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!r`!!!5X#!3! | ||
4283 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!3!!!!%X!J%!!!!!!!%!!3% | ||
4284 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!%"!!!",3)"!!!!!!!"!!%"!!!!!!!!!!! | ||
4285 | !!!!!!3!!!!!!!!!!#!!"!J!!!5i#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
4286 | !!!!!!!J!!3-!!!%[!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!% | ||
4287 | %!!!"-!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!""3!!!6%#!3! | ||
4288 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!3B!!!%b!J%!!!!!!!%!!3% | ||
4289 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!%(!!!"-`)"!!!!!!!"!!%"!!!!!!!!!!! | ||
4290 | !!!!!!3!!!!!!!!!!#!!"#!!!!63#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
4291 | !!!!!!!J!!3N!!!%e!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!% | ||
4292 | +!!!"0J)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!"#`!!!6F#!3! | ||
4293 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!3`!!!%i!J%!!!!!!!%!!3% | ||
4294 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!%0!!!"13)"!!!!!!!"!!%"!!!!!!!!!!! | ||
4295 | !!!!!!3!!!!!!!!!!#!!"$J!!!6S#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
4296 | !!!!!!!J!!3m!!!%l!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!% | ||
4297 | 3!!!"2!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!"%3!!!6d#!3! | ||
4298 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!4)!!!%q!J%!!!!!!!%!!3% | ||
4299 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!%6!!!"2`)"!!!!!!!"!!%"!!!!!!!!!!! | ||
4300 | !!!!!!3!!!!!!!!!!#!!"&!!!!8!#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
4301 | !!!!!!!J!!48!!!&"!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!% | ||
4302 | @!!!"3J)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!"&`!!!8-#!3! | ||
4303 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!4J!!!&%!J%!!!!!!!%!!3% | ||
4304 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!%C!!!"43)"!!!!!!!"!!%"!!!!!!!!!!! | ||
4305 | !!!!!!3!!!!!!!!!!#!!"'J!!!8B#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
4306 | !!!!!!!J!!4X!!!&(!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!% | ||
4307 | F!!!"5!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!"(3!!!8N#!3! | ||
4308 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!4i!!!&+!J%!!!!!!!%!!3% | ||
4309 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!%I!!!"5`)"!!!!!!!"!!%"!!!!!!!!!!! | ||
4310 | !!!!!!3!!!!!!!!!!#!!")!!!!8`#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
4311 | !!!!!!!J!!5%!!!&0!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!% | ||
4312 | L!!!"6J)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!")`!!!8m#!3! | ||
4313 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!53!!!&3!J%!!!!!!!%!!3% | ||
4314 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!%P!!!"83)"!!!!!!!"!!%"!!!!!!!!!!! | ||
4315 | !!!!!!3!!!!!!!!!!#!!"*J!!!9)#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
4316 | !!!!!!!J!!5F!!!&6!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!% | ||
4317 | S!!!"9!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!"+3!!!98#!3! | ||
4318 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!5S!!!&@!J%!!!!!!!%!!3% | ||
4319 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!%V!!!"9`)"!!!!!!!"!!%"!!!!!!!!!!! | ||
4320 | !!!!!!3!!!!!!!!!!#!!",!!!!9J#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
4321 | !!!!!!!J!!5d!!!&C!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!% | ||
4322 | Z!!!"@J)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!",`!!!9X#!3! | ||
4323 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!6!!!!&F!J%!!!!!!!%!!3% | ||
4324 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!%a!!!"A3)"!!!!!!!"!!%"!!!!!!!!!!! | ||
4325 | !!!!!!3!!!!!!!!!!#!!"-J!!!9i#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
4326 | !!!!!!!J!!6-!!!&I!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!% | ||
4327 | d!!!"B!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!"03!!!@%#!3! | ||
4328 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!6B!!!&L!J%!!!!!!!%!!3% | ||
4329 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!%h!!!"B`)"!!!!!!!"!!%"!!!!!!!!!!! | ||
4330 | !!!!!!3!!!!!!!!!!#!!"1!!!!@3#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
4331 | !!!!!!!J!!6N!!!&P!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!% | ||
4332 | k!!!"CJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!"1`!!!@F#!3! | ||
4333 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!6`!!!&S!J%!!!!!!!%!!3% | ||
4334 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!%p!!!"D3)"!!!!!!!"!!%"!!!!!!!!!!! | ||
4335 | !!!!!!3!!!!!!!!!!#!!"2J!!!@S#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
4336 | !!!!!!!J!!6m!!!&V!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!& | ||
4337 | !!!!"E!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!"33!!!@d#!3! | ||
4338 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!8)!!!&Z!J%!!!!!!!%!!3% | ||
4339 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!&$!!!"E`)"!!!!!!!"!!%"!!!!!!!!!!! | ||
4340 | !!!!!!3!!!!!!!!!!#!!"4!!!!A!#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
4341 | !!!!!!!J!!88!!!&a!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!& | ||
4342 | '!!!"FJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!"4`!!!A-#!3! | ||
4343 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!8J!!!&d!J%!!!!!!!%!!3% | ||
4344 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!&*!!!"G3)"!!!!!!!"!!%"!!!!!!!!!!! | ||
4345 | !!!!!!3!!!!!!!!!!#!!"5J!!!AB#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
4346 | !!!!!!!J!!8X!!!&h!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!& | ||
4347 | -!!!"H!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!"63!!!AN#!3! | ||
4348 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!8i!!!&k!J%!!!!!!!%!!3% | ||
4349 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!&2!!!"H`)"!!!!!!!"!!%"!!!!!!!!!!! | ||
4350 | !!!!!!3!!!!!!!!!!#!!"8!!!!A`#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
4351 | !!!!!!!J!!9%!!!&p!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!& | ||
4352 | 5!!!"IJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!"8`!!!B!#!3! | ||
4353 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!93!!!'"!J%!!!!!!!%!!3% | ||
4354 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!&9!!!"JJ)"!!!!!!!"!!%"!!!!!!!!!!! | ||
4355 | !!!!!!3!!!!!!!!!!#!!"9J!!!B-#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
4356 | !!!!!!!J!!9F!!!'%!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!& | ||
4357 | B!!!"K3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!"@3!!!BB#!3! | ||
4358 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!9S!!!'(!J%!!!!!!!%!!3% | ||
4359 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!&E!!!"L!)"!!!!!!!"!!%"!!!!!!!!!!! | ||
4360 | !!!!!!3!!!!!!!!!!#!!"A!!!!BN#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
4361 | !!!!!!!J!!9d!!!'+!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!& | ||
4362 | H!!!"L`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!"A`!!!B`#!3! | ||
4363 | !!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!@!!!!'0!J%!!!!!!!%!!3% | ||
4364 | !!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!&K!!!"MJ)"!!!!!!!"!!%"!!!!!!!!!!! | ||
4365 | !!!!!!3!!!!!!!!!!#!!"BJ!!!Bm#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!! | ||
4366 | !!!!!!!J!!@-!!!'3!!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!! | ||
4367 | "C!!!!C%#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!@8!!!'5!J% | ||
4368 | !!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!&Q!!!"N`)"!!!!!!!"!!% | ||
4369 | "!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!"C`!!!C3#!3!!!!!!!3!"!3!!!!!!!!! | ||
4370 | !!!!!!!%!!!!!!!!!!!J!!@J!!!'9!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!! | ||
4371 | !!!!!!!!)!!&T!!!"PJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!! | ||
4372 | "DJ!!!CF#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!@X!!!'B!J% | ||
4373 | !!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!&X!!!"Q3)"!!!!!!!"!!% | ||
4374 | "!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!"E3!!!CS#!3!!!!!!!3!"!3!!!!!!!!! | ||
4375 | !!!!!!!%!!!!!!!!!!!J!!@i!!!'E!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!! | ||
4376 | !!!!!!!!)!!&[!!!"R!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!! | ||
4377 | "F!!!!Cd#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!A%!!!'H!J% | ||
4378 | !!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!&b!!!"R`)"!!!!!!!"!!% | ||
4379 | "!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!"F`!!!D3#!3!!!!!!!3!"!3!!!!!!!!! | ||
4380 | !!!!!!!%!!!!!!!!!!!J!!A3!!!'Q!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!! | ||
4381 | !!!!!!!!)!!&e!!!"T`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!!! | ||
4382 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4383 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4384 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4385 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4386 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4387 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4388 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4389 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4390 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4391 | !!!!!!!!!!!!!!!!!!3!!!!)!!!!$!!!!"!!!!!8!!!!'!!!!"`!!!!J!!!!*!!! | ||
4392 | !#J!!!!X!!!!-!!!!$3!!!!i!!!!2!!!!%!!!!"%!!!!5!!!!%`!!!"3!!!!9!!! | ||
4393 | !&J!!!"F!!!!B!!!!'3!!!"S!!!!E!!!!(!!!!"d!!!!H!!!!(`!!!#!!!!!K!!! | ||
4394 | !)J!!!#-!!!!N!!!!*3!!!#B!!!!R!!!!+!!!!#N!!!!U!!!!+`!!!#`!!!!Y!!! | ||
4395 | !,J!!!#m!!!!`!!!!-3!!!$)!!!!c!!!!0!!!!$8!!!!f!!!!0`!!!$J!!!!j!!! | ||
4396 | !1J!!!$X!!!!m!!!!23!!!$i!!!!r!!!!3!!!!%%!!!"#!!!!3`!!!%3!!!"&!!! | ||
4397 | !4J!!!%F!!!")!!!!53!!!%S!!!",!!!!6!!!!%d!!!"1!!!!6`!!!&!!!!"4!!! | ||
4398 | !8J!!!&-!!!"8!!!!93!!!&B!!!"A!!!!@!!!!&N!!!"D!!!!@`!!!&`!!!"G!!! | ||
4399 | !AJ!!!&m!!!"J!!!!B3!!!')!!!"M!!!!C!!!!'8!!!"Q!!!!C`!!!'J!!!"T!!! | ||
4400 | !DJ!!!'X!!!"X!!!!E3!!!'i!!!"[!!!!F!!!!(%!!!"b!!!!F`!!!(3!!!"e!!! | ||
4401 | !GJ!!!(F!!!"i!!!!H3!!!(S!!!"l!!!!I!!!!(d!!!"q!!!!I`!!!)!!!!#"!!! | ||
4402 | !JJ!!!)-!!!#%!!!!K3!!!)B!!!#(!!!!L!!!!)N!!!#+!!!!L`!!!)`!!!#0!!! | ||
4403 | !MJ!!!)m!!!#3!!!!!*%!!!#5!!!!N`!!!*3!!!#9!!!!PJ!!!*F!!!#B!!!!Q3! | ||
4404 | !!*S!!!#E!!!!R!!!!*d!!!#H!!!!R`!!!+!!!!#K!!!!SJ!!!+-!!!#N!!!!T3! | ||
4405 | !!+B!!!#R!!!!U!!!!+N!!!#U!!!!U`!!!+`!!!#Y!!!!VJ!!!+m!!!#`!!!!X3! | ||
4406 | !!,)!!!#c!!!!Y!!!!,8!!!#f!!!!Y`!!!,J!!!#j!!!!ZJ!!!,X!!!#m!!!![3! | ||
4407 | !!,i!!!#r!!!!`!!!!-%!!!$#!!!!``!!!-3!!!$&!!!!aJ!!!-F!!!$)!!!!b3! | ||
4408 | !!-S!!!$,!!!!c!!!!-d!!!$1!!!!c`!!!0!!!!$4!!!!dJ!!!0-!!!$8!!!!e3! | ||
4409 | !!0B!!!$A!!!!f!!!!0N!!!$D!!!!f`!!!0`!!!$G!!!!hJ!!!0m!!!$J!!!!i3! | ||
4410 | !!1)!!!$M!!!!j!!!!18!!!$Q!!!!j`!!!1J!!!$T!!!!kJ!!!1X!!!$X!!!!l3! | ||
4411 | !!1i!!!$[!!!!m!!!!2%!!!$b!!!!m`!!!23!!!$e!!!!pJ!!!2F!!!$i!!!!q3! | ||
4412 | !!2S!!!$l!!!!r!!!!2d!!!$q!!!!r`!!!3!!!!%"!!!"!J!!!3-!!!%%!!!""3! | ||
4413 | !!3B!!!%(!!!"#!!!!3N!!!%+!!!"#`!!!3`!!!%0!!!"$J!!!3m!!!%3!!!"%3! | ||
4414 | !!4)!!!%6!!!"&!!!!48!!!%@!!!"&`!!!4J!!!%C!!!"'J!!!4X!!!%F!!!"(3! | ||
4415 | !!4i!!!%I!!!")!!!!5%!!!%L!!!")`!!!53!!!%P!!!"*J!!!5F!!!%S!!!"+3! | ||
4416 | !!5S!!!%V!!!",!!!!5d!!!%Z!!!",`!!!6!!!!%a!!!"-J!!!6-!!!%d!!!"03! | ||
4417 | !!6B!!!%h!!!"1!!!!6N!!!%k!!!"1`!!!6`!!!%p!!!"2J!!!6m!!!&!!!!"33! | ||
4418 | !!8)!!!&$!!!"4!!!!88!!!&'!!!"4`!!!8J!!!&*!!!"5J!!!8X!!!&-!!!"63! | ||
4419 | !!8i!!!&2!!!"8!!!!9%!!!&5!!!"8`!!!93!!!&9!!!"9J!!!9F!!!&B!!!"@3! | ||
4420 | !!9S!!!&E!!!"A!!!!9d!!!&H!!!"A`!!!@!!!!&K!!!"BJ!!!@-!!!&N!!!"C3! | ||
4421 | !!@B!!!&R!!!"D!!!!@N!!!&U!!!"D`!!!@`!!!&Y!!!"EJ!!!@m!!!&`!!!"F3! | ||
4422 | !!A)!!!&c!!!"G!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4423 | !!!!!!!!!!!!"G3!!!B!)!!!!#!!"G3!!!GS!!3!F!!!!!!!!!!!!!!!!!!!!!!! | ||
4424 | !!!!!!!!!#!!!!3J!!!))!!!$#!!!"!J!!!8)!!!'#!!!"`J!!!J)!!!*#!!!#JJ | ||
4425 | !!!X)!!!-#!!!$3J!!!i)!!!2#!!!%!J!!"%)!!!5#!!!%`J!!"3)!!!9#!!!&JJ | ||
4426 | !!"F)!!!B#!!!'3J!!"S)!!!E#!!!(!J!!"d)!!!H#!!!(`J!!#!)!!!K#!!!)JJ | ||
4427 | !!#-)!!!N#!!!*3J!!#B)!!!R#!!!+!J!!#N)!!!U#!!!+`J!!#`)!!!Y#!!!,JJ | ||
4428 | !!#m)!!!`#!!!-3J!!$))!!!c#!!!0!J!!$8)!!!f#!!!0`J!!$J)!!!j#!!!1JJ | ||
4429 | !!$X)!!!m#!!!23J!!$i)!!!r#!!!3!J!!%%)!!"##!!!3`J!!%3)!!"&#!!!4JJ | ||
4430 | !!%F)!!")#!!!53J!!%S)!!",#!!!6!J!!%d)!!"1#!!!6`J!!&!)!!"4#!!!8JJ | ||
4431 | !!&-)!!"8#!!!93J!!&B)!!"A#!!!@!J!!&N)!!"D#!!!@`J!!&`)!!&d#!!!A3J | ||
4432 | !!&i)!!"I#!!!B!J!!'%)!!"L#!!!B`J!!'3)!!"P#!!!CJJ!!'F)!!"S#!!!D3J | ||
4433 | !!'S)!!"V#!!!E!J!!'d)!!"Z#!!!E`J!!(!)!!"a#!!!FJJ!!(-)!!"d#!!!G3J | ||
4434 | !!(B)!!"h#!!!H!J!!(N)!!"k#!!!H`J!!(`)!!"p#!!!IJJ!!(m)!!#!#!!!J3J | ||
4435 | !!)))!!#$#!!!K!J!!)8)!!#'#!!!K`J!!)J)!!#*#!!!LJJ!!)X)!!#-#!!!M3J | ||
4436 | !!)i)!!#2#!!!N!!)!!#4#!!!NJJ!!*-)!!#8#!!!P3J!!*B)!!#A#!!!Q!J!!*N | ||
4437 | )!!#D#!!!Q`J!!*`)!!#G#!!!RJJ!!*m)!!#J#!!!S3J!!+))!!#M#!!!T!J!!+8 | ||
4438 | )!!#Q#!!!T`J!!+J)!!#T#!!!UJJ!!+X)!!#X#!!!V3J!!+i)!!#[#!!!X!J!!,% | ||
4439 | )!!#b#!!!X`J!!,3)!!#e#!!!YJJ!!,F)!!#i#!!!Z3J!!,S)!!#l#!!![!J!!,d | ||
4440 | )!!#q#!!![`J!!-!)!!$"#!!!`JJ!!--)!!$%#!!!a3J!!-B)!!$(#!!!b!J!!-N | ||
4441 | )!!$+#!!!b`J!!-`)!!$0#!!!cJJ!!-m)!!$3#!!!d3J!!0))!!$6#!!!e!J!!08 | ||
4442 | )!!$@#!!!e`J!!0J)!!$C#!!!fJJ!!0X)!!$F#!!!h3J!!0i)!!$I#!!!i!J!!1% | ||
4443 | )!!$L#!!!i`J!!13)!!$P#!!!jJJ!!1F)!!$S#!!!k3J!!1S)!!$V#!!!l!J!!1d | ||
4444 | )!!$Z#!!!l`J!!2!)!!$a#!!!mJJ!!2-)!!$d#!!!p3J!!2B)!!$h#!!!q!J!!2N | ||
4445 | )!!$k#!!!q`J!!2`)!!$p#!!!rJJ!!2m)!!%!#!!"!3J!!3))!!%$#!!""!J!!38 | ||
4446 | )!!%'#!!""`J!!3J)!!%*#!!"G3J!!3S)!!%,#!!"$!J!!3d)!!%1#!!"$`J!!4! | ||
4447 | )!!%4#!!"%JJ!!4-)!!%8#!!"&3J!!4B)!!%A#!!"'!J!!4N)!!%D#!!"'`J!!4` | ||
4448 | )!!%G#!!"(JJ!!4m)!!%J#!!")3J!!5))!!%M#!!"*!J!!58)!!%Q#!!"*`J!!5J | ||
4449 | )!!%T#!!"+JJ!!5X)!!%X#!!",3J!!5i)!!%[#!!"-!J!!6%)!!%b#!!"-`J!!63 | ||
4450 | )!!%e#!!"0JJ!!6F)!!%i#!!"13J!!6S)!!%l#!!"2!J!!6d)!!%q#!!"2`J!!8! | ||
4451 | )!!&"#!!"3JJ!!8-)!!&%#!!"43J!!8B)!!&(#!!"5!J!!8N)!!&+#!!"5`J!!8` | ||
4452 | )!!&0#!!"6JJ!!8m)!!&3#!!"83J!!9))!!&6#!!"9!J!!98)!!&@#!!"9`J!!9J | ||
4453 | )!!&C#!!"@JJ!!9X)!!&F#!!"A3J!!9i)!!&I#!!"B!J!!@%)!!&L#!!"B`J!!@3 | ||
4454 | )!!&P#!!"CJJ!!@F)!!&S#!!"D3J!!@S)!!&V#!!"E!J!!@d)!!&Z#!!"E`J!!A! | ||
4455 | )!!&a#!!"FJJ!!A-#!!!"!!!!!3)"!!!!!!!"!!%$!!!!!!!!!!!!!!!!!!!!!!! | ||
4456 | !!!!!!J!!!J!!!!)#!3!!!!!!!3!"!`!!!!!!!!!!!!!!!!3!!!!!!!!!!!)!!!- | ||
4457 | !!!!$!J%!!!!!!!%!!3-!!!!!!!!!!!!!!!!%!!!!!!!!!!!#!!!%!!!!"!)"!!! | ||
4458 | !!!!"!!%$!!!!!!!!!!!!!!!!!!!!!!!!!!!!!J!!"3!!!!8#!3!!!!!!!3!"!`! | ||
4459 | !!!!!!!!!!!!!!!%!!!!!!!!!!!)!!!B!!!!'!J%!!!!!!!%!!3-!!!!!!!!!!!! | ||
4460 | !!!!&!!!!!!!!!!!#!!!(!!!!"`)"!!!!!!!"!!%$!!!!!!!!!!!!!!!!!3!!!!! | ||
4461 | !!!!!!J!!#!!!!!J#!3!!!!!!!3!"!`!!!!!!!!!!!!!!!!8!!!!!!!!!!!)!!!N | ||
4462 | !!!!*!J%!!!!!!!%!!3-!!!!!!!!!!!!!!!!&!!!!!!!!!!!#!!!+!!!"I`)"!!! | ||
4463 | !!!!"!!%$!!!!!!!!!!!!!!!!!3!!!!!!!!!!!J!!#`!!!DN#!3!!!!!!!3!"!3! | ||
4464 | !!!!!!!!!!!!!!!%!!!!!!!!!!!)!!!`!!!'U!J%!!!!!!!%!!3%!!!!!!!!!!!! | ||
4465 | !!!!"!!!!!!!!!!!#!!!0!!!"U`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!! | ||
4466 | !!!!!!J!!$J!!!D`#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!)!!!m | ||
4467 | !!!'Y!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!#!!!3!!!"VJ)"!!! | ||
4468 | !!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!J!!%3!!!Dm#!3!!!!!!!3!"!3! | ||
4469 | !!!!!!!!!!!!!!!%!!!!!!!!!!!)!!")!!!'`!J%!!!!!!!%!!3%!!!!!!!!!!!! | ||
4470 | !!!!"!!!!!!!!!!!#!!!6!!!"X3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!! | ||
4471 | !!!!!!J!!&!!!!E)#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!)!!"8 | ||
4472 | !!!'c!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!#!!!@!!!"Y!)"!!! | ||
4473 | !!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!J!!&`!!!E8#!3!!!!!!!3!"!3! | ||
4474 | !!!!!!!!!!!!!!!%!!!!!!!!!!!)!!"J!!!'f!J%!!!!!!!%!!3%!!!!!!!!!!!! | ||
4475 | !!!!"!!!!!!!!!!!#!!!C!!!"Y`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!! | ||
4476 | !!!!!!J!!'J!!!EJ#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!)!!"X | ||
4477 | !!!'j!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!#!!!F!!!"ZJ)"!!! | ||
4478 | !!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!J!!(3!!!EX#!3!!!!!!!3!"!3! | ||
4479 | !!!!!!!!!!!!!!!%!!!!!!!!!!!)!!"i!!!'m!J%!!!!!!!%!!3%!!!!!!!!!!!! | ||
4480 | !!!!"!!!!!!!!!!!#!!!I!!!"[3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!! | ||
4481 | !!!!!!J!!)!!!!Ei#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!)!!#% | ||
4482 | !!!'r!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!#!!!L!!!"`!)"!!! | ||
4483 | !!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!J!!)`!!!F%#!3!!!!!!!3!"!3! | ||
4484 | !!!!!!!!!!!!!!!%!!!!!!!!!!!)!!#3!!!(#!J%!!!!!!!%!!3%!!!!!!!!!!!! | ||
4485 | !!!!"!!!!!!!!!!!#!!!P!!!"``)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!! | ||
4486 | !!!!!!J!!*J!!!F3#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!)!!#F | ||
4487 | !!!(&!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!#!!!S!!!"aJ)"!!! | ||
4488 | !!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!!J!!+3!!!FF#!3!!!!!!!3!"!3! | ||
4489 | !!!!!!!!!!!!!!!%!!!!!!!!!!!)!!#S!!!()!J%!!!!!!!%!!3%!!!!!!!!!!!! | ||
4490 | !!!!"!!!!!!!!!!!#!!!V!!!"b3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!! | ||
4491 | !!!!!!J!!,!!!!FS#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!)!!#d | ||
4492 | !!!(,!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!#!!!Z!!!"T3)"!!! | ||
4493 | !!!!"!!%$!!!!!!!!!!!!!!!!!3!!!!!!!!!!!J!!,`!!!F`#!3!!!!!!!3!"!3! | ||
4494 | !!!!!!!!!!!!!!!%!!!!!!!!!!!)!!$!!!!(0!J%!!!!!!!%!!3-!!!!!!!!!!!! | ||
4495 | !!!!"!!!!!!!!!!!#!!!a!!!"cJ)"!!!!!!!"!!%$!!!!!!!!!!!!!!!!!3!!!!! | ||
4496 | !!!!!!J!!-J!!!Fm#!3!!!!!!!3!"!`!!!!!!!!!!!!!!!!%!!!!!!!!!!!)!!$- | ||
4497 | !!!(p"!%!!!!!!!!!!3-!!!!!!!!!!!!!!!#"!!!!!!!!!!!#!!!d!!!"rJ3"!!! | ||
4498 | !!!!!!!%$!!!!!!!!!!!!!!!!J3!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4499 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4500 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4501 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4502 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4503 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4504 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4505 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4506 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4507 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4508 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'!!!!J)!!J!!!!!#!`!&!!! | ||
4509 | !!!)%!!`!!!!!!J8!#J!!!!!#"J!#!!!!!!)(!!8!!!!!!JJ!!J!!!!!##3!'!!! | ||
4510 | !!!)+!!d!!!!!!JX!"3!!!!!#$!!&!!!!!!)0!!%!!!!!!Ji!!3!!!!!#$`!(!!! | ||
4511 | !!!)3!!J!!!!!!K%!"3!!!!!#%J!#!!!!!!)6!!)!!!!!!K3!#!!!!!!#&3!"!!! | ||
4512 | !!!)@!!%!!!!!!KF!#!!!!!!#'!!*!!!!!!)C!!3!!!!!!!!!!!!!!!!!!!!!!!! | ||
4513 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4514 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4515 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4516 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4517 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4518 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4519 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4520 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4521 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4522 | !!!!!!!!!!!!!!!!!!!!!!!!"jJF!!!%!!!!!!!!!!!!!!!!!!!!!Y0m2&2rrr[B | ||
4523 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4524 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4525 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4526 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4527 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4528 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4529 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4530 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4531 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4532 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4533 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!(R#!!!!3!!!!!!!!!!!!!!!!!!!!# | ||
4534 | dh`m8rrr13J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4535 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4536 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4537 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4538 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4539 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4540 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4541 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4542 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4543 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4544 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!J!!!!"i!!!!!(L!!! | ||
4545 | !!H%!!!!"j!!!!!(P!!!!!H-!!!!"jJ!!!!(R!!%!!!!b8Np29!!!!!!!!!!!!!! | ||
4546 | !!!C(8P93!!!!!!!!!!%18Qpj*h-J4f9d5&488&-!!!!%4NP-43%!!D*'58a&!3! | ||
4547 | "SdC*6%8"!!'K4NP-43%!!D"(8P93!!!!!!!!!!)66h"PEP066#""F("XD@0KG'P | ||
4548 | [EJ!!!#0'58a&!J!!(%C*6%8#!!!U4NP-43)!!!e'58a&!J!!)%C*6%8#!!!54NP | ||
4549 | -43)!!"0'58a&!J!!&NC*6%8#!!!B4NP-43)!!"G'58a&!J!!$NC*6%8#!!!H4NP | ||
4550 | -43)!!"&'58a&!J!!%%C*6%8#!!!K4NP-43)!!"4'58a&!J!!&8C*6%8#!!!X4NP | ||
4551 | -43)!!"T'58a&!J!!'8C*6%8#!!!S4NP-43)!!#G'58a&!J!!*%C*6%8#!!!Y4NP | ||
4552 | -43)!!!Y'58a&!J!!*NC*6%8#!!!T4NP-43)!!!a'58a&!J!!+dC*6%8#!!!L4NP | ||
4553 | -43)!!!p'58a&!J!!'dC*6%8#!!!G4NP-43)!!"p'58a&!J!!*8C*6%8#!!!M4e* | ||
4554 | 98!!!!!!!!!!$%8p`C@j68d`J6'PLFQ&bD@9c!!!!"%G599!!!!!!!!!!"!038%- | ||
4555 | !!!!#4NP-43)!!$0'58a&!J!!0%G599!!!!!!!!!!"3-f1'X!!!!#4NP-438!!#" | ||
4556 | '58a&"3!!(dG599!!!!!!!!!!"JCMFRP`G'm!!!!S4NP-43%!!Aa'58a&!3!"INC | ||
4557 | *6%8"!!'N4NP-43%!!Cp'58a&!3!"I8C*6%8"!!&l4e*98!!!!!!!!!!("'&cEM% | ||
4558 | !!!"A4NP-43%!!$j'58a&!3!!-8C*6%8"!!"&4NP-43%!!$P'58a&!3!!3dC*6%8 | ||
4559 | "!!!m4NP-43%!!$p'58a&!3!!3%C*6%8"!!"%4NP-43%!!%&'58a&!3!!0dC*6%8 | ||
4560 | "!!!e4NP-43%!!$Y'58a&!3!!-NC*6%8"!!!i4NP-43%!!%K'58a&!3!!4NC*6%8 | ||
4561 | "!!"#4NP-43%!!$C'58a&!3!!4dC*6%8"!!')4NP-43%!!("'58a&!3!!I%C*6%8 | ||
4562 | "!!"i4NP-43%!!(T'58a&!3!!H8C*6%8"!!"a4NP-43%!!(C'58a&!3!!FNC*6%8 | ||
4563 | "!!"p4NP-43%!!B&'58a&!3!!FdC*6%8"!!"e4NP-43%!!(Y'58a&!3!!A8C*6%8 | ||
4564 | "!!"04NP-43%!!&P'58a&!3!!6NC*6%8"!!"D4NP-43%!!%p'58a&!3!!@dC*6%8 | ||
4565 | "!!"34NP-43%!!&a'58a&!3!!5dC*6%8"!!"A4NP-43%!!%a'58a&!3!!@%C*6%8 | ||
4566 | "!!"Z4NP-43%!!'p'58a&!3!"LNC*6%8"!!"X4NP-43%!!'e'58a&!3!"L8C*6%8 | ||
4567 | "!!',4NP-43%!!'9'58a&!3!!D8C*6%8"!!"S4NP-43%!!'G'58a&!3!!BdC*6%8 | ||
4568 | "!!"N4NP-43%!!'&'58a&!3!!DNC*6%8"!!"L4NP-43%!!'C'58a&!3!!8dC*6%8 | ||
4569 | "!!"84NP-43%!!&9'58a&!3!!9NC*6%8"!!"*4NP-43%!!%T'58a&!3!!ANC*6%8 | ||
4570 | "!!"54NP-43%!!$T'58a&!3!!GdC*6%8"!!!c4NP-43%!!(4'58a&!3!!,dC*6%8 | ||
4571 | "!!!Z4NP-43%!!#e'58a&!3!!28C*6%8"!!!d4NP-43%!!Ba'58a&!3!!88C*6%8 | ||
4572 | "!!!`4NP-43%!!&p'58a&!3!!B%C*6%8"!!"V4e*98!!!!!!!!!!)!Q*Q!!!!"8C | ||
4573 | *6%8"!!##4NP-43%!!(p'58a&!3!!J%C*6%8"!!"q4NP-43%!!)&(8P93!!!!!!! | ||
4574 | !!!N$BQP[!!!!$NC*6%8"!!#%4NP-43%!!Be'58a&!3!!JdC*6%8"!!'14NP-43% | ||
4575 | !!C&'58a&!3!"MdC*6%8"!!'3!%C*6%8"!!#&4NP-43%!!C*'58a&!3!"J%C*6%8 | ||
4576 | "!!'(4NP-43%!!C9'58a&!3!"NdC*6%8"!!'84e*98!!!!!!!!!!+!Q*Z!!!!&%C | ||
4577 | *6%8"!!#'4NP-43%!!)P'58a&!3!!LdC*6%8"!!#14NP-43%!!DC'58a&!3!!N8C | ||
4578 | *6%8"!!#64NP-43%!!*4'58a&!3!!PNC*6%8"!!#B4NP-43%!!)K'58a&!3!!M8C | ||
4579 | *6%8"!!#54NP-43%!!)T'58a&!3!!PdC*6%8"!!#(4NP-43%!!*9'58a&!3!!MdC | ||
4580 | *6%8"!!#3!%C*6%8"!!#-4e*98!!!!!!!!!!,"Q*eCQCPFJ!!!!*'58a&!3!!Q8C | ||
4581 | *6%8"!!#D4e*98!!!!!!!!!!-"'0KFh3!!!!&4NP-43%!!*p'58a&!3!!R%C*6%8 | ||
4582 | "!!#G4NP-43%!!*Y'58a&!3!!RNG599!!!!!!!!!!$34MEfe`!!!!!dC*6%8"!!# | ||
4583 | J4NP-43%!!+&'58a&!3!!SNG599!!!!!!!!!!$J4MEfjQ!!!!!NC*6%8"!!#M4NP | ||
4584 | -43%!!+4(8P93!!!!!!!!!!m$C'9c!!!!'NC*6%8"!!#P4NP-43%!!+C'58a&!3! | ||
4585 | !U%C*6%8"!!#T4NP-43%!!+Y'58a&!3!!V%C*6%8"!!#Z4NP-43%!!CC'58a&!3! | ||
4586 | !VdC*6%8"!!#b4NP-43%!!,0'58a&!3!!Y%C*6%8"!!#e4NP-43%!!,C'58a&!3! | ||
4587 | !Z%C*6%8"!!#j4NP-43%!!,T'58a&!3!!UNC*6%8"!!#`4NP-43%!!,G'58a&!3! | ||
4588 | ![8C*6%8"!!#l4NP-43%!!+G'58a&!3!!X8C*6%8"!!#m4NP-43%!!+e(8P93!!! | ||
4589 | !!!!!!"!#C'J!!!!&4NP-43%!!-"'58a&!3!!`8C*6%8"!!$#4NP-43%!!,j'58a | ||
4590 | &!3!![dG599!!!!!!!!!!%30NFf%!!!!)4NP-43%!!-9'58a&!3!!aNC*6%8"!!$ | ||
4591 | (4NP-43%!!-0'58a&!3!!b8C*6%8"!!$)4NP-43%!!-4'58a&!3!"JNG599!!!!! | ||
4592 | !!!!!%J0PFR)!!!!$4NP-43%!!-T'58a&!3!!bdC*6%8"!!$-4e*98!!!!!!!!!! | ||
4593 | 6!f9fF!!!!$p'58a&!3!!ddC*6%8"!!$54NP-43%!!04'58a&!3!!eNC*6%8"!!$ | ||
4594 | V4NP-43%!!0e'58a&!3!!j%C*6%8"!!$c4NP-43%!!1a'58a&!3!!hNC*6%8"!!$ | ||
4595 | P4NP-43%!!24'58a&!3!!k%C*6%8"!!$D4NP-43%!!2G'58a&!3!"!NC*6%8"!!$ | ||
4596 | K4NP-43%!!2"'58a&!3!!q%C*6%8"!!$Y4NP-43%!!0p'58a&!3!!jNC*6%8"!!$ | ||
4597 | e4NP-43%!!1P'58a&!3!!fdC*6%8"!!$L4NP-43%!!2&'58a&!3!!kNC*6%8"!!$ | ||
4598 | F4NP-43%!!10'58a&!3!!mNC*6%8"!!$Z4NP-43%!!1"'58a&!3!!jdC*6%8"!!$ | ||
4599 | f4NP-43%!!2j'58a&!3!!qdC*6%8"!!$m4NP-43%!!3"'58a&!3!"!8C*6%8"!!$ | ||
4600 | j4NP-43%!!2T'58a&!3!!r8C*6%8"!!$r4NP-43%!!3C'58a&!3!""dC*6%8"!!% | ||
4601 | )4NP-43%!!3P'58a&!3!""8C*6%8"!!%%4NP-43%!!30'58a&!3!!cdC*6%8"!!$ | ||
4602 | 04NP-43%!!-j'58a&!3!!e8C*6%8"!!$[4NP-43%!!0&'58a&!3!!edC*6%8"!!$ | ||
4603 | 34NP-43%!!0P'58a&!3!!f%C*6%8"!!'A4NP-43%!!CK(8P93!!!!!!!!!"3%D'e | ||
4604 | KB`!!!!&'58a&!3!"#NG599!!!!!!!!!!&34TC'9K!!!!"8C*6%8"!!%,4NP-43% | ||
4605 | !!3a'58a&!3!"$NC*6%8"!!%04NP-43%!!3p(8P93!!!!!!!!!"B&E'KKFfJ!!!! | ||
4606 | #4NP-43%!!4"'58a&!3!"%8G599!!!!!!!!!!&`0YC$)!!!!#4NP-43%!!4*'58a | ||
4607 | &!3!"%dG599!!!!!!!!!!'!0YC$8!!!!#4NP-43%!!44'58a&!3!"&8G599!!!!! | ||
4608 | !!!!!'34YC'-b!!!!!NC*6%8"!!%@4NP-43%!!4G(8P93!!!!!!!!!"S(Ef*UC@0 | ||
4609 | dF`!!!!4'58a&!3!"'dC*6%8"!!%B4NP-43%!!4T'58a&!3!"'8G599!!!!!!!!! | ||
4610 | !'`0`C@d!!!!'4NP-43%!!5&'58a&!3!")%C*6%8"!!%H4NP-43%!!4p'58a&!3! | ||
4611 | "(%C*6%8"!!%G4e*98!!!!!!!!!!F"R"VBh-a-J!!!""'58a&!3!")NC*6%8"!!% | ||
4612 | M4NP-43%!!54'58a&!3!"*8C*6%8"!!%Q4NP-43%!!5G'58a&!3!"+%C*6%8"!!% | ||
4613 | T4NP-43%!!5T'58a&!3!"+dC*6%8"!!%X4NP-43%!!5e'58a&!3!",NC*6%8"!!% | ||
4614 | [4NP-43%!!CP'58a&!3!"-%G599!!!!!!!!!!(39`Df0c0`!!!!C'58a&!3!"-NC | ||
4615 | *6%8"!!%c4NP-43%!!6&'58a&!3!"R%C*6%8"!!'D4NP-43%!!CY(8P93!!!!!!! | ||
4616 | !!"i%FQ&ZC!!!!!4'58a&!3!"0%C*6%8"!!%e4NP-43%!!6C'58a&!3!"TdG599! | ||
4617 | !!!!!!!!!(`0bBc)!!!!&4NP-43%!!6T'58a&!3!"1dC*6%8"!!%j4NP-43%!!6G | ||
4618 | '58a&!3!"1%G599!!!!!!!!!!)!0bBc3!!!!#4NP-43%!!6e'58a&!3!"2%G599! | ||
4619 | !!!!!!!!!)30bBc8!!!!&4NP-43%!!8*'58a&!3!"3%C*6%8"!!&"4NP-43%!!6j | ||
4620 | '58a&!3!"2dG599!!!!!!!!!!)JCbDA"PE@3!!!!#4NP-43%!!80'58a&!3!"4%G | ||
4621 | 599!!!!!!!!!!)`0bFf%!!!!-4NP-43%!!89'58a&!3!"4dC*6%8"!!&)4NP-43% | ||
4622 | !!8e'58a&!3!"6%C*6%8"!!&'4NP-43%!!8Y'58a&!3!"6NC*6%8"!!&*4NP-43% | ||
4623 | !!8T'58a&!3!"R8C*6%8"!!'H4e*98!!!!!!!!!!N!h0SB3!!!!4'58a&!3!"88C | ||
4624 | *6%8"!!&24NP-43%!!9*'58a&!3!"8%G599!!!!!!!!!!*39cG'&MD`!!!!&'58a | ||
4625 | &!3!"8dG599!!!!!!!!!!*JCdH(4IC')!!!!"4NP-43%!!94(8P93!!!!!!!!!#F | ||
4626 | %H$8`13!!!"9'58a&!3!"A%C*6%8"!!&E4NP-43%!!@&'58a&!3!"@NC*6%8"!!& | ||
4627 | J4NP-43%!!@*'58a&!3!"JdC*6%8"!!&Q4NP-43%!!@0'58a&!3!"@%C*6%8"!!& | ||
4628 | G4NP-43%!!9G'58a&!3!"C8C*6%8"!!&H4NP-43%!!9P'58a&!3!"AdC*6%8"!!& | ||
4629 | R4NP-43%!!@4'58a&!3!"K%C*6%8"!!&94NP-43%!!9C(8P93!!!!!!!!!#J'H$8 | ||
4630 | `1ABc!!!!&8C*6%8"!!&V4NP-43%!!@a'58a&!3!"E8C*6%8"!!&a4NP-43%!!A0 | ||
4631 | '58a&!3!"G8C*6%8"!!&h4NP-43%!!AT'58a&!3!"D%C*6%8"!!&b4NP-43%!!@T | ||
4632 | '58a&!3!"H%C*6%8"!!&T4NP-43%!!AC'58a&!3!"G%C*6%8"!!&`4NP-43%!!AP | ||
4633 | '58a&!3!"ENC*6%8"!!&[4NP-43%!!B9'58a&!3!"KNG599!!!!!!!!!!+30cFf` | ||
4634 | !!!!M4NP-43%!!"0'58a&!3!!&8C*6%8"!!!34NP-43%!!"*'58a&!3!!%8C*6%8 | ||
4635 | "!!!84NP-43%!!"T'58a&!3!!(%C*6%8"!!!A4NP-43%!!"P'58a&!3!!'%C*6%8 | ||
4636 | "!!!E4NP-43%!!"C'58a&!3!!$8C*6%8"!!!24NP-43%!!!Y'58a&!3!!$%C*6%8 | ||
4637 | "!!!14NP-43%!!#Y'58a&!3!!,%C*6%8"!!!S4NP-43%!!#T'58a&!3!!+8C*6%8 | ||
4638 | "!!!M4NP-43%!!#*'58a&!3!!(dC*6%8"!!!P4NP-43%!!#"'58a&!3!!*NC*6%8 | ||
4639 | "!!!N4NP-43%!!"j'58a&!3!!*dC*6%8"!!!G4NP-43%!!!T'58a&!3!!)8G599! | ||
4640 | !!!!!!!!!+Jj(990*)%aTBR*KFQPPF`!!!!0'58a&!J!!,dG599!!!!!!!!!!+`0 | ||
4641 | 38%-!!!!$4NP-43)!!$"'58a&!J!!-8C*6%8#!!!b4e*98!!!!!!!!!!X!cBiD`! | ||
4642 | !!!0'58a&"3!!&%C*6%8&!!!94NP-438!!"C(8P93!!!!!!!!!#d138j655"-D@* | ||
4643 | bBA*TCA-!!!!#4e*98!!!!!!!!!!Z!e"33`!!!!*'58a&!3!!!8C*6%8"!!&r4e* | ||
4644 | 98!!!!!!!!!![!cBiD`!!!!*'58a&!`!"S%C*6%8$!!'K4e*98!!!!!!!!!!`$8e | ||
4645 | KBb"-D@*bBA*TCA-!!!!#4e*98!!!!!!!!!!a!e"33`!!!!P'58a&!3!!"%C*6%8 | ||
4646 | "!!!#4NP-43%!!!0'58a&!3!!#8C*6%8"!!!)4NP-43%!!!G'58a&!3!!"NC*6%8 | ||
4647 | "!!!&4NP-43%!!D9(8P93!!!!!!!!!$)$0MKV!!!!"NC*6%8$!!'D4NP-43-!!D* | ||
4648 | '58a&!`!"R%C*6%8$!!'G4NP-43-!!Cp'58a&!`!"Q`!!!!!!!!!!!!!!Y,T3!!! | ||
4649 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4023 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4024 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!)!3!"!!!!!3%"!!!"!3%!!!! | ||
4025 | !!!%"!!!"!3!"!!!""!!!!!!!!!!!!!!)!3!"!3!"!3!!!!%!!!N!!aY-D@*$FRP | ||
4026 | `G'mZ0MKV)%CK+$4TAcKN+5j-D@)!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4027 | !!!!!!!!!!!!r2cmr2cmr2`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4028 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!$mr2cm!!!! | ||
4650 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4029 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4651 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4030 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4031 | !!!!!!!!!!!!!!!!0!!%!!!!!!"9I69G&8NY6AdG98dPIF(*PCQPi,QJ!!!!!!!! | ||
4032 | !!!!!!!!"!!!!!!!!!!!"!!!!!!!!!!!!!!8"!3%!!!%"!!%!!!!!"!!!!!!!!!! | ||
4033 | !!!!!!!!!!!!"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4652 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4034 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4653 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4035 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4654 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4036 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4655 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4037 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4656 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4038 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4039 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"IAh0 | ||
4040 | dBA*d!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4657 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4041 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4042 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%!!3!!#8ePFQGP)%peG!! | ||
4658 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4043 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4044 | !!!!!!$mr2cp"8&"-!!%"!!!%)#!J)!1ARe!$GYpi!`@Z%!!&!J%!!3%!!3%"!!! | ||
4045 | "!!!!!!!!!!%"!3%!!3%!!3!""!!!!!!!!!!!!!!(!3%!!3!!!3!!!!!!!!!!!!! | ||
4659 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4046 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4660 | !!!!!!!!!!!!!!!!!!!!#"J%#!!!c"`%#!!!d!!!!!J3""3!!)!J""3!!(`!!!HF | 4047 | !!!!!!!"IAh0dBA*d!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4661 | !!!)!!!!6e`!!&!!!!!(R!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!$*!!!!i!!!&0i | 4048 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4662 | !!"J!!!!!b3!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!#!!!!H!"!!!"!!!!!!!!!!! | 4049 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!#!!!!!!!!!! |
4663 | !"!!"!!!"k,6I$a6rrqXL!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4050 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4051 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4052 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4053 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4054 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4055 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!8!!!G2F'9Z8e0-!!!!!!! | ||
4056 | !!!!!!!!!!!!!!!!!!!!!!!!!2cmr2d&38%`!!!3!!!!%!!!!!%!!!&M!!!!!!!! | ||
4057 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4058 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%r2cm | ||
4059 | r!!!!!!!!!!)!!!!#!!)!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4060 | !!!!!!!!#!&!!!3!"!!%!!3!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4061 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4062 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4063 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4064 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4065 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!8*d024%8R)#G%394"*b! | ||
4066 | R8%P$9#F!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4067 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4068 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4069 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4070 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4071 | !#!!!!3!!!#d#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!!)!!!! | ||
4072 | Z!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!!$!!!!,`)"!!!!!!! | ||
4073 | "!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!"!!!!$!#!3!!!!!!!3!"!3!!!!! | ||
4074 | !!!!!!!!!!!%!!!!!!!!!!!J!!!8!!!!a!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!! | ||
4075 | "!!!!!!!!!!!)!!!'!!!!-J)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!! | ||
4076 | !#!!!"`!!!$-#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!!J!!!! | ||
4077 | d!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!!*!!!!03)"!!!!!!! | ||
4078 | "!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!#J!!!$B#!3!!!!!!!3!"!3!!!!! | ||
4079 | !!!!!!!!!!!%!!!!!!!!!!!J!!!X!!!!h!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!! | ||
4080 | "!!!!!!!!!!!)!!!-!!!!1!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!! | ||
4081 | !#!!!$3!!!$N#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!!i!!!! | ||
4082 | k!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!!2!!!!1`)"!!!!!!! | ||
4083 | "!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!%!!!!$`#!3!!!!!!!3!"!3!!!!! | ||
4084 | !!!!!!!!!!!%!!!!!!!!!!!J!!"%!!!!p!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!! | ||
4085 | "!!!!!!!!!!!)!!!5!!!!2J)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!! | ||
4086 | !#!!!%`!!!$m#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!"3!!!" | ||
4087 | !!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!!9!!!!33)"!!!!!!! | ||
4088 | "!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!&J!!!%)#!3!!!!!!!3!"!3!!!!! | ||
4089 | !!!!!!!!!!!%!!!!!!!!!!!J!!"F!!!"$!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!! | ||
4090 | "!!!!!!!!!!!)!!!B!!!!4!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!! | ||
4091 | !#!!!'3!!!%8#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!"S!!!" | ||
4092 | '!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!!E!!!!4`)"!!!!!!! | ||
4093 | "!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!(!!!!%J#!3!!!!!!!3!"!3!!!!! | ||
4094 | !!!!!!!!!!!%!!!!!!!!!!!J!!"d!!!"*!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!! | ||
4095 | "!!!!!!!!!!!)!!!H!!!!5J)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!! | ||
4096 | !#!!!(`!!!%X#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!#!!!!" | ||
4097 | -!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!!K!!!!63)"!!!!!!! | ||
4098 | "!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!)J!!!%i#!3!!!!!!!3!"!3!!!!! | ||
4099 | !!!!!!!!!!!%!!!!!!!!!!!J!!#-!!!"2!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!! | ||
4100 | "!!!!!!!!!!!)!!!N!!!!8!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!! | ||
4101 | !#!!!*3!!!&%#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!#B!!!" | ||
4102 | 5!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!!R!!!!8`)"!!!!!!! | ||
4103 | "!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!+!!!!&3#!3!!!!!!!3!"!3!!!!! | ||
4104 | !!!!!!!!!!!%!!!!!!!!!!!J!!#N!!!"9!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!! | ||
4105 | "!!!!!!!!!!!)!!!U!!!!9J)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!! | ||
4106 | !#!!!+`!!!&F#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!#`!!!" | ||
4107 | B!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!!Y!!!!@3)"!!!!!!! | ||
4108 | "!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!,J!!!&S#!3!!!!!!!3!"!3!!!!! | ||
4109 | !!!!!!!!!!!%!!!!!!!!!!!J!!#m!!!"E!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!! | ||
4110 | "!!!!!!!!!!!)!!!`!!!!A!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!! | ||
4111 | !#!!!-3!!!&d#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!$)!!!" | ||
4112 | H!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!!c!!!!A`)"!!!!!!! | ||
4113 | "!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!0!!!!'!#!3!!!!!!!3!"!3!!!!! | ||
4114 | !!!!!!!!!!!%!!!!!!!!!!!J!!$8!!!"K!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!! | ||
4115 | "!!!!!!!!!!!)!!!f!!!!BJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!! | ||
4116 | !#!!!0`!!!'-#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!$J!!!" | ||
4117 | N!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!!j!!!!C3)"!!!!!!! | ||
4118 | "!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!1J!!!'B#!3!!!!!!!3!"!3!!!!! | ||
4119 | !!!!!!!!!!!%!!!!!!!!!!!J!!$X!!!"R!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!! | ||
4120 | "!!!!!!!!!!!)!!!m!!!!D!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!! | ||
4121 | !#!!!23!!!'N#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!$i!!!" | ||
4122 | U!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!!r!!!!D`)"!!!!!!! | ||
4123 | "!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!3!!!!'`#!3!!!!!!!3!"!3!!!!! | ||
4124 | !!!!!!!!!!!%!!!!!!!!!!!J!!%%!!!"Y!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!! | ||
4125 | "!!!!!!!!!!!)!!"#!!!!EJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!! | ||
4126 | !#!!!3`!!!'m#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!%3!!!" | ||
4127 | `!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!"&!!!!F3)"!!!!!!! | ||
4128 | "!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!4J!!!()#!3!!!!!!!3!"!3!!!!! | ||
4129 | !!!!!!!!!!!%!!!!!!!!!!!J!!%F!!!"c!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!! | ||
4130 | "!!!!!!!!!!!)!!")!!!!G!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!! | ||
4131 | !#!!!53!!!(8#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!%S!!!" | ||
4132 | f!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!",!!!!G`)"!!!!!!! | ||
4133 | "!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!6!!!!(J#!3!!!!!!!3!"!3!!!!! | ||
4134 | !!!!!!!!!!!%!!!!!!!!!!!J!!%d!!!"j!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!! | ||
4135 | "!!!!!!!!!!!)!!"1!!!!HJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!! | ||
4136 | !#!!!6`!!!(X#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!&!!!!" | ||
4137 | m!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!"4!!!!I3)"!!!!!!! | ||
4138 | "!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!8J!!!(i#!3!!!!!!!3!"!3!!!!! | ||
4139 | !!!!!!!!!!!%!!!!!!!!!!!J!!&-!!!"r!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!! | ||
4140 | "!!!!!!!!!!!)!!"8!!!!J!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!! | ||
4141 | !#!!!93!!!)%#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!&B!!!# | ||
4142 | #!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!"A!!!!J`)"!!!!!!! | ||
4143 | "!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!@!!!!)3#!3!!!!!!!3!"!3!!!!! | ||
4144 | !!!!!!!!!!!%!!!!!!!!!!!J!!&N!!!#&!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!! | ||
4145 | "!!!!!!!!!!!)!!"D!!!!KJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!! | ||
4146 | !#!!!@`!!!)F#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!&`!!!# | ||
4147 | )!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!"G!!!!L3)"!!!!!!! | ||
4148 | "!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!AJ!!!)S#!3!!!!!!!3!"!3!!!!! | ||
4149 | !!!!!!!!!!!%!!!!!!!!!!!J!!&m!!!#,!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!! | ||
4150 | "!!!!!!!!!!!)!!"J!!!!M!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!! | ||
4151 | !#!!!B3!!!)d#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!')!!!# | ||
4152 | 1!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!"M!!!!M`)"!!!!!!! | ||
4153 | "!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!C!!!!*!!!J%!!!!!!!%!!3%!!!! | ||
4154 | !!!!!!!!!!!!"!!!!!!!!!!!)!!"P!!!!N3)"!!!!!!!"!!%"!!!!!!!!!!!!!!! | ||
4155 | !!3!!!!!!!!!!#!!!CJ!!!*)#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!! | ||
4156 | !!!J!!'F!!!#6!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!"S!!! | ||
4157 | !P!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!D3!!!*8#!3!!!!! | ||
4158 | !!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!'S!!!#@!J%!!!!!!!%!!3%!!!! | ||
4159 | !!!!!!!!!!!!"!!!!!!!!!!!)!!"V!!!!P`)"!!!!!!!"!!%"!!!!!!!!!!!!!!! | ||
4160 | !!3!!!!!!!!!!#!!!E!!!!*J#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!! | ||
4161 | !!!J!!'d!!!#C!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!"Z!!! | ||
4162 | !QJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!E`!!!*X#!3!!!!! | ||
4163 | !!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!(!!!!#F!J%!!!!!!!%!!3%!!!! | ||
4164 | !!!!!!!!!!!!"!!!!!!!!!!!)!!"a!!!!R3)"!!!!!!!"!!%"!!!!!!!!!!!!!!! | ||
4165 | !!3!!!!!!!!!!#!!!FJ!!!*i#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!! | ||
4166 | !!!J!!(-!!!#I!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!"d!!! | ||
4167 | !S!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!G3!!!+%#!3!!!!! | ||
4168 | !!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!(B!!!#L!J%!!!!!!!%!!3%!!!! | ||
4169 | !!!!!!!!!!!!"!!!!!!!!!!!)!!"h!!!!S`)"!!!!!!!"!!%"!!!!!!!!!!!!!!! | ||
4170 | !!3!!!!!!!!!!#!!!H!!!!+3#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!! | ||
4171 | !!!J!!(N!!!#P!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!"k!!! | ||
4172 | !TJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!H`!!!+F#!3!!!!! | ||
4173 | !!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!(`!!!#S!J%!!!!!!!%!!3%!!!! | ||
4174 | !!!!!!!!!!!!"!!!!!!!!!!!)!!"p!!!!U3)"!!!!!!!"!!%"!!!!!!!!!!!!!!! | ||
4175 | !!3!!!!!!!!!!#!!!IJ!!!+S#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!! | ||
4176 | !!!J!!(m!!!#V!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!#!!!! | ||
4177 | !V!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!J3!!!+d#!3!!!!! | ||
4178 | !!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!))!!!#Z!J%!!!!!!!%!!3%!!!! | ||
4179 | !!!!!!!!!!!!"!!!!!!!!!!!)!!#$!!!!V`)"!!!!!!!"!!%"!!!!!!!!!!!!!!! | ||
4180 | !!3!!!!!!!!!!#!!!K!!!!,!#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!! | ||
4181 | !!!J!!)8!!!#a!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!#'!!! | ||
4182 | !XJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!K`!!!,-#!3!!!!! | ||
4183 | !!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!)J!!!#d!J%!!!!!!!%!!3%!!!! | ||
4184 | !!!!!!!!!!!!"!!!!!!!!!!!)!!#*!!!!Y3)"!!!!!!!"!!%"!!!!!!!!!!!!!!! | ||
4185 | !!3!!!!!!!!!!#!!!LJ!!!,B#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!! | ||
4186 | !!!J!!)X!!!#h!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!#-!!! | ||
4187 | !Z!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!M3!!!,N#!3!!!!! | ||
4188 | !!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!)i!!!#k!J%!!!!!!!%!!3%!!!! | ||
4189 | !!!!!!!!!!!!"!!!!!!!!!!!)!!#2!!!!Z`)"!!!!!!!"!!%"!!!!!!!!!!!!!!! | ||
4190 | !!3!!!!!!!!!!#!!!N!!!!!#m!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4191 | !!!!)!!#4!!!![3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!NJ! | ||
4192 | !!,i#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!*-!!!#r!J%!!!! | ||
4193 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!#8!!!!`!)"!!!!!!!"!!%"!!! | ||
4194 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!!P3!!!-%#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4195 | !!!%!!!!!!!!!!!J!!*B!!!$#!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4196 | !!!!)!!#A!!!!``)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!Q!! | ||
4197 | !!-3#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!*N!!!$&!J%!!!! | ||
4198 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!#D!!!!aJ)"!!!!!!!"!!%"!!! | ||
4199 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!!Q`!!!-F#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4200 | !!!%!!!!!!!!!!!J!!*`!!!$)!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4201 | !!!!)!!#G!!!!b3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!RJ! | ||
4202 | !!-S#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!*m!!!$,!J%!!!! | ||
4203 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!#J!!!!c!)"!!!!!!!"!!%"!!! | ||
4204 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!!S3!!!-d#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4205 | !!!%!!!!!!!!!!!J!!+)!!!$1!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4206 | !!!!)!!#M!!!!c`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!T!! | ||
4207 | !!0!#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!+8!!!$4!J%!!!! | ||
4208 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!#Q!!!!dJ)"!!!!!!!"!!%"!!! | ||
4209 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!!T`!!!0-#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4210 | !!!%!!!!!!!!!!!J!!+J!!!$8!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4211 | !!!!)!!#T!!!!e3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!UJ! | ||
4212 | !!0B#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!+X!!!$A!J%!!!! | ||
4213 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!#X!!!!f!)"!!!!!!!"!!%"!!! | ||
4214 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!!V3!!!0N#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4215 | !!!%!!!!!!!!!!!J!!+i!!!$D!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4216 | !!!!)!!#[!!!!f`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!X!! | ||
4217 | !!0`#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!,%!!!$G!J%!!!! | ||
4218 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!#b!!!!hJ)"!!!!!!!"!!%"!!! | ||
4219 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!!X`!!!0m#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4220 | !!!%!!!!!!!!!!!J!!,3!!!$J!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4221 | !!!!)!!#e!!!!i3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!YJ! | ||
4222 | !!1)#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!,F!!!$M!J%!!!! | ||
4223 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!#i!!!!j!)"!!!!!!!"!!%"!!! | ||
4224 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!!Z3!!!18#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4225 | !!!%!!!!!!!!!!!J!!,S!!!$Q!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4226 | !!!!)!!#l!!!!j`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!![!! | ||
4227 | !!1J#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!,d!!!$T!J%!!!! | ||
4228 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!#q!!!!kJ)"!!!!!!!"!!%"!!! | ||
4229 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!![`!!!1X#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4230 | !!!%!!!!!!!!!!!J!!-!!!!$X!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4231 | !!!!)!!$"!!!!l3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!`J! | ||
4232 | !!1i#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!--!!!$[!J%!!!! | ||
4233 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!$%!!!!m!)"!!!!!!!"!!%"!!! | ||
4234 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!!a3!!!2%#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4235 | !!!%!!!!!!!!!!!J!!-B!!!$b!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4236 | !!!!)!!$(!!!!m`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!b!! | ||
4237 | !!23#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!-N!!!$e!J%!!!! | ||
4238 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!$+!!!!pJ)"!!!!!!!"!!%"!!! | ||
4239 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!!b`!!!2F#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4240 | !!!%!!!!!!!!!!!J!!-`!!!$i!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4241 | !!!!)!!$0!!!!q3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!cJ! | ||
4242 | !!2S#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!-m!!!$l!J%!!!! | ||
4243 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!$3!!!!r!)"!!!!!!!"!!%"!!! | ||
4244 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!!d3!!!2d#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4245 | !!!%!!!!!!!!!!!J!!0)!!!$q!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4246 | !!!!)!!$6!!!!r`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!e!! | ||
4247 | !!3!#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!08!!!%"!J%!!!! | ||
4248 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!$@!!!"!J)"!!!!!!!"!!%"!!! | ||
4249 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!!e`!!!3-#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4250 | !!!%!!!!!!!!!!!J!!0J!!!%%!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4251 | !!!!)!!$C!!!""3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!fJ! | ||
4252 | !!3B#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!0X!!!%(!J%!!!! | ||
4253 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!$F!!!"#!)"!!!!!!!"!!%"!!! | ||
4254 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!!h3!!!3N#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4255 | !!!%!!!!!!!!!!!J!!0i!!!%+!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4256 | !!!!)!!$I!!!"#`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!i!! | ||
4257 | !!3`#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!1%!!!%0!J%!!!! | ||
4258 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!$L!!!"$J)"!!!!!!!"!!%"!!! | ||
4259 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!!i`!!!3m#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4260 | !!!%!!!!!!!!!!!J!!13!!!%3!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4261 | !!!!)!!$P!!!"%3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!jJ! | ||
4262 | !!4)#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!1F!!!%6!J%!!!! | ||
4263 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!$S!!!"&!)"!!!!!!!"!!%"!!! | ||
4264 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!!k3!!!48#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4265 | !!!%!!!!!!!!!!!J!!1S!!!%@!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4266 | !!!!)!!$V!!!"&`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!l!! | ||
4267 | !!4J#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!1d!!!%C!J%!!!! | ||
4268 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!$Z!!!"'J)"!!!!!!!"!!%"!!! | ||
4269 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!!l`!!!4X#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4270 | !!!%!!!!!!!!!!!J!!2!!!!%F!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4271 | !!!!)!!$a!!!"(3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!mJ! | ||
4272 | !!4i#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!2-!!!%I!J%!!!! | ||
4273 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!$d!!!")!)"!!!!!!!"!!%"!!! | ||
4274 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!!p3!!!5%#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4275 | !!!%!!!!!!!!!!!J!!2B!!!%L!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4276 | !!!!)!!$h!!!")`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!q!! | ||
4277 | !!53#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!2N!!!%P!J%!!!! | ||
4278 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!$k!!!"*J)"!!!!!!!"!!%"!!! | ||
4279 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!!q`!!!5F#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4280 | !!!%!!!!!!!!!!!J!!2`!!!%S!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4281 | !!!!)!!$p!!!"+3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!!rJ! | ||
4282 | !!5S#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!2m!!!%V!J%!!!! | ||
4283 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!%!!!!",!)"!!!!!!!"!!%"!!! | ||
4284 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!"!3!!!5d#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4285 | !!!%!!!!!!!!!!!J!!3)!!!%Z!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4286 | !!!!)!!%$!!!",`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!""!! | ||
4287 | !!6!#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!38!!!%a!J%!!!! | ||
4288 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!%'!!!"-J)"!!!!!!!"!!%"!!! | ||
4289 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!""`!!!6-#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4290 | !!!%!!!!!!!!!!!J!!3J!!!%d!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4291 | !!!!)!!%*!!!"03)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!"#J! | ||
4292 | !!6B#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!3X!!!%h!J%!!!! | ||
4293 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!%-!!!"1!)"!!!!!!!"!!%"!!! | ||
4294 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!"$3!!!6N#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4295 | !!!%!!!!!!!!!!!J!!3i!!!%k!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4296 | !!!!)!!%2!!!"1`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!"%!! | ||
4297 | !!6`#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!4%!!!%p!J%!!!! | ||
4298 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!%5!!!"2J)"!!!!!!!"!!%"!!! | ||
4299 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!"%`!!!6m#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4300 | !!!%!!!!!!!!!!!J!!43!!!&!!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4301 | !!!!)!!%9!!!"33)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!"&J! | ||
4302 | !!8)#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!4F!!!&$!J%!!!! | ||
4303 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!%B!!!"4!)"!!!!!!!"!!%"!!! | ||
4304 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!"'3!!!88#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4305 | !!!%!!!!!!!!!!!J!!4S!!!&'!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4306 | !!!!)!!%E!!!"4`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!"(!! | ||
4307 | !!8J#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!4d!!!&*!J%!!!! | ||
4308 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!%H!!!"5J)"!!!!!!!"!!%"!!! | ||
4309 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!"(`!!!8X#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4310 | !!!%!!!!!!!!!!!J!!5!!!!&-!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4311 | !!!!)!!%K!!!"63)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!")J! | ||
4312 | !!8i#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!5-!!!&2!J%!!!! | ||
4313 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!%N!!!"8!)"!!!!!!!"!!%"!!! | ||
4314 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!"*3!!!9%#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4315 | !!!%!!!!!!!!!!!J!!5B!!!&5!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4316 | !!!!)!!%R!!!"8`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!"+!! | ||
4317 | !!93#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!5N!!!&9!J%!!!! | ||
4318 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!%U!!!"9J)"!!!!!!!"!!%"!!! | ||
4319 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!"+`!!!9F#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4320 | !!!%!!!!!!!!!!!J!!5`!!!&B!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4321 | !!!!)!!%Y!!!"@3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!",J! | ||
4322 | !!9S#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!5m!!!&E!J%!!!! | ||
4323 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!%`!!!"A!)"!!!!!!!"!!%"!!! | ||
4324 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!"-3!!!9d#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4325 | !!!%!!!!!!!!!!!J!!6)!!!&H!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4326 | !!!!)!!%c!!!"A`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!"0!! | ||
4327 | !!@!#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!68!!!&K!J%!!!! | ||
4328 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!%f!!!"BJ)"!!!!!!!"!!%"!!! | ||
4329 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!"0`!!!@-#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4330 | !!!%!!!!!!!!!!!J!!6J!!!&N!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4331 | !!!!)!!%j!!!"C3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!"1J! | ||
4332 | !!@B#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!6X!!!&R!J%!!!! | ||
4333 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!%m!!!"D!)"!!!!!!!"!!%"!!! | ||
4334 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!"23!!!@N#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4335 | !!!%!!!!!!!!!!!J!!6i!!!&U!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4336 | !!!!)!!%r!!!"D`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!"3!! | ||
4337 | !!@`#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!8%!!!&Y!J%!!!! | ||
4338 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!&#!!!"EJ)"!!!!!!!"!!%"!!! | ||
4339 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!"3`!!!@m#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4340 | !!!%!!!!!!!!!!!J!!83!!!&`!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4341 | !!!!)!!&&!!!"F3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!"4J! | ||
4342 | !!A)#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!8F!!!&c!J%!!!! | ||
4343 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!&)!!!"G!)"!!!!!!!"!!%"!!! | ||
4344 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!"53!!!A8#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4345 | !!!%!!!!!!!!!!!J!!8S!!!&f!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4346 | !!!!)!!&,!!!"G`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!"6!! | ||
4347 | !!AJ#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!8d!!!&j!J%!!!! | ||
4348 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!&1!!!"HJ)"!!!!!!!"!!%"!!! | ||
4349 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!"6`!!!AX#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4350 | !!!%!!!!!!!!!!!J!!9!!!!&m!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4351 | !!!!)!!&4!!!"I3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!"8J! | ||
4352 | !!Ai#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!9-!!!'!!J%!!!! | ||
4353 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!&8!!!"J3)"!!!!!!!"!!%"!!! | ||
4354 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!"93!!!B)#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4355 | !!!%!!!!!!!!!!!J!!9B!!!'$!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4356 | !!!!)!!&A!!!"K!)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!"@!! | ||
4357 | !!B8#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!9N!!!''!J%!!!! | ||
4358 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!&D!!!"K`)"!!!!!!!"!!%"!!! | ||
4359 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!"@`!!!BJ#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4360 | !!!%!!!!!!!!!!!J!!9`!!!'*!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4361 | !!!!)!!&G!!!"LJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!"AJ! | ||
4362 | !!BX#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!9m!!!'-!J%!!!! | ||
4363 | !!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!&J!!!"M3)"!!!!!!!"!!%"!!! | ||
4364 | !!!!!!!!!!!!!!3!!!!!!!!!!#!!"B3!!!Bi#!3!!!!!!!3!"!3!!!!!!!!!!!!! | ||
4365 | !!!%!!!!!!!!!!!J!!@)!!!'2!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!! | ||
4366 | !!!!)!!&M!!!"N!!#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!@3 | ||
4367 | !!!'4!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!&P!!!"NJ)"!!! | ||
4368 | !!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!"CJ!!!C-#!3!!!!!!!3!"!3! | ||
4369 | !!!!!!!!!!!!!!!%!!!!!!!!!!!J!!@F!!!'8!J%!!!!!!!%!!3%!!!!!!!!!!!! | ||
4370 | !!!!"!!!!!!!!!!!)!!&S!!!"P3)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!! | ||
4371 | !!!!!#!!"D3!!!CB#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!@S | ||
4372 | !!!'A!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!&V!!!"Q!)"!!! | ||
4373 | !!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!"E!!!!CN#!3!!!!!!!3!"!3! | ||
4374 | !!!!!!!!!!!!!!!%!!!!!!!!!!!J!!@d!!!'D!J%!!!!!!!%!!3%!!!!!!!!!!!! | ||
4375 | !!!!"!!!!!!!!!!!)!!&Z!!!"Q`)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!! | ||
4376 | !!!!!#!!"E`!!!C`#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!J!!A! | ||
4377 | !!!'G!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!)!!&a!!!"RJ)"!!! | ||
4378 | !!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!!!!!!!#!!"FJ!!!Cm#!3!!!!!!!3!"!3! | ||
4379 | !!!!!!!!!!!!!!!%!!!!!!!!!!!J!!A-!!!'N!J%!!!!!!!%!!3%!!!!!!!!!!!! | ||
4380 | !!!!"!!!!!!!!!!!)!!&d!!!"TJ)"!!!!!!!"!!%"!!!!!!!!!!!!!!!!!3!!!!! | ||
4381 | !!!!!#!!"G3!!!DF#!3!!!!!!!3!"!3!!!!!!!!!!!!!!!!%!!!!!!!!!!!!!!!! | ||
4382 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4383 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4384 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4385 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4386 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4387 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4388 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4389 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4390 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4391 | !!!!!!!!!!!!!!!%!!!!#!!!!!`!!!!3!!!!&!!!!"J!!!!F!!!!)!!!!#3!!!!S | ||
4392 | !!!!,!!!!$!!!!!d!!!!1!!!!$`!!!"!!!!!4!!!!%J!!!"-!!!!8!!!!&3!!!"B | ||
4393 | !!!!A!!!!'!!!!"N!!!!D!!!!'`!!!"`!!!!G!!!!(J!!!"m!!!!J!!!!)3!!!#) | ||
4394 | !!!!M!!!!*!!!!#8!!!!Q!!!!*`!!!#J!!!!T!!!!+J!!!#X!!!!X!!!!,3!!!#i | ||
4395 | !!!![!!!!-!!!!$%!!!!b!!!!-`!!!$3!!!!e!!!!0J!!!$F!!!!i!!!!13!!!$S | ||
4396 | !!!!l!!!!2!!!!$d!!!!q!!!!2`!!!%!!!!""!!!!3J!!!%-!!!"%!!!!43!!!%B | ||
4397 | !!!"(!!!!5!!!!%N!!!"+!!!!5`!!!%`!!!"0!!!!6J!!!%m!!!"3!!!!83!!!&) | ||
4398 | !!!"6!!!!9!!!!&8!!!"@!!!!9`!!!&J!!!"C!!!!@J!!!&X!!!"F!!!!A3!!!&i | ||
4399 | !!!"I!!!!B!!!!'%!!!"L!!!!B`!!!'3!!!"P!!!!CJ!!!'F!!!"S!!!!D3!!!'S | ||
4400 | !!!"V!!!!E!!!!'d!!!"Z!!!!E`!!!(!!!!"a!!!!FJ!!!(-!!!"d!!!!G3!!!(B | ||
4401 | !!!"h!!!!H!!!!(N!!!"k!!!!H`!!!(`!!!"p!!!!IJ!!!(m!!!#!!!!!J3!!!)) | ||
4402 | !!!#$!!!!K!!!!)8!!!#'!!!!K`!!!)J!!!#*!!!!LJ!!!)X!!!#-!!!!M3!!!)i | ||
4403 | !!!#2!!!!N!!!!!#4!!!!NJ!!!*-!!!#8!!!!P3!!!*B!!!#A!!!!Q!!!!*N!!!# | ||
4404 | D!!!!Q`!!!*`!!!#G!!!!RJ!!!*m!!!#J!!!!S3!!!+)!!!#M!!!!T!!!!+8!!!# | ||
4405 | Q!!!!T`!!!+J!!!#T!!!!UJ!!!+X!!!#X!!!!V3!!!+i!!!#[!!!!X!!!!,%!!!# | ||
4406 | b!!!!X`!!!,3!!!#e!!!!YJ!!!,F!!!#i!!!!Z3!!!,S!!!#l!!!![!!!!,d!!!# | ||
4407 | q!!!![`!!!-!!!!$"!!!!`J!!!--!!!$%!!!!a3!!!-B!!!$(!!!!b!!!!-N!!!$ | ||
4408 | +!!!!b`!!!-`!!!$0!!!!cJ!!!-m!!!$3!!!!d3!!!0)!!!$6!!!!e!!!!08!!!$ | ||
4409 | @!!!!e`!!!0J!!!$C!!!!fJ!!!0X!!!$F!!!!h3!!!0i!!!$I!!!!i!!!!1%!!!$ | ||
4410 | L!!!!i`!!!13!!!$P!!!!jJ!!!1F!!!$S!!!!k3!!!1S!!!$V!!!!l!!!!1d!!!$ | ||
4411 | Z!!!!l`!!!2!!!!$a!!!!mJ!!!2-!!!$d!!!!p3!!!2B!!!$h!!!!q!!!!2N!!!$ | ||
4412 | k!!!!q`!!!2`!!!$p!!!!rJ!!!2m!!!%!!!!"!3!!!3)!!!%$!!!""!!!!38!!!% | ||
4413 | '!!!""`!!!3J!!!%*!!!"#J!!!3X!!!%-!!!"$3!!!3i!!!%2!!!"%!!!!4%!!!% | ||
4414 | 5!!!"%`!!!43!!!%9!!!"&J!!!4F!!!%B!!!"'3!!!4S!!!%E!!!"(!!!!4d!!!% | ||
4415 | H!!!"(`!!!5!!!!%K!!!")J!!!5-!!!%N!!!"*3!!!5B!!!%R!!!"+!!!!5N!!!% | ||
4416 | U!!!"+`!!!5`!!!%Y!!!",J!!!5m!!!%`!!!"-3!!!6)!!!%c!!!"0!!!!68!!!% | ||
4417 | f!!!"0`!!!6J!!!%j!!!"1J!!!6X!!!%m!!!"23!!!6i!!!%r!!!"3!!!!8%!!!& | ||
4418 | #!!!"3`!!!83!!!&&!!!"4J!!!8F!!!&)!!!"53!!!8S!!!&,!!!"6!!!!8d!!!& | ||
4419 | 1!!!"6`!!!9!!!!&4!!!"8J!!!9-!!!&8!!!"93!!!9B!!!&A!!!"@!!!!9N!!!& | ||
4420 | D!!!"@`!!!9`!!!&G!!!"AJ!!!9m!!!&J!!!"B3!!!@)!!!&M!!!"C!!!!@8!!!& | ||
4421 | Q!!!"C`!!!@J!!!&T!!!"DJ!!!@X!!!&X!!!"E3!!!@i!!!&[!!!"F!!!!A%!!!& | ||
4422 | b!!!"F`!!!A3!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4423 | !!!!!!!!!!A8!!!'!#!!!!!J!!A8!!!(E!!%!(!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4424 | !!!!!!!J!!!%)!!!##!!!!`J!!!3)!!!&#!!!"JJ!!!F)!!!)#!!!#3J!!!S)!!! | ||
4425 | ,#!!!$!J!!!d)!!!1#!!!$`J!!"!)!!!4#!!!%JJ!!"-)!!!8#!!!&3J!!"B)!!! | ||
4426 | A#!!!'!J!!"N)!!!D#!!!'`J!!"`)!!!G#!!!(JJ!!"m)!!!J#!!!)3J!!#))!!! | ||
4427 | M#!!!*!J!!#8)!!!Q#!!!*`J!!#J)!!!T#!!!+JJ!!#X)!!!X#!!!,3J!!#i)!!! | ||
4428 | [#!!!-!J!!$%)!!!b#!!!-`J!!$3)!!!e#!!!0JJ!!$F)!!!i#!!!13J!!$S)!!! | ||
4429 | l#!!!2!J!!$d)!!!q#!!!2`J!!%!)!!""#!!!3JJ!!%-)!!"%#!!!43J!!%B)!!" | ||
4430 | (#!!!5!J!!%N)!!"+#!!!5`J!!%`)!!"0#!!!6JJ!!%m)!!"3#!!!83J!!&))!!" | ||
4431 | 6#!!!9!J!!&8)!!"@#!!!9`J!!&J)!!"C#!!!@JJ!!&X)!!"F#!!!A3J!!&i)!!" | ||
4432 | I#!!!B!J!!'%)!!"L#!!"G!J!!'-)!!"N#!!!C3J!!'B)!!"R#!!!D!J!!'N)!!" | ||
4433 | U#!!!D`J!!'`)!!"Y#!!!EJJ!!'m)!!"`#!!!F3J!!())!!"c#!!!G!J!!(8)!!" | ||
4434 | f#!!!G`J!!(J)!!"j#!!!HJJ!!(X)!!"m#!!!I3J!!(i)!!"r#!!!J!J!!)%)!!# | ||
4435 | ##!!!J`J!!)3)!!#&#!!!KJJ!!)F)!!#)#!!!L3J!!)S)!!#,#!!!M!J!!)d)!!# | ||
4436 | 1#!!!M`J!!*!!#!!!N3J!!*))!!#6#!!!P!J!!*8)!!#@#!!!P`J!!*J)!!#C#!! | ||
4437 | !QJJ!!*X)!!#F#!!!R3J!!*i)!!#I#!!!S!J!!+%)!!#L#!!!S`J!!+3)!!#P#!! | ||
4438 | !TJJ!!+F)!!#S#!!!U3J!!+S)!!#V#!!!V!J!!+d)!!#Z#!!!V`J!!,!)!!#a#!! | ||
4439 | !XJJ!!,-)!!#d#!!!Y3J!!,B)!!#h#!!!Z!J!!,N)!!#k#!!!Z`J!!,`)!!#p#!! | ||
4440 | ![JJ!!,m)!!$!#!!!`3J!!-))!!$$#!!!a!J!!-8)!!$'#!!!a`J!!-J)!!$*#!! | ||
4441 | !bJJ!!-X)!!$-#!!!c3J!!-i)!!$2#!!!d!J!!0%)!!$5#!!!d`J!!03)!!$9#!! | ||
4442 | !eJJ!!0F)!!$B#!!!f3J!!0S)!!$E#!!!h!J!!0d)!!$H#!!!h`J!!1!)!!$K#!! | ||
4443 | !iJJ!!1-)!!$N#!!!j3J!!1B)!!$R#!!!k!J!!1N)!!$U#!!!k`J!!1`)!!$Y#!! | ||
4444 | !lJJ!!1m)!!$`#!!!m3J!!2))!!$c#!!!p!J!!28)!!$f#!!!p`J!!2J)!!$j#!! | ||
4445 | !qJJ!!2X)!!$m#!!!r3J!!2i)!!$r#!!"!!J!!3%)!!%##!!"!`J!!33)!!%&#!! | ||
4446 | ""JJ!!3F)!!%)#!!"#3J!!3S)!!&e#!!"#`J!!3`)!!%0#!!"$JJ!!3m)!!%3#!! | ||
4447 | "%3J!!4))!!%6#!!"&!J!!48)!!%@#!!"&`J!!4J)!!%C#!!"'JJ!!4X)!!%F#!! | ||
4448 | "(3J!!4i)!!%I#!!")!J!!5%)!!%L#!!")`J!!53)!!%P#!!"*JJ!!5F)!!%S#!! | ||
4449 | "+3J!!5S)!!%V#!!",!J!!5d)!!%Z#!!",`J!!6!)!!%a#!!"-JJ!!6-)!!%d#!! | ||
4450 | "03J!!6B)!!%h#!!"1!J!!6N)!!%k#!!"1`J!!6`)!!%p#!!"2JJ!!6m)!!&!#!! | ||
4451 | "33J!!8))!!&$#!!"4!J!!88)!!&'#!!"4`J!!8J)!!&*#!!"5JJ!!8X)!!&-#!! | ||
4452 | "63J!!8i)!!&2#!!"8!J!!9%)!!&5#!!"8`J!!93)!!&9#!!"9JJ!!9F)!!&B#!! | ||
4453 | "@3J!!9S)!!&E#!!"A!J!!9d)!!&H#!!"A`J!!@!)!!&K#!!"BJJ!!@-)!!&N#!! | ||
4454 | "C3J!!@B)!!&R#!!"D!J!!@N)!!&U#!!"D`J!!@`)!!&Y#!!"EJJ!!@m)!!&`#!! | ||
4455 | "F3J!!A))!!&c!!!!#!!!!H%"!!!"!!!!!!!!!!!!"!!"!!!"kE6H0L[rrmA@!!! | ||
4664 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4456 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4665 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4457 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4666 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4458 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -4670,9 +4462,9 @@ KBb"-D@*bBA*TCA-!!!!#4e*98!!!!!!!!!!a!e"33`!!!!P'58a&!3!!"%C*6%8 | |||
4670 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4462 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4671 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4463 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4672 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4464 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4673 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"i3)!!!% | ||
4674 | !!!!!!!!!!!!%!!%!!!(dY0m2*3!!DlF!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4675 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4465 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4466 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"iJ)!!!%!!!!!!!!!!!!%!!%!!!(eY0i | ||
4467 | f,!!!IZ)!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4676 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4468 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4677 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4469 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4678 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4470 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -4682,7 +4474,8 @@ KBb"-D@*bBA*TCA-!!!!#4e*98!!!!!!!!!!a!e"33`!!!!P'58a&!3!!"%C*6%8 | |||
4682 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4474 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4683 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4475 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4684 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4476 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4685 | !!!(L!`!!!3!!!!!!!!!!!!3!!3!!!I@dh`m8!!!`R3!!!!!!!!!!!!!!!!!!!!! | 4477 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!(M!`!!!3!!!!!!!!!!!!3 |
4478 | !!3!!!IDdhMBX!!!f%!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4686 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4479 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4687 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4480 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4688 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4481 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -4692,8 +4485,9 @@ KBb"-D@*bBA*TCA-!!!!#4e*98!!!!!!!!!!a!e"33`!!!!P'58a&!3!!"%C*6%8 | |||
4692 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4485 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4693 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4486 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4694 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4487 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4488 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!H3%!!!"!!! | ||
4489 | !!!!!!!!!"!!"!!!"r,6H0L`!!&C*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4695 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4490 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4696 | !!!!!!!!!!!!!!H-%!!!"!!!!!!!!!!!!"!!"!!!"ql6I$a6rrjeI!!!!!!!!!!! | ||
4697 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4491 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4698 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4492 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4699 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4493 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -4703,8 +4497,8 @@ KBb"-D@*bBA*TCA-!!!!#4e*98!!!!!!!!!!a!e"33`!!!!P'58a&!3!!"%C*6%8 | |||
4703 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4497 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4704 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4498 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4705 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4499 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4500 | "j38!!!%!!!!!!!!!!!!%!!%!!!(pY0if,2rrp2N!!!!!!!!!!!!!!!!!!!!!!!! | ||
4706 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4501 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4707 | !!!!!!!!!!!!!!!!!!!!!!!!"j!8!!!%!!!!!!!!!!!!%!!%!!!(mY0m2*IrrcT! | ||
4708 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4502 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4709 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4503 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4710 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4504 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -4714,9 +4508,8 @@ KBb"-D@*bBA*TCA-!!!!#4e*98!!!!!!!!!!a!e"33`!!!!P'58a&!3!!"%C*6%8 | |||
4714 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4508 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4715 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4509 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4716 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4510 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4511 | !!!!!!!!!!!(Q"J!!!3!!!!!!!!!!!!3!!3!!!G'dhMBX!!!Si3!!!!!!!!!!!!! | ||
4717 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4512 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4718 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"j3B!!!%!!!!!!!!!!!!%!!%!!!( | ||
4719 | pY0m2&2rrVV8!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4720 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4513 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4721 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4514 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4722 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4515 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -4726,8 +4519,7 @@ pY0m2&2rrVV8!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
4726 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4519 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4727 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4520 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4728 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4521 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4729 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!(Q"`!!!3!!!!!!!!! | 4522 | !!!!!!!!!!!!!!!!!!!!!!HF(!!!"!!!!!!!!!!!!"!!"!!!"dV6H0L`!!!ca!!! |
4730 | !!!3!!3!!!Ikdh`m8rrrqpJ!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4731 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4523 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4732 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4524 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4733 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4525 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -4737,9 +4529,9 @@ pY0m2&2rrVV8!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
4737 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4529 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4738 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4530 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4739 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4531 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4740 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!HF)!!! | ||
4741 | "!!!!!!!!!!!!"!!"!!!"rl6I$a6rrmj#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4742 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4532 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4533 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"k!J!!!%!!!!!!!!!!!!%!!%!!!(IY0i | ||
4534 | f,2rr[fi!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4743 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4535 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4744 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4536 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4745 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4537 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -4749,132 +4541,400 @@ pY0m2&2rrVV8!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
4749 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4541 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4750 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4542 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4751 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4543 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4752 | !!!!"+!!!'!"YFh4b!!!!!!!!!!!!!!!!!!!C+!!!#S"YFh4X!!!!!!!!!!!!!!! | 4544 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!)!!!!!H%!!!!"i`!!!!( |
4753 | !!!!MU!!!!i"YFh4Z!!!!!!!!!!!!!!!!!!!R+!!!'!"YFh4b!!!$k!!!!!!!!!! | 4545 | L!!!!!H8!!!!"jJ!!!!(N!!!!!HF!!!!"k!!"!!!!!&*26e3!!!!!!!!!!!!!!!! |
4754 | !!!!r+!!!'B"YFh4X!!!$k!!!!!!!!!!!!!%0dJ!!#)"YFh4Z!!!$k!!!!!!!!!! | 4546 | '4e*98!!!!!!!!!!!$P*[H5Gc)%GPG%K89&"6!!!!"8C*6%8"!!'L4NP-43%!!D0 |
4755 | !!!"E+!!!"4"`FQ9Q!!jqcJ!!!!%!!!!!!!"J1!!!!!K`FQ9Q!!i,hJ!!!!)!!!! | 4547 | '58a&!3!"U%C*6%8"!!'K4NP-43%!!D"(8P93!!!!!!!!!!!66h"PEP066#""F(" |
4756 | !!!"J3!!!!"T`FQ9Q!!i*C!!!!!-!!!!!!!"J@J!!$+"`FQ9Q!!j"B3!!!!3!!!! | 4548 | XD@0KG'P[EJ!!!#0'58a&!J!!(%C*6%8#!!!U4NP-43)!!!e'58a&!J!!)%C*6%8 |
4757 | !!!"XqJ!!"K4`FQ9Q!!kHI3!!!!8!!!!!!!"c$J!!#*C`FQ9Q!!j,f`!!!!B!!!! | 4549 | #!!!54NP-43)!!"0'58a&!J!!&NC*6%8#!!!B4NP-43)!!"G'58a&!J!!$NC*6%8 |
4758 | !!!"lT!!!!3G`FQ9Q!!ihQJ!!!!F!!!!!!!"mU`!!!b"`FQ9Q!!iT1`!!!!J!!!! | 4550 | #!!!H4NP-43)!!"&'58a&!J!!%%C*6%8#!!!K4NP-43)!!"4'58a&!J!!&8C*6%8 |
4759 | !!!"rb`!!!"4`FQ9Q!!jZi!!!!!N!!!!!!!"rh`!!!!T`FQ9Q!!jf-!!!!!S!!!! | 4551 | #!!!X4NP-43)!!"T'58a&!J!!'8C*6%8#!!!S4NP-43)!!#G'58a&!J!!*%C*6%8 |
4760 | !!!"rk3!!!!a`FQ9Q!!k$&3!!!!X!!!!!!!"rp3!!!!j`FQ9Q!!l6V!!!!!`!!!! | 4552 | #!!!Y4NP-43)!!!Y'58a&!J!!*NC*6%8#!!!T4NP-43)!!!a'58a&!J!!+dC*6%8 |
4761 | !!!#!!`!!!3C`FQ9Q!!l9e3!!!!d!!!!!!!#"#3!!!$j`FQ9Q!!k(*3!!!!i!!!! | 4553 | #!!!L4NP-43)!!!p'58a&!J!!'dC*6%8#!!!G4NP-43)!!"p'58a&!J!!*8C*6%8 |
4762 | !!!#"4`!!!!j`FQ9Q!!j"33!!!!m!!!!!!!#"93!!!GT`FQ9Q!!jMQ`!!!"!!!!! | 4554 | #!!!M4e*98!!!!!!!!!!!%8p`C@j68d`J6'PLFQ&bD@9c!!!!"%G599!!!!!!!!! |
4763 | !!!#$,`!!!'*`FQ9Q!!iIT3!!!"%!!!!!!!#$N3!!!"4`FQ9Q!!i)0`!!!")!!!! | 4555 | !!!038%-!!!!#4NP-43)!!$0'58a&!J!!0%G599!!!!!!!!!!!!-f1'X!!!!#4NP |
4764 | !!!#$T3!!!!T`FQ9Q!!k[Z3!!!"-!!!!!!!#$V`!!!!a`FQ9Q!!kCE!!!!"3!!!! | 4556 | -438!!#"'58a&"3!!(dG599!!!!!!!!!!!!CMFRP`G'm!!!!S4NP-43%!!Aa'58a |
4765 | !!!#$Z`!!!-T`FQ9Q!!jHY`!!!"8!!!!!!!#%K3!!!4K`FQ9Q!!kSh!!!!"B!!!! | 4557 | &!3!"INC*6%8"!!'N4NP-43%!!Cp'58a&!3!"I8C*6%8"!!&l4e*98!!!!!!!!!! |
4766 | !!!#&R3!!!+K`FQ9Q!!j(T3!!!"F!!!!!!!#'43!!!#j`FQ9Q!!i#aJ!!!"J!!!! | 4558 | !"'&cEM%!!!"A4NP-43%!!$j'58a&!3!!-8C*6%8"!!"&4NP-43%!!$P'58a&!3! |
4767 | !!!#'F`!!!Ja`FQ9Q!!lpS`!!!"N!!!!!!!#)I`!!4J"YG("X!!!!!3!!!!!!!!! | 4559 | !3dC*6%8"!!!m4NP-43%!!$p'58a&!3!!3%C*6%8"!!"%4NP-43%!!%&'58a&!3! |
4768 | !!!$1I`!!"`"YG("c!!!!!3!!!!!!!!!!!!$9I`!!!""YG("T!!!!!3!!!!!!!!! | 4560 | !0dC*6%8"!!!e4NP-43%!!$Y'58a&!3!!-NC*6%8"!!!i4NP-43%!!%K'58a&!3! |
4769 | !!!$9M`!!"TaYG'a[!!!!!3!!!!!!!!!!!!$F+`!!!#"YG(0X!!!!!3!!!!!!!!! | 4561 | !4NC*6%8"!!"#4NP-43%!!$C'58a&!3!!4dC*6%8"!!')4NP-43%!!("'58a&!3! |
4770 | !!!$F5`!!"4"`FQ9Q!!klZ`!!!"S!!!!!!!$K@`!!!!K`FQ9Q!!lq$`!!!"X!!!! | 4562 | !I%C*6%8"!!"i4NP-43%!!(T'58a&!3!!H8C*6%8"!!"a4NP-43%!!(C'58a&!3! |
4771 | !!!$KB`!!!"T`FQ9Q!!lTR!!!!"`!!!!!!!$KI3!!%0"`FQ9Q!!jkK!!!!"d!!!! | 4563 | !FNC*6%8"!!"p4NP-43%!!B&'58a&!3!!FdC*6%8"!!"e4NP-43%!!(Y'58a&!3! |
4772 | !!!$b63!!"K4`FQ9Q!!lQ%3!!!"i!!!!!!!$iB3!!#*C`FQ9Q!!l4QJ!!!"m!!!! | 4564 | !A8C*6%8"!!"04NP-43%!!&P'58a&!3!!6NC*6%8"!!"D4NP-43%!!%p'58a&!3! |
4773 | !!!%!p`!!!3G`FQ9Q!!l9lJ!!!#!!!!!!!!%"rJ!!!b"`FQ9Q!!i2K!!!!#%!!!! | 4565 | !@dC*6%8"!!"34NP-43%!!&a'58a&!3!!5dC*6%8"!!"A4NP-43%!!%a'58a&!3! |
4774 | !!!%&(J!!!"4`FQ9Q!!kki3!!!#)!!!!!!!%&-J!!!!T`FQ9Q!!lUEJ!!!#-!!!! | 4566 | !@%C*6%8"!!"Z4NP-43%!!'p'58a&!3!"LNC*6%8"!!"X4NP-43%!!'e'58a&!3! |
4775 | !!!%&2!!!!!a`FQ9Q!!l+`J!!!#3!!!!!!!%&5!!!!!j`FQ9Q!!j@3J!!!#8!!!! | 4567 | "L8C*6%8"!!',4NP-43%!!'9'58a&!3!!D8C*6%8"!!"S4NP-43%!!'G'58a&!3! |
4776 | !!!%&9J!!!3C`FQ9Q!!kR#`!!!#B!!!!!!!%'A!!!!$j`FQ9Q!!i993!!!#F!!!! | 4568 | !BdC*6%8"!!"N4NP-43%!!'&'58a&!3!!DNC*6%8"!!"L4NP-43%!!'C'58a&!3! |
4777 | !!!%'QJ!!!!j`FQ9Q!!km6J!!!#J!!!!!!!%'U!!!!GT`FQ9Q!!kq6J!!!#N!!!! | 4569 | !8dC*6%8"!!"84NP-43%!!&9'58a&!3!!9NC*6%8"!!"*4NP-43%!!%T'58a&!3! |
4778 | !!!%)JJ!!!'*`FQ9Q!!lXDJ!!!#S!!!!!!!%)j!!!!"4`FQ9Q!!lEH!!!!#X!!!! | 4570 | !ANC*6%8"!!"54NP-43%!!$T'58a&!3!!GdC*6%8"!!!c4NP-43%!!(4'58a&!3! |
4779 | !!!%)q!!!!!T`FQ9Q!!i6c`!!!#`!!!!!!!%*!J!!!!a`FQ9Q!!iSA!!!!#d!!!! | 4571 | !,dC*6%8"!!!Z4NP-43%!!#e'58a&!3!!28C*6%8"!!!d4NP-43%!!Ba'58a&!3! |
4780 | !!!%*$J!!!-T`FQ9Q!!i15!!!!#i!!!!!!!%*f!!!!4K`FQ9Q!!i#2!!!!#m!!!! | 4572 | !88C*6%8"!!!`4NP-43%!!&p'58a&!3!!B%C*6%8"!!"V4e*98!!!!!!!!!!!!Q* |
4781 | !!!%+m!!!!+K`FQ9Q!!l,'3!!!$!!!!!!!!%,Q!!!!#j`FQ9Q!!l[K3!!!$%!!!! | 4573 | Q!!!!"8C*6%8"!!##4NP-43%!!(p'58a&!3!!J%C*6%8"!!"q4NP-43%!!)&(8P9 |
4782 | !!!%,aJ!!!Ja`FQ9Q!!kqX!!!!$)!!!!!!!0#I!!!#J"YG("X!!!!!J!!!!!!!!! | 4574 | 3!!!!!!!!!!!$BQP[!!!!$NC*6%8"!!#%4NP-43%!!Be'58a&!3!!JdC*6%8"!!' |
4783 | !!!"BU!!!!3"YG("c!!!!!J!!!!!!!!!!!!"CU!!!!""YG("T!!!!!J!!!!!!!!! | 4575 | 14NP-43%!!C&'58a&!3!"MdC*6%8"!!'3!%C*6%8"!!#&4NP-43%!!C*'58a&!3! |
4784 | !!!%BiJ!!!0"YG'a[!!!!!J!!!!!!!!!!!!%CXJ!!!#"YG(0X!!!!!J!!!!!!!!! | 4576 | "J%C*6%8"!!'(4NP-43%!!C9'58a&!3!"NdC*6%8"!!'84e*98!!!!!!!!!!!!Q* |
4785 | !!!%CdJ!!"4"`FQ9Q!!lk53!!!$-!!!!!!!%HiJ!!!!K`FQ9Q!!ibfJ!!!$3!!!! | 4577 | Z!!!!&%C*6%8"!!#'4NP-43%!!)P'58a&!3!!LdC*6%8"!!#14NP-43%!!DC'58a |
4786 | !!!%HkJ!!!"T`FQ9Q!!j($3!!!$8!!!!!!!%I"!!!$+"`FQ9Q!!ipM3!!!$B!!!! | 4578 | &!3!!N8C*6%8"!!#64NP-43%!!*4'58a&!3!!PNC*6%8"!!#B4NP-43%!!)K'58a |
4787 | !!!%VT!!!"K4`FQ9Q!!kR*3!!!$F!!!!!!!%aZ!!!#5C`FQ9Q!!lqqJ!!!$J!!!! | 4579 | &!3!!M8C*6%8"!!#54NP-43%!!)T'58a&!3!!PdC*6%8"!!#(4NP-43%!!*9'58a |
4788 | !!!%khJ!!!3G`FQ9Q!!j"k!!!!$N!!!!!!!%lj3!!!b"`FQ9Q!!jU8`!!!$S!!!! | 4580 | &!3!!MdC*6%8"!!#3!%C*6%8"!!#-4e*98!!!!!!!!!!!"Q*eCQCPFJ!!!!*'58a |
4789 | !!!%r"3!!!"4`FQ9Q!!m!0!!!!$X!!!!!!!%r'3!!!!T`FQ9Q!!kBq3!!!$`!!!! | 4581 | &!3!!Q8C*6%8"!!#D4e*98!!!!!!!!!!!"'0KFh3!!!!&4NP-43%!!*p'58a&!3! |
4790 | !!!%r)`!!!!a`FQ9Q!!ia@3!!!$d!!!!!!!%r,`!!!!j`FQ9Q!!kDRJ!!!$i!!!! | 4582 | !R%C*6%8"!!#G4NP-43%!!*Y'58a&!3!!RNG599!!!!!!!!!!!!4MEfe`!!!!!dC |
4791 | !!!%r23!!!3C`FQ9Q!!i"i`!!!$m!!!!!!!&!3`!!!$j`FQ9Q!!ja`3!!!%!!!!! | 4583 | *6%8"!!#J4NP-43%!!+&'58a&!3!!SNG599!!!!!!!!!!!!4MEfjQ!!!!!NC*6%8 |
4792 | !!!&!J3!!!!j`FQ9Q!!lI4!!!!%%!!!!!!!&!M`!!!GT`FQ9Q!!j[I`!!!%)!!!! | 4584 | "!!#M4NP-43%!!+4(8P93!!!!!!!!!!!$C'9c!!!!'NC*6%8"!!#P4NP-43%!!+C |
4793 | !!!&#D3!!!'*`FQ9Q!!iXV!!!!%-!!!!!!!&#b`!!!"4`FQ9Q!!i&T`!!!%3!!!! | 4585 | '58a&!3!!U%C*6%8"!!#T4NP-43%!!+Y'58a&!3!!V%C*6%8"!!#Z4NP-43%!!CC |
4794 | !!!&#h`!!!!T`FQ9Q!!lfMJ!!!%8!!!!!!!&#k3!!!!a`FQ9Q!!km-!!!!%B!!!! | 4586 | '58a&!3!!VdC*6%8"!!#b4NP-43%!!,0'58a&!3!!Y%C*6%8"!!#e4NP-43%!!,C |
4795 | !!!&#p3!!!-T`FQ9Q!!k+c3!!!%F!!!!!!!&$[`!!!4K`FQ9Q!!jBk`!!!%J!!!! | 4587 | '58a&!3!!Z%C*6%8"!!#j4NP-43%!!,T'58a&!3!!UNC*6%8"!!#`4NP-43%!!,G |
4796 | !!!&%e`!!!+K`FQ9Q!!i30J!!!%N!!!!!!!&&I`!!!#j`FQ9Q!!kMJ3!!!%S!!!! | 4588 | '58a&!3!![8C*6%8"!!#l4NP-43%!!+G'58a&!3!!X8C*6%8"!!#m4NP-43%!!+e |
4797 | !!!&&V3!!!Ja`FQ9Q!!jc,3!!!%X!!!!!!!&(Z3!!4J"YG("X!!!!!`!!!!!!!!! | 4589 | (8P93!!!!!!!!!!!#C'J!!!!&4NP-43%!!-"'58a&!3!!`8C*6%8"!!$#4NP-43% |
4798 | !!!'0Z3!!"`"YG("c!!!!!`!!!!!!!!!!!!'8Z3!!!""YG("T!!!!!`!!!!!!!!! | 4590 | !!,j'58a&!3!![dG599!!!!!!!!!!!!0NFf%!!!!)4NP-43%!!-9'58a&!3!!aNC |
4799 | !!!'8b3!!!#"YG(0X!!!!!`!!!!!!!!!!!!'8k3!!"T!!EA4XE`!!!!-!!!!!!!! | 4591 | *6%8"!!$(4NP-43%!!-0'58a&!3!!b8C*6%8"!!$)4NP-43%!!-4'58a&!3!"JNG |
4800 | !!!!"QhN!!!83F(*PCJ!1L,S!!!"-!!!!!!!"S)N!!!!)F(*PCJ!1iN8!!!"0!!! | 4592 | 599!!!!!!!!!!!!0PFR)!!!!$4NP-43%!!-T'58a&!3!!bdC*6%8"!!$-4e*98!! |
4801 | !!!!"S*%!!!!DF(*PCJ!1d&S!!!"1!!!!!!!"S+X!!"$3F(*PCJ!1Rh-!!!"2!!! | 4593 | !!!!!!!!!!f9fF!!!!$p'58a&!3!!ddC*6%8"!!$54NP-43%!!04'58a&!3!!eNC |
4802 | !!!!"XAX!!!B8F(*PCJ!1P(-!!!"3!!!!!!!"Yim!!!NQF(*PCJ!1LkB!!!"4!!! | 4594 | *6%8"!!$V4NP-43%!!0e'58a&!3!!j%C*6%8"!!$c4NP-43%!!1a'58a&!3!!hNC |
4803 | !!!!"`,8!!!%(F(*PCJ!1VAF!!!"5!!!!!!!"`E`!!!-JF(*PCJ!1ejm!!!"6!!! | 4595 | *6%8"!!$P4NP-43%!!24'58a&!3!!k%C*6%8"!!$D4NP-43%!!2G'58a&!3!"!NC |
4804 | !!!!"a0`!!!!8F(*PCJ!1FbF!!!"8!!!!!!!"a2!!!!!+F(*PCJ!1@,m!!!"9!!! | 4596 | *6%8"!!$K4NP-43%!!2"'58a&!3!!q%C*6%8"!!$Y4NP-43%!!0p'58a&!3!!jNC |
4805 | !!!!"a2S!!!!-F(*PCJ!1VG`!!!"@!!!!!!!"a3B!!!!1F(*PCJ!1@GJ!!!"A!!! | 4597 | *6%8"!!$e4NP-43%!!1P'58a&!3!!fdC*6%8"!!$L4NP-43%!!2&'58a&!3!!kNC |
4806 | !!!!"a43!!!%'F(*PCJ!1G1)!!!"B!!!!!!!"aKS!!!!qF(*PCJ!1CB`!!!"C!!! | 4598 | *6%8"!!$F4NP-43%!!10'58a&!3!!mNC*6%8"!!$Z4NP-43%!!1"'58a&!3!!jdC |
4807 | !!!!"aPJ!!!!1F(*PCJ!1*2X!!!"D!!!!!!!"aQB!!!(DF(*PCJ!19#X!!!"E!!! | 4599 | *6%8"!!$f4NP-43%!!2j'58a&!3!!qdC*6%8"!!$m4NP-43%!!3"'58a&!3!"!8C |
4808 | !!!!"b%!!!!"LF(*PCJ!1mb!!!!"F!!!!!!!"b+)!!!!8F(*PCJ!1m`8!!!"G!!! | 4600 | *6%8"!!$j4NP-43%!!2T'58a&!3!!r8C*6%8"!!$r4NP-43%!!3C'58a&!3!""dC |
4809 | !!!!"b,B!!!!+F(*PCJ!1fHN!!!"H!!!!!!!"b-!!!!!-F(*PCJ!1$)-!!!"I!!! | 4601 | *6%8"!!%)4NP-43%!!3P'58a&!3!""8C*6%8"!!%%4NP-43%!!30'58a&!3!!cdC |
4810 | !!!!"b-`!!!$+F(*PCJ!1%CN!!!"J!!!!!!!"bCB!!!%BF(*PCJ!1Y5%!!!"K!!! | 4602 | *6%8"!!$04NP-43%!!-j'58a&!3!!e8C*6%8"!!$[4NP-43%!!0&'58a&!3!!edC |
4811 | !!!!"bUi!!!#SF(*PCJ!1$e8!!!"L!!!!!!!"beB!!!!ZF(*PCJ!1VXF!!!"M!!! | 4603 | *6%8"!!$34NP-43%!!0P'58a&!3!!f%C*6%8"!!'A4NP-43%!!CK(8P93!!!!!!! |
4812 | !!!!"bi3!!!)-F(*PCJ!1YBi!!!"N!!!!!!!"cC!!!!!+!'edF'`!!!!%!!!!!!! | 4604 | !!!!%D'eKB`!!!!&'58a&!3!"#NG599!!!!!!!!!!!!4TC'9K!!!!"8C*6%8"!!% |
4813 | !!!!!!GH3!!!!!3"YG("c!!!!"!!!!!!!!!!!!!(BN!!!!!!3EA4`D3!!!!3!!!! | 4605 | ,4NP-43%!!3a'58a&!3!"$NC*6%8"!!%04NP-43%!!3p(8P93!!!!!!!!!!!&E'K |
4814 | !!!!!!!!"f+!!!!!JEA4cE!!!!!3!!!!!!!!!!!!"f-!!!!#-EA4XE`!!!!3!!!! | 4606 | KFfJ!!!!#4NP-43%!!4"'58a&!3!"%8G599!!!!!!!!!!!!0YC$)!!!!#4NP-43% |
4815 | !!!!!!!!"f8`!!!83F(*PCJ!1C"3!!!"P!!!!!!!"hP`!!!!)F(*PCJ!1MEF!!!" | 4607 | !!4*'58a&!3!"%dG599!!!!!!!!!!!!0YC$8!!!!#4NP-43%!!44'58a&!3!"&8G |
4816 | Q!!!!!!!"hQ3!!!!DF(*PCJ!1SV`!!!"R!!!!!!!"hRi!!"$3F(*PCJ!1NlJ!!!" | 4608 | 599!!!!!!!!!!!!4YC'-b!!!!!NC*6%8"!!%@4NP-43%!!4G(8P93!!!!!!!!!!! |
4817 | S!!!!!!!"ldi!!!B8F(*PCJ!1G1B!!!"T!!!!!!!"p@)!!!NQF(*PCJ!1lFS!!!" | 4609 | (Ef*UC@0dF`!!!!4'58a&!3!"'dC*6%8"!!%B4NP-43%!!4T'58a&!3!"'8G599! |
4818 | U!!!!!!!"rSJ!!!%(F(*PCJ!1ff%!!!"V!!!!!!!"rim!!!-JF(*PCJ!1r-N!!!" | 4610 | !!!!!!!!!!!0`C@d!!!!'4NP-43%!!5&'58a&!3!")%C*6%8"!!%H4NP-43%!!4p |
4819 | X!!!!!!!#!Um!!!!8F(*PCJ!1r(F!!!"Y!!!!!!!#!X-!!!!+F(*PCJ!1%0B!!!" | 4611 | '58a&!3!"(%C*6%8"!!%G4e*98!!!!!!!!!!!"R"VBh-a-J!!!""'58a&!3!")NC |
4820 | Z!!!!!!!#!Xd!!!!-F(*PCJ!11!J!!!"[!!!!!!!#!YN!!!!1F(*PCJ!1Lh%!!!" | 4612 | *6%8"!!%M4NP-43%!!54'58a&!3!"*8C*6%8"!!%Q4NP-43%!!5G'58a&!3!"+%C |
4821 | `!!!!!!!#!ZF!!!%'F(*PCJ!1,BX!!!"a!!!!!!!#!qd!!!!qF(*PCJ!1KTd!!!" | 4613 | *6%8"!!%T4NP-43%!!5T'58a&!3!"+dC*6%8"!!%X4NP-43%!!5e'58a&!3!",NC |
4822 | b!!!!!!!#"#X!!!!1F(*PCJ!1%am!!!"c!!!!!!!#"$N!!!(DF(*PCJ!1HE-!!!" | 4614 | *6%8"!!%[4NP-43%!!CP'58a&!3!"-%G599!!!!!!!!!!!!9`Df0c0`!!!!C'58a |
4823 | d!!!!!!!#"K-!!!"LF(*PCJ!1idJ!!!"e!!!!!!!#"R8!!!!8F(*PCJ!1AA!!!!" | 4615 | &!3!"-NC*6%8"!!%c4NP-43%!!6&'58a&!3!"R%C*6%8"!!'D4NP-43%!!CY(8P9 |
4824 | f!!!!!!!#"SN!!!!+F(*PCJ!1j"8!!!"h!!!!!!!#"T-!!!!-F(*PCJ!1Qr-!!!" | 4616 | 3!!!!!!!!!!!%FQ&ZC!!!!!4'58a&!3!"0%C*6%8"!!%e4NP-43%!!6C'58a&!3! |
4825 | i!!!!!!!#"Tm!!!$+F(*PCJ!1a+%!!!"j!!!!!!!#"fN!!!%BF(*PCJ!1CMm!!!" | 4617 | "TdG599!!!!!!!!!!!!0bBc)!!!!&4NP-43%!!6T'58a&!3!"1dC*6%8"!!%j4NP |
4826 | k!!!!!!!##)%!!!#SF(*PCJ!1XB!!!!"l!!!!!!!##5N!!!!ZF(*PCJ!1mR8!!!" | 4618 | -43%!!6G'58a&!3!"1%G599!!!!!!!!!!!!0bBc3!!!!#4NP-43%!!6e'58a&!3! |
4827 | m!!!!!!!##9F!!!)-F(*PCJ!1Z,`!!!"p!!!!!!!##f-!!!8!EA4`E!!!!!8!!!! | 4619 | "2%G599!!!!!!!!!!!!0bBc8!!!!&4NP-43%!!8*'58a&!3!"3%C*6%8"!!&"4NP |
4828 | !!!!!!!!!@EJ!!!#!EA4`F`!!!!8!!!!!!!!!!!!!@MJ!!!!3EA4`D3!!!!8!!!! | 4620 | -43%!!6j'58a&!3!"2dG599!!!!!!!!!!!!CbDA"PE@3!!!!#4NP-43%!!80'58a |
4829 | !!!!!!!!#%2-!!!!JEA4cE!!!!!8!!!!!!!!!!!!#%4-!!!#!EA4XE`!!!!8!!!! | 4621 | &!3!"4%G599!!!!!!!!!!!!0bFf%!!!!-4NP-43%!!89'58a&!3!"4dC*6%8"!!& |
4830 | !!!!!!!!#%C-!!!83F(*PCJ!1a$B!!!"q!!!!!!!#&U-!!!!)F(*PCJ!1ppX!!!" | 4622 | )4NP-43%!!8e'58a&!3!"6%C*6%8"!!&'4NP-43%!!8Y'58a&!3!"6NC*6%8"!!& |
4831 | r!!!!!!!#&UX!!!!DF(*PCJ!1YK%!!!#!!!!!!!!#&X8!!"$3F(*PCJ!1UKi!!!# | 4623 | *4NP-43%!!8T'58a&!3!"R8C*6%8"!!'H4e*98!!!!!!!!!!!!h0SB3!!!!4'58a |
4832 | "!!!!!!!#*j8!!!B8F(*PCJ!1!fJ!!!##!!!!!!!#,DN!!!L@F(*PCJ!1bY3!!!# | 4624 | &!3!"88C*6%8"!!&24NP-43%!!9*'58a&!3!"8%G599!!!!!!!!!!!!9cG'&MD`! |
4833 | $!!!!!!!#0Mm!!!%(F(*PCJ!1D*S!!!#%!!!!!!!#0dB!!!-JF(*PCJ!1Q1)!!!# | 4625 | !!!&'58a&!3!"8dG599!!!!!!!!!!!!CdH(4IC')!!!!"4NP-43%!!94(8P93!!! |
4834 | &!!!!!!!#1QB!!!!8F(*PCJ!1DmN!!!#'!!!!!!!#1RS!!!!+F(*PCJ!1B[N!!!# | 4626 | !!!!!!!!%H$8`13!!!"9'58a&!3!"A%C*6%8"!!&E4NP-43%!!@&'58a&!3!"@NC |
4835 | (!!!!!!!#1S3!!!!-F(*PCJ!1Y%%!!!#)!!!!!!!#1T!!!!!!$R"bC@B!$Z2!!!! | 4627 | *6%8"!!&J4NP-43%!!@*'58a&!3!"JdC*6%8"!!&Q4NP-43%!!@0'58a&!3!"@%C |
4836 | !L3!!!!!!!MUH!!!""R"bC@B!$K+Q!!!!LJ!!!!!!!MZN!!!!2R"bC@B!$Y45!!! | 4628 | *6%8"!!&G4NP-43%!!9G'58a&!3!"C8C*6%8"!!&H4NP-43%!!9P'58a&!3!"AdC |
4837 | !L`!!!!!!!M[L!!!!$R"bC@B!$ThJ!!!!M!!!!!!!!M[`!!!"fR"bC@B!$L2p!!! | 4629 | *6%8"!!&R4NP-43%!!@4'58a&!3!"K%C*6%8"!!&94NP-43%!!9C(8P93!!!!!!! |
4838 | !M3!!!!!!!Mh+!!!!BR"bC@B!$UH%!!!!MJ!!!!!!!MiX!!!!&("bC@B!$U1Q!!! | 4630 | !!!!'H$8`1ABc!!!!&8C*6%8"!!&V4NP-43%!!@a'58a&!3!"E8C*6%8"!!&a4NP |
4839 | !M`!!!!!!!Mj!!!!!#R"bC@B!$Rrm!!!!N!!!!!!!!!)q5J!!!!a`FQ9Q!!iEh`! | 4631 | -43%!!A0'58a&!3!"G8C*6%8"!!&h4NP-43%!!AT'58a&!3!"D%C*6%8"!!&b4NP |
4840 | !!*%!!!!!!!)q9J!!!-T`FQ9Q!!j-XJ!!!*)!!!!!!!)r)!!!!4K`FQ9Q!!jGN3! | 4632 | -43%!!@T'58a&!3!"H%C*6%8"!!&T4NP-43%!!AC'58a&!3!"G%C*6%8"!!&`4NP |
4841 | !!*-!!!!!!!*!1!!!!+K`FQ9Q!!i5!3!!!*3!!!!!!!*!i!!!!#j`FQ9Q!!lG5`! | 4633 | -43%!!AP'58a&!3!"ENC*6%8"!!&[4NP-43%!!B9'58a&!3!"KNG599!!!!!!!!! |
4842 | !!*8!!!!!!!*"$J!!!Ja`FQ9Q!!jL+`!!!*B!!!!!!!*$'J!!#J"YG("X!!!!"J! | 4634 | !!!0cFf`!!!!M4NP-43%!!"0'58a&!3!!&8C*6%8"!!!34NP-43%!!"*'58a&!3! |
4843 | !!!!!!!!!!!*0'J!!!3"YG("c!!!!"J!!!!!!!!!!!!*1'J!!!""YG("T!!!!"J! | 4635 | !%8C*6%8"!!!84NP-43%!!"T'58a&!3!!(%C*6%8"!!!A4NP-43%!!"P'58a&!3! |
4844 | !!!!!!!!!!!*1+J!!!)aYG'a[!!!!"J!!!!!!!!!!!!*1YJ!!!#"YG(0X!!!!"J! | 4636 | !'%C*6%8"!!!E4NP-43%!!"C'58a&!3!!$8C*6%8"!!!24NP-43%!!!Y'58a&!3! |
4845 | !!!!!!!!!!!*1eJ!!"4"`FQ9Q!!ke'`!!!*F!!!!!!!*6jJ!!!!K`FQ9Q!!iPYJ! | 4637 | !$%C*6%8"!!!14NP-43%!!#Y'58a&!3!!,%C*6%8"!!!S4NP-43%!!#T'58a&!3! |
4846 | !!*J!!!!!!!*6lJ!!!"T`FQ9Q!!k$'`!!!*N!!!!!!!*8#!!!%0"`FQ9Q!!iDS3! | 4638 | !+8C*6%8"!!!M4NP-43%!!#*'58a&!3!!(dC*6%8"!!!P4NP-43%!!#"'58a&!3! |
4847 | !!*S!!!!!!!*Nf!!!"K4`FQ9Q!!k8"3!!!*X!!!!!!!*Ul!!!#*C`FQ9Q!!iKFJ! | 4639 | !*NC*6%8"!!!N4NP-43%!!"j'58a&!3!!*dC*6%8"!!!G4NP-43%!!!T'58a&!3! |
4848 | !!*`!!!!!!!*cJJ!!!3G`FQ9Q!!iTD3!!!*d!!!!!!!*dL3!!!b"`FQ9Q!!i1j`! | 4640 | !)8G599!!!!!!!!!!!!j(990*)%aTBR*KFQPPF`!!!!0'58a&!J!!,dG599!!!!! |
4849 | !!*i!!!!!!!*hU3!!!"4`FQ9Q!!jL[3!!!*m!!!!!!!*h[3!!!!T`FQ9Q!!jXAJ! | 4641 | !!!!!!!038%-!!!!$4NP-43)!!$"'58a&!J!!-8C*6%8#!!!b4e*98!!!!!!!!!! |
4850 | !!+!!!!!!!!*ha`!!!!a`FQ9Q!!jr'`!!!+%!!!!!!!*hd`!!!!j`FQ9Q!!k0TJ! | 4642 | !!cBiD`!!!!0'58a&"3!!&%C*6%8&!!!94NP-438!!"C(8P93!!!!!!!!!!!138j |
4851 | !!+)!!!!!!!*hi3!!!3C`FQ9Q!!i0!3!!!+-!!!!!!!*ij`!!!$j`FQ9Q!!j!f3! | 4643 | 655"-D@*bBA*TCA-!!!!#4e*98!!!!!!!!!!!!e"33`!!!!*'58a&!3!!!8C*6%8 |
4852 | !!+3!!!!!!!*j*3!!!!j`FQ9Q!!k[33!!!+8!!!!!!!*j-`!!!GT`FQ9Q!!iY93! | 4644 | "!!&r4e*98!!!!!!!!!!!!cBiD`!!!!*'58a&!`!"S%C*6%8$!!'K4e*98!!!!!! |
4853 | !!+B!!!!!!!*l$3!!!'*`FQ9Q!!i`KJ!!!+F!!!!!!!*lE`!!!"4`FQ9Q!!jK6!! | 4645 | !!!!!$8eKBb"-D@*bBA*TCA-!!!!#4e*98!!!!!!!!!!!!e"33`!!!!P'58a&!3! |
4854 | !!+J!!!!!!!*lJ`!!!!T`FQ9Q!!kKkJ!!!+N!!!!!!!*lM3!!!!a`FQ9Q!!k[X3! | 4646 | !"%C*6%8"!!!#4NP-43%!!!0'58a&!3!!#8C*6%8"!!!)4NP-43%!!!G'58a&!3! |
4855 | !!+S!!!!!!!*lQ3!!!-T`FQ9Q!!iUj!!!!+X!!!!!!!*mB`!!!4K`FQ9Q!!iAM3! | 4647 | !"NC*6%8"!!!&4NP-43%!!D9(8P93!!!!!!!!!!!$0MKV!!!!"NC*6%8$!!'D4NP |
4856 | !!+`!!!!!!!*pH`!!!+K`FQ9Q!!jMNJ!!!+d!!!!!!!*q)`!!!#j`FQ9Q!!lid!! | 4648 | -43-!!D*'58a&!`!"R%C*6%8$!!'G4NP-43-!!Cp'58a&!`!"Q`!!!"J!!!)!!!) |
4857 | !!+i!!!!!!!*q83!!!Ja`FQ9Q!!iiI!!!!+m!!!!!!!+!A3!!2!"YG("X!!!!"`! | 4649 | !!!!!!J%!"3!!!!!#!J!-!!!!!!)$!!S!!!!!!J3!!J!!!!!#"3!&!!!!!!)'!!) |
4858 | !!!!!!!!!!!+mA3!!"J"YG("c!!!!"`!!!!!!!!!!!!,#A3!!!""YG("T!!!!"`! | 4650 | !!!!!!JF!"J!!!!!##!!0!!!!!!)*!!8!!!!!!JS!"3!!!!!##`!"!!!!!!)-!!% |
4859 | !!!!!!!!!!!,#E3!!"G4YG'a[!!!!"`!!!!!!!!!!!!,)33!!!#"YG(0X!!!!"`! | 4651 | !!!!!!Jd!"`!!!!!#$J!)!!!!!!)2!!8!!!!!!K!!!J!!!!!#%3!#!!!!!!)5!!J |
4860 | !!!!!!!!!!!,)B3!!"4"`FQ9Q!!i1N!!!!!#`!!!!!!!#cA%!!!!)F(*PCJ!1PMd | 4652 | !!!!!!K-!!3!!!!!#&!!"!!!!!!)9!!J!!!!!!KB!#3!!!!!#&`!%!!!!!!!!!!! |
4861 | !!!#a!!!!!!!#cAN!!!!DF(*PCJ!1G*S!!!#b!!!!!!!#cC-!!"$3F(*PCJ!1m28 | 4653 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4862 | !!!#c!!!!!!!#hQ-!!!B8F(*PCJ!18k%!!!#d!!!!!!!#j(F!!!NQF(*PCJ!1&dF | 4654 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4863 | !!!#e!!!!!!!#lCd!!!%(F(*PCJ!1a"8!!!#f!!!!!!!#lU3!!!-JF(*PCJ!1h-` | 4655 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4864 | !!!#h!!!!!!!#mF3!!!!8F(*PCJ!1Gj-!!!#i!!!!!!!#mGJ!!!!+F(*PCJ!1c58 | 4656 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4865 | !!!#j!!!!!!!#mH)!!!!-F(*PCJ!1Nd!!!!#k!!!!!!!#mHi!!!!1F(*PCJ!1Kq% | 4657 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4866 | !!!#l!!!!!!!#mI`!!!%'F(*PCJ!1ebJ!!!#m!!!!!!!#m`)!!!!qF(*PCJ!1C`N | 4658 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4867 | !!!#p!!!!!!!#md!!!!!1F(*PCJ!1qpm!!!#q!!!!!!!#mdi!!!(DF(*PCJ!1EaJ | 4659 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
4868 | !!!#r!!!!!!!#p5J!!!"LF(*PCJ!1m4i!!!$!!!!!!!!#pBS!!!!8F(*PCJ!1#Td | 4660 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!#"J%#!!!c"`%#!!!d!!!!!J3""3!!)!J""3! |
4869 | !!!$"!!!!!!!#pCi!!!!+F(*PCJ!1d"!!!!$#!!!!!!!#pDJ!!!!-F(*PCJ!1Mb- | 4661 | !(`!!!HJ!!!)!!!!6k3!!&!!!!!(S!&j1G!!-6PB!!#m+,`-NEJ!35Ui!!!$*!!! |
4870 | !!!$$!!!!!!!#pE3!!!$+F(*PCJ!1+43!!!$%!!!!!!!#pRi!!!%BF(*PCJ!1BQB | 4662 | !i!!!&0i!!"J!!!!!b3!-,bi!##"U!-JJD!"i6T!!-"mf!!!!!K%!!!)5!!!#%`! |
4871 | !!!$&!!!!!!!#pjB!!!#SF(*PCJ!1JbF!!!$'!!!!!!!#q$i!!!!ZF(*PCJ!1jBJ | 4663 | !!K3!!!)9!!!"p3!!!HJ!!!(H!!!"d3!!!IX!!!(3!!!"p!!!!I`!!!)"!!!"U3! |
4872 | !!!$(!!!!!!!#q'`!!!)-F(*PCJ!1EJ)!!!$)!!!!!!!#qRJ!!$`!EA4`E!!!!!J | 4664 | !!DS!!!'V!!!!,!!!!#d!!!!Z!!!!,`!!!$!!!!!a!!!!-J!!!$-!!!!d!!!!03! |
4873 | !!!!!!!!!!!!$0RJ!!!B!EA4`F`!!!!J!!!!!!!!!!!!$2(J!!!!3EA4`D3!!!!J | 4665 | !!$B!!!!h!!!!1!!!!$N!!!!k!!!!1`!!!BF!!!!m!!!!23!!!$i!!!!r!!!!3!! |
4874 | !!!!!!!!!!!!$2)J!!!!JEA4cE!!!!!J!!!!!!!!!!!!$2+J!!!A8EA4XE`!!!!J | 4666 | !!%%!!!',!!!!3J!!!%-!!!"%!!!!43!!!%B!!!"(!!!"kJ!!!Am!!!"p!!!!IJ! |
4875 | !!!!!!!!!!!!$D9S!!"$%EA4RE!!!!qJ!!!!!!!!!!!!$8d!!!!!XE@pdD3!!!!! | 4667 | !!(m!!!'5!!!"N3!!!)!!!!#"!!!!c!!!!B`!!!$0!!!!JJ!!!)-!!!$1!!!!c`! |
4876 | !!!!!!!!!!!!$8f`!!"1!8%acG!!19TJ!!!$*!!!!!!!"&P)!!!)XEA"cD3!!!qJ | 4668 | !!!N!!!(a!!!!K3!!!)B!!!#(!!!"T3!!!)J!!!#*!!!!LJ!!!)X!!!#-!!!!M3! |
4877 | !!!!!!!!!!!!$D1S!!!!3EA0dF!!!!!)!!!!!!!!!!!!$D2S!!!!3EA0dF!!!!!8 | 4669 | !!)i!!!#2!!!!N!!!!!#4!!!!NJ!!!*-!!!#8!!!!P3!!!*B!!!#A!!!"N`!!!Bi |
4878 | !!!!!!!!!!!!!@NJ!!!!SEA0dD3!!!qJ!!!!!!!!!!!!$D6)!!!!SEA0dD3!!!!! | 4670 | !!!'2!!!"M3!!!C!!!!!!K!!!!*J!!!#C!!!#"!!!!93!!!&9!!!"P!!!!BB!!!) |
4879 | !!!!!!!!!!!!!@R!!!!!-E@&XE!!!!!!!!!!!!!!!!!!$6(`!!!$%E@&`E!!!!!! | 4671 | (!!!##!!!!D`!!!#N!!!!T3!!!+B!!!#R!!!!U!!!!KB!!!'Y!!!!R`!!!+)!!!# |
4880 | !!!!!!!!!!-eY!!!: | 4672 | M!!!"R`!!!AS!!!'Z!!!"V`!!!AX!!!)!!!!"RJ!!!0!!!!#D!!!!Q`!!!*`!!!# |
4673 | G!!!!S!!!!*i!!!#K!!!!5!!!!%N!!!"+!!!!5`!!!%`!!!"0!!!!6J!!!%m!!!) | ||
4674 | &!!!#"J!!!+N!!!'`!!!"X3!!!,d!!!#q!!!![`!!!-!!!!$"!!!!d3!!!E)!!!' | ||
4675 | c!!!!`J!!!--!!!$%!!!!a3!!!-B!!!'"!!!!a`!!!-J!!!#U!!!!U`!!!+`!!!' | ||
4676 | d!!!!dJ!!!+d!!!'9!!!!b3!!!D!!!!'e!!!!bJ!!!-X!!!"3!!!!d`!!!03!!!$ | ||
4677 | 9!!!!eJ!!!0F!!!$B!!!"I!!!!0N!!!$D!!!!f`!!!0`!!!$G!!!!hJ!!!0m!!!$ | ||
4678 | J!!!!i3!!!1)!!!$M!!!!j!!!!18!!!$Q!!!!j`!!!1J!!!$T!!!!kJ!!!1X!!!$ | ||
4679 | X!!!!l3!!!1i!!!$[!!!!m!!!!2%!!!$b!!!!m`!!!23!!!$e!!!!pJ!!!2F!!!# | ||
4680 | Z!!!!V`!!!J-!!!(D!!!"l3!!!&%!!!"5!!!!8`!!!H`!!!'f!!!"Y`!!!EJ!!!( | ||
4681 | L!!!"i!!!!D%!!!(E!!!"c3!!!F`!!!(F!!!"cJ!!!Gd!!!(2!!!"#3!!!&3!!!" | ||
4682 | 9!!!!9J!!!&F!!!"B!!!!@3!!!&S!!!"E!!!!!3!!!3S!!!%,!!!"$!!!!3d!!!% | ||
4683 | 1!!!"$`!!!4!!!!(f!!!"k3!!!HF!!!(Q!!!"i`!!!H8!!!(I!!!"rJ!!!Id!!!( | ||
4684 | 5!!!"SJ!!!!)!!!(C!!!"%3!!!4)!!!%6!!!"&!!!!48!!!%@!!!"-`!!!Ad!!!' | ||
4685 | M!!!"p`!!!GJ!!!!!!!!"d`!!!!-!!!(A!!!"IJ!!!IJ!!!(V!!!"q3!!!Hi!!!$ | ||
4686 | i!!!!q3!!!2S!!!$l!!!!r!!!!2d!!!$q!!!!r`!!!3!!!!%"!!!"Z3!!!&`!!!" | ||
4687 | G!!!"&`!!!4J!!!%C!!!!X!!!!,%!!!#b!!!"j!!!!H%!!!'k!!!"e!!!!!3!!!! | ||
4688 | &!!!"e3!!!GB!!!!'!!!!"`!!!4S!!!%K!!!")J!!!5-!!!%N!!!"*3!!!5B!!!% | ||
4689 | R!!!"+!!!!5N!!!%U!!!"+`!!!5`!!!'B!!!",3!!!5i!!!'@!!!"P`!!!&i!!!" | ||
4690 | I!!!!B!!!!'%!!!"L!!!!B`!!!'3!!!"P!!!!CJ!!!'F!!!"S!!!!D3!!!'S!!!# | ||
4691 | c!!!"qJ!!!I-!!!%E!!!"(!!!!4d!!!%H!!!"(`!!!5!!!!%[!!!"Q3!!!6!!!!% | ||
4692 | a!!!"QJ!!!CX!!!'l!!!"[!!!!6)!!!'p!!!"T!!!!JN!!!)+!!!##`!!!J`!!!) | ||
4693 | 0!!!#$J!!!I!!!!)2!!!"!J!!!3-!!!%%!!!""3!!!3B!!!%(!!!"#!!!!,3!!!% | ||
4694 | d!!!"T`!!!DB!!!#e!!!"03!!!6B!!!%h!!!"1!!!!6N!!!%k!!!"1`!!!6`!!!% | ||
4695 | p!!!"2J!!!6m!!!&!!!!"33!!!,B!!!#h!!!"[J!!!Hm!!!)3!!!"3J!!!8-!!!# | ||
4696 | i!!!"[`!!!C`!!!&%!!!"43!!!8B!!!&(!!!"5!!!!Cd!!!&*!!!"5J!!!8X!!!& | ||
4697 | -!!!"63!!!!S!!!!,!!!!$!!!!!d!!!!1!!!!$`!!!"!!!!!4!!!!%J!!!"-!!!! | ||
4698 | 8!!!!&3!!!"B!!!!A!!!!'!!!!"N!!!!D!!!!'`!!!F!!!!#j!!!"6J!!!8m!!!& | ||
4699 | 3!!!"83!!!F%!!!(r!!!"`J!!!F-!!!!F!!!!(3!!!"i!!!!I!!!!)!!!!#%!!!! | ||
4700 | L!!!!)`!!!#3!!!!P!!!!*J!!!9)!!!#k!!!!Z`!!!F3!!!(&!!!"aJ!!!FF!!!( | ||
4701 | ,!!!!*`!!!#J!!!!T!!!!+J!!!#X!!!)#!!!!#!!!!9-!!!'+!!!!D`!!!'`!!!" | ||
4702 | Y!!!"L!!!!'i!!!'*!!!"C`!!!@J!!!&T!!!"DJ!!!@X!!!&X!!!"E3!!!@i!!!& | ||
4703 | [!!!"F!!!!A%!!!&b!!!"K3!!!A-!!!&d!!!"G3!!!AB!!!'%!!!"G`!!!AJ!!!& | ||
4704 | j!!!"b!!!!FN!!!'S!!!"bJ!!!9B!!!&A!!!"JJ!!!9J!!!&C!!!"@J!!!9X!!!& | ||
4705 | F!!!"A3!!!9i!!!&I!!!"B!!!!@%!!!&L!!!"J`!!!@-!!!&N!!!"C3!!!,`!!!( | ||
4706 | b!!!!E`!!!@B!!!"`!!!!F3!!!()!!!"c!!!!G!!!!(8!!!"f!!!!G`!!!(J!!!" | ||
4707 | j!!!!HJ!!!(X!!!"m!!!"J!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4708 | !!!!!!!!"!!!!-P*26e3!!!!!!!!!!!!!!!!'4e*98!!!!!!!!!!"$P*[H5Gc)%G | ||
4709 | PG%K89&"6!!!!"8C*6%8"!!'L4NP-43%!!D0'58a&!3!"U%C*6%8"!!'K4NP-43% | ||
4710 | !!D"(8P93!!!!!!!!!!)66h"PEP066#""F("XD@0KG'P[EJ!!!#0'58a&!J!!(%C | ||
4711 | *6%8#!!!U4NP-43)!!!e'58a&!J!!)%C*6%8#!!!54NP-43)!!"0'58a&!J!!&NC | ||
4712 | *6%8#!!!B4NP-43)!!"G'58a&!J!!$NC*6%8#!!!H4NP-43)!!"&'58a&!J!!%%C | ||
4713 | *6%8#!!!K4NP-43)!!"4'58a&!J!!&8C*6%8#!!!X4NP-43)!!"T'58a&!J!!'8C | ||
4714 | *6%8#!!!S4NP-43)!!#G'58a&!J!!*%C*6%8#!!!Y4NP-43)!!!Y'58a&!J!!*NC | ||
4715 | *6%8#!!!T4NP-43)!!!a'58a&!J!!+dC*6%8#!!!L4NP-43)!!!p'58a&!J!!'dC | ||
4716 | *6%8#!!!G4NP-43)!!"p'58a&!J!!*8C*6%8#!!!M4e*98!!!!!!!!!!$%8p`C@j | ||
4717 | 68d`J6'PLFQ&bD@9c!!!!"%G599!!!!!!!!!!"!038%-!!!!#4NP-43)!!$0'58a | ||
4718 | &!J!!0%G599!!!!!!!!!!"3-f1'X!!!!#4NP-438!!#"'58a&"3!!(dG599!!!!! | ||
4719 | !!!!!"JCMFRP`G'm!!!!S4NP-43%!!Aa'58a&!3!"INC*6%8"!!'N4NP-43%!!Cp | ||
4720 | '58a&!3!"I8C*6%8"!!&l4e*98!!!!!!!!!!("'&cEM%!!!"A4NP-43%!!$j'58a | ||
4721 | &!3!!-8C*6%8"!!"&4NP-43%!!$P'58a&!3!!3dC*6%8"!!!m4NP-43%!!$p'58a | ||
4722 | &!3!!3%C*6%8"!!"%4NP-43%!!%&'58a&!3!!0dC*6%8"!!!e4NP-43%!!$Y'58a | ||
4723 | &!3!!-NC*6%8"!!!i4NP-43%!!%K'58a&!3!!4NC*6%8"!!"#4NP-43%!!$C'58a | ||
4724 | &!3!!4dC*6%8"!!')4NP-43%!!("'58a&!3!!I%C*6%8"!!"i4NP-43%!!(T'58a | ||
4725 | &!3!!H8C*6%8"!!"a4NP-43%!!(C'58a&!3!!FNC*6%8"!!"p4NP-43%!!B&'58a | ||
4726 | &!3!!FdC*6%8"!!"e4NP-43%!!(Y'58a&!3!!A8C*6%8"!!"04NP-43%!!&P'58a | ||
4727 | &!3!!6NC*6%8"!!"D4NP-43%!!%p'58a&!3!!@dC*6%8"!!"34NP-43%!!&a'58a | ||
4728 | &!3!!5dC*6%8"!!"A4NP-43%!!%a'58a&!3!!@%C*6%8"!!"Z4NP-43%!!'p'58a | ||
4729 | &!3!"LNC*6%8"!!"X4NP-43%!!'e'58a&!3!"L8C*6%8"!!',4NP-43%!!'9'58a | ||
4730 | &!3!!D8C*6%8"!!"S4NP-43%!!'G'58a&!3!!BdC*6%8"!!"N4NP-43%!!'&'58a | ||
4731 | &!3!!DNC*6%8"!!"L4NP-43%!!'C'58a&!3!!8dC*6%8"!!"84NP-43%!!&9'58a | ||
4732 | &!3!!9NC*6%8"!!"*4NP-43%!!%T'58a&!3!!ANC*6%8"!!"54NP-43%!!$T'58a | ||
4733 | &!3!!GdC*6%8"!!!c4NP-43%!!(4'58a&!3!!,dC*6%8"!!!Z4NP-43%!!#e'58a | ||
4734 | &!3!!28C*6%8"!!!d4NP-43%!!Ba'58a&!3!!88C*6%8"!!!`4NP-43%!!&p'58a | ||
4735 | &!3!!B%C*6%8"!!"V4e*98!!!!!!!!!!)!Q*Q!!!!"8C*6%8"!!##4NP-43%!!(p | ||
4736 | '58a&!3!!J%C*6%8"!!"q4NP-43%!!)&(8P93!!!!!!!!!!N$BQP[!!!!$NC*6%8 | ||
4737 | "!!#%4NP-43%!!Be'58a&!3!!JdC*6%8"!!'14NP-43%!!C&'58a&!3!"MdC*6%8 | ||
4738 | "!!'3!%C*6%8"!!#&4NP-43%!!C*'58a&!3!"J%C*6%8"!!'(4NP-43%!!C9'58a | ||
4739 | &!3!"NdC*6%8"!!'84e*98!!!!!!!!!!+!Q*Z!!!!&%C*6%8"!!#'4NP-43%!!)P | ||
4740 | '58a&!3!!LdC*6%8"!!#14NP-43%!!DC'58a&!3!!N8C*6%8"!!#64NP-43%!!*4 | ||
4741 | '58a&!3!!PNC*6%8"!!#B4NP-43%!!)K'58a&!3!!M8C*6%8"!!#54NP-43%!!)T | ||
4742 | '58a&!3!!PdC*6%8"!!#(4NP-43%!!*9'58a&!3!!MdC*6%8"!!#3!%C*6%8"!!# | ||
4743 | -4e*98!!!!!!!!!!,"Q*eCQCPFJ!!!!*'58a&!3!!Q8C*6%8"!!#D4e*98!!!!!! | ||
4744 | !!!!-"'0KFh3!!!!&4NP-43%!!*p'58a&!3!!R%C*6%8"!!#G4NP-43%!!*Y'58a | ||
4745 | &!3!!RNG599!!!!!!!!!!$34MEfe`!!!!!dC*6%8"!!#J4NP-43%!!+&'58a&!3! | ||
4746 | !SNG599!!!!!!!!!!$J4MEfjQ!!!!!NC*6%8"!!#M4NP-43%!!+4(8P93!!!!!!! | ||
4747 | !!!m$C'9c!!!!'NC*6%8"!!#P4NP-43%!!+C'58a&!3!!U%C*6%8"!!#T4NP-43% | ||
4748 | !!+Y'58a&!3!!V%C*6%8"!!#Z4NP-43%!!CC'58a&!3!!VdC*6%8"!!#b4NP-43% | ||
4749 | !!,0'58a&!3!!Y%C*6%8"!!#e4NP-43%!!,C'58a&!3!!Z%C*6%8"!!#j4NP-43% | ||
4750 | !!,T'58a&!3!!UNC*6%8"!!#`4NP-43%!!,G'58a&!3!![8C*6%8"!!#l4NP-43% | ||
4751 | !!+G'58a&!3!!X8C*6%8"!!#m4NP-43%!!+e(8P93!!!!!!!!!"!#C'J!!!!&4NP | ||
4752 | -43%!!-"'58a&!3!!`8C*6%8"!!$#4NP-43%!!,j'58a&!3!![dG599!!!!!!!!! | ||
4753 | !%30NFf%!!!!)4NP-43%!!-9'58a&!3!!aNC*6%8"!!$(4NP-43%!!-0'58a&!3! | ||
4754 | !b8C*6%8"!!$)4NP-43%!!-4'58a&!3!"JNG599!!!!!!!!!!%J0PFR)!!!!$4NP | ||
4755 | -43%!!-T'58a&!3!!bdC*6%8"!!$-4e*98!!!!!!!!!!6!f9fF!!!!$p'58a&!3! | ||
4756 | !ddC*6%8"!!$54NP-43%!!04'58a&!3!!eNC*6%8"!!$V4NP-43%!!0e'58a&!3! | ||
4757 | !j%C*6%8"!!$c4NP-43%!!1a'58a&!3!!hNC*6%8"!!$P4NP-43%!!24'58a&!3! | ||
4758 | !k%C*6%8"!!$D4NP-43%!!2G'58a&!3!"!NC*6%8"!!$K4NP-43%!!2"'58a&!3! | ||
4759 | !q%C*6%8"!!$Y4NP-43%!!0p'58a&!3!!jNC*6%8"!!$e4NP-43%!!1P'58a&!3! | ||
4760 | !fdC*6%8"!!$L4NP-43%!!2&'58a&!3!!kNC*6%8"!!$F4NP-43%!!10'58a&!3! | ||
4761 | !mNC*6%8"!!$Z4NP-43%!!1"'58a&!3!!jdC*6%8"!!$f4NP-43%!!2j'58a&!3! | ||
4762 | !qdC*6%8"!!$m4NP-43%!!3"'58a&!3!"!8C*6%8"!!$j4NP-43%!!2T'58a&!3! | ||
4763 | !r8C*6%8"!!$r4NP-43%!!3C'58a&!3!""dC*6%8"!!%)4NP-43%!!3P'58a&!3! | ||
4764 | ""8C*6%8"!!%%4NP-43%!!30'58a&!3!!cdC*6%8"!!$04NP-43%!!-j'58a&!3! | ||
4765 | !e8C*6%8"!!$[4NP-43%!!0&'58a&!3!!edC*6%8"!!$34NP-43%!!0P'58a&!3! | ||
4766 | !f%C*6%8"!!'A4NP-43%!!CK(8P93!!!!!!!!!"3%D'eKB`!!!!&'58a&!3!"#NG | ||
4767 | 599!!!!!!!!!!&34TC'9K!!!!"8C*6%8"!!%,4NP-43%!!3a'58a&!3!"$NC*6%8 | ||
4768 | "!!%04NP-43%!!3p(8P93!!!!!!!!!"B&E'KKFfJ!!!!#4NP-43%!!4"'58a&!3! | ||
4769 | "%8G599!!!!!!!!!!&`0YC$)!!!!#4NP-43%!!4*'58a&!3!"%dG599!!!!!!!!! | ||
4770 | !'!0YC$8!!!!#4NP-43%!!44'58a&!3!"&8G599!!!!!!!!!!'34YC'-b!!!!!NC | ||
4771 | *6%8"!!%@4NP-43%!!4G(8P93!!!!!!!!!"S(Ef*UC@0dF`!!!!4'58a&!3!"'dC | ||
4772 | *6%8"!!%B4NP-43%!!4T'58a&!3!"'8G599!!!!!!!!!!'`0`C@d!!!!'4NP-43% | ||
4773 | !!5&'58a&!3!")%C*6%8"!!%H4NP-43%!!4p'58a&!3!"(%C*6%8"!!%G4e*98!! | ||
4774 | !!!!!!!!F"R"VBh-a-J!!!""'58a&!3!")NC*6%8"!!%M4NP-43%!!54'58a&!3! | ||
4775 | "*8C*6%8"!!%Q4NP-43%!!5G'58a&!3!"+%C*6%8"!!%T4NP-43%!!5T'58a&!3! | ||
4776 | "+dC*6%8"!!%X4NP-43%!!5e'58a&!3!",NC*6%8"!!%[4NP-43%!!CP'58a&!3! | ||
4777 | "-%G599!!!!!!!!!!(39`Df0c0`!!!!C'58a&!3!"-NC*6%8"!!%c4NP-43%!!6& | ||
4778 | '58a&!3!"R%C*6%8"!!'D4NP-43%!!CY(8P93!!!!!!!!!"i%FQ&ZC!!!!!4'58a | ||
4779 | &!3!"0%C*6%8"!!%e4NP-43%!!6C'58a&!3!"TdG599!!!!!!!!!!(`0bBc)!!!! | ||
4780 | &4NP-43%!!6T'58a&!3!"1dC*6%8"!!%j4NP-43%!!6G'58a&!3!"1%G599!!!!! | ||
4781 | !!!!!)!0bBc3!!!!#4NP-43%!!6e'58a&!3!"2%G599!!!!!!!!!!)30bBc8!!!! | ||
4782 | &4NP-43%!!8*'58a&!3!"3%C*6%8"!!&"4NP-43%!!6j'58a&!3!"2dG599!!!!! | ||
4783 | !!!!!)JCbDA"PE@3!!!!#4NP-43%!!80'58a&!3!"4%G599!!!!!!!!!!)`0bFf% | ||
4784 | !!!!-4NP-43%!!89'58a&!3!"4dC*6%8"!!&)4NP-43%!!8e'58a&!3!"6%C*6%8 | ||
4785 | "!!&'4NP-43%!!8Y'58a&!3!"6NC*6%8"!!&*4NP-43%!!8T'58a&!3!"R8C*6%8 | ||
4786 | "!!'H4e*98!!!!!!!!!!N!h0SB3!!!!4'58a&!3!"88C*6%8"!!&24NP-43%!!9* | ||
4787 | '58a&!3!"8%G599!!!!!!!!!!*39cG'&MD`!!!!&'58a&!3!"8dG599!!!!!!!!! | ||
4788 | !*JCdH(4IC')!!!!"4NP-43%!!94(8P93!!!!!!!!!#F%H$8`13!!!"9'58a&!3! | ||
4789 | "A%C*6%8"!!&E4NP-43%!!@&'58a&!3!"@NC*6%8"!!&J4NP-43%!!@*'58a&!3! | ||
4790 | "JdC*6%8"!!&Q4NP-43%!!@0'58a&!3!"@%C*6%8"!!&G4NP-43%!!9G'58a&!3! | ||
4791 | "C8C*6%8"!!&H4NP-43%!!9P'58a&!3!"AdC*6%8"!!&R4NP-43%!!@4'58a&!3! | ||
4792 | "K%C*6%8"!!&94NP-43%!!9C(8P93!!!!!!!!!#J'H$8`1ABc!!!!&8C*6%8"!!& | ||
4793 | V4NP-43%!!@a'58a&!3!"E8C*6%8"!!&a4NP-43%!!A0'58a&!3!"G8C*6%8"!!& | ||
4794 | h4NP-43%!!AT'58a&!3!"D%C*6%8"!!&b4NP-43%!!@T'58a&!3!"H%C*6%8"!!& | ||
4795 | T4NP-43%!!AC'58a&!3!"G%C*6%8"!!&`4NP-43%!!AP'58a&!3!"ENC*6%8"!!& | ||
4796 | [4NP-43%!!B9'58a&!3!"KNG599!!!!!!!!!!+30cFf`!!!!M4NP-43%!!"0'58a | ||
4797 | &!3!!&8C*6%8"!!!34NP-43%!!"*'58a&!3!!%8C*6%8"!!!84NP-43%!!"T'58a | ||
4798 | &!3!!(%C*6%8"!!!A4NP-43%!!"P'58a&!3!!'%C*6%8"!!!E4NP-43%!!"C'58a | ||
4799 | &!3!!$8C*6%8"!!!24NP-43%!!!Y'58a&!3!!$%C*6%8"!!!14NP-43%!!#Y'58a | ||
4800 | &!3!!,%C*6%8"!!!S4NP-43%!!#T'58a&!3!!+8C*6%8"!!!M4NP-43%!!#*'58a | ||
4801 | &!3!!(dC*6%8"!!!P4NP-43%!!#"'58a&!3!!*NC*6%8"!!!N4NP-43%!!"j'58a | ||
4802 | &!3!!*dC*6%8"!!!G4NP-43%!!!T'58a&!3!!)8G599!!!!!!!!!!+Jj(990*)%a | ||
4803 | TBR*KFQPPF`!!!!0'58a&!J!!,dG599!!!!!!!!!!+`038%-!!!!$4NP-43)!!$" | ||
4804 | '58a&!J!!-8C*6%8#!!!b4e*98!!!!!!!!!!X!cBiD`!!!!0'58a&"3!!&%C*6%8 | ||
4805 | &!!!94NP-438!!"C(8P93!!!!!!!!!#d138j655"-D@*bBA*TCA-!!!!#4e*98!! | ||
4806 | !!!!!!!!Z!e"33`!!!!*'58a&!3!!!8C*6%8"!!&r4e*98!!!!!!!!!![!cBiD`! | ||
4807 | !!!*'58a&!`!"S%C*6%8$!!'K4e*98!!!!!!!!!!`$8eKBb"-D@*bBA*TCA-!!!! | ||
4808 | #4e*98!!!!!!!!!!a!e"33`!!!!P'58a&!3!!"%C*6%8"!!!#4NP-43%!!!0'58a | ||
4809 | &!3!!#8C*6%8"!!!)4NP-43%!!!G'58a&!3!!"NC*6%8"!!!&4NP-43%!!D9(8P9 | ||
4810 | 3!!!!!!!!!$)$0MKV!!!!"NC*6%8$!!'D4NP-43-!!D*'58a&!`!"R%C*6%8$!!' | ||
4811 | G4NP-43-!!Cp'58a&!`!"Q`!!!4#V3!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
4812 | !!!!!!!!!!!!"+!!!'!"YFh4b!!!!!!!!!!!!!!!!!!!C+!!!#S"YFh4X!!!!!!! | ||
4813 | !!!!!!!!!!!!MU!!!!i"YFh4Z!!!!!!!!!!!!!!!!!!!R+!!!'!"YFh4b!!!$k!! | ||
4814 | !!!!!!!!!!!!r+!!!'B"YFh4X!!!$k!!!!!!!!!!!!!0TDJ!!#)"YFh4Z!!!$k!! | ||
4815 | !!!!!!!!!!!"E+!!!"4"`FQ9Q!!P'eJ!!!!%!!!!!!!"J1!!!!!K`FQ9Q!!L`,3! | ||
4816 | !!!)!!!!!!!"J3!!!!"T`FQ9Q!!PX2!!!!!-!!!!!!!"J@J!!$+"`FQ9Q!!MrS3! | ||
4817 | !!!3!!!!!!!"XqJ!!"K4`FQ9Q!!L+i3!!!!8!!!!!!!"c$J!!#*C`FQ9Q!!P5m!! | ||
4818 | !!!B!!!!!!!"lT!!!!3G`FQ9Q!!Le63!!!!F!!!!!!!"mU`!!!b"`FQ9Q!!N!,`! | ||
4819 | !!!J!!!!!!!"rb`!!!"4`FQ9Q!!NR4!!!!!N!!!!!!!"rh`!!!!T`FQ9Q!!M`UJ! | ||
4820 | !!!S!!!!!!!"rk3!!!!a`FQ9Q!!L"hJ!!!!X!!!!!!!"rp3!!!!j`FQ9Q!!M0!!! | ||
4821 | !!!`!!!!!!!#!!`!!!3C`FQ9Q!!Kpf3!!!!d!!!!!!!#"#3!!!$j`FQ9Q!!N#K!! | ||
4822 | !!!i!!!!!!!#"4`!!!!j`FQ9Q!!PRC3!!!!m!!!!!!!#"93!!!GT`FQ9Q!!MG@`! | ||
4823 | !!"!!!!!!!!#$,`!!!'*`FQ9Q!!M*!3!!!"%!!!!!!!#$N3!!!"4`FQ9Q!!MP"`! | ||
4824 | !!")!!!!!!!#$T3!!!!T`FQ9Q!!LpV!!!!"-!!!!!!!#$V`!!!!a`FQ9Q!!PJK`! | ||
4825 | !!"3!!!!!!!#$Z`!!!-T`FQ9Q!!L(e!!!!"8!!!!!!!#%K3!!!4K`FQ9Q!!LAh3! | ||
4826 | !!"B!!!!!!!#&R3!!!+K`FQ9Q!!LpP!!!!"F!!!!!!!#'43!!!#j`FQ9Q!!PBJJ! | ||
4827 | !!"J!!!!!!!#'F`!!!Ja`FQ9Q!!N()3!!!"N!!!!!!!#)I`!!4J"YG("X!!!!!3! | ||
4828 | !!!!!!!!!!!$1I`!!"`"YG("c!!!!!3!!!!!!!!!!!!$9I`!!!""YG("T!!!!!3! | ||
4829 | !!!!!!!!!!!$9M`!!"U"YG'a[!!!!!3!!!!!!!!!!!!$F,`!!!#"YG(0X!!!!!3! | ||
4830 | !!!!!!!!!!!$F6`!!"4"`FQ9Q!!NN23!!!"S!!!!!!!$KA`!!!!K`FQ9Q!!M6`J! | ||
4831 | !!"X!!!!!!!$KC`!!!"T`FQ9Q!!KkI3!!!"`!!!!!!!$KJ3!!%0"`FQ9Q!!LKD`! | ||
4832 | !!"d!!!!!!!$b83!!"K4`FQ9Q!!PS2J!!!"i!!!!!!!$iC3!!#*C`FQ9Q!!M14`! | ||
4833 | !!"m!!!!!!!%!q`!!!3G`FQ9Q!!P,IJ!!!#!!!!!!!!%#!J!!!b"`FQ9Q!!Mle3! | ||
4834 | !!#%!!!!!!!%&)J!!!"4`FQ9Q!!NP93!!!#)!!!!!!!%&0J!!!!T`FQ9Q!!LIJJ! | ||
4835 | !!#-!!!!!!!%&3!!!!!a`FQ9Q!!L8Z!!!!#3!!!!!!!%&6!!!!!j`FQ9Q!!P54!! | ||
4836 | !!#8!!!!!!!%&@J!!!3C`FQ9Q!!P'2`!!!#B!!!!!!!%'B!!!!$j`FQ9Q!!N63!! | ||
4837 | !!#F!!!!!!!%'RJ!!!!j`FQ9Q!!MZ(3!!!#J!!!!!!!%'V!!!!GT`FQ9Q!!Lmf!! | ||
4838 | !!#N!!!!!!!%)KJ!!!'*`FQ9Q!!LrK!!!!#S!!!!!!!%)k!!!!"4`FQ9Q!!NchJ! | ||
4839 | !!#X!!!!!!!%)r!!!!!T`FQ9Q!!M,S!!!!#`!!!!!!!%*"J!!!!a`FQ9Q!!N%'3! | ||
4840 | !!#d!!!!!!!%*%J!!!-T`FQ9Q!!NJ2!!!!#i!!!!!!!%*h!!!!4K`FQ9Q!!PIl3! | ||
4841 | !!#m!!!!!!!%+p!!!!+K`FQ9Q!!Lq%J!!!$!!!!!!!!%,R!!!!#j`FQ9Q!!LM0`! | ||
4842 | !!$%!!!!!!!%,bJ!!!Ja`FQ9Q!!NG#`!!!$)!!!!!!!%0eJ!!#J"YG("X!!!!!J! | ||
4843 | !!!!!!!!!!!%AeJ!!!3"YG("c!!!!!J!!!!!!!!!!!!%BeJ!!!""YG("T!!!!!J! | ||
4844 | !!!!!!!!!!!%BjJ!!!0"YG'a[!!!!!J!!!!!!!!!!!!%CYJ!!!#"YG(0X!!!!!J! | ||
4845 | !!!!!!!!!!!%CeJ!!"4"`FQ9Q!!PDj!!!!$-!!!!!!!%HjJ!!!!K`FQ9Q!!NN$!! | ||
4846 | !!$3!!!!!!!%HlJ!!!"T`FQ9Q!!MT*`!!!$8!!!!!!!%I#!!!$+"`FQ9Q!!P`ZJ! | ||
4847 | !!$B!!!!!!!%VU!!!"K4`FQ9Q!!N$-3!!!$F!!!!!!!%a[!!!#5C`FQ9Q!!L9f`! | ||
4848 | !!$J!!!!!!!%kiJ!!!3G`FQ9Q!!LI%`!!!$N!!!!!!!%lk3!!!b"`FQ9Q!!Lj$!! | ||
4849 | !!$S!!!!!!!%r#3!!!"4`FQ9Q!!MhR`!!!$X!!!!!!!%r(3!!!!T`FQ9Q!!M-hJ! | ||
4850 | !!$`!!!!!!!%r*`!!!!a`FQ9Q!!N&m!!!!$d!!!!!!!%r-`!!!!j`FQ9Q!!P[``! | ||
4851 | !!$i!!!!!!!%r33!!!3C`FQ9Q!!MmQ!!!!$m!!!!!!!&!4`!!!$j`FQ9Q!!MK!J! | ||
4852 | !!%!!!!!!!!&!K3!!!!j`FQ9Q!!LfY`!!!%%!!!!!!!&!N`!!!GT`FQ9Q!!MPM!! | ||
4853 | !!%)!!!!!!!&#E3!!!'*`FQ9Q!!PS+!!!!%-!!!!!!!&#c`!!!"4`FQ9Q!!MH03! | ||
4854 | !!%3!!!!!!!&#i`!!!!T`FQ9Q!!PH+3!!!%8!!!!!!!&#l3!!!!a`FQ9Q!!L*a3! | ||
4855 | !!%B!!!!!!!&#q3!!!-T`FQ9Q!!L*,!!!!%F!!!!!!!&$``!!!4K`FQ9Q!!MZ"!! | ||
4856 | !!%J!!!!!!!&%f`!!!+K`FQ9Q!!L@Q`!!!%N!!!!!!!&&J`!!!#j`FQ9Q!!M8&3! | ||
4857 | !!%S!!!!!!!&&X3!!!Ja`FQ9Q!!Lj"J!!!%X!!!!!!!&([3!!4J"YG("X!!!!!`! | ||
4858 | !!!!!!!!!!!'0[3!!"`"YG("c!!!!!`!!!!!!!!!!!!'8[3!!!""YG("T!!!!!`! | ||
4859 | !!!!!!!!!!!'8c3!!!#"YG(0X!!!!!`!!!!!!!!!!!!'8l3!!"T4YG'a[!!!!!`! | ||
4860 | !!!!!!!!!!!'EJ3!!"4"`FQ9Q!!N*[!!!!%`!!!!!!!'JN3!!!!K`FQ9Q!!Kq93! | ||
4861 | !!%d!!!!!!!'JQ3!!!"T`FQ9Q!!M+H`!!!%i!!!!!!!'JX`!!%0"`FQ9Q!!N6p!! | ||
4862 | !!%m!!!!!!!'aJ`!!"K4`FQ9Q!!M$+3!!!&!!!!!!!!'hP`!!#5C`FQ9Q!!L!9`! | ||
4863 | !!&%!!!!!!!(![3!!!3G`FQ9Q!!N`BJ!!!&)!!!!!!!("a!!!!b"`FQ9Q!!M3)3! | ||
4864 | !!&-!!!!!!!(%j!!!!"4`FQ9Q!!L4H3!!!&3!!!!!!!(%q!!!!!T`FQ9Q!!NR0J! | ||
4865 | !!&8!!!!!!!(&!J!!!!a`FQ9Q!!L'$3!!!&B!!!!!!!(&$J!!!!j`FQ9Q!!MR53! | ||
4866 | !!&F!!!!!!!(&(!!!!3C`FQ9Q!!PEH!!!!&J!!!!!!!(')J!!!$j`FQ9Q!!MfA3! | ||
4867 | !!&N!!!!!!!('B!!!!!j`FQ9Q!!N&53!!!&S!!!!!!!('EJ!!!GT`FQ9Q!!LB-`! | ||
4868 | !!&X!!!!!!!()5!!!!'*`FQ9Q!!L6[3!!!&`!!!!!!!()UJ!!!"4`FQ9Q!!LeT`! | ||
4869 | !!&d!!!!!!!()[J!!!!T`FQ9Q!!N,D`!!!&i!!!!!!!()b!!!!!a`FQ9Q!!LcY`! | ||
4870 | !!&m!!!!!!!()e!!!!-T`FQ9Q!!LFj`!!!'!!!!!!!!(*RJ!!!4K`FQ9Q!!N!V3! | ||
4871 | !!'%!!!!!!!(+YJ!!!+K`FQ9Q!!N(2!!!!')!!!!!!!(,AJ!!!#j`FQ9Q!!LQY!! | ||
4872 | !!'-!!!!!!!(,M!!!!Ja`FQ9Q!!M053!!!'3!!!!!!!(0Q!!!#J"YG("X!!!!"!! | ||
4873 | !!!!!!!!!!!(AQ!!!!3"YG("c!!!!"!!!!!!!!!!!!!(BQ!!!!""YG("T!!!!"!! | ||
4874 | !!!!!!!!!!!(BU!!!!#"YG(0X!!!!"!!!!!!!!!!!!!(Bb!!!!)aYG'a[!!!!"!! | ||
4875 | !!!!!!!!!!!(C9!!!"4"`FQ9Q!!MM#`!!!'8!!!!!!!(HC!!!!!K`FQ9Q!!M"$!! | ||
4876 | !!'B!!!!!!!(HE!!!!"T`FQ9Q!!MYHJ!!!'F!!!!!!!(HKJ!!%0"`FQ9Q!!MKm`! | ||
4877 | !!'J!!!!!!!([9J!!"K4`FQ9Q!!Nre3!!!'N!!!!!!!(eDJ!!#5C`FQ9Q!!LZ3J! | ||
4878 | !!'S!!!!!!!(qN!!!!!%(F(*PCJ!)KRi!!!"V!!!!!!!"rjF!!!-JF(*PCJ!)PD8 | ||
4879 | !!!"X!!!!!!!#!VF!!!!8F(*PCJ!*0m)!!!"Y!!!!!!!#!XX!!!!+F(*PCJ!*AZd | ||
4880 | !!!"Z!!!!!!!#!Y8!!!!-F(*PCJ!)Vii!!!"[!!!!!!!#!Z%!!!!1F(*PCJ!*,[d | ||
4881 | !!!"`!!!!!!!#!Zm!!!%'F(*PCJ!*'EB!!!"a!!!!!!!#!r8!!!!qF(*PCJ!*0P8 | ||
4882 | !!!"b!!!!!!!#"$-!!!!1F(*PCJ!*-D%!!!"c!!!!!!!#"%%!!!(DF(*PCJ!*0"i | ||
4883 | !!!"d!!!!!!!#"KX!!!"LF(*PCJ!)GH!!!!"e!!!!!!!#"Rd!!!!8F(*PCJ!)Q)S | ||
4884 | !!!"f!!!!!!!#"T%!!!!+F(*PCJ!*!Pd!!!"h!!!!!!!#"TX!!!!-F(*PCJ!)PR- | ||
4885 | !!!"i!!!!!!!#"UF!!!$+F(*PCJ!)TC!!!!!!H3!!!!!!!JGa!!!"'("bC@B!#-A | ||
4886 | 9!!!!HJ!!!!!!!JL*!!!!U("bC@B!#86U!!!!H`!!!!!!!JNa!!!!,R"bC@B!#@@ | ||
4887 | 8!!!!I!!!!!!!!JPI!!!#$("bC@B!#(ep!!!!I3!!!!!!!JYV!!!&!'edF'`!!!! | ||
4888 | &!!!!!!!!!!!!!K"V!!!!J'edF(-!!!!&!!!!!!!!!!!!!K$V!!!!%'edF'N!!!! | ||
4889 | &!!!!!!!!!!!!!K$l!!!!)'edFf`!!!!&!!!!!!!!!!!!!K%E!!!!J'edE'm!!!! | ||
4890 | &!!!!!!!!!!!!!K'E!!!&%("bC@B!#8UQ!!!!IJ!!!!!!!KDV!!!!#("bC@B!#22 | ||
4891 | (!!!!I`!!!!!!!KDc!!!!'R"bC@B!#3#p!!!!J!!!!!!!!KE0!!!3d("bC@B!#2` | ||
4892 | [!!!!J3!!!!!!!LHG!!!'&("bC@B!#1[4!!!!JJ!!!!!!!Lfa!!!)PR"bC@B!#(, | ||
4893 | 9!!!!J`!!!!!!!MC(!!!""h"bC@B!#@rk!!!!K!!!!!!!!MG1!!!$)("bC@B!#1G | ||
4894 | '!!!!K3!!!!!!!MTZ!!!!&("bC@B!#128!!!!KJ!!!!!!!MU#!!!!#R"bC@B!#,1 | ||
4895 | q!!!!K`!!!!!!!MU-!!!!$("bC@B!#)c'!!!!L!!!!!!!!MUB!!!!$R"bC@B!#4S | ||
4896 | ,!!!!L3!!!!!!!MUQ!!!""R"bC@B!#-iX!!!!LJ!!!!!!!MZX!!!!2R"bC@B!#(C | ||
4897 | #!!!!L`!!!!!!!M[U!!!!$R"bC@B!#@+F!!!!M!!!!!!!!M[i!!!"fR"bC@B!#8( | ||
4898 | h!!!!M3!!!!!!!Mh5!!!!BR"bC@B!#2!L!!!!MJ!!!!!!!Mid!!!!&("bC@B!#(d | ||
4899 | @!!!!M`!!!!!!!Mj)!!!!#R"bC@B!#2iC!!!!N!!!!!!!!!)q8J!!!!a`FQ9Q!!M | ||
4900 | YZ!!!!*%!!!!!!!)qAJ!!!-T`FQ9Q!!Pb83!!!*)!!!!!!!)r+!!!!4K`FQ9Q!!L | ||
4901 | a"3!!!*-!!!!!!!*!3!!!!+K`FQ9Q!!NZf`!!!*3!!!!!!!*!k!!!!#j`FQ9Q!!K | ||
4902 | j[`!!!*8!!!!!!!*"&J!!!Ja`FQ9Q!!Mi,3!!!*B!!!!!!!*$)J!!#J"YG("X!!! | ||
4903 | !"J!!!!!!!!!!!!*0)J!!!3"YG("c!!!!"J!!!!!!!!!!!!*1)J!!!""YG("T!!! | ||
4904 | !"J!!!!!!!!!!!!*1-J!!!)aYG'a[!!!!"J!!!!!!!!!!!!*1[J!!!#"YG(0X!!! | ||
4905 | !"J!!!!!!!!!!!!*1hJ!!"4"`FQ9Q!!Kf)J!!!*F!!!!!!!*6lJ!!!!K`FQ9Q!!N | ||
4906 | bh`!!!*J!!!!!!!*6pJ!!!"T`FQ9Q!!MZB3!!!*N!!!!!!!*8%!!!%0"`FQ9Q!!M | ||
4907 | [m`!!!*S!!!!!!!*Ni!!!"K4`FQ9Q!!NVZ`!!!*X!!!!!!!*Up!!!#*C`FQ9Q!!M | ||
4908 | b!J!!!*`!!!!!!!*cLJ!!!3G`FQ9Q!!P083!!!*d!!!!!!!*dN3!!!b"`FQ9Q!!M | ||
4909 | a13!!!*i!!!!!!!*hX3!!!"4`FQ9Q!!P9h3!!!*m!!!!!!!*ha3!!!!T`FQ9Q!!M | ||
4910 | +,3!!!+!!!!!!!!*hc`!!!!a`FQ9Q!!L6T`!!!+%!!!!!!!*hf`!!!!j`FQ9Q!!M | ||
4911 | jB3!!!+)!!!!!!!*hk3!!!3C`FQ9Q!!L0Z`!!!+-!!!!!!!*il`!!!$j`FQ9Q!!M | ||
4912 | P3J!!!+3!!!!!!!*j,3!!!!j`FQ9Q!!N6hJ!!!+8!!!!!!!*j1`!!!GT`FQ9Q!!N | ||
4913 | kJ`!!!+B!!!!!!!*l&3!!!'*`FQ9Q!!N&H!!!!+F!!!!!!!*lG`!!!"4`FQ9Q!!L | ||
4914 | ,iJ!!!+J!!!!!!!*lL`!!!!T`FQ9Q!!MDI3!!!+N!!!!!!!*lP3!!!!a`FQ9Q!!K | ||
4915 | l33!!!+S!!!!!!!*lS3!!!-T`FQ9Q!!MlG3!!!+X!!!!!!!*mD`!!!4K`FQ9Q!!L | ||
4916 | e&!!!!+`!!!!!!!*pJ`!!!+K`FQ9Q!!MK1`!!!+d!!!!!!!*q+`!!!#j`FQ9Q!!L | ||
4917 | Y#!!!!+i!!!!!!!*q@3!!!Ja`FQ9Q!!L42`!!!+m!!!!!!!+!C3!!2!"YG("X!!! | ||
4918 | !"`!!!!!!!!!!!!+mC3!!"J"YG("c!!!!"`!!!!!!!!!!!!,#C3!!!""YG("T!!! | ||
4919 | !"`!!!!!!!!!!!!,#G3!!"G4YG'a[!!!!"`!!!!!!!!!!!!,)53!!!#"YG(0X!!! | ||
4920 | !"`!!!!!!!!!!!!,)D3!!"4"`FQ9Q!!NXL3!!!,!!!!!!!!,0H3!!!!K`FQ9Q!!P | ||
4921 | %U3!!!,%!!!!!!!,0J3!!!"T`FQ9Q!!LT(!!!!,)!!!!!!!,0Q`!!%0"`FQ9Q!!N | ||
4922 | (M3!!!,-!!!!!!!,HD`!!"K4`FQ9Q!!PH[`!!!,3!!!!!!!,NI`!!#5C`FQ9Q!!M | ||
4923 | Hh!!!!,8!!!!!!!,YT3!!!3G`FQ9Q!!M`h!!!!,B!!!!!!!,ZV!!!!b"`FQ9Q!!L | ||
4924 | N03!!!,F!!!!!!!,ac!!!!"4`FQ9Q!!Mb6J!!!,J!!!!!!!,ai!!!!!T`FQ9Q!!N | ||
4925 | a@!!!!,N!!!!!!!,akJ!!!!a`FQ9Q!!LH1J!!!,S!!!!!!!,apJ!!!!j`FQ9Q!!N | ||
4926 | "f3!!!,X!!!!!!!,b"!!!!3C`FQ9Q!!P`p!!!!,`!!!!!!!,c#J!!!$j`FQ9Q!!P | ||
4927 | Qf!!!!,d!!!!!!!,c5!!!!!j`FQ9Q!!PYDJ!!!,i!!!!!!!,c9J!!!GT`FQ9Q!!N | ||
4928 | #-!!!!,m!!!!!!!,e-!!!!'*`FQ9Q!!ME@!!!!-!!!!!!!!,eNJ!!!"4`FQ9Q!!L | ||
4929 | j4`!!!-%!!!!!!!,eTJ!!!!T`FQ9Q!!Mf$3!!!-)!!!!!!!,eX!!!!!a`FQ9Q!!M | ||
4930 | eDJ!!!--!!!!!!!,e[!!!!-T`FQ9Q!!MfF3!!!-3!!!!!!!,fKJ!!!4K`FQ9Q!!N | ||
4931 | `R`!!!-8!!!!!!!,hRJ!!!+K`FQ9Q!!LqH3!!!-B!!!!!!!,i4J!!!#j`FQ9Q!!L | ||
4932 | 3!*S!!!$(!!!!!!!#q(3!!!)-F(*PCJ!)d'B!!!$)!!!!!!!#qS!!!$`!EA4`E!! | ||
4933 | !!!J!!!!!!!!!!!!$0S!!!!B!EA4`F`!!!!J!!!!!!!!!!!!$2)!!!!!3EA4`D3! | ||
4934 | !!!J!!!!!!!!!!!!$2*!!!!!!)'edFf`!!!!)!!!!!!!!!!!!!cb`!!!&e'edE'm | ||
4935 | !!!!)!!!!!!!!!!!!!d+%!!!3a'edCf`!!!2S!!!!!!!!!!!!!e0)!!!!,'e[G'N | ||
4936 | !!!!!!!!!!!!!!!!!!h(U!!!6J&"-Fh3!#,"V!!!!b3!!!!!!!&LS!!!#,'e`FfN | ||
4937 | !!!2S!!!!!!!!!!!!!fMk!!!!%'ecG(!!!!!#!!!!!!!!!!!!!fN+!!!!%'ecG(! | ||
4938 | !!!!&!!!!!!!!!!!!!&V8!!!!+'ecG'N!!!2S!!!!!!!!!!!!!fP#!!!!+'ecG'N | ||
4939 | !!!!!!!!!!!!!!!!!!&Vm!!!!$'eKE'`!!!!!!!!!!!!!!!!!!fE1!!!!a'eKF'` | ||
4940 | !!!!!!!!!!!!!!!$B03!!: | ||
diff --git a/src/lib/libssl/src/MacOS/Randomizer.cpp b/src/lib/libssl/src/MacOS/Randomizer.cpp new file mode 100644 index 0000000000..cceb6bde44 --- /dev/null +++ b/src/lib/libssl/src/MacOS/Randomizer.cpp | |||
@@ -0,0 +1,476 @@ | |||
1 | /* | ||
2 | ------- Strong random data generation on a Macintosh (pre - OS X) ------ | ||
3 | |||
4 | -- GENERAL: We aim to generate unpredictable bits without explicit | ||
5 | user interaction. A general review of the problem may be found | ||
6 | in RFC 1750, "Randomness Recommendations for Security", and some | ||
7 | more discussion, of general and Mac-specific issues has appeared | ||
8 | in "Using and Creating Cryptographic- Quality Random Numbers" by | ||
9 | Jon Callas (www.merrymeet.com/jon/usingrandom.html). | ||
10 | |||
11 | The data and entropy estimates provided below are based on my | ||
12 | limited experimentation and estimates, rather than by any | ||
13 | rigorous study, and the entropy estimates tend to be optimistic. | ||
14 | They should not be considered absolute. | ||
15 | |||
16 | Some of the information being collected may be correlated in | ||
17 | subtle ways. That includes mouse positions, timings, and disk | ||
18 | size measurements. Some obvious correlations will be eliminated | ||
19 | by the programmer, but other, weaker ones may remain. The | ||
20 | reliability of the code depends on such correlations being | ||
21 | poorly understood, both by us and by potential interceptors. | ||
22 | |||
23 | This package has been planned to be used with OpenSSL, v. 0.9.5. | ||
24 | It requires the OpenSSL function RAND_add. | ||
25 | |||
26 | -- OTHER WORK: Some source code and other details have been | ||
27 | published elsewhere, but I haven't found any to be satisfactory | ||
28 | for the Mac per se: | ||
29 | |||
30 | * The Linux random number generator (by Theodore Ts'o, in | ||
31 | drivers/char/random.c), is a carefully designed open-source | ||
32 | crypto random number package. It collects data from a variety | ||
33 | of sources, including mouse, keyboard and other interrupts. | ||
34 | One nice feature is that it explicitly estimates the entropy | ||
35 | of the data it collects. Some of its features (e.g. interrupt | ||
36 | timing) cannot be reliably exported to the Mac without using | ||
37 | undocumented APIs. | ||
38 | |||
39 | * Truerand by Don P. Mitchell and Matt Blaze uses variations | ||
40 | between different timing mechanisms on the same system. This | ||
41 | has not been tested on the Mac, but requires preemptive | ||
42 | multitasking, and is hardware-dependent, and can't be relied | ||
43 | on to work well if only one oscillator is present. | ||
44 | |||
45 | * Cryptlib's RNG for the Mac (RNDMAC.C by Peter Gutmann), | ||
46 | gathers a lot of information about the machine and system | ||
47 | environment. Unfortunately, much of it is constant from one | ||
48 | startup to the next. In other words, the random seed could be | ||
49 | the same from one day to the next. Some of the APIs are | ||
50 | hardware-dependent, and not all are compatible with Carbon (OS | ||
51 | X). Incidentally, the EGD library is based on the UNIX entropy | ||
52 | gathering methods in cryptlib, and isn't suitable for MacOS | ||
53 | either. | ||
54 | |||
55 | * Mozilla (and perhaps earlier versions of Netscape) uses the | ||
56 | time of day (in seconds) and an uninitialized local variable | ||
57 | to seed the random number generator. The time of day is known | ||
58 | to an outside interceptor (to within the accuracy of the | ||
59 | system clock). The uninitialized variable could easily be | ||
60 | identical between subsequent launches of an application, if it | ||
61 | is reached through the same path. | ||
62 | |||
63 | * OpenSSL provides the function RAND_screen(), by G. van | ||
64 | Oosten, which hashes the contents of the screen to generate a | ||
65 | seed. This is not useful for an extension or for an | ||
66 | application which launches at startup time, since the screen | ||
67 | is likely to look identical from one launch to the next. This | ||
68 | method is also rather slow. | ||
69 | |||
70 | * Using variations in disk drive seek times has been proposed | ||
71 | (Davis, Ihaka and Fenstermacher, world.std.com/~dtd/; | ||
72 | Jakobsson, Shriver, Hillyer and Juels, | ||
73 | www.bell-labs.com/user/shriver/random.html). These variations | ||
74 | appear to be due to air turbulence inside the disk drive | ||
75 | mechanism, and are very strongly unpredictable. Unfortunately | ||
76 | this technique is slow, and some implementations of it may be | ||
77 | patented (see Shriver's page above.) It of course cannot be | ||
78 | used with a RAM disk. | ||
79 | |||
80 | -- TIMING: On the 601 PowerPC the time base register is guaranteed | ||
81 | to change at least once every 10 addi instructions, i.e. 10 | ||
82 | cycles. On a 60 MHz machine (slowest PowerPC) this translates to | ||
83 | a resolution of 1/6 usec. Newer machines seem to be using a 10 | ||
84 | cycle resolution as well. | ||
85 | |||
86 | For 68K Macs, the Microseconds() call may be used. See Develop | ||
87 | issue 29 on the Apple developer site | ||
88 | (developer.apple.com/dev/techsupport/develop/issue29/minow.html) | ||
89 | for information on its accuracy and resolution. The code below | ||
90 | has been tested only on PowerPC based machines. | ||
91 | |||
92 | The time from machine startup to the launch of an application in | ||
93 | the startup folder has a variance of about 1.6 msec on a new G4 | ||
94 | machine with a defragmented and optimized disk, most extensions | ||
95 | off and no icons on the desktop. This can be reasonably taken as | ||
96 | a lower bound on the variance. Most of this variation is likely | ||
97 | due to disk seek time variability. The distribution of startup | ||
98 | times is probably not entirely even or uncorrelated. This needs | ||
99 | to be investigated, but I am guessing that it not a majpor | ||
100 | problem. Entropy = log2 (1600/0.166) ~= 13 bits on a 60 MHz | ||
101 | machine, ~16 bits for a 450 MHz machine. | ||
102 | |||
103 | User-launched application startup times will have a variance of | ||
104 | a second or more relative to machine startup time. Entropy >~22 | ||
105 | bits. | ||
106 | |||
107 | Machine startup time is available with a 1-second resolution. It | ||
108 | is predictable to no better a minute or two, in the case of | ||
109 | people who show up punctually to work at the same time and | ||
110 | immediately start their computer. Using the scheduled startup | ||
111 | feature (when available) will cause the machine to start up at | ||
112 | the same time every day, making the value predictable. Entropy | ||
113 | >~7 bits, or 0 bits with scheduled startup. | ||
114 | |||
115 | The time of day is of course known to an outsider and thus has 0 | ||
116 | entropy if the system clock is regularly calibrated. | ||
117 | |||
118 | -- KEY TIMING: A very fast typist (120 wpm) will have a typical | ||
119 | inter-key timing interval of 100 msec. We can assume a variance | ||
120 | of no less than 2 msec -- maybe. Do good typists have a constant | ||
121 | rhythm, like drummers? Since what we measure is not the | ||
122 | key-generated interrupt but the time at which the key event was | ||
123 | taken off the event queue, our resolution is roughly the time | ||
124 | between process switches, at best 1 tick (17 msec). I therefore | ||
125 | consider this technique questionable and not very useful for | ||
126 | obtaining high entropy data on the Mac. | ||
127 | |||
128 | -- MOUSE POSITION AND TIMING: The high bits of the mouse position | ||
129 | are far from arbitrary, since the mouse tends to stay in a few | ||
130 | limited areas of the screen. I am guessing that the position of | ||
131 | the mouse is arbitrary within a 6 pixel square. Since the mouse | ||
132 | stays still for long periods of time, it should be sampled only | ||
133 | after it was moved, to avoid correlated data. This gives an | ||
134 | entropy of log2(6*6) ~= 5 bits per measurement. | ||
135 | |||
136 | The time during which the mouse stays still can vary from zero | ||
137 | to, say, 5 seconds (occasionally longer). If the still time is | ||
138 | measured by sampling the mouse during null events, and null | ||
139 | events are received once per tick, its resolution is 1/60th of a | ||
140 | second, giving an entropy of log2 (60*5) ~= 8 bits per | ||
141 | measurement. Since the distribution of still times is uneven, | ||
142 | this estimate is on the high side. | ||
143 | |||
144 | For simplicity and compatibility across system versions, the | ||
145 | mouse is to be sampled explicitly (e.g. in the event loop), | ||
146 | rather than in a time manager task. | ||
147 | |||
148 | -- STARTUP DISK TOTAL FILE SIZE: Varies typically by at least 20k | ||
149 | from one startup to the next, with 'minimal' computer use. Won't | ||
150 | vary at all if machine is started again immediately after | ||
151 | startup (unless virtual memory is on), but any application which | ||
152 | uses the web and caches information to disk is likely to cause | ||
153 | this much variation or more. The variation is probably not | ||
154 | random, but I don't know in what way. File sizes tend to be | ||
155 | divisible by 4 bytes since file format fields are often | ||
156 | long-aligned. Entropy > log2 (20000/4) ~= 12 bits. | ||
157 | |||
158 | -- STARTUP DISK FIRST AVAILABLE ALLOCATION BLOCK: As the volume | ||
159 | gets fragmented this could be anywhere in principle. In a | ||
160 | perfectly unfragmented volume this will be strongly correlated | ||
161 | with the total file size on the disk. With more fragmentation | ||
162 | comes less certainty. I took the variation in this value to be | ||
163 | 1/8 of the total file size on the volume. | ||
164 | |||
165 | -- SYSTEM REQUIREMENTS: The code here requires System 7.0 and above | ||
166 | (for Gestalt and Microseconds calls). All the calls used are | ||
167 | Carbon-compatible. | ||
168 | */ | ||
169 | |||
170 | /*------------------------------ Includes ----------------------------*/ | ||
171 | |||
172 | #include "Randomizer.h" | ||
173 | |||
174 | // Mac OS API | ||
175 | #include <Files.h> | ||
176 | #include <Folders.h> | ||
177 | #include <Events.h> | ||
178 | #include <Processes.h> | ||
179 | #include <Gestalt.h> | ||
180 | #include <Resources.h> | ||
181 | #include <LowMem.h> | ||
182 | |||
183 | // Standard C library | ||
184 | #include <stdlib.h> | ||
185 | #include <math.h> | ||
186 | |||
187 | /*---------------------- Function declarations -----------------------*/ | ||
188 | |||
189 | // declared in OpenSSL/crypto/rand/rand.h | ||
190 | extern "C" void RAND_add (const void *buf, int num, double entropy); | ||
191 | |||
192 | unsigned long GetPPCTimer (bool is601); // Make it global if needed | ||
193 | // elsewhere | ||
194 | |||
195 | /*---------------------------- Constants -----------------------------*/ | ||
196 | |||
197 | #define kMouseResolution 6 // Mouse position has to differ | ||
198 | // from the last one by this | ||
199 | // much to be entered | ||
200 | #define kMousePositionEntropy 5.16 // log2 (kMouseResolution**2) | ||
201 | #define kTypicalMouseIdleTicks 300.0 // I am guessing that a typical | ||
202 | // amount of time between mouse | ||
203 | // moves is 5 seconds | ||
204 | #define kVolumeBytesEntropy 12.0 // about log2 (20000/4), | ||
205 | // assuming a variation of 20K | ||
206 | // in total file size and | ||
207 | // long-aligned file formats. | ||
208 | #define kApplicationUpTimeEntropy 6.0 // Variance > 1 second, uptime | ||
209 | // in ticks | ||
210 | #define kSysStartupEntropy 7.0 // Entropy for machine startup | ||
211 | // time | ||
212 | |||
213 | |||
214 | /*------------------------ Function definitions ----------------------*/ | ||
215 | |||
216 | CRandomizer::CRandomizer (void) | ||
217 | { | ||
218 | long result; | ||
219 | |||
220 | mSupportsLargeVolumes = | ||
221 | (Gestalt(gestaltFSAttr, &result) == noErr) && | ||
222 | ((result & (1L << gestaltFSSupports2TBVols)) != 0); | ||
223 | |||
224 | if (Gestalt (gestaltNativeCPUtype, &result) != noErr) | ||
225 | { | ||
226 | mIsPowerPC = false; | ||
227 | mIs601 = false; | ||
228 | } | ||
229 | else | ||
230 | { | ||
231 | mIs601 = (result == gestaltCPU601); | ||
232 | mIsPowerPC = (result >= gestaltCPU601); | ||
233 | } | ||
234 | mLastMouse.h = mLastMouse.v = -10; // First mouse will | ||
235 | // always be recorded | ||
236 | mLastPeriodicTicks = TickCount(); | ||
237 | GetTimeBaseResolution (); | ||
238 | |||
239 | // Add initial entropy | ||
240 | AddTimeSinceMachineStartup (); | ||
241 | AddAbsoluteSystemStartupTime (); | ||
242 | AddStartupVolumeInfo (); | ||
243 | AddFiller (); | ||
244 | } | ||
245 | |||
246 | void CRandomizer::PeriodicAction (void) | ||
247 | { | ||
248 | AddCurrentMouse (); | ||
249 | AddNow (0.0); // Should have a better entropy estimate here | ||
250 | mLastPeriodicTicks = TickCount(); | ||
251 | } | ||
252 | |||
253 | /*------------------------- Private Methods --------------------------*/ | ||
254 | |||
255 | void CRandomizer::AddCurrentMouse (void) | ||
256 | { | ||
257 | Point mouseLoc; | ||
258 | unsigned long lastCheck; // Ticks since mouse was last | ||
259 | // sampled | ||
260 | |||
261 | #if TARGET_API_MAC_CARBON | ||
262 | GetGlobalMouse (&mouseLoc); | ||
263 | #else | ||
264 | mouseLoc = LMGetMouseLocation(); | ||
265 | #endif | ||
266 | |||
267 | if (labs (mLastMouse.h - mouseLoc.h) > kMouseResolution/2 && | ||
268 | labs (mLastMouse.v - mouseLoc.v) > kMouseResolution/2) | ||
269 | AddBytes (&mouseLoc, sizeof (mouseLoc), | ||
270 | kMousePositionEntropy); | ||
271 | |||
272 | if (mLastMouse.h == mouseLoc.h && mLastMouse.v == mouseLoc.v) | ||
273 | mMouseStill ++; | ||
274 | else | ||
275 | { | ||
276 | double entropy; | ||
277 | |||
278 | // Mouse has moved. Add the number of measurements for | ||
279 | // which it's been still. If the resolution is too | ||
280 | // coarse, assume the entropy is 0. | ||
281 | |||
282 | lastCheck = TickCount() - mLastPeriodicTicks; | ||
283 | if (lastCheck <= 0) | ||
284 | lastCheck = 1; | ||
285 | entropy = log2l | ||
286 | (kTypicalMouseIdleTicks/(double)lastCheck); | ||
287 | if (entropy < 0.0) | ||
288 | entropy = 0.0; | ||
289 | AddBytes (&mMouseStill, sizeof (mMouseStill), entropy); | ||
290 | mMouseStill = 0; | ||
291 | } | ||
292 | mLastMouse = mouseLoc; | ||
293 | } | ||
294 | |||
295 | void CRandomizer::AddAbsoluteSystemStartupTime (void) | ||
296 | { | ||
297 | unsigned long now; // Time in seconds since | ||
298 | // 1/1/1904 | ||
299 | GetDateTime (&now); | ||
300 | now -= TickCount() / 60; // Time in ticks since machine | ||
301 | // startup | ||
302 | AddBytes (&now, sizeof (now), kSysStartupEntropy); | ||
303 | } | ||
304 | |||
305 | void CRandomizer::AddTimeSinceMachineStartup (void) | ||
306 | { | ||
307 | AddNow (1.5); // Uncertainty in app startup | ||
308 | // time is > 1.5 msec (for | ||
309 | // automated app startup). | ||
310 | } | ||
311 | |||
312 | void CRandomizer::AddAppRunningTime (void) | ||
313 | { | ||
314 | ProcessSerialNumber PSN; | ||
315 | ProcessInfoRec ProcessInfo; | ||
316 | |||
317 | ProcessInfo.processInfoLength = sizeof (ProcessInfoRec); | ||
318 | ProcessInfo.processName = nil; | ||
319 | ProcessInfo.processAppSpec = nil; | ||
320 | |||
321 | GetCurrentProcess (&PSN); | ||
322 | GetProcessInformation (&PSN, &ProcessInfo); | ||
323 | |||
324 | // Now add the amount of time in ticks that the current process | ||
325 | // has been active | ||
326 | |||
327 | AddBytes (&ProcessInfo, sizeof (ProcessInfoRec), | ||
328 | kApplicationUpTimeEntropy); | ||
329 | } | ||
330 | |||
331 | void CRandomizer::AddStartupVolumeInfo (void) | ||
332 | { | ||
333 | short vRefNum; | ||
334 | long dirID; | ||
335 | XVolumeParam pb; | ||
336 | OSErr err; | ||
337 | |||
338 | if (!mSupportsLargeVolumes) | ||
339 | return; | ||
340 | |||
341 | FindFolder (kOnSystemDisk, kSystemFolderType, kDontCreateFolder, | ||
342 | &vRefNum, &dirID); | ||
343 | pb.ioVRefNum = vRefNum; | ||
344 | pb.ioCompletion = 0; | ||
345 | pb.ioNamePtr = 0; | ||
346 | pb.ioVolIndex = 0; | ||
347 | err = PBXGetVolInfoSync (&pb); | ||
348 | if (err != noErr) | ||
349 | return; | ||
350 | |||
351 | // Base the entropy on the amount of space used on the disk and | ||
352 | // on the next available allocation block. A lot else might be | ||
353 | // unpredictable, so might as well toss the whole block in. See | ||
354 | // comments for entropy estimate justifications. | ||
355 | |||
356 | AddBytes (&pb, sizeof (pb), | ||
357 | kVolumeBytesEntropy + | ||
358 | log2l (((pb.ioVTotalBytes.hi - pb.ioVFreeBytes.hi) | ||
359 | * 4294967296.0D + | ||
360 | (pb.ioVTotalBytes.lo - pb.ioVFreeBytes.lo)) | ||
361 | / pb.ioVAlBlkSiz - 3.0)); | ||
362 | } | ||
363 | |||
364 | /* | ||
365 | On a typical startup CRandomizer will come up with about 60 | ||
366 | bits of good, unpredictable data. Assuming no more input will | ||
367 | be available, we'll need some more lower-quality data to give | ||
368 | OpenSSL the 128 bits of entropy it desires. AddFiller adds some | ||
369 | relatively predictable data into the soup. | ||
370 | */ | ||
371 | |||
372 | void CRandomizer::AddFiller (void) | ||
373 | { | ||
374 | struct | ||
375 | { | ||
376 | ProcessSerialNumber psn; // Front process serial | ||
377 | // number | ||
378 | RGBColor hiliteRGBValue; // User-selected | ||
379 | // highlight color | ||
380 | long processCount; // Number of active | ||
381 | // processes | ||
382 | long cpuSpeed; // Processor speed | ||
383 | long totalMemory; // Total logical memory | ||
384 | // (incl. virtual one) | ||
385 | long systemVersion; // OS version | ||
386 | short resFile; // Current resource file | ||
387 | } data; | ||
388 | |||
389 | GetNextProcess ((ProcessSerialNumber*) kNoProcess); | ||
390 | while (GetNextProcess (&data.psn) == noErr) | ||
391 | data.processCount++; | ||
392 | GetFrontProcess (&data.psn); | ||
393 | LMGetHiliteRGB (&data.hiliteRGBValue); | ||
394 | Gestalt (gestaltProcClkSpeed, &data.cpuSpeed); | ||
395 | Gestalt (gestaltLogicalRAMSize, &data.totalMemory); | ||
396 | Gestalt (gestaltSystemVersion, &data.systemVersion); | ||
397 | data.resFile = CurResFile (); | ||
398 | |||
399 | // Here we pretend to feed the PRNG completely random data. This | ||
400 | // is of course false, as much of the above data is predictable | ||
401 | // by an outsider. At this point we don't have any more | ||
402 | // randomness to add, but with OpenSSL we must have a 128 bit | ||
403 | // seed before we can start. We just add what we can, without a | ||
404 | // real entropy estimate, and hope for the best. | ||
405 | |||
406 | AddBytes (&data, sizeof(data), 8.0 * sizeof(data)); | ||
407 | AddCurrentMouse (); | ||
408 | AddNow (1.0); | ||
409 | } | ||
410 | |||
411 | //------------------- LOW LEVEL --------------------- | ||
412 | |||
413 | void CRandomizer::AddBytes (void *data, long size, double entropy) | ||
414 | { | ||
415 | RAND_add (data, size, entropy * 0.125); // Convert entropy bits | ||
416 | // to bytes | ||
417 | } | ||
418 | |||
419 | void CRandomizer::AddNow (double millisecondUncertainty) | ||
420 | { | ||
421 | long time = SysTimer(); | ||
422 | AddBytes (&time, sizeof (time), log2l (millisecondUncertainty * | ||
423 | mTimebaseTicksPerMillisec)); | ||
424 | } | ||
425 | |||
426 | //----------------- TIMING SUPPORT ------------------ | ||
427 | |||
428 | void CRandomizer::GetTimeBaseResolution (void) | ||
429 | { | ||
430 | #ifdef __powerc | ||
431 | long speed; | ||
432 | |||
433 | // gestaltProcClkSpeed available on System 7.5.2 and above | ||
434 | if (Gestalt (gestaltProcClkSpeed, &speed) != noErr) | ||
435 | // Only PowerPCs running pre-7.5.2 are 60-80 MHz | ||
436 | // machines. | ||
437 | mTimebaseTicksPerMillisec = 6000.0D; | ||
438 | // Assume 10 cycles per clock update, as in 601 spec. Seems true | ||
439 | // for later chips as well. | ||
440 | mTimebaseTicksPerMillisec = speed / 1.0e4D; | ||
441 | #else | ||
442 | // 68K VIA-based machines (see Develop Magazine no. 29) | ||
443 | mTimebaseTicksPerMillisec = 783.360D; | ||
444 | #endif | ||
445 | } | ||
446 | |||
447 | unsigned long CRandomizer::SysTimer (void) // returns the lower 32 | ||
448 | // bit of the chip timer | ||
449 | { | ||
450 | #ifdef __powerc | ||
451 | return GetPPCTimer (mIs601); | ||
452 | #else | ||
453 | UnsignedWide usec; | ||
454 | Microseconds (&usec); | ||
455 | return usec.lo; | ||
456 | #endif | ||
457 | } | ||
458 | |||
459 | #ifdef __powerc | ||
460 | // The timebase is available through mfspr on 601, mftb on later chips. | ||
461 | // Motorola recommends that an 601 implementation map mftb to mfspr | ||
462 | // through an exception, but I haven't tested to see if MacOS actually | ||
463 | // does this. We only sample the lower 32 bits of the timer (i.e. a | ||
464 | // few minutes of resolution) | ||
465 | |||
466 | asm unsigned long GetPPCTimer (register bool is601) | ||
467 | { | ||
468 | cmplwi is601, 0 // Check if 601 | ||
469 | bne _601 // if non-zero goto _601 | ||
470 | mftb r3 // Available on 603 and later. | ||
471 | blr // return with result in r3 | ||
472 | _601: | ||
473 | mfspr r3, spr5 // Available on 601 only. | ||
474 | // blr inserted automatically | ||
475 | } | ||
476 | #endif | ||
diff --git a/src/lib/libssl/src/MacOS/Randomizer.h b/src/lib/libssl/src/MacOS/Randomizer.h new file mode 100644 index 0000000000..565537b15d --- /dev/null +++ b/src/lib/libssl/src/MacOS/Randomizer.h | |||
@@ -0,0 +1,43 @@ | |||
1 | |||
2 | // Gathers unpredictable system data to be used for generating | ||
3 | // random bits | ||
4 | |||
5 | #include <MacTypes.h> | ||
6 | |||
7 | class CRandomizer | ||
8 | { | ||
9 | public: | ||
10 | CRandomizer (void); | ||
11 | void PeriodicAction (void); | ||
12 | |||
13 | private: | ||
14 | |||
15 | // Private calls | ||
16 | |||
17 | void AddTimeSinceMachineStartup (void); | ||
18 | void AddAbsoluteSystemStartupTime (void); | ||
19 | void AddAppRunningTime (void); | ||
20 | void AddStartupVolumeInfo (void); | ||
21 | void AddFiller (void); | ||
22 | |||
23 | void AddCurrentMouse (void); | ||
24 | void AddNow (double millisecondUncertainty); | ||
25 | void AddBytes (void *data, long size, double entropy); | ||
26 | |||
27 | void GetTimeBaseResolution (void); | ||
28 | unsigned long SysTimer (void); | ||
29 | |||
30 | // System Info | ||
31 | bool mSupportsLargeVolumes; | ||
32 | bool mIsPowerPC; | ||
33 | bool mIs601; | ||
34 | |||
35 | // Time info | ||
36 | double mTimebaseTicksPerMillisec; | ||
37 | unsigned long mLastPeriodicTicks; | ||
38 | |||
39 | // Mouse info | ||
40 | long mSamplePeriod; | ||
41 | Point mLastMouse; | ||
42 | long mMouseStill; | ||
43 | }; | ||
diff --git a/src/lib/libssl/src/apps/CA.pl b/src/lib/libssl/src/apps/CA.pl index beebee7ffe..4eef57e6e3 100644 --- a/src/lib/libssl/src/apps/CA.pl +++ b/src/lib/libssl/src/apps/CA.pl | |||
@@ -1,4 +1,4 @@ | |||
1 | #!/sw/bin/perl | 1 | #!/usr/local/bin/perl |
2 | # | 2 | # |
3 | # CA - wrapper around ca to make it easier to use ... basically ca requires | 3 | # CA - wrapper around ca to make it easier to use ... basically ca requires |
4 | # some setup stuff to be done before you can use it and this makes | 4 | # some setup stuff to be done before you can use it and this makes |
diff --git a/src/lib/libssl/src/apps/Makefile.ssl b/src/lib/libssl/src/apps/Makefile.ssl index f97154ba03..c7373f74de 100644 --- a/src/lib/libssl/src/apps/Makefile.ssl +++ b/src/lib/libssl/src/apps/Makefile.ssl | |||
@@ -38,7 +38,7 @@ E_EXE= verify asn1pars req dgst dh dhparam enc passwd gendh errstr \ | |||
38 | ca crl rsa dsa dsaparam \ | 38 | ca crl rsa dsa dsaparam \ |
39 | x509 genrsa gendsa s_server s_client speed \ | 39 | x509 genrsa gendsa s_server s_client speed \ |
40 | s_time version pkcs7 crl2pkcs7 sess_id ciphers nseq pkcs12 \ | 40 | s_time version pkcs7 crl2pkcs7 sess_id ciphers nseq pkcs12 \ |
41 | pkcs8 spkac smime | 41 | pkcs8 spkac smime rand |
42 | 42 | ||
43 | PROGS= $(PROGRAM).c | 43 | PROGS= $(PROGRAM).c |
44 | 44 | ||
@@ -54,18 +54,14 @@ E_OBJ= verify.o asn1pars.o req.o dgst.o dh.o dhparam.o enc.o passwd.o gendh.o er | |||
54 | rsa.o dsa.o dsaparam.o \ | 54 | rsa.o dsa.o dsaparam.o \ |
55 | x509.o genrsa.o gendsa.o s_server.o s_client.o speed.o \ | 55 | x509.o genrsa.o gendsa.o s_server.o s_client.o speed.o \ |
56 | s_time.o $(A_OBJ) $(S_OBJ) $(RAND_OBJ) version.o sess_id.o \ | 56 | s_time.o $(A_OBJ) $(S_OBJ) $(RAND_OBJ) version.o sess_id.o \ |
57 | ciphers.o nseq.o pkcs12.o pkcs8.o spkac.o smime.o | 57 | ciphers.o nseq.o pkcs12.o pkcs8.o spkac.o smime.o rand.o |
58 | |||
59 | # pem_mail.o | ||
60 | 58 | ||
61 | E_SRC= verify.c asn1pars.c req.c dgst.c dh.c enc.c passwd.c gendh.c errstr.c ca.c \ | 59 | E_SRC= verify.c asn1pars.c req.c dgst.c dh.c enc.c passwd.c gendh.c errstr.c ca.c \ |
62 | pkcs7.c crl2p7.c crl.c \ | 60 | pkcs7.c crl2p7.c crl.c \ |
63 | rsa.c dsa.c dsaparam.c \ | 61 | rsa.c dsa.c dsaparam.c \ |
64 | x509.c genrsa.c gendsa.c s_server.c s_client.c speed.c \ | 62 | x509.c genrsa.c gendsa.c s_server.c s_client.c speed.c \ |
65 | s_time.c $(A_SRC) $(S_SRC) $(RAND_SRC) version.c sess_id.c \ | 63 | s_time.c $(A_SRC) $(S_SRC) $(RAND_SRC) version.c sess_id.c \ |
66 | ciphers.c nseq.c pkcs12.c pkcs8.c spkac.c smime.c | 64 | ciphers.c nseq.c pkcs12.c pkcs8.c spkac.c smime.c rand.c |
67 | |||
68 | # pem_mail.c | ||
69 | 65 | ||
70 | SRC=$(E_SRC) | 66 | SRC=$(E_SRC) |
71 | 67 | ||
@@ -537,6 +533,23 @@ pkcs8.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h | |||
537 | pkcs8.o: ../include/openssl/safestack.h ../include/openssl/sha.h | 533 | pkcs8.o: ../include/openssl/safestack.h ../include/openssl/sha.h |
538 | pkcs8.o: ../include/openssl/stack.h ../include/openssl/x509.h | 534 | pkcs8.o: ../include/openssl/stack.h ../include/openssl/x509.h |
539 | pkcs8.o: ../include/openssl/x509_vfy.h apps.h | 535 | pkcs8.o: ../include/openssl/x509_vfy.h apps.h |
536 | rand.o: ../include/openssl/asn1.h ../include/openssl/bio.h | ||
537 | rand.o: ../include/openssl/blowfish.h ../include/openssl/bn.h | ||
538 | rand.o: ../include/openssl/buffer.h ../include/openssl/cast.h | ||
539 | rand.o: ../include/openssl/crypto.h ../include/openssl/des.h | ||
540 | rand.o: ../include/openssl/dh.h ../include/openssl/dsa.h | ||
541 | rand.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h | ||
542 | rand.o: ../include/openssl/err.h ../include/openssl/evp.h | ||
543 | rand.o: ../include/openssl/idea.h ../include/openssl/md2.h | ||
544 | rand.o: ../include/openssl/md5.h ../include/openssl/mdc2.h | ||
545 | rand.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h | ||
546 | rand.o: ../include/openssl/opensslv.h ../include/openssl/pkcs7.h | ||
547 | rand.o: ../include/openssl/rand.h ../include/openssl/rc2.h | ||
548 | rand.o: ../include/openssl/rc4.h ../include/openssl/rc5.h | ||
549 | rand.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h | ||
550 | rand.o: ../include/openssl/safestack.h ../include/openssl/sha.h | ||
551 | rand.o: ../include/openssl/stack.h ../include/openssl/x509.h | ||
552 | rand.o: ../include/openssl/x509_vfy.h apps.h | ||
540 | req.o: ../include/openssl/asn1.h ../include/openssl/bio.h | 553 | req.o: ../include/openssl/asn1.h ../include/openssl/bio.h |
541 | req.o: ../include/openssl/blowfish.h ../include/openssl/bn.h | 554 | req.o: ../include/openssl/blowfish.h ../include/openssl/bn.h |
542 | req.o: ../include/openssl/buffer.h ../include/openssl/cast.h | 555 | req.o: ../include/openssl/buffer.h ../include/openssl/cast.h |
@@ -734,11 +747,12 @@ speed.o: ./testrsa.h apps.h | |||
734 | spkac.o: ../include/openssl/asn1.h ../include/openssl/bio.h | 747 | spkac.o: ../include/openssl/asn1.h ../include/openssl/bio.h |
735 | spkac.o: ../include/openssl/blowfish.h ../include/openssl/bn.h | 748 | spkac.o: ../include/openssl/blowfish.h ../include/openssl/bn.h |
736 | spkac.o: ../include/openssl/buffer.h ../include/openssl/cast.h | 749 | spkac.o: ../include/openssl/buffer.h ../include/openssl/cast.h |
737 | spkac.o: ../include/openssl/crypto.h ../include/openssl/des.h | 750 | spkac.o: ../include/openssl/conf.h ../include/openssl/crypto.h |
738 | spkac.o: ../include/openssl/dh.h ../include/openssl/dsa.h | 751 | spkac.o: ../include/openssl/des.h ../include/openssl/dh.h |
739 | spkac.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h | 752 | spkac.o: ../include/openssl/dsa.h ../include/openssl/e_os.h |
740 | spkac.o: ../include/openssl/err.h ../include/openssl/evp.h | 753 | spkac.o: ../include/openssl/e_os2.h ../include/openssl/err.h |
741 | spkac.o: ../include/openssl/idea.h ../include/openssl/md2.h | 754 | spkac.o: ../include/openssl/evp.h ../include/openssl/idea.h |
755 | spkac.o: ../include/openssl/lhash.h ../include/openssl/md2.h | ||
742 | spkac.o: ../include/openssl/md5.h ../include/openssl/mdc2.h | 756 | spkac.o: ../include/openssl/md5.h ../include/openssl/mdc2.h |
743 | spkac.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h | 757 | spkac.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h |
744 | spkac.o: ../include/openssl/opensslv.h ../include/openssl/pem.h | 758 | spkac.o: ../include/openssl/opensslv.h ../include/openssl/pem.h |
diff --git a/src/lib/libssl/src/apps/app_rand.c b/src/lib/libssl/src/apps/app_rand.c index f7f133831d..1146f9f7f3 100644 --- a/src/lib/libssl/src/apps/app_rand.c +++ b/src/lib/libssl/src/apps/app_rand.c | |||
@@ -56,7 +56,7 @@ | |||
56 | * [including the GNU Public Licence.] | 56 | * [including the GNU Public Licence.] |
57 | */ | 57 | */ |
58 | /* ==================================================================== | 58 | /* ==================================================================== |
59 | * Copyright (c) 1998-1999 The OpenSSL Project. All rights reserved. | 59 | * Copyright (c) 1998-2000 The OpenSSL Project. All rights reserved. |
60 | * | 60 | * |
61 | * Redistribution and use in source and binary forms, with or without | 61 | * Redistribution and use in source and binary forms, with or without |
62 | * modification, are permitted provided that the following conditions | 62 | * modification, are permitted provided that the following conditions |
@@ -109,7 +109,9 @@ | |||
109 | * | 109 | * |
110 | */ | 110 | */ |
111 | 111 | ||
112 | #define NON_MAIN | ||
112 | #include "apps.h" | 113 | #include "apps.h" |
114 | #undef NON_MAIN | ||
113 | #include <openssl/bio.h> | 115 | #include <openssl/bio.h> |
114 | #include <openssl/rand.h> | 116 | #include <openssl/rand.h> |
115 | 117 | ||
@@ -162,7 +164,7 @@ long app_RAND_load_files(char *name) | |||
162 | char *p,*n; | 164 | char *p,*n; |
163 | int last; | 165 | int last; |
164 | long tot=0; | 166 | long tot=0; |
165 | int egd; | 167 | int egd; |
166 | 168 | ||
167 | for (;;) | 169 | for (;;) |
168 | { | 170 | { |
@@ -174,9 +176,9 @@ long app_RAND_load_files(char *name) | |||
174 | name=p+1; | 176 | name=p+1; |
175 | if (*n == '\0') break; | 177 | if (*n == '\0') break; |
176 | 178 | ||
177 | egd=RAND_egd(n); | 179 | egd=RAND_egd(n); |
178 | if (egd > 0) tot+=egd; | 180 | if (egd > 0) tot+=egd; |
179 | tot+=RAND_load_file(n,1024L*1024L); | 181 | tot+=RAND_load_file(n,-1); |
180 | if (last) break; | 182 | if (last) break; |
181 | } | 183 | } |
182 | if (tot > 512) | 184 | if (tot > 512) |
diff --git a/src/lib/libssl/src/apps/ca.c b/src/lib/libssl/src/apps/ca.c index e22beda097..73df13fe8e 100644 --- a/src/lib/libssl/src/apps/ca.c +++ b/src/lib/libssl/src/apps/ca.c | |||
@@ -1662,7 +1662,7 @@ again2: | |||
1662 | } | 1662 | } |
1663 | if (j < 0) | 1663 | if (j < 0) |
1664 | { | 1664 | { |
1665 | BIO_printf(bio_err,"The %s field needed to be the same in the\nCA certificate (%s) and the request (%s)\n",cv->name,((str == NULL)?"NULL":(char *)str->data),((str2 == NULL)?"NULL":(char *)str2->data)); | 1665 | BIO_printf(bio_err,"The %s field needed to be the same in the\nCA certificate (%s) and the request (%s)\n",cv->name,((str2 == NULL)?"NULL":(char *)str2->data),((str == NULL)?"NULL":(char *)str->data)); |
1666 | goto err; | 1666 | goto err; |
1667 | } | 1667 | } |
1668 | } | 1668 | } |
diff --git a/src/lib/libssl/src/apps/dh.c b/src/lib/libssl/src/apps/dh.c index b3c20e2b5c..674963f81a 100644 --- a/src/lib/libssl/src/apps/dh.c +++ b/src/lib/libssl/src/apps/dh.c | |||
@@ -1,4 +1,5 @@ | |||
1 | /* apps/dh.c */ | 1 | /* apps/dh.c */ |
2 | /* obsoleted by dhparam.c */ | ||
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 3 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 4 | * All rights reserved. |
4 | * | 5 | * |
@@ -234,8 +235,8 @@ bad: | |||
234 | } | 235 | } |
235 | if (i & DH_CHECK_P_NOT_PRIME) | 236 | if (i & DH_CHECK_P_NOT_PRIME) |
236 | printf("p value is not prime\n"); | 237 | printf("p value is not prime\n"); |
237 | if (i & DH_CHECK_P_NOT_STRONG_PRIME) | 238 | if (i & DH_CHECK_P_NOT_SAFE_PRIME) |
238 | printf("p value is not a strong prime\n"); | 239 | printf("p value is not a safe prime\n"); |
239 | if (i & DH_UNABLE_TO_CHECK_GENERATOR) | 240 | if (i & DH_UNABLE_TO_CHECK_GENERATOR) |
240 | printf("unable to check the generator value\n"); | 241 | printf("unable to check the generator value\n"); |
241 | if (i & DH_NOT_SUITABLE_GENERATOR) | 242 | if (i & DH_NOT_SUITABLE_GENERATOR) |
diff --git a/src/lib/libssl/src/apps/dhparam.c b/src/lib/libssl/src/apps/dhparam.c index 293a400d0c..709547ff5e 100644 --- a/src/lib/libssl/src/apps/dhparam.c +++ b/src/lib/libssl/src/apps/dhparam.c | |||
@@ -55,6 +55,59 @@ | |||
55 | * copied and put under another distribution licence | 55 | * copied and put under another distribution licence |
56 | * [including the GNU Public Licence.] | 56 | * [including the GNU Public Licence.] |
57 | */ | 57 | */ |
58 | /* ==================================================================== | ||
59 | * Copyright (c) 1998-2000 The OpenSSL Project. All rights reserved. | ||
60 | * | ||
61 | * Redistribution and use in source and binary forms, with or without | ||
62 | * modification, are permitted provided that the following conditions | ||
63 | * are met: | ||
64 | * | ||
65 | * 1. Redistributions of source code must retain the above copyright | ||
66 | * notice, this list of conditions and the following disclaimer. | ||
67 | * | ||
68 | * 2. Redistributions in binary form must reproduce the above copyright | ||
69 | * notice, this list of conditions and the following disclaimer in | ||
70 | * the documentation and/or other materials provided with the | ||
71 | * distribution. | ||
72 | * | ||
73 | * 3. All advertising materials mentioning features or use of this | ||
74 | * software must display the following acknowledgment: | ||
75 | * "This product includes software developed by the OpenSSL Project | ||
76 | * for use in the OpenSSL Toolkit. (http://www.openssl.org/)" | ||
77 | * | ||
78 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
79 | * endorse or promote products derived from this software without | ||
80 | * prior written permission. For written permission, please contact | ||
81 | * openssl-core@openssl.org. | ||
82 | * | ||
83 | * 5. Products derived from this software may not be called "OpenSSL" | ||
84 | * nor may "OpenSSL" appear in their names without prior written | ||
85 | * permission of the OpenSSL Project. | ||
86 | * | ||
87 | * 6. Redistributions of any form whatsoever must retain the following | ||
88 | * acknowledgment: | ||
89 | * "This product includes software developed by the OpenSSL Project | ||
90 | * for use in the OpenSSL Toolkit (http://www.openssl.org/)" | ||
91 | * | ||
92 | * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
93 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
94 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
95 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
96 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
97 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
98 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
99 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
100 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
101 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
102 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
103 | * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
104 | * ==================================================================== | ||
105 | * | ||
106 | * This product includes cryptographic software written by Eric Young | ||
107 | * (eay@cryptsoft.com). This product includes software written by Tim | ||
108 | * Hudson (tjh@cryptsoft.com). | ||
109 | * | ||
110 | */ | ||
58 | 111 | ||
59 | #ifndef NO_DH | 112 | #ifndef NO_DH |
60 | #include <stdio.h> | 113 | #include <stdio.h> |
@@ -69,6 +122,10 @@ | |||
69 | #include <openssl/x509.h> | 122 | #include <openssl/x509.h> |
70 | #include <openssl/pem.h> | 123 | #include <openssl/pem.h> |
71 | 124 | ||
125 | #ifndef NO_DSA | ||
126 | #include <openssl/dsa.h> | ||
127 | #endif | ||
128 | |||
72 | #undef PROG | 129 | #undef PROG |
73 | #define PROG dhparam_main | 130 | #define PROG dhparam_main |
74 | 131 | ||
@@ -78,6 +135,7 @@ | |||
78 | * -outform arg - output format - default PEM | 135 | * -outform arg - output format - default PEM |
79 | * -in arg - input file - default stdin | 136 | * -in arg - input file - default stdin |
80 | * -out arg - output file - default stdout | 137 | * -out arg - output file - default stdout |
138 | * -dsaparam - read or generate DSA parameters, convert to DH | ||
81 | * -check - check the parameters are ok | 139 | * -check - check the parameters are ok |
82 | * -noout | 140 | * -noout |
83 | * -text | 141 | * -text |
@@ -92,6 +150,9 @@ int MAIN(int argc, char **argv) | |||
92 | { | 150 | { |
93 | DH *dh=NULL; | 151 | DH *dh=NULL; |
94 | int i,badops=0,text=0; | 152 | int i,badops=0,text=0; |
153 | #ifndef NO_DSA | ||
154 | int dsaparam=0; | ||
155 | #endif | ||
95 | BIO *in=NULL,*out=NULL; | 156 | BIO *in=NULL,*out=NULL; |
96 | int informat,outformat,check=0,noout=0,C=0,ret=1; | 157 | int informat,outformat,check=0,noout=0,C=0,ret=1; |
97 | char *infile,*outfile,*prog; | 158 | char *infile,*outfile,*prog; |
@@ -138,6 +199,10 @@ int MAIN(int argc, char **argv) | |||
138 | check=1; | 199 | check=1; |
139 | else if (strcmp(*argv,"-text") == 0) | 200 | else if (strcmp(*argv,"-text") == 0) |
140 | text=1; | 201 | text=1; |
202 | #ifndef NO_DSA | ||
203 | else if (strcmp(*argv,"-dsaparam") == 0) | ||
204 | dsaparam=1; | ||
205 | #endif | ||
141 | else if (strcmp(*argv,"-C") == 0) | 206 | else if (strcmp(*argv,"-C") == 0) |
142 | C=1; | 207 | C=1; |
143 | else if (strcmp(*argv,"-noout") == 0) | 208 | else if (strcmp(*argv,"-noout") == 0) |
@@ -166,13 +231,16 @@ bad: | |||
166 | BIO_printf(bio_err," -outform arg output format - one of DER PEM\n"); | 231 | BIO_printf(bio_err," -outform arg output format - one of DER PEM\n"); |
167 | BIO_printf(bio_err," -in arg input file\n"); | 232 | BIO_printf(bio_err," -in arg input file\n"); |
168 | BIO_printf(bio_err," -out arg output file\n"); | 233 | BIO_printf(bio_err," -out arg output file\n"); |
234 | #ifndef NO_DSA | ||
235 | BIO_printf(bio_err," -dsaparam read or generate DSA parameters, convert to DH\n"); | ||
236 | #endif | ||
169 | BIO_printf(bio_err," -check check the DH parameters\n"); | 237 | BIO_printf(bio_err," -check check the DH parameters\n"); |
170 | BIO_printf(bio_err," -text print a text form of the DH parameters\n"); | 238 | BIO_printf(bio_err," -text print a text form of the DH parameters\n"); |
171 | BIO_printf(bio_err," -C Output C code\n"); | 239 | BIO_printf(bio_err," -C Output C code\n"); |
172 | BIO_printf(bio_err," -2 generate parameters using 2 as the generator value\n"); | 240 | BIO_printf(bio_err," -2 generate parameters using 2 as the generator value\n"); |
173 | BIO_printf(bio_err," -5 generate parameters using 5 as the generator value\n"); | 241 | BIO_printf(bio_err," -5 generate parameters using 5 as the generator value\n"); |
174 | BIO_printf(bio_err," numbits number of bits in to generate (default 512)\n"); | 242 | BIO_printf(bio_err," numbits number of bits in to generate (default 512)\n"); |
175 | BIO_printf(bio_err," -rand file:file:...\n"); | 243 | BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR); |
176 | BIO_printf(bio_err," - load the file (or the files in the directory) into\n"); | 244 | BIO_printf(bio_err," - load the file (or the files in the directory) into\n"); |
177 | BIO_printf(bio_err," the random number generator\n"); | 245 | BIO_printf(bio_err," the random number generator\n"); |
178 | BIO_printf(bio_err," -noout no output\n"); | 246 | BIO_printf(bio_err," -noout no output\n"); |
@@ -181,8 +249,25 @@ bad: | |||
181 | 249 | ||
182 | ERR_load_crypto_strings(); | 250 | ERR_load_crypto_strings(); |
183 | 251 | ||
184 | if(g && !num) num = DEFBITS; | 252 | if (g && !num) |
185 | else if(num && !g) g = 2; | 253 | num = DEFBITS; |
254 | |||
255 | #ifndef NO_DSA | ||
256 | if (dsaparam) | ||
257 | { | ||
258 | if (g) | ||
259 | { | ||
260 | BIO_printf(bio_err, "generator may not be chosen for DSA parameters\n"); | ||
261 | goto end; | ||
262 | } | ||
263 | } | ||
264 | else | ||
265 | #endif | ||
266 | { | ||
267 | /* DH parameters */ | ||
268 | if (num && !g) | ||
269 | g = 2; | ||
270 | } | ||
186 | 271 | ||
187 | if(num) { | 272 | if(num) { |
188 | 273 | ||
@@ -194,11 +279,40 @@ bad: | |||
194 | BIO_printf(bio_err,"%ld semi-random bytes loaded\n", | 279 | BIO_printf(bio_err,"%ld semi-random bytes loaded\n", |
195 | app_RAND_load_files(inrand)); | 280 | app_RAND_load_files(inrand)); |
196 | 281 | ||
197 | BIO_printf(bio_err,"Generating DH parameters, %d bit long strong prime, generator of %d\n",num,g); | 282 | #ifndef NO_DSA |
198 | BIO_printf(bio_err,"This is going to take a long time\n"); | 283 | if (dsaparam) |
199 | dh=DH_generate_parameters(num,g,dh_cb,bio_err); | 284 | { |
285 | DSA *dsa; | ||
200 | 286 | ||
201 | if (dh == NULL) goto end; | 287 | BIO_printf(bio_err,"Generating DSA parameters, %d bit long prime\n",num); |
288 | dsa = DSA_generate_parameters(num, NULL, 0, NULL, NULL, dh_cb, bio_err); | ||
289 | if (dsa == NULL) | ||
290 | { | ||
291 | ERR_print_errors(bio_err); | ||
292 | goto end; | ||
293 | } | ||
294 | |||
295 | dh = DSA_dup_DH(dsa); | ||
296 | DSA_free(dsa); | ||
297 | if (dh == NULL) | ||
298 | { | ||
299 | ERR_print_errors(bio_err); | ||
300 | goto end; | ||
301 | } | ||
302 | } | ||
303 | else | ||
304 | #endif | ||
305 | { | ||
306 | BIO_printf(bio_err,"Generating DH parameters, %d bit long safe prime, generator %d\n",num,g); | ||
307 | BIO_printf(bio_err,"This is going to take a long time\n"); | ||
308 | dh=DH_generate_parameters(num,g,dh_cb,bio_err); | ||
309 | |||
310 | if (dh == NULL) | ||
311 | { | ||
312 | ERR_print_errors(bio_err); | ||
313 | goto end; | ||
314 | } | ||
315 | } | ||
202 | 316 | ||
203 | app_RAND_write_file(NULL, bio_err); | 317 | app_RAND_write_file(NULL, bio_err); |
204 | } else { | 318 | } else { |
@@ -220,24 +334,56 @@ bad: | |||
220 | } | 334 | } |
221 | } | 335 | } |
222 | 336 | ||
223 | if (informat == FORMAT_ASN1) | 337 | if (informat != FORMAT_ASN1 && informat != FORMAT_PEM) |
224 | dh=d2i_DHparams_bio(in,NULL); | ||
225 | else if (informat == FORMAT_PEM) | ||
226 | dh=PEM_read_bio_DHparams(in,NULL,NULL,NULL); | ||
227 | else | ||
228 | { | 338 | { |
229 | BIO_printf(bio_err,"bad input format specified\n"); | 339 | BIO_printf(bio_err,"bad input format specified\n"); |
230 | goto end; | 340 | goto end; |
231 | } | 341 | } |
232 | if (dh == NULL) | 342 | |
343 | #ifndef NO_DSA | ||
344 | if (dsaparam) | ||
233 | { | 345 | { |
234 | BIO_printf(bio_err,"unable to load DH parameters\n"); | 346 | DSA *dsa; |
235 | ERR_print_errors(bio_err); | 347 | |
236 | goto end; | 348 | if (informat == FORMAT_ASN1) |
349 | dsa=d2i_DSAparams_bio(in,NULL); | ||
350 | else /* informat == FORMAT_PEM */ | ||
351 | dsa=PEM_read_bio_DSAparams(in,NULL,NULL,NULL); | ||
352 | |||
353 | if (dsa == NULL) | ||
354 | { | ||
355 | BIO_printf(bio_err,"unable to load DSA parameters\n"); | ||
356 | ERR_print_errors(bio_err); | ||
357 | goto end; | ||
358 | } | ||
359 | |||
360 | dh = DSA_dup_DH(dsa); | ||
361 | DSA_free(dsa); | ||
362 | if (dh == NULL) | ||
363 | { | ||
364 | ERR_print_errors(bio_err); | ||
365 | goto end; | ||
366 | } | ||
237 | } | 367 | } |
238 | 368 | else | |
369 | #endif | ||
370 | { | ||
371 | if (informat == FORMAT_ASN1) | ||
372 | dh=d2i_DHparams_bio(in,NULL); | ||
373 | else /* informat == FORMAT_PEM */ | ||
374 | dh=PEM_read_bio_DHparams(in,NULL,NULL,NULL); | ||
375 | |||
376 | if (dh == NULL) | ||
377 | { | ||
378 | BIO_printf(bio_err,"unable to load DH parameters\n"); | ||
379 | ERR_print_errors(bio_err); | ||
380 | goto end; | ||
381 | } | ||
382 | } | ||
383 | |||
384 | /* dh != NULL */ | ||
239 | } | 385 | } |
240 | 386 | ||
241 | out=BIO_new(BIO_s_file()); | 387 | out=BIO_new(BIO_s_file()); |
242 | if (out == NULL) | 388 | if (out == NULL) |
243 | { | 389 | { |
@@ -255,7 +401,6 @@ bad: | |||
255 | } | 401 | } |
256 | } | 402 | } |
257 | 403 | ||
258 | |||
259 | 404 | ||
260 | if (text) | 405 | if (text) |
261 | { | 406 | { |
@@ -271,8 +416,8 @@ bad: | |||
271 | } | 416 | } |
272 | if (i & DH_CHECK_P_NOT_PRIME) | 417 | if (i & DH_CHECK_P_NOT_PRIME) |
273 | printf("p value is not prime\n"); | 418 | printf("p value is not prime\n"); |
274 | if (i & DH_CHECK_P_NOT_STRONG_PRIME) | 419 | if (i & DH_CHECK_P_NOT_SAFE_PRIME) |
275 | printf("p value is not a strong prime\n"); | 420 | printf("p value is not a safe prime\n"); |
276 | if (i & DH_UNABLE_TO_CHECK_GENERATOR) | 421 | if (i & DH_UNABLE_TO_CHECK_GENERATOR) |
277 | printf("unable to check the generator value\n"); | 422 | printf("unable to check the generator value\n"); |
278 | if (i & DH_NOT_SUITABLE_GENERATOR) | 423 | if (i & DH_NOT_SUITABLE_GENERATOR) |
@@ -293,25 +438,29 @@ bad: | |||
293 | perror("Malloc"); | 438 | perror("Malloc"); |
294 | goto end; | 439 | goto end; |
295 | } | 440 | } |
441 | printf("#ifndef HEADER_DH_H\n" | ||
442 | "#include <openssl/dh.h>\n" | ||
443 | "#endif\n"); | ||
444 | printf("DH *get_dh%d()\n\t{\n",bits); | ||
445 | |||
296 | l=BN_bn2bin(dh->p,data); | 446 | l=BN_bn2bin(dh->p,data); |
297 | printf("static unsigned char dh%d_p[]={",bits); | 447 | printf("\tstatic unsigned char dh%d_p[]={",bits); |
298 | for (i=0; i<l; i++) | 448 | for (i=0; i<l; i++) |
299 | { | 449 | { |
300 | if ((i%12) == 0) printf("\n\t"); | 450 | if ((i%12) == 0) printf("\n\t\t"); |
301 | printf("0x%02X,",data[i]); | 451 | printf("0x%02X,",data[i]); |
302 | } | 452 | } |
303 | printf("\n\t};\n"); | 453 | printf("\n\t\t};\n"); |
304 | 454 | ||
305 | l=BN_bn2bin(dh->g,data); | 455 | l=BN_bn2bin(dh->g,data); |
306 | printf("static unsigned char dh%d_g[]={",bits); | 456 | printf("\tstatic unsigned char dh%d_g[]={",bits); |
307 | for (i=0; i<l; i++) | 457 | for (i=0; i<l; i++) |
308 | { | 458 | { |
309 | if ((i%12) == 0) printf("\n\t"); | 459 | if ((i%12) == 0) printf("\n\t\t"); |
310 | printf("0x%02X,",data[i]); | 460 | printf("0x%02X,",data[i]); |
311 | } | 461 | } |
312 | printf("\n\t};\n\n"); | 462 | printf("\n\t\t};\n"); |
313 | 463 | ||
314 | printf("DH *get_dh%d()\n\t{\n",bits); | ||
315 | printf("\tDH *dh;\n\n"); | 464 | printf("\tDH *dh;\n\n"); |
316 | printf("\tif ((dh=DH_new()) == NULL) return(NULL);\n"); | 465 | printf("\tif ((dh=DH_new()) == NULL) return(NULL);\n"); |
317 | printf("\tdh->p=BN_bin2bn(dh%d_p,sizeof(dh%d_p),NULL);\n", | 466 | printf("\tdh->p=BN_bin2bn(dh%d_p,sizeof(dh%d_p),NULL);\n", |
@@ -319,7 +468,9 @@ bad: | |||
319 | printf("\tdh->g=BN_bin2bn(dh%d_g,sizeof(dh%d_g),NULL);\n", | 468 | printf("\tdh->g=BN_bin2bn(dh%d_g,sizeof(dh%d_g),NULL);\n", |
320 | bits,bits); | 469 | bits,bits); |
321 | printf("\tif ((dh->p == NULL) || (dh->g == NULL))\n"); | 470 | printf("\tif ((dh->p == NULL) || (dh->g == NULL))\n"); |
322 | printf("\t\treturn(NULL);\n"); | 471 | printf("\t\t{ DH_free(dh); return(NULL); }\n"); |
472 | if (dh->length) | ||
473 | printf("\tdh->length = %d;\n", dh->length); | ||
323 | printf("\treturn(dh);\n\t}\n"); | 474 | printf("\treturn(dh);\n\t}\n"); |
324 | Free(data); | 475 | Free(data); |
325 | } | 476 | } |
@@ -350,6 +501,7 @@ end: | |||
350 | EXIT(ret); | 501 | EXIT(ret); |
351 | } | 502 | } |
352 | 503 | ||
504 | /* dh_cb is identical to dsa_cb in apps/dsaparam.c */ | ||
353 | static void MS_CALLBACK dh_cb(int p, int n, void *arg) | 505 | static void MS_CALLBACK dh_cb(int p, int n, void *arg) |
354 | { | 506 | { |
355 | char c='*'; | 507 | char c='*'; |
diff --git a/src/lib/libssl/src/apps/eay.c b/src/lib/libssl/src/apps/eay.c index a84aa382bd..e69de29bb2 100644 --- a/src/lib/libssl/src/apps/eay.c +++ b/src/lib/libssl/src/apps/eay.c | |||
@@ -1,131 +0,0 @@ | |||
1 | /* apps/eay.c */ | ||
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
3 | * All rights reserved. | ||
4 | * | ||
5 | * This package is an SSL implementation written | ||
6 | * by Eric Young (eay@cryptsoft.com). | ||
7 | * The implementation was written so as to conform with Netscapes SSL. | ||
8 | * | ||
9 | * This library is free for commercial and non-commercial use as long as | ||
10 | * the following conditions are aheared to. The following conditions | ||
11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
13 | * included with this distribution is covered by the same copyright terms | ||
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
15 | * | ||
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
17 | * the code are not to be removed. | ||
18 | * If this package is used in a product, Eric Young should be given attribution | ||
19 | * as the author of the parts of the library used. | ||
20 | * This can be in the form of a textual message at program startup or | ||
21 | * in documentation (online or textual) provided with the package. | ||
22 | * | ||
23 | * Redistribution and use in source and binary forms, with or without | ||
24 | * modification, are permitted provided that the following conditions | ||
25 | * are met: | ||
26 | * 1. Redistributions of source code must retain the copyright | ||
27 | * notice, this list of conditions and the following disclaimer. | ||
28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
29 | * notice, this list of conditions and the following disclaimer in the | ||
30 | * documentation and/or other materials provided with the distribution. | ||
31 | * 3. All advertising materials mentioning features or use of this software | ||
32 | * must display the following acknowledgement: | ||
33 | * "This product includes cryptographic software written by | ||
34 | * Eric Young (eay@cryptsoft.com)" | ||
35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
36 | * being used are not cryptographic related :-). | ||
37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
38 | * the apps directory (application code) you must include an acknowledgement: | ||
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
40 | * | ||
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
51 | * SUCH DAMAGE. | ||
52 | * | ||
53 | * The licence and distribution terms for any publically available version or | ||
54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
55 | * copied and put under another distribution licence | ||
56 | * [including the GNU Public Licence.] | ||
57 | */ | ||
58 | |||
59 | #include <stdio.h> | ||
60 | #include <stdlib.h> | ||
61 | #include <string.h> | ||
62 | |||
63 | #define MONOLITH | ||
64 | #define USE_SOCKETS | ||
65 | |||
66 | #include "openssl/e_os.h" | ||
67 | |||
68 | #include <openssl/bio.h> | ||
69 | #include <openssl/stack.h> | ||
70 | #include <openssl/lhash.h> | ||
71 | |||
72 | #include <openssl/err.h> | ||
73 | |||
74 | #include <openssl/bn.h> | ||
75 | |||
76 | #include <openssl/evp.h> | ||
77 | |||
78 | #include <openssl/rand.h> | ||
79 | #include <openssl/conf.h> | ||
80 | #include <openssl/txt_db.h> | ||
81 | |||
82 | #include <openssl/err.h> | ||
83 | |||
84 | #include <openssl/x509.h> | ||
85 | #include <openssl/pkcs7.h> | ||
86 | #include <openssl/pem.h> | ||
87 | #include <openssl/asn1.h> | ||
88 | #include <openssl/objects.h> | ||
89 | |||
90 | #define MONOLITH | ||
91 | |||
92 | #include "openssl.c" | ||
93 | #include "apps.c" | ||
94 | #include "asn1pars.c" | ||
95 | #ifndef NO_RSA | ||
96 | #include "ca.c" | ||
97 | #include "genrsa.c" | ||
98 | #include "req.c" | ||
99 | #include "rsa.c" | ||
100 | #endif | ||
101 | #ifndef NO_DH | ||
102 | #include "gendh.c" | ||
103 | #include "dh.c" | ||
104 | #endif | ||
105 | #include "crl.c" | ||
106 | #include "crl2p7.c" | ||
107 | #include "dgst.c" | ||
108 | #include "enc.c" | ||
109 | #include "errstr.c" | ||
110 | #if !defined(NO_SSL2) || !defined(NO_SSL3) | ||
111 | #ifndef NO_SOCK | ||
112 | #include "s_cb.c" | ||
113 | #include "s_client.c" | ||
114 | #include "s_server.c" | ||
115 | #include "s_socket.c" | ||
116 | #include "s_time.c" | ||
117 | #endif | ||
118 | #endif | ||
119 | #include "speed.c" | ||
120 | #include "verify.c" | ||
121 | #include "version.c" | ||
122 | #include "x509.c" | ||
123 | #include "ciphers.c" | ||
124 | #include "sess_id.c" | ||
125 | #include "pkcs7.c" | ||
126 | #ifndef NO_DSA | ||
127 | #include "dsaparam.c" | ||
128 | #include "dsa.c" | ||
129 | #include "gendsa.c" | ||
130 | #endif | ||
131 | |||
diff --git a/src/lib/libssl/src/apps/gendh.c b/src/lib/libssl/src/apps/gendh.c index 1f6be96599..caf5e8d736 100644 --- a/src/lib/libssl/src/apps/gendh.c +++ b/src/lib/libssl/src/apps/gendh.c | |||
@@ -1,4 +1,5 @@ | |||
1 | /* apps/gendh.c */ | 1 | /* apps/gendh.c */ |
2 | /* obsoleted by dhparam.c */ | ||
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 3 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 4 | * All rights reserved. |
4 | * | 5 | * |
@@ -127,7 +128,7 @@ bad: | |||
127 | BIO_printf(bio_err," -2 use 2 as the generator value\n"); | 128 | BIO_printf(bio_err," -2 use 2 as the generator value\n"); |
128 | /* BIO_printf(bio_err," -3 use 3 as the generator value\n"); */ | 129 | /* BIO_printf(bio_err," -3 use 3 as the generator value\n"); */ |
129 | BIO_printf(bio_err," -5 use 5 as the generator value\n"); | 130 | BIO_printf(bio_err," -5 use 5 as the generator value\n"); |
130 | BIO_printf(bio_err," -rand file:file:...\n"); | 131 | BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR); |
131 | BIO_printf(bio_err," - load the file (or the files in the directory) into\n"); | 132 | BIO_printf(bio_err," - load the file (or the files in the directory) into\n"); |
132 | BIO_printf(bio_err," the random number generator\n"); | 133 | BIO_printf(bio_err," the random number generator\n"); |
133 | goto end; | 134 | goto end; |
@@ -159,7 +160,7 @@ bad: | |||
159 | BIO_printf(bio_err,"%ld semi-random bytes loaded\n", | 160 | BIO_printf(bio_err,"%ld semi-random bytes loaded\n", |
160 | app_RAND_load_files(inrand)); | 161 | app_RAND_load_files(inrand)); |
161 | 162 | ||
162 | BIO_printf(bio_err,"Generating DH parameters, %d bit long strong prime, generator of %d\n",num,g); | 163 | BIO_printf(bio_err,"Generating DH parameters, %d bit long safe prime, generator %d\n",num,g); |
163 | BIO_printf(bio_err,"This is going to take a long time\n"); | 164 | BIO_printf(bio_err,"This is going to take a long time\n"); |
164 | dh=DH_generate_parameters(num,g,dh_cb,bio_err); | 165 | dh=DH_generate_parameters(num,g,dh_cb,bio_err); |
165 | 166 | ||
diff --git a/src/lib/libssl/src/apps/gendsa.c b/src/lib/libssl/src/apps/gendsa.c index d69a93da45..b1a1c4fcfa 100644 --- a/src/lib/libssl/src/apps/gendsa.c +++ b/src/lib/libssl/src/apps/gendsa.c | |||
@@ -145,7 +145,7 @@ bad: | |||
145 | #ifndef NO_IDEA | 145 | #ifndef NO_IDEA |
146 | BIO_printf(bio_err," -idea - encrypt the generated key with IDEA in cbc mode\n"); | 146 | BIO_printf(bio_err," -idea - encrypt the generated key with IDEA in cbc mode\n"); |
147 | #endif | 147 | #endif |
148 | BIO_printf(bio_err," -rand file:file:...\n"); | 148 | BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR); |
149 | BIO_printf(bio_err," - load the file (or the files in the directory) into\n"); | 149 | BIO_printf(bio_err," - load the file (or the files in the directory) into\n"); |
150 | BIO_printf(bio_err," the random number generator\n"); | 150 | BIO_printf(bio_err," the random number generator\n"); |
151 | BIO_printf(bio_err," dsaparam-file\n"); | 151 | BIO_printf(bio_err," dsaparam-file\n"); |
diff --git a/src/lib/libssl/src/apps/genrsa.c b/src/lib/libssl/src/apps/genrsa.c index dc63ff02bd..6fe578d69f 100644 --- a/src/lib/libssl/src/apps/genrsa.c +++ b/src/lib/libssl/src/apps/genrsa.c | |||
@@ -154,7 +154,7 @@ bad: | |||
154 | BIO_printf(bio_err," -passout arg output file pass phrase source\n"); | 154 | BIO_printf(bio_err," -passout arg output file pass phrase source\n"); |
155 | BIO_printf(bio_err," -f4 use F4 (0x10001) for the E value\n"); | 155 | BIO_printf(bio_err," -f4 use F4 (0x10001) for the E value\n"); |
156 | BIO_printf(bio_err," -3 use 3 for the E value\n"); | 156 | BIO_printf(bio_err," -3 use 3 for the E value\n"); |
157 | BIO_printf(bio_err," -rand file:file:...\n"); | 157 | BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR); |
158 | BIO_printf(bio_err," load the file (or the files in the directory) into\n"); | 158 | BIO_printf(bio_err," load the file (or the files in the directory) into\n"); |
159 | BIO_printf(bio_err," the random number generator\n"); | 159 | BIO_printf(bio_err," the random number generator\n"); |
160 | goto err; | 160 | goto err; |
diff --git a/src/lib/libssl/src/apps/makeapps.com b/src/lib/libssl/src/apps/makeapps.com index 5ef6a8904e..94acbf8219 100644 --- a/src/lib/libssl/src/apps/makeapps.com +++ b/src/lib/libssl/src/apps/makeapps.com | |||
@@ -157,13 +157,13 @@ $ LIB_FILES = "VERIFY;ASN1PARS;REQ;DGST;DH;DHPARAM;ENC;PASSWD;GENDH;ERRSTR;"+- | |||
157 | "RSA;DSA;DSAPARAM;"+- | 157 | "RSA;DSA;DSAPARAM;"+- |
158 | "X509;GENRSA;GENDSA;S_SERVER;S_CLIENT;SPEED;"+- | 158 | "X509;GENRSA;GENDSA;S_SERVER;S_CLIENT;SPEED;"+- |
159 | "S_TIME;APPS;S_CB;S_SOCKET;APP_RAND;VERSION;SESS_ID;"+- | 159 | "S_TIME;APPS;S_CB;S_SOCKET;APP_RAND;VERSION;SESS_ID;"+- |
160 | "CIPHERS;NSEQ;PKCS12;PKCS8;SPKAC;SMIME" | 160 | "CIPHERS;NSEQ;PKCS12;PKCS8;SPKAC;SMIME;RAND" |
161 | $ APP_FILES := OPENSSL,'OBJ_DIR'VERIFY.OBJ,ASN1PARS.OBJ,REQ.OBJ,DGST.OBJ,DH.OBJ,DHPARAM.OBJ,ENC.OBJ,PASSWD.OBJ,GENDH.OBJ,ERRSTR.OBJ,- | 161 | $ APP_FILES := OPENSSL,'OBJ_DIR'VERIFY.OBJ,ASN1PARS.OBJ,REQ.OBJ,DGST.OBJ,DH.OBJ,DHPARAM.OBJ,ENC.OBJ,PASSWD.OBJ,GENDH.OBJ,ERRSTR.OBJ,- |
162 | CA.OBJ,PKCS7.OBJ,CRL2P7.OBJ,CRL.OBJ,- | 162 | CA.OBJ,PKCS7.OBJ,CRL2P7.OBJ,CRL.OBJ,- |
163 | RSA.OBJ,DSA.OBJ,DSAPARAM.OBJ,- | 163 | RSA.OBJ,DSA.OBJ,DSAPARAM.OBJ,- |
164 | X509.OBJ,GENRSA.OBJ,GENDSA.OBJ,S_SERVER.OBJ,S_CLIENT.OBJ,SPEED.OBJ,- | 164 | X509.OBJ,GENRSA.OBJ,GENDSA.OBJ,S_SERVER.OBJ,S_CLIENT.OBJ,SPEED.OBJ,- |
165 | S_TIME.OBJ,APPS.OBJ,S_CB.OBJ,S_SOCKET.OBJ,APP_RAND.OBJ,VERSION.OBJ,SESS_ID.OBJ,- | 165 | S_TIME.OBJ,APPS.OBJ,S_CB.OBJ,S_SOCKET.OBJ,APP_RAND.OBJ,VERSION.OBJ,SESS_ID.OBJ,- |
166 | CIPHERS.OBJ,NSEQ.OBJ,PKCS12.OBJ,PKCS8.OBJ,SPKAC.OBJ,SMIME.OBJ | 166 | CIPHERS.OBJ,NSEQ.OBJ,PKCS12.OBJ,PKCS8.OBJ,SPKAC.OBJ,SMIME.OBJ,RAND.OBJ |
167 | $ TCPIP_PROGRAMS = ",," | 167 | $ TCPIP_PROGRAMS = ",," |
168 | $ IF COMPILER .EQS. "VAXC" THEN - | 168 | $ IF COMPILER .EQS. "VAXC" THEN - |
169 | TCPIP_PROGRAMS = ",OPENSSL," | 169 | TCPIP_PROGRAMS = ",OPENSSL," |
diff --git a/src/lib/libssl/src/apps/openssl.c b/src/lib/libssl/src/apps/openssl.c index 748c6ce71a..a2a263062d 100644 --- a/src/lib/libssl/src/apps/openssl.c +++ b/src/lib/libssl/src/apps/openssl.c | |||
@@ -56,13 +56,10 @@ | |||
56 | * [including the GNU Public Licence.] | 56 | * [including the GNU Public Licence.] |
57 | */ | 57 | */ |
58 | 58 | ||
59 | #ifndef DEBUG | ||
60 | #undef DEBUG | ||
61 | #endif | ||
62 | |||
63 | #include <stdio.h> | 59 | #include <stdio.h> |
64 | #include <string.h> | 60 | #include <string.h> |
65 | #include <stdlib.h> | 61 | #include <stdlib.h> |
62 | #define OPENSSL_C /* tells apps.h to use complete apps_startup() */ | ||
66 | #include <openssl/bio.h> | 63 | #include <openssl/bio.h> |
67 | #include <openssl/crypto.h> | 64 | #include <openssl/crypto.h> |
68 | #include <openssl/lhash.h> | 65 | #include <openssl/lhash.h> |
@@ -71,18 +68,11 @@ | |||
71 | #include <openssl/pem.h> | 68 | #include <openssl/pem.h> |
72 | #include <openssl/ssl.h> | 69 | #include <openssl/ssl.h> |
73 | #define USE_SOCKETS /* needed for the _O_BINARY defs in the MS world */ | 70 | #define USE_SOCKETS /* needed for the _O_BINARY defs in the MS world */ |
74 | #define OPENSSL_C /* tells apps.h to use complete apps_startup() */ | ||
75 | #include "apps.h" | 71 | #include "apps.h" |
76 | #include "progs.h" | 72 | #include "progs.h" |
77 | #include "s_apps.h" | 73 | #include "s_apps.h" |
78 | #include <openssl/err.h> | 74 | #include <openssl/err.h> |
79 | 75 | ||
80 | /* | ||
81 | #ifdef WINDOWS | ||
82 | #include "bss_file.c" | ||
83 | #endif | ||
84 | */ | ||
85 | |||
86 | static unsigned long MS_CALLBACK hash(FUNCTION *a); | 76 | static unsigned long MS_CALLBACK hash(FUNCTION *a); |
87 | static int MS_CALLBACK cmp(FUNCTION *a,FUNCTION *b); | 77 | static int MS_CALLBACK cmp(FUNCTION *a,FUNCTION *b); |
88 | static LHASH *prog_init(void ); | 78 | static LHASH *prog_init(void ); |
@@ -90,15 +80,6 @@ static int do_cmd(LHASH *prog,int argc,char *argv[]); | |||
90 | LHASH *config=NULL; | 80 | LHASH *config=NULL; |
91 | char *default_config_file=NULL; | 81 | char *default_config_file=NULL; |
92 | 82 | ||
93 | #ifdef DEBUG | ||
94 | static void sig_stop(int i) | ||
95 | { | ||
96 | char *a=NULL; | ||
97 | |||
98 | *a='\0'; | ||
99 | } | ||
100 | #endif | ||
101 | |||
102 | /* Make sure there is only one when MONOLITH is defined */ | 83 | /* Make sure there is only one when MONOLITH is defined */ |
103 | #ifdef MONOLITH | 84 | #ifdef MONOLITH |
104 | BIO *bio_err=NULL; | 85 | BIO *bio_err=NULL; |
@@ -120,15 +101,6 @@ int main(int Argc, char *Argv[]) | |||
120 | arg.data=NULL; | 101 | arg.data=NULL; |
121 | arg.count=0; | 102 | arg.count=0; |
122 | 103 | ||
123 | #if defined(DEBUG) && !defined(WINDOWS) && !defined(MSDOS) | ||
124 | #ifdef SIGBUS | ||
125 | signal(SIGBUS,sig_stop); | ||
126 | #endif | ||
127 | #ifdef SIGSEGV | ||
128 | signal(SIGSEGV,sig_stop); | ||
129 | #endif | ||
130 | #endif | ||
131 | |||
132 | CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON); | 104 | CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON); |
133 | 105 | ||
134 | apps_startup(); | 106 | apps_startup(); |
@@ -234,13 +206,7 @@ end: | |||
234 | 206 | ||
235 | EVP_cleanup(); | 207 | EVP_cleanup(); |
236 | ERR_free_strings(); | 208 | ERR_free_strings(); |
237 | 209 | ||
238 | #ifdef LEVITTE_DEBUG | ||
239 | CRYPTO_push_info("Just to make sure I get a memory leak I can see :-)"); | ||
240 | (void)Malloc(1024); | ||
241 | CRYPTO_pop_info(); | ||
242 | #endif | ||
243 | |||
244 | CRYPTO_mem_leaks(bio_err); | 210 | CRYPTO_mem_leaks(bio_err); |
245 | if (bio_err != NULL) | 211 | if (bio_err != NULL) |
246 | { | 212 | { |
@@ -267,6 +233,18 @@ static int do_cmd(LHASH *prog, int argc, char *argv[]) | |||
267 | { | 233 | { |
268 | ret=fp->func(argc,argv); | 234 | ret=fp->func(argc,argv); |
269 | } | 235 | } |
236 | else if ((strncmp(argv[0],"no-",3)) == 0) | ||
237 | { | ||
238 | BIO *bio_stdout = BIO_new_fp(stdout,BIO_NOCLOSE); | ||
239 | f.name=argv[0]+3; | ||
240 | ret = (lh_retrieve(prog,&f) != NULL); | ||
241 | if (!ret) | ||
242 | BIO_printf(bio_stdout, "%s\n", argv[0]); | ||
243 | else | ||
244 | BIO_printf(bio_stdout, "%s\n", argv[0]+3); | ||
245 | BIO_free(bio_stdout); | ||
246 | goto end; | ||
247 | } | ||
270 | else if ((strcmp(argv[0],"quit") == 0) || | 248 | else if ((strcmp(argv[0],"quit") == 0) || |
271 | (strcmp(argv[0],"q") == 0) || | 249 | (strcmp(argv[0],"q") == 0) || |
272 | (strcmp(argv[0],"exit") == 0) || | 250 | (strcmp(argv[0],"exit") == 0) || |
diff --git a/src/lib/libssl/src/apps/pkcs12.c b/src/lib/libssl/src/apps/pkcs12.c index d535a71335..bf76864713 100644 --- a/src/lib/libssl/src/apps/pkcs12.c +++ b/src/lib/libssl/src/apps/pkcs12.c | |||
@@ -265,7 +265,7 @@ int MAIN(int argc, char **argv) | |||
265 | BIO_printf (bio_err, "-password p set import/export password source\n"); | 265 | BIO_printf (bio_err, "-password p set import/export password source\n"); |
266 | BIO_printf (bio_err, "-passin p input file pass phrase source\n"); | 266 | BIO_printf (bio_err, "-passin p input file pass phrase source\n"); |
267 | BIO_printf (bio_err, "-passout p output file pass phrase source\n"); | 267 | BIO_printf (bio_err, "-passout p output file pass phrase source\n"); |
268 | BIO_printf(bio_err, "-rand file:file:...\n"); | 268 | BIO_printf(bio_err, "-rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR); |
269 | BIO_printf(bio_err, " load the file (or the files in the directory) into\n"); | 269 | BIO_printf(bio_err, " load the file (or the files in the directory) into\n"); |
270 | BIO_printf(bio_err, " the random number generator\n"); | 270 | BIO_printf(bio_err, " the random number generator\n"); |
271 | goto end; | 271 | goto end; |
diff --git a/src/lib/libssl/src/apps/progs.h b/src/lib/libssl/src/apps/progs.h index ffb21bd64f..7d2238493a 100644 --- a/src/lib/libssl/src/apps/progs.h +++ b/src/lib/libssl/src/apps/progs.h | |||
@@ -33,6 +33,7 @@ extern int pkcs12_main(int argc,char *argv[]); | |||
33 | extern int pkcs8_main(int argc,char *argv[]); | 33 | extern int pkcs8_main(int argc,char *argv[]); |
34 | extern int spkac_main(int argc,char *argv[]); | 34 | extern int spkac_main(int argc,char *argv[]); |
35 | extern int smime_main(int argc,char *argv[]); | 35 | extern int smime_main(int argc,char *argv[]); |
36 | extern int rand_main(int argc,char *argv[]); | ||
36 | 37 | ||
37 | #define FUNC_TYPE_GENERAL 1 | 38 | #define FUNC_TYPE_GENERAL 1 |
38 | #define FUNC_TYPE_MD 2 | 39 | #define FUNC_TYPE_MD 2 |
@@ -103,6 +104,7 @@ FUNCTION functions[] = { | |||
103 | {FUNC_TYPE_GENERAL,"pkcs8",pkcs8_main}, | 104 | {FUNC_TYPE_GENERAL,"pkcs8",pkcs8_main}, |
104 | {FUNC_TYPE_GENERAL,"spkac",spkac_main}, | 105 | {FUNC_TYPE_GENERAL,"spkac",spkac_main}, |
105 | {FUNC_TYPE_GENERAL,"smime",smime_main}, | 106 | {FUNC_TYPE_GENERAL,"smime",smime_main}, |
107 | {FUNC_TYPE_GENERAL,"rand",rand_main}, | ||
106 | {FUNC_TYPE_MD,"md2",dgst_main}, | 108 | {FUNC_TYPE_MD,"md2",dgst_main}, |
107 | {FUNC_TYPE_MD,"md5",dgst_main}, | 109 | {FUNC_TYPE_MD,"md5",dgst_main}, |
108 | {FUNC_TYPE_MD,"sha",dgst_main}, | 110 | {FUNC_TYPE_MD,"sha",dgst_main}, |
diff --git a/src/lib/libssl/src/apps/rand.c b/src/lib/libssl/src/apps/rand.c new file mode 100644 index 0000000000..cfbba30755 --- /dev/null +++ b/src/lib/libssl/src/apps/rand.c | |||
@@ -0,0 +1,140 @@ | |||
1 | /* apps/rand.c */ | ||
2 | |||
3 | #include "apps.h" | ||
4 | |||
5 | #include <ctype.h> | ||
6 | #include <stdio.h> | ||
7 | #include <string.h> | ||
8 | |||
9 | #include <openssl/bio.h> | ||
10 | #include <openssl/err.h> | ||
11 | #include <openssl/rand.h> | ||
12 | |||
13 | #undef PROG | ||
14 | #define PROG rand_main | ||
15 | |||
16 | /* -out file - write to file | ||
17 | * -rand file:file - PRNG seed files | ||
18 | * -base64 - encode output | ||
19 | * num - write 'num' bytes | ||
20 | */ | ||
21 | |||
22 | int MAIN(int, char **); | ||
23 | |||
24 | int MAIN(int argc, char **argv) | ||
25 | { | ||
26 | int i, r, ret = 1; | ||
27 | int badopt; | ||
28 | char *outfile = NULL; | ||
29 | char *inrand = NULL; | ||
30 | int base64 = 0; | ||
31 | BIO *out = NULL; | ||
32 | int num = -1; | ||
33 | |||
34 | apps_startup(); | ||
35 | |||
36 | if (bio_err == NULL) | ||
37 | if ((bio_err = BIO_new(BIO_s_file())) != NULL) | ||
38 | BIO_set_fp(bio_err, stderr, BIO_NOCLOSE|BIO_FP_TEXT); | ||
39 | |||
40 | badopt = 0; | ||
41 | i = 0; | ||
42 | while (!badopt && argv[++i] != NULL) | ||
43 | { | ||
44 | if (strcmp(argv[i], "-out") == 0) | ||
45 | { | ||
46 | if ((argv[i+1] != NULL) && (outfile == NULL)) | ||
47 | outfile = argv[++i]; | ||
48 | else | ||
49 | badopt = 1; | ||
50 | } | ||
51 | else if (strcmp(argv[i], "-rand") == 0) | ||
52 | { | ||
53 | if ((argv[i+1] != NULL) && (inrand == NULL)) | ||
54 | inrand = argv[++i]; | ||
55 | else | ||
56 | badopt = 1; | ||
57 | } | ||
58 | else if (strcmp(argv[i], "-base64") == 0) | ||
59 | { | ||
60 | if (!base64) | ||
61 | base64 = 1; | ||
62 | else | ||
63 | badopt = 1; | ||
64 | } | ||
65 | else if (isdigit(argv[i][0])) | ||
66 | { | ||
67 | if (num < 0) | ||
68 | { | ||
69 | r = sscanf(argv[i], "%d", &num); | ||
70 | if (r == 0 || num < 0) | ||
71 | badopt = 1; | ||
72 | } | ||
73 | else | ||
74 | badopt = 1; | ||
75 | } | ||
76 | else | ||
77 | badopt = 1; | ||
78 | } | ||
79 | |||
80 | if (num < 0) | ||
81 | badopt = 1; | ||
82 | |||
83 | if (badopt) | ||
84 | { | ||
85 | BIO_printf(bio_err, "Usage: rand [options] num\n"); | ||
86 | BIO_printf(bio_err, "where options are\n"); | ||
87 | BIO_printf(bio_err, "-out file - write to file\n"); | ||
88 | BIO_printf(bio_err, "-rand file%cfile%c... - seed PRNG from files\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR); | ||
89 | BIO_printf(bio_err, "-base64 - encode output\n"); | ||
90 | goto err; | ||
91 | } | ||
92 | |||
93 | app_RAND_load_file(NULL, bio_err, (inrand != NULL)); | ||
94 | if (inrand != NULL) | ||
95 | BIO_printf(bio_err,"%ld semi-random bytes loaded\n", | ||
96 | app_RAND_load_files(inrand)); | ||
97 | |||
98 | out = BIO_new(BIO_s_file()); | ||
99 | if (out == NULL) | ||
100 | goto err; | ||
101 | if (outfile != NULL) | ||
102 | r = BIO_write_filename(out, outfile); | ||
103 | else | ||
104 | r = BIO_set_fp(out, stdout, BIO_NOCLOSE | BIO_FP_TEXT); | ||
105 | if (r <= 0) | ||
106 | goto err; | ||
107 | |||
108 | if (base64) | ||
109 | { | ||
110 | BIO *b64 = BIO_new(BIO_f_base64()); | ||
111 | if (b64 == NULL) | ||
112 | goto err; | ||
113 | out = BIO_push(b64, out); | ||
114 | } | ||
115 | |||
116 | while (num > 0) | ||
117 | { | ||
118 | unsigned char buf[4096]; | ||
119 | int chunk; | ||
120 | |||
121 | chunk = num; | ||
122 | if (chunk > sizeof buf) | ||
123 | chunk = sizeof buf; | ||
124 | r = RAND_bytes(buf, chunk); | ||
125 | if (r <= 0) | ||
126 | goto err; | ||
127 | BIO_write(out, buf, chunk); | ||
128 | num -= chunk; | ||
129 | } | ||
130 | BIO_flush(out); | ||
131 | |||
132 | app_RAND_write_file(NULL, bio_err); | ||
133 | ret = 0; | ||
134 | |||
135 | err: | ||
136 | ERR_print_errors(bio_err); | ||
137 | if (out) | ||
138 | BIO_free_all(out); | ||
139 | EXIT(ret); | ||
140 | } | ||
diff --git a/src/lib/libssl/src/apps/req.c b/src/lib/libssl/src/apps/req.c index 97bb0d0ed8..eb338eeb1b 100644 --- a/src/lib/libssl/src/apps/req.c +++ b/src/lib/libssl/src/apps/req.c | |||
@@ -878,8 +878,8 @@ end: | |||
878 | EVP_PKEY_free(pkey); | 878 | EVP_PKEY_free(pkey); |
879 | X509_REQ_free(req); | 879 | X509_REQ_free(req); |
880 | X509_free(x509ss); | 880 | X509_free(x509ss); |
881 | if(passin) Free(passin); | 881 | if(passargin && passin) Free(passin); |
882 | if(passout) Free(passout); | 882 | if(passargout && passout) Free(passout); |
883 | OBJ_cleanup(); | 883 | OBJ_cleanup(); |
884 | #ifndef NO_DSA | 884 | #ifndef NO_DSA |
885 | if (dsa_params != NULL) DSA_free(dsa_params); | 885 | if (dsa_params != NULL) DSA_free(dsa_params); |
diff --git a/src/lib/libssl/src/apps/rsa.c b/src/lib/libssl/src/apps/rsa.c index 53d234ca35..9d4c2e6564 100644 --- a/src/lib/libssl/src/apps/rsa.c +++ b/src/lib/libssl/src/apps/rsa.c | |||
@@ -179,7 +179,6 @@ bad: | |||
179 | BIO_printf(bio_err," -outform arg output format - one of DER NET PEM\n"); | 179 | BIO_printf(bio_err," -outform arg output format - one of DER NET PEM\n"); |
180 | BIO_printf(bio_err," -in arg input file\n"); | 180 | BIO_printf(bio_err," -in arg input file\n"); |
181 | BIO_printf(bio_err," -passin arg input file pass phrase source\n"); | 181 | BIO_printf(bio_err," -passin arg input file pass phrase source\n"); |
182 | BIO_printf(bio_err," -in arg input file\n"); | ||
183 | BIO_printf(bio_err," -out arg output file\n"); | 182 | BIO_printf(bio_err," -out arg output file\n"); |
184 | BIO_printf(bio_err," -passout arg output file pass phrase source\n"); | 183 | BIO_printf(bio_err," -passout arg output file pass phrase source\n"); |
185 | BIO_printf(bio_err," -des encrypt PEM output with cbc des\n"); | 184 | BIO_printf(bio_err," -des encrypt PEM output with cbc des\n"); |
diff --git a/src/lib/libssl/src/apps/rsa/01.pem b/src/lib/libssl/src/apps/rsa/01.pem index 36ec57598e..e69de29bb2 100644 --- a/src/lib/libssl/src/apps/rsa/01.pem +++ b/src/lib/libssl/src/apps/rsa/01.pem | |||
@@ -1,15 +0,0 @@ | |||
1 | -----BEGIN CERTIFICATE----- | ||
2 | MIICTjCCAbsCEGiuFKTJn6nzmiPPLxUZs1owDQYJKoZIhvcNAQEEBQAwXzELMAkG | ||
3 | A1UEBhMCVVMxIDAeBgNVBAoTF1JTQSBEYXRhIFNlY3VyaXR5LCBJbmMuMS4wLAYD | ||
4 | VQQLEyVTZWN1cmUgU2VydmVyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk4 | ||
5 | MDUxODAwMDAwMFoXDTk5MDUxODIzNTk1OVowdTELMAkGA1UEBhMCVVMxETAPBgNV | ||
6 | BAgTCE5ldyBZb3JrMREwDwYDVQQHFAhOZXcgWW9yazEeMBwGA1UEChQVSW5kdXN0 | ||
7 | cmlhbCBQcmVzcyBJbmMuMSAwHgYDVQQDFBd3d3cuaW5kdXN0cmlhbHByZXNzLmNv | ||
8 | bTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqiH9xUJNHvqCmaDon27ValJb | ||
9 | qTLymF3yKKWBxbODLWjX7yKjewoqWhotaEARI6jXPqomU87gFU1tH4r/bgwh3FmU | ||
10 | MK3qo92XOsvwNAHzXzWRXQNJmm54g2F1RUt00pgYiOximDse1t9RL5POCDEbfX8D | ||
11 | gugrE/WwkS2FrSoc5/cCAwEAATANBgkqhkiG9w0BAQQFAAN+AIw7fvF0EtEvrNS/ | ||
12 | LYuqAgUw/tH0FLgCkqKLmYYm/yR+Z0hD2eP/UhF+jAwmV8rHtBnaTM7oN23RVW2k | ||
13 | Cf8soiGfr2PYtfufpXtd7azUFa+WJCWnp0N29EG0BR1JOFC0Q/4dh/X9qulM8luq | ||
14 | Pjrmw2eSgbdmmdumWAcNPVbV | ||
15 | -----END CERTIFICATE----- | ||
diff --git a/src/lib/libssl/src/apps/rsa/1.txt b/src/lib/libssl/src/apps/rsa/1.txt index 95a862e150..e69de29bb2 100644 --- a/src/lib/libssl/src/apps/rsa/1.txt +++ b/src/lib/libssl/src/apps/rsa/1.txt | |||
@@ -1,50 +0,0 @@ | |||
1 | issuer= /C=US/O=RSA Data Security, Inc./OU=Secure Server Certification Authority | ||
2 | subject=/C=US/ST=New York/L=New York/O=Industrial Press Inc./CN=www.industrialpress.com | ||
3 | Certificate: | ||
4 | Data: | ||
5 | Version: 1 (0x0) | ||
6 | Serial Number: | ||
7 | 68:ae:14:a4:c9:9f:a9:f3:9a:23:cf:2f:15:19:b3:5a | ||
8 | Signature Algorithm: md5WithRSAEncryption | ||
9 | Issuer: C=US, O=RSA Data Security, Inc., OU=Secure Server Certification Authority | ||
10 | Validity | ||
11 | Not Before: May 18 00:00:00 1998 GMT | ||
12 | Not After : May 18 23:59:59 1999 GMT | ||
13 | Subject: C=US, ST=New York, L=New York, O=Industrial Press Inc., CN=www.industrialpress.com | ||
14 | Subject Public Key Info: | ||
15 | Public Key Algorithm: rsaEncryption | ||
16 | RSA Public Key: (1024 bit) | ||
17 | Modulus (1024 bit): | ||
18 | 00:aa:21:fd:c5:42:4d:1e:fa:82:99:a0:e8:9f:6e: | ||
19 | d5:6a:52:5b:a9:32:f2:98:5d:f2:28:a5:81:c5:b3: | ||
20 | 83:2d:68:d7:ef:22:a3:7b:0a:2a:5a:1a:2d:68:40: | ||
21 | 11:23:a8:d7:3e:aa:26:53:ce:e0:15:4d:6d:1f:8a: | ||
22 | ff:6e:0c:21:dc:59:94:30:ad:ea:a3:dd:97:3a:cb: | ||
23 | f0:34:01:f3:5f:35:91:5d:03:49:9a:6e:78:83:61: | ||
24 | 75:45:4b:74:d2:98:18:88:ec:62:98:3b:1e:d6:df: | ||
25 | 51:2f:93:ce:08:31:1b:7d:7f:03:82:e8:2b:13:f5: | ||
26 | b0:91:2d:85:ad:2a:1c:e7:f7 | ||
27 | Exponent: 65537 (0x10001) | ||
28 | Signature Algorithm: md5WithRSAEncryption | ||
29 | 8c:3b:7e:f1:74:12:d1:2f:ac:d4:bf:2d:8b:aa:02:05:30:fe: | ||
30 | d1:f4:14:b8:02:92:a2:8b:99:86:26:ff:24:7e:67:48:43:d9: | ||
31 | e3:ff:52:11:7e:8c:0c:26:57:ca:c7:b4:19:da:4c:ce:e8:37: | ||
32 | 6d:d1:55:6d:a4:09:ff:2c:a2:21:9f:af:63:d8:b5:fb:9f:a5: | ||
33 | 7b:5d:ed:ac:d4:15:af:96:24:25:a7:a7:43:76:f4:41:b4:05: | ||
34 | 1d:49:38:50:b4:43:fe:1d:87:f5:fd:aa:e9:4c:f2:5b:aa:3e: | ||
35 | 3a:e6:c3:67:92:81:b7:66:99:db:a6:58:07:0d:3d:56:d5 | ||
36 | -----BEGIN CERTIFICATE----- | ||
37 | MIICTjCCAbsCEGiuFKTJn6nzmiPPLxUZs1owDQYJKoZIhvcNAQEEBQAwXzELMAkG | ||
38 | A1UEBhMCVVMxIDAeBgNVBAoTF1JTQSBEYXRhIFNlY3VyaXR5LCBJbmMuMS4wLAYD | ||
39 | VQQLEyVTZWN1cmUgU2VydmVyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk4 | ||
40 | MDUxODAwMDAwMFoXDTk5MDUxODIzNTk1OVowdTELMAkGA1UEBhMCVVMxETAPBgNV | ||
41 | BAgTCE5ldyBZb3JrMREwDwYDVQQHFAhOZXcgWW9yazEeMBwGA1UEChQVSW5kdXN0 | ||
42 | cmlhbCBQcmVzcyBJbmMuMSAwHgYDVQQDFBd3d3cuaW5kdXN0cmlhbHByZXNzLmNv | ||
43 | bTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqiH9xUJNHvqCmaDon27ValJb | ||
44 | qTLymF3yKKWBxbODLWjX7yKjewoqWhotaEARI6jXPqomU87gFU1tH4r/bgwh3FmU | ||
45 | MK3qo92XOsvwNAHzXzWRXQNJmm54g2F1RUt00pgYiOximDse1t9RL5POCDEbfX8D | ||
46 | gugrE/WwkS2FrSoc5/cCAwEAATANBgkqhkiG9w0BAQQFAAN+AIw7fvF0EtEvrNS/ | ||
47 | LYuqAgUw/tH0FLgCkqKLmYYm/yR+Z0hD2eP/UhF+jAwmV8rHtBnaTM7oN23RVW2k | ||
48 | Cf8soiGfr2PYtfufpXtd7azUFa+WJCWnp0N29EG0BR1JOFC0Q/4dh/X9qulM8luq | ||
49 | Pjrmw2eSgbdmmdumWAcNPVbV | ||
50 | -----END CERTIFICATE----- | ||
diff --git a/src/lib/libssl/src/apps/rsa/SecureServer.pem b/src/lib/libssl/src/apps/rsa/SecureServer.pem index 7c8ffb2cd8..e69de29bb2 100644 --- a/src/lib/libssl/src/apps/rsa/SecureServer.pem +++ b/src/lib/libssl/src/apps/rsa/SecureServer.pem | |||
@@ -1,47 +0,0 @@ | |||
1 | Certificate: | ||
2 | Data: | ||
3 | Version: 1 (0x0) | ||
4 | Serial Number: | ||
5 | 02:ad:66:7e:4e:45:fe:5e:57:6f:3c:98:19:5e:dd:c0 | ||
6 | Signature Algorithm: md2WithRSAEncryption | ||
7 | Issuer: C=US, O=RSA Data Security, Inc., OU=Secure Server Certification Authority | ||
8 | Validity | ||
9 | Not Before: Nov 9 00:00:00 1994 GMT | ||
10 | Not After : Jan 7 23:59:59 2010 GMT | ||
11 | Subject: C=US, O=RSA Data Security, Inc., OU=Secure Server Certification Authority | ||
12 | Subject Public Key Info: | ||
13 | Public Key Algorithm: rsaEncryption | ||
14 | RSA Public Key: (1000 bit) | ||
15 | Modulus (1000 bit): | ||
16 | 00:92:ce:7a:c1:ae:83:3e:5a:aa:89:83:57:ac:25: | ||
17 | 01:76:0c:ad:ae:8e:2c:37:ce:eb:35:78:64:54:03: | ||
18 | e5:84:40:51:c9:bf:8f:08:e2:8a:82:08:d2:16:86: | ||
19 | 37:55:e9:b1:21:02:ad:76:68:81:9a:05:a2:4b:c9: | ||
20 | 4b:25:66:22:56:6c:88:07:8f:f7:81:59:6d:84:07: | ||
21 | 65:70:13:71:76:3e:9b:77:4c:e3:50:89:56:98:48: | ||
22 | b9:1d:a7:29:1a:13:2e:4a:11:59:9c:1e:15:d5:49: | ||
23 | 54:2c:73:3a:69:82:b1:97:39:9c:6d:70:67:48:e5: | ||
24 | dd:2d:d6:c8:1e:7b | ||
25 | Exponent: 65537 (0x10001) | ||
26 | Signature Algorithm: md2WithRSAEncryption | ||
27 | 65:dd:7e:e1:b2:ec:b0:e2:3a:e0:ec:71:46:9a:19:11:b8:d3: | ||
28 | c7:a0:b4:03:40:26:02:3e:09:9c:e1:12:b3:d1:5a:f6:37:a5: | ||
29 | b7:61:03:b6:5b:16:69:3b:c6:44:08:0c:88:53:0c:6b:97:49: | ||
30 | c7:3e:35:dc:6c:b9:bb:aa:df:5c:bb:3a:2f:93:60:b6:a9:4b: | ||
31 | 4d:f2:20:f7:cd:5f:7f:64:7b:8e:dc:00:5c:d7:fa:77:ca:39: | ||
32 | 16:59:6f:0e:ea:d3:b5:83:7f:4d:4d:42:56:76:b4:c9:5f:04: | ||
33 | f8:38:f8:eb:d2:5f:75:5f:cd:7b:fc:e5:8e:80:7c:fc:50 | ||
34 | -----BEGIN CERTIFICATE----- | ||
35 | MIICNDCCAaECEAKtZn5ORf5eV288mBle3cAwDQYJKoZIhvcNAQECBQAwXzELMAkG | ||
36 | A1UEBhMCVVMxIDAeBgNVBAoTF1JTQSBEYXRhIFNlY3VyaXR5LCBJbmMuMS4wLAYD | ||
37 | VQQLEyVTZWN1cmUgU2VydmVyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk0 | ||
38 | MTEwOTAwMDAwMFoXDTEwMDEwNzIzNTk1OVowXzELMAkGA1UEBhMCVVMxIDAeBgNV | ||
39 | BAoTF1JTQSBEYXRhIFNlY3VyaXR5LCBJbmMuMS4wLAYDVQQLEyVTZWN1cmUgU2Vy | ||
40 | dmVyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGbMA0GCSqGSIb3DQEBAQUAA4GJ | ||
41 | ADCBhQJ+AJLOesGugz5aqomDV6wlAXYMra6OLDfO6zV4ZFQD5YRAUcm/jwjiioII | ||
42 | 0haGN1XpsSECrXZogZoFokvJSyVmIlZsiAeP94FZbYQHZXATcXY+m3dM41CJVphI | ||
43 | uR2nKRoTLkoRWZweFdVJVCxzOmmCsZc5nG1wZ0jl3S3WyB57AgMBAAEwDQYJKoZI | ||
44 | hvcNAQECBQADfgBl3X7hsuyw4jrg7HFGmhkRuNPHoLQDQCYCPgmc4RKz0Vr2N6W3 | ||
45 | YQO2WxZpO8ZECAyIUwxrl0nHPjXcbLm7qt9cuzovk2C2qUtN8iD3zV9/ZHuO3ABc | ||
46 | 1/p3yjkWWW8O6tO1g39NTUJWdrTJXwT4OPjr0l91X817/OWOgHz8UA== | ||
47 | -----END CERTIFICATE----- | ||
diff --git a/src/lib/libssl/src/apps/rsa/s.txt b/src/lib/libssl/src/apps/rsa/s.txt index 7de7e0764f..e69de29bb2 100644 --- a/src/lib/libssl/src/apps/rsa/s.txt +++ b/src/lib/libssl/src/apps/rsa/s.txt | |||
@@ -1,49 +0,0 @@ | |||
1 | issuer= /C=US/O=RSA Data Security, Inc./OU=Secure Server Certification Authority | ||
2 | subject=/C=US/O=RSA Data Security, Inc./OU=Secure Server Certification Authority | ||
3 | Certificate: | ||
4 | Data: | ||
5 | Version: 1 (0x0) | ||
6 | Serial Number: | ||
7 | 02:ad:66:7e:4e:45:fe:5e:57:6f:3c:98:19:5e:dd:c0 | ||
8 | Signature Algorithm: md2WithRSAEncryption | ||
9 | Issuer: C=US, O=RSA Data Security, Inc., OU=Secure Server Certification Authority | ||
10 | Validity | ||
11 | Not Before: Nov 9 00:00:00 1994 GMT | ||
12 | Not After : Jan 7 23:59:59 2010 GMT | ||
13 | Subject: C=US, O=RSA Data Security, Inc., OU=Secure Server Certification Authority | ||
14 | Subject Public Key Info: | ||
15 | Public Key Algorithm: rsaEncryption | ||
16 | RSA Public Key: (1000 bit) | ||
17 | Modulus (1000 bit): | ||
18 | 00:92:ce:7a:c1:ae:83:3e:5a:aa:89:83:57:ac:25: | ||
19 | 01:76:0c:ad:ae:8e:2c:37:ce:eb:35:78:64:54:03: | ||
20 | e5:84:40:51:c9:bf:8f:08:e2:8a:82:08:d2:16:86: | ||
21 | 37:55:e9:b1:21:02:ad:76:68:81:9a:05:a2:4b:c9: | ||
22 | 4b:25:66:22:56:6c:88:07:8f:f7:81:59:6d:84:07: | ||
23 | 65:70:13:71:76:3e:9b:77:4c:e3:50:89:56:98:48: | ||
24 | b9:1d:a7:29:1a:13:2e:4a:11:59:9c:1e:15:d5:49: | ||
25 | 54:2c:73:3a:69:82:b1:97:39:9c:6d:70:67:48:e5: | ||
26 | dd:2d:d6:c8:1e:7b | ||
27 | Exponent: 65537 (0x10001) | ||
28 | Signature Algorithm: md2WithRSAEncryption | ||
29 | 65:dd:7e:e1:b2:ec:b0:e2:3a:e0:ec:71:46:9a:19:11:b8:d3: | ||
30 | c7:a0:b4:03:40:26:02:3e:09:9c:e1:12:b3:d1:5a:f6:37:a5: | ||
31 | b7:61:03:b6:5b:16:69:3b:c6:44:08:0c:88:53:0c:6b:97:49: | ||
32 | c7:3e:35:dc:6c:b9:bb:aa:df:5c:bb:3a:2f:93:60:b6:a9:4b: | ||
33 | 4d:f2:20:f7:cd:5f:7f:64:7b:8e:dc:00:5c:d7:fa:77:ca:39: | ||
34 | 16:59:6f:0e:ea:d3:b5:83:7f:4d:4d:42:56:76:b4:c9:5f:04: | ||
35 | f8:38:f8:eb:d2:5f:75:5f:cd:7b:fc:e5:8e:80:7c:fc:50 | ||
36 | -----BEGIN CERTIFICATE----- | ||
37 | MIICNDCCAaECEAKtZn5ORf5eV288mBle3cAwDQYJKoZIhvcNAQECBQAwXzELMAkG | ||
38 | A1UEBhMCVVMxIDAeBgNVBAoTF1JTQSBEYXRhIFNlY3VyaXR5LCBJbmMuMS4wLAYD | ||
39 | VQQLEyVTZWN1cmUgU2VydmVyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk0 | ||
40 | MTEwOTAwMDAwMFoXDTEwMDEwNzIzNTk1OVowXzELMAkGA1UEBhMCVVMxIDAeBgNV | ||
41 | BAoTF1JTQSBEYXRhIFNlY3VyaXR5LCBJbmMuMS4wLAYDVQQLEyVTZWN1cmUgU2Vy | ||
42 | dmVyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGbMA0GCSqGSIb3DQEBAQUAA4GJ | ||
43 | ADCBhQJ+AJLOesGugz5aqomDV6wlAXYMra6OLDfO6zV4ZFQD5YRAUcm/jwjiioII | ||
44 | 0haGN1XpsSECrXZogZoFokvJSyVmIlZsiAeP94FZbYQHZXATcXY+m3dM41CJVphI | ||
45 | uR2nKRoTLkoRWZweFdVJVCxzOmmCsZc5nG1wZ0jl3S3WyB57AgMBAAEwDQYJKoZI | ||
46 | hvcNAQECBQADfgBl3X7hsuyw4jrg7HFGmhkRuNPHoLQDQCYCPgmc4RKz0Vr2N6W3 | ||
47 | YQO2WxZpO8ZECAyIUwxrl0nHPjXcbLm7qt9cuzovk2C2qUtN8iD3zV9/ZHuO3ABc | ||
48 | 1/p3yjkWWW8O6tO1g39NTUJWdrTJXwT4OPjr0l91X817/OWOgHz8UA== | ||
49 | -----END CERTIFICATE----- | ||
diff --git a/src/lib/libssl/src/apps/s_apps.h b/src/lib/libssl/src/apps/s_apps.h index 1a0e9f9f92..57af7c0f8c 100644 --- a/src/lib/libssl/src/apps/s_apps.h +++ b/src/lib/libssl/src/apps/s_apps.h | |||
@@ -84,7 +84,6 @@ typedef fd_mask fd_set; | |||
84 | #define PORT_STR "4433" | 84 | #define PORT_STR "4433" |
85 | #define PROTOCOL "tcp" | 85 | #define PROTOCOL "tcp" |
86 | 86 | ||
87 | int do_accept(int acc_sock, int *sock, char **host); | ||
88 | int do_server(int port, int *ret, int (*cb) (), char *context); | 87 | int do_server(int port, int *ret, int (*cb) (), char *context); |
89 | #ifdef HEADER_X509_H | 88 | #ifdef HEADER_X509_H |
90 | int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx); | 89 | int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx); |
@@ -97,17 +96,9 @@ int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file); | |||
97 | int set_cert_stuff(char *ctx, char *cert_file, char *key_file); | 96 | int set_cert_stuff(char *ctx, char *cert_file, char *key_file); |
98 | #endif | 97 | #endif |
99 | int init_client(int *sock, char *server, int port); | 98 | int init_client(int *sock, char *server, int port); |
100 | int init_client_ip(int *sock,unsigned char ip[4], int port); | ||
101 | int nbio_init_client_ip(int *sock,unsigned char ip[4], int port); | ||
102 | int nbio_sock_error(int sock); | ||
103 | int spawn(int argc, char **argv, int *in, int *out); | ||
104 | int init_server(int *sock, int port); | ||
105 | int init_server_long(int *sock, int port,char *ip); | ||
106 | int should_retry(int i); | 99 | int should_retry(int i); |
107 | void sock_cleanup(void ); | ||
108 | int extract_port(char *str, short *port_ptr); | 100 | int extract_port(char *str, short *port_ptr); |
109 | int extract_host_port(char *str,char **host_ptr,unsigned char *ip,short *p); | 101 | int extract_host_port(char *str,char **host_ptr,unsigned char *ip,short *p); |
110 | int host_ip(char *str, unsigned char ip[4]); | ||
111 | 102 | ||
112 | long MS_CALLBACK bio_dump_cb(BIO *bio, int cmd, const char *argp, | 103 | long MS_CALLBACK bio_dump_cb(BIO *bio, int cmd, const char *argp, |
113 | int argi, long argl, long ret); | 104 | int argi, long argl, long ret); |
diff --git a/src/lib/libssl/src/apps/s_cb.c b/src/lib/libssl/src/apps/s_cb.c index fdb11a1d11..fd622597d6 100644 --- a/src/lib/libssl/src/apps/s_cb.c +++ b/src/lib/libssl/src/apps/s_cb.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* apps/s_cb.c */ | 1 | /* apps/s_cb.c - callback functions used by s_client, s_server, and s_time */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
diff --git a/src/lib/libssl/src/apps/s_client.c b/src/lib/libssl/src/apps/s_client.c index c4c3b0e94a..e629f8e7f1 100644 --- a/src/lib/libssl/src/apps/s_client.c +++ b/src/lib/libssl/src/apps/s_client.c | |||
@@ -117,6 +117,7 @@ static void sc_usage(void); | |||
117 | static void print_stuff(BIO *berr,SSL *con,int full); | 117 | static void print_stuff(BIO *berr,SSL *con,int full); |
118 | static BIO *bio_c_out=NULL; | 118 | static BIO *bio_c_out=NULL; |
119 | static int c_quiet=0; | 119 | static int c_quiet=0; |
120 | static int c_ign_eof=0; | ||
120 | 121 | ||
121 | static void sc_usage(void) | 122 | static void sc_usage(void) |
122 | { | 123 | { |
@@ -143,6 +144,7 @@ static void sc_usage(void) | |||
143 | #endif | 144 | #endif |
144 | BIO_printf(bio_err," -crlf - convert LF from terminal into CRLF\n"); | 145 | BIO_printf(bio_err," -crlf - convert LF from terminal into CRLF\n"); |
145 | BIO_printf(bio_err," -quiet - no s_client output\n"); | 146 | BIO_printf(bio_err," -quiet - no s_client output\n"); |
147 | BIO_printf(bio_err," -ign_eof - ignore input eof (default when -quiet)\n"); | ||
146 | BIO_printf(bio_err," -ssl2 - just use SSLv2\n"); | 148 | BIO_printf(bio_err," -ssl2 - just use SSLv2\n"); |
147 | BIO_printf(bio_err," -ssl3 - just use SSLv3\n"); | 149 | BIO_printf(bio_err," -ssl3 - just use SSLv3\n"); |
148 | BIO_printf(bio_err," -tls1 - just use TLSv1\n"); | 150 | BIO_printf(bio_err," -tls1 - just use TLSv1\n"); |
@@ -192,6 +194,7 @@ int MAIN(int argc, char **argv) | |||
192 | apps_startup(); | 194 | apps_startup(); |
193 | c_Pause=0; | 195 | c_Pause=0; |
194 | c_quiet=0; | 196 | c_quiet=0; |
197 | c_ign_eof=0; | ||
195 | c_debug=0; | 198 | c_debug=0; |
196 | c_showcerts=0; | 199 | c_showcerts=0; |
197 | 200 | ||
@@ -249,7 +252,12 @@ int MAIN(int argc, char **argv) | |||
249 | else if (strcmp(*argv,"-crlf") == 0) | 252 | else if (strcmp(*argv,"-crlf") == 0) |
250 | crlf=1; | 253 | crlf=1; |
251 | else if (strcmp(*argv,"-quiet") == 0) | 254 | else if (strcmp(*argv,"-quiet") == 0) |
255 | { | ||
252 | c_quiet=1; | 256 | c_quiet=1; |
257 | c_ign_eof=1; | ||
258 | } | ||
259 | else if (strcmp(*argv,"-ign_eof") == 0) | ||
260 | c_ign_eof=1; | ||
253 | else if (strcmp(*argv,"-pause") == 0) | 261 | else if (strcmp(*argv,"-pause") == 0) |
254 | c_Pause=1; | 262 | c_Pause=1; |
255 | else if (strcmp(*argv,"-debug") == 0) | 263 | else if (strcmp(*argv,"-debug") == 0) |
@@ -711,13 +719,13 @@ printf("read=%d pending=%d peek=%d\n",k,SSL_pending(con),SSL_peek(con,zbuf,10240 | |||
711 | else | 719 | else |
712 | i=read(fileno(stdin),cbuf,BUFSIZZ); | 720 | i=read(fileno(stdin),cbuf,BUFSIZZ); |
713 | 721 | ||
714 | if ((!c_quiet) && ((i <= 0) || (cbuf[0] == 'Q'))) | 722 | if ((!c_ign_eof) && ((i <= 0) || (cbuf[0] == 'Q'))) |
715 | { | 723 | { |
716 | BIO_printf(bio_err,"DONE\n"); | 724 | BIO_printf(bio_err,"DONE\n"); |
717 | goto shut; | 725 | goto shut; |
718 | } | 726 | } |
719 | 727 | ||
720 | if ((!c_quiet) && (cbuf[0] == 'R')) | 728 | if ((!c_ign_eof) && (cbuf[0] == 'R')) |
721 | { | 729 | { |
722 | BIO_printf(bio_err,"RENEGOTIATING\n"); | 730 | BIO_printf(bio_err,"RENEGOTIATING\n"); |
723 | SSL_renegotiate(con); | 731 | SSL_renegotiate(con); |
diff --git a/src/lib/libssl/src/apps/s_socket.c b/src/lib/libssl/src/apps/s_socket.c index 888b66df18..081b1a57d1 100644 --- a/src/lib/libssl/src/apps/s_socket.c +++ b/src/lib/libssl/src/apps/s_socket.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* apps/s_socket.c */ | 1 | /* apps/s_socket.c - socket-related functions used by s_client and s_server */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -79,16 +79,17 @@ typedef unsigned int u_int; | |||
79 | #include "s_apps.h" | 79 | #include "s_apps.h" |
80 | #include <openssl/ssl.h> | 80 | #include <openssl/ssl.h> |
81 | 81 | ||
82 | #ifdef VMS | 82 | static struct hostent *GetHostByName(char *name); |
83 | #if (__VMS_VER < 70000000) /* FIONBIO used as a switch to enable ioctl, | 83 | #ifdef WINDOWS |
84 | and that isn't in VMS < 7.0 */ | 84 | static void sock_cleanup(void); |
85 | #undef FIONBIO | ||
86 | #endif | ||
87 | #include <processes.h> /* for vfork() */ | ||
88 | #endif | 85 | #endif |
86 | static int sock_init(void); | ||
87 | static int init_client_ip(int *sock,unsigned char ip[4], int port); | ||
88 | static int init_server(int *sock, int port); | ||
89 | static int init_server_long(int *sock, int port,char *ip); | ||
90 | static int do_accept(int acc_sock, int *sock, char **host); | ||
91 | static int host_ip(char *str, unsigned char ip[4]); | ||
89 | 92 | ||
90 | static struct hostent *GetHostByName(char *name); | ||
91 | int sock_init(void ); | ||
92 | #ifdef WIN16 | 93 | #ifdef WIN16 |
93 | #define SOCKET_PROTOCOL 0 /* more microsoft stupidity */ | 94 | #define SOCKET_PROTOCOL 0 /* more microsoft stupidity */ |
94 | #else | 95 | #else |
@@ -131,19 +132,19 @@ static BOOL CALLBACK enumproc(HWND hwnd,LPARAM lParam) | |||
131 | #endif /* WIN32 */ | 132 | #endif /* WIN32 */ |
132 | #endif /* WINDOWS */ | 133 | #endif /* WINDOWS */ |
133 | 134 | ||
134 | void sock_cleanup(void) | ||
135 | { | ||
136 | #ifdef WINDOWS | 135 | #ifdef WINDOWS |
136 | static void sock_cleanup(void) | ||
137 | { | ||
137 | if (wsa_init_done) | 138 | if (wsa_init_done) |
138 | { | 139 | { |
139 | wsa_init_done=0; | 140 | wsa_init_done=0; |
140 | WSACancelBlockingCall(); | 141 | WSACancelBlockingCall(); |
141 | WSACleanup(); | 142 | WSACleanup(); |
142 | } | 143 | } |
143 | #endif | ||
144 | } | 144 | } |
145 | #endif | ||
145 | 146 | ||
146 | int sock_init(void) | 147 | static int sock_init(void) |
147 | { | 148 | { |
148 | #ifdef WINDOWS | 149 | #ifdef WINDOWS |
149 | if (!wsa_init_done) | 150 | if (!wsa_init_done) |
@@ -187,7 +188,7 @@ int init_client(int *sock, char *host, int port) | |||
187 | return(init_client_ip(sock,ip,port)); | 188 | return(init_client_ip(sock,ip,port)); |
188 | } | 189 | } |
189 | 190 | ||
190 | int init_client_ip(int *sock, unsigned char ip[4], int port) | 191 | static int init_client_ip(int *sock, unsigned char ip[4], int port) |
191 | { | 192 | { |
192 | unsigned long addr; | 193 | unsigned long addr; |
193 | struct sockaddr_in them; | 194 | struct sockaddr_in them; |
@@ -218,75 +219,6 @@ int init_client_ip(int *sock, unsigned char ip[4], int port) | |||
218 | return(1); | 219 | return(1); |
219 | } | 220 | } |
220 | 221 | ||
221 | int nbio_sock_error(int sock) | ||
222 | { | ||
223 | int j,i; | ||
224 | int size; | ||
225 | |||
226 | size=sizeof(int); | ||
227 | /* Note: under VMS with SOCKETSHR the third parameter is currently | ||
228 | * of type (int *) whereas under other systems it is (void *) if | ||
229 | * you don't have a cast it will choke the compiler: if you do | ||
230 | * have a cast then you can either go for (int *) or (void *). | ||
231 | */ | ||
232 | i=getsockopt(sock,SOL_SOCKET,SO_ERROR,(char *)&j,(void *)&size); | ||
233 | if (i < 0) | ||
234 | return(1); | ||
235 | else | ||
236 | return(j); | ||
237 | } | ||
238 | |||
239 | int nbio_init_client_ip(int *sock, unsigned char ip[4], int port) | ||
240 | { | ||
241 | unsigned long addr; | ||
242 | struct sockaddr_in them; | ||
243 | int s,i; | ||
244 | |||
245 | if (!sock_init()) return(0); | ||
246 | |||
247 | memset((char *)&them,0,sizeof(them)); | ||
248 | them.sin_family=AF_INET; | ||
249 | them.sin_port=htons((unsigned short)port); | ||
250 | addr= (unsigned long) | ||
251 | ((unsigned long)ip[0]<<24L)| | ||
252 | ((unsigned long)ip[1]<<16L)| | ||
253 | ((unsigned long)ip[2]<< 8L)| | ||
254 | ((unsigned long)ip[3]); | ||
255 | them.sin_addr.s_addr=htonl(addr); | ||
256 | |||
257 | if (*sock <= 0) | ||
258 | { | ||
259 | #ifdef FIONBIO | ||
260 | unsigned long l=1; | ||
261 | #endif | ||
262 | |||
263 | s=socket(AF_INET,SOCK_STREAM,SOCKET_PROTOCOL); | ||
264 | if (s == INVALID_SOCKET) { perror("socket"); return(0); } | ||
265 | |||
266 | i=0; | ||
267 | i=setsockopt(s,SOL_SOCKET,SO_KEEPALIVE,(char *)&i,sizeof(i)); | ||
268 | if (i < 0) { perror("keepalive"); return(0); } | ||
269 | *sock=s; | ||
270 | |||
271 | #ifdef FIONBIO | ||
272 | BIO_socket_ioctl(s,FIONBIO,&l); | ||
273 | #endif | ||
274 | } | ||
275 | else | ||
276 | s= *sock; | ||
277 | |||
278 | i=connect(s,(struct sockaddr *)&them,sizeof(them)); | ||
279 | if (i == INVALID_SOCKET) | ||
280 | { | ||
281 | if (BIO_sock_should_retry(i)) | ||
282 | return(-1); | ||
283 | else | ||
284 | return(0); | ||
285 | } | ||
286 | else | ||
287 | return(1); | ||
288 | } | ||
289 | |||
290 | int do_server(int port, int *ret, int (*cb)(), char *context) | 222 | int do_server(int port, int *ret, int (*cb)(), char *context) |
291 | { | 223 | { |
292 | int sock; | 224 | int sock; |
@@ -319,7 +251,7 @@ int do_server(int port, int *ret, int (*cb)(), char *context) | |||
319 | } | 251 | } |
320 | } | 252 | } |
321 | 253 | ||
322 | int init_server_long(int *sock, int port, char *ip) | 254 | static int init_server_long(int *sock, int port, char *ip) |
323 | { | 255 | { |
324 | int ret=0; | 256 | int ret=0; |
325 | struct sockaddr_in server; | 257 | struct sockaddr_in server; |
@@ -369,12 +301,12 @@ err: | |||
369 | return(ret); | 301 | return(ret); |
370 | } | 302 | } |
371 | 303 | ||
372 | int init_server(int *sock, int port) | 304 | static int init_server(int *sock, int port) |
373 | { | 305 | { |
374 | return(init_server_long(sock, port, NULL)); | 306 | return(init_server_long(sock, port, NULL)); |
375 | } | 307 | } |
376 | 308 | ||
377 | int do_accept(int acc_sock, int *sock, char **host) | 309 | static int do_accept(int acc_sock, int *sock, char **host) |
378 | { | 310 | { |
379 | int ret,i; | 311 | int ret,i; |
380 | struct hostent *h1,*h2; | 312 | struct hostent *h1,*h2; |
@@ -490,7 +422,7 @@ err: | |||
490 | return(0); | 422 | return(0); |
491 | } | 423 | } |
492 | 424 | ||
493 | int host_ip(char *str, unsigned char ip[4]) | 425 | static int host_ip(char *str, unsigned char ip[4]) |
494 | { | 426 | { |
495 | unsigned int in[4]; | 427 | unsigned int in[4]; |
496 | int i; | 428 | int i; |
@@ -606,69 +538,3 @@ static struct hostent *GetHostByName(char *name) | |||
606 | return(ret); | 538 | return(ret); |
607 | } | 539 | } |
608 | } | 540 | } |
609 | |||
610 | #ifndef MSDOS | ||
611 | int spawn(int argc, char **argv, int *in, int *out) | ||
612 | { | ||
613 | int pid; | ||
614 | #define CHILD_READ p1[0] | ||
615 | #define CHILD_WRITE p2[1] | ||
616 | #define PARENT_READ p2[0] | ||
617 | #define PARENT_WRITE p1[1] | ||
618 | int p1[2],p2[2]; | ||
619 | |||
620 | if ((pipe(p1) < 0) || (pipe(p2) < 0)) return(-1); | ||
621 | |||
622 | #ifdef VMS | ||
623 | if ((pid=vfork()) == 0) | ||
624 | #else | ||
625 | if ((pid=fork()) == 0) | ||
626 | #endif | ||
627 | { /* child */ | ||
628 | if (dup2(CHILD_WRITE,fileno(stdout)) < 0) | ||
629 | perror("dup2"); | ||
630 | if (dup2(CHILD_WRITE,fileno(stderr)) < 0) | ||
631 | perror("dup2"); | ||
632 | if (dup2(CHILD_READ,fileno(stdin)) < 0) | ||
633 | perror("dup2"); | ||
634 | close(CHILD_READ); | ||
635 | close(CHILD_WRITE); | ||
636 | |||
637 | close(PARENT_READ); | ||
638 | close(PARENT_WRITE); | ||
639 | execvp(argv[0],argv); | ||
640 | perror("child"); | ||
641 | exit(1); | ||
642 | } | ||
643 | |||
644 | /* parent */ | ||
645 | *in= PARENT_READ; | ||
646 | *out=PARENT_WRITE; | ||
647 | close(CHILD_READ); | ||
648 | close(CHILD_WRITE); | ||
649 | return(pid); | ||
650 | } | ||
651 | #endif /* MSDOS */ | ||
652 | |||
653 | |||
654 | #ifdef undef | ||
655 | /* Turn on synchronous sockets so that we can do a WaitForMultipleObjects | ||
656 | * on sockets */ | ||
657 | { | ||
658 | SOCKET s; | ||
659 | int optionValue = SO_SYNCHRONOUS_NONALERT; | ||
660 | int err; | ||
661 | |||
662 | err = setsockopt( | ||
663 | INVALID_SOCKET, | ||
664 | SOL_SOCKET, | ||
665 | SO_OPENTYPE, | ||
666 | (char *)&optionValue, | ||
667 | sizeof(optionValue)); | ||
668 | if (err != NO_ERROR) { | ||
669 | /* failed for some reason... */ | ||
670 | BIO_printf(bio_err, "failed to setsockopt(SO_OPENTYPE, SO_SYNCHRONOUS_ALERT) - %d\n", | ||
671 | WSAGetLastError()); | ||
672 | } | ||
673 | } | ||
674 | #endif | ||
diff --git a/src/lib/libssl/src/apps/smime.c b/src/lib/libssl/src/apps/smime.c index 77633cfb60..7dc66d6ecd 100644 --- a/src/lib/libssl/src/apps/smime.c +++ b/src/lib/libssl/src/apps/smime.c | |||
@@ -272,7 +272,7 @@ int MAIN(int argc, char **argv) | |||
272 | BIO_printf (bio_err, "-text include or delete text MIME headers\n"); | 272 | BIO_printf (bio_err, "-text include or delete text MIME headers\n"); |
273 | BIO_printf (bio_err, "-CApath dir trusted certificates directory\n"); | 273 | BIO_printf (bio_err, "-CApath dir trusted certificates directory\n"); |
274 | BIO_printf (bio_err, "-CAfile file trusted certificates file\n"); | 274 | BIO_printf (bio_err, "-CAfile file trusted certificates file\n"); |
275 | BIO_printf(bio_err, "-rand file:file:...\n"); | 275 | BIO_printf(bio_err, "-rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR); |
276 | BIO_printf(bio_err, " load the file (or the files in the directory) into\n"); | 276 | BIO_printf(bio_err, " load the file (or the files in the directory) into\n"); |
277 | BIO_printf(bio_err, " the random number generator\n"); | 277 | BIO_printf(bio_err, " the random number generator\n"); |
278 | BIO_printf (bio_err, "cert.pem recipient certificate(s) for encryption\n"); | 278 | BIO_printf (bio_err, "cert.pem recipient certificate(s) for encryption\n"); |
@@ -309,9 +309,6 @@ int MAIN(int argc, char **argv) | |||
309 | goto end; | 309 | goto end; |
310 | #endif | 310 | #endif |
311 | } | 311 | } |
312 | #ifdef CRYPTO_MDEBUG | ||
313 | CRYPTO_push_info("load encryption certificates"); | ||
314 | #endif | ||
315 | encerts = sk_X509_new_null(); | 312 | encerts = sk_X509_new_null(); |
316 | while (*args) { | 313 | while (*args) { |
317 | if(!(cert = load_cert(*args))) { | 314 | if(!(cert = load_cert(*args))) { |
@@ -322,50 +319,29 @@ int MAIN(int argc, char **argv) | |||
322 | cert = NULL; | 319 | cert = NULL; |
323 | args++; | 320 | args++; |
324 | } | 321 | } |
325 | #ifdef CRYPTO_MDEBUG | ||
326 | CRYPTO_pop_info(); | ||
327 | #endif | ||
328 | } | 322 | } |
329 | 323 | ||
330 | if(signerfile && (operation == SMIME_SIGN)) { | 324 | if(signerfile && (operation == SMIME_SIGN)) { |
331 | #ifdef CRYPTO_MDEBUG | ||
332 | CRYPTO_push_info("load signer certificate"); | ||
333 | #endif | ||
334 | if(!(signer = load_cert(signerfile))) { | 325 | if(!(signer = load_cert(signerfile))) { |
335 | BIO_printf(bio_err, "Can't read signer certificate file %s\n", signerfile); | 326 | BIO_printf(bio_err, "Can't read signer certificate file %s\n", signerfile); |
336 | goto end; | 327 | goto end; |
337 | } | 328 | } |
338 | #ifdef CRYPTO_MDEBUG | ||
339 | CRYPTO_pop_info(); | ||
340 | #endif | ||
341 | } | 329 | } |
342 | 330 | ||
343 | if(certfile) { | 331 | if(certfile) { |
344 | #ifdef CRYPTO_MDEBUG | ||
345 | CRYPTO_push_info("load other certfiles"); | ||
346 | #endif | ||
347 | if(!(other = load_certs(certfile))) { | 332 | if(!(other = load_certs(certfile))) { |
348 | BIO_printf(bio_err, "Can't read certificate file %s\n", certfile); | 333 | BIO_printf(bio_err, "Can't read certificate file %s\n", certfile); |
349 | ERR_print_errors(bio_err); | 334 | ERR_print_errors(bio_err); |
350 | goto end; | 335 | goto end; |
351 | } | 336 | } |
352 | #ifdef CRYPTO_MDEBUG | ||
353 | CRYPTO_pop_info(); | ||
354 | #endif | ||
355 | } | 337 | } |
356 | 338 | ||
357 | if(recipfile && (operation == SMIME_DECRYPT)) { | 339 | if(recipfile && (operation == SMIME_DECRYPT)) { |
358 | #ifdef CRYPTO_MDEBUG | ||
359 | CRYPTO_push_info("load recipient certificate"); | ||
360 | #endif | ||
361 | if(!(recip = load_cert(recipfile))) { | 340 | if(!(recip = load_cert(recipfile))) { |
362 | BIO_printf(bio_err, "Can't read recipient certificate file %s\n", recipfile); | 341 | BIO_printf(bio_err, "Can't read recipient certificate file %s\n", recipfile); |
363 | ERR_print_errors(bio_err); | 342 | ERR_print_errors(bio_err); |
364 | goto end; | 343 | goto end; |
365 | } | 344 | } |
366 | #ifdef CRYPTO_MDEBUG | ||
367 | CRYPTO_pop_info(); | ||
368 | #endif | ||
369 | } | 345 | } |
370 | 346 | ||
371 | if(operation == SMIME_DECRYPT) { | 347 | if(operation == SMIME_DECRYPT) { |
@@ -375,22 +351,13 @@ int MAIN(int argc, char **argv) | |||
375 | } else keyfile = NULL; | 351 | } else keyfile = NULL; |
376 | 352 | ||
377 | if(keyfile) { | 353 | if(keyfile) { |
378 | #ifdef CRYPTO_MDEBUG | ||
379 | CRYPTO_push_info("load keyfile"); | ||
380 | #endif | ||
381 | if(!(key = load_key(keyfile, passin))) { | 354 | if(!(key = load_key(keyfile, passin))) { |
382 | BIO_printf(bio_err, "Can't read recipient certificate file %s\n", keyfile); | 355 | BIO_printf(bio_err, "Can't read recipient certificate file %s\n", keyfile); |
383 | ERR_print_errors(bio_err); | 356 | ERR_print_errors(bio_err); |
384 | goto end; | 357 | goto end; |
385 | } | 358 | } |
386 | #ifdef CRYPTO_MDEBUG | ||
387 | CRYPTO_pop_info(); | ||
388 | #endif | ||
389 | } | 359 | } |
390 | 360 | ||
391 | #ifdef CRYPTO_MDEBUG | ||
392 | CRYPTO_push_info("open input files"); | ||
393 | #endif | ||
394 | if (infile) { | 361 | if (infile) { |
395 | if (!(in = BIO_new_file(infile, inmode))) { | 362 | if (!(in = BIO_new_file(infile, inmode))) { |
396 | BIO_printf (bio_err, | 363 | BIO_printf (bio_err, |
@@ -398,13 +365,7 @@ int MAIN(int argc, char **argv) | |||
398 | goto end; | 365 | goto end; |
399 | } | 366 | } |
400 | } else in = BIO_new_fp(stdin, BIO_NOCLOSE); | 367 | } else in = BIO_new_fp(stdin, BIO_NOCLOSE); |
401 | #ifdef CRYPTO_MDEBUG | ||
402 | CRYPTO_pop_info(); | ||
403 | #endif | ||
404 | 368 | ||
405 | #ifdef CRYPTO_MDEBUG | ||
406 | CRYPTO_push_info("open output files"); | ||
407 | #endif | ||
408 | if (outfile) { | 369 | if (outfile) { |
409 | if (!(out = BIO_new_file(outfile, outmode))) { | 370 | if (!(out = BIO_new_file(outfile, outmode))) { |
410 | BIO_printf (bio_err, | 371 | BIO_printf (bio_err, |
@@ -412,50 +373,23 @@ int MAIN(int argc, char **argv) | |||
412 | goto end; | 373 | goto end; |
413 | } | 374 | } |
414 | } else out = BIO_new_fp(stdout, BIO_NOCLOSE); | 375 | } else out = BIO_new_fp(stdout, BIO_NOCLOSE); |
415 | #ifdef CRYPTO_MDEBUG | ||
416 | CRYPTO_pop_info(); | ||
417 | #endif | ||
418 | 376 | ||
419 | if(operation == SMIME_VERIFY) { | 377 | if(operation == SMIME_VERIFY) { |
420 | #ifdef CRYPTO_MDEBUG | ||
421 | CRYPTO_push_info("setup_verify"); | ||
422 | #endif | ||
423 | if(!(store = setup_verify(CAfile, CApath))) goto end; | 378 | if(!(store = setup_verify(CAfile, CApath))) goto end; |
424 | #ifdef CRYPTO_MDEBUG | ||
425 | CRYPTO_pop_info(); | ||
426 | #endif | ||
427 | } | 379 | } |
428 | 380 | ||
429 | ret = 3; | 381 | ret = 3; |
430 | 382 | ||
431 | if(operation == SMIME_ENCRYPT) { | 383 | if(operation == SMIME_ENCRYPT) { |
432 | #ifdef CRYPTO_MDEBUG | ||
433 | CRYPTO_push_info("PKCS7_encrypt"); | ||
434 | #endif | ||
435 | p7 = PKCS7_encrypt(encerts, in, cipher, flags); | 384 | p7 = PKCS7_encrypt(encerts, in, cipher, flags); |
436 | #ifdef CRYPTO_MDEBUG | ||
437 | CRYPTO_pop_info(); | ||
438 | #endif | ||
439 | } else if(operation == SMIME_SIGN) { | 385 | } else if(operation == SMIME_SIGN) { |
440 | #ifdef CRYPTO_MDEBUG | ||
441 | CRYPTO_push_info("PKCS7_sign"); | ||
442 | #endif | ||
443 | p7 = PKCS7_sign(signer, key, other, in, flags); | 386 | p7 = PKCS7_sign(signer, key, other, in, flags); |
444 | BIO_reset(in); | 387 | BIO_reset(in); |
445 | #ifdef CRYPTO_MDEBUG | ||
446 | CRYPTO_pop_info(); | ||
447 | #endif | ||
448 | } else { | 388 | } else { |
449 | #ifdef CRYPTO_MDEBUG | ||
450 | CRYPTO_push_info("SMIME_read_PKCS7"); | ||
451 | #endif | ||
452 | if(!(p7 = SMIME_read_PKCS7(in, &indata))) { | 389 | if(!(p7 = SMIME_read_PKCS7(in, &indata))) { |
453 | BIO_printf(bio_err, "Error reading S/MIME message\n"); | 390 | BIO_printf(bio_err, "Error reading S/MIME message\n"); |
454 | goto end; | 391 | goto end; |
455 | } | 392 | } |
456 | #ifdef CRYPTO_MDEBUG | ||
457 | CRYPTO_pop_info(); | ||
458 | #endif | ||
459 | } | 393 | } |
460 | 394 | ||
461 | if(!p7) { | 395 | if(!p7) { |
@@ -465,45 +399,25 @@ int MAIN(int argc, char **argv) | |||
465 | 399 | ||
466 | ret = 4; | 400 | ret = 4; |
467 | if(operation == SMIME_DECRYPT) { | 401 | if(operation == SMIME_DECRYPT) { |
468 | #ifdef CRYPTO_MDEBUG | ||
469 | CRYPTO_push_info("PKCS7_decrypt"); | ||
470 | #endif | ||
471 | if(!PKCS7_decrypt(p7, key, recip, out, flags)) { | 402 | if(!PKCS7_decrypt(p7, key, recip, out, flags)) { |
472 | BIO_printf(bio_err, "Error decrypting PKCS#7 structure\n"); | 403 | BIO_printf(bio_err, "Error decrypting PKCS#7 structure\n"); |
473 | goto end; | 404 | goto end; |
474 | } | 405 | } |
475 | #ifdef CRYPTO_MDEBUG | ||
476 | CRYPTO_pop_info(); | ||
477 | #endif | ||
478 | } else if(operation == SMIME_VERIFY) { | 406 | } else if(operation == SMIME_VERIFY) { |
479 | STACK_OF(X509) *signers; | 407 | STACK_OF(X509) *signers; |
480 | #ifdef CRYPTO_MDEBUG | ||
481 | CRYPTO_push_info("PKCS7_verify"); | ||
482 | #endif | ||
483 | if(PKCS7_verify(p7, other, store, indata, out, flags)) { | 408 | if(PKCS7_verify(p7, other, store, indata, out, flags)) { |
484 | BIO_printf(bio_err, "Verification Successful\n"); | 409 | BIO_printf(bio_err, "Verification Successful\n"); |
485 | } else { | 410 | } else { |
486 | BIO_printf(bio_err, "Verification Failure\n"); | 411 | BIO_printf(bio_err, "Verification Failure\n"); |
487 | goto end; | 412 | goto end; |
488 | } | 413 | } |
489 | #ifdef CRYPTO_MDEBUG | ||
490 | CRYPTO_pop_info(); | ||
491 | CRYPTO_push_info("PKCS7_get0_signers"); | ||
492 | #endif | ||
493 | signers = PKCS7_get0_signers(p7, other, flags); | 414 | signers = PKCS7_get0_signers(p7, other, flags); |
494 | #ifdef CRYPTO_MDEBUG | ||
495 | CRYPTO_pop_info(); | ||
496 | CRYPTO_push_info("save_certs"); | ||
497 | #endif | ||
498 | if(!save_certs(signerfile, signers)) { | 415 | if(!save_certs(signerfile, signers)) { |
499 | BIO_printf(bio_err, "Error writing signers to %s\n", | 416 | BIO_printf(bio_err, "Error writing signers to %s\n", |
500 | signerfile); | 417 | signerfile); |
501 | ret = 5; | 418 | ret = 5; |
502 | goto end; | 419 | goto end; |
503 | } | 420 | } |
504 | #ifdef CRYPTO_MDEBUG | ||
505 | CRYPTO_pop_info(); | ||
506 | #endif | ||
507 | sk_X509_free(signers); | 421 | sk_X509_free(signers); |
508 | } else if(operation == SMIME_PK7OUT) { | 422 | } else if(operation == SMIME_PK7OUT) { |
509 | PEM_write_bio_PKCS7(out, p7); | 423 | PEM_write_bio_PKCS7(out, p7); |
@@ -515,9 +429,6 @@ int MAIN(int argc, char **argv) | |||
515 | } | 429 | } |
516 | ret = 0; | 430 | ret = 0; |
517 | end: | 431 | end: |
518 | #ifdef CRYPTO_MDEBUG | ||
519 | CRYPTO_remove_all_info(); | ||
520 | #endif | ||
521 | if (need_rand) | 432 | if (need_rand) |
522 | app_RAND_write_file(NULL, bio_err); | 433 | app_RAND_write_file(NULL, bio_err); |
523 | if(ret) ERR_print_errors(bio_err); | 434 | if(ret) ERR_print_errors(bio_err); |
@@ -583,20 +494,9 @@ static X509_STORE *setup_verify(char *CAfile, char *CApath) | |||
583 | { | 494 | { |
584 | X509_STORE *store; | 495 | X509_STORE *store; |
585 | X509_LOOKUP *lookup; | 496 | X509_LOOKUP *lookup; |
586 | #ifdef CRYPTO_MDEBUG | ||
587 | CRYPTO_push_info("X509_STORE_new"); | ||
588 | #endif | ||
589 | if(!(store = X509_STORE_new())) goto end; | 497 | if(!(store = X509_STORE_new())) goto end; |
590 | #ifdef CRYPTO_MDEBUG | ||
591 | CRYPTO_pop_info(); | ||
592 | CRYPTO_push_info("X509_STORE_add_lookup(...file)"); | ||
593 | #endif | ||
594 | lookup=X509_STORE_add_lookup(store,X509_LOOKUP_file()); | 498 | lookup=X509_STORE_add_lookup(store,X509_LOOKUP_file()); |
595 | if (lookup == NULL) goto end; | 499 | if (lookup == NULL) goto end; |
596 | #ifdef CRYPTO_MDEBUG | ||
597 | CRYPTO_pop_info(); | ||
598 | CRYPTO_push_info("X509_LOOKUP_load_file"); | ||
599 | #endif | ||
600 | if (CAfile) { | 500 | if (CAfile) { |
601 | if(!X509_LOOKUP_load_file(lookup,CAfile,X509_FILETYPE_PEM)) { | 501 | if(!X509_LOOKUP_load_file(lookup,CAfile,X509_FILETYPE_PEM)) { |
602 | BIO_printf(bio_err, "Error loading file %s\n", CAfile); | 502 | BIO_printf(bio_err, "Error loading file %s\n", CAfile); |
@@ -604,25 +504,14 @@ static X509_STORE *setup_verify(char *CAfile, char *CApath) | |||
604 | } | 504 | } |
605 | } else X509_LOOKUP_load_file(lookup,NULL,X509_FILETYPE_DEFAULT); | 505 | } else X509_LOOKUP_load_file(lookup,NULL,X509_FILETYPE_DEFAULT); |
606 | 506 | ||
607 | #ifdef CRYPTO_MDEBUG | ||
608 | CRYPTO_pop_info(); | ||
609 | CRYPTO_push_info("X509_STORE_add_lookup(...hash_dir)"); | ||
610 | #endif | ||
611 | lookup=X509_STORE_add_lookup(store,X509_LOOKUP_hash_dir()); | 507 | lookup=X509_STORE_add_lookup(store,X509_LOOKUP_hash_dir()); |
612 | if (lookup == NULL) goto end; | 508 | if (lookup == NULL) goto end; |
613 | #ifdef CRYPTO_MDEBUG | ||
614 | CRYPTO_pop_info(); | ||
615 | CRYPTO_push_info("X509_LOOKUP_add_dir"); | ||
616 | #endif | ||
617 | if (CApath) { | 509 | if (CApath) { |
618 | if(!X509_LOOKUP_add_dir(lookup,CApath,X509_FILETYPE_PEM)) { | 510 | if(!X509_LOOKUP_add_dir(lookup,CApath,X509_FILETYPE_PEM)) { |
619 | BIO_printf(bio_err, "Error loading directory %s\n", CApath); | 511 | BIO_printf(bio_err, "Error loading directory %s\n", CApath); |
620 | goto end; | 512 | goto end; |
621 | } | 513 | } |
622 | } else X509_LOOKUP_add_dir(lookup,NULL,X509_FILETYPE_DEFAULT); | 514 | } else X509_LOOKUP_add_dir(lookup,NULL,X509_FILETYPE_DEFAULT); |
623 | #ifdef CRYPTO_MDEBUG | ||
624 | CRYPTO_pop_info(); | ||
625 | #endif | ||
626 | 515 | ||
627 | ERR_clear_error(); | 516 | ERR_clear_error(); |
628 | return store; | 517 | return store; |
diff --git a/src/lib/libssl/src/apps/speed.c b/src/lib/libssl/src/apps/speed.c index b3130def8b..f7a8e00a8b 100644 --- a/src/lib/libssl/src/apps/speed.c +++ b/src/lib/libssl/src/apps/speed.c | |||
@@ -1030,6 +1030,11 @@ int MAIN(int argc, char **argv) | |||
1030 | 1030 | ||
1031 | RAND_pseudo_bytes(buf,20); | 1031 | RAND_pseudo_bytes(buf,20); |
1032 | #ifndef NO_DSA | 1032 | #ifndef NO_DSA |
1033 | if (RAND_status() != 1) | ||
1034 | { | ||
1035 | RAND_seed(rnd_seed, sizeof rnd_seed); | ||
1036 | rnd_fake = 1; | ||
1037 | } | ||
1033 | for (j=0; j<DSA_NUM; j++) | 1038 | for (j=0; j<DSA_NUM; j++) |
1034 | { | 1039 | { |
1035 | unsigned int kk; | 1040 | unsigned int kk; |
@@ -1089,6 +1094,7 @@ int MAIN(int argc, char **argv) | |||
1089 | dsa_doit[j]=0; | 1094 | dsa_doit[j]=0; |
1090 | } | 1095 | } |
1091 | } | 1096 | } |
1097 | if (rnd_fake) RAND_cleanup(); | ||
1092 | #endif | 1098 | #endif |
1093 | 1099 | ||
1094 | fprintf(stdout,"%s\n",SSLeay_version(SSLEAY_VERSION)); | 1100 | fprintf(stdout,"%s\n",SSLeay_version(SSLEAY_VERSION)); |
diff --git a/src/lib/libssl/src/apps/spkac.c b/src/lib/libssl/src/apps/spkac.c index b35354a8d7..f3ee7e34e3 100644 --- a/src/lib/libssl/src/apps/spkac.c +++ b/src/lib/libssl/src/apps/spkac.c | |||
@@ -63,8 +63,10 @@ | |||
63 | #include <time.h> | 63 | #include <time.h> |
64 | #include "apps.h" | 64 | #include "apps.h" |
65 | #include <openssl/bio.h> | 65 | #include <openssl/bio.h> |
66 | #include <openssl/conf.h> | ||
66 | #include <openssl/err.h> | 67 | #include <openssl/err.h> |
67 | #include <openssl/evp.h> | 68 | #include <openssl/evp.h> |
69 | #include <openssl/lhash.h> | ||
68 | #include <openssl/x509.h> | 70 | #include <openssl/x509.h> |
69 | #include <openssl/pem.h> | 71 | #include <openssl/pem.h> |
70 | 72 | ||
diff --git a/src/lib/libssl/src/apps/testdsa.h b/src/lib/libssl/src/apps/testdsa.h index a322978f8c..f0bfbb1ffa 100644 --- a/src/lib/libssl/src/apps/testdsa.h +++ b/src/lib/libssl/src/apps/testdsa.h | |||
@@ -1,4 +1,5 @@ | |||
1 | /* NOCW */ | 1 | /* NOCW */ |
2 | /* used by apps/speed.c */ | ||
2 | DSA *get_dsa512(void ); | 3 | DSA *get_dsa512(void ); |
3 | DSA *get_dsa1024(void ); | 4 | DSA *get_dsa1024(void ); |
4 | DSA *get_dsa2048(void ); | 5 | DSA *get_dsa2048(void ); |
@@ -146,3 +147,5 @@ DSA *get_dsa2048() | |||
146 | return(dsa); | 147 | return(dsa); |
147 | } | 148 | } |
148 | 149 | ||
150 | static const char rnd_seed[] = "string to make the random number generator think it has entropy"; | ||
151 | static int rnd_fake = 0; | ||
diff --git a/src/lib/libssl/src/apps/testrsa.h b/src/lib/libssl/src/apps/testrsa.h index 9a0e811c73..3007d792b0 100644 --- a/src/lib/libssl/src/apps/testrsa.h +++ b/src/lib/libssl/src/apps/testrsa.h | |||
@@ -1,4 +1,5 @@ | |||
1 | /* apps/testrsa.h */ | 1 | /* apps/testrsa.h */ |
2 | /* used by apps/speed.c */ | ||
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 3 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 4 | * All rights reserved. |
4 | * | 5 | * |
diff --git a/src/lib/libssl/src/apps/tkca b/src/lib/libssl/src/apps/tkca index bdaf21606a..e69de29bb2 100644 --- a/src/lib/libssl/src/apps/tkca +++ b/src/lib/libssl/src/apps/tkca | |||
@@ -1,66 +0,0 @@ | |||
1 | #!/usr/local/bin/perl5 | ||
2 | # | ||
3 | # This is only something I'm playing with, it does not work :-) | ||
4 | # | ||
5 | |||
6 | use Tk; | ||
7 | |||
8 | my $main=MainWindow->new(); | ||
9 | my $f=$main->Frame(-relief => "ridge", -borderwidth => 2); | ||
10 | $f->pack(-fill => 'x'); | ||
11 | |||
12 | my $ff=$f->Frame; | ||
13 | $ff->pack(-fill => 'x'); | ||
14 | my $l=$ff->Label(-text => "TkCA - SSLeay", | ||
15 | -relief => "ridge", -borderwidth => 2); | ||
16 | $l->pack(-fill => 'x', -ipady => 5); | ||
17 | |||
18 | my $l=$ff->Button(-text => "Certify"); | ||
19 | $l->pack(-fill => 'x', -ipady => 5); | ||
20 | |||
21 | my $l=$ff->Button(-text => "Review"); | ||
22 | $l->pack(-fill => 'x', -ipady => 5); | ||
23 | |||
24 | my $l=$ff->Button(-text => "Revoke"); | ||
25 | $l->pack(-fill => 'x', -ipady => 5); | ||
26 | |||
27 | my $l=$ff->Button(-text => "Generate CRL"); | ||
28 | $l->pack(-fill => 'x', -ipady => 5); | ||
29 | |||
30 | my($db)=&load_db("demoCA/index.txt"); | ||
31 | |||
32 | MainLoop; | ||
33 | |||
34 | sub load_db | ||
35 | { | ||
36 | my(%ret); | ||
37 | my($file)=@_; | ||
38 | my(*IN); | ||
39 | my(%db_serial,%db_name,@f,@db_s); | ||
40 | |||
41 | $ret{'serial'}=\%db_serial; | ||
42 | $ret{'name'}=\%db_name; | ||
43 | |||
44 | open(IN,"<$file") || die "unable to open $file:$!\n"; | ||
45 | while (<IN>) | ||
46 | { | ||
47 | chop; | ||
48 | s/([^\\])\t/\1\t\t/g; | ||
49 | my(@f)=split(/\t\t/); | ||
50 | die "wrong number of fields in $file, line $.\n" | ||
51 | if ($#f != 5); | ||
52 | |||
53 | my(%f); | ||
54 | $f{'type'}=$f[0]; | ||
55 | $f{'exp'}=$f[1]; | ||
56 | $f{'rev'}=$f[2]; | ||
57 | $f{'serial'}=$f[3]; | ||
58 | $f{'file'}=$f[4]; | ||
59 | $f{'name'}=$f[5]; | ||
60 | die "serial number $f{'serial'} appears twice (line $.)\n" | ||
61 | if (defined($db{$f{'serial'}})) | ||
62 | $db_serial{$f{'serial'}}=\%f; | ||
63 | $db_name{$f{'name'}}.=$f{'serial'}." "; | ||
64 | } | ||
65 | return \%ret; | ||
66 | } | ||
diff --git a/src/lib/libssl/src/apps/winrand.c b/src/lib/libssl/src/apps/winrand.c new file mode 100644 index 0000000000..d042258b50 --- /dev/null +++ b/src/lib/libssl/src/apps/winrand.c | |||
@@ -0,0 +1,149 @@ | |||
1 | /* apps/winrand.c */ | ||
2 | /* ==================================================================== | ||
3 | * Copyright (c) 1998-2000 The OpenSSL Project. All rights reserved. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions | ||
7 | * are met: | ||
8 | * | ||
9 | * 1. Redistributions of source code must retain the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer. | ||
11 | * | ||
12 | * 2. Redistributions in binary form must reproduce the above copyright | ||
13 | * notice, this list of conditions and the following disclaimer in | ||
14 | * the documentation and/or other materials provided with the | ||
15 | * distribution. | ||
16 | * | ||
17 | * 3. All advertising materials mentioning features or use of this | ||
18 | * software must display the following acknowledgment: | ||
19 | * "This product includes software developed by the OpenSSL Project | ||
20 | * for use in the OpenSSL Toolkit. (http://www.openssl.org/)" | ||
21 | * | ||
22 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
23 | * endorse or promote products derived from this software without | ||
24 | * prior written permission. For written permission, please contact | ||
25 | * openssl-core@openssl.org. | ||
26 | * | ||
27 | * 5. Products derived from this software may not be called "OpenSSL" | ||
28 | * nor may "OpenSSL" appear in their names without prior written | ||
29 | * permission of the OpenSSL Project. | ||
30 | * | ||
31 | * 6. Redistributions of any form whatsoever must retain the following | ||
32 | * acknowledgment: | ||
33 | * "This product includes software developed by the OpenSSL Project | ||
34 | * for use in the OpenSSL Toolkit (http://www.openssl.org/)" | ||
35 | * | ||
36 | * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
37 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
38 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
39 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
40 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
41 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
42 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
43 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
44 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
45 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
46 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
47 | * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
48 | * ==================================================================== | ||
49 | * | ||
50 | * This product includes cryptographic software written by Eric Young | ||
51 | * (eay@cryptsoft.com). This product includes software written by Tim | ||
52 | * Hudson (tjh@cryptsoft.com). | ||
53 | * | ||
54 | */ | ||
55 | |||
56 | /* Usage: winrand [filename] | ||
57 | * | ||
58 | * Collects entropy from mouse movements and other events and writes | ||
59 | * random data to filename or .rnd | ||
60 | */ | ||
61 | |||
62 | #include <windows.h> | ||
63 | #include <openssl/opensslv.h> | ||
64 | #include <openssl/rand.h> | ||
65 | |||
66 | LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM); | ||
67 | const char *filename; | ||
68 | |||
69 | int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, | ||
70 | PSTR cmdline, int iCmdShow) | ||
71 | { | ||
72 | static char appname[] = "OpenSSL"; | ||
73 | HWND hwnd; | ||
74 | MSG msg; | ||
75 | WNDCLASSEX wndclass; | ||
76 | char buffer[200]; | ||
77 | |||
78 | if (cmdline[0] == '\0') | ||
79 | filename = RAND_file_name(buffer, sizeof buffer); | ||
80 | else | ||
81 | filename = cmdline; | ||
82 | |||
83 | RAND_load_file(filename, -1); | ||
84 | |||
85 | wndclass.cbSize = sizeof(wndclass); | ||
86 | wndclass.style = CS_HREDRAW | CS_VREDRAW; | ||
87 | wndclass.lpfnWndProc = WndProc; | ||
88 | wndclass.cbClsExtra = 0; | ||
89 | wndclass.cbWndExtra = 0; | ||
90 | wndclass.hInstance = hInstance; | ||
91 | wndclass.hIcon = LoadIcon(NULL, IDI_APPLICATION); | ||
92 | wndclass.hCursor = LoadCursor(NULL, IDC_ARROW); | ||
93 | wndclass.hbrBackground = (HBRUSH) GetStockObject(WHITE_BRUSH); | ||
94 | wndclass.lpszMenuName = NULL; | ||
95 | wndclass.lpszClassName = appname; | ||
96 | wndclass.hIconSm = LoadIcon(NULL, IDI_APPLICATION); | ||
97 | RegisterClassEx(&wndclass); | ||
98 | |||
99 | hwnd = CreateWindow(appname, OPENSSL_VERSION_TEXT, | ||
100 | WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, | ||
101 | CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, hInstance, NULL); | ||
102 | |||
103 | ShowWindow(hwnd, iCmdShow); | ||
104 | UpdateWindow(hwnd); | ||
105 | |||
106 | |||
107 | while (GetMessage(&msg, NULL, 0, 0)) | ||
108 | { | ||
109 | TranslateMessage(&msg); | ||
110 | DispatchMessage(&msg); | ||
111 | } | ||
112 | |||
113 | return msg.wParam; | ||
114 | } | ||
115 | |||
116 | LRESULT CALLBACK WndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam) | ||
117 | { | ||
118 | HDC hdc; | ||
119 | PAINTSTRUCT ps; | ||
120 | RECT rect; | ||
121 | char buffer[200]; | ||
122 | static int seeded = 0; | ||
123 | |||
124 | switch (iMsg) | ||
125 | { | ||
126 | case WM_PAINT: | ||
127 | hdc = BeginPaint(hwnd, &ps); | ||
128 | GetClientRect(hwnd, &rect); | ||
129 | DrawText(hdc, "Seeding the PRNG. Please move the mouse!", -1, | ||
130 | &rect, DT_SINGLELINE | DT_CENTER | DT_VCENTER); | ||
131 | EndPaint(hwnd, &ps); | ||
132 | return 0; | ||
133 | |||
134 | case WM_DESTROY: | ||
135 | PostQuitMessage(0); | ||
136 | return 0; | ||
137 | } | ||
138 | |||
139 | if (RAND_event(iMsg, wParam, lParam) == 1 && seeded == 0) | ||
140 | { | ||
141 | seeded = 1; | ||
142 | if (RAND_write_file(filename) <= 0) | ||
143 | MessageBox(hwnd, "Couldn't write random file!", | ||
144 | "OpenSSL", MB_OK | MB_ICONERROR); | ||
145 | PostQuitMessage(0); | ||
146 | } | ||
147 | |||
148 | return DefWindowProc(hwnd, iMsg, wParam, lParam); | ||
149 | } | ||
diff --git a/src/lib/libssl/src/apps/x509.c b/src/lib/libssl/src/apps/x509.c index d5c0d0404e..2d6384184c 100644 --- a/src/lib/libssl/src/apps/x509.c +++ b/src/lib/libssl/src/apps/x509.c | |||
@@ -126,7 +126,7 @@ static char *x509_usage[]={ | |||
126 | " -md2/-md5/-sha1/-mdc2 - digest to use\n", | 126 | " -md2/-md5/-sha1/-mdc2 - digest to use\n", |
127 | " -extfile - configuration file with X509V3 extensions to add\n", | 127 | " -extfile - configuration file with X509V3 extensions to add\n", |
128 | " -extensions - section from config file with X509V3 extensions to add\n", | 128 | " -extensions - section from config file with X509V3 extensions to add\n", |
129 | " -crlext - delete extensions before signing and input certificate\n", | 129 | " -clrext - delete extensions before signing and input certificate\n", |
130 | NULL | 130 | NULL |
131 | }; | 131 | }; |
132 | 132 | ||
@@ -365,8 +365,15 @@ int MAIN(int argc, char **argv) | |||
365 | aliasout= ++num; | 365 | aliasout= ++num; |
366 | else if (strcmp(*argv,"-CAcreateserial") == 0) | 366 | else if (strcmp(*argv,"-CAcreateserial") == 0) |
367 | CA_createserial= ++num; | 367 | CA_createserial= ++num; |
368 | else if (strcmp(*argv,"-clrext") == 0) | ||
369 | clrext = 1; | ||
370 | #if 1 /* stay backwards-compatible with 0.9.5; this should go away soon */ | ||
368 | else if (strcmp(*argv,"-crlext") == 0) | 371 | else if (strcmp(*argv,"-crlext") == 0) |
372 | { | ||
373 | BIO_printf(bio_err,"use -clrext instead of -crlext\n"); | ||
369 | clrext = 1; | 374 | clrext = 1; |
375 | } | ||
376 | #endif | ||
370 | else if ((md_alg=EVP_get_digestbyname(*argv + 1))) | 377 | else if ((md_alg=EVP_get_digestbyname(*argv + 1))) |
371 | { | 378 | { |
372 | /* ok */ | 379 | /* ok */ |
diff --git a/src/lib/libssl/src/crypto/Makefile b/src/lib/libssl/src/crypto/Makefile index 24b7f32fdd..b980f54dba 100644 --- a/src/lib/libssl/src/crypto/Makefile +++ b/src/lib/libssl/src/crypto/Makefile | |||
@@ -40,7 +40,7 @@ LIBOBJ= cryptlib.o mem.o mem_dbg.o cversion.o ex_data.o tmdiff.o cpt_err.o ebcdi | |||
40 | SRC= $(LIBSRC) | 40 | SRC= $(LIBSRC) |
41 | 41 | ||
42 | EXHEADER= crypto.h tmdiff.h opensslv.h opensslconf.h ebcdic.h | 42 | EXHEADER= crypto.h tmdiff.h opensslv.h opensslconf.h ebcdic.h |
43 | HEADER= cryptlib.h buildinf.h $(EXHEADER) | 43 | HEADER= cryptlib.h buildinf.h md32_common.h $(EXHEADER) |
44 | 44 | ||
45 | ALL= $(GENERAL) $(SRC) $(HEADER) | 45 | ALL= $(GENERAL) $(SRC) $(HEADER) |
46 | 46 | ||
diff --git a/src/lib/libssl/src/crypto/Makefile.ssl b/src/lib/libssl/src/crypto/Makefile.ssl index cab75d9f80..f9b33586be 100644 --- a/src/lib/libssl/src/crypto/Makefile.ssl +++ b/src/lib/libssl/src/crypto/Makefile.ssl | |||
@@ -40,7 +40,7 @@ LIBOBJ= cryptlib.o mem.o mem_dbg.o cversion.o ex_data.o tmdiff.o cpt_err.o ebcdi | |||
40 | SRC= $(LIBSRC) | 40 | SRC= $(LIBSRC) |
41 | 41 | ||
42 | EXHEADER= crypto.h tmdiff.h opensslv.h opensslconf.h ebcdic.h | 42 | EXHEADER= crypto.h tmdiff.h opensslv.h opensslconf.h ebcdic.h |
43 | HEADER= cryptlib.h buildinf.h $(EXHEADER) | 43 | HEADER= cryptlib.h buildinf.h md32_common.h $(EXHEADER) |
44 | 44 | ||
45 | ALL= $(GENERAL) $(SRC) $(HEADER) | 45 | ALL= $(GENERAL) $(SRC) $(HEADER) |
46 | 46 | ||
diff --git a/src/lib/libssl/src/crypto/asn1/asn1_err.c b/src/lib/libssl/src/crypto/asn1/asn1_err.c index b183814242..cecd555c88 100644 --- a/src/lib/libssl/src/crypto/asn1/asn1_err.c +++ b/src/lib/libssl/src/crypto/asn1/asn1_err.c | |||
@@ -54,7 +54,8 @@ | |||
54 | */ | 54 | */ |
55 | 55 | ||
56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes |
57 | * made to it will be overwritten when the script next updates this file. | 57 | * made to it will be overwritten when the script next updates this file, |
58 | * only reason strings will be preserved. | ||
58 | */ | 59 | */ |
59 | 60 | ||
60 | #include <stdio.h> | 61 | #include <stdio.h> |
diff --git a/src/lib/libssl/src/crypto/asn1/p5_pbe.c b/src/lib/libssl/src/crypto/asn1/p5_pbe.c index 64e90237cc..a147ac3295 100644 --- a/src/lib/libssl/src/crypto/asn1/p5_pbe.c +++ b/src/lib/libssl/src/crypto/asn1/p5_pbe.c | |||
@@ -129,7 +129,7 @@ X509_ALGOR *PKCS5_pbe_set(int alg, int iter, unsigned char *salt, | |||
129 | } | 129 | } |
130 | pbe->salt->length = saltlen; | 130 | pbe->salt->length = saltlen; |
131 | if (salt) memcpy (pbe->salt->data, salt, saltlen); | 131 | if (salt) memcpy (pbe->salt->data, salt, saltlen); |
132 | else if (RAND_bytes (pbe->salt->data, saltlen) <= 0) | 132 | else if (RAND_pseudo_bytes (pbe->salt->data, saltlen) < 0) |
133 | return NULL; | 133 | return NULL; |
134 | 134 | ||
135 | if (!(astype = ASN1_TYPE_new())) { | 135 | if (!(astype = ASN1_TYPE_new())) { |
diff --git a/src/lib/libssl/src/crypto/asn1/p5_pbev2.c b/src/lib/libssl/src/crypto/asn1/p5_pbev2.c index 4ce06a94ab..1bbdb10c71 100644 --- a/src/lib/libssl/src/crypto/asn1/p5_pbev2.c +++ b/src/lib/libssl/src/crypto/asn1/p5_pbev2.c | |||
@@ -194,7 +194,8 @@ X509_ALGOR *PKCS5_pbe2_set(const EVP_CIPHER *cipher, int iter, | |||
194 | if(!(scheme->parameter = ASN1_TYPE_new())) goto merr; | 194 | if(!(scheme->parameter = ASN1_TYPE_new())) goto merr; |
195 | 195 | ||
196 | /* Create random IV */ | 196 | /* Create random IV */ |
197 | RAND_pseudo_bytes(iv, EVP_CIPHER_iv_length(cipher)); | 197 | if (RAND_pseudo_bytes(iv, EVP_CIPHER_iv_length(cipher)) < 0) |
198 | goto err; | ||
198 | 199 | ||
199 | /* Dummy cipherinit to just setup the IV */ | 200 | /* Dummy cipherinit to just setup the IV */ |
200 | EVP_CipherInit(&ctx, cipher, NULL, iv, 0); | 201 | EVP_CipherInit(&ctx, cipher, NULL, iv, 0); |
@@ -212,7 +213,7 @@ X509_ALGOR *PKCS5_pbe2_set(const EVP_CIPHER *cipher, int iter, | |||
212 | if (!(osalt->data = Malloc (saltlen))) goto merr; | 213 | if (!(osalt->data = Malloc (saltlen))) goto merr; |
213 | osalt->length = saltlen; | 214 | osalt->length = saltlen; |
214 | if (salt) memcpy (osalt->data, salt, saltlen); | 215 | if (salt) memcpy (osalt->data, salt, saltlen); |
215 | else if (RAND_bytes (osalt->data, saltlen) <= 0) goto merr; | 216 | else if (RAND_pseudo_bytes (osalt->data, saltlen) < 0) goto merr; |
216 | 217 | ||
217 | if(iter <= 0) iter = PKCS5_DEFAULT_ITER; | 218 | if(iter <= 0) iter = PKCS5_DEFAULT_ITER; |
218 | if(!ASN1_INTEGER_set(kdf->iter, iter)) goto merr; | 219 | if(!ASN1_INTEGER_set(kdf->iter, iter)) goto merr; |
diff --git a/src/lib/libssl/src/crypto/asn1/t_req.c b/src/lib/libssl/src/crypto/asn1/t_req.c index 81dd6355a8..ea1af092db 100644 --- a/src/lib/libssl/src/crypto/asn1/t_req.c +++ b/src/lib/libssl/src/crypto/asn1/t_req.c | |||
@@ -119,7 +119,7 @@ int X509_REQ_print(BIO *bp, X509_REQ *x) | |||
119 | 119 | ||
120 | pkey=X509_REQ_get_pubkey(x); | 120 | pkey=X509_REQ_get_pubkey(x); |
121 | #ifndef NO_RSA | 121 | #ifndef NO_RSA |
122 | if (pkey->type == EVP_PKEY_RSA) | 122 | if (pkey != NULL && pkey->type == EVP_PKEY_RSA) |
123 | { | 123 | { |
124 | BIO_printf(bp,"%12sRSA Public Key: (%d bit)\n","", | 124 | BIO_printf(bp,"%12sRSA Public Key: (%d bit)\n","", |
125 | BN_num_bits(pkey->pkey.rsa->n)); | 125 | BN_num_bits(pkey->pkey.rsa->n)); |
@@ -128,7 +128,7 @@ int X509_REQ_print(BIO *bp, X509_REQ *x) | |||
128 | else | 128 | else |
129 | #endif | 129 | #endif |
130 | #ifndef NO_DSA | 130 | #ifndef NO_DSA |
131 | if (pkey->type == EVP_PKEY_DSA) | 131 | if (pkey != NULL && pkey->type == EVP_PKEY_DSA) |
132 | { | 132 | { |
133 | BIO_printf(bp,"%12sDSA Public Key:\n",""); | 133 | BIO_printf(bp,"%12sDSA Public Key:\n",""); |
134 | DSA_print(bp,pkey->pkey.dsa,16); | 134 | DSA_print(bp,pkey->pkey.dsa,16); |
@@ -137,7 +137,8 @@ int X509_REQ_print(BIO *bp, X509_REQ *x) | |||
137 | #endif | 137 | #endif |
138 | BIO_printf(bp,"%12sUnknown Public Key:\n",""); | 138 | BIO_printf(bp,"%12sUnknown Public Key:\n",""); |
139 | 139 | ||
140 | EVP_PKEY_free(pkey); | 140 | if (pkey != NULL) |
141 | EVP_PKEY_free(pkey); | ||
141 | 142 | ||
142 | /* may not be */ | 143 | /* may not be */ |
143 | sprintf(str,"%8sAttributes:\n",""); | 144 | sprintf(str,"%8sAttributes:\n",""); |
diff --git a/src/lib/libssl/src/crypto/asn1/x_pubkey.c b/src/lib/libssl/src/crypto/asn1/x_pubkey.c index 81e9815222..7a05d575c9 100644 --- a/src/lib/libssl/src/crypto/asn1/x_pubkey.c +++ b/src/lib/libssl/src/crypto/asn1/x_pubkey.c | |||
@@ -183,8 +183,10 @@ int X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey) | |||
183 | 183 | ||
184 | Free(s); | 184 | Free(s); |
185 | 185 | ||
186 | #if 0 | ||
186 | CRYPTO_add(&pkey->references,1,CRYPTO_LOCK_EVP_PKEY); | 187 | CRYPTO_add(&pkey->references,1,CRYPTO_LOCK_EVP_PKEY); |
187 | pk->pkey=pkey; | 188 | pk->pkey=pkey; |
189 | #endif | ||
188 | 190 | ||
189 | if (*x != NULL) | 191 | if (*x != NULL) |
190 | X509_PUBKEY_free(*x); | 192 | X509_PUBKEY_free(*x); |
diff --git a/src/lib/libssl/src/crypto/bf/Makefile.ssl b/src/lib/libssl/src/crypto/bf/Makefile.ssl index 15f6a63987..cf2f7dd48e 100644 --- a/src/lib/libssl/src/crypto/bf/Makefile.ssl +++ b/src/lib/libssl/src/crypto/bf/Makefile.ssl | |||
@@ -49,7 +49,7 @@ lib: $(LIBOBJ) | |||
49 | 49 | ||
50 | # elf | 50 | # elf |
51 | asm/bx86-elf.o: asm/bx86unix.cpp | 51 | asm/bx86-elf.o: asm/bx86unix.cpp |
52 | $(CPP) -DELF asm/bx86unix.cpp | as -o asm/bx86-elf.o | 52 | $(CPP) -DELF -x c asm/bx86unix.cpp | as -o asm/bx86-elf.o |
53 | 53 | ||
54 | # solaris | 54 | # solaris |
55 | asm/bx86-sol.o: asm/bx86unix.cpp | 55 | asm/bx86-sol.o: asm/bx86unix.cpp |
@@ -65,7 +65,7 @@ asm/bx86-out.o: asm/bx86unix.cpp | |||
65 | asm/bx86bsdi.o: asm/bx86unix.cpp | 65 | asm/bx86bsdi.o: asm/bx86unix.cpp |
66 | $(CPP) -DBSDI asm/bx86unix.cpp | sed 's/ :/:/' | as -o asm/bx86bsdi.o | 66 | $(CPP) -DBSDI asm/bx86unix.cpp | sed 's/ :/:/' | as -o asm/bx86bsdi.o |
67 | 67 | ||
68 | asm/bx86unix.cpp: | 68 | asm/bx86unix.cpp: asm/bf-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl |
69 | (cd asm; $(PERL) bf-586.pl cpp $(PROCESSOR) >bx86unix.cpp) | 69 | (cd asm; $(PERL) bf-586.pl cpp $(PROCESSOR) >bx86unix.cpp) |
70 | 70 | ||
71 | files: | 71 | files: |
diff --git a/src/lib/libssl/src/crypto/bf/Makefile.uni b/src/lib/libssl/src/crypto/bf/Makefile.uni index f67e5ca23b..e69de29bb2 100644 --- a/src/lib/libssl/src/crypto/bf/Makefile.uni +++ b/src/lib/libssl/src/crypto/bf/Makefile.uni | |||
@@ -1,157 +0,0 @@ | |||
1 | # Targets | ||
2 | # make - twidle the options yourself :-) | ||
3 | # make cc - standard cc options | ||
4 | # make gcc - standard gcc options | ||
5 | # make x86-elf - linux-elf etc | ||
6 | # make x86-out - linux-a.out, FreeBSD etc | ||
7 | # make x86-solaris | ||
8 | # make x86-bdsi | ||
9 | |||
10 | DIR= bf | ||
11 | TOP= . | ||
12 | # use BF_PTR2 for intel boxes, | ||
13 | # BF_PTR for sparc and MIPS/SGI | ||
14 | # use nothing for Alpha and HP. | ||
15 | |||
16 | # There are 3 possible performance options, experiment :-) | ||
17 | #OPTS= -DBF_PTR # usr for sparc and MIPS/SGI | ||
18 | #OPTS= -DBF_PTR2 # use for pentium | ||
19 | OPTS= # use for pentium pro, Alpha and HP | ||
20 | |||
21 | MAKE=make -f Makefile | ||
22 | #CC=cc | ||
23 | #CFLAG= -O | ||
24 | |||
25 | CC=gcc | ||
26 | #CFLAG= -O4 -funroll-loops -fomit-frame-pointer | ||
27 | CFLAG= -O3 -fomit-frame-pointer | ||
28 | |||
29 | CFLAGS=$(OPTS) $(CFLAG) | ||
30 | CPP=$(CC) -E | ||
31 | AS=as | ||
32 | RANLIB=ranlib | ||
33 | |||
34 | # Assember version of bf_encrypt(). | ||
35 | BF_ENC=bf_enc.o # normal C version | ||
36 | #BF_ENC=asm/bx86-elf.o # elf format x86 | ||
37 | #BF_ENC=asm/bx86-out.o # a.out format x86 | ||
38 | #BF_ENC=asm/bx86-sol.o # solaris format x86 | ||
39 | #BF_ENC=asm/bx86bsdi.o # bsdi format x86 | ||
40 | |||
41 | LIBDIR=/usr/local/lib | ||
42 | BINDIR=/usr/local/bin | ||
43 | INCDIR=/usr/local/include | ||
44 | MANDIR=/usr/local/man | ||
45 | MAN1=1 | ||
46 | MAN3=3 | ||
47 | SHELL=/bin/sh | ||
48 | LIBOBJ=bf_skey.o bf_ecb.o $(BF_ENC) bf_cfb64.o bf_ofb64.o | ||
49 | LIBSRC=bf_skey.c bf_ecb.c bf_enc.c bf_cfb64.c bf_ofb64.c | ||
50 | |||
51 | GENERAL=Makefile Makefile.ssl Makefile.uni asm bf_locl.org README \ | ||
52 | COPYRIGHT blowfish.doc INSTALL | ||
53 | |||
54 | TESTING= bftest bfspeed bf_opts | ||
55 | TESTING_SRC=bftest.c bfspeed.c bf_opts.c | ||
56 | HEADERS=bf_locl.h blowfish.h bf_pi.h | ||
57 | |||
58 | ALL= $(GENERAL) $(TESTING_SRC) $(LIBSRC) $(HEADERS) | ||
59 | |||
60 | BLIB= libblowfish.a | ||
61 | |||
62 | all: $(BLIB) $(TESTING) | ||
63 | |||
64 | cc: | ||
65 | $(MAKE) CC=cc CFLAGS="-O $(OPTS) $(CFLAG)" all | ||
66 | |||
67 | gcc: | ||
68 | $(MAKE) CC=gcc CFLAGS="-O3 -fomit-frame-pointer $(OPTS) $(CFLAG)" all | ||
69 | |||
70 | x86-elf: | ||
71 | $(MAKE) BF_ENC='asm/bx86-elf.o' CC=$(CC) CFLAGS="-DELF $(OPTS) $(CFLAG)" all | ||
72 | |||
73 | x86-out: | ||
74 | $(MAKE) BF_ENC='asm/bx86-out.o' CC=$(CC) CFLAGS="-DOUT $(OPTS) $(CFLAG)" all | ||
75 | |||
76 | x86-solaris: | ||
77 | $(MAKE) BF_ENC='asm/bx86-sol.o' CC=$(CC) CFLAGS="-DSOL $(OPTS) $(CFLAG)" all | ||
78 | |||
79 | x86-bsdi: | ||
80 | $(MAKE) BF_ENC='asm/bx86bsdi.o' CC=$(CC) CFLAGS="-DBSDI $(OPTS) $(CFLAG)" all | ||
81 | |||
82 | # elf | ||
83 | asm/bx86-elf.o: asm/bx86unix.cpp | ||
84 | $(CPP) -DELF asm/bx86unix.cpp | $(AS) -o asm/bx86-elf.o | ||
85 | |||
86 | # solaris | ||
87 | asm/bx86-sol.o: asm/bx86unix.cpp | ||
88 | $(CC) -E -DSOL asm/bx86unix.cpp | sed 's/^#.*//' > asm/bx86-sol.s | ||
89 | as -o asm/bx86-sol.o asm/bx86-sol.s | ||
90 | rm -f asm/bx86-sol.s | ||
91 | |||
92 | # a.out | ||
93 | asm/bx86-out.o: asm/bx86unix.cpp | ||
94 | $(CPP) -DOUT asm/bx86unix.cpp | $(AS) -o asm/bx86-out.o | ||
95 | |||
96 | # bsdi | ||
97 | asm/bx86bsdi.o: asm/bx86unix.cpp | ||
98 | $(CPP) -DBSDI asm/bx86unix.cpp | $(AS) -o asm/bx86bsdi.o | ||
99 | |||
100 | asm/bx86unix.cpp: | ||
101 | (cd asm; perl bf-586.pl cpp >bx86unix.cpp) | ||
102 | |||
103 | test: all | ||
104 | ./bftest | ||
105 | |||
106 | $(BLIB): $(LIBOBJ) | ||
107 | /bin/rm -f $(BLIB) | ||
108 | ar cr $(BLIB) $(LIBOBJ) | ||
109 | $(RANLIB) $(BLIB) | ||
110 | |||
111 | bftest: bftest.o $(BLIB) | ||
112 | $(CC) $(CFLAGS) -o bftest bftest.o $(BLIB) | ||
113 | |||
114 | bfspeed: bfspeed.o $(BLIB) | ||
115 | $(CC) $(CFLAGS) -o bfspeed bfspeed.o $(BLIB) | ||
116 | |||
117 | bf_opts: bf_opts.o $(BLIB) | ||
118 | $(CC) $(CFLAGS) -o bf_opts bf_opts.o $(BLIB) | ||
119 | |||
120 | tags: | ||
121 | ctags $(TESTING_SRC) $(LIBBF) | ||
122 | |||
123 | tar: | ||
124 | tar chf libbf.tar $(ALL) | ||
125 | |||
126 | shar: | ||
127 | shar $(ALL) >libbf.shar | ||
128 | |||
129 | depend: | ||
130 | makedepend $(LIBBF) $(TESTING_SRC) | ||
131 | |||
132 | clean: | ||
133 | /bin/rm -f *.o tags core $(TESTING) $(BLIB) .nfs* *.old *.bak asm/*.o | ||
134 | |||
135 | dclean: | ||
136 | sed -e '/^# DO NOT DELETE THIS LINE/ q' Makefile >Makefile.new | ||
137 | mv -f Makefile.new Makefile | ||
138 | |||
139 | # Eric is probably going to choke when he next looks at this --tjh | ||
140 | install: $(BLIB) | ||
141 | if test $(INSTALLTOP); then \ | ||
142 | echo SSL style install; \ | ||
143 | cp $(BLIB) $(INSTALLTOP)/lib; \ | ||
144 | $(RANLIB) $(BLIB); \ | ||
145 | chmod 644 $(INSTALLTOP)/lib/$(BLIB); \ | ||
146 | cp blowfish.h $(INSTALLTOP)/include; \ | ||
147 | chmod 644 $(INSTALLTOP)/include/blowfish.h; \ | ||
148 | else \ | ||
149 | echo Standalone install; \ | ||
150 | cp $(BLIB) $(LIBDIR)/$(BLIB); \ | ||
151 | $(RANLIB) $(BLIB); \ | ||
152 | chmod 644 $(LIBDIR)/$(BLIB); \ | ||
153 | cp blowfish.h $(INCDIR)/blowfish.h; \ | ||
154 | chmod 644 $(INCDIR)/blowfish.h; \ | ||
155 | fi | ||
156 | |||
157 | # DO NOT DELETE THIS LINE -- make depend depends on it. | ||
diff --git a/src/lib/libssl/src/crypto/bf/asm/b-win32.asm b/src/lib/libssl/src/crypto/bf/asm/b-win32.asm index 138c99d0aa..e69de29bb2 100644 --- a/src/lib/libssl/src/crypto/bf/asm/b-win32.asm +++ b/src/lib/libssl/src/crypto/bf/asm/b-win32.asm | |||
@@ -1,906 +0,0 @@ | |||
1 | ; Don't even think of reading this code | ||
2 | ; It was automatically generated by bf-586.pl | ||
3 | ; Which is a perl program used to generate the x86 assember for | ||
4 | ; any of elf, a.out, BSDI,Win32, or Solaris | ||
5 | ; eric <eay@cryptsoft.com> | ||
6 | ; | ||
7 | TITLE bf-586.asm | ||
8 | .486 | ||
9 | .model FLAT | ||
10 | _TEXT SEGMENT | ||
11 | PUBLIC _BF_encrypt | ||
12 | |||
13 | _BF_encrypt PROC NEAR | ||
14 | ; | ||
15 | push ebp | ||
16 | push ebx | ||
17 | mov ebx, DWORD PTR 12[esp] | ||
18 | mov ebp, DWORD PTR 16[esp] | ||
19 | push esi | ||
20 | push edi | ||
21 | ; Load the 2 words | ||
22 | mov edi, DWORD PTR [ebx] | ||
23 | mov esi, DWORD PTR 4[ebx] | ||
24 | xor eax, eax | ||
25 | mov ebx, DWORD PTR [ebp] | ||
26 | xor ecx, ecx | ||
27 | xor edi, ebx | ||
28 | ; | ||
29 | ; Round 0 | ||
30 | mov edx, DWORD PTR 4[ebp] | ||
31 | mov ebx, edi | ||
32 | xor esi, edx | ||
33 | shr ebx, 16 | ||
34 | mov edx, edi | ||
35 | mov al, bh | ||
36 | and ebx, 255 | ||
37 | mov cl, dh | ||
38 | and edx, 255 | ||
39 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
40 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
41 | add ebx, eax | ||
42 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
43 | xor ebx, eax | ||
44 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
45 | add ebx, edx | ||
46 | xor eax, eax | ||
47 | xor esi, ebx | ||
48 | ; | ||
49 | ; Round 1 | ||
50 | mov edx, DWORD PTR 8[ebp] | ||
51 | mov ebx, esi | ||
52 | xor edi, edx | ||
53 | shr ebx, 16 | ||
54 | mov edx, esi | ||
55 | mov al, bh | ||
56 | and ebx, 255 | ||
57 | mov cl, dh | ||
58 | and edx, 255 | ||
59 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
60 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
61 | add ebx, eax | ||
62 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
63 | xor ebx, eax | ||
64 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
65 | add ebx, edx | ||
66 | xor eax, eax | ||
67 | xor edi, ebx | ||
68 | ; | ||
69 | ; Round 2 | ||
70 | mov edx, DWORD PTR 12[ebp] | ||
71 | mov ebx, edi | ||
72 | xor esi, edx | ||
73 | shr ebx, 16 | ||
74 | mov edx, edi | ||
75 | mov al, bh | ||
76 | and ebx, 255 | ||
77 | mov cl, dh | ||
78 | and edx, 255 | ||
79 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
80 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
81 | add ebx, eax | ||
82 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
83 | xor ebx, eax | ||
84 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
85 | add ebx, edx | ||
86 | xor eax, eax | ||
87 | xor esi, ebx | ||
88 | ; | ||
89 | ; Round 3 | ||
90 | mov edx, DWORD PTR 16[ebp] | ||
91 | mov ebx, esi | ||
92 | xor edi, edx | ||
93 | shr ebx, 16 | ||
94 | mov edx, esi | ||
95 | mov al, bh | ||
96 | and ebx, 255 | ||
97 | mov cl, dh | ||
98 | and edx, 255 | ||
99 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
100 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
101 | add ebx, eax | ||
102 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
103 | xor ebx, eax | ||
104 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
105 | add ebx, edx | ||
106 | xor eax, eax | ||
107 | xor edi, ebx | ||
108 | ; | ||
109 | ; Round 4 | ||
110 | mov edx, DWORD PTR 20[ebp] | ||
111 | mov ebx, edi | ||
112 | xor esi, edx | ||
113 | shr ebx, 16 | ||
114 | mov edx, edi | ||
115 | mov al, bh | ||
116 | and ebx, 255 | ||
117 | mov cl, dh | ||
118 | and edx, 255 | ||
119 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
120 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
121 | add ebx, eax | ||
122 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
123 | xor ebx, eax | ||
124 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
125 | add ebx, edx | ||
126 | xor eax, eax | ||
127 | xor esi, ebx | ||
128 | ; | ||
129 | ; Round 5 | ||
130 | mov edx, DWORD PTR 24[ebp] | ||
131 | mov ebx, esi | ||
132 | xor edi, edx | ||
133 | shr ebx, 16 | ||
134 | mov edx, esi | ||
135 | mov al, bh | ||
136 | and ebx, 255 | ||
137 | mov cl, dh | ||
138 | and edx, 255 | ||
139 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
140 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
141 | add ebx, eax | ||
142 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
143 | xor ebx, eax | ||
144 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
145 | add ebx, edx | ||
146 | xor eax, eax | ||
147 | xor edi, ebx | ||
148 | ; | ||
149 | ; Round 6 | ||
150 | mov edx, DWORD PTR 28[ebp] | ||
151 | mov ebx, edi | ||
152 | xor esi, edx | ||
153 | shr ebx, 16 | ||
154 | mov edx, edi | ||
155 | mov al, bh | ||
156 | and ebx, 255 | ||
157 | mov cl, dh | ||
158 | and edx, 255 | ||
159 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
160 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
161 | add ebx, eax | ||
162 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
163 | xor ebx, eax | ||
164 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
165 | add ebx, edx | ||
166 | xor eax, eax | ||
167 | xor esi, ebx | ||
168 | ; | ||
169 | ; Round 7 | ||
170 | mov edx, DWORD PTR 32[ebp] | ||
171 | mov ebx, esi | ||
172 | xor edi, edx | ||
173 | shr ebx, 16 | ||
174 | mov edx, esi | ||
175 | mov al, bh | ||
176 | and ebx, 255 | ||
177 | mov cl, dh | ||
178 | and edx, 255 | ||
179 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
180 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
181 | add ebx, eax | ||
182 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
183 | xor ebx, eax | ||
184 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
185 | add ebx, edx | ||
186 | xor eax, eax | ||
187 | xor edi, ebx | ||
188 | ; | ||
189 | ; Round 8 | ||
190 | mov edx, DWORD PTR 36[ebp] | ||
191 | mov ebx, edi | ||
192 | xor esi, edx | ||
193 | shr ebx, 16 | ||
194 | mov edx, edi | ||
195 | mov al, bh | ||
196 | and ebx, 255 | ||
197 | mov cl, dh | ||
198 | and edx, 255 | ||
199 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
200 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
201 | add ebx, eax | ||
202 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
203 | xor ebx, eax | ||
204 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
205 | add ebx, edx | ||
206 | xor eax, eax | ||
207 | xor esi, ebx | ||
208 | ; | ||
209 | ; Round 9 | ||
210 | mov edx, DWORD PTR 40[ebp] | ||
211 | mov ebx, esi | ||
212 | xor edi, edx | ||
213 | shr ebx, 16 | ||
214 | mov edx, esi | ||
215 | mov al, bh | ||
216 | and ebx, 255 | ||
217 | mov cl, dh | ||
218 | and edx, 255 | ||
219 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
220 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
221 | add ebx, eax | ||
222 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
223 | xor ebx, eax | ||
224 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
225 | add ebx, edx | ||
226 | xor eax, eax | ||
227 | xor edi, ebx | ||
228 | ; | ||
229 | ; Round 10 | ||
230 | mov edx, DWORD PTR 44[ebp] | ||
231 | mov ebx, edi | ||
232 | xor esi, edx | ||
233 | shr ebx, 16 | ||
234 | mov edx, edi | ||
235 | mov al, bh | ||
236 | and ebx, 255 | ||
237 | mov cl, dh | ||
238 | and edx, 255 | ||
239 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
240 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
241 | add ebx, eax | ||
242 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
243 | xor ebx, eax | ||
244 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
245 | add ebx, edx | ||
246 | xor eax, eax | ||
247 | xor esi, ebx | ||
248 | ; | ||
249 | ; Round 11 | ||
250 | mov edx, DWORD PTR 48[ebp] | ||
251 | mov ebx, esi | ||
252 | xor edi, edx | ||
253 | shr ebx, 16 | ||
254 | mov edx, esi | ||
255 | mov al, bh | ||
256 | and ebx, 255 | ||
257 | mov cl, dh | ||
258 | and edx, 255 | ||
259 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
260 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
261 | add ebx, eax | ||
262 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
263 | xor ebx, eax | ||
264 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
265 | add ebx, edx | ||
266 | xor eax, eax | ||
267 | xor edi, ebx | ||
268 | ; | ||
269 | ; Round 12 | ||
270 | mov edx, DWORD PTR 52[ebp] | ||
271 | mov ebx, edi | ||
272 | xor esi, edx | ||
273 | shr ebx, 16 | ||
274 | mov edx, edi | ||
275 | mov al, bh | ||
276 | and ebx, 255 | ||
277 | mov cl, dh | ||
278 | and edx, 255 | ||
279 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
280 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
281 | add ebx, eax | ||
282 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
283 | xor ebx, eax | ||
284 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
285 | add ebx, edx | ||
286 | xor eax, eax | ||
287 | xor esi, ebx | ||
288 | ; | ||
289 | ; Round 13 | ||
290 | mov edx, DWORD PTR 56[ebp] | ||
291 | mov ebx, esi | ||
292 | xor edi, edx | ||
293 | shr ebx, 16 | ||
294 | mov edx, esi | ||
295 | mov al, bh | ||
296 | and ebx, 255 | ||
297 | mov cl, dh | ||
298 | and edx, 255 | ||
299 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
300 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
301 | add ebx, eax | ||
302 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
303 | xor ebx, eax | ||
304 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
305 | add ebx, edx | ||
306 | xor eax, eax | ||
307 | xor edi, ebx | ||
308 | ; | ||
309 | ; Round 14 | ||
310 | mov edx, DWORD PTR 60[ebp] | ||
311 | mov ebx, edi | ||
312 | xor esi, edx | ||
313 | shr ebx, 16 | ||
314 | mov edx, edi | ||
315 | mov al, bh | ||
316 | and ebx, 255 | ||
317 | mov cl, dh | ||
318 | and edx, 255 | ||
319 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
320 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
321 | add ebx, eax | ||
322 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
323 | xor ebx, eax | ||
324 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
325 | add ebx, edx | ||
326 | xor eax, eax | ||
327 | xor esi, ebx | ||
328 | ; | ||
329 | ; Round 15 | ||
330 | mov edx, DWORD PTR 64[ebp] | ||
331 | mov ebx, esi | ||
332 | xor edi, edx | ||
333 | shr ebx, 16 | ||
334 | mov edx, esi | ||
335 | mov al, bh | ||
336 | and ebx, 255 | ||
337 | mov cl, dh | ||
338 | and edx, 255 | ||
339 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
340 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
341 | add ebx, eax | ||
342 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
343 | xor ebx, eax | ||
344 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
345 | add ebx, edx | ||
346 | ; Load parameter 0 (16) enc=1 | ||
347 | mov eax, DWORD PTR 20[esp] | ||
348 | xor edi, ebx | ||
349 | mov edx, DWORD PTR 68[ebp] | ||
350 | xor esi, edx | ||
351 | mov DWORD PTR 4[eax],edi | ||
352 | mov DWORD PTR [eax],esi | ||
353 | pop edi | ||
354 | pop esi | ||
355 | pop ebx | ||
356 | pop ebp | ||
357 | ret | ||
358 | _BF_encrypt ENDP | ||
359 | _TEXT ENDS | ||
360 | _TEXT SEGMENT | ||
361 | PUBLIC _BF_decrypt | ||
362 | |||
363 | _BF_decrypt PROC NEAR | ||
364 | ; | ||
365 | push ebp | ||
366 | push ebx | ||
367 | mov ebx, DWORD PTR 12[esp] | ||
368 | mov ebp, DWORD PTR 16[esp] | ||
369 | push esi | ||
370 | push edi | ||
371 | ; Load the 2 words | ||
372 | mov edi, DWORD PTR [ebx] | ||
373 | mov esi, DWORD PTR 4[ebx] | ||
374 | xor eax, eax | ||
375 | mov ebx, DWORD PTR 68[ebp] | ||
376 | xor ecx, ecx | ||
377 | xor edi, ebx | ||
378 | ; | ||
379 | ; Round 16 | ||
380 | mov edx, DWORD PTR 64[ebp] | ||
381 | mov ebx, edi | ||
382 | xor esi, edx | ||
383 | shr ebx, 16 | ||
384 | mov edx, edi | ||
385 | mov al, bh | ||
386 | and ebx, 255 | ||
387 | mov cl, dh | ||
388 | and edx, 255 | ||
389 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
390 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
391 | add ebx, eax | ||
392 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
393 | xor ebx, eax | ||
394 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
395 | add ebx, edx | ||
396 | xor eax, eax | ||
397 | xor esi, ebx | ||
398 | ; | ||
399 | ; Round 15 | ||
400 | mov edx, DWORD PTR 60[ebp] | ||
401 | mov ebx, esi | ||
402 | xor edi, edx | ||
403 | shr ebx, 16 | ||
404 | mov edx, esi | ||
405 | mov al, bh | ||
406 | and ebx, 255 | ||
407 | mov cl, dh | ||
408 | and edx, 255 | ||
409 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
410 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
411 | add ebx, eax | ||
412 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
413 | xor ebx, eax | ||
414 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
415 | add ebx, edx | ||
416 | xor eax, eax | ||
417 | xor edi, ebx | ||
418 | ; | ||
419 | ; Round 14 | ||
420 | mov edx, DWORD PTR 56[ebp] | ||
421 | mov ebx, edi | ||
422 | xor esi, edx | ||
423 | shr ebx, 16 | ||
424 | mov edx, edi | ||
425 | mov al, bh | ||
426 | and ebx, 255 | ||
427 | mov cl, dh | ||
428 | and edx, 255 | ||
429 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
430 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
431 | add ebx, eax | ||
432 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
433 | xor ebx, eax | ||
434 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
435 | add ebx, edx | ||
436 | xor eax, eax | ||
437 | xor esi, ebx | ||
438 | ; | ||
439 | ; Round 13 | ||
440 | mov edx, DWORD PTR 52[ebp] | ||
441 | mov ebx, esi | ||
442 | xor edi, edx | ||
443 | shr ebx, 16 | ||
444 | mov edx, esi | ||
445 | mov al, bh | ||
446 | and ebx, 255 | ||
447 | mov cl, dh | ||
448 | and edx, 255 | ||
449 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
450 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
451 | add ebx, eax | ||
452 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
453 | xor ebx, eax | ||
454 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
455 | add ebx, edx | ||
456 | xor eax, eax | ||
457 | xor edi, ebx | ||
458 | ; | ||
459 | ; Round 12 | ||
460 | mov edx, DWORD PTR 48[ebp] | ||
461 | mov ebx, edi | ||
462 | xor esi, edx | ||
463 | shr ebx, 16 | ||
464 | mov edx, edi | ||
465 | mov al, bh | ||
466 | and ebx, 255 | ||
467 | mov cl, dh | ||
468 | and edx, 255 | ||
469 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
470 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
471 | add ebx, eax | ||
472 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
473 | xor ebx, eax | ||
474 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
475 | add ebx, edx | ||
476 | xor eax, eax | ||
477 | xor esi, ebx | ||
478 | ; | ||
479 | ; Round 11 | ||
480 | mov edx, DWORD PTR 44[ebp] | ||
481 | mov ebx, esi | ||
482 | xor edi, edx | ||
483 | shr ebx, 16 | ||
484 | mov edx, esi | ||
485 | mov al, bh | ||
486 | and ebx, 255 | ||
487 | mov cl, dh | ||
488 | and edx, 255 | ||
489 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
490 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
491 | add ebx, eax | ||
492 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
493 | xor ebx, eax | ||
494 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
495 | add ebx, edx | ||
496 | xor eax, eax | ||
497 | xor edi, ebx | ||
498 | ; | ||
499 | ; Round 10 | ||
500 | mov edx, DWORD PTR 40[ebp] | ||
501 | mov ebx, edi | ||
502 | xor esi, edx | ||
503 | shr ebx, 16 | ||
504 | mov edx, edi | ||
505 | mov al, bh | ||
506 | and ebx, 255 | ||
507 | mov cl, dh | ||
508 | and edx, 255 | ||
509 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
510 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
511 | add ebx, eax | ||
512 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
513 | xor ebx, eax | ||
514 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
515 | add ebx, edx | ||
516 | xor eax, eax | ||
517 | xor esi, ebx | ||
518 | ; | ||
519 | ; Round 9 | ||
520 | mov edx, DWORD PTR 36[ebp] | ||
521 | mov ebx, esi | ||
522 | xor edi, edx | ||
523 | shr ebx, 16 | ||
524 | mov edx, esi | ||
525 | mov al, bh | ||
526 | and ebx, 255 | ||
527 | mov cl, dh | ||
528 | and edx, 255 | ||
529 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
530 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
531 | add ebx, eax | ||
532 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
533 | xor ebx, eax | ||
534 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
535 | add ebx, edx | ||
536 | xor eax, eax | ||
537 | xor edi, ebx | ||
538 | ; | ||
539 | ; Round 8 | ||
540 | mov edx, DWORD PTR 32[ebp] | ||
541 | mov ebx, edi | ||
542 | xor esi, edx | ||
543 | shr ebx, 16 | ||
544 | mov edx, edi | ||
545 | mov al, bh | ||
546 | and ebx, 255 | ||
547 | mov cl, dh | ||
548 | and edx, 255 | ||
549 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
550 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
551 | add ebx, eax | ||
552 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
553 | xor ebx, eax | ||
554 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
555 | add ebx, edx | ||
556 | xor eax, eax | ||
557 | xor esi, ebx | ||
558 | ; | ||
559 | ; Round 7 | ||
560 | mov edx, DWORD PTR 28[ebp] | ||
561 | mov ebx, esi | ||
562 | xor edi, edx | ||
563 | shr ebx, 16 | ||
564 | mov edx, esi | ||
565 | mov al, bh | ||
566 | and ebx, 255 | ||
567 | mov cl, dh | ||
568 | and edx, 255 | ||
569 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
570 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
571 | add ebx, eax | ||
572 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
573 | xor ebx, eax | ||
574 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
575 | add ebx, edx | ||
576 | xor eax, eax | ||
577 | xor edi, ebx | ||
578 | ; | ||
579 | ; Round 6 | ||
580 | mov edx, DWORD PTR 24[ebp] | ||
581 | mov ebx, edi | ||
582 | xor esi, edx | ||
583 | shr ebx, 16 | ||
584 | mov edx, edi | ||
585 | mov al, bh | ||
586 | and ebx, 255 | ||
587 | mov cl, dh | ||
588 | and edx, 255 | ||
589 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
590 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
591 | add ebx, eax | ||
592 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
593 | xor ebx, eax | ||
594 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
595 | add ebx, edx | ||
596 | xor eax, eax | ||
597 | xor esi, ebx | ||
598 | ; | ||
599 | ; Round 5 | ||
600 | mov edx, DWORD PTR 20[ebp] | ||
601 | mov ebx, esi | ||
602 | xor edi, edx | ||
603 | shr ebx, 16 | ||
604 | mov edx, esi | ||
605 | mov al, bh | ||
606 | and ebx, 255 | ||
607 | mov cl, dh | ||
608 | and edx, 255 | ||
609 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
610 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
611 | add ebx, eax | ||
612 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
613 | xor ebx, eax | ||
614 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
615 | add ebx, edx | ||
616 | xor eax, eax | ||
617 | xor edi, ebx | ||
618 | ; | ||
619 | ; Round 4 | ||
620 | mov edx, DWORD PTR 16[ebp] | ||
621 | mov ebx, edi | ||
622 | xor esi, edx | ||
623 | shr ebx, 16 | ||
624 | mov edx, edi | ||
625 | mov al, bh | ||
626 | and ebx, 255 | ||
627 | mov cl, dh | ||
628 | and edx, 255 | ||
629 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
630 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
631 | add ebx, eax | ||
632 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
633 | xor ebx, eax | ||
634 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
635 | add ebx, edx | ||
636 | xor eax, eax | ||
637 | xor esi, ebx | ||
638 | ; | ||
639 | ; Round 3 | ||
640 | mov edx, DWORD PTR 12[ebp] | ||
641 | mov ebx, esi | ||
642 | xor edi, edx | ||
643 | shr ebx, 16 | ||
644 | mov edx, esi | ||
645 | mov al, bh | ||
646 | and ebx, 255 | ||
647 | mov cl, dh | ||
648 | and edx, 255 | ||
649 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
650 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
651 | add ebx, eax | ||
652 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
653 | xor ebx, eax | ||
654 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
655 | add ebx, edx | ||
656 | xor eax, eax | ||
657 | xor edi, ebx | ||
658 | ; | ||
659 | ; Round 2 | ||
660 | mov edx, DWORD PTR 8[ebp] | ||
661 | mov ebx, edi | ||
662 | xor esi, edx | ||
663 | shr ebx, 16 | ||
664 | mov edx, edi | ||
665 | mov al, bh | ||
666 | and ebx, 255 | ||
667 | mov cl, dh | ||
668 | and edx, 255 | ||
669 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
670 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
671 | add ebx, eax | ||
672 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
673 | xor ebx, eax | ||
674 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
675 | add ebx, edx | ||
676 | xor eax, eax | ||
677 | xor esi, ebx | ||
678 | ; | ||
679 | ; Round 1 | ||
680 | mov edx, DWORD PTR 4[ebp] | ||
681 | mov ebx, esi | ||
682 | xor edi, edx | ||
683 | shr ebx, 16 | ||
684 | mov edx, esi | ||
685 | mov al, bh | ||
686 | and ebx, 255 | ||
687 | mov cl, dh | ||
688 | and edx, 255 | ||
689 | mov eax, DWORD PTR 72[eax*4+ebp] | ||
690 | mov ebx, DWORD PTR 1096[ebx*4+ebp] | ||
691 | add ebx, eax | ||
692 | mov eax, DWORD PTR 2120[ecx*4+ebp] | ||
693 | xor ebx, eax | ||
694 | mov edx, DWORD PTR 3144[edx*4+ebp] | ||
695 | add ebx, edx | ||
696 | ; Load parameter 0 (1) enc=0 | ||
697 | mov eax, DWORD PTR 20[esp] | ||
698 | xor edi, ebx | ||
699 | mov edx, DWORD PTR [ebp] | ||
700 | xor esi, edx | ||
701 | mov DWORD PTR 4[eax],edi | ||
702 | mov DWORD PTR [eax],esi | ||
703 | pop edi | ||
704 | pop esi | ||
705 | pop ebx | ||
706 | pop ebp | ||
707 | ret | ||
708 | _BF_decrypt ENDP | ||
709 | _TEXT ENDS | ||
710 | _TEXT SEGMENT | ||
711 | PUBLIC _BF_cbc_encrypt | ||
712 | |||
713 | _BF_cbc_encrypt PROC NEAR | ||
714 | ; | ||
715 | push ebp | ||
716 | push ebx | ||
717 | push esi | ||
718 | push edi | ||
719 | mov ebp, DWORD PTR 28[esp] | ||
720 | ; getting iv ptr from parameter 4 | ||
721 | mov ebx, DWORD PTR 36[esp] | ||
722 | mov esi, DWORD PTR [ebx] | ||
723 | mov edi, DWORD PTR 4[ebx] | ||
724 | push edi | ||
725 | push esi | ||
726 | push edi | ||
727 | push esi | ||
728 | mov ebx, esp | ||
729 | mov esi, DWORD PTR 36[esp] | ||
730 | mov edi, DWORD PTR 40[esp] | ||
731 | ; getting encrypt flag from parameter 5 | ||
732 | mov ecx, DWORD PTR 56[esp] | ||
733 | ; get and push parameter 3 | ||
734 | mov eax, DWORD PTR 48[esp] | ||
735 | push eax | ||
736 | push ebx | ||
737 | cmp ecx, 0 | ||
738 | jz $L000decrypt | ||
739 | and ebp, 4294967288 | ||
740 | mov eax, DWORD PTR 8[esp] | ||
741 | mov ebx, DWORD PTR 12[esp] | ||
742 | jz $L001encrypt_finish | ||
743 | L002encrypt_loop: | ||
744 | mov ecx, DWORD PTR [esi] | ||
745 | mov edx, DWORD PTR 4[esi] | ||
746 | xor eax, ecx | ||
747 | xor ebx, edx | ||
748 | bswap eax | ||
749 | bswap ebx | ||
750 | mov DWORD PTR 8[esp],eax | ||
751 | mov DWORD PTR 12[esp],ebx | ||
752 | call _BF_encrypt | ||
753 | mov eax, DWORD PTR 8[esp] | ||
754 | mov ebx, DWORD PTR 12[esp] | ||
755 | bswap eax | ||
756 | bswap ebx | ||
757 | mov DWORD PTR [edi],eax | ||
758 | mov DWORD PTR 4[edi],ebx | ||
759 | add esi, 8 | ||
760 | add edi, 8 | ||
761 | sub ebp, 8 | ||
762 | jnz L002encrypt_loop | ||
763 | $L001encrypt_finish: | ||
764 | mov ebp, DWORD PTR 52[esp] | ||
765 | and ebp, 7 | ||
766 | jz $L003finish | ||
767 | xor ecx, ecx | ||
768 | xor edx, edx | ||
769 | mov ebp, DWORD PTR $L004cbc_enc_jmp_table[ebp*4] | ||
770 | jmp ebp | ||
771 | L005ej7: | ||
772 | mov dh, BYTE PTR 6[esi] | ||
773 | shl edx, 8 | ||
774 | L006ej6: | ||
775 | mov dh, BYTE PTR 5[esi] | ||
776 | L007ej5: | ||
777 | mov dl, BYTE PTR 4[esi] | ||
778 | L008ej4: | ||
779 | mov ecx, DWORD PTR [esi] | ||
780 | jmp $L009ejend | ||
781 | L010ej3: | ||
782 | mov ch, BYTE PTR 2[esi] | ||
783 | shl ecx, 8 | ||
784 | L011ej2: | ||
785 | mov ch, BYTE PTR 1[esi] | ||
786 | L012ej1: | ||
787 | mov cl, BYTE PTR [esi] | ||
788 | $L009ejend: | ||
789 | xor eax, ecx | ||
790 | xor ebx, edx | ||
791 | bswap eax | ||
792 | bswap ebx | ||
793 | mov DWORD PTR 8[esp],eax | ||
794 | mov DWORD PTR 12[esp],ebx | ||
795 | call _BF_encrypt | ||
796 | mov eax, DWORD PTR 8[esp] | ||
797 | mov ebx, DWORD PTR 12[esp] | ||
798 | bswap eax | ||
799 | bswap ebx | ||
800 | mov DWORD PTR [edi],eax | ||
801 | mov DWORD PTR 4[edi],ebx | ||
802 | jmp $L003finish | ||
803 | $L000decrypt: | ||
804 | and ebp, 4294967288 | ||
805 | mov eax, DWORD PTR 16[esp] | ||
806 | mov ebx, DWORD PTR 20[esp] | ||
807 | jz $L013decrypt_finish | ||
808 | L014decrypt_loop: | ||
809 | mov eax, DWORD PTR [esi] | ||
810 | mov ebx, DWORD PTR 4[esi] | ||
811 | bswap eax | ||
812 | bswap ebx | ||
813 | mov DWORD PTR 8[esp],eax | ||
814 | mov DWORD PTR 12[esp],ebx | ||
815 | call _BF_decrypt | ||
816 | mov eax, DWORD PTR 8[esp] | ||
817 | mov ebx, DWORD PTR 12[esp] | ||
818 | bswap eax | ||
819 | bswap ebx | ||
820 | mov ecx, DWORD PTR 16[esp] | ||
821 | mov edx, DWORD PTR 20[esp] | ||
822 | xor ecx, eax | ||
823 | xor edx, ebx | ||
824 | mov eax, DWORD PTR [esi] | ||
825 | mov ebx, DWORD PTR 4[esi] | ||
826 | mov DWORD PTR [edi],ecx | ||
827 | mov DWORD PTR 4[edi],edx | ||
828 | mov DWORD PTR 16[esp],eax | ||
829 | mov DWORD PTR 20[esp],ebx | ||
830 | add esi, 8 | ||
831 | add edi, 8 | ||
832 | sub ebp, 8 | ||
833 | jnz L014decrypt_loop | ||
834 | $L013decrypt_finish: | ||
835 | mov ebp, DWORD PTR 52[esp] | ||
836 | and ebp, 7 | ||
837 | jz $L003finish | ||
838 | mov eax, DWORD PTR [esi] | ||
839 | mov ebx, DWORD PTR 4[esi] | ||
840 | bswap eax | ||
841 | bswap ebx | ||
842 | mov DWORD PTR 8[esp],eax | ||
843 | mov DWORD PTR 12[esp],ebx | ||
844 | call _BF_decrypt | ||
845 | mov eax, DWORD PTR 8[esp] | ||
846 | mov ebx, DWORD PTR 12[esp] | ||
847 | bswap eax | ||
848 | bswap ebx | ||
849 | mov ecx, DWORD PTR 16[esp] | ||
850 | mov edx, DWORD PTR 20[esp] | ||
851 | xor ecx, eax | ||
852 | xor edx, ebx | ||
853 | mov eax, DWORD PTR [esi] | ||
854 | mov ebx, DWORD PTR 4[esi] | ||
855 | L015dj7: | ||
856 | ror edx, 16 | ||
857 | mov BYTE PTR 6[edi],dl | ||
858 | shr edx, 16 | ||
859 | L016dj6: | ||
860 | mov BYTE PTR 5[edi],dh | ||
861 | L017dj5: | ||
862 | mov BYTE PTR 4[edi],dl | ||
863 | L018dj4: | ||
864 | mov DWORD PTR [edi],ecx | ||
865 | jmp $L019djend | ||
866 | L020dj3: | ||
867 | ror ecx, 16 | ||
868 | mov BYTE PTR 2[edi],cl | ||
869 | shl ecx, 16 | ||
870 | L021dj2: | ||
871 | mov BYTE PTR 1[esi],ch | ||
872 | L022dj1: | ||
873 | mov BYTE PTR [esi], cl | ||
874 | $L019djend: | ||
875 | jmp $L003finish | ||
876 | $L003finish: | ||
877 | mov ecx, DWORD PTR 60[esp] | ||
878 | add esp, 24 | ||
879 | mov DWORD PTR [ecx],eax | ||
880 | mov DWORD PTR 4[ecx],ebx | ||
881 | pop edi | ||
882 | pop esi | ||
883 | pop ebx | ||
884 | pop ebp | ||
885 | ret | ||
886 | $L004cbc_enc_jmp_table: | ||
887 | DD 0 | ||
888 | DD L012ej1 | ||
889 | DD L011ej2 | ||
890 | DD L010ej3 | ||
891 | DD L008ej4 | ||
892 | DD L007ej5 | ||
893 | DD L006ej6 | ||
894 | DD L005ej7 | ||
895 | L023cbc_dec_jmp_table: | ||
896 | DD 0 | ||
897 | DD L022dj1 | ||
898 | DD L021dj2 | ||
899 | DD L020dj3 | ||
900 | DD L018dj4 | ||
901 | DD L017dj5 | ||
902 | DD L016dj6 | ||
903 | DD L015dj7 | ||
904 | _BF_cbc_encrypt ENDP | ||
905 | _TEXT ENDS | ||
906 | END | ||
diff --git a/src/lib/libssl/src/crypto/bio/Makefile.ssl b/src/lib/libssl/src/crypto/bio/Makefile.ssl index 2e7480ead9..755f255fe4 100644 --- a/src/lib/libssl/src/crypto/bio/Makefile.ssl +++ b/src/lib/libssl/src/crypto/bio/Makefile.ssl | |||
@@ -172,8 +172,10 @@ bss_acpt.o: ../../include/openssl/opensslconf.h | |||
172 | bss_acpt.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h | 172 | bss_acpt.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h |
173 | bss_acpt.o: ../../include/openssl/stack.h ../cryptlib.h | 173 | bss_acpt.o: ../../include/openssl/stack.h ../cryptlib.h |
174 | bss_bio.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h | 174 | bss_bio.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h |
175 | bss_bio.o: ../../include/openssl/err.h ../../include/openssl/opensslv.h | 175 | bss_bio.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h |
176 | bss_bio.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | 176 | bss_bio.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h |
177 | bss_bio.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h | ||
178 | bss_bio.o: ../../include/openssl/stack.h | ||
177 | bss_conn.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h | 179 | bss_conn.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h |
178 | bss_conn.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h | 180 | bss_conn.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h |
179 | bss_conn.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h | 181 | bss_conn.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h |
diff --git a/src/lib/libssl/src/crypto/bio/b_print.c b/src/lib/libssl/src/crypto/bio/b_print.c index 2a5e8b58c9..b11b501512 100644 --- a/src/lib/libssl/src/crypto/bio/b_print.c +++ b/src/lib/libssl/src/crypto/bio/b_print.c | |||
@@ -64,6 +64,8 @@ | |||
64 | #include <stdarg.h> | 64 | #include <stdarg.h> |
65 | #include <string.h> | 65 | #include <string.h> |
66 | #include <ctype.h> | 66 | #include <ctype.h> |
67 | #include <assert.h> | ||
68 | #include <limits.h> | ||
67 | #include "cryptlib.h" | 69 | #include "cryptlib.h" |
68 | #ifndef NO_SYS_TYPES_H | 70 | #ifndef NO_SYS_TYPES_H |
69 | #include <sys/types.h> | 71 | #include <sys/types.h> |
@@ -72,12 +74,16 @@ | |||
72 | 74 | ||
73 | #ifdef BN_LLONG | 75 | #ifdef BN_LLONG |
74 | # ifndef HAVE_LONG_LONG | 76 | # ifndef HAVE_LONG_LONG |
75 | # define HAVE_LONG_LONG | 77 | # define HAVE_LONG_LONG 1 |
76 | # endif | 78 | # endif |
77 | #endif | 79 | #endif |
78 | 80 | ||
79 | static void dopr (char *buffer, size_t maxlen, size_t *retlen, | 81 | static void dopr (char *buffer, size_t maxlen, size_t *retlen, |
80 | const char *format, va_list args); | 82 | const char *format, va_list args); |
83 | #ifdef USE_ALLOCATING_PRINT | ||
84 | static void doapr (char **buffer, size_t *retlen, | ||
85 | const char *format, va_list args); | ||
86 | #endif | ||
81 | 87 | ||
82 | int BIO_printf (BIO *bio, ...) | 88 | int BIO_printf (BIO *bio, ...) |
83 | { | 89 | { |
@@ -85,15 +91,32 @@ int BIO_printf (BIO *bio, ...) | |||
85 | char *format; | 91 | char *format; |
86 | int ret; | 92 | int ret; |
87 | size_t retlen; | 93 | size_t retlen; |
94 | #ifdef USE_ALLOCATING_PRINT | ||
95 | char *hugebuf; | ||
96 | #else | ||
88 | MS_STATIC char hugebuf[1024*2]; /* 10k in one chunk is the limit */ | 97 | MS_STATIC char hugebuf[1024*2]; /* 10k in one chunk is the limit */ |
98 | #endif | ||
89 | 99 | ||
90 | va_start(args, bio); | 100 | va_start(args, bio); |
91 | format=va_arg(args, char *); | 101 | format=va_arg(args, char *); |
92 | 102 | ||
103 | #ifndef USE_ALLOCATING_PRINT | ||
93 | hugebuf[0]='\0'; | 104 | hugebuf[0]='\0'; |
94 | dopr(hugebuf, sizeof(hugebuf), &retlen, format, args); | 105 | dopr(hugebuf, sizeof(hugebuf), &retlen, format, args); |
95 | ret=BIO_write(bio, hugebuf, (int)retlen); | 106 | #else |
107 | hugebuf = NULL; | ||
108 | CRYPTO_push_info("doapr()"); | ||
109 | doapr(&hugebuf, &retlen, format, args); | ||
110 | if (hugebuf) | ||
111 | { | ||
112 | #endif | ||
113 | ret=BIO_write(bio, hugebuf, (int)retlen); | ||
96 | 114 | ||
115 | #ifdef USE_ALLOCATING_PRINT | ||
116 | Free(hugebuf); | ||
117 | } | ||
118 | CRYPTO_pop_info(); | ||
119 | #endif | ||
97 | va_end(args); | 120 | va_end(args); |
98 | return(ret); | 121 | return(ret); |
99 | } | 122 | } |
@@ -131,10 +154,26 @@ int BIO_printf (BIO *bio, ...) | |||
131 | #define LLONG long | 154 | #define LLONG long |
132 | #endif | 155 | #endif |
133 | 156 | ||
134 | static void fmtstr (char *, size_t *, size_t, char *, int, int, int); | 157 | static void fmtstr (void (*)(char **, size_t *, size_t *, int), |
135 | static void fmtint (char *, size_t *, size_t, LLONG, int, int, int, int); | 158 | char **, size_t *, size_t *, const char *, int, int, |
136 | static void fmtfp (char *, size_t *, size_t, LDOUBLE, int, int, int); | 159 | int); |
137 | static void dopr_outch (char *, size_t *, size_t, int); | 160 | static void fmtint (void (*)(char **, size_t *, size_t *, int), |
161 | char **, size_t *, size_t *, LLONG, int, int, int, int); | ||
162 | static void fmtfp (void (*)(char **, size_t *, size_t *, int), | ||
163 | char **, size_t *, size_t *, LDOUBLE, int, int, int); | ||
164 | #ifndef USE_ALLOCATING_PRINT | ||
165 | static int dopr_isbig (size_t, size_t); | ||
166 | static int dopr_copy (size_t); | ||
167 | static void dopr_outch (char **, size_t *, size_t *, int); | ||
168 | #else | ||
169 | static int doapr_isbig (size_t, size_t); | ||
170 | static int doapr_copy (size_t); | ||
171 | static void doapr_outch (char **, size_t *, size_t *, int); | ||
172 | #endif | ||
173 | static void _dopr(void (*)(char **, size_t *, size_t *, int), | ||
174 | int (*)(size_t, size_t), int (*)(size_t), | ||
175 | char **buffer, size_t *maxlen, size_t *retlen, | ||
176 | const char *format, va_list args); | ||
138 | 177 | ||
139 | /* format read states */ | 178 | /* format read states */ |
140 | #define DP_S_DEFAULT 0 | 179 | #define DP_S_DEFAULT 0 |
@@ -165,6 +204,7 @@ static void dopr_outch (char *, size_t *, size_t, int); | |||
165 | #define char_to_int(p) (p - '0') | 204 | #define char_to_int(p) (p - '0') |
166 | #define MAX(p,q) ((p >= q) ? p : q) | 205 | #define MAX(p,q) ((p >= q) ? p : q) |
167 | 206 | ||
207 | #ifndef USE_ALLOCATING_PRINT | ||
168 | static void | 208 | static void |
169 | dopr( | 209 | dopr( |
170 | char *buffer, | 210 | char *buffer, |
@@ -173,6 +213,35 @@ dopr( | |||
173 | const char *format, | 213 | const char *format, |
174 | va_list args) | 214 | va_list args) |
175 | { | 215 | { |
216 | _dopr(dopr_outch, dopr_isbig, dopr_copy, | ||
217 | &buffer, &maxlen, retlen, format, args); | ||
218 | } | ||
219 | |||
220 | #else | ||
221 | static void | ||
222 | doapr( | ||
223 | char **buffer, | ||
224 | size_t *retlen, | ||
225 | const char *format, | ||
226 | va_list args) | ||
227 | { | ||
228 | size_t dummy_maxlen = 0; | ||
229 | _dopr(doapr_outch, doapr_isbig, doapr_copy, | ||
230 | buffer, &dummy_maxlen, retlen, format, args); | ||
231 | } | ||
232 | #endif | ||
233 | |||
234 | static void | ||
235 | _dopr( | ||
236 | void (*outch_fn)(char **, size_t *, size_t *, int), | ||
237 | int (*isbig_fn)(size_t, size_t), | ||
238 | int (*copy_fn)(size_t), | ||
239 | char **buffer, | ||
240 | size_t *maxlen, | ||
241 | size_t *retlen, | ||
242 | const char *format, | ||
243 | va_list args) | ||
244 | { | ||
176 | char ch; | 245 | char ch; |
177 | LLONG value; | 246 | LLONG value; |
178 | LDOUBLE fvalue; | 247 | LDOUBLE fvalue; |
@@ -190,7 +259,7 @@ dopr( | |||
190 | ch = *format++; | 259 | ch = *format++; |
191 | 260 | ||
192 | while (state != DP_S_DONE) { | 261 | while (state != DP_S_DONE) { |
193 | if ((ch == '\0') || (currlen >= maxlen)) | 262 | if ((ch == '\0') || (*isbig_fn)(currlen, *maxlen)) |
194 | state = DP_S_DONE; | 263 | state = DP_S_DONE; |
195 | 264 | ||
196 | switch (state) { | 265 | switch (state) { |
@@ -198,7 +267,7 @@ dopr( | |||
198 | if (ch == '%') | 267 | if (ch == '%') |
199 | state = DP_S_FLAGS; | 268 | state = DP_S_FLAGS; |
200 | else | 269 | else |
201 | dopr_outch(buffer, &currlen, maxlen, ch); | 270 | (*outch_fn)(buffer, &currlen, maxlen, ch); |
202 | ch = *format++; | 271 | ch = *format++; |
203 | break; | 272 | break; |
204 | case DP_S_FLAGS: | 273 | case DP_S_FLAGS: |
@@ -304,7 +373,8 @@ dopr( | |||
304 | value = va_arg(args, int); | 373 | value = va_arg(args, int); |
305 | break; | 374 | break; |
306 | } | 375 | } |
307 | fmtint(buffer, &currlen, maxlen, value, 10, min, max, flags); | 376 | fmtint(outch_fn, buffer, &currlen, maxlen, |
377 | value, 10, min, max, flags); | ||
308 | break; | 378 | break; |
309 | case 'X': | 379 | case 'X': |
310 | flags |= DP_F_UP; | 380 | flags |= DP_F_UP; |
@@ -329,7 +399,7 @@ dopr( | |||
329 | unsigned int); | 399 | unsigned int); |
330 | break; | 400 | break; |
331 | } | 401 | } |
332 | fmtint(buffer, &currlen, maxlen, value, | 402 | fmtint(outch_fn, buffer, &currlen, maxlen, value, |
333 | ch == 'o' ? 8 : (ch == 'u' ? 10 : 16), | 403 | ch == 'o' ? 8 : (ch == 'u' ? 10 : 16), |
334 | min, max, flags); | 404 | min, max, flags); |
335 | break; | 405 | break; |
@@ -338,7 +408,8 @@ dopr( | |||
338 | fvalue = va_arg(args, LDOUBLE); | 408 | fvalue = va_arg(args, LDOUBLE); |
339 | else | 409 | else |
340 | fvalue = va_arg(args, double); | 410 | fvalue = va_arg(args, double); |
341 | fmtfp(buffer, &currlen, maxlen, fvalue, min, max, flags); | 411 | fmtfp(outch_fn, buffer, &currlen, maxlen, |
412 | fvalue, min, max, flags); | ||
342 | break; | 413 | break; |
343 | case 'E': | 414 | case 'E': |
344 | flags |= DP_F_UP; | 415 | flags |= DP_F_UP; |
@@ -357,19 +428,19 @@ dopr( | |||
357 | fvalue = va_arg(args, double); | 428 | fvalue = va_arg(args, double); |
358 | break; | 429 | break; |
359 | case 'c': | 430 | case 'c': |
360 | dopr_outch(buffer, &currlen, maxlen, | 431 | (*outch_fn)(buffer, &currlen, maxlen, |
361 | va_arg(args, int)); | 432 | va_arg(args, int)); |
362 | break; | 433 | break; |
363 | case 's': | 434 | case 's': |
364 | strvalue = va_arg(args, char *); | 435 | strvalue = va_arg(args, char *); |
365 | if (max < 0) | 436 | if (max < 0) |
366 | max = maxlen; | 437 | max = (*copy_fn)(*maxlen); |
367 | fmtstr(buffer, &currlen, maxlen, strvalue, | 438 | fmtstr(outch_fn, buffer, &currlen, maxlen, strvalue, |
368 | flags, min, max); | 439 | flags, min, max); |
369 | break; | 440 | break; |
370 | case 'p': | 441 | case 'p': |
371 | value = (long)va_arg(args, void *); | 442 | value = (long)va_arg(args, void *); |
372 | fmtint(buffer, &currlen, maxlen, | 443 | fmtint(outch_fn, buffer, &currlen, maxlen, |
373 | value, 16, min, max, flags); | 444 | value, 16, min, max, flags); |
374 | break; | 445 | break; |
375 | case 'n': /* XXX */ | 446 | case 'n': /* XXX */ |
@@ -392,7 +463,7 @@ dopr( | |||
392 | } | 463 | } |
393 | break; | 464 | break; |
394 | case '%': | 465 | case '%': |
395 | dopr_outch(buffer, &currlen, maxlen, ch); | 466 | (*outch_fn)(buffer, &currlen, maxlen, ch); |
396 | break; | 467 | break; |
397 | case 'w': | 468 | case 'w': |
398 | /* not supported yet, treat as next char */ | 469 | /* not supported yet, treat as next char */ |
@@ -413,19 +484,20 @@ dopr( | |||
413 | break; | 484 | break; |
414 | } | 485 | } |
415 | } | 486 | } |
416 | if (currlen >= maxlen - 1) | 487 | if (currlen >= *maxlen - 1) |
417 | currlen = maxlen - 1; | 488 | currlen = *maxlen - 1; |
418 | buffer[currlen] = '\0'; | 489 | (*buffer)[currlen] = '\0'; |
419 | *retlen = currlen; | 490 | *retlen = currlen; |
420 | return; | 491 | return; |
421 | } | 492 | } |
422 | 493 | ||
423 | static void | 494 | static void |
424 | fmtstr( | 495 | fmtstr( |
425 | char *buffer, | 496 | void (*outch_fn)(char **, size_t *, size_t *, int), |
497 | char **buffer, | ||
426 | size_t *currlen, | 498 | size_t *currlen, |
427 | size_t maxlen, | 499 | size_t *maxlen, |
428 | char *value, | 500 | const char *value, |
429 | int flags, | 501 | int flags, |
430 | int min, | 502 | int min, |
431 | int max) | 503 | int max) |
@@ -444,16 +516,16 @@ fmtstr( | |||
444 | padlen = -padlen; | 516 | padlen = -padlen; |
445 | 517 | ||
446 | while ((padlen > 0) && (cnt < max)) { | 518 | while ((padlen > 0) && (cnt < max)) { |
447 | dopr_outch(buffer, currlen, maxlen, ' '); | 519 | (*outch_fn)(buffer, currlen, maxlen, ' '); |
448 | --padlen; | 520 | --padlen; |
449 | ++cnt; | 521 | ++cnt; |
450 | } | 522 | } |
451 | while (*value && (cnt < max)) { | 523 | while (*value && (cnt < max)) { |
452 | dopr_outch(buffer, currlen, maxlen, *value++); | 524 | (*outch_fn)(buffer, currlen, maxlen, *value++); |
453 | ++cnt; | 525 | ++cnt; |
454 | } | 526 | } |
455 | while ((padlen < 0) && (cnt < max)) { | 527 | while ((padlen < 0) && (cnt < max)) { |
456 | dopr_outch(buffer, currlen, maxlen, ' '); | 528 | (*outch_fn)(buffer, currlen, maxlen, ' '); |
457 | ++padlen; | 529 | ++padlen; |
458 | ++cnt; | 530 | ++cnt; |
459 | } | 531 | } |
@@ -461,9 +533,10 @@ fmtstr( | |||
461 | 533 | ||
462 | static void | 534 | static void |
463 | fmtint( | 535 | fmtint( |
464 | char *buffer, | 536 | void (*outch_fn)(char **, size_t *, size_t *, int), |
537 | char **buffer, | ||
465 | size_t *currlen, | 538 | size_t *currlen, |
466 | size_t maxlen, | 539 | size_t *maxlen, |
467 | LLONG value, | 540 | LLONG value, |
468 | int base, | 541 | int base, |
469 | int min, | 542 | int min, |
@@ -517,28 +590,28 @@ fmtint( | |||
517 | 590 | ||
518 | /* spaces */ | 591 | /* spaces */ |
519 | while (spadlen > 0) { | 592 | while (spadlen > 0) { |
520 | dopr_outch(buffer, currlen, maxlen, ' '); | 593 | (*outch_fn)(buffer, currlen, maxlen, ' '); |
521 | --spadlen; | 594 | --spadlen; |
522 | } | 595 | } |
523 | 596 | ||
524 | /* sign */ | 597 | /* sign */ |
525 | if (signvalue) | 598 | if (signvalue) |
526 | dopr_outch(buffer, currlen, maxlen, signvalue); | 599 | (*outch_fn)(buffer, currlen, maxlen, signvalue); |
527 | 600 | ||
528 | /* zeros */ | 601 | /* zeros */ |
529 | if (zpadlen > 0) { | 602 | if (zpadlen > 0) { |
530 | while (zpadlen > 0) { | 603 | while (zpadlen > 0) { |
531 | dopr_outch(buffer, currlen, maxlen, '0'); | 604 | (*outch_fn)(buffer, currlen, maxlen, '0'); |
532 | --zpadlen; | 605 | --zpadlen; |
533 | } | 606 | } |
534 | } | 607 | } |
535 | /* digits */ | 608 | /* digits */ |
536 | while (place > 0) | 609 | while (place > 0) |
537 | dopr_outch(buffer, currlen, maxlen, convert[--place]); | 610 | (*outch_fn)(buffer, currlen, maxlen, convert[--place]); |
538 | 611 | ||
539 | /* left justified spaces */ | 612 | /* left justified spaces */ |
540 | while (spadlen < 0) { | 613 | while (spadlen < 0) { |
541 | dopr_outch(buffer, currlen, maxlen, ' '); | 614 | (*outch_fn)(buffer, currlen, maxlen, ' '); |
542 | ++spadlen; | 615 | ++spadlen; |
543 | } | 616 | } |
544 | return; | 617 | return; |
@@ -577,9 +650,10 @@ round(LDOUBLE value) | |||
577 | 650 | ||
578 | static void | 651 | static void |
579 | fmtfp( | 652 | fmtfp( |
580 | char *buffer, | 653 | void (*outch_fn)(char **, size_t *, size_t *, int), |
654 | char **buffer, | ||
581 | size_t *currlen, | 655 | size_t *currlen, |
582 | size_t maxlen, | 656 | size_t *maxlen, |
583 | LDOUBLE fvalue, | 657 | LDOUBLE fvalue, |
584 | int min, | 658 | int min, |
585 | int max, | 659 | int max, |
@@ -657,54 +731,114 @@ fmtfp( | |||
657 | 731 | ||
658 | if ((flags & DP_F_ZERO) && (padlen > 0)) { | 732 | if ((flags & DP_F_ZERO) && (padlen > 0)) { |
659 | if (signvalue) { | 733 | if (signvalue) { |
660 | dopr_outch(buffer, currlen, maxlen, signvalue); | 734 | (*outch_fn)(buffer, currlen, maxlen, signvalue); |
661 | --padlen; | 735 | --padlen; |
662 | signvalue = 0; | 736 | signvalue = 0; |
663 | } | 737 | } |
664 | while (padlen > 0) { | 738 | while (padlen > 0) { |
665 | dopr_outch(buffer, currlen, maxlen, '0'); | 739 | (*outch_fn)(buffer, currlen, maxlen, '0'); |
666 | --padlen; | 740 | --padlen; |
667 | } | 741 | } |
668 | } | 742 | } |
669 | while (padlen > 0) { | 743 | while (padlen > 0) { |
670 | dopr_outch(buffer, currlen, maxlen, ' '); | 744 | (*outch_fn)(buffer, currlen, maxlen, ' '); |
671 | --padlen; | 745 | --padlen; |
672 | } | 746 | } |
673 | if (signvalue) | 747 | if (signvalue) |
674 | dopr_outch(buffer, currlen, maxlen, signvalue); | 748 | (*outch_fn)(buffer, currlen, maxlen, signvalue); |
675 | 749 | ||
676 | while (iplace > 0) | 750 | while (iplace > 0) |
677 | dopr_outch(buffer, currlen, maxlen, iconvert[--iplace]); | 751 | (*outch_fn)(buffer, currlen, maxlen, iconvert[--iplace]); |
678 | 752 | ||
679 | /* | 753 | /* |
680 | * Decimal point. This should probably use locale to find the correct | 754 | * Decimal point. This should probably use locale to find the correct |
681 | * char to print out. | 755 | * char to print out. |
682 | */ | 756 | */ |
683 | if (max > 0) { | 757 | if (max > 0) { |
684 | dopr_outch(buffer, currlen, maxlen, '.'); | 758 | (*outch_fn)(buffer, currlen, maxlen, '.'); |
685 | 759 | ||
686 | while (fplace > 0) | 760 | while (fplace > 0) |
687 | dopr_outch(buffer, currlen, maxlen, fconvert[--fplace]); | 761 | (*outch_fn)(buffer, currlen, maxlen, fconvert[--fplace]); |
688 | } | 762 | } |
689 | while (zpadlen > 0) { | 763 | while (zpadlen > 0) { |
690 | dopr_outch(buffer, currlen, maxlen, '0'); | 764 | (*outch_fn)(buffer, currlen, maxlen, '0'); |
691 | --zpadlen; | 765 | --zpadlen; |
692 | } | 766 | } |
693 | 767 | ||
694 | while (padlen < 0) { | 768 | while (padlen < 0) { |
695 | dopr_outch(buffer, currlen, maxlen, ' '); | 769 | (*outch_fn)(buffer, currlen, maxlen, ' '); |
696 | ++padlen; | 770 | ++padlen; |
697 | } | 771 | } |
698 | } | 772 | } |
699 | 773 | ||
774 | static int | ||
775 | dopr_copy( | ||
776 | size_t len) | ||
777 | { | ||
778 | return len; | ||
779 | } | ||
780 | |||
781 | #ifdef USE_ALLOCATING_PRINT | ||
782 | static int | ||
783 | doapr_copy( | ||
784 | size_t len) | ||
785 | { | ||
786 | /* Return as high an integer as possible */ | ||
787 | return INT_MAX; | ||
788 | } | ||
789 | #endif | ||
790 | |||
791 | static int | ||
792 | dopr_isbig( | ||
793 | size_t currlen, | ||
794 | size_t maxlen) | ||
795 | { | ||
796 | return currlen > maxlen; | ||
797 | } | ||
798 | |||
799 | #ifdef USE_ALLOCATING_PRINT | ||
800 | static int | ||
801 | doapr_isbig( | ||
802 | size_t currlen, | ||
803 | size_t maxlen) | ||
804 | { | ||
805 | return 0; | ||
806 | } | ||
807 | #endif | ||
808 | |||
700 | static void | 809 | static void |
701 | dopr_outch( | 810 | dopr_outch( |
702 | char *buffer, | 811 | char **buffer, |
703 | size_t *currlen, | 812 | size_t *currlen, |
704 | size_t maxlen, | 813 | size_t *maxlen, |
814 | int c) | ||
815 | { | ||
816 | if (*currlen < *maxlen) | ||
817 | (*buffer)[(*currlen)++] = (char)c; | ||
818 | return; | ||
819 | } | ||
820 | |||
821 | #ifdef USE_ALLOCATING_PRINT | ||
822 | static void | ||
823 | doapr_outch( | ||
824 | char **buffer, | ||
825 | size_t *currlen, | ||
826 | size_t *maxlen, | ||
705 | int c) | 827 | int c) |
706 | { | 828 | { |
707 | if (*currlen < maxlen) | 829 | if (*buffer == NULL) { |
708 | buffer[(*currlen)++] = (char)c; | 830 | if (*maxlen == 0) |
831 | *maxlen = 1024; | ||
832 | *buffer = Malloc(*maxlen); | ||
833 | } | ||
834 | while (*currlen >= *maxlen) { | ||
835 | *maxlen += 1024; | ||
836 | *buffer = Realloc(*buffer, *maxlen); | ||
837 | } | ||
838 | /* What to do if *buffer is NULL? */ | ||
839 | assert(*buffer != NULL); | ||
840 | |||
841 | (*buffer)[(*currlen)++] = (char)c; | ||
709 | return; | 842 | return; |
710 | } | 843 | } |
844 | #endif | ||
diff --git a/src/lib/libssl/src/crypto/bio/bio.h b/src/lib/libssl/src/crypto/bio/bio.h index bc08401eeb..ebdb18170b 100644 --- a/src/lib/libssl/src/crypto/bio/bio.h +++ b/src/lib/libssl/src/crypto/bio/bio.h | |||
@@ -507,7 +507,7 @@ int BIO_set(BIO *a,BIO_METHOD *type); | |||
507 | int BIO_free(BIO *a); | 507 | int BIO_free(BIO *a); |
508 | int BIO_read(BIO *b, void *data, int len); | 508 | int BIO_read(BIO *b, void *data, int len); |
509 | int BIO_gets(BIO *bp,char *buf, int size); | 509 | int BIO_gets(BIO *bp,char *buf, int size); |
510 | int BIO_write(BIO *b, const char *data, int len); | 510 | int BIO_write(BIO *b, const void *data, int len); |
511 | int BIO_puts(BIO *bp,const char *buf); | 511 | int BIO_puts(BIO *bp,const char *buf); |
512 | long BIO_ctrl(BIO *bp,int cmd,long larg,void *parg); | 512 | long BIO_ctrl(BIO *bp,int cmd,long larg,void *parg); |
513 | long BIO_callback_ctrl(BIO *bp,int cmd,void (*fp)()); | 513 | long BIO_callback_ctrl(BIO *bp,int cmd,void (*fp)()); |
diff --git a/src/lib/libssl/src/crypto/bio/bio_err.c b/src/lib/libssl/src/crypto/bio/bio_err.c index b5f07de5a0..f38e7b9178 100644 --- a/src/lib/libssl/src/crypto/bio/bio_err.c +++ b/src/lib/libssl/src/crypto/bio/bio_err.c | |||
@@ -54,7 +54,8 @@ | |||
54 | */ | 54 | */ |
55 | 55 | ||
56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes |
57 | * made to it will be overwritten when the script next updates this file. | 57 | * made to it will be overwritten when the script next updates this file, |
58 | * only reason strings will be preserved. | ||
58 | */ | 59 | */ |
59 | 60 | ||
60 | #include <stdio.h> | 61 | #include <stdio.h> |
diff --git a/src/lib/libssl/src/crypto/bio/bio_lib.c b/src/lib/libssl/src/crypto/bio/bio_lib.c index cf8e6150fd..e88dcc80f3 100644 --- a/src/lib/libssl/src/crypto/bio/bio_lib.c +++ b/src/lib/libssl/src/crypto/bio/bio_lib.c | |||
@@ -169,7 +169,7 @@ int BIO_read(BIO *b, void *out, int outl) | |||
169 | return(i); | 169 | return(i); |
170 | } | 170 | } |
171 | 171 | ||
172 | int BIO_write(BIO *b, const char *in, int inl) | 172 | int BIO_write(BIO *b, const void *in, int inl) |
173 | { | 173 | { |
174 | int i; | 174 | int i; |
175 | long (*cb)(); | 175 | long (*cb)(); |
diff --git a/src/lib/libssl/src/crypto/bio/bss_bio.c b/src/lib/libssl/src/crypto/bio/bss_bio.c index 0d0f9356f7..1e2d7491f2 100644 --- a/src/lib/libssl/src/crypto/bio/bss_bio.c +++ b/src/lib/libssl/src/crypto/bio/bss_bio.c | |||
@@ -19,8 +19,14 @@ | |||
19 | 19 | ||
20 | #include <openssl/bio.h> | 20 | #include <openssl/bio.h> |
21 | #include <openssl/err.h> | 21 | #include <openssl/err.h> |
22 | #include <openssl/err.h> | ||
22 | #include <openssl/crypto.h> | 23 | #include <openssl/crypto.h> |
23 | 24 | ||
25 | #include "openssl/e_os.h" | ||
26 | #ifndef SSIZE_MAX | ||
27 | # define SSIZE_MAX INT_MAX | ||
28 | #endif | ||
29 | |||
24 | static int bio_new(BIO *bio); | 30 | static int bio_new(BIO *bio); |
25 | static int bio_free(BIO *bio); | 31 | static int bio_free(BIO *bio); |
26 | static int bio_read(BIO *bio, char *buf, int size); | 32 | static int bio_read(BIO *bio, char *buf, int size); |
@@ -205,10 +211,10 @@ static int bio_read(BIO *bio, char *buf, int size_) | |||
205 | */ | 211 | */ |
206 | /* WARNING: The non-copying interface is largely untested as of yet | 212 | /* WARNING: The non-copying interface is largely untested as of yet |
207 | * and may contain bugs. */ | 213 | * and may contain bugs. */ |
208 | static size_t bio_nread0(BIO *bio, char **buf) | 214 | static ssize_t bio_nread0(BIO *bio, char **buf) |
209 | { | 215 | { |
210 | struct bio_bio_st *b, *peer_b; | 216 | struct bio_bio_st *b, *peer_b; |
211 | size_t num; | 217 | ssize_t num; |
212 | 218 | ||
213 | BIO_clear_retry_flags(bio); | 219 | BIO_clear_retry_flags(bio); |
214 | 220 | ||
@@ -243,15 +249,20 @@ static size_t bio_nread0(BIO *bio, char **buf) | |||
243 | return num; | 249 | return num; |
244 | } | 250 | } |
245 | 251 | ||
246 | static size_t bio_nread(BIO *bio, char **buf, size_t num) | 252 | static ssize_t bio_nread(BIO *bio, char **buf, size_t num_) |
247 | { | 253 | { |
248 | struct bio_bio_st *b, *peer_b; | 254 | struct bio_bio_st *b, *peer_b; |
249 | size_t available; | 255 | ssize_t num, available; |
256 | |||
257 | if (num_ > SSIZE_MAX) | ||
258 | num = SSIZE_MAX; | ||
259 | else | ||
260 | num = (ssize_t)num_; | ||
250 | 261 | ||
251 | available = bio_nread0(bio, buf); | 262 | available = bio_nread0(bio, buf); |
252 | if (num > available) | 263 | if (num > available) |
253 | num = available; | 264 | num = available; |
254 | if (num == 0) | 265 | if (num <= 0) |
255 | return num; | 266 | return num; |
256 | 267 | ||
257 | b = bio->ptr; | 268 | b = bio->ptr; |
@@ -351,7 +362,7 @@ static int bio_write(BIO *bio, char *buf, int num_) | |||
351 | * (example usage: bio_nwrite0(), write to buffer, bio_nwrite() | 362 | * (example usage: bio_nwrite0(), write to buffer, bio_nwrite() |
352 | * or just bio_nwrite(), write to buffer) | 363 | * or just bio_nwrite(), write to buffer) |
353 | */ | 364 | */ |
354 | static size_t bio_nwrite0(BIO *bio, char **buf) | 365 | static ssize_t bio_nwrite0(BIO *bio, char **buf) |
355 | { | 366 | { |
356 | struct bio_bio_st *b; | 367 | struct bio_bio_st *b; |
357 | size_t num; | 368 | size_t num; |
@@ -399,15 +410,20 @@ static size_t bio_nwrite0(BIO *bio, char **buf) | |||
399 | return num; | 410 | return num; |
400 | } | 411 | } |
401 | 412 | ||
402 | static size_t bio_nwrite(BIO *bio, char **buf, size_t num) | 413 | static ssize_t bio_nwrite(BIO *bio, char **buf, size_t num_) |
403 | { | 414 | { |
404 | struct bio_bio_st *b; | 415 | struct bio_bio_st *b; |
405 | size_t space; | 416 | ssize_t num, space; |
417 | |||
418 | if (num_ > SSIZE_MAX) | ||
419 | num = SSIZE_MAX; | ||
420 | else | ||
421 | num = (ssize_t)num_; | ||
406 | 422 | ||
407 | space = bio_nwrite0(bio, buf); | 423 | space = bio_nwrite0(bio, buf); |
408 | if (num > space) | 424 | if (num > space) |
409 | num = space; | 425 | num = space; |
410 | if (num == 0) | 426 | if (num <= 0) |
411 | return num; | 427 | return num; |
412 | b = bio->ptr; | 428 | b = bio->ptr; |
413 | assert(b != NULL); | 429 | assert(b != NULL); |
@@ -509,6 +525,11 @@ static long bio_ctrl(BIO *bio, int cmd, long num, void *ptr) | |||
509 | ret = 1; | 525 | ret = 1; |
510 | break; | 526 | break; |
511 | 527 | ||
528 | case BIO_C_NREAD0: | ||
529 | /* prepare for non-copying read */ | ||
530 | ret = (long) bio_nread0(bio, ptr); | ||
531 | break; | ||
532 | |||
512 | case BIO_C_NREAD: | 533 | case BIO_C_NREAD: |
513 | /* non-copying read */ | 534 | /* non-copying read */ |
514 | ret = (long) bio_nread(bio, ptr, (size_t) num); | 535 | ret = (long) bio_nread(bio, ptr, (size_t) num); |
diff --git a/src/lib/libssl/src/crypto/bio/bss_log.c b/src/lib/libssl/src/crypto/bio/bss_log.c index 4308b19663..497eb1af72 100644 --- a/src/lib/libssl/src/crypto/bio/bss_log.c +++ b/src/lib/libssl/src/crypto/bio/bss_log.c | |||
@@ -57,8 +57,8 @@ | |||
57 | Why BIO_s_log? | 57 | Why BIO_s_log? |
58 | 58 | ||
59 | BIO_s_log is useful for system daemons (or services under NT). | 59 | BIO_s_log is useful for system daemons (or services under NT). |
60 | It is one-way BIO, it sends all stuff to syslogd (or event log | 60 | It is one-way BIO, it sends all stuff to syslogd (on system that |
61 | under NT). | 61 | commonly use that), or event log (on NT), or OPCOM (on OpenVMS). |
62 | 62 | ||
63 | */ | 63 | */ |
64 | 64 | ||
@@ -66,29 +66,58 @@ | |||
66 | #include <stdio.h> | 66 | #include <stdio.h> |
67 | #include <errno.h> | 67 | #include <errno.h> |
68 | 68 | ||
69 | #ifndef WIN32 | 69 | #if defined(WIN32) |
70 | #ifdef __ultrix | 70 | # include <process.h> |
71 | #include <sys/syslog.h> | 71 | #elif defined(VMS) || defined(__VMS) |
72 | #else | 72 | # include <opcdef.h> |
73 | #include <syslog.h> | 73 | # include <descrip.h> |
74 | #endif | 74 | # include <lib$routines.h> |
75 | #else | 75 | # include <starlet.h> |
76 | #include <process.h> | 76 | #elif defined(__ultrix) |
77 | # include <sys/syslog.h> | ||
78 | #elif !defined(MSDOS) /* Unix */ | ||
79 | # include <syslog.h> | ||
77 | #endif | 80 | #endif |
78 | 81 | ||
79 | #include "cryptlib.h" | 82 | #include "cryptlib.h" |
80 | #include <openssl/buffer.h> | 83 | #include <openssl/buffer.h> |
81 | #include <openssl/err.h> | 84 | #include <openssl/err.h> |
85 | |||
82 | #ifndef NO_SYSLOG | 86 | #ifndef NO_SYSLOG |
83 | 87 | ||
88 | #if defined(WIN32) | ||
89 | #define LOG_EMERG 0 | ||
90 | #define LOG_ALERT 1 | ||
91 | #define LOG_CRIT 2 | ||
92 | #define LOG_ERR 3 | ||
93 | #define LOG_WARNING 4 | ||
94 | #define LOG_NOTICE 5 | ||
95 | #define LOG_INFO 6 | ||
96 | #define LOG_DEBUG 7 | ||
97 | |||
98 | #define LOG_DAEMON (3<<3) | ||
99 | #elif defined(VMS) | ||
100 | /* On VMS, we don't really care about these, but we need them to compile */ | ||
101 | #define LOG_EMERG 0 | ||
102 | #define LOG_ALERT 1 | ||
103 | #define LOG_CRIT 2 | ||
104 | #define LOG_ERR 3 | ||
105 | #define LOG_WARNING 4 | ||
106 | #define LOG_NOTICE 5 | ||
107 | #define LOG_INFO 6 | ||
108 | #define LOG_DEBUG 7 | ||
109 | |||
110 | #define LOG_DAEMON OPC$M_NM_NTWORK | ||
111 | #endif | ||
84 | 112 | ||
85 | static int MS_CALLBACK slg_write(BIO *h,char *buf,int num); | 113 | static int MS_CALLBACK slg_write(BIO *h,char *buf,int num); |
86 | static int MS_CALLBACK slg_puts(BIO *h,char *str); | 114 | static int MS_CALLBACK slg_puts(BIO *h,char *str); |
87 | static long MS_CALLBACK slg_ctrl(BIO *h,int cmd,long arg1,char *arg2); | 115 | static long MS_CALLBACK slg_ctrl(BIO *h,int cmd,long arg1,char *arg2); |
88 | static int MS_CALLBACK slg_new(BIO *h); | 116 | static int MS_CALLBACK slg_new(BIO *h); |
89 | static int MS_CALLBACK slg_free(BIO *data); | 117 | static int MS_CALLBACK slg_free(BIO *data); |
90 | static int xopenlog(BIO* bp, const char* name, int level); | 118 | static void xopenlog(BIO* bp, const char* name, int level); |
91 | static int xcloselog(BIO* bp); | 119 | static void xsyslog(BIO* bp, int priority, const char* string); |
120 | static void xcloselog(BIO* bp); | ||
92 | 121 | ||
93 | static BIO_METHOD methods_slg= | 122 | static BIO_METHOD methods_slg= |
94 | { | 123 | { |
@@ -113,11 +142,7 @@ static int MS_CALLBACK slg_new(BIO *bi) | |||
113 | bi->init=1; | 142 | bi->init=1; |
114 | bi->num=0; | 143 | bi->num=0; |
115 | bi->ptr=NULL; | 144 | bi->ptr=NULL; |
116 | #ifndef WIN32 | ||
117 | xopenlog(bi, "application", LOG_DAEMON); | 145 | xopenlog(bi, "application", LOG_DAEMON); |
118 | #else | ||
119 | xopenlog(bi, "application", 0); | ||
120 | #endif | ||
121 | return(1); | 146 | return(1); |
122 | } | 147 | } |
123 | 148 | ||
@@ -133,43 +158,14 @@ static int MS_CALLBACK slg_write(BIO *b, char *in, int inl) | |||
133 | int ret= inl; | 158 | int ret= inl; |
134 | char* buf= in; | 159 | char* buf= in; |
135 | char* pp; | 160 | char* pp; |
136 | #if defined(WIN32) | ||
137 | LPCSTR lpszStrings[2]; | ||
138 | WORD evtype= EVENTLOG_ERROR_TYPE; | ||
139 | int pid = _getpid(); | ||
140 | char pidbuf[20]; | ||
141 | #else | ||
142 | int priority; | 161 | int priority; |
143 | #endif | ||
144 | 162 | ||
145 | if((buf= (char *)Malloc(inl+ 1)) == NULL){ | 163 | if((buf= (char *)Malloc(inl+ 1)) == NULL){ |
146 | return(0); | 164 | return(0); |
147 | } | 165 | } |
148 | strncpy(buf, in, inl); | 166 | strncpy(buf, in, inl); |
149 | buf[inl]= '\0'; | 167 | buf[inl]= '\0'; |
150 | #if defined(WIN32) | ||
151 | if(strncmp(buf, "ERR ", 4) == 0){ | ||
152 | evtype= EVENTLOG_ERROR_TYPE; | ||
153 | pp= buf+ 4; | ||
154 | }else if(strncmp(buf, "WAR ", 4) == 0){ | ||
155 | evtype= EVENTLOG_WARNING_TYPE; | ||
156 | pp= buf+ 4; | ||
157 | }else if(strncmp(buf, "INF ", 4) == 0){ | ||
158 | evtype= EVENTLOG_INFORMATION_TYPE; | ||
159 | pp= buf+ 4; | ||
160 | }else{ | ||
161 | evtype= EVENTLOG_ERROR_TYPE; | ||
162 | pp= buf; | ||
163 | } | ||
164 | 168 | ||
165 | sprintf(pidbuf, "[%d] ", pid); | ||
166 | lpszStrings[0] = pidbuf; | ||
167 | lpszStrings[1] = pp; | ||
168 | |||
169 | if(b->ptr) | ||
170 | ReportEvent(b->ptr, evtype, 0, 1024, NULL, 2, 0, | ||
171 | lpszStrings, NULL); | ||
172 | #else | ||
173 | if(strncmp(buf, "ERR ", 4) == 0){ | 169 | if(strncmp(buf, "ERR ", 4) == 0){ |
174 | priority= LOG_ERR; | 170 | priority= LOG_ERR; |
175 | pp= buf+ 4; | 171 | pp= buf+ 4; |
@@ -184,8 +180,8 @@ static int MS_CALLBACK slg_write(BIO *b, char *in, int inl) | |||
184 | pp= buf; | 180 | pp= buf; |
185 | } | 181 | } |
186 | 182 | ||
187 | syslog(priority, "%s", pp); | 183 | xsyslog(b, priority, pp); |
188 | #endif | 184 | |
189 | Free(buf); | 185 | Free(buf); |
190 | return(ret); | 186 | return(ret); |
191 | } | 187 | } |
@@ -213,28 +209,128 @@ static int MS_CALLBACK slg_puts(BIO *bp, char *str) | |||
213 | return(ret); | 209 | return(ret); |
214 | } | 210 | } |
215 | 211 | ||
216 | static int xopenlog(BIO* bp, const char* name, int level) | ||
217 | { | ||
218 | #if defined(WIN32) | 212 | #if defined(WIN32) |
219 | if((bp->ptr= (char *)RegisterEventSource(NULL, name)) == NULL){ | 213 | |
220 | return(0); | 214 | static void xopenlog(BIO* bp, const char* name, int level) |
221 | } | 215 | { |
222 | #else | 216 | bp->ptr= (char *)RegisterEventSource(NULL, name); |
223 | openlog(name, LOG_PID|LOG_CONS, level); | ||
224 | #endif | ||
225 | return(1); | ||
226 | } | 217 | } |
227 | 218 | ||
228 | static int xcloselog(BIO* bp) | 219 | static void xsyslog(BIO *bp, int priority, const char *string) |
220 | { | ||
221 | LPCSTR lpszStrings[2]; | ||
222 | WORD evtype= EVENTLOG_ERROR_TYPE; | ||
223 | int pid = _getpid(); | ||
224 | char pidbuf[20]; | ||
225 | |||
226 | switch (priority) | ||
227 | { | ||
228 | case LOG_ERR: | ||
229 | evtype = EVENTLOG_ERROR_TYPE; | ||
230 | break; | ||
231 | case LOG_WARNING: | ||
232 | evtype = EVENTLOG_WARNING_TYPE; | ||
233 | break; | ||
234 | case LOG_INFO: | ||
235 | evtype = EVENTLOG_INFORMATION_TYPE; | ||
236 | break; | ||
237 | default: | ||
238 | evtype = EVENTLOG_ERROR_TYPE; | ||
239 | break; | ||
240 | } | ||
241 | |||
242 | sprintf(pidbuf, "[%d] ", pid); | ||
243 | lpszStrings[0] = pidbuf; | ||
244 | lpszStrings[1] = string; | ||
245 | |||
246 | if(bp->ptr) | ||
247 | ReportEvent(bp->ptr, evtype, 0, 1024, NULL, 2, 0, | ||
248 | lpszStrings, NULL); | ||
249 | } | ||
250 | |||
251 | static void xcloselog(BIO* bp) | ||
229 | { | 252 | { |
230 | #if defined(WIN32) | ||
231 | if(bp->ptr) | 253 | if(bp->ptr) |
232 | DeregisterEventSource((HANDLE)(bp->ptr)); | 254 | DeregisterEventSource((HANDLE)(bp->ptr)); |
233 | bp->ptr= NULL; | 255 | bp->ptr= NULL; |
234 | #else | 256 | } |
257 | |||
258 | #elif defined(VMS) | ||
259 | |||
260 | static int VMS_OPC_target = LOG_DAEMON; | ||
261 | |||
262 | static void xopenlog(BIO* bp, const char* name, int level) | ||
263 | { | ||
264 | VMS_OPC_target = level; | ||
265 | } | ||
266 | |||
267 | static void xsyslog(BIO *bp, int priority, const char *string) | ||
268 | { | ||
269 | struct dsc$descriptor_s opc_dsc; | ||
270 | struct opcdef *opcdef_p; | ||
271 | char buf[10240]; | ||
272 | unsigned int len; | ||
273 | struct dsc$descriptor_s buf_dsc; | ||
274 | $DESCRIPTOR(fao_cmd, "!AZ: !AZ"); | ||
275 | char *priority_tag; | ||
276 | |||
277 | switch (priority) | ||
278 | { | ||
279 | case LOG_EMERG: priority_tag = "Emergency"; break; | ||
280 | case LOG_ALERT: priority_tag = "Alert"; break; | ||
281 | case LOG_CRIT: priority_tag = "Critical"; break; | ||
282 | case LOG_ERR: priority_tag = "Error"; break; | ||
283 | case LOG_WARNING: priority_tag = "Warning"; break; | ||
284 | case LOG_NOTICE: priority_tag = "Notice"; break; | ||
285 | case LOG_INFO: priority_tag = "Info"; break; | ||
286 | case LOG_DEBUG: priority_tag = "DEBUG"; break; | ||
287 | } | ||
288 | |||
289 | buf_dsc.dsc$b_dtype = DSC$K_DTYPE_T; | ||
290 | buf_dsc.dsc$b_class = DSC$K_CLASS_S; | ||
291 | buf_dsc.dsc$a_pointer = buf; | ||
292 | buf_dsc.dsc$w_length = sizeof(buf) - 1; | ||
293 | |||
294 | lib$sys_fao(&fao_cmd, &len, &buf_dsc, priority_tag, string); | ||
295 | |||
296 | /* we know there's an 8 byte header. That's documented */ | ||
297 | opcdef_p = (struct opcdef *) Malloc(8 + len); | ||
298 | opcdef_p->opc$b_ms_type = OPC$_RQ_RQST; | ||
299 | memcpy(opcdef_p->opc$z_ms_target_classes, &VMS_OPC_target, 3); | ||
300 | opcdef_p->opc$l_ms_rqstid = 0; | ||
301 | memcpy(&opcdef_p->opc$l_ms_text, buf, len); | ||
302 | |||
303 | opc_dsc.dsc$b_dtype = DSC$K_DTYPE_T; | ||
304 | opc_dsc.dsc$b_class = DSC$K_CLASS_S; | ||
305 | opc_dsc.dsc$a_pointer = (char *)opcdef_p; | ||
306 | opc_dsc.dsc$w_length = len + 8; | ||
307 | |||
308 | sys$sndopr(opc_dsc, 0); | ||
309 | |||
310 | Free(opcdef_p); | ||
311 | } | ||
312 | |||
313 | static void xcloselog(BIO* bp) | ||
314 | { | ||
315 | } | ||
316 | |||
317 | #else /* Unix */ | ||
318 | |||
319 | static void xopenlog(BIO* bp, const char* name, int level) | ||
320 | { | ||
321 | openlog(name, LOG_PID|LOG_CONS, level); | ||
322 | } | ||
323 | |||
324 | static void xsyslog(BIO *bp, int priority, const char *string) | ||
325 | { | ||
326 | syslog(priority, "%s", string); | ||
327 | } | ||
328 | |||
329 | static void xcloselog(BIO* bp) | ||
330 | { | ||
235 | closelog(); | 331 | closelog(); |
236 | #endif | ||
237 | return(1); | ||
238 | } | 332 | } |
239 | 333 | ||
240 | #endif | 334 | #endif /* Unix */ |
335 | |||
336 | #endif /* NO_SYSLOG */ | ||
diff --git a/src/lib/libssl/src/crypto/bn/Makefile.ssl b/src/lib/libssl/src/crypto/bn/Makefile.ssl index fa23a43fa0..beb9c1b523 100644 --- a/src/lib/libssl/src/crypto/bn/Makefile.ssl +++ b/src/lib/libssl/src/crypto/bn/Makefile.ssl | |||
@@ -5,6 +5,7 @@ | |||
5 | DIR= bn | 5 | DIR= bn |
6 | TOP= ../.. | 6 | TOP= ../.. |
7 | CC= cc | 7 | CC= cc |
8 | CPP= $(CC) -E | ||
8 | INCLUDES= -I.. -I../../include | 9 | INCLUDES= -I.. -I../../include |
9 | CFLAG=-g | 10 | CFLAG=-g |
10 | INSTALL_PREFIX= | 11 | INSTALL_PREFIX= |
@@ -72,10 +73,10 @@ lib: $(LIBOBJ) | |||
72 | 73 | ||
73 | # elf | 74 | # elf |
74 | asm/bn86-elf.o: asm/bn86unix.cpp | 75 | asm/bn86-elf.o: asm/bn86unix.cpp |
75 | $(CPP) -DELF asm/bn86unix.cpp | as -o asm/bn86-elf.o | 76 | $(CPP) -DELF -x c asm/bn86unix.cpp | as -o asm/bn86-elf.o |
76 | 77 | ||
77 | asm/co86-elf.o: asm/co86unix.cpp | 78 | asm/co86-elf.o: asm/co86unix.cpp |
78 | $(CPP) -DELF asm/co86unix.cpp | as -o asm/co86-elf.o | 79 | $(CPP) -DELF -x c asm/co86unix.cpp | as -o asm/co86-elf.o |
79 | 80 | ||
80 | # solaris | 81 | # solaris |
81 | asm/bn86-sol.o: asm/bn86unix.cpp | 82 | asm/bn86-sol.o: asm/bn86unix.cpp |
@@ -102,10 +103,10 @@ asm/bn86bsdi.o: asm/bn86unix.cpp | |||
102 | asm/co86bsdi.o: asm/co86unix.cpp | 103 | asm/co86bsdi.o: asm/co86unix.cpp |
103 | $(CPP) -DBSDI asm/co86unix.cpp | sed 's/ :/:/' | as -o asm/co86bsdi.o | 104 | $(CPP) -DBSDI asm/co86unix.cpp | sed 's/ :/:/' | as -o asm/co86bsdi.o |
104 | 105 | ||
105 | asm/bn86unix.cpp: asm/bn-586.pl | 106 | asm/bn86unix.cpp: asm/bn-586.pl ../perlasm/x86asm.pl |
106 | (cd asm; $(PERL) bn-586.pl cpp >bn86unix.cpp ) | 107 | (cd asm; $(PERL) bn-586.pl cpp >bn86unix.cpp ) |
107 | 108 | ||
108 | asm/co86unix.cpp: asm/co-586.pl | 109 | asm/co86unix.cpp: asm/co-586.pl ../perlasm/x86asm.pl |
109 | (cd asm; $(PERL) co-586.pl cpp >co86unix.cpp ) | 110 | (cd asm; $(PERL) co-586.pl cpp >co86unix.cpp ) |
110 | 111 | ||
111 | asm/sparcv8.o: asm/sparcv8.S | 112 | asm/sparcv8.o: asm/sparcv8.S |
diff --git a/src/lib/libssl/src/crypto/bn/asm/bn-win32.asm b/src/lib/libssl/src/crypto/bn/asm/bn-win32.asm index 871bd88d77..e69de29bb2 100644 --- a/src/lib/libssl/src/crypto/bn/asm/bn-win32.asm +++ b/src/lib/libssl/src/crypto/bn/asm/bn-win32.asm | |||
@@ -1,2122 +0,0 @@ | |||
1 | ; Don't even think of reading this code | ||
2 | ; It was automatically generated by bn-586.pl | ||
3 | ; Which is a perl program used to generate the x86 assember for | ||
4 | ; any of elf, a.out, BSDI,Win32, or Solaris | ||
5 | ; eric <eay@cryptsoft.com> | ||
6 | ; | ||
7 | TITLE bn-586.asm | ||
8 | .386 | ||
9 | .model FLAT | ||
10 | _TEXT SEGMENT | ||
11 | PUBLIC _bn_mul_add_words | ||
12 | |||
13 | _bn_mul_add_words PROC NEAR | ||
14 | push ebp | ||
15 | push ebx | ||
16 | push esi | ||
17 | push edi | ||
18 | ; | ||
19 | xor esi, esi | ||
20 | mov edi, DWORD PTR 20[esp] | ||
21 | mov ecx, DWORD PTR 28[esp] | ||
22 | mov ebx, DWORD PTR 24[esp] | ||
23 | and ecx, 4294967288 | ||
24 | mov ebp, DWORD PTR 32[esp] | ||
25 | push ecx | ||
26 | jz $L000maw_finish | ||
27 | L001maw_loop: | ||
28 | mov DWORD PTR [esp],ecx | ||
29 | ; Round 0 | ||
30 | mov eax, DWORD PTR [ebx] | ||
31 | mul ebp | ||
32 | add eax, esi | ||
33 | mov esi, DWORD PTR [edi] | ||
34 | adc edx, 0 | ||
35 | add eax, esi | ||
36 | adc edx, 0 | ||
37 | mov DWORD PTR [edi],eax | ||
38 | mov esi, edx | ||
39 | ; Round 4 | ||
40 | mov eax, DWORD PTR 4[ebx] | ||
41 | mul ebp | ||
42 | add eax, esi | ||
43 | mov esi, DWORD PTR 4[edi] | ||
44 | adc edx, 0 | ||
45 | add eax, esi | ||
46 | adc edx, 0 | ||
47 | mov DWORD PTR 4[edi],eax | ||
48 | mov esi, edx | ||
49 | ; Round 8 | ||
50 | mov eax, DWORD PTR 8[ebx] | ||
51 | mul ebp | ||
52 | add eax, esi | ||
53 | mov esi, DWORD PTR 8[edi] | ||
54 | adc edx, 0 | ||
55 | add eax, esi | ||
56 | adc edx, 0 | ||
57 | mov DWORD PTR 8[edi],eax | ||
58 | mov esi, edx | ||
59 | ; Round 12 | ||
60 | mov eax, DWORD PTR 12[ebx] | ||
61 | mul ebp | ||
62 | add eax, esi | ||
63 | mov esi, DWORD PTR 12[edi] | ||
64 | adc edx, 0 | ||
65 | add eax, esi | ||
66 | adc edx, 0 | ||
67 | mov DWORD PTR 12[edi],eax | ||
68 | mov esi, edx | ||
69 | ; Round 16 | ||
70 | mov eax, DWORD PTR 16[ebx] | ||
71 | mul ebp | ||
72 | add eax, esi | ||
73 | mov esi, DWORD PTR 16[edi] | ||
74 | adc edx, 0 | ||
75 | add eax, esi | ||
76 | adc edx, 0 | ||
77 | mov DWORD PTR 16[edi],eax | ||
78 | mov esi, edx | ||
79 | ; Round 20 | ||
80 | mov eax, DWORD PTR 20[ebx] | ||
81 | mul ebp | ||
82 | add eax, esi | ||
83 | mov esi, DWORD PTR 20[edi] | ||
84 | adc edx, 0 | ||
85 | add eax, esi | ||
86 | adc edx, 0 | ||
87 | mov DWORD PTR 20[edi],eax | ||
88 | mov esi, edx | ||
89 | ; Round 24 | ||
90 | mov eax, DWORD PTR 24[ebx] | ||
91 | mul ebp | ||
92 | add eax, esi | ||
93 | mov esi, DWORD PTR 24[edi] | ||
94 | adc edx, 0 | ||
95 | add eax, esi | ||
96 | adc edx, 0 | ||
97 | mov DWORD PTR 24[edi],eax | ||
98 | mov esi, edx | ||
99 | ; Round 28 | ||
100 | mov eax, DWORD PTR 28[ebx] | ||
101 | mul ebp | ||
102 | add eax, esi | ||
103 | mov esi, DWORD PTR 28[edi] | ||
104 | adc edx, 0 | ||
105 | add eax, esi | ||
106 | adc edx, 0 | ||
107 | mov DWORD PTR 28[edi],eax | ||
108 | mov esi, edx | ||
109 | ; | ||
110 | mov ecx, DWORD PTR [esp] | ||
111 | add ebx, 32 | ||
112 | add edi, 32 | ||
113 | sub ecx, 8 | ||
114 | jnz L001maw_loop | ||
115 | $L000maw_finish: | ||
116 | mov ecx, DWORD PTR 32[esp] | ||
117 | and ecx, 7 | ||
118 | jnz $L002maw_finish2 | ||
119 | jmp $L003maw_end | ||
120 | $L002maw_finish2: | ||
121 | ; Tail Round 0 | ||
122 | mov eax, DWORD PTR [ebx] | ||
123 | mul ebp | ||
124 | add eax, esi | ||
125 | mov esi, DWORD PTR [edi] | ||
126 | adc edx, 0 | ||
127 | add eax, esi | ||
128 | adc edx, 0 | ||
129 | dec ecx | ||
130 | mov DWORD PTR [edi],eax | ||
131 | mov esi, edx | ||
132 | jz $L003maw_end | ||
133 | ; Tail Round 1 | ||
134 | mov eax, DWORD PTR 4[ebx] | ||
135 | mul ebp | ||
136 | add eax, esi | ||
137 | mov esi, DWORD PTR 4[edi] | ||
138 | adc edx, 0 | ||
139 | add eax, esi | ||
140 | adc edx, 0 | ||
141 | dec ecx | ||
142 | mov DWORD PTR 4[edi],eax | ||
143 | mov esi, edx | ||
144 | jz $L003maw_end | ||
145 | ; Tail Round 2 | ||
146 | mov eax, DWORD PTR 8[ebx] | ||
147 | mul ebp | ||
148 | add eax, esi | ||
149 | mov esi, DWORD PTR 8[edi] | ||
150 | adc edx, 0 | ||
151 | add eax, esi | ||
152 | adc edx, 0 | ||
153 | dec ecx | ||
154 | mov DWORD PTR 8[edi],eax | ||
155 | mov esi, edx | ||
156 | jz $L003maw_end | ||
157 | ; Tail Round 3 | ||
158 | mov eax, DWORD PTR 12[ebx] | ||
159 | mul ebp | ||
160 | add eax, esi | ||
161 | mov esi, DWORD PTR 12[edi] | ||
162 | adc edx, 0 | ||
163 | add eax, esi | ||
164 | adc edx, 0 | ||
165 | dec ecx | ||
166 | mov DWORD PTR 12[edi],eax | ||
167 | mov esi, edx | ||
168 | jz $L003maw_end | ||
169 | ; Tail Round 4 | ||
170 | mov eax, DWORD PTR 16[ebx] | ||
171 | mul ebp | ||
172 | add eax, esi | ||
173 | mov esi, DWORD PTR 16[edi] | ||
174 | adc edx, 0 | ||
175 | add eax, esi | ||
176 | adc edx, 0 | ||
177 | dec ecx | ||
178 | mov DWORD PTR 16[edi],eax | ||
179 | mov esi, edx | ||
180 | jz $L003maw_end | ||
181 | ; Tail Round 5 | ||
182 | mov eax, DWORD PTR 20[ebx] | ||
183 | mul ebp | ||
184 | add eax, esi | ||
185 | mov esi, DWORD PTR 20[edi] | ||
186 | adc edx, 0 | ||
187 | add eax, esi | ||
188 | adc edx, 0 | ||
189 | dec ecx | ||
190 | mov DWORD PTR 20[edi],eax | ||
191 | mov esi, edx | ||
192 | jz $L003maw_end | ||
193 | ; Tail Round 6 | ||
194 | mov eax, DWORD PTR 24[ebx] | ||
195 | mul ebp | ||
196 | add eax, esi | ||
197 | mov esi, DWORD PTR 24[edi] | ||
198 | adc edx, 0 | ||
199 | add eax, esi | ||
200 | adc edx, 0 | ||
201 | mov DWORD PTR 24[edi],eax | ||
202 | mov esi, edx | ||
203 | $L003maw_end: | ||
204 | mov eax, esi | ||
205 | pop ecx | ||
206 | pop edi | ||
207 | pop esi | ||
208 | pop ebx | ||
209 | pop ebp | ||
210 | ret | ||
211 | _bn_mul_add_words ENDP | ||
212 | _TEXT ENDS | ||
213 | _TEXT SEGMENT | ||
214 | PUBLIC _bn_mul_words | ||
215 | |||
216 | _bn_mul_words PROC NEAR | ||
217 | push ebp | ||
218 | push ebx | ||
219 | push esi | ||
220 | push edi | ||
221 | ; | ||
222 | xor esi, esi | ||
223 | mov edi, DWORD PTR 20[esp] | ||
224 | mov ebx, DWORD PTR 24[esp] | ||
225 | mov ebp, DWORD PTR 28[esp] | ||
226 | mov ecx, DWORD PTR 32[esp] | ||
227 | and ebp, 4294967288 | ||
228 | jz $L004mw_finish | ||
229 | L005mw_loop: | ||
230 | ; Round 0 | ||
231 | mov eax, DWORD PTR [ebx] | ||
232 | mul ecx | ||
233 | add eax, esi | ||
234 | adc edx, 0 | ||
235 | mov DWORD PTR [edi],eax | ||
236 | mov esi, edx | ||
237 | ; Round 4 | ||
238 | mov eax, DWORD PTR 4[ebx] | ||
239 | mul ecx | ||
240 | add eax, esi | ||
241 | adc edx, 0 | ||
242 | mov DWORD PTR 4[edi],eax | ||
243 | mov esi, edx | ||
244 | ; Round 8 | ||
245 | mov eax, DWORD PTR 8[ebx] | ||
246 | mul ecx | ||
247 | add eax, esi | ||
248 | adc edx, 0 | ||
249 | mov DWORD PTR 8[edi],eax | ||
250 | mov esi, edx | ||
251 | ; Round 12 | ||
252 | mov eax, DWORD PTR 12[ebx] | ||
253 | mul ecx | ||
254 | add eax, esi | ||
255 | adc edx, 0 | ||
256 | mov DWORD PTR 12[edi],eax | ||
257 | mov esi, edx | ||
258 | ; Round 16 | ||
259 | mov eax, DWORD PTR 16[ebx] | ||
260 | mul ecx | ||
261 | add eax, esi | ||
262 | adc edx, 0 | ||
263 | mov DWORD PTR 16[edi],eax | ||
264 | mov esi, edx | ||
265 | ; Round 20 | ||
266 | mov eax, DWORD PTR 20[ebx] | ||
267 | mul ecx | ||
268 | add eax, esi | ||
269 | adc edx, 0 | ||
270 | mov DWORD PTR 20[edi],eax | ||
271 | mov esi, edx | ||
272 | ; Round 24 | ||
273 | mov eax, DWORD PTR 24[ebx] | ||
274 | mul ecx | ||
275 | add eax, esi | ||
276 | adc edx, 0 | ||
277 | mov DWORD PTR 24[edi],eax | ||
278 | mov esi, edx | ||
279 | ; Round 28 | ||
280 | mov eax, DWORD PTR 28[ebx] | ||
281 | mul ecx | ||
282 | add eax, esi | ||
283 | adc edx, 0 | ||
284 | mov DWORD PTR 28[edi],eax | ||
285 | mov esi, edx | ||
286 | ; | ||
287 | add ebx, 32 | ||
288 | add edi, 32 | ||
289 | sub ebp, 8 | ||
290 | jz $L004mw_finish | ||
291 | jmp L005mw_loop | ||
292 | $L004mw_finish: | ||
293 | mov ebp, DWORD PTR 28[esp] | ||
294 | and ebp, 7 | ||
295 | jnz $L006mw_finish2 | ||
296 | jmp $L007mw_end | ||
297 | $L006mw_finish2: | ||
298 | ; Tail Round 0 | ||
299 | mov eax, DWORD PTR [ebx] | ||
300 | mul ecx | ||
301 | add eax, esi | ||
302 | adc edx, 0 | ||
303 | mov DWORD PTR [edi],eax | ||
304 | mov esi, edx | ||
305 | dec ebp | ||
306 | jz $L007mw_end | ||
307 | ; Tail Round 1 | ||
308 | mov eax, DWORD PTR 4[ebx] | ||
309 | mul ecx | ||
310 | add eax, esi | ||
311 | adc edx, 0 | ||
312 | mov DWORD PTR 4[edi],eax | ||
313 | mov esi, edx | ||
314 | dec ebp | ||
315 | jz $L007mw_end | ||
316 | ; Tail Round 2 | ||
317 | mov eax, DWORD PTR 8[ebx] | ||
318 | mul ecx | ||
319 | add eax, esi | ||
320 | adc edx, 0 | ||
321 | mov DWORD PTR 8[edi],eax | ||
322 | mov esi, edx | ||
323 | dec ebp | ||
324 | jz $L007mw_end | ||
325 | ; Tail Round 3 | ||
326 | mov eax, DWORD PTR 12[ebx] | ||
327 | mul ecx | ||
328 | add eax, esi | ||
329 | adc edx, 0 | ||
330 | mov DWORD PTR 12[edi],eax | ||
331 | mov esi, edx | ||
332 | dec ebp | ||
333 | jz $L007mw_end | ||
334 | ; Tail Round 4 | ||
335 | mov eax, DWORD PTR 16[ebx] | ||
336 | mul ecx | ||
337 | add eax, esi | ||
338 | adc edx, 0 | ||
339 | mov DWORD PTR 16[edi],eax | ||
340 | mov esi, edx | ||
341 | dec ebp | ||
342 | jz $L007mw_end | ||
343 | ; Tail Round 5 | ||
344 | mov eax, DWORD PTR 20[ebx] | ||
345 | mul ecx | ||
346 | add eax, esi | ||
347 | adc edx, 0 | ||
348 | mov DWORD PTR 20[edi],eax | ||
349 | mov esi, edx | ||
350 | dec ebp | ||
351 | jz $L007mw_end | ||
352 | ; Tail Round 6 | ||
353 | mov eax, DWORD PTR 24[ebx] | ||
354 | mul ecx | ||
355 | add eax, esi | ||
356 | adc edx, 0 | ||
357 | mov DWORD PTR 24[edi],eax | ||
358 | mov esi, edx | ||
359 | $L007mw_end: | ||
360 | mov eax, esi | ||
361 | pop edi | ||
362 | pop esi | ||
363 | pop ebx | ||
364 | pop ebp | ||
365 | ret | ||
366 | _bn_mul_words ENDP | ||
367 | _TEXT ENDS | ||
368 | _TEXT SEGMENT | ||
369 | PUBLIC _bn_sqr_words | ||
370 | |||
371 | _bn_sqr_words PROC NEAR | ||
372 | push ebp | ||
373 | push ebx | ||
374 | push esi | ||
375 | push edi | ||
376 | ; | ||
377 | mov esi, DWORD PTR 20[esp] | ||
378 | mov edi, DWORD PTR 24[esp] | ||
379 | mov ebx, DWORD PTR 28[esp] | ||
380 | and ebx, 4294967288 | ||
381 | jz $L008sw_finish | ||
382 | L009sw_loop: | ||
383 | ; Round 0 | ||
384 | mov eax, DWORD PTR [edi] | ||
385 | mul eax | ||
386 | mov DWORD PTR [esi],eax | ||
387 | mov DWORD PTR 4[esi],edx | ||
388 | ; Round 4 | ||
389 | mov eax, DWORD PTR 4[edi] | ||
390 | mul eax | ||
391 | mov DWORD PTR 8[esi],eax | ||
392 | mov DWORD PTR 12[esi],edx | ||
393 | ; Round 8 | ||
394 | mov eax, DWORD PTR 8[edi] | ||
395 | mul eax | ||
396 | mov DWORD PTR 16[esi],eax | ||
397 | mov DWORD PTR 20[esi],edx | ||
398 | ; Round 12 | ||
399 | mov eax, DWORD PTR 12[edi] | ||
400 | mul eax | ||
401 | mov DWORD PTR 24[esi],eax | ||
402 | mov DWORD PTR 28[esi],edx | ||
403 | ; Round 16 | ||
404 | mov eax, DWORD PTR 16[edi] | ||
405 | mul eax | ||
406 | mov DWORD PTR 32[esi],eax | ||
407 | mov DWORD PTR 36[esi],edx | ||
408 | ; Round 20 | ||
409 | mov eax, DWORD PTR 20[edi] | ||
410 | mul eax | ||
411 | mov DWORD PTR 40[esi],eax | ||
412 | mov DWORD PTR 44[esi],edx | ||
413 | ; Round 24 | ||
414 | mov eax, DWORD PTR 24[edi] | ||
415 | mul eax | ||
416 | mov DWORD PTR 48[esi],eax | ||
417 | mov DWORD PTR 52[esi],edx | ||
418 | ; Round 28 | ||
419 | mov eax, DWORD PTR 28[edi] | ||
420 | mul eax | ||
421 | mov DWORD PTR 56[esi],eax | ||
422 | mov DWORD PTR 60[esi],edx | ||
423 | ; | ||
424 | add edi, 32 | ||
425 | add esi, 64 | ||
426 | sub ebx, 8 | ||
427 | jnz L009sw_loop | ||
428 | $L008sw_finish: | ||
429 | mov ebx, DWORD PTR 28[esp] | ||
430 | and ebx, 7 | ||
431 | jz $L010sw_end | ||
432 | ; Tail Round 0 | ||
433 | mov eax, DWORD PTR [edi] | ||
434 | mul eax | ||
435 | mov DWORD PTR [esi],eax | ||
436 | dec ebx | ||
437 | mov DWORD PTR 4[esi],edx | ||
438 | jz $L010sw_end | ||
439 | ; Tail Round 1 | ||
440 | mov eax, DWORD PTR 4[edi] | ||
441 | mul eax | ||
442 | mov DWORD PTR 8[esi],eax | ||
443 | dec ebx | ||
444 | mov DWORD PTR 12[esi],edx | ||
445 | jz $L010sw_end | ||
446 | ; Tail Round 2 | ||
447 | mov eax, DWORD PTR 8[edi] | ||
448 | mul eax | ||
449 | mov DWORD PTR 16[esi],eax | ||
450 | dec ebx | ||
451 | mov DWORD PTR 20[esi],edx | ||
452 | jz $L010sw_end | ||
453 | ; Tail Round 3 | ||
454 | mov eax, DWORD PTR 12[edi] | ||
455 | mul eax | ||
456 | mov DWORD PTR 24[esi],eax | ||
457 | dec ebx | ||
458 | mov DWORD PTR 28[esi],edx | ||
459 | jz $L010sw_end | ||
460 | ; Tail Round 4 | ||
461 | mov eax, DWORD PTR 16[edi] | ||
462 | mul eax | ||
463 | mov DWORD PTR 32[esi],eax | ||
464 | dec ebx | ||
465 | mov DWORD PTR 36[esi],edx | ||
466 | jz $L010sw_end | ||
467 | ; Tail Round 5 | ||
468 | mov eax, DWORD PTR 20[edi] | ||
469 | mul eax | ||
470 | mov DWORD PTR 40[esi],eax | ||
471 | dec ebx | ||
472 | mov DWORD PTR 44[esi],edx | ||
473 | jz $L010sw_end | ||
474 | ; Tail Round 6 | ||
475 | mov eax, DWORD PTR 24[edi] | ||
476 | mul eax | ||
477 | mov DWORD PTR 48[esi],eax | ||
478 | mov DWORD PTR 52[esi],edx | ||
479 | $L010sw_end: | ||
480 | pop edi | ||
481 | pop esi | ||
482 | pop ebx | ||
483 | pop ebp | ||
484 | ret | ||
485 | _bn_sqr_words ENDP | ||
486 | _TEXT ENDS | ||
487 | _TEXT SEGMENT | ||
488 | PUBLIC _bn_div_words | ||
489 | |||
490 | _bn_div_words PROC NEAR | ||
491 | push ebp | ||
492 | push ebx | ||
493 | push esi | ||
494 | push edi | ||
495 | mov edx, DWORD PTR 20[esp] | ||
496 | mov eax, DWORD PTR 24[esp] | ||
497 | mov ebx, DWORD PTR 28[esp] | ||
498 | div ebx | ||
499 | pop edi | ||
500 | pop esi | ||
501 | pop ebx | ||
502 | pop ebp | ||
503 | ret | ||
504 | _bn_div_words ENDP | ||
505 | _TEXT ENDS | ||
506 | _TEXT SEGMENT | ||
507 | PUBLIC _bn_add_words | ||
508 | |||
509 | _bn_add_words PROC NEAR | ||
510 | push ebp | ||
511 | push ebx | ||
512 | push esi | ||
513 | push edi | ||
514 | ; | ||
515 | mov ebx, DWORD PTR 20[esp] | ||
516 | mov esi, DWORD PTR 24[esp] | ||
517 | mov edi, DWORD PTR 28[esp] | ||
518 | mov ebp, DWORD PTR 32[esp] | ||
519 | xor eax, eax | ||
520 | and ebp, 4294967288 | ||
521 | jz $L011aw_finish | ||
522 | L012aw_loop: | ||
523 | ; Round 0 | ||
524 | mov ecx, DWORD PTR [esi] | ||
525 | mov edx, DWORD PTR [edi] | ||
526 | add ecx, eax | ||
527 | mov eax, 0 | ||
528 | adc eax, eax | ||
529 | add ecx, edx | ||
530 | adc eax, 0 | ||
531 | mov DWORD PTR [ebx],ecx | ||
532 | ; Round 1 | ||
533 | mov ecx, DWORD PTR 4[esi] | ||
534 | mov edx, DWORD PTR 4[edi] | ||
535 | add ecx, eax | ||
536 | mov eax, 0 | ||
537 | adc eax, eax | ||
538 | add ecx, edx | ||
539 | adc eax, 0 | ||
540 | mov DWORD PTR 4[ebx],ecx | ||
541 | ; Round 2 | ||
542 | mov ecx, DWORD PTR 8[esi] | ||
543 | mov edx, DWORD PTR 8[edi] | ||
544 | add ecx, eax | ||
545 | mov eax, 0 | ||
546 | adc eax, eax | ||
547 | add ecx, edx | ||
548 | adc eax, 0 | ||
549 | mov DWORD PTR 8[ebx],ecx | ||
550 | ; Round 3 | ||
551 | mov ecx, DWORD PTR 12[esi] | ||
552 | mov edx, DWORD PTR 12[edi] | ||
553 | add ecx, eax | ||
554 | mov eax, 0 | ||
555 | adc eax, eax | ||
556 | add ecx, edx | ||
557 | adc eax, 0 | ||
558 | mov DWORD PTR 12[ebx],ecx | ||
559 | ; Round 4 | ||
560 | mov ecx, DWORD PTR 16[esi] | ||
561 | mov edx, DWORD PTR 16[edi] | ||
562 | add ecx, eax | ||
563 | mov eax, 0 | ||
564 | adc eax, eax | ||
565 | add ecx, edx | ||
566 | adc eax, 0 | ||
567 | mov DWORD PTR 16[ebx],ecx | ||
568 | ; Round 5 | ||
569 | mov ecx, DWORD PTR 20[esi] | ||
570 | mov edx, DWORD PTR 20[edi] | ||
571 | add ecx, eax | ||
572 | mov eax, 0 | ||
573 | adc eax, eax | ||
574 | add ecx, edx | ||
575 | adc eax, 0 | ||
576 | mov DWORD PTR 20[ebx],ecx | ||
577 | ; Round 6 | ||
578 | mov ecx, DWORD PTR 24[esi] | ||
579 | mov edx, DWORD PTR 24[edi] | ||
580 | add ecx, eax | ||
581 | mov eax, 0 | ||
582 | adc eax, eax | ||
583 | add ecx, edx | ||
584 | adc eax, 0 | ||
585 | mov DWORD PTR 24[ebx],ecx | ||
586 | ; Round 7 | ||
587 | mov ecx, DWORD PTR 28[esi] | ||
588 | mov edx, DWORD PTR 28[edi] | ||
589 | add ecx, eax | ||
590 | mov eax, 0 | ||
591 | adc eax, eax | ||
592 | add ecx, edx | ||
593 | adc eax, 0 | ||
594 | mov DWORD PTR 28[ebx],ecx | ||
595 | ; | ||
596 | add esi, 32 | ||
597 | add edi, 32 | ||
598 | add ebx, 32 | ||
599 | sub ebp, 8 | ||
600 | jnz L012aw_loop | ||
601 | $L011aw_finish: | ||
602 | mov ebp, DWORD PTR 32[esp] | ||
603 | and ebp, 7 | ||
604 | jz $L013aw_end | ||
605 | ; Tail Round 0 | ||
606 | mov ecx, DWORD PTR [esi] | ||
607 | mov edx, DWORD PTR [edi] | ||
608 | add ecx, eax | ||
609 | mov eax, 0 | ||
610 | adc eax, eax | ||
611 | add ecx, edx | ||
612 | adc eax, 0 | ||
613 | dec ebp | ||
614 | mov DWORD PTR [ebx],ecx | ||
615 | jz $L013aw_end | ||
616 | ; Tail Round 1 | ||
617 | mov ecx, DWORD PTR 4[esi] | ||
618 | mov edx, DWORD PTR 4[edi] | ||
619 | add ecx, eax | ||
620 | mov eax, 0 | ||
621 | adc eax, eax | ||
622 | add ecx, edx | ||
623 | adc eax, 0 | ||
624 | dec ebp | ||
625 | mov DWORD PTR 4[ebx],ecx | ||
626 | jz $L013aw_end | ||
627 | ; Tail Round 2 | ||
628 | mov ecx, DWORD PTR 8[esi] | ||
629 | mov edx, DWORD PTR 8[edi] | ||
630 | add ecx, eax | ||
631 | mov eax, 0 | ||
632 | adc eax, eax | ||
633 | add ecx, edx | ||
634 | adc eax, 0 | ||
635 | dec ebp | ||
636 | mov DWORD PTR 8[ebx],ecx | ||
637 | jz $L013aw_end | ||
638 | ; Tail Round 3 | ||
639 | mov ecx, DWORD PTR 12[esi] | ||
640 | mov edx, DWORD PTR 12[edi] | ||
641 | add ecx, eax | ||
642 | mov eax, 0 | ||
643 | adc eax, eax | ||
644 | add ecx, edx | ||
645 | adc eax, 0 | ||
646 | dec ebp | ||
647 | mov DWORD PTR 12[ebx],ecx | ||
648 | jz $L013aw_end | ||
649 | ; Tail Round 4 | ||
650 | mov ecx, DWORD PTR 16[esi] | ||
651 | mov edx, DWORD PTR 16[edi] | ||
652 | add ecx, eax | ||
653 | mov eax, 0 | ||
654 | adc eax, eax | ||
655 | add ecx, edx | ||
656 | adc eax, 0 | ||
657 | dec ebp | ||
658 | mov DWORD PTR 16[ebx],ecx | ||
659 | jz $L013aw_end | ||
660 | ; Tail Round 5 | ||
661 | mov ecx, DWORD PTR 20[esi] | ||
662 | mov edx, DWORD PTR 20[edi] | ||
663 | add ecx, eax | ||
664 | mov eax, 0 | ||
665 | adc eax, eax | ||
666 | add ecx, edx | ||
667 | adc eax, 0 | ||
668 | dec ebp | ||
669 | mov DWORD PTR 20[ebx],ecx | ||
670 | jz $L013aw_end | ||
671 | ; Tail Round 6 | ||
672 | mov ecx, DWORD PTR 24[esi] | ||
673 | mov edx, DWORD PTR 24[edi] | ||
674 | add ecx, eax | ||
675 | mov eax, 0 | ||
676 | adc eax, eax | ||
677 | add ecx, edx | ||
678 | adc eax, 0 | ||
679 | mov DWORD PTR 24[ebx],ecx | ||
680 | $L013aw_end: | ||
681 | pop edi | ||
682 | pop esi | ||
683 | pop ebx | ||
684 | pop ebp | ||
685 | ret | ||
686 | _bn_add_words ENDP | ||
687 | _TEXT ENDS | ||
688 | _TEXT SEGMENT | ||
689 | PUBLIC _bn_sub_words | ||
690 | |||
691 | _bn_sub_words PROC NEAR | ||
692 | push ebp | ||
693 | push ebx | ||
694 | push esi | ||
695 | push edi | ||
696 | ; | ||
697 | mov ebx, DWORD PTR 20[esp] | ||
698 | mov esi, DWORD PTR 24[esp] | ||
699 | mov edi, DWORD PTR 28[esp] | ||
700 | mov ebp, DWORD PTR 32[esp] | ||
701 | xor eax, eax | ||
702 | and ebp, 4294967288 | ||
703 | jz $L014aw_finish | ||
704 | L015aw_loop: | ||
705 | ; Round 0 | ||
706 | mov ecx, DWORD PTR [esi] | ||
707 | mov edx, DWORD PTR [edi] | ||
708 | sub ecx, eax | ||
709 | mov eax, 0 | ||
710 | adc eax, eax | ||
711 | sub ecx, edx | ||
712 | adc eax, 0 | ||
713 | mov DWORD PTR [ebx],ecx | ||
714 | ; Round 1 | ||
715 | mov ecx, DWORD PTR 4[esi] | ||
716 | mov edx, DWORD PTR 4[edi] | ||
717 | sub ecx, eax | ||
718 | mov eax, 0 | ||
719 | adc eax, eax | ||
720 | sub ecx, edx | ||
721 | adc eax, 0 | ||
722 | mov DWORD PTR 4[ebx],ecx | ||
723 | ; Round 2 | ||
724 | mov ecx, DWORD PTR 8[esi] | ||
725 | mov edx, DWORD PTR 8[edi] | ||
726 | sub ecx, eax | ||
727 | mov eax, 0 | ||
728 | adc eax, eax | ||
729 | sub ecx, edx | ||
730 | adc eax, 0 | ||
731 | mov DWORD PTR 8[ebx],ecx | ||
732 | ; Round 3 | ||
733 | mov ecx, DWORD PTR 12[esi] | ||
734 | mov edx, DWORD PTR 12[edi] | ||
735 | sub ecx, eax | ||
736 | mov eax, 0 | ||
737 | adc eax, eax | ||
738 | sub ecx, edx | ||
739 | adc eax, 0 | ||
740 | mov DWORD PTR 12[ebx],ecx | ||
741 | ; Round 4 | ||
742 | mov ecx, DWORD PTR 16[esi] | ||
743 | mov edx, DWORD PTR 16[edi] | ||
744 | sub ecx, eax | ||
745 | mov eax, 0 | ||
746 | adc eax, eax | ||
747 | sub ecx, edx | ||
748 | adc eax, 0 | ||
749 | mov DWORD PTR 16[ebx],ecx | ||
750 | ; Round 5 | ||
751 | mov ecx, DWORD PTR 20[esi] | ||
752 | mov edx, DWORD PTR 20[edi] | ||
753 | sub ecx, eax | ||
754 | mov eax, 0 | ||
755 | adc eax, eax | ||
756 | sub ecx, edx | ||
757 | adc eax, 0 | ||
758 | mov DWORD PTR 20[ebx],ecx | ||
759 | ; Round 6 | ||
760 | mov ecx, DWORD PTR 24[esi] | ||
761 | mov edx, DWORD PTR 24[edi] | ||
762 | sub ecx, eax | ||
763 | mov eax, 0 | ||
764 | adc eax, eax | ||
765 | sub ecx, edx | ||
766 | adc eax, 0 | ||
767 | mov DWORD PTR 24[ebx],ecx | ||
768 | ; Round 7 | ||
769 | mov ecx, DWORD PTR 28[esi] | ||
770 | mov edx, DWORD PTR 28[edi] | ||
771 | sub ecx, eax | ||
772 | mov eax, 0 | ||
773 | adc eax, eax | ||
774 | sub ecx, edx | ||
775 | adc eax, 0 | ||
776 | mov DWORD PTR 28[ebx],ecx | ||
777 | ; | ||
778 | add esi, 32 | ||
779 | add edi, 32 | ||
780 | add ebx, 32 | ||
781 | sub ebp, 8 | ||
782 | jnz L015aw_loop | ||
783 | $L014aw_finish: | ||
784 | mov ebp, DWORD PTR 32[esp] | ||
785 | and ebp, 7 | ||
786 | jz $L016aw_end | ||
787 | ; Tail Round 0 | ||
788 | mov ecx, DWORD PTR [esi] | ||
789 | mov edx, DWORD PTR [edi] | ||
790 | sub ecx, eax | ||
791 | mov eax, 0 | ||
792 | adc eax, eax | ||
793 | sub ecx, edx | ||
794 | adc eax, 0 | ||
795 | dec ebp | ||
796 | mov DWORD PTR [ebx],ecx | ||
797 | jz $L016aw_end | ||
798 | ; Tail Round 1 | ||
799 | mov ecx, DWORD PTR 4[esi] | ||
800 | mov edx, DWORD PTR 4[edi] | ||
801 | sub ecx, eax | ||
802 | mov eax, 0 | ||
803 | adc eax, eax | ||
804 | sub ecx, edx | ||
805 | adc eax, 0 | ||
806 | dec ebp | ||
807 | mov DWORD PTR 4[ebx],ecx | ||
808 | jz $L016aw_end | ||
809 | ; Tail Round 2 | ||
810 | mov ecx, DWORD PTR 8[esi] | ||
811 | mov edx, DWORD PTR 8[edi] | ||
812 | sub ecx, eax | ||
813 | mov eax, 0 | ||
814 | adc eax, eax | ||
815 | sub ecx, edx | ||
816 | adc eax, 0 | ||
817 | dec ebp | ||
818 | mov DWORD PTR 8[ebx],ecx | ||
819 | jz $L016aw_end | ||
820 | ; Tail Round 3 | ||
821 | mov ecx, DWORD PTR 12[esi] | ||
822 | mov edx, DWORD PTR 12[edi] | ||
823 | sub ecx, eax | ||
824 | mov eax, 0 | ||
825 | adc eax, eax | ||
826 | sub ecx, edx | ||
827 | adc eax, 0 | ||
828 | dec ebp | ||
829 | mov DWORD PTR 12[ebx],ecx | ||
830 | jz $L016aw_end | ||
831 | ; Tail Round 4 | ||
832 | mov ecx, DWORD PTR 16[esi] | ||
833 | mov edx, DWORD PTR 16[edi] | ||
834 | sub ecx, eax | ||
835 | mov eax, 0 | ||
836 | adc eax, eax | ||
837 | sub ecx, edx | ||
838 | adc eax, 0 | ||
839 | dec ebp | ||
840 | mov DWORD PTR 16[ebx],ecx | ||
841 | jz $L016aw_end | ||
842 | ; Tail Round 5 | ||
843 | mov ecx, DWORD PTR 20[esi] | ||
844 | mov edx, DWORD PTR 20[edi] | ||
845 | sub ecx, eax | ||
846 | mov eax, 0 | ||
847 | adc eax, eax | ||
848 | sub ecx, edx | ||
849 | adc eax, 0 | ||
850 | dec ebp | ||
851 | mov DWORD PTR 20[ebx],ecx | ||
852 | jz $L016aw_end | ||
853 | ; Tail Round 6 | ||
854 | mov ecx, DWORD PTR 24[esi] | ||
855 | mov edx, DWORD PTR 24[edi] | ||
856 | sub ecx, eax | ||
857 | mov eax, 0 | ||
858 | adc eax, eax | ||
859 | sub ecx, edx | ||
860 | adc eax, 0 | ||
861 | mov DWORD PTR 24[ebx],ecx | ||
862 | $L016aw_end: | ||
863 | pop edi | ||
864 | pop esi | ||
865 | pop ebx | ||
866 | pop ebp | ||
867 | ret | ||
868 | _bn_sub_words ENDP | ||
869 | _TEXT ENDS | ||
870 | _TEXT SEGMENT | ||
871 | PUBLIC _bn_mul_comba8 | ||
872 | |||
873 | _bn_mul_comba8 PROC NEAR | ||
874 | push esi | ||
875 | mov esi, DWORD PTR 12[esp] | ||
876 | push edi | ||
877 | mov edi, DWORD PTR 20[esp] | ||
878 | push ebp | ||
879 | push ebx | ||
880 | xor ebx, ebx | ||
881 | mov eax, DWORD PTR [esi] | ||
882 | xor ecx, ecx | ||
883 | mov edx, DWORD PTR [edi] | ||
884 | ; ################## Calculate word 0 | ||
885 | xor ebp, ebp | ||
886 | ; mul a[0]*b[0] | ||
887 | mul edx | ||
888 | add ebx, eax | ||
889 | mov eax, DWORD PTR 20[esp] | ||
890 | adc ecx, edx | ||
891 | mov edx, DWORD PTR [edi] | ||
892 | adc ebp, 0 | ||
893 | mov DWORD PTR [eax],ebx | ||
894 | mov eax, DWORD PTR 4[esi] | ||
895 | ; saved r[0] | ||
896 | ; ################## Calculate word 1 | ||
897 | xor ebx, ebx | ||
898 | ; mul a[1]*b[0] | ||
899 | mul edx | ||
900 | add ecx, eax | ||
901 | mov eax, DWORD PTR [esi] | ||
902 | adc ebp, edx | ||
903 | mov edx, DWORD PTR 4[edi] | ||
904 | adc ebx, 0 | ||
905 | ; mul a[0]*b[1] | ||
906 | mul edx | ||
907 | add ecx, eax | ||
908 | mov eax, DWORD PTR 20[esp] | ||
909 | adc ebp, edx | ||
910 | mov edx, DWORD PTR [edi] | ||
911 | adc ebx, 0 | ||
912 | mov DWORD PTR 4[eax],ecx | ||
913 | mov eax, DWORD PTR 8[esi] | ||
914 | ; saved r[1] | ||
915 | ; ################## Calculate word 2 | ||
916 | xor ecx, ecx | ||
917 | ; mul a[2]*b[0] | ||
918 | mul edx | ||
919 | add ebp, eax | ||
920 | mov eax, DWORD PTR 4[esi] | ||
921 | adc ebx, edx | ||
922 | mov edx, DWORD PTR 4[edi] | ||
923 | adc ecx, 0 | ||
924 | ; mul a[1]*b[1] | ||
925 | mul edx | ||
926 | add ebp, eax | ||
927 | mov eax, DWORD PTR [esi] | ||
928 | adc ebx, edx | ||
929 | mov edx, DWORD PTR 8[edi] | ||
930 | adc ecx, 0 | ||
931 | ; mul a[0]*b[2] | ||
932 | mul edx | ||
933 | add ebp, eax | ||
934 | mov eax, DWORD PTR 20[esp] | ||
935 | adc ebx, edx | ||
936 | mov edx, DWORD PTR [edi] | ||
937 | adc ecx, 0 | ||
938 | mov DWORD PTR 8[eax],ebp | ||
939 | mov eax, DWORD PTR 12[esi] | ||
940 | ; saved r[2] | ||
941 | ; ################## Calculate word 3 | ||
942 | xor ebp, ebp | ||
943 | ; mul a[3]*b[0] | ||
944 | mul edx | ||
945 | add ebx, eax | ||
946 | mov eax, DWORD PTR 8[esi] | ||
947 | adc ecx, edx | ||
948 | mov edx, DWORD PTR 4[edi] | ||
949 | adc ebp, 0 | ||
950 | ; mul a[2]*b[1] | ||
951 | mul edx | ||
952 | add ebx, eax | ||
953 | mov eax, DWORD PTR 4[esi] | ||
954 | adc ecx, edx | ||
955 | mov edx, DWORD PTR 8[edi] | ||
956 | adc ebp, 0 | ||
957 | ; mul a[1]*b[2] | ||
958 | mul edx | ||
959 | add ebx, eax | ||
960 | mov eax, DWORD PTR [esi] | ||
961 | adc ecx, edx | ||
962 | mov edx, DWORD PTR 12[edi] | ||
963 | adc ebp, 0 | ||
964 | ; mul a[0]*b[3] | ||
965 | mul edx | ||
966 | add ebx, eax | ||
967 | mov eax, DWORD PTR 20[esp] | ||
968 | adc ecx, edx | ||
969 | mov edx, DWORD PTR [edi] | ||
970 | adc ebp, 0 | ||
971 | mov DWORD PTR 12[eax],ebx | ||
972 | mov eax, DWORD PTR 16[esi] | ||
973 | ; saved r[3] | ||
974 | ; ################## Calculate word 4 | ||
975 | xor ebx, ebx | ||
976 | ; mul a[4]*b[0] | ||
977 | mul edx | ||
978 | add ecx, eax | ||
979 | mov eax, DWORD PTR 12[esi] | ||
980 | adc ebp, edx | ||
981 | mov edx, DWORD PTR 4[edi] | ||
982 | adc ebx, 0 | ||
983 | ; mul a[3]*b[1] | ||
984 | mul edx | ||
985 | add ecx, eax | ||
986 | mov eax, DWORD PTR 8[esi] | ||
987 | adc ebp, edx | ||
988 | mov edx, DWORD PTR 8[edi] | ||
989 | adc ebx, 0 | ||
990 | ; mul a[2]*b[2] | ||
991 | mul edx | ||
992 | add ecx, eax | ||
993 | mov eax, DWORD PTR 4[esi] | ||
994 | adc ebp, edx | ||
995 | mov edx, DWORD PTR 12[edi] | ||
996 | adc ebx, 0 | ||
997 | ; mul a[1]*b[3] | ||
998 | mul edx | ||
999 | add ecx, eax | ||
1000 | mov eax, DWORD PTR [esi] | ||
1001 | adc ebp, edx | ||
1002 | mov edx, DWORD PTR 16[edi] | ||
1003 | adc ebx, 0 | ||
1004 | ; mul a[0]*b[4] | ||
1005 | mul edx | ||
1006 | add ecx, eax | ||
1007 | mov eax, DWORD PTR 20[esp] | ||
1008 | adc ebp, edx | ||
1009 | mov edx, DWORD PTR [edi] | ||
1010 | adc ebx, 0 | ||
1011 | mov DWORD PTR 16[eax],ecx | ||
1012 | mov eax, DWORD PTR 20[esi] | ||
1013 | ; saved r[4] | ||
1014 | ; ################## Calculate word 5 | ||
1015 | xor ecx, ecx | ||
1016 | ; mul a[5]*b[0] | ||
1017 | mul edx | ||
1018 | add ebp, eax | ||
1019 | mov eax, DWORD PTR 16[esi] | ||
1020 | adc ebx, edx | ||
1021 | mov edx, DWORD PTR 4[edi] | ||
1022 | adc ecx, 0 | ||
1023 | ; mul a[4]*b[1] | ||
1024 | mul edx | ||
1025 | add ebp, eax | ||
1026 | mov eax, DWORD PTR 12[esi] | ||
1027 | adc ebx, edx | ||
1028 | mov edx, DWORD PTR 8[edi] | ||
1029 | adc ecx, 0 | ||
1030 | ; mul a[3]*b[2] | ||
1031 | mul edx | ||
1032 | add ebp, eax | ||
1033 | mov eax, DWORD PTR 8[esi] | ||
1034 | adc ebx, edx | ||
1035 | mov edx, DWORD PTR 12[edi] | ||
1036 | adc ecx, 0 | ||
1037 | ; mul a[2]*b[3] | ||
1038 | mul edx | ||
1039 | add ebp, eax | ||
1040 | mov eax, DWORD PTR 4[esi] | ||
1041 | adc ebx, edx | ||
1042 | mov edx, DWORD PTR 16[edi] | ||
1043 | adc ecx, 0 | ||
1044 | ; mul a[1]*b[4] | ||
1045 | mul edx | ||
1046 | add ebp, eax | ||
1047 | mov eax, DWORD PTR [esi] | ||
1048 | adc ebx, edx | ||
1049 | mov edx, DWORD PTR 20[edi] | ||
1050 | adc ecx, 0 | ||
1051 | ; mul a[0]*b[5] | ||
1052 | mul edx | ||
1053 | add ebp, eax | ||
1054 | mov eax, DWORD PTR 20[esp] | ||
1055 | adc ebx, edx | ||
1056 | mov edx, DWORD PTR [edi] | ||
1057 | adc ecx, 0 | ||
1058 | mov DWORD PTR 20[eax],ebp | ||
1059 | mov eax, DWORD PTR 24[esi] | ||
1060 | ; saved r[5] | ||
1061 | ; ################## Calculate word 6 | ||
1062 | xor ebp, ebp | ||
1063 | ; mul a[6]*b[0] | ||
1064 | mul edx | ||
1065 | add ebx, eax | ||
1066 | mov eax, DWORD PTR 20[esi] | ||
1067 | adc ecx, edx | ||
1068 | mov edx, DWORD PTR 4[edi] | ||
1069 | adc ebp, 0 | ||
1070 | ; mul a[5]*b[1] | ||
1071 | mul edx | ||
1072 | add ebx, eax | ||
1073 | mov eax, DWORD PTR 16[esi] | ||
1074 | adc ecx, edx | ||
1075 | mov edx, DWORD PTR 8[edi] | ||
1076 | adc ebp, 0 | ||
1077 | ; mul a[4]*b[2] | ||
1078 | mul edx | ||
1079 | add ebx, eax | ||
1080 | mov eax, DWORD PTR 12[esi] | ||
1081 | adc ecx, edx | ||
1082 | mov edx, DWORD PTR 12[edi] | ||
1083 | adc ebp, 0 | ||
1084 | ; mul a[3]*b[3] | ||
1085 | mul edx | ||
1086 | add ebx, eax | ||
1087 | mov eax, DWORD PTR 8[esi] | ||
1088 | adc ecx, edx | ||
1089 | mov edx, DWORD PTR 16[edi] | ||
1090 | adc ebp, 0 | ||
1091 | ; mul a[2]*b[4] | ||
1092 | mul edx | ||
1093 | add ebx, eax | ||
1094 | mov eax, DWORD PTR 4[esi] | ||
1095 | adc ecx, edx | ||
1096 | mov edx, DWORD PTR 20[edi] | ||
1097 | adc ebp, 0 | ||
1098 | ; mul a[1]*b[5] | ||
1099 | mul edx | ||
1100 | add ebx, eax | ||
1101 | mov eax, DWORD PTR [esi] | ||
1102 | adc ecx, edx | ||
1103 | mov edx, DWORD PTR 24[edi] | ||
1104 | adc ebp, 0 | ||
1105 | ; mul a[0]*b[6] | ||
1106 | mul edx | ||
1107 | add ebx, eax | ||
1108 | mov eax, DWORD PTR 20[esp] | ||
1109 | adc ecx, edx | ||
1110 | mov edx, DWORD PTR [edi] | ||
1111 | adc ebp, 0 | ||
1112 | mov DWORD PTR 24[eax],ebx | ||
1113 | mov eax, DWORD PTR 28[esi] | ||
1114 | ; saved r[6] | ||
1115 | ; ################## Calculate word 7 | ||
1116 | xor ebx, ebx | ||
1117 | ; mul a[7]*b[0] | ||
1118 | mul edx | ||
1119 | add ecx, eax | ||
1120 | mov eax, DWORD PTR 24[esi] | ||
1121 | adc ebp, edx | ||
1122 | mov edx, DWORD PTR 4[edi] | ||
1123 | adc ebx, 0 | ||
1124 | ; mul a[6]*b[1] | ||
1125 | mul edx | ||
1126 | add ecx, eax | ||
1127 | mov eax, DWORD PTR 20[esi] | ||
1128 | adc ebp, edx | ||
1129 | mov edx, DWORD PTR 8[edi] | ||
1130 | adc ebx, 0 | ||
1131 | ; mul a[5]*b[2] | ||
1132 | mul edx | ||
1133 | add ecx, eax | ||
1134 | mov eax, DWORD PTR 16[esi] | ||
1135 | adc ebp, edx | ||
1136 | mov edx, DWORD PTR 12[edi] | ||
1137 | adc ebx, 0 | ||
1138 | ; mul a[4]*b[3] | ||
1139 | mul edx | ||
1140 | add ecx, eax | ||
1141 | mov eax, DWORD PTR 12[esi] | ||
1142 | adc ebp, edx | ||
1143 | mov edx, DWORD PTR 16[edi] | ||
1144 | adc ebx, 0 | ||
1145 | ; mul a[3]*b[4] | ||
1146 | mul edx | ||
1147 | add ecx, eax | ||
1148 | mov eax, DWORD PTR 8[esi] | ||
1149 | adc ebp, edx | ||
1150 | mov edx, DWORD PTR 20[edi] | ||
1151 | adc ebx, 0 | ||
1152 | ; mul a[2]*b[5] | ||
1153 | mul edx | ||
1154 | add ecx, eax | ||
1155 | mov eax, DWORD PTR 4[esi] | ||
1156 | adc ebp, edx | ||
1157 | mov edx, DWORD PTR 24[edi] | ||
1158 | adc ebx, 0 | ||
1159 | ; mul a[1]*b[6] | ||
1160 | mul edx | ||
1161 | add ecx, eax | ||
1162 | mov eax, DWORD PTR [esi] | ||
1163 | adc ebp, edx | ||
1164 | mov edx, DWORD PTR 28[edi] | ||
1165 | adc ebx, 0 | ||
1166 | ; mul a[0]*b[7] | ||
1167 | mul edx | ||
1168 | add ecx, eax | ||
1169 | mov eax, DWORD PTR 20[esp] | ||
1170 | adc ebp, edx | ||
1171 | mov edx, DWORD PTR 4[edi] | ||
1172 | adc ebx, 0 | ||
1173 | mov DWORD PTR 28[eax],ecx | ||
1174 | mov eax, DWORD PTR 28[esi] | ||
1175 | ; saved r[7] | ||
1176 | ; ################## Calculate word 8 | ||
1177 | xor ecx, ecx | ||
1178 | ; mul a[7]*b[1] | ||
1179 | mul edx | ||
1180 | add ebp, eax | ||
1181 | mov eax, DWORD PTR 24[esi] | ||
1182 | adc ebx, edx | ||
1183 | mov edx, DWORD PTR 8[edi] | ||
1184 | adc ecx, 0 | ||
1185 | ; mul a[6]*b[2] | ||
1186 | mul edx | ||
1187 | add ebp, eax | ||
1188 | mov eax, DWORD PTR 20[esi] | ||
1189 | adc ebx, edx | ||
1190 | mov edx, DWORD PTR 12[edi] | ||
1191 | adc ecx, 0 | ||
1192 | ; mul a[5]*b[3] | ||
1193 | mul edx | ||
1194 | add ebp, eax | ||
1195 | mov eax, DWORD PTR 16[esi] | ||
1196 | adc ebx, edx | ||
1197 | mov edx, DWORD PTR 16[edi] | ||
1198 | adc ecx, 0 | ||
1199 | ; mul a[4]*b[4] | ||
1200 | mul edx | ||
1201 | add ebp, eax | ||
1202 | mov eax, DWORD PTR 12[esi] | ||
1203 | adc ebx, edx | ||
1204 | mov edx, DWORD PTR 20[edi] | ||
1205 | adc ecx, 0 | ||
1206 | ; mul a[3]*b[5] | ||
1207 | mul edx | ||
1208 | add ebp, eax | ||
1209 | mov eax, DWORD PTR 8[esi] | ||
1210 | adc ebx, edx | ||
1211 | mov edx, DWORD PTR 24[edi] | ||
1212 | adc ecx, 0 | ||
1213 | ; mul a[2]*b[6] | ||
1214 | mul edx | ||
1215 | add ebp, eax | ||
1216 | mov eax, DWORD PTR 4[esi] | ||
1217 | adc ebx, edx | ||
1218 | mov edx, DWORD PTR 28[edi] | ||
1219 | adc ecx, 0 | ||
1220 | ; mul a[1]*b[7] | ||
1221 | mul edx | ||
1222 | add ebp, eax | ||
1223 | mov eax, DWORD PTR 20[esp] | ||
1224 | adc ebx, edx | ||
1225 | mov edx, DWORD PTR 8[edi] | ||
1226 | adc ecx, 0 | ||
1227 | mov DWORD PTR 32[eax],ebp | ||
1228 | mov eax, DWORD PTR 28[esi] | ||
1229 | ; saved r[8] | ||
1230 | ; ################## Calculate word 9 | ||
1231 | xor ebp, ebp | ||
1232 | ; mul a[7]*b[2] | ||
1233 | mul edx | ||
1234 | add ebx, eax | ||
1235 | mov eax, DWORD PTR 24[esi] | ||
1236 | adc ecx, edx | ||
1237 | mov edx, DWORD PTR 12[edi] | ||
1238 | adc ebp, 0 | ||
1239 | ; mul a[6]*b[3] | ||
1240 | mul edx | ||
1241 | add ebx, eax | ||
1242 | mov eax, DWORD PTR 20[esi] | ||
1243 | adc ecx, edx | ||
1244 | mov edx, DWORD PTR 16[edi] | ||
1245 | adc ebp, 0 | ||
1246 | ; mul a[5]*b[4] | ||
1247 | mul edx | ||
1248 | add ebx, eax | ||
1249 | mov eax, DWORD PTR 16[esi] | ||
1250 | adc ecx, edx | ||
1251 | mov edx, DWORD PTR 20[edi] | ||
1252 | adc ebp, 0 | ||
1253 | ; mul a[4]*b[5] | ||
1254 | mul edx | ||
1255 | add ebx, eax | ||
1256 | mov eax, DWORD PTR 12[esi] | ||
1257 | adc ecx, edx | ||
1258 | mov edx, DWORD PTR 24[edi] | ||
1259 | adc ebp, 0 | ||
1260 | ; mul a[3]*b[6] | ||
1261 | mul edx | ||
1262 | add ebx, eax | ||
1263 | mov eax, DWORD PTR 8[esi] | ||
1264 | adc ecx, edx | ||
1265 | mov edx, DWORD PTR 28[edi] | ||
1266 | adc ebp, 0 | ||
1267 | ; mul a[2]*b[7] | ||
1268 | mul edx | ||
1269 | add ebx, eax | ||
1270 | mov eax, DWORD PTR 20[esp] | ||
1271 | adc ecx, edx | ||
1272 | mov edx, DWORD PTR 12[edi] | ||
1273 | adc ebp, 0 | ||
1274 | mov DWORD PTR 36[eax],ebx | ||
1275 | mov eax, DWORD PTR 28[esi] | ||
1276 | ; saved r[9] | ||
1277 | ; ################## Calculate word 10 | ||
1278 | xor ebx, ebx | ||
1279 | ; mul a[7]*b[3] | ||
1280 | mul edx | ||
1281 | add ecx, eax | ||
1282 | mov eax, DWORD PTR 24[esi] | ||
1283 | adc ebp, edx | ||
1284 | mov edx, DWORD PTR 16[edi] | ||
1285 | adc ebx, 0 | ||
1286 | ; mul a[6]*b[4] | ||
1287 | mul edx | ||
1288 | add ecx, eax | ||
1289 | mov eax, DWORD PTR 20[esi] | ||
1290 | adc ebp, edx | ||
1291 | mov edx, DWORD PTR 20[edi] | ||
1292 | adc ebx, 0 | ||
1293 | ; mul a[5]*b[5] | ||
1294 | mul edx | ||
1295 | add ecx, eax | ||
1296 | mov eax, DWORD PTR 16[esi] | ||
1297 | adc ebp, edx | ||
1298 | mov edx, DWORD PTR 24[edi] | ||
1299 | adc ebx, 0 | ||
1300 | ; mul a[4]*b[6] | ||
1301 | mul edx | ||
1302 | add ecx, eax | ||
1303 | mov eax, DWORD PTR 12[esi] | ||
1304 | adc ebp, edx | ||
1305 | mov edx, DWORD PTR 28[edi] | ||
1306 | adc ebx, 0 | ||
1307 | ; mul a[3]*b[7] | ||
1308 | mul edx | ||
1309 | add ecx, eax | ||
1310 | mov eax, DWORD PTR 20[esp] | ||
1311 | adc ebp, edx | ||
1312 | mov edx, DWORD PTR 16[edi] | ||
1313 | adc ebx, 0 | ||
1314 | mov DWORD PTR 40[eax],ecx | ||
1315 | mov eax, DWORD PTR 28[esi] | ||
1316 | ; saved r[10] | ||
1317 | ; ################## Calculate word 11 | ||
1318 | xor ecx, ecx | ||
1319 | ; mul a[7]*b[4] | ||
1320 | mul edx | ||
1321 | add ebp, eax | ||
1322 | mov eax, DWORD PTR 24[esi] | ||
1323 | adc ebx, edx | ||
1324 | mov edx, DWORD PTR 20[edi] | ||
1325 | adc ecx, 0 | ||
1326 | ; mul a[6]*b[5] | ||
1327 | mul edx | ||
1328 | add ebp, eax | ||
1329 | mov eax, DWORD PTR 20[esi] | ||
1330 | adc ebx, edx | ||
1331 | mov edx, DWORD PTR 24[edi] | ||
1332 | adc ecx, 0 | ||
1333 | ; mul a[5]*b[6] | ||
1334 | mul edx | ||
1335 | add ebp, eax | ||
1336 | mov eax, DWORD PTR 16[esi] | ||
1337 | adc ebx, edx | ||
1338 | mov edx, DWORD PTR 28[edi] | ||
1339 | adc ecx, 0 | ||
1340 | ; mul a[4]*b[7] | ||
1341 | mul edx | ||
1342 | add ebp, eax | ||
1343 | mov eax, DWORD PTR 20[esp] | ||
1344 | adc ebx, edx | ||
1345 | mov edx, DWORD PTR 20[edi] | ||
1346 | adc ecx, 0 | ||
1347 | mov DWORD PTR 44[eax],ebp | ||
1348 | mov eax, DWORD PTR 28[esi] | ||
1349 | ; saved r[11] | ||
1350 | ; ################## Calculate word 12 | ||
1351 | xor ebp, ebp | ||
1352 | ; mul a[7]*b[5] | ||
1353 | mul edx | ||
1354 | add ebx, eax | ||
1355 | mov eax, DWORD PTR 24[esi] | ||
1356 | adc ecx, edx | ||
1357 | mov edx, DWORD PTR 24[edi] | ||
1358 | adc ebp, 0 | ||
1359 | ; mul a[6]*b[6] | ||
1360 | mul edx | ||
1361 | add ebx, eax | ||
1362 | mov eax, DWORD PTR 20[esi] | ||
1363 | adc ecx, edx | ||
1364 | mov edx, DWORD PTR 28[edi] | ||
1365 | adc ebp, 0 | ||
1366 | ; mul a[5]*b[7] | ||
1367 | mul edx | ||
1368 | add ebx, eax | ||
1369 | mov eax, DWORD PTR 20[esp] | ||
1370 | adc ecx, edx | ||
1371 | mov edx, DWORD PTR 24[edi] | ||
1372 | adc ebp, 0 | ||
1373 | mov DWORD PTR 48[eax],ebx | ||
1374 | mov eax, DWORD PTR 28[esi] | ||
1375 | ; saved r[12] | ||
1376 | ; ################## Calculate word 13 | ||
1377 | xor ebx, ebx | ||
1378 | ; mul a[7]*b[6] | ||
1379 | mul edx | ||
1380 | add ecx, eax | ||
1381 | mov eax, DWORD PTR 24[esi] | ||
1382 | adc ebp, edx | ||
1383 | mov edx, DWORD PTR 28[edi] | ||
1384 | adc ebx, 0 | ||
1385 | ; mul a[6]*b[7] | ||
1386 | mul edx | ||
1387 | add ecx, eax | ||
1388 | mov eax, DWORD PTR 20[esp] | ||
1389 | adc ebp, edx | ||
1390 | mov edx, DWORD PTR 28[edi] | ||
1391 | adc ebx, 0 | ||
1392 | mov DWORD PTR 52[eax],ecx | ||
1393 | mov eax, DWORD PTR 28[esi] | ||
1394 | ; saved r[13] | ||
1395 | ; ################## Calculate word 14 | ||
1396 | xor ecx, ecx | ||
1397 | ; mul a[7]*b[7] | ||
1398 | mul edx | ||
1399 | add ebp, eax | ||
1400 | mov eax, DWORD PTR 20[esp] | ||
1401 | adc ebx, edx | ||
1402 | adc ecx, 0 | ||
1403 | mov DWORD PTR 56[eax],ebp | ||
1404 | ; saved r[14] | ||
1405 | ; save r[15] | ||
1406 | mov DWORD PTR 60[eax],ebx | ||
1407 | pop ebx | ||
1408 | pop ebp | ||
1409 | pop edi | ||
1410 | pop esi | ||
1411 | ret | ||
1412 | _bn_mul_comba8 ENDP | ||
1413 | _TEXT ENDS | ||
1414 | _TEXT SEGMENT | ||
1415 | PUBLIC _bn_mul_comba4 | ||
1416 | |||
1417 | _bn_mul_comba4 PROC NEAR | ||
1418 | push esi | ||
1419 | mov esi, DWORD PTR 12[esp] | ||
1420 | push edi | ||
1421 | mov edi, DWORD PTR 20[esp] | ||
1422 | push ebp | ||
1423 | push ebx | ||
1424 | xor ebx, ebx | ||
1425 | mov eax, DWORD PTR [esi] | ||
1426 | xor ecx, ecx | ||
1427 | mov edx, DWORD PTR [edi] | ||
1428 | ; ################## Calculate word 0 | ||
1429 | xor ebp, ebp | ||
1430 | ; mul a[0]*b[0] | ||
1431 | mul edx | ||
1432 | add ebx, eax | ||
1433 | mov eax, DWORD PTR 20[esp] | ||
1434 | adc ecx, edx | ||
1435 | mov edx, DWORD PTR [edi] | ||
1436 | adc ebp, 0 | ||
1437 | mov DWORD PTR [eax],ebx | ||
1438 | mov eax, DWORD PTR 4[esi] | ||
1439 | ; saved r[0] | ||
1440 | ; ################## Calculate word 1 | ||
1441 | xor ebx, ebx | ||
1442 | ; mul a[1]*b[0] | ||
1443 | mul edx | ||
1444 | add ecx, eax | ||
1445 | mov eax, DWORD PTR [esi] | ||
1446 | adc ebp, edx | ||
1447 | mov edx, DWORD PTR 4[edi] | ||
1448 | adc ebx, 0 | ||
1449 | ; mul a[0]*b[1] | ||
1450 | mul edx | ||
1451 | add ecx, eax | ||
1452 | mov eax, DWORD PTR 20[esp] | ||
1453 | adc ebp, edx | ||
1454 | mov edx, DWORD PTR [edi] | ||
1455 | adc ebx, 0 | ||
1456 | mov DWORD PTR 4[eax],ecx | ||
1457 | mov eax, DWORD PTR 8[esi] | ||
1458 | ; saved r[1] | ||
1459 | ; ################## Calculate word 2 | ||
1460 | xor ecx, ecx | ||
1461 | ; mul a[2]*b[0] | ||
1462 | mul edx | ||
1463 | add ebp, eax | ||
1464 | mov eax, DWORD PTR 4[esi] | ||
1465 | adc ebx, edx | ||
1466 | mov edx, DWORD PTR 4[edi] | ||
1467 | adc ecx, 0 | ||
1468 | ; mul a[1]*b[1] | ||
1469 | mul edx | ||
1470 | add ebp, eax | ||
1471 | mov eax, DWORD PTR [esi] | ||
1472 | adc ebx, edx | ||
1473 | mov edx, DWORD PTR 8[edi] | ||
1474 | adc ecx, 0 | ||
1475 | ; mul a[0]*b[2] | ||
1476 | mul edx | ||
1477 | add ebp, eax | ||
1478 | mov eax, DWORD PTR 20[esp] | ||
1479 | adc ebx, edx | ||
1480 | mov edx, DWORD PTR [edi] | ||
1481 | adc ecx, 0 | ||
1482 | mov DWORD PTR 8[eax],ebp | ||
1483 | mov eax, DWORD PTR 12[esi] | ||
1484 | ; saved r[2] | ||
1485 | ; ################## Calculate word 3 | ||
1486 | xor ebp, ebp | ||
1487 | ; mul a[3]*b[0] | ||
1488 | mul edx | ||
1489 | add ebx, eax | ||
1490 | mov eax, DWORD PTR 8[esi] | ||
1491 | adc ecx, edx | ||
1492 | mov edx, DWORD PTR 4[edi] | ||
1493 | adc ebp, 0 | ||
1494 | ; mul a[2]*b[1] | ||
1495 | mul edx | ||
1496 | add ebx, eax | ||
1497 | mov eax, DWORD PTR 4[esi] | ||
1498 | adc ecx, edx | ||
1499 | mov edx, DWORD PTR 8[edi] | ||
1500 | adc ebp, 0 | ||
1501 | ; mul a[1]*b[2] | ||
1502 | mul edx | ||
1503 | add ebx, eax | ||
1504 | mov eax, DWORD PTR [esi] | ||
1505 | adc ecx, edx | ||
1506 | mov edx, DWORD PTR 12[edi] | ||
1507 | adc ebp, 0 | ||
1508 | ; mul a[0]*b[3] | ||
1509 | mul edx | ||
1510 | add ebx, eax | ||
1511 | mov eax, DWORD PTR 20[esp] | ||
1512 | adc ecx, edx | ||
1513 | mov edx, DWORD PTR 4[edi] | ||
1514 | adc ebp, 0 | ||
1515 | mov DWORD PTR 12[eax],ebx | ||
1516 | mov eax, DWORD PTR 12[esi] | ||
1517 | ; saved r[3] | ||
1518 | ; ################## Calculate word 4 | ||
1519 | xor ebx, ebx | ||
1520 | ; mul a[3]*b[1] | ||
1521 | mul edx | ||
1522 | add ecx, eax | ||
1523 | mov eax, DWORD PTR 8[esi] | ||
1524 | adc ebp, edx | ||
1525 | mov edx, DWORD PTR 8[edi] | ||
1526 | adc ebx, 0 | ||
1527 | ; mul a[2]*b[2] | ||
1528 | mul edx | ||
1529 | add ecx, eax | ||
1530 | mov eax, DWORD PTR 4[esi] | ||
1531 | adc ebp, edx | ||
1532 | mov edx, DWORD PTR 12[edi] | ||
1533 | adc ebx, 0 | ||
1534 | ; mul a[1]*b[3] | ||
1535 | mul edx | ||
1536 | add ecx, eax | ||
1537 | mov eax, DWORD PTR 20[esp] | ||
1538 | adc ebp, edx | ||
1539 | mov edx, DWORD PTR 8[edi] | ||
1540 | adc ebx, 0 | ||
1541 | mov DWORD PTR 16[eax],ecx | ||
1542 | mov eax, DWORD PTR 12[esi] | ||
1543 | ; saved r[4] | ||
1544 | ; ################## Calculate word 5 | ||
1545 | xor ecx, ecx | ||
1546 | ; mul a[3]*b[2] | ||
1547 | mul edx | ||
1548 | add ebp, eax | ||
1549 | mov eax, DWORD PTR 8[esi] | ||
1550 | adc ebx, edx | ||
1551 | mov edx, DWORD PTR 12[edi] | ||
1552 | adc ecx, 0 | ||
1553 | ; mul a[2]*b[3] | ||
1554 | mul edx | ||
1555 | add ebp, eax | ||
1556 | mov eax, DWORD PTR 20[esp] | ||
1557 | adc ebx, edx | ||
1558 | mov edx, DWORD PTR 12[edi] | ||
1559 | adc ecx, 0 | ||
1560 | mov DWORD PTR 20[eax],ebp | ||
1561 | mov eax, DWORD PTR 12[esi] | ||
1562 | ; saved r[5] | ||
1563 | ; ################## Calculate word 6 | ||
1564 | xor ebp, ebp | ||
1565 | ; mul a[3]*b[3] | ||
1566 | mul edx | ||
1567 | add ebx, eax | ||
1568 | mov eax, DWORD PTR 20[esp] | ||
1569 | adc ecx, edx | ||
1570 | adc ebp, 0 | ||
1571 | mov DWORD PTR 24[eax],ebx | ||
1572 | ; saved r[6] | ||
1573 | ; save r[7] | ||
1574 | mov DWORD PTR 28[eax],ecx | ||
1575 | pop ebx | ||
1576 | pop ebp | ||
1577 | pop edi | ||
1578 | pop esi | ||
1579 | ret | ||
1580 | _bn_mul_comba4 ENDP | ||
1581 | _TEXT ENDS | ||
1582 | _TEXT SEGMENT | ||
1583 | PUBLIC _bn_sqr_comba8 | ||
1584 | |||
1585 | _bn_sqr_comba8 PROC NEAR | ||
1586 | push esi | ||
1587 | push edi | ||
1588 | push ebp | ||
1589 | push ebx | ||
1590 | mov edi, DWORD PTR 20[esp] | ||
1591 | mov esi, DWORD PTR 24[esp] | ||
1592 | xor ebx, ebx | ||
1593 | xor ecx, ecx | ||
1594 | mov eax, DWORD PTR [esi] | ||
1595 | ; ############### Calculate word 0 | ||
1596 | xor ebp, ebp | ||
1597 | ; sqr a[0]*a[0] | ||
1598 | mul eax | ||
1599 | add ebx, eax | ||
1600 | adc ecx, edx | ||
1601 | mov edx, DWORD PTR [esi] | ||
1602 | adc ebp, 0 | ||
1603 | mov DWORD PTR [edi],ebx | ||
1604 | mov eax, DWORD PTR 4[esi] | ||
1605 | ; saved r[0] | ||
1606 | ; ############### Calculate word 1 | ||
1607 | xor ebx, ebx | ||
1608 | ; sqr a[1]*a[0] | ||
1609 | mul edx | ||
1610 | add eax, eax | ||
1611 | adc edx, edx | ||
1612 | adc ebx, 0 | ||
1613 | add ecx, eax | ||
1614 | adc ebp, edx | ||
1615 | mov eax, DWORD PTR 8[esi] | ||
1616 | adc ebx, 0 | ||
1617 | mov DWORD PTR 4[edi],ecx | ||
1618 | mov edx, DWORD PTR [esi] | ||
1619 | ; saved r[1] | ||
1620 | ; ############### Calculate word 2 | ||
1621 | xor ecx, ecx | ||
1622 | ; sqr a[2]*a[0] | ||
1623 | mul edx | ||
1624 | add eax, eax | ||
1625 | adc edx, edx | ||
1626 | adc ecx, 0 | ||
1627 | add ebp, eax | ||
1628 | adc ebx, edx | ||
1629 | mov eax, DWORD PTR 4[esi] | ||
1630 | adc ecx, 0 | ||
1631 | ; sqr a[1]*a[1] | ||
1632 | mul eax | ||
1633 | add ebp, eax | ||
1634 | adc ebx, edx | ||
1635 | mov edx, DWORD PTR [esi] | ||
1636 | adc ecx, 0 | ||
1637 | mov DWORD PTR 8[edi],ebp | ||
1638 | mov eax, DWORD PTR 12[esi] | ||
1639 | ; saved r[2] | ||
1640 | ; ############### Calculate word 3 | ||
1641 | xor ebp, ebp | ||
1642 | ; sqr a[3]*a[0] | ||
1643 | mul edx | ||
1644 | add eax, eax | ||
1645 | adc edx, edx | ||
1646 | adc ebp, 0 | ||
1647 | add ebx, eax | ||
1648 | adc ecx, edx | ||
1649 | mov eax, DWORD PTR 8[esi] | ||
1650 | adc ebp, 0 | ||
1651 | mov edx, DWORD PTR 4[esi] | ||
1652 | ; sqr a[2]*a[1] | ||
1653 | mul edx | ||
1654 | add eax, eax | ||
1655 | adc edx, edx | ||
1656 | adc ebp, 0 | ||
1657 | add ebx, eax | ||
1658 | adc ecx, edx | ||
1659 | mov eax, DWORD PTR 16[esi] | ||
1660 | adc ebp, 0 | ||
1661 | mov DWORD PTR 12[edi],ebx | ||
1662 | mov edx, DWORD PTR [esi] | ||
1663 | ; saved r[3] | ||
1664 | ; ############### Calculate word 4 | ||
1665 | xor ebx, ebx | ||
1666 | ; sqr a[4]*a[0] | ||
1667 | mul edx | ||
1668 | add eax, eax | ||
1669 | adc edx, edx | ||
1670 | adc ebx, 0 | ||
1671 | add ecx, eax | ||
1672 | adc ebp, edx | ||
1673 | mov eax, DWORD PTR 12[esi] | ||
1674 | adc ebx, 0 | ||
1675 | mov edx, DWORD PTR 4[esi] | ||
1676 | ; sqr a[3]*a[1] | ||
1677 | mul edx | ||
1678 | add eax, eax | ||
1679 | adc edx, edx | ||
1680 | adc ebx, 0 | ||
1681 | add ecx, eax | ||
1682 | adc ebp, edx | ||
1683 | mov eax, DWORD PTR 8[esi] | ||
1684 | adc ebx, 0 | ||
1685 | ; sqr a[2]*a[2] | ||
1686 | mul eax | ||
1687 | add ecx, eax | ||
1688 | adc ebp, edx | ||
1689 | mov edx, DWORD PTR [esi] | ||
1690 | adc ebx, 0 | ||
1691 | mov DWORD PTR 16[edi],ecx | ||
1692 | mov eax, DWORD PTR 20[esi] | ||
1693 | ; saved r[4] | ||
1694 | ; ############### Calculate word 5 | ||
1695 | xor ecx, ecx | ||
1696 | ; sqr a[5]*a[0] | ||
1697 | mul edx | ||
1698 | add eax, eax | ||
1699 | adc edx, edx | ||
1700 | adc ecx, 0 | ||
1701 | add ebp, eax | ||
1702 | adc ebx, edx | ||
1703 | mov eax, DWORD PTR 16[esi] | ||
1704 | adc ecx, 0 | ||
1705 | mov edx, DWORD PTR 4[esi] | ||
1706 | ; sqr a[4]*a[1] | ||
1707 | mul edx | ||
1708 | add eax, eax | ||
1709 | adc edx, edx | ||
1710 | adc ecx, 0 | ||
1711 | add ebp, eax | ||
1712 | adc ebx, edx | ||
1713 | mov eax, DWORD PTR 12[esi] | ||
1714 | adc ecx, 0 | ||
1715 | mov edx, DWORD PTR 8[esi] | ||
1716 | ; sqr a[3]*a[2] | ||
1717 | mul edx | ||
1718 | add eax, eax | ||
1719 | adc edx, edx | ||
1720 | adc ecx, 0 | ||
1721 | add ebp, eax | ||
1722 | adc ebx, edx | ||
1723 | mov eax, DWORD PTR 24[esi] | ||
1724 | adc ecx, 0 | ||
1725 | mov DWORD PTR 20[edi],ebp | ||
1726 | mov edx, DWORD PTR [esi] | ||
1727 | ; saved r[5] | ||
1728 | ; ############### Calculate word 6 | ||
1729 | xor ebp, ebp | ||
1730 | ; sqr a[6]*a[0] | ||
1731 | mul edx | ||
1732 | add eax, eax | ||
1733 | adc edx, edx | ||
1734 | adc ebp, 0 | ||
1735 | add ebx, eax | ||
1736 | adc ecx, edx | ||
1737 | mov eax, DWORD PTR 20[esi] | ||
1738 | adc ebp, 0 | ||
1739 | mov edx, DWORD PTR 4[esi] | ||
1740 | ; sqr a[5]*a[1] | ||
1741 | mul edx | ||
1742 | add eax, eax | ||
1743 | adc edx, edx | ||
1744 | adc ebp, 0 | ||
1745 | add ebx, eax | ||
1746 | adc ecx, edx | ||
1747 | mov eax, DWORD PTR 16[esi] | ||
1748 | adc ebp, 0 | ||
1749 | mov edx, DWORD PTR 8[esi] | ||
1750 | ; sqr a[4]*a[2] | ||
1751 | mul edx | ||
1752 | add eax, eax | ||
1753 | adc edx, edx | ||
1754 | adc ebp, 0 | ||
1755 | add ebx, eax | ||
1756 | adc ecx, edx | ||
1757 | mov eax, DWORD PTR 12[esi] | ||
1758 | adc ebp, 0 | ||
1759 | ; sqr a[3]*a[3] | ||
1760 | mul eax | ||
1761 | add ebx, eax | ||
1762 | adc ecx, edx | ||
1763 | mov edx, DWORD PTR [esi] | ||
1764 | adc ebp, 0 | ||
1765 | mov DWORD PTR 24[edi],ebx | ||
1766 | mov eax, DWORD PTR 28[esi] | ||
1767 | ; saved r[6] | ||
1768 | ; ############### Calculate word 7 | ||
1769 | xor ebx, ebx | ||
1770 | ; sqr a[7]*a[0] | ||
1771 | mul edx | ||
1772 | add eax, eax | ||
1773 | adc edx, edx | ||
1774 | adc ebx, 0 | ||
1775 | add ecx, eax | ||
1776 | adc ebp, edx | ||
1777 | mov eax, DWORD PTR 24[esi] | ||
1778 | adc ebx, 0 | ||
1779 | mov edx, DWORD PTR 4[esi] | ||
1780 | ; sqr a[6]*a[1] | ||
1781 | mul edx | ||
1782 | add eax, eax | ||
1783 | adc edx, edx | ||
1784 | adc ebx, 0 | ||
1785 | add ecx, eax | ||
1786 | adc ebp, edx | ||
1787 | mov eax, DWORD PTR 20[esi] | ||
1788 | adc ebx, 0 | ||
1789 | mov edx, DWORD PTR 8[esi] | ||
1790 | ; sqr a[5]*a[2] | ||
1791 | mul edx | ||
1792 | add eax, eax | ||
1793 | adc edx, edx | ||
1794 | adc ebx, 0 | ||
1795 | add ecx, eax | ||
1796 | adc ebp, edx | ||
1797 | mov eax, DWORD PTR 16[esi] | ||
1798 | adc ebx, 0 | ||
1799 | mov edx, DWORD PTR 12[esi] | ||
1800 | ; sqr a[4]*a[3] | ||
1801 | mul edx | ||
1802 | add eax, eax | ||
1803 | adc edx, edx | ||
1804 | adc ebx, 0 | ||
1805 | add ecx, eax | ||
1806 | adc ebp, edx | ||
1807 | mov eax, DWORD PTR 28[esi] | ||
1808 | adc ebx, 0 | ||
1809 | mov DWORD PTR 28[edi],ecx | ||
1810 | mov edx, DWORD PTR 4[esi] | ||
1811 | ; saved r[7] | ||
1812 | ; ############### Calculate word 8 | ||
1813 | xor ecx, ecx | ||
1814 | ; sqr a[7]*a[1] | ||
1815 | mul edx | ||
1816 | add eax, eax | ||
1817 | adc edx, edx | ||
1818 | adc ecx, 0 | ||
1819 | add ebp, eax | ||
1820 | adc ebx, edx | ||
1821 | mov eax, DWORD PTR 24[esi] | ||
1822 | adc ecx, 0 | ||
1823 | mov edx, DWORD PTR 8[esi] | ||
1824 | ; sqr a[6]*a[2] | ||
1825 | mul edx | ||
1826 | add eax, eax | ||
1827 | adc edx, edx | ||
1828 | adc ecx, 0 | ||
1829 | add ebp, eax | ||
1830 | adc ebx, edx | ||
1831 | mov eax, DWORD PTR 20[esi] | ||
1832 | adc ecx, 0 | ||
1833 | mov edx, DWORD PTR 12[esi] | ||
1834 | ; sqr a[5]*a[3] | ||
1835 | mul edx | ||
1836 | add eax, eax | ||
1837 | adc edx, edx | ||
1838 | adc ecx, 0 | ||
1839 | add ebp, eax | ||
1840 | adc ebx, edx | ||
1841 | mov eax, DWORD PTR 16[esi] | ||
1842 | adc ecx, 0 | ||
1843 | ; sqr a[4]*a[4] | ||
1844 | mul eax | ||
1845 | add ebp, eax | ||
1846 | adc ebx, edx | ||
1847 | mov edx, DWORD PTR 8[esi] | ||
1848 | adc ecx, 0 | ||
1849 | mov DWORD PTR 32[edi],ebp | ||
1850 | mov eax, DWORD PTR 28[esi] | ||
1851 | ; saved r[8] | ||
1852 | ; ############### Calculate word 9 | ||
1853 | xor ebp, ebp | ||
1854 | ; sqr a[7]*a[2] | ||
1855 | mul edx | ||
1856 | add eax, eax | ||
1857 | adc edx, edx | ||
1858 | adc ebp, 0 | ||
1859 | add ebx, eax | ||
1860 | adc ecx, edx | ||
1861 | mov eax, DWORD PTR 24[esi] | ||
1862 | adc ebp, 0 | ||
1863 | mov edx, DWORD PTR 12[esi] | ||
1864 | ; sqr a[6]*a[3] | ||
1865 | mul edx | ||
1866 | add eax, eax | ||
1867 | adc edx, edx | ||
1868 | adc ebp, 0 | ||
1869 | add ebx, eax | ||
1870 | adc ecx, edx | ||
1871 | mov eax, DWORD PTR 20[esi] | ||
1872 | adc ebp, 0 | ||
1873 | mov edx, DWORD PTR 16[esi] | ||
1874 | ; sqr a[5]*a[4] | ||
1875 | mul edx | ||
1876 | add eax, eax | ||
1877 | adc edx, edx | ||
1878 | adc ebp, 0 | ||
1879 | add ebx, eax | ||
1880 | adc ecx, edx | ||
1881 | mov eax, DWORD PTR 28[esi] | ||
1882 | adc ebp, 0 | ||
1883 | mov DWORD PTR 36[edi],ebx | ||
1884 | mov edx, DWORD PTR 12[esi] | ||
1885 | ; saved r[9] | ||
1886 | ; ############### Calculate word 10 | ||
1887 | xor ebx, ebx | ||
1888 | ; sqr a[7]*a[3] | ||
1889 | mul edx | ||
1890 | add eax, eax | ||
1891 | adc edx, edx | ||
1892 | adc ebx, 0 | ||
1893 | add ecx, eax | ||
1894 | adc ebp, edx | ||
1895 | mov eax, DWORD PTR 24[esi] | ||
1896 | adc ebx, 0 | ||
1897 | mov edx, DWORD PTR 16[esi] | ||
1898 | ; sqr a[6]*a[4] | ||
1899 | mul edx | ||
1900 | add eax, eax | ||
1901 | adc edx, edx | ||
1902 | adc ebx, 0 | ||
1903 | add ecx, eax | ||
1904 | adc ebp, edx | ||
1905 | mov eax, DWORD PTR 20[esi] | ||
1906 | adc ebx, 0 | ||
1907 | ; sqr a[5]*a[5] | ||
1908 | mul eax | ||
1909 | add ecx, eax | ||
1910 | adc ebp, edx | ||
1911 | mov edx, DWORD PTR 16[esi] | ||
1912 | adc ebx, 0 | ||
1913 | mov DWORD PTR 40[edi],ecx | ||
1914 | mov eax, DWORD PTR 28[esi] | ||
1915 | ; saved r[10] | ||
1916 | ; ############### Calculate word 11 | ||
1917 | xor ecx, ecx | ||
1918 | ; sqr a[7]*a[4] | ||
1919 | mul edx | ||
1920 | add eax, eax | ||
1921 | adc edx, edx | ||
1922 | adc ecx, 0 | ||
1923 | add ebp, eax | ||
1924 | adc ebx, edx | ||
1925 | mov eax, DWORD PTR 24[esi] | ||
1926 | adc ecx, 0 | ||
1927 | mov edx, DWORD PTR 20[esi] | ||
1928 | ; sqr a[6]*a[5] | ||
1929 | mul edx | ||
1930 | add eax, eax | ||
1931 | adc edx, edx | ||
1932 | adc ecx, 0 | ||
1933 | add ebp, eax | ||
1934 | adc ebx, edx | ||
1935 | mov eax, DWORD PTR 28[esi] | ||
1936 | adc ecx, 0 | ||
1937 | mov DWORD PTR 44[edi],ebp | ||
1938 | mov edx, DWORD PTR 20[esi] | ||
1939 | ; saved r[11] | ||
1940 | ; ############### Calculate word 12 | ||
1941 | xor ebp, ebp | ||
1942 | ; sqr a[7]*a[5] | ||
1943 | mul edx | ||
1944 | add eax, eax | ||
1945 | adc edx, edx | ||
1946 | adc ebp, 0 | ||
1947 | add ebx, eax | ||
1948 | adc ecx, edx | ||
1949 | mov eax, DWORD PTR 24[esi] | ||
1950 | adc ebp, 0 | ||
1951 | ; sqr a[6]*a[6] | ||
1952 | mul eax | ||
1953 | add ebx, eax | ||
1954 | adc ecx, edx | ||
1955 | mov edx, DWORD PTR 24[esi] | ||
1956 | adc ebp, 0 | ||
1957 | mov DWORD PTR 48[edi],ebx | ||
1958 | mov eax, DWORD PTR 28[esi] | ||
1959 | ; saved r[12] | ||
1960 | ; ############### Calculate word 13 | ||
1961 | xor ebx, ebx | ||
1962 | ; sqr a[7]*a[6] | ||
1963 | mul edx | ||
1964 | add eax, eax | ||
1965 | adc edx, edx | ||
1966 | adc ebx, 0 | ||
1967 | add ecx, eax | ||
1968 | adc ebp, edx | ||
1969 | mov eax, DWORD PTR 28[esi] | ||
1970 | adc ebx, 0 | ||
1971 | mov DWORD PTR 52[edi],ecx | ||
1972 | ; saved r[13] | ||
1973 | ; ############### Calculate word 14 | ||
1974 | xor ecx, ecx | ||
1975 | ; sqr a[7]*a[7] | ||
1976 | mul eax | ||
1977 | add ebp, eax | ||
1978 | adc ebx, edx | ||
1979 | adc ecx, 0 | ||
1980 | mov DWORD PTR 56[edi],ebp | ||
1981 | ; saved r[14] | ||
1982 | mov DWORD PTR 60[edi],ebx | ||
1983 | pop ebx | ||
1984 | pop ebp | ||
1985 | pop edi | ||
1986 | pop esi | ||
1987 | ret | ||
1988 | _bn_sqr_comba8 ENDP | ||
1989 | _TEXT ENDS | ||
1990 | _TEXT SEGMENT | ||
1991 | PUBLIC _bn_sqr_comba4 | ||
1992 | |||
1993 | _bn_sqr_comba4 PROC NEAR | ||
1994 | push esi | ||
1995 | push edi | ||
1996 | push ebp | ||
1997 | push ebx | ||
1998 | mov edi, DWORD PTR 20[esp] | ||
1999 | mov esi, DWORD PTR 24[esp] | ||
2000 | xor ebx, ebx | ||
2001 | xor ecx, ecx | ||
2002 | mov eax, DWORD PTR [esi] | ||
2003 | ; ############### Calculate word 0 | ||
2004 | xor ebp, ebp | ||
2005 | ; sqr a[0]*a[0] | ||
2006 | mul eax | ||
2007 | add ebx, eax | ||
2008 | adc ecx, edx | ||
2009 | mov edx, DWORD PTR [esi] | ||
2010 | adc ebp, 0 | ||
2011 | mov DWORD PTR [edi],ebx | ||
2012 | mov eax, DWORD PTR 4[esi] | ||
2013 | ; saved r[0] | ||
2014 | ; ############### Calculate word 1 | ||
2015 | xor ebx, ebx | ||
2016 | ; sqr a[1]*a[0] | ||
2017 | mul edx | ||
2018 | add eax, eax | ||
2019 | adc edx, edx | ||
2020 | adc ebx, 0 | ||
2021 | add ecx, eax | ||
2022 | adc ebp, edx | ||
2023 | mov eax, DWORD PTR 8[esi] | ||
2024 | adc ebx, 0 | ||
2025 | mov DWORD PTR 4[edi],ecx | ||
2026 | mov edx, DWORD PTR [esi] | ||
2027 | ; saved r[1] | ||
2028 | ; ############### Calculate word 2 | ||
2029 | xor ecx, ecx | ||
2030 | ; sqr a[2]*a[0] | ||
2031 | mul edx | ||
2032 | add eax, eax | ||
2033 | adc edx, edx | ||
2034 | adc ecx, 0 | ||
2035 | add ebp, eax | ||
2036 | adc ebx, edx | ||
2037 | mov eax, DWORD PTR 4[esi] | ||
2038 | adc ecx, 0 | ||
2039 | ; sqr a[1]*a[1] | ||
2040 | mul eax | ||
2041 | add ebp, eax | ||
2042 | adc ebx, edx | ||
2043 | mov edx, DWORD PTR [esi] | ||
2044 | adc ecx, 0 | ||
2045 | mov DWORD PTR 8[edi],ebp | ||
2046 | mov eax, DWORD PTR 12[esi] | ||
2047 | ; saved r[2] | ||
2048 | ; ############### Calculate word 3 | ||
2049 | xor ebp, ebp | ||
2050 | ; sqr a[3]*a[0] | ||
2051 | mul edx | ||
2052 | add eax, eax | ||
2053 | adc edx, edx | ||
2054 | adc ebp, 0 | ||
2055 | add ebx, eax | ||
2056 | adc ecx, edx | ||
2057 | mov eax, DWORD PTR 8[esi] | ||
2058 | adc ebp, 0 | ||
2059 | mov edx, DWORD PTR 4[esi] | ||
2060 | ; sqr a[2]*a[1] | ||
2061 | mul edx | ||
2062 | add eax, eax | ||
2063 | adc edx, edx | ||
2064 | adc ebp, 0 | ||
2065 | add ebx, eax | ||
2066 | adc ecx, edx | ||
2067 | mov eax, DWORD PTR 12[esi] | ||
2068 | adc ebp, 0 | ||
2069 | mov DWORD PTR 12[edi],ebx | ||
2070 | mov edx, DWORD PTR 4[esi] | ||
2071 | ; saved r[3] | ||
2072 | ; ############### Calculate word 4 | ||
2073 | xor ebx, ebx | ||
2074 | ; sqr a[3]*a[1] | ||
2075 | mul edx | ||
2076 | add eax, eax | ||
2077 | adc edx, edx | ||
2078 | adc ebx, 0 | ||
2079 | add ecx, eax | ||
2080 | adc ebp, edx | ||
2081 | mov eax, DWORD PTR 8[esi] | ||
2082 | adc ebx, 0 | ||
2083 | ; sqr a[2]*a[2] | ||
2084 | mul eax | ||
2085 | add ecx, eax | ||
2086 | adc ebp, edx | ||
2087 | mov edx, DWORD PTR 8[esi] | ||
2088 | adc ebx, 0 | ||
2089 | mov DWORD PTR 16[edi],ecx | ||
2090 | mov eax, DWORD PTR 12[esi] | ||
2091 | ; saved r[4] | ||
2092 | ; ############### Calculate word 5 | ||
2093 | xor ecx, ecx | ||
2094 | ; sqr a[3]*a[2] | ||
2095 | mul edx | ||
2096 | add eax, eax | ||
2097 | adc edx, edx | ||
2098 | adc ecx, 0 | ||
2099 | add ebp, eax | ||
2100 | adc ebx, edx | ||
2101 | mov eax, DWORD PTR 12[esi] | ||
2102 | adc ecx, 0 | ||
2103 | mov DWORD PTR 20[edi],ebp | ||
2104 | ; saved r[5] | ||
2105 | ; ############### Calculate word 6 | ||
2106 | xor ebp, ebp | ||
2107 | ; sqr a[3]*a[3] | ||
2108 | mul eax | ||
2109 | add ebx, eax | ||
2110 | adc ecx, edx | ||
2111 | adc ebp, 0 | ||
2112 | mov DWORD PTR 24[edi],ebx | ||
2113 | ; saved r[6] | ||
2114 | mov DWORD PTR 28[edi],ecx | ||
2115 | pop ebx | ||
2116 | pop ebp | ||
2117 | pop edi | ||
2118 | pop esi | ||
2119 | ret | ||
2120 | _bn_sqr_comba4 ENDP | ||
2121 | _TEXT ENDS | ||
2122 | END | ||
diff --git a/src/lib/libssl/src/crypto/bn/asm/x86w16.asm b/src/lib/libssl/src/crypto/bn/asm/x86w16.asm index 80a9ed6eef..e69de29bb2 100644 --- a/src/lib/libssl/src/crypto/bn/asm/x86w16.asm +++ b/src/lib/libssl/src/crypto/bn/asm/x86w16.asm | |||
@@ -1,297 +0,0 @@ | |||
1 | ; Static Name Aliases | ||
2 | ; | ||
3 | TITLE bn_mulw.c | ||
4 | .8087 | ||
5 | F_TEXT SEGMENT WORD PUBLIC 'CODE' | ||
6 | F_TEXT ENDS | ||
7 | _DATA SEGMENT WORD PUBLIC 'DATA' | ||
8 | _DATA ENDS | ||
9 | _CONST SEGMENT WORD PUBLIC 'CONST' | ||
10 | _CONST ENDS | ||
11 | _BSS SEGMENT WORD PUBLIC 'BSS' | ||
12 | _BSS ENDS | ||
13 | DGROUP GROUP _CONST, _BSS, _DATA | ||
14 | ASSUME DS: DGROUP, SS: DGROUP | ||
15 | F_TEXT SEGMENT | ||
16 | ASSUME CS: F_TEXT | ||
17 | PUBLIC _bn_mul_add_words | ||
18 | _bn_mul_add_words PROC FAR | ||
19 | ; Line 58 | ||
20 | push bp | ||
21 | push bx | ||
22 | push si | ||
23 | push di | ||
24 | push ds | ||
25 | push es | ||
26 | mov bp,sp | ||
27 | ; w = 26 | ||
28 | ; num = 24 | ||
29 | ; ap = 20 | ||
30 | ; rp = 16 | ||
31 | xor si,si ;c=0; | ||
32 | mov di,WORD PTR [bp+16] ; load r | ||
33 | mov ds,WORD PTR [bp+18] ; load r | ||
34 | mov bx,WORD PTR [bp+20] ; load a | ||
35 | mov es,WORD PTR [bp+22] ; load a | ||
36 | mov cx,WORD PTR [bp+26] ; load w | ||
37 | mov bp,WORD PTR [bp+24] ; load num | ||
38 | |||
39 | shr bp,1 ; div count by 4 and do groups of 4 | ||
40 | shr bp,1 | ||
41 | je $L555 | ||
42 | |||
43 | $L546: | ||
44 | mov ax,cx | ||
45 | mul WORD PTR es:[bx] ; w* *a | ||
46 | add ax,WORD PTR ds:[di] ; + *r | ||
47 | adc dx,0 | ||
48 | adc ax,si | ||
49 | adc dx,0 | ||
50 | mov WORD PTR ds:[di],ax | ||
51 | mov si,dx | ||
52 | ; | ||
53 | mov ax,cx | ||
54 | mul WORD PTR es:[bx+2] ; w* *a | ||
55 | add ax,WORD PTR ds:[di+2] ; + *r | ||
56 | adc dx,0 | ||
57 | adc ax,si | ||
58 | adc dx,0 | ||
59 | mov WORD PTR ds:[di+2],ax | ||
60 | mov si,dx | ||
61 | ; | ||
62 | mov ax,cx | ||
63 | mul WORD PTR es:[bx+4] ; w* *a | ||
64 | add ax,WORD PTR ds:[di+4] ; + *r | ||
65 | adc dx,0 | ||
66 | adc ax,si | ||
67 | adc dx,0 | ||
68 | mov WORD PTR ds:[di+4],ax | ||
69 | mov si,dx | ||
70 | ; | ||
71 | mov ax,cx | ||
72 | mul WORD PTR es:[bx+6] ; w* *a | ||
73 | add ax,WORD PTR ds:[di+6] ; + *r | ||
74 | adc dx,0 | ||
75 | adc ax,si | ||
76 | adc dx,0 | ||
77 | mov WORD PTR ds:[di+6],ax | ||
78 | mov si,dx | ||
79 | ; | ||
80 | add bx,8 | ||
81 | add di,8 | ||
82 | ; | ||
83 | dec bp | ||
84 | je $L555 | ||
85 | jmp $L546 | ||
86 | ; | ||
87 | ; | ||
88 | $L555: | ||
89 | mov bp,sp | ||
90 | mov bp,WORD PTR [bp+24] ; load num | ||
91 | and bp,3 | ||
92 | dec bp | ||
93 | js $L547 | ||
94 | |||
95 | mov ax,cx | ||
96 | mul WORD PTR es:[bx] ; w* *a | ||
97 | add ax,WORD PTR ds:[di] ; + *r | ||
98 | adc dx,0 | ||
99 | adc ax,si | ||
100 | adc dx,0 | ||
101 | mov WORD PTR ds:[di],ax | ||
102 | mov si,dx | ||
103 | dec bp | ||
104 | js $L547 ; Note that we are now testing for -1 | ||
105 | ; | ||
106 | mov ax,cx | ||
107 | mul WORD PTR es:[bx+2] ; w* *a | ||
108 | add ax,WORD PTR ds:[di+2] ; + *r | ||
109 | adc dx,0 | ||
110 | adc ax,si | ||
111 | adc dx,0 | ||
112 | mov WORD PTR ds:[di+2],ax | ||
113 | mov si,dx | ||
114 | dec bp | ||
115 | js $L547 | ||
116 | ; | ||
117 | mov ax,cx | ||
118 | mul WORD PTR es:[bx+4] ; w* *a | ||
119 | add ax,WORD PTR ds:[di+4] ; + *r | ||
120 | adc dx,0 | ||
121 | adc ax,si | ||
122 | adc dx,0 | ||
123 | mov WORD PTR ds:[di+4],ax | ||
124 | mov si,dx | ||
125 | $L547: | ||
126 | mov ax,si | ||
127 | pop es | ||
128 | pop ds | ||
129 | pop di | ||
130 | pop si | ||
131 | pop bx | ||
132 | pop bp | ||
133 | ret | ||
134 | nop | ||
135 | |||
136 | _bn_mul_add_words ENDP | ||
137 | PUBLIC _bn_mul_words | ||
138 | _bn_mul_words PROC FAR | ||
139 | ; Line 76 | ||
140 | push bp | ||
141 | push bx | ||
142 | push si | ||
143 | push di | ||
144 | push ds | ||
145 | push es | ||
146 | xor si,si | ||
147 | mov bp,sp | ||
148 | mov di,WORD PTR [bp+16] ; r | ||
149 | mov ds,WORD PTR [bp+18] | ||
150 | mov bx,WORD PTR [bp+20] ; a | ||
151 | mov es,WORD PTR [bp+22] | ||
152 | mov cx,WORD PTR [bp+26] ; w | ||
153 | mov bp,WORD PTR [bp+24] ; num | ||
154 | $FC743: | ||
155 | mov ax,cx | ||
156 | mul WORD PTR es:[bx] | ||
157 | add ax,si | ||
158 | adc dx,0 | ||
159 | mov WORD PTR ds:[di],ax | ||
160 | mov si,dx | ||
161 | dec bp | ||
162 | je $L764 | ||
163 | ; | ||
164 | mov ax,cx | ||
165 | mul WORD PTR es:[bx+2] | ||
166 | add ax,si | ||
167 | adc dx,0 | ||
168 | mov WORD PTR ds:[di+2],ax | ||
169 | mov si,dx | ||
170 | dec bp | ||
171 | je $L764 | ||
172 | ; | ||
173 | mov ax,cx | ||
174 | mul WORD PTR es:[bx+4] | ||
175 | add ax,si | ||
176 | adc dx,0 | ||
177 | mov WORD PTR ds:[di+4],ax | ||
178 | mov si,dx | ||
179 | dec bp | ||
180 | je $L764 | ||
181 | ; | ||
182 | mov ax,cx | ||
183 | mul WORD PTR es:[bx+6] | ||
184 | add ax,si | ||
185 | adc dx,0 | ||
186 | mov WORD PTR ds:[di+6],ax | ||
187 | mov si,dx | ||
188 | dec bp | ||
189 | je $L764 | ||
190 | ; | ||
191 | add bx,8 | ||
192 | add di,8 | ||
193 | jmp $FC743 | ||
194 | nop | ||
195 | $L764: | ||
196 | mov ax,si | ||
197 | pop es | ||
198 | pop ds | ||
199 | pop di | ||
200 | pop si | ||
201 | pop bx | ||
202 | pop bp | ||
203 | ret | ||
204 | nop | ||
205 | _bn_mul_words ENDP | ||
206 | PUBLIC _bn_sqr_words | ||
207 | _bn_sqr_words PROC FAR | ||
208 | ; Line 92 | ||
209 | push bp | ||
210 | push bx | ||
211 | push si | ||
212 | push di | ||
213 | push ds | ||
214 | push es | ||
215 | mov bp,sp | ||
216 | mov si,WORD PTR [bp+16] | ||
217 | mov ds,WORD PTR [bp+18] | ||
218 | mov di,WORD PTR [bp+20] | ||
219 | mov es,WORD PTR [bp+22] | ||
220 | mov bx,WORD PTR [bp+24] | ||
221 | |||
222 | mov bp,bx ; save a memory lookup later | ||
223 | shr bx,1 ; div count by 4 and do groups of 4 | ||
224 | shr bx,1 | ||
225 | je $L666 | ||
226 | |||
227 | $L765: | ||
228 | mov ax,WORD PTR es:[di] | ||
229 | mul ax | ||
230 | mov WORD PTR ds:[si],ax | ||
231 | mov WORD PTR ds:[si+2],dx | ||
232 | ; | ||
233 | mov ax,WORD PTR es:[di+2] | ||
234 | mul ax | ||
235 | mov WORD PTR ds:[si+4],ax | ||
236 | mov WORD PTR ds:[si+6],dx | ||
237 | ; | ||
238 | mov ax,WORD PTR es:[di+4] | ||
239 | mul ax | ||
240 | mov WORD PTR ds:[si+8],ax | ||
241 | mov WORD PTR ds:[si+10],dx | ||
242 | ; | ||
243 | mov ax,WORD PTR es:[di+6] | ||
244 | mul ax | ||
245 | mov WORD PTR ds:[si+12],ax | ||
246 | mov WORD PTR ds:[si+14],dx | ||
247 | ; | ||
248 | add di,8 | ||
249 | add si,16 | ||
250 | dec bx | ||
251 | je $L666 | ||
252 | jmp $L765 | ||
253 | $L666: | ||
254 | and bp,3 | ||
255 | dec bp ; The copied value of bx (num) | ||
256 | js $L645 | ||
257 | ; | ||
258 | mov ax,WORD PTR es:[di] | ||
259 | mul ax | ||
260 | mov WORD PTR ds:[si],ax | ||
261 | mov WORD PTR ds:[si+2],dx | ||
262 | dec bp | ||
263 | js $L645 | ||
264 | ; | ||
265 | mov ax,WORD PTR es:[di+2] | ||
266 | mul ax | ||
267 | mov WORD PTR ds:[si+4],ax | ||
268 | mov WORD PTR ds:[si+6],dx | ||
269 | dec bp | ||
270 | js $L645 | ||
271 | ; | ||
272 | mov ax,WORD PTR es:[di+4] | ||
273 | mul ax | ||
274 | mov WORD PTR ds:[si+8],ax | ||
275 | mov WORD PTR ds:[si+10],dx | ||
276 | $L645: | ||
277 | pop es | ||
278 | pop ds | ||
279 | pop di | ||
280 | pop si | ||
281 | pop bx | ||
282 | pop bp | ||
283 | ret | ||
284 | |||
285 | _bn_sqr_words ENDP | ||
286 | PUBLIC _bn_div64 | ||
287 | _bn_div64 PROC FAR | ||
288 | push bp | ||
289 | mov bp,sp | ||
290 | mov dx, WORD PTR [bp+6] | ||
291 | mov ax, WORD PTR [bp+8] | ||
292 | div WORD PTR [bp+10] | ||
293 | pop bp | ||
294 | ret | ||
295 | _bn_div64 ENDP | ||
296 | F_TEXT ENDS | ||
297 | END | ||
diff --git a/src/lib/libssl/src/crypto/bn/asm/x86w32.asm b/src/lib/libssl/src/crypto/bn/asm/x86w32.asm index 957d71e3b1..e69de29bb2 100644 --- a/src/lib/libssl/src/crypto/bn/asm/x86w32.asm +++ b/src/lib/libssl/src/crypto/bn/asm/x86w32.asm | |||
@@ -1,360 +0,0 @@ | |||
1 | ; Static Name Aliases | ||
2 | ; | ||
3 | TITLE bn_mulw.c | ||
4 | .386 | ||
5 | F_TEXT SEGMENT WORD USE16 PUBLIC 'CODE' | ||
6 | F_TEXT ENDS | ||
7 | _DATA SEGMENT WORD USE16 PUBLIC 'DATA' | ||
8 | _DATA ENDS | ||
9 | _CONST SEGMENT WORD USE16 PUBLIC 'CONST' | ||
10 | _CONST ENDS | ||
11 | _BSS SEGMENT WORD USE16 PUBLIC 'BSS' | ||
12 | _BSS ENDS | ||
13 | DGROUP GROUP _CONST, _BSS, _DATA | ||
14 | ASSUME DS: DGROUP, SS: DGROUP | ||
15 | F_TEXT SEGMENT | ||
16 | ASSUME CS: F_TEXT | ||
17 | PUBLIC _bn_mul_add_words | ||
18 | _bn_mul_add_words PROC FAR | ||
19 | ; Line 58 | ||
20 | push bp | ||
21 | push bx | ||
22 | push esi | ||
23 | push di | ||
24 | push ds | ||
25 | push es | ||
26 | mov bp,sp | ||
27 | ; w = 28 | ||
28 | ; num = 26 | ||
29 | ; ap = 22 | ||
30 | ; rp = 18 | ||
31 | xor esi,esi ;c=0; | ||
32 | mov di,WORD PTR [bp+18] ; load r | ||
33 | mov ds,WORD PTR [bp+20] ; load r | ||
34 | mov bx,WORD PTR [bp+22] ; load a | ||
35 | mov es,WORD PTR [bp+24] ; load a | ||
36 | mov ecx,DWORD PTR [bp+28] ; load w | ||
37 | mov bp,WORD PTR [bp+26] ; load num | ||
38 | shr bp,1 ; div count by 4 and do groups of 4 | ||
39 | shr bp,1 | ||
40 | je $L555 | ||
41 | |||
42 | $L546: | ||
43 | mov eax,ecx | ||
44 | mul DWORD PTR es:[bx] ; w* *a | ||
45 | add eax,DWORD PTR ds:[di] ; + *r | ||
46 | adc edx,0 | ||
47 | adc eax,esi | ||
48 | adc edx,0 | ||
49 | mov DWORD PTR ds:[di],eax | ||
50 | mov esi,edx | ||
51 | ; | ||
52 | mov eax,ecx | ||
53 | mul DWORD PTR es:[bx+4] ; w* *a | ||
54 | add eax,DWORD PTR ds:[di+4] ; + *r | ||
55 | adc edx,0 | ||
56 | adc eax,esi | ||
57 | adc edx,0 | ||
58 | mov DWORD PTR ds:[di+4],eax | ||
59 | mov esi,edx | ||
60 | ; | ||
61 | mov eax,ecx | ||
62 | mul DWORD PTR es:[bx+8] ; w* *a | ||
63 | add eax,DWORD PTR ds:[di+8] ; + *r | ||
64 | adc edx,0 | ||
65 | adc eax,esi | ||
66 | adc edx,0 | ||
67 | mov DWORD PTR ds:[di+8],eax | ||
68 | mov esi,edx | ||
69 | ; | ||
70 | mov eax,ecx | ||
71 | mul DWORD PTR es:[bx+12] ; w* *a | ||
72 | add eax,DWORD PTR ds:[di+12] ; + *r | ||
73 | adc edx,0 | ||
74 | adc eax,esi | ||
75 | adc edx,0 | ||
76 | mov DWORD PTR ds:[di+12],eax | ||
77 | mov esi,edx | ||
78 | ; | ||
79 | add bx,16 | ||
80 | add di,16 | ||
81 | ; | ||
82 | dec bp | ||
83 | je $L555 | ||
84 | jmp $L546 | ||
85 | ; | ||
86 | ; | ||
87 | $L555: | ||
88 | mov bp,sp | ||
89 | mov bp,WORD PTR [bp+26] ; load num | ||
90 | and bp,3 | ||
91 | dec bp | ||
92 | js $L547m | ||
93 | |||
94 | mov eax,ecx | ||
95 | mul DWORD PTR es:[bx] ; w* *a | ||
96 | add eax,DWORD PTR ds:[di] ; + *r | ||
97 | adc edx,0 | ||
98 | adc eax,esi | ||
99 | adc edx,0 | ||
100 | mov DWORD PTR ds:[di],eax | ||
101 | mov esi,edx | ||
102 | dec bp | ||
103 | js $L547m ; Note that we are now testing for -1 | ||
104 | ; | ||
105 | mov eax,ecx | ||
106 | mul DWORD PTR es:[bx+4] ; w* *a | ||
107 | add eax,DWORD PTR ds:[di+4] ; + *r | ||
108 | adc edx,0 | ||
109 | adc eax,esi | ||
110 | adc edx,0 | ||
111 | mov DWORD PTR ds:[di+4],eax | ||
112 | mov esi,edx | ||
113 | dec bp | ||
114 | js $L547m | ||
115 | ; | ||
116 | mov eax,ecx | ||
117 | mul DWORD PTR es:[bx+8] ; w* *a | ||
118 | add eax,DWORD PTR ds:[di+8] ; + *r | ||
119 | adc edx,0 | ||
120 | adc eax,esi | ||
121 | adc edx,0 | ||
122 | mov DWORD PTR ds:[di+8],eax | ||
123 | mov esi,edx | ||
124 | $L547m: | ||
125 | mov eax,esi | ||
126 | mov edx,esi | ||
127 | shr edx,16 | ||
128 | pop es | ||
129 | pop ds | ||
130 | pop di | ||
131 | pop esi | ||
132 | pop bx | ||
133 | pop bp | ||
134 | ret | ||
135 | nop | ||
136 | _bn_mul_add_words ENDP | ||
137 | |||
138 | PUBLIC _bn_mul_words | ||
139 | _bn_mul_words PROC FAR | ||
140 | ; Line 76 | ||
141 | push bp | ||
142 | push bx | ||
143 | push esi | ||
144 | push di | ||
145 | push ds | ||
146 | push es | ||
147 | xor esi,esi | ||
148 | mov bp,sp | ||
149 | mov di,WORD PTR [bp+18] ; r | ||
150 | mov ds,WORD PTR [bp+20] | ||
151 | mov bx,WORD PTR [bp+22] ; a | ||
152 | mov es,WORD PTR [bp+24] | ||
153 | mov ecx,DWORD PTR [bp+28] ; w | ||
154 | mov bp,WORD PTR [bp+26] ; num | ||
155 | |||
156 | $FC743: | ||
157 | mov eax,ecx | ||
158 | mul DWORD PTR es:[bx] | ||
159 | add eax,esi | ||
160 | adc edx,0 | ||
161 | mov DWORD PTR ds:[di],eax | ||
162 | mov esi,edx | ||
163 | dec bp | ||
164 | je $L764 | ||
165 | ; | ||
166 | mov eax,ecx | ||
167 | mul DWORD PTR es:[bx+4] | ||
168 | add eax,esi | ||
169 | adc edx,0 | ||
170 | mov DWORD PTR ds:[di+4],eax | ||
171 | mov esi,edx | ||
172 | dec bp | ||
173 | je $L764 | ||
174 | ; | ||
175 | mov eax,ecx | ||
176 | mul DWORD PTR es:[bx+8] | ||
177 | add eax,esi | ||
178 | adc edx,0 | ||
179 | mov DWORD PTR ds:[di+8],eax | ||
180 | mov esi,edx | ||
181 | dec bp | ||
182 | je $L764 | ||
183 | ; | ||
184 | mov eax,ecx | ||
185 | mul DWORD PTR es:[bx+12] | ||
186 | add eax,esi | ||
187 | adc edx,0 | ||
188 | mov DWORD PTR ds:[di+12],eax | ||
189 | mov esi,edx | ||
190 | dec bp | ||
191 | je $L764 | ||
192 | ; | ||
193 | add bx,16 | ||
194 | add di,16 | ||
195 | jmp $FC743 | ||
196 | nop | ||
197 | $L764: | ||
198 | mov eax,esi | ||
199 | mov edx,esi | ||
200 | shr edx,16 | ||
201 | pop es | ||
202 | pop ds | ||
203 | pop di | ||
204 | pop esi | ||
205 | pop bx | ||
206 | pop bp | ||
207 | ret | ||
208 | nop | ||
209 | _bn_mul_words ENDP | ||
210 | PUBLIC _bn_sqr_words | ||
211 | _bn_sqr_words PROC FAR | ||
212 | ; Line 92 | ||
213 | push bp | ||
214 | push bx | ||
215 | push si | ||
216 | push di | ||
217 | push ds | ||
218 | push es | ||
219 | mov bp,sp | ||
220 | mov si,WORD PTR [bp+16] | ||
221 | mov ds,WORD PTR [bp+18] | ||
222 | mov di,WORD PTR [bp+20] | ||
223 | mov es,WORD PTR [bp+22] | ||
224 | mov bx,WORD PTR [bp+24] | ||
225 | |||
226 | mov bp,bx ; save a memory lookup later | ||
227 | shr bx,1 ; div count by 4 and do groups of 4 | ||
228 | shr bx,1 | ||
229 | je $L666 | ||
230 | |||
231 | $L765: | ||
232 | mov eax,DWORD PTR es:[di] | ||
233 | mul eax | ||
234 | mov DWORD PTR ds:[si],eax | ||
235 | mov DWORD PTR ds:[si+4],edx | ||
236 | ; | ||
237 | mov eax,DWORD PTR es:[di+4] | ||
238 | mul eax | ||
239 | mov DWORD PTR ds:[si+8],eax | ||
240 | mov DWORD PTR ds:[si+12],edx | ||
241 | ; | ||
242 | mov eax,DWORD PTR es:[di+8] | ||
243 | mul eax | ||
244 | mov DWORD PTR ds:[si+16],eax | ||
245 | mov DWORD PTR ds:[si+20],edx | ||
246 | ; | ||
247 | mov eax,DWORD PTR es:[di+12] | ||
248 | mul eax | ||
249 | mov DWORD PTR ds:[si+24],eax | ||
250 | mov DWORD PTR ds:[si+28],edx | ||
251 | ; | ||
252 | add di,16 | ||
253 | add si,32 | ||
254 | dec bx | ||
255 | je $L666 | ||
256 | jmp $L765 | ||
257 | $L666: | ||
258 | and bp,3 | ||
259 | dec bp ; The copied value of bx (num) | ||
260 | js $L645 | ||
261 | ; | ||
262 | mov eax,DWORD PTR es:[di] | ||
263 | mul eax | ||
264 | mov DWORD PTR ds:[si],eax | ||
265 | mov DWORD PTR ds:[si+4],edx | ||
266 | dec bp | ||
267 | js $L645 | ||
268 | ; | ||
269 | mov eax,DWORD PTR es:[di+4] | ||
270 | mul eax | ||
271 | mov DWORD PTR ds:[si+8],eax | ||
272 | mov DWORD PTR ds:[si+12],edx | ||
273 | dec bp | ||
274 | js $L645 | ||
275 | ; | ||
276 | mov eax,DWORD PTR es:[di+8] | ||
277 | mul eax | ||
278 | mov DWORD PTR ds:[si+16],eax | ||
279 | mov DWORD PTR ds:[si+20],edx | ||
280 | $L645: | ||
281 | pop es | ||
282 | pop ds | ||
283 | pop di | ||
284 | pop si | ||
285 | pop bx | ||
286 | pop bp | ||
287 | ret | ||
288 | _bn_sqr_words ENDP | ||
289 | |||
290 | PUBLIC _bn_div64 | ||
291 | _bn_div64 PROC FAR | ||
292 | push bp | ||
293 | mov bp,sp | ||
294 | mov edx, DWORD PTR [bp+6] | ||
295 | mov eax, DWORD PTR [bp+10] | ||
296 | div DWORD PTR [bp+14] | ||
297 | mov edx,eax | ||
298 | shr edx,16 | ||
299 | pop bp | ||
300 | ret | ||
301 | _bn_div64 ENDP | ||
302 | |||
303 | PUBLIC _bn_add_words | ||
304 | _bn_add_words PROC FAR | ||
305 | ; Line 58 | ||
306 | push bp | ||
307 | push bx | ||
308 | push esi | ||
309 | push di | ||
310 | push ds | ||
311 | push es | ||
312 | mov bp,sp | ||
313 | ; w = 28 | ||
314 | ; num = 26 | ||
315 | ; ap = 22 | ||
316 | ; rp = 18 | ||
317 | xor esi,esi ;c=0; | ||
318 | mov bx,WORD PTR [bp+18] ; load low r | ||
319 | mov si,WORD PTR [bp+22] ; load a | ||
320 | mov es,WORD PTR [bp+24] ; load a | ||
321 | mov di,WORD PTR [bp+26] ; load b | ||
322 | mov ds,WORD PTR [bp+28] ; load b | ||
323 | |||
324 | mov dx,WORD PTR [bp+30] ; load num | ||
325 | xor ecx,ecx | ||
326 | dec dx | ||
327 | js $L547a | ||
328 | |||
329 | $L5477: | ||
330 | mov eax,DWORD PTR es:[si] ; *a | ||
331 | add eax,ecx | ||
332 | mov ecx,0 | ||
333 | adc ecx,0 | ||
334 | add si,4 ; a++ | ||
335 | add eax,DWORD PTR ds:[di] ; + *b | ||
336 | adc ecx,0 | ||
337 | mov ds,WORD PTR [bp+20] | ||
338 | add di,4 | ||
339 | mov DWORD PTR ds:[bx],eax | ||
340 | mov ds,WORD PTR [bp+28] | ||
341 | add bx,4 | ||
342 | dec dx | ||
343 | js $L547a ; Note that we are now testing for -1 | ||
344 | jmp $L5477 | ||
345 | ; | ||
346 | $L547a: | ||
347 | mov eax,ecx | ||
348 | mov edx,ecx | ||
349 | shr edx,16 | ||
350 | pop es | ||
351 | pop ds | ||
352 | pop di | ||
353 | pop esi | ||
354 | pop bx | ||
355 | pop bp | ||
356 | ret | ||
357 | nop | ||
358 | _bn_add_words ENDP | ||
359 | F_TEXT ENDS | ||
360 | END | ||
diff --git a/src/lib/libssl/src/crypto/bn/bn.h b/src/lib/libssl/src/crypto/bn/bn.h index d8822610df..009b0eb685 100644 --- a/src/lib/libssl/src/crypto/bn/bn.h +++ b/src/lib/libssl/src/crypto/bn/bn.h | |||
@@ -89,7 +89,7 @@ extern "C" { | |||
89 | * For machines with only one compiler (or shared libraries), this should | 89 | * For machines with only one compiler (or shared libraries), this should |
90 | * be on. Again this in only really a problem on machines | 90 | * be on. Again this in only really a problem on machines |
91 | * using "long long's", are 32bit, and are not using my assembler code. */ | 91 | * using "long long's", are 32bit, and are not using my assembler code. */ |
92 | #if defined(MSDOS) || defined(WINDOWS) || defined(linux) | 92 | #if defined(MSDOS) || defined(WINDOWS) || defined(WIN32) || defined(linux) |
93 | #define BN_DIV2W | 93 | #define BN_DIV2W |
94 | #endif | 94 | #endif |
95 | 95 | ||
diff --git a/src/lib/libssl/src/crypto/bn/bn_err.c b/src/lib/libssl/src/crypto/bn/bn_err.c index f3b9497dca..988270bcf4 100644 --- a/src/lib/libssl/src/crypto/bn/bn_err.c +++ b/src/lib/libssl/src/crypto/bn/bn_err.c | |||
@@ -54,7 +54,8 @@ | |||
54 | */ | 54 | */ |
55 | 55 | ||
56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes |
57 | * made to it will be overwritten when the script next updates this file. | 57 | * made to it will be overwritten when the script next updates this file, |
58 | * only reason strings will be preserved. | ||
58 | */ | 59 | */ |
59 | 60 | ||
60 | #include <stdio.h> | 61 | #include <stdio.h> |
diff --git a/src/lib/libssl/src/crypto/bn/bn_mont.c b/src/lib/libssl/src/crypto/bn/bn_mont.c index 7bb0b91223..598fecbf0c 100644 --- a/src/lib/libssl/src/crypto/bn/bn_mont.c +++ b/src/lib/libssl/src/crypto/bn/bn_mont.c | |||
@@ -73,6 +73,7 @@ int BN_mod_mul_montgomery(BIGNUM *r, BIGNUM *a, BIGNUM *b, | |||
73 | BN_MONT_CTX *mont, BN_CTX *ctx) | 73 | BN_MONT_CTX *mont, BN_CTX *ctx) |
74 | { | 74 | { |
75 | BIGNUM *tmp,*tmp2; | 75 | BIGNUM *tmp,*tmp2; |
76 | int ret=0; | ||
76 | 77 | ||
77 | BN_CTX_start(ctx); | 78 | BN_CTX_start(ctx); |
78 | tmp = BN_CTX_get(ctx); | 79 | tmp = BN_CTX_get(ctx); |
@@ -101,10 +102,10 @@ int BN_mod_mul_montgomery(BIGNUM *r, BIGNUM *a, BIGNUM *b, | |||
101 | } | 102 | } |
102 | /* reduce from aRR to aR */ | 103 | /* reduce from aRR to aR */ |
103 | if (!BN_from_montgomery(r,tmp,mont,ctx)) goto err; | 104 | if (!BN_from_montgomery(r,tmp,mont,ctx)) goto err; |
104 | BN_CTX_end(ctx); | 105 | ret=1; |
105 | return(1); | ||
106 | err: | 106 | err: |
107 | return(0); | 107 | BN_CTX_end(ctx); |
108 | return(ret); | ||
108 | } | 109 | } |
109 | 110 | ||
110 | int BN_from_montgomery(BIGNUM *ret, BIGNUM *a, BN_MONT_CTX *mont, | 111 | int BN_from_montgomery(BIGNUM *ret, BIGNUM *a, BN_MONT_CTX *mont, |
diff --git a/src/lib/libssl/src/crypto/bn/bn_mul.c b/src/lib/libssl/src/crypto/bn/bn_mul.c index eb007e19e9..3e8baaad9a 100644 --- a/src/lib/libssl/src/crypto/bn/bn_mul.c +++ b/src/lib/libssl/src/crypto/bn/bn_mul.c | |||
@@ -61,6 +61,9 @@ | |||
61 | #include "bn_lcl.h" | 61 | #include "bn_lcl.h" |
62 | 62 | ||
63 | #ifdef BN_RECURSION | 63 | #ifdef BN_RECURSION |
64 | /* Karatsuba recursive multiplication algorithm | ||
65 | * (cf. Knuth, The Art of Computer Programming, Vol. 2) */ | ||
66 | |||
64 | /* r is 2*n2 words in size, | 67 | /* r is 2*n2 words in size, |
65 | * a and b are both n2 words in size. | 68 | * a and b are both n2 words in size. |
66 | * n2 must be a power of 2. | 69 | * n2 must be a power of 2. |
diff --git a/src/lib/libssl/src/crypto/bn/bntest.c b/src/lib/libssl/src/crypto/bn/bntest.c index 41c22f5954..0a97af69c5 100644 --- a/src/lib/libssl/src/crypto/bn/bntest.c +++ b/src/lib/libssl/src/crypto/bn/bntest.c | |||
@@ -234,7 +234,8 @@ int main(int argc, char *argv[]) | |||
234 | /**/ | 234 | /**/ |
235 | exit(0); | 235 | exit(0); |
236 | err: | 236 | err: |
237 | BIO_puts(out,"1\n"); /* make sure bc fails if we are piping to it */ | 237 | BIO_puts(out,"1\n"); /* make sure the Perl script fed by bc notices |
238 | * the failure, see test_bn in test/Makefile.ssl*/ | ||
238 | BIO_flush(out); | 239 | BIO_flush(out); |
239 | ERR_load_crypto_strings(); | 240 | ERR_load_crypto_strings(); |
240 | ERR_print_errors_fp(stderr); | 241 | ERR_print_errors_fp(stderr); |
diff --git a/src/lib/libssl/src/crypto/buffer/buf_err.c b/src/lib/libssl/src/crypto/buffer/buf_err.c index 7f9fd1f6c3..2f971a5f38 100644 --- a/src/lib/libssl/src/crypto/buffer/buf_err.c +++ b/src/lib/libssl/src/crypto/buffer/buf_err.c | |||
@@ -54,7 +54,8 @@ | |||
54 | */ | 54 | */ |
55 | 55 | ||
56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes |
57 | * made to it will be overwritten when the script next updates this file. | 57 | * made to it will be overwritten when the script next updates this file, |
58 | * only reason strings will be preserved. | ||
58 | */ | 59 | */ |
59 | 60 | ||
60 | #include <stdio.h> | 61 | #include <stdio.h> |
diff --git a/src/lib/libssl/src/crypto/cast/Makefile.ssl b/src/lib/libssl/src/crypto/cast/Makefile.ssl index 763148e314..4c70d1e3e8 100644 --- a/src/lib/libssl/src/crypto/cast/Makefile.ssl +++ b/src/lib/libssl/src/crypto/cast/Makefile.ssl | |||
@@ -52,7 +52,7 @@ lib: $(LIBOBJ) | |||
52 | 52 | ||
53 | # elf | 53 | # elf |
54 | asm/cx86-elf.o: asm/cx86unix.cpp | 54 | asm/cx86-elf.o: asm/cx86unix.cpp |
55 | $(CPP) -DELF asm/cx86unix.cpp | as -o asm/cx86-elf.o | 55 | $(CPP) -DELF -x c asm/cx86unix.cpp | as -o asm/cx86-elf.o |
56 | 56 | ||
57 | # solaris | 57 | # solaris |
58 | asm/cx86-sol.o: asm/cx86unix.cpp | 58 | asm/cx86-sol.o: asm/cx86unix.cpp |
@@ -68,7 +68,7 @@ asm/cx86-out.o: asm/cx86unix.cpp | |||
68 | asm/cx86bsdi.o: asm/cx86unix.cpp | 68 | asm/cx86bsdi.o: asm/cx86unix.cpp |
69 | $(CPP) -DBSDI asm/cx86unix.cpp | sed 's/ :/:/' | as -o asm/cx86bsdi.o | 69 | $(CPP) -DBSDI asm/cx86unix.cpp | sed 's/ :/:/' | as -o asm/cx86bsdi.o |
70 | 70 | ||
71 | asm/cx86unix.cpp: asm/cast-586.pl | 71 | asm/cx86unix.cpp: asm/cast-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl |
72 | (cd asm; $(PERL) cast-586.pl cpp $(PROCESSOR) >cx86unix.cpp) | 72 | (cd asm; $(PERL) cast-586.pl cpp $(PROCESSOR) >cx86unix.cpp) |
73 | 73 | ||
74 | files: | 74 | files: |
diff --git a/src/lib/libssl/src/crypto/cast/Makefile.uni b/src/lib/libssl/src/crypto/cast/Makefile.uni index a5870897cf..e69de29bb2 100644 --- a/src/lib/libssl/src/crypto/cast/Makefile.uni +++ b/src/lib/libssl/src/crypto/cast/Makefile.uni | |||
@@ -1,124 +0,0 @@ | |||
1 | # Targets | ||
2 | # make - twidle the options yourself :-) | ||
3 | # make cc - standard cc options | ||
4 | # make gcc - standard gcc options | ||
5 | # make x86-elf - linux-elf etc | ||
6 | # make x86-out - linux-a.out, FreeBSD etc | ||
7 | # make x86-solaris | ||
8 | # make x86-bdsi | ||
9 | |||
10 | # There are 3 possible performance options, experiment :-) | ||
11 | #OPTS= -DBF_PTR | ||
12 | #OPTS= -DBF_PTR2 | ||
13 | OPTS= | ||
14 | |||
15 | DIR= cast | ||
16 | TOP= . | ||
17 | CC= gcc | ||
18 | CFLAG= -O3 -fomit-frame-pointer | ||
19 | |||
20 | CPP= $(CC) -E | ||
21 | INCLUDES= | ||
22 | INSTALLTOP=/usr/local/lib | ||
23 | MAKE= make | ||
24 | MAKEDEPEND= makedepend | ||
25 | MAKEFILE= Makefile.uni | ||
26 | AR= ar r | ||
27 | RANLIB= ranlib | ||
28 | |||
29 | CAST_ENC=c_enc.o | ||
30 | # or use | ||
31 | #CAST_ENC=asm/cx86-elf.o | ||
32 | #CAST_ENC=asm/cx86-out.o | ||
33 | #CAST_ENC=asm/cx86-sol.o | ||
34 | #CAST_ENC=asm/cx86bdsi.o | ||
35 | |||
36 | CFLAGS= $(OPTS) $(INCLUDES) $(CFLAG) -DFULL_TEST | ||
37 | |||
38 | GENERAL=Makefile | ||
39 | TEST=casttest | ||
40 | APP1=cast_spd | ||
41 | APP2=castopts | ||
42 | APPS=$(APP1) $(APP2) | ||
43 | |||
44 | LIB=libcast.a | ||
45 | LIBSRC=c_skey.c c_ecb.c c_enc.c c_cfb64.c c_ofb64.c | ||
46 | LIBOBJ=c_skey.o c_ecb.o $(CAST_ENC) c_cfb64.o c_ofb64.o | ||
47 | |||
48 | SRC= $(LIBSRC) | ||
49 | |||
50 | EXHEADER= cast.h | ||
51 | HEADER= cast_lcl.h $(EXHEADER) | ||
52 | |||
53 | ALL= $(GENERAL) $(SRC) $(HEADER) | ||
54 | |||
55 | all: $(LIB) $(TEST) $(APPS) | ||
56 | |||
57 | $(LIB): $(LIBOBJ) | ||
58 | $(AR) $(LIB) $(LIBOBJ) | ||
59 | $(RANLIB) $(LIB) | ||
60 | # elf | ||
61 | asm/cx86-elf.o: asm/cx86unix.cpp | ||
62 | $(CPP) -DELF asm/cx86unix.cpp | as -o asm/cx86-elf.o | ||
63 | |||
64 | # solaris | ||
65 | asm/cx86-sol.o: asm/cx86unix.cpp | ||
66 | $(CC) -E -DSOL asm/cx86unix.cpp | sed 's/^#.*//' > asm/cx86-sol.s | ||
67 | as -o asm/cx86-sol.o asm/cx86-sol.s | ||
68 | rm -f asm/cx86-sol.s | ||
69 | |||
70 | # a.out | ||
71 | asm/cx86-out.o: asm/cx86unix.cpp | ||
72 | $(CPP) -DOUT asm/cx86unix.cpp | as -o asm/cx86-out.o | ||
73 | |||
74 | # bsdi | ||
75 | asm/cx86bsdi.o: asm/cx86unix.cpp | ||
76 | $(CPP) -DBSDI asm/cx86unix.cpp | as -o asm/cx86bsdi.o | ||
77 | |||
78 | asm/cx86unix.cpp: | ||
79 | (cd asm; perl cast-586.pl cpp >cx86unix.cpp) | ||
80 | |||
81 | test: $(TEST) | ||
82 | ./$(TEST) | ||
83 | |||
84 | $(TEST): $(TEST).c $(LIB) | ||
85 | $(CC) -o $(TEST) $(CFLAGS) $(TEST).c $(LIB) | ||
86 | |||
87 | $(APP1): $(APP1).c $(LIB) | ||
88 | $(CC) -o $(APP1) $(CFLAGS) $(APP1).c $(LIB) | ||
89 | |||
90 | $(APP2): $(APP2).c $(LIB) | ||
91 | $(CC) -o $(APP2) $(CFLAGS) $(APP2).c $(LIB) | ||
92 | |||
93 | lint: | ||
94 | lint -DLINT $(INCLUDES) $(SRC)>fluff | ||
95 | |||
96 | depend: | ||
97 | $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) | ||
98 | |||
99 | dclean: | ||
100 | perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new | ||
101 | mv -f Makefile.new $(MAKEFILE) | ||
102 | |||
103 | clean: | ||
104 | /bin/rm -f $(LIB) $(TEST) $(APPS) *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff | ||
105 | |||
106 | cc: | ||
107 | $(MAKE) CC="cc" CFLAG="-O" all | ||
108 | |||
109 | gcc: | ||
110 | $(MAKE) CC="gcc" CFLAGS="-O3 -fomit-frame-pointer" all | ||
111 | |||
112 | x86-elf: | ||
113 | $(MAKE) CAST_ENC="asm/cx86-elf.o" CFLAG="-DELF $(CFLAGS)" all | ||
114 | |||
115 | x86-out: | ||
116 | $(MAKE) CAST_ENC="asm/cx86-out.o" CFLAG="-DOUT $(CFLAGS)" all | ||
117 | |||
118 | x86-solaris: | ||
119 | $(MAKE) CAST_ENC="asm/cx86-sol.o" CFLAG="-DSOL $(CFLAGS)" all | ||
120 | |||
121 | x86-bdsi: | ||
122 | $(MAKE) CAST_ENC="asm/cx86-bdsi.o" CFLAG="-DBDSI $(CFLAGS)" all | ||
123 | |||
124 | # DO NOT DELETE THIS LINE -- make depend depends on it. | ||
diff --git a/src/lib/libssl/src/crypto/cast/asm/c-win32.asm b/src/lib/libssl/src/crypto/cast/asm/c-win32.asm index ba78a3c69c..e69de29bb2 100644 --- a/src/lib/libssl/src/crypto/cast/asm/c-win32.asm +++ b/src/lib/libssl/src/crypto/cast/asm/c-win32.asm | |||
@@ -1,953 +0,0 @@ | |||
1 | ; Don't even think of reading this code | ||
2 | ; It was automatically generated by cast-586.pl | ||
3 | ; Which is a perl program used to generate the x86 assember for | ||
4 | ; any of elf, a.out, BSDI,Win32, or Solaris | ||
5 | ; eric <eay@cryptsoft.com> | ||
6 | ; | ||
7 | TITLE cast-586.asm | ||
8 | .486 | ||
9 | .model FLAT | ||
10 | _TEXT SEGMENT | ||
11 | PUBLIC _CAST_encrypt | ||
12 | EXTERN _CAST_S_table0:DWORD | ||
13 | EXTERN _CAST_S_table1:DWORD | ||
14 | EXTERN _CAST_S_table2:DWORD | ||
15 | EXTERN _CAST_S_table3:DWORD | ||
16 | |||
17 | _CAST_encrypt PROC NEAR | ||
18 | ; | ||
19 | push ebp | ||
20 | push ebx | ||
21 | mov ebx, DWORD PTR 12[esp] | ||
22 | mov ebp, DWORD PTR 16[esp] | ||
23 | push esi | ||
24 | push edi | ||
25 | ; Load the 2 words | ||
26 | mov edi, DWORD PTR [ebx] | ||
27 | mov esi, DWORD PTR 4[ebx] | ||
28 | ; Get short key flag | ||
29 | mov eax, DWORD PTR 128[ebp] | ||
30 | push eax | ||
31 | xor eax, eax | ||
32 | ; round 0 | ||
33 | mov edx, DWORD PTR [ebp] | ||
34 | mov ecx, DWORD PTR 4[ebp] | ||
35 | add edx, esi | ||
36 | rol edx, cl | ||
37 | mov ebx, edx | ||
38 | xor ecx, ecx | ||
39 | mov cl, dh | ||
40 | and ebx, 255 | ||
41 | shr edx, 16 | ||
42 | xor eax, eax | ||
43 | mov al, dh | ||
44 | and edx, 255 | ||
45 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
46 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
47 | xor ecx, ebx | ||
48 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
49 | sub ecx, ebx | ||
50 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
51 | add ecx, ebx | ||
52 | xor edi, ecx | ||
53 | ; round 1 | ||
54 | mov edx, DWORD PTR 8[ebp] | ||
55 | mov ecx, DWORD PTR 12[ebp] | ||
56 | xor edx, edi | ||
57 | rol edx, cl | ||
58 | mov ebx, edx | ||
59 | xor ecx, ecx | ||
60 | mov cl, dh | ||
61 | and ebx, 255 | ||
62 | shr edx, 16 | ||
63 | xor eax, eax | ||
64 | mov al, dh | ||
65 | and edx, 255 | ||
66 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
67 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
68 | sub ecx, ebx | ||
69 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
70 | add ecx, ebx | ||
71 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
72 | xor ecx, ebx | ||
73 | xor esi, ecx | ||
74 | ; round 2 | ||
75 | mov edx, DWORD PTR 16[ebp] | ||
76 | mov ecx, DWORD PTR 20[ebp] | ||
77 | sub edx, esi | ||
78 | rol edx, cl | ||
79 | mov ebx, edx | ||
80 | xor ecx, ecx | ||
81 | mov cl, dh | ||
82 | and ebx, 255 | ||
83 | shr edx, 16 | ||
84 | xor eax, eax | ||
85 | mov al, dh | ||
86 | and edx, 255 | ||
87 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
88 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
89 | add ecx, ebx | ||
90 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
91 | xor ecx, ebx | ||
92 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
93 | sub ecx, ebx | ||
94 | xor edi, ecx | ||
95 | ; round 3 | ||
96 | mov edx, DWORD PTR 24[ebp] | ||
97 | mov ecx, DWORD PTR 28[ebp] | ||
98 | add edx, edi | ||
99 | rol edx, cl | ||
100 | mov ebx, edx | ||
101 | xor ecx, ecx | ||
102 | mov cl, dh | ||
103 | and ebx, 255 | ||
104 | shr edx, 16 | ||
105 | xor eax, eax | ||
106 | mov al, dh | ||
107 | and edx, 255 | ||
108 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
109 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
110 | xor ecx, ebx | ||
111 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
112 | sub ecx, ebx | ||
113 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
114 | add ecx, ebx | ||
115 | xor esi, ecx | ||
116 | ; round 4 | ||
117 | mov edx, DWORD PTR 32[ebp] | ||
118 | mov ecx, DWORD PTR 36[ebp] | ||
119 | xor edx, esi | ||
120 | rol edx, cl | ||
121 | mov ebx, edx | ||
122 | xor ecx, ecx | ||
123 | mov cl, dh | ||
124 | and ebx, 255 | ||
125 | shr edx, 16 | ||
126 | xor eax, eax | ||
127 | mov al, dh | ||
128 | and edx, 255 | ||
129 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
130 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
131 | sub ecx, ebx | ||
132 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
133 | add ecx, ebx | ||
134 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
135 | xor ecx, ebx | ||
136 | xor edi, ecx | ||
137 | ; round 5 | ||
138 | mov edx, DWORD PTR 40[ebp] | ||
139 | mov ecx, DWORD PTR 44[ebp] | ||
140 | sub edx, edi | ||
141 | rol edx, cl | ||
142 | mov ebx, edx | ||
143 | xor ecx, ecx | ||
144 | mov cl, dh | ||
145 | and ebx, 255 | ||
146 | shr edx, 16 | ||
147 | xor eax, eax | ||
148 | mov al, dh | ||
149 | and edx, 255 | ||
150 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
151 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
152 | add ecx, ebx | ||
153 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
154 | xor ecx, ebx | ||
155 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
156 | sub ecx, ebx | ||
157 | xor esi, ecx | ||
158 | ; round 6 | ||
159 | mov edx, DWORD PTR 48[ebp] | ||
160 | mov ecx, DWORD PTR 52[ebp] | ||
161 | add edx, esi | ||
162 | rol edx, cl | ||
163 | mov ebx, edx | ||
164 | xor ecx, ecx | ||
165 | mov cl, dh | ||
166 | and ebx, 255 | ||
167 | shr edx, 16 | ||
168 | xor eax, eax | ||
169 | mov al, dh | ||
170 | and edx, 255 | ||
171 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
172 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
173 | xor ecx, ebx | ||
174 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
175 | sub ecx, ebx | ||
176 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
177 | add ecx, ebx | ||
178 | xor edi, ecx | ||
179 | ; round 7 | ||
180 | mov edx, DWORD PTR 56[ebp] | ||
181 | mov ecx, DWORD PTR 60[ebp] | ||
182 | xor edx, edi | ||
183 | rol edx, cl | ||
184 | mov ebx, edx | ||
185 | xor ecx, ecx | ||
186 | mov cl, dh | ||
187 | and ebx, 255 | ||
188 | shr edx, 16 | ||
189 | xor eax, eax | ||
190 | mov al, dh | ||
191 | and edx, 255 | ||
192 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
193 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
194 | sub ecx, ebx | ||
195 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
196 | add ecx, ebx | ||
197 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
198 | xor ecx, ebx | ||
199 | xor esi, ecx | ||
200 | ; round 8 | ||
201 | mov edx, DWORD PTR 64[ebp] | ||
202 | mov ecx, DWORD PTR 68[ebp] | ||
203 | sub edx, esi | ||
204 | rol edx, cl | ||
205 | mov ebx, edx | ||
206 | xor ecx, ecx | ||
207 | mov cl, dh | ||
208 | and ebx, 255 | ||
209 | shr edx, 16 | ||
210 | xor eax, eax | ||
211 | mov al, dh | ||
212 | and edx, 255 | ||
213 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
214 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
215 | add ecx, ebx | ||
216 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
217 | xor ecx, ebx | ||
218 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
219 | sub ecx, ebx | ||
220 | xor edi, ecx | ||
221 | ; round 9 | ||
222 | mov edx, DWORD PTR 72[ebp] | ||
223 | mov ecx, DWORD PTR 76[ebp] | ||
224 | add edx, edi | ||
225 | rol edx, cl | ||
226 | mov ebx, edx | ||
227 | xor ecx, ecx | ||
228 | mov cl, dh | ||
229 | and ebx, 255 | ||
230 | shr edx, 16 | ||
231 | xor eax, eax | ||
232 | mov al, dh | ||
233 | and edx, 255 | ||
234 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
235 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
236 | xor ecx, ebx | ||
237 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
238 | sub ecx, ebx | ||
239 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
240 | add ecx, ebx | ||
241 | xor esi, ecx | ||
242 | ; round 10 | ||
243 | mov edx, DWORD PTR 80[ebp] | ||
244 | mov ecx, DWORD PTR 84[ebp] | ||
245 | xor edx, esi | ||
246 | rol edx, cl | ||
247 | mov ebx, edx | ||
248 | xor ecx, ecx | ||
249 | mov cl, dh | ||
250 | and ebx, 255 | ||
251 | shr edx, 16 | ||
252 | xor eax, eax | ||
253 | mov al, dh | ||
254 | and edx, 255 | ||
255 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
256 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
257 | sub ecx, ebx | ||
258 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
259 | add ecx, ebx | ||
260 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
261 | xor ecx, ebx | ||
262 | xor edi, ecx | ||
263 | ; round 11 | ||
264 | mov edx, DWORD PTR 88[ebp] | ||
265 | mov ecx, DWORD PTR 92[ebp] | ||
266 | sub edx, edi | ||
267 | rol edx, cl | ||
268 | mov ebx, edx | ||
269 | xor ecx, ecx | ||
270 | mov cl, dh | ||
271 | and ebx, 255 | ||
272 | shr edx, 16 | ||
273 | xor eax, eax | ||
274 | mov al, dh | ||
275 | and edx, 255 | ||
276 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
277 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
278 | add ecx, ebx | ||
279 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
280 | xor ecx, ebx | ||
281 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
282 | sub ecx, ebx | ||
283 | xor esi, ecx | ||
284 | ; test short key flag | ||
285 | pop edx | ||
286 | or edx, edx | ||
287 | jnz $L000cast_enc_done | ||
288 | ; round 12 | ||
289 | mov edx, DWORD PTR 96[ebp] | ||
290 | mov ecx, DWORD PTR 100[ebp] | ||
291 | add edx, esi | ||
292 | rol edx, cl | ||
293 | mov ebx, edx | ||
294 | xor ecx, ecx | ||
295 | mov cl, dh | ||
296 | and ebx, 255 | ||
297 | shr edx, 16 | ||
298 | xor eax, eax | ||
299 | mov al, dh | ||
300 | and edx, 255 | ||
301 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
302 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
303 | xor ecx, ebx | ||
304 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
305 | sub ecx, ebx | ||
306 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
307 | add ecx, ebx | ||
308 | xor edi, ecx | ||
309 | ; round 13 | ||
310 | mov edx, DWORD PTR 104[ebp] | ||
311 | mov ecx, DWORD PTR 108[ebp] | ||
312 | xor edx, edi | ||
313 | rol edx, cl | ||
314 | mov ebx, edx | ||
315 | xor ecx, ecx | ||
316 | mov cl, dh | ||
317 | and ebx, 255 | ||
318 | shr edx, 16 | ||
319 | xor eax, eax | ||
320 | mov al, dh | ||
321 | and edx, 255 | ||
322 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
323 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
324 | sub ecx, ebx | ||
325 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
326 | add ecx, ebx | ||
327 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
328 | xor ecx, ebx | ||
329 | xor esi, ecx | ||
330 | ; round 14 | ||
331 | mov edx, DWORD PTR 112[ebp] | ||
332 | mov ecx, DWORD PTR 116[ebp] | ||
333 | sub edx, esi | ||
334 | rol edx, cl | ||
335 | mov ebx, edx | ||
336 | xor ecx, ecx | ||
337 | mov cl, dh | ||
338 | and ebx, 255 | ||
339 | shr edx, 16 | ||
340 | xor eax, eax | ||
341 | mov al, dh | ||
342 | and edx, 255 | ||
343 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
344 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
345 | add ecx, ebx | ||
346 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
347 | xor ecx, ebx | ||
348 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
349 | sub ecx, ebx | ||
350 | xor edi, ecx | ||
351 | ; round 15 | ||
352 | mov edx, DWORD PTR 120[ebp] | ||
353 | mov ecx, DWORD PTR 124[ebp] | ||
354 | add edx, edi | ||
355 | rol edx, cl | ||
356 | mov ebx, edx | ||
357 | xor ecx, ecx | ||
358 | mov cl, dh | ||
359 | and ebx, 255 | ||
360 | shr edx, 16 | ||
361 | xor eax, eax | ||
362 | mov al, dh | ||
363 | and edx, 255 | ||
364 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
365 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
366 | xor ecx, ebx | ||
367 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
368 | sub ecx, ebx | ||
369 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
370 | add ecx, ebx | ||
371 | xor esi, ecx | ||
372 | $L000cast_enc_done: | ||
373 | nop | ||
374 | mov eax, DWORD PTR 20[esp] | ||
375 | mov DWORD PTR 4[eax],edi | ||
376 | mov DWORD PTR [eax],esi | ||
377 | pop edi | ||
378 | pop esi | ||
379 | pop ebx | ||
380 | pop ebp | ||
381 | ret | ||
382 | _CAST_encrypt ENDP | ||
383 | _TEXT ENDS | ||
384 | _TEXT SEGMENT | ||
385 | PUBLIC _CAST_decrypt | ||
386 | EXTERN _CAST_S_table0:DWORD | ||
387 | EXTERN _CAST_S_table1:DWORD | ||
388 | EXTERN _CAST_S_table2:DWORD | ||
389 | EXTERN _CAST_S_table3:DWORD | ||
390 | |||
391 | _CAST_decrypt PROC NEAR | ||
392 | ; | ||
393 | push ebp | ||
394 | push ebx | ||
395 | mov ebx, DWORD PTR 12[esp] | ||
396 | mov ebp, DWORD PTR 16[esp] | ||
397 | push esi | ||
398 | push edi | ||
399 | ; Load the 2 words | ||
400 | mov edi, DWORD PTR [ebx] | ||
401 | mov esi, DWORD PTR 4[ebx] | ||
402 | ; Get short key flag | ||
403 | mov eax, DWORD PTR 128[ebp] | ||
404 | or eax, eax | ||
405 | jnz $L001cast_dec_skip | ||
406 | xor eax, eax | ||
407 | ; round 15 | ||
408 | mov edx, DWORD PTR 120[ebp] | ||
409 | mov ecx, DWORD PTR 124[ebp] | ||
410 | add edx, esi | ||
411 | rol edx, cl | ||
412 | mov ebx, edx | ||
413 | xor ecx, ecx | ||
414 | mov cl, dh | ||
415 | and ebx, 255 | ||
416 | shr edx, 16 | ||
417 | xor eax, eax | ||
418 | mov al, dh | ||
419 | and edx, 255 | ||
420 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
421 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
422 | xor ecx, ebx | ||
423 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
424 | sub ecx, ebx | ||
425 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
426 | add ecx, ebx | ||
427 | xor edi, ecx | ||
428 | ; round 14 | ||
429 | mov edx, DWORD PTR 112[ebp] | ||
430 | mov ecx, DWORD PTR 116[ebp] | ||
431 | sub edx, edi | ||
432 | rol edx, cl | ||
433 | mov ebx, edx | ||
434 | xor ecx, ecx | ||
435 | mov cl, dh | ||
436 | and ebx, 255 | ||
437 | shr edx, 16 | ||
438 | xor eax, eax | ||
439 | mov al, dh | ||
440 | and edx, 255 | ||
441 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
442 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
443 | add ecx, ebx | ||
444 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
445 | xor ecx, ebx | ||
446 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
447 | sub ecx, ebx | ||
448 | xor esi, ecx | ||
449 | ; round 13 | ||
450 | mov edx, DWORD PTR 104[ebp] | ||
451 | mov ecx, DWORD PTR 108[ebp] | ||
452 | xor edx, esi | ||
453 | rol edx, cl | ||
454 | mov ebx, edx | ||
455 | xor ecx, ecx | ||
456 | mov cl, dh | ||
457 | and ebx, 255 | ||
458 | shr edx, 16 | ||
459 | xor eax, eax | ||
460 | mov al, dh | ||
461 | and edx, 255 | ||
462 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
463 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
464 | sub ecx, ebx | ||
465 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
466 | add ecx, ebx | ||
467 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
468 | xor ecx, ebx | ||
469 | xor edi, ecx | ||
470 | ; round 12 | ||
471 | mov edx, DWORD PTR 96[ebp] | ||
472 | mov ecx, DWORD PTR 100[ebp] | ||
473 | add edx, edi | ||
474 | rol edx, cl | ||
475 | mov ebx, edx | ||
476 | xor ecx, ecx | ||
477 | mov cl, dh | ||
478 | and ebx, 255 | ||
479 | shr edx, 16 | ||
480 | xor eax, eax | ||
481 | mov al, dh | ||
482 | and edx, 255 | ||
483 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
484 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
485 | xor ecx, ebx | ||
486 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
487 | sub ecx, ebx | ||
488 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
489 | add ecx, ebx | ||
490 | xor esi, ecx | ||
491 | $L001cast_dec_skip: | ||
492 | ; round 11 | ||
493 | mov edx, DWORD PTR 88[ebp] | ||
494 | mov ecx, DWORD PTR 92[ebp] | ||
495 | sub edx, esi | ||
496 | rol edx, cl | ||
497 | mov ebx, edx | ||
498 | xor ecx, ecx | ||
499 | mov cl, dh | ||
500 | and ebx, 255 | ||
501 | shr edx, 16 | ||
502 | xor eax, eax | ||
503 | mov al, dh | ||
504 | and edx, 255 | ||
505 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
506 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
507 | add ecx, ebx | ||
508 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
509 | xor ecx, ebx | ||
510 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
511 | sub ecx, ebx | ||
512 | xor edi, ecx | ||
513 | ; round 10 | ||
514 | mov edx, DWORD PTR 80[ebp] | ||
515 | mov ecx, DWORD PTR 84[ebp] | ||
516 | xor edx, edi | ||
517 | rol edx, cl | ||
518 | mov ebx, edx | ||
519 | xor ecx, ecx | ||
520 | mov cl, dh | ||
521 | and ebx, 255 | ||
522 | shr edx, 16 | ||
523 | xor eax, eax | ||
524 | mov al, dh | ||
525 | and edx, 255 | ||
526 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
527 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
528 | sub ecx, ebx | ||
529 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
530 | add ecx, ebx | ||
531 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
532 | xor ecx, ebx | ||
533 | xor esi, ecx | ||
534 | ; round 9 | ||
535 | mov edx, DWORD PTR 72[ebp] | ||
536 | mov ecx, DWORD PTR 76[ebp] | ||
537 | add edx, esi | ||
538 | rol edx, cl | ||
539 | mov ebx, edx | ||
540 | xor ecx, ecx | ||
541 | mov cl, dh | ||
542 | and ebx, 255 | ||
543 | shr edx, 16 | ||
544 | xor eax, eax | ||
545 | mov al, dh | ||
546 | and edx, 255 | ||
547 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
548 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
549 | xor ecx, ebx | ||
550 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
551 | sub ecx, ebx | ||
552 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
553 | add ecx, ebx | ||
554 | xor edi, ecx | ||
555 | ; round 8 | ||
556 | mov edx, DWORD PTR 64[ebp] | ||
557 | mov ecx, DWORD PTR 68[ebp] | ||
558 | sub edx, edi | ||
559 | rol edx, cl | ||
560 | mov ebx, edx | ||
561 | xor ecx, ecx | ||
562 | mov cl, dh | ||
563 | and ebx, 255 | ||
564 | shr edx, 16 | ||
565 | xor eax, eax | ||
566 | mov al, dh | ||
567 | and edx, 255 | ||
568 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
569 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
570 | add ecx, ebx | ||
571 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
572 | xor ecx, ebx | ||
573 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
574 | sub ecx, ebx | ||
575 | xor esi, ecx | ||
576 | ; round 7 | ||
577 | mov edx, DWORD PTR 56[ebp] | ||
578 | mov ecx, DWORD PTR 60[ebp] | ||
579 | xor edx, esi | ||
580 | rol edx, cl | ||
581 | mov ebx, edx | ||
582 | xor ecx, ecx | ||
583 | mov cl, dh | ||
584 | and ebx, 255 | ||
585 | shr edx, 16 | ||
586 | xor eax, eax | ||
587 | mov al, dh | ||
588 | and edx, 255 | ||
589 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
590 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
591 | sub ecx, ebx | ||
592 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
593 | add ecx, ebx | ||
594 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
595 | xor ecx, ebx | ||
596 | xor edi, ecx | ||
597 | ; round 6 | ||
598 | mov edx, DWORD PTR 48[ebp] | ||
599 | mov ecx, DWORD PTR 52[ebp] | ||
600 | add edx, edi | ||
601 | rol edx, cl | ||
602 | mov ebx, edx | ||
603 | xor ecx, ecx | ||
604 | mov cl, dh | ||
605 | and ebx, 255 | ||
606 | shr edx, 16 | ||
607 | xor eax, eax | ||
608 | mov al, dh | ||
609 | and edx, 255 | ||
610 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
611 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
612 | xor ecx, ebx | ||
613 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
614 | sub ecx, ebx | ||
615 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
616 | add ecx, ebx | ||
617 | xor esi, ecx | ||
618 | ; round 5 | ||
619 | mov edx, DWORD PTR 40[ebp] | ||
620 | mov ecx, DWORD PTR 44[ebp] | ||
621 | sub edx, esi | ||
622 | rol edx, cl | ||
623 | mov ebx, edx | ||
624 | xor ecx, ecx | ||
625 | mov cl, dh | ||
626 | and ebx, 255 | ||
627 | shr edx, 16 | ||
628 | xor eax, eax | ||
629 | mov al, dh | ||
630 | and edx, 255 | ||
631 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
632 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
633 | add ecx, ebx | ||
634 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
635 | xor ecx, ebx | ||
636 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
637 | sub ecx, ebx | ||
638 | xor edi, ecx | ||
639 | ; round 4 | ||
640 | mov edx, DWORD PTR 32[ebp] | ||
641 | mov ecx, DWORD PTR 36[ebp] | ||
642 | xor edx, edi | ||
643 | rol edx, cl | ||
644 | mov ebx, edx | ||
645 | xor ecx, ecx | ||
646 | mov cl, dh | ||
647 | and ebx, 255 | ||
648 | shr edx, 16 | ||
649 | xor eax, eax | ||
650 | mov al, dh | ||
651 | and edx, 255 | ||
652 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
653 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
654 | sub ecx, ebx | ||
655 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
656 | add ecx, ebx | ||
657 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
658 | xor ecx, ebx | ||
659 | xor esi, ecx | ||
660 | ; round 3 | ||
661 | mov edx, DWORD PTR 24[ebp] | ||
662 | mov ecx, DWORD PTR 28[ebp] | ||
663 | add edx, esi | ||
664 | rol edx, cl | ||
665 | mov ebx, edx | ||
666 | xor ecx, ecx | ||
667 | mov cl, dh | ||
668 | and ebx, 255 | ||
669 | shr edx, 16 | ||
670 | xor eax, eax | ||
671 | mov al, dh | ||
672 | and edx, 255 | ||
673 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
674 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
675 | xor ecx, ebx | ||
676 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
677 | sub ecx, ebx | ||
678 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
679 | add ecx, ebx | ||
680 | xor edi, ecx | ||
681 | ; round 2 | ||
682 | mov edx, DWORD PTR 16[ebp] | ||
683 | mov ecx, DWORD PTR 20[ebp] | ||
684 | sub edx, edi | ||
685 | rol edx, cl | ||
686 | mov ebx, edx | ||
687 | xor ecx, ecx | ||
688 | mov cl, dh | ||
689 | and ebx, 255 | ||
690 | shr edx, 16 | ||
691 | xor eax, eax | ||
692 | mov al, dh | ||
693 | and edx, 255 | ||
694 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
695 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
696 | add ecx, ebx | ||
697 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
698 | xor ecx, ebx | ||
699 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
700 | sub ecx, ebx | ||
701 | xor esi, ecx | ||
702 | ; round 1 | ||
703 | mov edx, DWORD PTR 8[ebp] | ||
704 | mov ecx, DWORD PTR 12[ebp] | ||
705 | xor edx, esi | ||
706 | rol edx, cl | ||
707 | mov ebx, edx | ||
708 | xor ecx, ecx | ||
709 | mov cl, dh | ||
710 | and ebx, 255 | ||
711 | shr edx, 16 | ||
712 | xor eax, eax | ||
713 | mov al, dh | ||
714 | and edx, 255 | ||
715 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
716 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
717 | sub ecx, ebx | ||
718 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
719 | add ecx, ebx | ||
720 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
721 | xor ecx, ebx | ||
722 | xor edi, ecx | ||
723 | ; round 0 | ||
724 | mov edx, DWORD PTR [ebp] | ||
725 | mov ecx, DWORD PTR 4[ebp] | ||
726 | add edx, edi | ||
727 | rol edx, cl | ||
728 | mov ebx, edx | ||
729 | xor ecx, ecx | ||
730 | mov cl, dh | ||
731 | and ebx, 255 | ||
732 | shr edx, 16 | ||
733 | xor eax, eax | ||
734 | mov al, dh | ||
735 | and edx, 255 | ||
736 | mov ecx, DWORD PTR _CAST_S_table0[ecx*4] | ||
737 | mov ebx, DWORD PTR _CAST_S_table1[ebx*4] | ||
738 | xor ecx, ebx | ||
739 | mov ebx, DWORD PTR _CAST_S_table2[eax*4] | ||
740 | sub ecx, ebx | ||
741 | mov ebx, DWORD PTR _CAST_S_table3[edx*4] | ||
742 | add ecx, ebx | ||
743 | xor esi, ecx | ||
744 | nop | ||
745 | mov eax, DWORD PTR 20[esp] | ||
746 | mov DWORD PTR 4[eax],edi | ||
747 | mov DWORD PTR [eax],esi | ||
748 | pop edi | ||
749 | pop esi | ||
750 | pop ebx | ||
751 | pop ebp | ||
752 | ret | ||
753 | _CAST_decrypt ENDP | ||
754 | _TEXT ENDS | ||
755 | _TEXT SEGMENT | ||
756 | PUBLIC _CAST_cbc_encrypt | ||
757 | |||
758 | _CAST_cbc_encrypt PROC NEAR | ||
759 | ; | ||
760 | push ebp | ||
761 | push ebx | ||
762 | push esi | ||
763 | push edi | ||
764 | mov ebp, DWORD PTR 28[esp] | ||
765 | ; getting iv ptr from parameter 4 | ||
766 | mov ebx, DWORD PTR 36[esp] | ||
767 | mov esi, DWORD PTR [ebx] | ||
768 | mov edi, DWORD PTR 4[ebx] | ||
769 | push edi | ||
770 | push esi | ||
771 | push edi | ||
772 | push esi | ||
773 | mov ebx, esp | ||
774 | mov esi, DWORD PTR 36[esp] | ||
775 | mov edi, DWORD PTR 40[esp] | ||
776 | ; getting encrypt flag from parameter 5 | ||
777 | mov ecx, DWORD PTR 56[esp] | ||
778 | ; get and push parameter 3 | ||
779 | mov eax, DWORD PTR 48[esp] | ||
780 | push eax | ||
781 | push ebx | ||
782 | cmp ecx, 0 | ||
783 | jz $L002decrypt | ||
784 | and ebp, 4294967288 | ||
785 | mov eax, DWORD PTR 8[esp] | ||
786 | mov ebx, DWORD PTR 12[esp] | ||
787 | jz $L003encrypt_finish | ||
788 | L004encrypt_loop: | ||
789 | mov ecx, DWORD PTR [esi] | ||
790 | mov edx, DWORD PTR 4[esi] | ||
791 | xor eax, ecx | ||
792 | xor ebx, edx | ||
793 | bswap eax | ||
794 | bswap ebx | ||
795 | mov DWORD PTR 8[esp],eax | ||
796 | mov DWORD PTR 12[esp],ebx | ||
797 | call _CAST_encrypt | ||
798 | mov eax, DWORD PTR 8[esp] | ||
799 | mov ebx, DWORD PTR 12[esp] | ||
800 | bswap eax | ||
801 | bswap ebx | ||
802 | mov DWORD PTR [edi],eax | ||
803 | mov DWORD PTR 4[edi],ebx | ||
804 | add esi, 8 | ||
805 | add edi, 8 | ||
806 | sub ebp, 8 | ||
807 | jnz L004encrypt_loop | ||
808 | $L003encrypt_finish: | ||
809 | mov ebp, DWORD PTR 52[esp] | ||
810 | and ebp, 7 | ||
811 | jz $L005finish | ||
812 | xor ecx, ecx | ||
813 | xor edx, edx | ||
814 | mov ebp, DWORD PTR $L006cbc_enc_jmp_table[ebp*4] | ||
815 | jmp ebp | ||
816 | L007ej7: | ||
817 | xor edx, edx | ||
818 | mov dh, BYTE PTR 6[esi] | ||
819 | shl edx, 8 | ||
820 | L008ej6: | ||
821 | mov dh, BYTE PTR 5[esi] | ||
822 | L009ej5: | ||
823 | mov dl, BYTE PTR 4[esi] | ||
824 | L010ej4: | ||
825 | mov ecx, DWORD PTR [esi] | ||
826 | jmp $L011ejend | ||
827 | L012ej3: | ||
828 | mov ch, BYTE PTR 2[esi] | ||
829 | xor ecx, ecx | ||
830 | shl ecx, 8 | ||
831 | L013ej2: | ||
832 | mov ch, BYTE PTR 1[esi] | ||
833 | L014ej1: | ||
834 | mov cl, BYTE PTR [esi] | ||
835 | $L011ejend: | ||
836 | xor eax, ecx | ||
837 | xor ebx, edx | ||
838 | bswap eax | ||
839 | bswap ebx | ||
840 | mov DWORD PTR 8[esp],eax | ||
841 | mov DWORD PTR 12[esp],ebx | ||
842 | call _CAST_encrypt | ||
843 | mov eax, DWORD PTR 8[esp] | ||
844 | mov ebx, DWORD PTR 12[esp] | ||
845 | bswap eax | ||
846 | bswap ebx | ||
847 | mov DWORD PTR [edi],eax | ||
848 | mov DWORD PTR 4[edi],ebx | ||
849 | jmp $L005finish | ||
850 | $L002decrypt: | ||
851 | and ebp, 4294967288 | ||
852 | mov eax, DWORD PTR 16[esp] | ||
853 | mov ebx, DWORD PTR 20[esp] | ||
854 | jz $L015decrypt_finish | ||
855 | L016decrypt_loop: | ||
856 | mov eax, DWORD PTR [esi] | ||
857 | mov ebx, DWORD PTR 4[esi] | ||
858 | bswap eax | ||
859 | bswap ebx | ||
860 | mov DWORD PTR 8[esp],eax | ||
861 | mov DWORD PTR 12[esp],ebx | ||
862 | call _CAST_decrypt | ||
863 | mov eax, DWORD PTR 8[esp] | ||
864 | mov ebx, DWORD PTR 12[esp] | ||
865 | bswap eax | ||
866 | bswap ebx | ||
867 | mov ecx, DWORD PTR 16[esp] | ||
868 | mov edx, DWORD PTR 20[esp] | ||
869 | xor ecx, eax | ||
870 | xor edx, ebx | ||
871 | mov eax, DWORD PTR [esi] | ||
872 | mov ebx, DWORD PTR 4[esi] | ||
873 | mov DWORD PTR [edi],ecx | ||
874 | mov DWORD PTR 4[edi],edx | ||
875 | mov DWORD PTR 16[esp],eax | ||
876 | mov DWORD PTR 20[esp],ebx | ||
877 | add esi, 8 | ||
878 | add edi, 8 | ||
879 | sub ebp, 8 | ||
880 | jnz L016decrypt_loop | ||
881 | $L015decrypt_finish: | ||
882 | mov ebp, DWORD PTR 52[esp] | ||
883 | and ebp, 7 | ||
884 | jz $L005finish | ||
885 | mov eax, DWORD PTR [esi] | ||
886 | mov ebx, DWORD PTR 4[esi] | ||
887 | bswap eax | ||
888 | bswap ebx | ||
889 | mov DWORD PTR 8[esp],eax | ||
890 | mov DWORD PTR 12[esp],ebx | ||
891 | call _CAST_decrypt | ||
892 | mov eax, DWORD PTR 8[esp] | ||
893 | mov ebx, DWORD PTR 12[esp] | ||
894 | bswap eax | ||
895 | bswap ebx | ||
896 | mov ecx, DWORD PTR 16[esp] | ||
897 | mov edx, DWORD PTR 20[esp] | ||
898 | xor ecx, eax | ||
899 | xor edx, ebx | ||
900 | mov eax, DWORD PTR [esi] | ||
901 | mov ebx, DWORD PTR 4[esi] | ||
902 | L017dj7: | ||
903 | ror edx, 16 | ||
904 | mov BYTE PTR 6[edi],dl | ||
905 | shr edx, 16 | ||
906 | L018dj6: | ||
907 | mov BYTE PTR 5[edi],dh | ||
908 | L019dj5: | ||
909 | mov BYTE PTR 4[edi],dl | ||
910 | L020dj4: | ||
911 | mov DWORD PTR [edi],ecx | ||
912 | jmp $L021djend | ||
913 | L022dj3: | ||
914 | ror ecx, 16 | ||
915 | mov BYTE PTR 2[edi],cl | ||
916 | shl ecx, 16 | ||
917 | L023dj2: | ||
918 | mov BYTE PTR 1[esi],ch | ||
919 | L024dj1: | ||
920 | mov BYTE PTR [esi], cl | ||
921 | $L021djend: | ||
922 | jmp $L005finish | ||
923 | $L005finish: | ||
924 | mov ecx, DWORD PTR 60[esp] | ||
925 | add esp, 24 | ||
926 | mov DWORD PTR [ecx],eax | ||
927 | mov DWORD PTR 4[ecx],ebx | ||
928 | pop edi | ||
929 | pop esi | ||
930 | pop ebx | ||
931 | pop ebp | ||
932 | ret | ||
933 | $L006cbc_enc_jmp_table: | ||
934 | DD 0 | ||
935 | DD L014ej1 | ||
936 | DD L013ej2 | ||
937 | DD L012ej3 | ||
938 | DD L010ej4 | ||
939 | DD L009ej5 | ||
940 | DD L008ej6 | ||
941 | DD L007ej7 | ||
942 | L025cbc_dec_jmp_table: | ||
943 | DD 0 | ||
944 | DD L024dj1 | ||
945 | DD L023dj2 | ||
946 | DD L022dj3 | ||
947 | DD L020dj4 | ||
948 | DD L019dj5 | ||
949 | DD L018dj6 | ||
950 | DD L017dj7 | ||
951 | _CAST_cbc_encrypt ENDP | ||
952 | _TEXT ENDS | ||
953 | END | ||
diff --git a/src/lib/libssl/src/crypto/cast/cast_lcl.h b/src/lib/libssl/src/crypto/cast/cast_lcl.h index cfe3842e91..5fab8a43f6 100644 --- a/src/lib/libssl/src/crypto/cast/cast_lcl.h +++ b/src/lib/libssl/src/crypto/cast/cast_lcl.h | |||
@@ -151,7 +151,7 @@ | |||
151 | *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \ | 151 | *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \ |
152 | *((c)++)=(unsigned char)(((l) )&0xff)) | 152 | *((c)++)=(unsigned char)(((l) )&0xff)) |
153 | 153 | ||
154 | #if defined(WIN32) | 154 | #if defined(WIN32) && defined(_MSC_VER) |
155 | #define ROTL(a,n) (_lrotl(a,n)) | 155 | #define ROTL(a,n) (_lrotl(a,n)) |
156 | #else | 156 | #else |
157 | #define ROTL(a,n) ((((a)<<(n))&0xffffffffL)|((a)>>(32-(n)))) | 157 | #define ROTL(a,n) ((((a)<<(n))&0xffffffffL)|((a)>>(32-(n)))) |
diff --git a/src/lib/libssl/src/crypto/comp/comp_err.c b/src/lib/libssl/src/crypto/comp/comp_err.c index 77a3f7070c..c10282a73c 100644 --- a/src/lib/libssl/src/crypto/comp/comp_err.c +++ b/src/lib/libssl/src/crypto/comp/comp_err.c | |||
@@ -54,7 +54,8 @@ | |||
54 | */ | 54 | */ |
55 | 55 | ||
56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes |
57 | * made to it will be overwritten when the script next updates this file. | 57 | * made to it will be overwritten when the script next updates this file, |
58 | * only reason strings will be preserved. | ||
58 | */ | 59 | */ |
59 | 60 | ||
60 | #include <stdio.h> | 61 | #include <stdio.h> |
diff --git a/src/lib/libssl/src/crypto/conf/conf_err.c b/src/lib/libssl/src/crypto/conf/conf_err.c index eb4b3cfc70..5c1ca59090 100644 --- a/src/lib/libssl/src/crypto/conf/conf_err.c +++ b/src/lib/libssl/src/crypto/conf/conf_err.c | |||
@@ -54,7 +54,8 @@ | |||
54 | */ | 54 | */ |
55 | 55 | ||
56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes |
57 | * made to it will be overwritten when the script next updates this file. | 57 | * made to it will be overwritten when the script next updates this file, |
58 | * only reason strings will be preserved. | ||
58 | */ | 59 | */ |
59 | 60 | ||
60 | #include <stdio.h> | 61 | #include <stdio.h> |
diff --git a/src/lib/libssl/src/crypto/cpt_err.c b/src/lib/libssl/src/crypto/cpt_err.c index c2a2dd4af6..dadd8d8d92 100644 --- a/src/lib/libssl/src/crypto/cpt_err.c +++ b/src/lib/libssl/src/crypto/cpt_err.c | |||
@@ -54,7 +54,8 @@ | |||
54 | */ | 54 | */ |
55 | 55 | ||
56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes |
57 | * made to it will be overwritten when the script next updates this file. | 57 | * made to it will be overwritten when the script next updates this file, |
58 | * only reason strings will be preserved. | ||
58 | */ | 59 | */ |
59 | 60 | ||
60 | #include <stdio.h> | 61 | #include <stdio.h> |
diff --git a/src/lib/libssl/src/crypto/crypto-lib.com b/src/lib/libssl/src/crypto/crypto-lib.com index 79d86771e8..8ddeafbc06 100644 --- a/src/lib/libssl/src/crypto/crypto-lib.com +++ b/src/lib/libssl/src/crypto/crypto-lib.com | |||
@@ -186,7 +186,7 @@ $ LIB_DES = "set_key,ecb_enc,cbc_enc,"+ - | |||
186 | "enc_read,enc_writ,ofb64enc,"+ - | 186 | "enc_read,enc_writ,ofb64enc,"+ - |
187 | "ofb_enc,str2key,pcbc_enc,qud_cksm,rand_key,"+ - | 187 | "ofb_enc,str2key,pcbc_enc,qud_cksm,rand_key,"+ - |
188 | "des_enc,fcrypt_b,read2pwd,"+ - | 188 | "des_enc,fcrypt_b,read2pwd,"+ - |
189 | "fcrypt,xcbc_enc,read_pwd,rpc_enc,cbc_cksm,supp,ede_cbcm_enc" | 189 | "fcrypt,xcbc_enc,read_pwd,rpc_enc,cbc_cksm,ede_cbcm_enc" |
190 | $ LIB_RC2 = "rc2_ecb,rc2_skey,rc2_cbc,rc2cfb64,rc2ofb64" | 190 | $ LIB_RC2 = "rc2_ecb,rc2_skey,rc2_cbc,rc2cfb64,rc2ofb64" |
191 | $ LIB_RC4 = "rc4_skey,rc4_enc" | 191 | $ LIB_RC4 = "rc4_skey,rc4_enc" |
192 | $ LIB_RC5 = "rc5_skey,rc5_ecb,rc5_enc,rc5cfb64,rc5ofb64" | 192 | $ LIB_RC5 = "rc5_skey,rc5_ecb,rc5_enc,rc5cfb64,rc5ofb64" |
@@ -208,7 +208,7 @@ $ LIB_BIO = "bio_lib,bio_cb,bio_err,"+ - | |||
208 | "bss_mem,bss_null,bss_fd,"+ - | 208 | "bss_mem,bss_null,bss_fd,"+ - |
209 | "bss_file,bss_sock,bss_conn,"+ - | 209 | "bss_file,bss_sock,bss_conn,"+ - |
210 | "bf_null,bf_buff,b_print,b_dump,"+ - | 210 | "bf_null,bf_buff,b_print,b_dump,"+ - |
211 | "b_sock,bss_acpt,bf_nbio,bss_rtcp,bss_bio" ! + ",bss_log" for syslog | 211 | "b_sock,bss_acpt,bf_nbio,bss_rtcp,bss_bio,bss_log" |
212 | $ LIB_STACK = "stack" | 212 | $ LIB_STACK = "stack" |
213 | $ LIB_LHASH = "lhash,lh_stats" | 213 | $ LIB_LHASH = "lhash,lh_stats" |
214 | $ LIB_RAND = "md_rand,randfile,rand_lib,rand_err,rand_egd" | 214 | $ LIB_RAND = "md_rand,randfile,rand_lib,rand_err,rand_egd" |
@@ -266,7 +266,7 @@ $! | |||
266 | $! Setup exceptional compilations | 266 | $! Setup exceptional compilations |
267 | $! | 267 | $! |
268 | $ COMPILEWITH_CC3 = ",bss_rtcp," | 268 | $ COMPILEWITH_CC3 = ",bss_rtcp," |
269 | $ COMPILEWITH_CC4 = ",a_utctm," | 269 | $ COMPILEWITH_CC4 = ",a_utctm,bss_log," |
270 | $ COMPILEWITH_CC5 = ",md2_dgst,md5_dgst,mdc2dgst,sha_dgst,sha1dgst," + - | 270 | $ COMPILEWITH_CC5 = ",md2_dgst,md5_dgst,mdc2dgst,sha_dgst,sha1dgst," + - |
271 | "rmd_dgst,bf_enc," | 271 | "rmd_dgst,bf_enc," |
272 | $! | 272 | $! |
@@ -1441,6 +1441,7 @@ $! | |||
1441 | $ IF P7 .NES. "" | 1441 | $ IF P7 .NES. "" |
1442 | $ THEN | 1442 | $ THEN |
1443 | $ ENCRYPT_TYPES = P7 | 1443 | $ ENCRYPT_TYPES = P7 |
1444 | $! NYI: ENCRYPT_PROGRAMS = P7 | ||
1444 | $ ENDIF | 1445 | $ ENDIF |
1445 | $! | 1446 | $! |
1446 | $! Time To RETURN... | 1447 | $! Time To RETURN... |
diff --git a/src/lib/libssl/src/crypto/des/DES.pod b/src/lib/libssl/src/crypto/des/DES.pod index 8a739e7ca0..e69de29bb2 100644 --- a/src/lib/libssl/src/crypto/des/DES.pod +++ b/src/lib/libssl/src/crypto/des/DES.pod | |||
@@ -1,16 +0,0 @@ | |||
1 | crypt <= crypt(buf,salt) | ||
2 | key <= set_odd_parity(key) | ||
3 | int <= is_weak_key(key) | ||
4 | keysched<= set_key(key) | ||
5 | key <= ecb_encrypt(string8,ks,enc) | ||
6 | key <= ecb3_encrypt(input,ks1,ks2,enc) | ||
7 | string <= cbc_encrypt(input,ks,ivec,enc) => ivec | ||
8 | string <= cbc3_encrypt(input,ks1,ks2,ivec1,ivec2,enc) => ivec1&ivec2 | ||
9 | ck1,ck2 <= cbc_cksum(input,ks,ivec) => ivec | ||
10 | string <= pcbc_encrypt(input,ks,ivec,enc) => ivec | ||
11 | string <= ofb_encrypt(input,numbits,ks,ivec) => ivec | ||
12 | string <= cfb_encrypt(input,numbits,ks,ivec,enc) => ivec | ||
13 | key <= random_key() | ||
14 | key <= string_to_key(string) | ||
15 | key1,key2<= string_to_2keys(string) | ||
16 | |||
diff --git a/src/lib/libssl/src/crypto/des/MODES.DES b/src/lib/libssl/src/crypto/des/MODES.DES index 0cbc44f51d..e69de29bb2 100644 --- a/src/lib/libssl/src/crypto/des/MODES.DES +++ b/src/lib/libssl/src/crypto/des/MODES.DES | |||
@@ -1,84 +0,0 @@ | |||
1 | Modes of DES | ||
2 | Quite a bit of the following information has been taken from | ||
3 | AS 2805.5.2 | ||
4 | Australian Standard | ||
5 | Electronic funds transfer - Requirements for interfaces, | ||
6 | Part 5.2: Modes of operation for an n-bit block cipher algorithm | ||
7 | Appendix A | ||
8 | |||
9 | There are several different modes in which DES can be used, they are | ||
10 | as follows. | ||
11 | |||
12 | Electronic Codebook Mode (ECB) (des_ecb_encrypt()) | ||
13 | - 64 bits are enciphered at a time. | ||
14 | - The order of the blocks can be rearranged without detection. | ||
15 | - The same plaintext block always produces the same ciphertext block | ||
16 | (for the same key) making it vulnerable to a 'dictionary attack'. | ||
17 | - An error will only affect one ciphertext block. | ||
18 | |||
19 | Cipher Block Chaining Mode (CBC) (des_cbc_encrypt()) | ||
20 | - a multiple of 64 bits are enciphered at a time. | ||
21 | - The CBC mode produces the same ciphertext whenever the same | ||
22 | plaintext is encrypted using the same key and starting variable. | ||
23 | - The chaining operation makes the ciphertext blocks dependent on the | ||
24 | current and all preceding plaintext blocks and therefore blocks can not | ||
25 | be rearranged. | ||
26 | - The use of different starting variables prevents the same plaintext | ||
27 | enciphering to the same ciphertext. | ||
28 | - An error will affect the current and the following ciphertext blocks. | ||
29 | |||
30 | Cipher Feedback Mode (CFB) (des_cfb_encrypt()) | ||
31 | - a number of bits (j) <= 64 are enciphered at a time. | ||
32 | - The CFB mode produces the same ciphertext whenever the same | ||
33 | plaintext is encrypted using the same key and starting variable. | ||
34 | - The chaining operation makes the ciphertext variables dependent on the | ||
35 | current and all preceding variables and therefore j-bit variables are | ||
36 | chained together and con not be rearranged. | ||
37 | - The use of different starting variables prevents the same plaintext | ||
38 | enciphering to the same ciphertext. | ||
39 | - The strength of the CFB mode depends on the size of k (maximal if | ||
40 | j == k). In my implementation this is always the case. | ||
41 | - Selection of a small value for j will require more cycles through | ||
42 | the encipherment algorithm per unit of plaintext and thus cause | ||
43 | greater processing overheads. | ||
44 | - Only multiples of j bits can be enciphered. | ||
45 | - An error will affect the current and the following ciphertext variables. | ||
46 | |||
47 | Output Feedback Mode (OFB) (des_ofb_encrypt()) | ||
48 | - a number of bits (j) <= 64 are enciphered at a time. | ||
49 | - The OFB mode produces the same ciphertext whenever the same | ||
50 | plaintext enciphered using the same key and starting variable. More | ||
51 | over, in the OFB mode the same key stream is produced when the same | ||
52 | key and start variable are used. Consequently, for security reasons | ||
53 | a specific start variable should be used only once for a given key. | ||
54 | - The absence of chaining makes the OFB more vulnerable to specific attacks. | ||
55 | - The use of different start variables values prevents the same | ||
56 | plaintext enciphering to the same ciphertext, by producing different | ||
57 | key streams. | ||
58 | - Selection of a small value for j will require more cycles through | ||
59 | the encipherment algorithm per unit of plaintext and thus cause | ||
60 | greater processing overheads. | ||
61 | - Only multiples of j bits can be enciphered. | ||
62 | - OFB mode of operation does not extend ciphertext errors in the | ||
63 | resultant plaintext output. Every bit error in the ciphertext causes | ||
64 | only one bit to be in error in the deciphered plaintext. | ||
65 | - OFB mode is not self-synchronising. If the two operation of | ||
66 | encipherment and decipherment get out of synchronism, the system needs | ||
67 | to be re-initialised. | ||
68 | - Each re-initialisation should use a value of the start variable | ||
69 | different from the start variable values used before with the same | ||
70 | key. The reason for this is that an identical bit stream would be | ||
71 | produced each time from the same parameters. This would be | ||
72 | susceptible to a 'known plaintext' attack. | ||
73 | |||
74 | Triple ECB Mode (des_ecb3_encrypt()) | ||
75 | - Encrypt with key1, decrypt with key2 and encrypt with key1 again. | ||
76 | - As for ECB encryption but increases the effective key length to 112 bits. | ||
77 | - If both keys are the same it is equivalent to encrypting once with | ||
78 | just one key. | ||
79 | |||
80 | Triple CBC Mode (des_3cbc_encrypt()) | ||
81 | - Encrypt with key1, decrypt with key2 and encrypt with key1 again. | ||
82 | - As for CBC encryption but increases the effective key length to 112 bits. | ||
83 | - If both keys are the same it is equivalent to encrypting once with | ||
84 | just one key. | ||
diff --git a/src/lib/libssl/src/crypto/des/Makefile.PL b/src/lib/libssl/src/crypto/des/Makefile.PL index b54a24387c..e69de29bb2 100644 --- a/src/lib/libssl/src/crypto/des/Makefile.PL +++ b/src/lib/libssl/src/crypto/des/Makefile.PL | |||
@@ -1,14 +0,0 @@ | |||
1 | use ExtUtils::MakeMaker; | ||
2 | # See lib/ExtUtils/MakeMaker.pm for details of how to influence | ||
3 | # the contents of the Makefile being created. | ||
4 | &writeMakefile( | ||
5 | 'potential_libs' => '', # e.g., '-lm' | ||
6 | 'INC' => '', # e.g., '-I/usr/include/other' | ||
7 | 'DISTNAME' => 'DES', | ||
8 | 'VERSION' => '0.1', | ||
9 | 'DEFINE' => '-DPERL5', | ||
10 | 'OBJECT' => 'DES.o cbc_cksm.o cbc_enc.o ecb_enc.o pcbc_enc.o \ | ||
11 | rand_key.o set_key.o str2key.o \ | ||
12 | enc_read.o enc_writ.o fcrypt.o cfb_enc.o \ | ||
13 | ecb3_enc.o ofb_enc.o cbc3_enc.o des_enc.o', | ||
14 | ); | ||
diff --git a/src/lib/libssl/src/crypto/des/Makefile.lit b/src/lib/libssl/src/crypto/des/Makefile.lit index c09f6969da..e69de29bb2 100644 --- a/src/lib/libssl/src/crypto/des/Makefile.lit +++ b/src/lib/libssl/src/crypto/des/Makefile.lit | |||
@@ -1,250 +0,0 @@ | |||
1 | # You must select the correct terminal control system to be used to | ||
2 | # turn character echo off when reading passwords. There a 5 systems | ||
3 | # SGTTY - the old BSD system | ||
4 | # TERMIO - most system V boxes | ||
5 | # TERMIOS - SGI (ala IRIX). | ||
6 | # VMS - the DEC operating system | ||
7 | # MSDOS - we all know what it is :-) | ||
8 | # read_pwd.c makes a reasonable guess at what is correct. | ||
9 | |||
10 | # Targets | ||
11 | # make - twidle the options yourself :-) | ||
12 | # make cc - standard cc options | ||
13 | # make gcc - standard gcc options | ||
14 | # make x86-elf - linux-elf etc | ||
15 | # make x86-out - linux-a.out, FreeBSD etc | ||
16 | # make x86-solaris | ||
17 | # make x86-bdsi | ||
18 | |||
19 | # If you are on a DEC Alpha, edit des.h and change the DES_LONG | ||
20 | # define to 'unsigned int'. I have seen this give a %20 speedup. | ||
21 | |||
22 | OPTS0= -DLIBDES_LIT -DRAND -DTERMIO #-DNOCONST | ||
23 | |||
24 | # Version 1.94 has changed the strings_to_key function so that it is | ||
25 | # now compatible with MITs when the string is longer than 8 characters. | ||
26 | # If you wish to keep the old version, uncomment the following line. | ||
27 | # This will affect the -E/-D options on des(1). | ||
28 | #OPTS1= -DOLD_STR_TO_KEY | ||
29 | |||
30 | # There are 4 possible performance options | ||
31 | # -DDES_PTR | ||
32 | # -DDES_RISC1 | ||
33 | # -DDES_RISC2 (only one of DES_RISC1 and DES_RISC2) | ||
34 | # -DDES_UNROLL | ||
35 | # after the initial build, run 'des_opts' to see which options are best | ||
36 | # for your platform. There are some listed in options.txt | ||
37 | #OPTS2= -DDES_PTR | ||
38 | #OPTS3= -DDES_RISC1 # or DES_RISC2 | ||
39 | #OPTS4= -DDES_UNROLL | ||
40 | |||
41 | OPTS= $(OPTS0) $(OPTS1) $(OPTS2) $(OPTS3) $(OPTS4) | ||
42 | |||
43 | MAKE=make -f Makefile | ||
44 | #CC=cc | ||
45 | #CFLAG= -O | ||
46 | |||
47 | CC=gcc | ||
48 | #CFLAG= -O4 -funroll-loops -fomit-frame-pointer | ||
49 | CFLAG= -O3 -fomit-frame-pointer | ||
50 | |||
51 | CFLAGS=$(OPTS) $(CFLAG) | ||
52 | CPP=$(CC) -E | ||
53 | AS=as | ||
54 | |||
55 | # Assember version of des_encrypt*(). | ||
56 | DES_ENC=des_enc.o fcrypt_b.o # normal C version | ||
57 | #DES_ENC=asm/dx86-elf.o asm/yx86-elf.o # elf format x86 | ||
58 | #DES_ENC=asm/dx86-out.o asm/yx86-out.o # a.out format x86 | ||
59 | #DES_ENC=asm/dx86-sol.o asm/yx86-sol.o # solaris format x86 | ||
60 | #DES_ENC=asm/dx86bsdi.o asm/yx86basi.o # bsdi format x86 | ||
61 | |||
62 | LIBDIR=/usr/local/lib | ||
63 | BINDIR=/usr/local/bin | ||
64 | INCDIR=/usr/local/include | ||
65 | MANDIR=/usr/local/man | ||
66 | MAN1=1 | ||
67 | MAN3=3 | ||
68 | SHELL=/bin/sh | ||
69 | OBJ_LIT=cbc_enc.o ecb_enc.o $(DES_ENC) fcrypt.o set_key.o | ||
70 | OBJ_FULL=cbc_cksm.o $(OBJ_LIT) pcbc_enc.o \ | ||
71 | xcbc_enc.o qud_cksm.o \ | ||
72 | cfb64ede.o cfb64enc.o cfb_enc.o ecb3_enc.o \ | ||
73 | enc_read.o enc_writ.o ofb64ede.o ofb64enc.o ofb_enc.o \ | ||
74 | rand_key.o read_pwd.o read2pwd.o rpc_enc.o str2key.o supp.o | ||
75 | |||
76 | GENERAL_LIT=COPYRIGHT INSTALL README VERSION Makefile des_crypt.man \ | ||
77 | des.doc options.txt asm | ||
78 | GENERAL_FULL=$(GENERAL_LIT) FILES Imakefile times vms.com KERBEROS MODES.DES \ | ||
79 | des.man DES.pm DES.pod DES.xs Makefile.PL dess.cpp des3s.cpp \ | ||
80 | Makefile.uni typemap t Makefile.ssl makefile.bc Makefile.lit \ | ||
81 | des.org des_locl.org | ||
82 | TESTING_LIT= destest speed des_opts | ||
83 | TESTING_FULL= rpw $(TESTING_LIT) | ||
84 | TESTING_SRC_LIT=destest.c speed.c des_opts.c | ||
85 | TESTING_SRC_FULL=rpw.c $(TESTING_SRC_LIT) | ||
86 | HEADERS_LIT=des_ver.h des.h des_locl.h podd.h sk.h spr.h | ||
87 | HEADERS_FULL= $(HEADERS_LIT) rpc_des.h | ||
88 | LIBDES_LIT=cbc_enc.c ecb_enc.c fcrypt.c set_key.c des_enc.c fcrypt_b.c | ||
89 | LIBDES_FULL= cbc_cksm.c pcbc_enc.c qud_cksm.c \ | ||
90 | cfb64ede.c cfb64enc.c cfb_enc.c ecb3_enc.c \ | ||
91 | enc_read.c enc_writ.c ofb64ede.c ofb64enc.c ofb_enc.c \ | ||
92 | rand_key.c rpc_enc.c str2key.c supp.c \ | ||
93 | xcbc_enc.c $(LIBDES_LIT) read_pwd.c read2pwd.c | ||
94 | |||
95 | PERL= des.pl testdes.pl doIP doPC1 doPC2 PC1 PC2 shifts.pl | ||
96 | |||
97 | OBJ= $(OBJ_LIT) | ||
98 | GENERAL=$(GENERAL_LIT) | ||
99 | TESTING=$(TESTING_LIT) | ||
100 | TESTING_SRC=$(TESTING_SRC_LIT) | ||
101 | HEADERS=$(HEADERS_LIT) | ||
102 | LIBDES= $(LIBDES_LIT) | ||
103 | |||
104 | ALL= $(GENERAL) $(TESTING_SRC) $(LIBDES) $(PERL) $(HEADERS) | ||
105 | |||
106 | DLIB= libdes.a | ||
107 | |||
108 | all: $(DLIB) $(TESTING) | ||
109 | |||
110 | cc: | ||
111 | $(MAKE) CC=cc CFLAGS="-O $(OPTS) $(CFLAG)" all | ||
112 | |||
113 | gcc: | ||
114 | $(MAKE) CC=gcc CFLAGS="-O3 -fomit-frame-pointer $(OPTS) $(CFLAG)" all | ||
115 | |||
116 | x86-elf: | ||
117 | $(MAKE) DES_ENC='asm/dx86-elf.o asm/yx86-elf.o' CC=$(CC) CFLAGS="-DELF $(OPTS) $(CFLAG)" all | ||
118 | |||
119 | x86-out: | ||
120 | $(MAKE) DES_ENC='asm/dx86-out.o asm/yx86-out.o' CC=$(CC) CFLAGS="-DOUT $(OPTS) $(CFLAG)" all | ||
121 | |||
122 | x86-solaris: | ||
123 | $(MAKE) DES_ENC='asm/dx86-sol.o asm/yx86-sol.o' CC=$(CC) CFLAGS="-DSOL $(OPTS) $(CFLAG)" all | ||
124 | |||
125 | x86-bsdi: | ||
126 | $(MAKE) DES_ENC='asm/dx86bsdi.o asm/yx86bsdi.o' CC=$(CC) CFLAGS="-DBSDI $(OPTS) $(CFLAG)" all | ||
127 | |||
128 | # elf | ||
129 | asm/dx86-elf.o: asm/dx86unix.cpp | ||
130 | $(CPP) -DELF asm/dx86unix.cpp | $(AS) -o asm/dx86-elf.o | ||
131 | |||
132 | asm/yx86-elf.o: asm/yx86unix.cpp | ||
133 | $(CPP) -DELF asm/yx86unix.cpp | $(AS) -o asm/yx86-elf.o | ||
134 | |||
135 | # solaris | ||
136 | asm/dx86-sol.o: asm/dx86unix.cpp | ||
137 | $(CC) -E -DSOL asm/dx86unix.cpp | sed 's/^#.*//' > asm/dx86-sol.s | ||
138 | as -o asm/dx86-sol.o asm/dx86-sol.s | ||
139 | rm -f asm/dx86-sol.s | ||
140 | |||
141 | asm/yx86-sol.o: asm/yx86unix.cpp | ||
142 | $(CC) -E -DSOL asm/yx86unix.cpp | sed 's/^#.*//' > asm/yx86-sol.s | ||
143 | as -o asm/yx86-sol.o asm/yx86-sol.s | ||
144 | rm -f asm/yx86-sol.s | ||
145 | |||
146 | # a.out | ||
147 | asm/dx86-out.o: asm/dx86unix.cpp | ||
148 | $(CPP) -DOUT asm/dx86unix.cpp | $(AS) -o asm/dx86-out.o | ||
149 | |||
150 | asm/yx86-out.o: asm/yx86unix.cpp | ||
151 | $(CPP) -DOUT asm/yx86unix.cpp | $(AS) -o asm/yx86-out.o | ||
152 | |||
153 | # bsdi | ||
154 | asm/dx86bsdi.o: asm/dx86unix.cpp | ||
155 | $(CPP) -DBSDI asm/dx86unix.cpp | $(AS) -o asm/dx86bsdi.o | ||
156 | |||
157 | asm/yx86bsdi.o: asm/yx86unix.cpp | ||
158 | $(CPP) -DBSDI asm/yx86unix.cpp | $(AS) -o asm/yx86bsdi.o | ||
159 | |||
160 | asm/dx86unix.cpp: | ||
161 | (cd asm; perl des-586.pl cpp >dx86unix.cpp) | ||
162 | |||
163 | asm/yx86unix.cpp: | ||
164 | (cd asm; perl crypt586.pl cpp >yx86unix.cpp) | ||
165 | |||
166 | test: all | ||
167 | ./destest | ||
168 | |||
169 | $(DLIB): $(OBJ) | ||
170 | /bin/rm -f $(DLIB) | ||
171 | ar cr $(DLIB) $(OBJ) | ||
172 | -if test -s /bin/ranlib; then /bin/ranlib $(DLIB); \ | ||
173 | else if test -s /usr/bin/ranlib; then /usr/bin/ranlib $(DLIB); \ | ||
174 | else exit 0; fi; fi | ||
175 | |||
176 | des_opts: des_opts.o $(DLIB) | ||
177 | $(CC) $(CFLAGS) -o des_opts des_opts.o $(DLIB) | ||
178 | |||
179 | destest: destest.o $(DLIB) | ||
180 | $(CC) $(CFLAGS) -o destest destest.o $(DLIB) | ||
181 | |||
182 | rpw: rpw.o $(DLIB) | ||
183 | $(CC) $(CFLAGS) -o rpw rpw.o $(DLIB) | ||
184 | |||
185 | speed: speed.o $(DLIB) | ||
186 | $(CC) $(CFLAGS) -o speed speed.o $(DLIB) | ||
187 | |||
188 | des: des.o $(DLIB) | ||
189 | $(CC) $(CFLAGS) -o des des.o $(DLIB) | ||
190 | |||
191 | tags: | ||
192 | ctags $(TESTING_SRC) $(LIBDES) | ||
193 | |||
194 | tar_lit: | ||
195 | /bin/mv Makefile Makefile.tmp | ||
196 | /bin/cp Makefile.lit Makefile | ||
197 | tar chf libdes-l.tar $(LIBDES_LIT) $(HEADERS_LIT) \ | ||
198 | $(GENERAL_LIT) $(TESTING_SRC_LIT) | ||
199 | /bin/rm -f Makefile | ||
200 | /bin/mv Makefile.tmp Makefile | ||
201 | |||
202 | tar: | ||
203 | tar chf libdes.tar $(ALL) | ||
204 | |||
205 | shar: | ||
206 | shar $(ALL) >libdes.shar | ||
207 | |||
208 | depend: | ||
209 | makedepend $(LIBDES) $(TESTING_SRC) | ||
210 | |||
211 | clean: | ||
212 | /bin/rm -f *.o tags core $(TESTING) $(DLIB) .nfs* *.old *.bak asm/*.o | ||
213 | |||
214 | dclean: | ||
215 | sed -e '/^# DO NOT DELETE THIS LINE/ q' Makefile >Makefile.new | ||
216 | mv -f Makefile.new Makefile | ||
217 | |||
218 | # Eric is probably going to choke when he next looks at this --tjh | ||
219 | install: | ||
220 | if test $(INSTALLTOP); then \ | ||
221 | echo SSL style install; \ | ||
222 | cp $(DLIB) $(INSTALLTOP)/lib; \ | ||
223 | if test -s /bin/ranlib; then \ | ||
224 | /bin/ranlib $(INSTALLTOP)/lib/$(DLIB); \ | ||
225 | else \ | ||
226 | if test -s /usr/bin/ranlib; then \ | ||
227 | /usr/bin/ranlib $(INSTALLTOP)/lib/$(DLIB); \ | ||
228 | fi; fi; \ | ||
229 | chmod 644 $(INSTALLTOP)/lib/$(DLIB); \ | ||
230 | cp des.h $(INSTALLTOP)/include; \ | ||
231 | chmod 644 $(INSTALLTOP)/include/des.h; \ | ||
232 | else \ | ||
233 | echo Standalone install; \ | ||
234 | cp $(DLIB) $(LIBDIR)/$(DLIB); \ | ||
235 | if test -s /bin/ranlib; then \ | ||
236 | /bin/ranlib $(LIBDIR)/$(DLIB); \ | ||
237 | else \ | ||
238 | if test -s /usr/bin/ranlib; then \ | ||
239 | /usr/bin/ranlib $(LIBDIR)/$(DLIB); \ | ||
240 | fi; \ | ||
241 | fi; \ | ||
242 | chmod 644 $(LIBDIR)/$(DLIB); \ | ||
243 | cp des_crypt.man $(MANDIR)/man$(MAN3)/des_crypt.$(MAN3); \ | ||
244 | chmod 644 $(MANDIR)/man$(MAN3)/des_crypt.$(MAN3); \ | ||
245 | cp des.man $(MANDIR)/man$(MAN1)/des.$(MAN1); \ | ||
246 | chmod 644 $(MANDIR)/man$(MAN1)/des.$(MAN1); \ | ||
247 | cp des.h $(INCDIR)/des.h; \ | ||
248 | chmod 644 $(INCDIR)/des.h; \ | ||
249 | fi | ||
250 | # DO NOT DELETE THIS LINE -- make depend depends on it. | ||
diff --git a/src/lib/libssl/src/crypto/des/Makefile.ssl b/src/lib/libssl/src/crypto/des/Makefile.ssl index 41976655e9..3eb0738b7b 100644 --- a/src/lib/libssl/src/crypto/des/Makefile.ssl +++ b/src/lib/libssl/src/crypto/des/Makefile.ssl | |||
@@ -32,21 +32,21 @@ LIBSRC= cbc_cksm.c cbc_enc.c cfb64enc.c cfb_enc.c \ | |||
32 | fcrypt.c ofb64enc.c ofb_enc.c pcbc_enc.c \ | 32 | fcrypt.c ofb64enc.c ofb_enc.c pcbc_enc.c \ |
33 | qud_cksm.c rand_key.c read_pwd.c rpc_enc.c set_key.c \ | 33 | qud_cksm.c rand_key.c read_pwd.c rpc_enc.c set_key.c \ |
34 | des_enc.c fcrypt_b.c read2pwd.c \ | 34 | des_enc.c fcrypt_b.c read2pwd.c \ |
35 | fcrypt.c xcbc_enc.c \ | 35 | xcbc_enc.c \ |
36 | str2key.c cfb64ede.c ofb64ede.c supp.c ede_cbcm_enc.c | 36 | str2key.c cfb64ede.c ofb64ede.c ede_cbcm_enc.c |
37 | 37 | ||
38 | LIBOBJ= set_key.o ecb_enc.o cbc_enc.o \ | 38 | LIBOBJ= set_key.o ecb_enc.o cbc_enc.o \ |
39 | ecb3_enc.o cfb64enc.o cfb64ede.o cfb_enc.o ofb64ede.o \ | 39 | ecb3_enc.o cfb64enc.o cfb64ede.o cfb_enc.o ofb64ede.o \ |
40 | enc_read.o enc_writ.o ofb64enc.o \ | 40 | enc_read.o enc_writ.o ofb64enc.o \ |
41 | ofb_enc.o str2key.o pcbc_enc.o qud_cksm.o rand_key.o \ | 41 | ofb_enc.o str2key.o pcbc_enc.o qud_cksm.o rand_key.o \ |
42 | ${DES_ENC} read2pwd.o \ | 42 | ${DES_ENC} read2pwd.o \ |
43 | fcrypt.o xcbc_enc.o read_pwd.o rpc_enc.o cbc_cksm.o supp.o \ | 43 | fcrypt.o xcbc_enc.o read_pwd.o rpc_enc.o cbc_cksm.o \ |
44 | ede_cbcm_enc.o | 44 | ede_cbcm_enc.o |
45 | 45 | ||
46 | SRC= $(LIBSRC) | 46 | SRC= $(LIBSRC) |
47 | 47 | ||
48 | EXHEADER= des.h | 48 | EXHEADER= des.h |
49 | HEADER= des_locl.h rpc_des.h podd.h sk.h spr.h des_ver.h $(EXHEADER) | 49 | HEADER= des_locl.h rpc_des.h spr.h des_ver.h $(EXHEADER) |
50 | 50 | ||
51 | ALL= $(GENERAL) $(SRC) $(HEADER) | 51 | ALL= $(GENERAL) $(SRC) $(HEADER) |
52 | 52 | ||
@@ -65,10 +65,10 @@ des: des.o cbc3_enc.o lib | |||
65 | 65 | ||
66 | # elf | 66 | # elf |
67 | asm/dx86-elf.o: asm/dx86unix.cpp | 67 | asm/dx86-elf.o: asm/dx86unix.cpp |
68 | $(CPP) -DELF asm/dx86unix.cpp | as -o asm/dx86-elf.o | 68 | $(CPP) -DELF -x c asm/dx86unix.cpp | as -o asm/dx86-elf.o |
69 | 69 | ||
70 | asm/yx86-elf.o: asm/yx86unix.cpp | 70 | asm/yx86-elf.o: asm/yx86unix.cpp |
71 | $(CPP) -DELF asm/yx86unix.cpp | as -o asm/yx86-elf.o | 71 | $(CPP) -DELF -x c asm/yx86unix.cpp | as -o asm/yx86-elf.o |
72 | 72 | ||
73 | # solaris | 73 | # solaris |
74 | asm/dx86-sol.o: asm/dx86unix.cpp | 74 | asm/dx86-sol.o: asm/dx86unix.cpp |
@@ -95,10 +95,10 @@ asm/dx86bsdi.o: asm/dx86unix.cpp | |||
95 | asm/yx86bsdi.o: asm/yx86unix.cpp | 95 | asm/yx86bsdi.o: asm/yx86unix.cpp |
96 | $(CPP) -DBSDI asm/yx86unix.cpp | sed 's/ :/:/' | as -o asm/yx86bsdi.o | 96 | $(CPP) -DBSDI asm/yx86unix.cpp | sed 's/ :/:/' | as -o asm/yx86bsdi.o |
97 | 97 | ||
98 | asm/dx86unix.cpp: asm/des-586.pl | 98 | asm/dx86unix.cpp: asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl |
99 | (cd asm; $(PERL) des-586.pl cpp >dx86unix.cpp) | 99 | (cd asm; $(PERL) des-586.pl cpp >dx86unix.cpp) |
100 | 100 | ||
101 | asm/yx86unix.cpp: asm/crypt586.pl | 101 | asm/yx86unix.cpp: asm/crypt586.pl ../perlasm/x86asm.pl |
102 | (cd asm; $(PERL) crypt586.pl cpp >yx86unix.cpp) | 102 | (cd asm; $(PERL) crypt586.pl cpp >yx86unix.cpp) |
103 | 103 | ||
104 | files: | 104 | files: |
@@ -172,10 +172,8 @@ enc_writ.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h | |||
172 | enc_writ.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h | 172 | enc_writ.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h |
173 | enc_writ.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | 173 | enc_writ.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h |
174 | enc_writ.o: ../cryptlib.h des_locl.h | 174 | enc_writ.o: ../cryptlib.h des_locl.h |
175 | fcrypt.o: ../../include/openssl/des.h ../../include/openssl/des.h | 175 | fcrypt.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h |
176 | fcrypt.o: ../../include/openssl/e_os2.h ../../include/openssl/e_os2.h | 176 | fcrypt.o: ../../include/openssl/opensslconf.h des_locl.h |
177 | fcrypt.o: ../../include/openssl/opensslconf.h | ||
178 | fcrypt.o: ../../include/openssl/opensslconf.h des_locl.h des_locl.h | ||
179 | fcrypt_b.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h | 177 | fcrypt_b.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h |
180 | fcrypt_b.o: ../../include/openssl/opensslconf.h des_locl.h | 178 | fcrypt_b.o: ../../include/openssl/opensslconf.h des_locl.h |
181 | ofb64ede.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h | 179 | ofb64ede.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h |
@@ -201,10 +199,8 @@ read_pwd.o: ../../include/openssl/stack.h ../cryptlib.h des_locl.h | |||
201 | rpc_enc.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h | 199 | rpc_enc.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h |
202 | rpc_enc.o: ../../include/openssl/opensslconf.h des_locl.h des_ver.h rpc_des.h | 200 | rpc_enc.o: ../../include/openssl/opensslconf.h des_locl.h des_ver.h rpc_des.h |
203 | set_key.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h | 201 | set_key.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h |
204 | set_key.o: ../../include/openssl/opensslconf.h des_locl.h podd.h sk.h | 202 | set_key.o: ../../include/openssl/opensslconf.h des_locl.h |
205 | str2key.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h | 203 | str2key.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h |
206 | str2key.o: ../../include/openssl/opensslconf.h des_locl.h | 204 | str2key.o: ../../include/openssl/opensslconf.h des_locl.h |
207 | supp.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h | ||
208 | supp.o: ../../include/openssl/opensslconf.h des_locl.h | ||
209 | xcbc_enc.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h | 205 | xcbc_enc.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h |
210 | xcbc_enc.o: ../../include/openssl/opensslconf.h des_locl.h | 206 | xcbc_enc.o: ../../include/openssl/opensslconf.h des_locl.h |
diff --git a/src/lib/libssl/src/crypto/des/Makefile.uni b/src/lib/libssl/src/crypto/des/Makefile.uni index ec19d75b81..e69de29bb2 100644 --- a/src/lib/libssl/src/crypto/des/Makefile.uni +++ b/src/lib/libssl/src/crypto/des/Makefile.uni | |||
@@ -1,251 +0,0 @@ | |||
1 | # You must select the correct terminal control system to be used to | ||
2 | # turn character echo off when reading passwords. There a 5 systems | ||
3 | # SGTTY - the old BSD system | ||
4 | # TERMIO - most system V boxes | ||
5 | # TERMIOS - SGI (ala IRIX). | ||
6 | # VMS - the DEC operating system | ||
7 | # MSDOS - we all know what it is :-) | ||
8 | # read_pwd.c makes a reasonable guess at what is correct. | ||
9 | |||
10 | # Targets | ||
11 | # make - twidle the options yourself :-) | ||
12 | # make cc - standard cc options | ||
13 | # make gcc - standard gcc options | ||
14 | # make x86-elf - linux-elf etc | ||
15 | # make x86-out - linux-a.out, FreeBSD etc | ||
16 | # make x86-solaris | ||
17 | # make x86-bdsi | ||
18 | |||
19 | # If you are on a DEC Alpha, edit des.h and change the DES_LONG | ||
20 | # define to 'unsigned int'. I have seen this give a %20 speedup. | ||
21 | |||
22 | OPTS0= -DRAND -DTERMIO #-DNOCONST | ||
23 | |||
24 | # Version 1.94 has changed the strings_to_key function so that it is | ||
25 | # now compatible with MITs when the string is longer than 8 characters. | ||
26 | # If you wish to keep the old version, uncomment the following line. | ||
27 | # This will affect the -E/-D options on des(1). | ||
28 | #OPTS1= -DOLD_STR_TO_KEY | ||
29 | |||
30 | # There are 4 possible performance options | ||
31 | # -DDES_PTR | ||
32 | # -DDES_RISC1 | ||
33 | # -DDES_RISC2 (only one of DES_RISC1 and DES_RISC2) | ||
34 | # -DDES_UNROLL | ||
35 | # after the initial build, run 'des_opts' to see which options are best | ||
36 | # for your platform. There are some listed in options.txt | ||
37 | #OPTS2= -DDES_PTR | ||
38 | #OPTS3= -DDES_RISC1 # or DES_RISC2 | ||
39 | #OPTS4= -DDES_UNROLL | ||
40 | |||
41 | OPTS= $(OPTS0) $(OPTS1) $(OPTS2) $(OPTS3) $(OPTS4) | ||
42 | |||
43 | MAKE=make -f Makefile | ||
44 | #CC=cc | ||
45 | #CFLAG= -O | ||
46 | |||
47 | CC=gcc | ||
48 | #CFLAG= -O4 -funroll-loops -fomit-frame-pointer | ||
49 | CFLAG= -O3 -fomit-frame-pointer | ||
50 | |||
51 | CFLAGS=$(OPTS) $(CFLAG) | ||
52 | CPP=$(CC) -E | ||
53 | AS=as | ||
54 | RANLIB=ranlib | ||
55 | |||
56 | # Assember version of des_encrypt*(). | ||
57 | DES_ENC=des_enc.o fcrypt_b.o # normal C version | ||
58 | #DES_ENC=asm/dx86-elf.o asm/yx86-elf.o # elf format x86 | ||
59 | #DES_ENC=asm/dx86-out.o asm/yx86-out.o # a.out format x86 | ||
60 | #DES_ENC=asm/dx86-sol.o asm/yx86-sol.o # solaris format x86 | ||
61 | #DES_ENC=asm/dx86bsdi.o asm/yx86basi.o # bsdi format x86 | ||
62 | |||
63 | LIBDIR=/usr/local/lib | ||
64 | BINDIR=/usr/local/bin | ||
65 | INCDIR=/usr/local/include | ||
66 | MANDIR=/usr/local/man | ||
67 | MAN1=1 | ||
68 | MAN3=3 | ||
69 | SHELL=/bin/sh | ||
70 | OBJ_LIT=cbc_enc.o ecb_enc.o $(DES_ENC) fcrypt.o set_key.o | ||
71 | OBJ_FULL=cbc_cksm.o $(OBJ_LIT) pcbc_enc.o \ | ||
72 | xcbc_enc.o qud_cksm.o cbc3_enc.o \ | ||
73 | cfb64ede.o cfb64enc.o cfb_enc.o ecb3_enc.o \ | ||
74 | enc_read.o enc_writ.o ofb64ede.o ofb64enc.o ofb_enc.o \ | ||
75 | rand_key.o read_pwd.o read2pwd.o rpc_enc.o str2key.o supp.o | ||
76 | |||
77 | GENERAL_LIT=COPYRIGHT INSTALL README VERSION Makefile des_crypt.man \ | ||
78 | des.doc options.txt asm | ||
79 | GENERAL_FULL=$(GENERAL_LIT) FILES Imakefile times vms.com KERBEROS MODES.DES \ | ||
80 | des.man DES.pm DES.pod DES.xs Makefile.PL dess.cpp des3s.cpp \ | ||
81 | Makefile.uni typemap t Makefile.ssl makefile.bc Makefile.lit \ | ||
82 | des.org des_locl.org | ||
83 | TESTING_LIT= destest speed des_opts | ||
84 | TESTING_FULL= rpw des $(TESTING_LIT) | ||
85 | TESTING_SRC_LIT=destest.c speed.c des_opts.c | ||
86 | TESTING_SRC_FULL=rpw.c des.c $(TESTING_SRC_LIT) | ||
87 | HEADERS_LIT=des_ver.h des.h des_locl.h podd.h sk.h spr.h | ||
88 | HEADERS_FULL= $(HEADERS_LIT) rpc_des.h | ||
89 | LIBDES_LIT=cbc_enc.c ecb_enc.c fcrypt.c set_key.c des_enc.c fcrypt_b.c | ||
90 | LIBDES_FULL= cbc_cksm.c pcbc_enc.c qud_cksm.c cbc3_enc.c \ | ||
91 | cfb64ede.c cfb64enc.c cfb_enc.c ecb3_enc.c \ | ||
92 | enc_read.c enc_writ.c ofb64ede.c ofb64enc.c ofb_enc.c \ | ||
93 | rand_key.c rpc_enc.c str2key.c supp.c \ | ||
94 | xcbc_enc.c $(LIBDES_LIT) read_pwd.c read2pwd.c | ||
95 | |||
96 | PERL= des.pl testdes.pl doIP doPC1 doPC2 PC1 PC2 shifts.pl | ||
97 | |||
98 | OBJ= $(OBJ_FULL) | ||
99 | GENERAL=$(GENERAL_FULL) | ||
100 | TESTING=$(TESTING_FULL) | ||
101 | TESTING_SRC=$(TESTING_SRC_FULL) | ||
102 | HEADERS=$(HEADERS_FULL) | ||
103 | LIBDES= $(LIBDES_FULL) | ||
104 | |||
105 | ALL= $(GENERAL) $(TESTING_SRC) $(LIBDES) $(PERL) $(HEADERS) | ||
106 | |||
107 | DLIB= libdes.a | ||
108 | |||
109 | all: $(DLIB) $(TESTING) | ||
110 | |||
111 | cc: | ||
112 | $(MAKE) CC=cc CFLAGS="-O $(OPTS) $(CFLAG)" all | ||
113 | |||
114 | gcc: | ||
115 | $(MAKE) CC=gcc CFLAGS="-O3 -fomit-frame-pointer $(OPTS) $(CFLAG)" all | ||
116 | |||
117 | x86-elf: | ||
118 | $(MAKE) DES_ENC='asm/dx86-elf.o asm/yx86-elf.o' CC=$(CC) CFLAGS="-DELF $(OPTS) $(CFLAG)" all | ||
119 | |||
120 | x86-out: | ||
121 | $(MAKE) DES_ENC='asm/dx86-out.o asm/yx86-out.o' CC=$(CC) CFLAGS="-DOUT $(OPTS) $(CFLAG)" all | ||
122 | |||
123 | x86-solaris: | ||
124 | $(MAKE) DES_ENC='asm/dx86-sol.o asm/yx86-sol.o' CC=$(CC) CFLAGS="-DSOL $(OPTS) $(CFLAG)" all | ||
125 | |||
126 | x86-bsdi: | ||
127 | $(MAKE) DES_ENC='asm/dx86bsdi.o asm/yx86bsdi.o' CC=$(CC) CFLAGS="-DBSDI $(OPTS) $(CFLAG)" all | ||
128 | |||
129 | # elf | ||
130 | asm/dx86-elf.o: asm/dx86unix.cpp | ||
131 | $(CPP) -DELF asm/dx86unix.cpp | $(AS) -o asm/dx86-elf.o | ||
132 | |||
133 | asm/yx86-elf.o: asm/yx86unix.cpp | ||
134 | $(CPP) -DELF asm/yx86unix.cpp | $(AS) -o asm/yx86-elf.o | ||
135 | |||
136 | # solaris | ||
137 | asm/dx86-sol.o: asm/dx86unix.cpp | ||
138 | $(CC) -E -DSOL asm/dx86unix.cpp | sed 's/^#.*//' > asm/dx86-sol.s | ||
139 | as -o asm/dx86-sol.o asm/dx86-sol.s | ||
140 | rm -f asm/dx86-sol.s | ||
141 | |||
142 | asm/yx86-sol.o: asm/yx86unix.cpp | ||
143 | $(CC) -E -DSOL asm/yx86unix.cpp | sed 's/^#.*//' > asm/yx86-sol.s | ||
144 | as -o asm/yx86-sol.o asm/yx86-sol.s | ||
145 | rm -f asm/yx86-sol.s | ||
146 | |||
147 | # a.out | ||
148 | asm/dx86-out.o: asm/dx86unix.cpp | ||
149 | $(CPP) -DOUT asm/dx86unix.cpp | $(AS) -o asm/dx86-out.o | ||
150 | |||
151 | asm/yx86-out.o: asm/yx86unix.cpp | ||
152 | $(CPP) -DOUT asm/yx86unix.cpp | $(AS) -o asm/yx86-out.o | ||
153 | |||
154 | # bsdi | ||
155 | asm/dx86bsdi.o: asm/dx86unix.cpp | ||
156 | $(CPP) -DBSDI asm/dx86unix.cpp | $(AS) -o asm/dx86bsdi.o | ||
157 | |||
158 | asm/yx86bsdi.o: asm/yx86unix.cpp | ||
159 | $(CPP) -DBSDI asm/yx86unix.cpp | $(AS) -o asm/yx86bsdi.o | ||
160 | |||
161 | asm/dx86unix.cpp: | ||
162 | (cd asm; perl des-586.pl cpp >dx86unix.cpp) | ||
163 | |||
164 | asm/yx86unix.cpp: | ||
165 | (cd asm; perl crypt586.pl cpp >yx86unix.cpp) | ||
166 | |||
167 | test: all | ||
168 | ./destest | ||
169 | |||
170 | $(DLIB): $(OBJ) | ||
171 | /bin/rm -f $(DLIB) | ||
172 | ar cr $(DLIB) $(OBJ) | ||
173 | $(RANLIB) $(DLIB) | ||
174 | |||
175 | des_opts: des_opts.o $(DLIB) | ||
176 | $(CC) $(CFLAGS) -o des_opts des_opts.o $(DLIB) | ||
177 | |||
178 | destest: destest.o $(DLIB) | ||
179 | $(CC) $(CFLAGS) -o destest destest.o $(DLIB) | ||
180 | |||
181 | rpw: rpw.o $(DLIB) | ||
182 | $(CC) $(CFLAGS) -o rpw rpw.o $(DLIB) | ||
183 | |||
184 | speed: speed.o $(DLIB) | ||
185 | $(CC) $(CFLAGS) -o speed speed.o $(DLIB) | ||
186 | |||
187 | des: des.o $(DLIB) | ||
188 | $(CC) $(CFLAGS) -o des des.o $(DLIB) | ||
189 | |||
190 | tags: | ||
191 | ctags $(TESTING_SRC) $(LIBDES) | ||
192 | |||
193 | tar_lit: | ||
194 | /bin/mv Makefile Makefile.tmp | ||
195 | /bin/cp Makefile.lit Makefile | ||
196 | for i in $(HEADERS_LIT) $(LIBDES_LIT) $(GENERAL_LIT) $(TESTING_SRC_LIT) ;\ | ||
197 | do \ | ||
198 | n="$$n des/$$i"; \ | ||
199 | done; \ | ||
200 | ( cd .. ; tar chf - $$n )| gzip > libdes-l.tgz | ||
201 | /bin/rm -f Makefile | ||
202 | /bin/mv Makefile.tmp Makefile | ||
203 | |||
204 | tar: | ||
205 | mv Makefile Makefile.tmp | ||
206 | /bin/cp Makefile.uni Makefile | ||
207 | for i in $(ALL) ;\ | ||
208 | do \ | ||
209 | n="$$n des/$$i"; \ | ||
210 | done; \ | ||
211 | ( cd .. ; tar chf - $$n )| gzip > libdes.tgz | ||
212 | /bin/rm -f Makefile | ||
213 | /bin/mv Makefile.tmp Makefile | ||
214 | |||
215 | shar: | ||
216 | shar $(ALL) >libdes.shar | ||
217 | |||
218 | depend: | ||
219 | makedepend $(LIBDES) $(TESTING_SRC) | ||
220 | |||
221 | clean: | ||
222 | /bin/rm -f *.o tags core $(TESTING) $(DLIB) .nfs* *.old *.bak asm/*.o | ||
223 | |||
224 | dclean: | ||
225 | sed -e '/^# DO NOT DELETE THIS LINE/ q' Makefile >Makefile.new | ||
226 | mv -f Makefile.new Makefile | ||
227 | |||
228 | # Eric is probably going to choke when he next looks at this --tjh | ||
229 | install: des | ||
230 | if test $(INSTALLTOP); then \ | ||
231 | echo SSL style install; \ | ||
232 | cp $(DLIB) $(INSTALLTOP)/lib; \ | ||
233 | $(RANLIB) $(DLIB); \ | ||
234 | chmod 644 $(INSTALLTOP)/lib/$(DLIB); \ | ||
235 | cp des.h $(INSTALLTOP)/include; \ | ||
236 | chmod 644 $(INSTALLTOP)/include/des.h; \ | ||
237 | else \ | ||
238 | echo Standalone install; \ | ||
239 | cp $(DLIB) $(LIBDIR)/$(DLIB); \ | ||
240 | $(RANLIB) $(DLIB); \ | ||
241 | chmod 644 $(LIBDIR)/$(DLIB); \ | ||
242 | cp des $(BINDIR)/des; \ | ||
243 | chmod 711 $(BINDIR)/des; \ | ||
244 | cp des_crypt.man $(MANDIR)/man$(MAN3)/des_crypt.$(MAN3); \ | ||
245 | chmod 644 $(MANDIR)/man$(MAN3)/des_crypt.$(MAN3); \ | ||
246 | cp des.man $(MANDIR)/man$(MAN1)/des.$(MAN1); \ | ||
247 | chmod 644 $(MANDIR)/man$(MAN1)/des.$(MAN1); \ | ||
248 | cp des.h $(INCDIR)/des.h; \ | ||
249 | chmod 644 $(INCDIR)/des.h; \ | ||
250 | fi | ||
251 | # DO NOT DELETE THIS LINE -- make depend depends on it. | ||
diff --git a/src/lib/libssl/src/crypto/des/PC1 b/src/lib/libssl/src/crypto/des/PC1 index efb8348b72..e69de29bb2 100644 --- a/src/lib/libssl/src/crypto/des/PC1 +++ b/src/lib/libssl/src/crypto/des/PC1 | |||
@@ -1,28 +0,0 @@ | |||
1 | #!/usr/local/bin/perl | ||
2 | |||
3 | @PC1=( 57,49,41,33,25,17, 9, | ||
4 | 1,58,50,42,34,26,18, | ||
5 | 10, 2,59,51,43,35,27, | ||
6 | 19,11, 3,60,52,44,36, | ||
7 | "-","-","-","-", | ||
8 | 63,55,47,39,31,23,15, | ||
9 | 7,62,54,46,38,30,22, | ||
10 | 14, 6,61,53,45,37,29, | ||
11 | 21,13, 5,28,20,12, 4, | ||
12 | "-","-","-","-", | ||
13 | ); | ||
14 | |||
15 | foreach (@PC1) | ||
16 | { | ||
17 | if ($_ ne "-") | ||
18 | { | ||
19 | $_--; | ||
20 | $_=int($_/8)*8+7-($_%8); | ||
21 | printf "%2d ",$_; | ||
22 | } | ||
23 | else | ||
24 | { print "-- "; } | ||
25 | print "\n" if (((++$i) % 8) == 0); | ||
26 | print "\n" if ((($i) % 32) == 0); | ||
27 | } | ||
28 | |||
diff --git a/src/lib/libssl/src/crypto/des/PC2 b/src/lib/libssl/src/crypto/des/PC2 index 2d560270ec..e69de29bb2 100644 --- a/src/lib/libssl/src/crypto/des/PC2 +++ b/src/lib/libssl/src/crypto/des/PC2 | |||
@@ -1,57 +0,0 @@ | |||
1 | #!/usr/local/bin/perl | ||
2 | |||
3 | @PC2_C=(14,17,11,24, 1, 5, | ||
4 | 3,28,15, 6,21,10, | ||
5 | 23,19,12, 4,26, 8, | ||
6 | 16, 7,27,20,13, 2, | ||
7 | ); | ||
8 | |||
9 | @PC2_D=(41,52,31,37,47,55, | ||
10 | 30,40,51,45,33,48, | ||
11 | 44,49,39,56,34,53, | ||
12 | 46,42,50,36,29,32, | ||
13 | ); | ||
14 | |||
15 | foreach (@PC2_C) { | ||
16 | if ($_ ne "-") | ||
17 | { | ||
18 | $_--; | ||
19 | printf "%2d ",$_; } | ||
20 | else { print "-- "; } | ||
21 | $C{$_}=1; | ||
22 | print "\n" if (((++$i) % 8) == 0); | ||
23 | } | ||
24 | $i=0; | ||
25 | print "\n"; | ||
26 | foreach (@PC2_D) { | ||
27 | if ($_ ne "-") | ||
28 | { | ||
29 | $_-=29; | ||
30 | printf "%2d ",$_; } | ||
31 | else { print "-- "; } | ||
32 | $D{$_}=1; | ||
33 | print "\n" if (((++$i) % 8) == 0); } | ||
34 | |||
35 | print "\n"; | ||
36 | foreach $i (0 .. 27) | ||
37 | { | ||
38 | $_=$C{$i}; | ||
39 | if ($_ ne "-") {printf "%2d ",$_;} | ||
40 | else { print "-- "; } | ||
41 | print "\n" if (((++$i) % 8) == 0); | ||
42 | } | ||
43 | print "\n"; | ||
44 | |||
45 | print "\n"; | ||
46 | foreach $i (0 .. 27) | ||
47 | { | ||
48 | $_=$D{$i}; | ||
49 | if ($_ ne "-") {printf "%2d ",$_;} | ||
50 | else { print "-- "; } | ||
51 | print "\n" if (((++$i) % 8) == 0); | ||
52 | } | ||
53 | print "\n"; | ||
54 | sub numsort | ||
55 | { | ||
56 | $a-$b; | ||
57 | } | ||
diff --git a/src/lib/libssl/src/crypto/des/asm/d-win32.asm b/src/lib/libssl/src/crypto/des/asm/d-win32.asm index 9e3dc9cd87..e69de29bb2 100644 --- a/src/lib/libssl/src/crypto/des/asm/d-win32.asm +++ b/src/lib/libssl/src/crypto/des/asm/d-win32.asm | |||
@@ -1,3132 +0,0 @@ | |||
1 | ; Don't even think of reading this code | ||
2 | ; It was automatically generated by des-586.pl | ||
3 | ; Which is a perl program used to generate the x86 assember for | ||
4 | ; any of elf, a.out, BSDI,Win32, or Solaris | ||
5 | ; eric <eay@cryptsoft.com> | ||
6 | ; | ||
7 | TITLE des-586.asm | ||
8 | .386 | ||
9 | .model FLAT | ||
10 | _TEXT SEGMENT | ||
11 | PUBLIC _des_encrypt | ||
12 | EXTRN _des_SPtrans:DWORD | ||
13 | _des_encrypt PROC NEAR | ||
14 | push esi | ||
15 | push edi | ||
16 | ; | ||
17 | ; Load the 2 words | ||
18 | mov esi, DWORD PTR 12[esp] | ||
19 | xor ecx, ecx | ||
20 | push ebx | ||
21 | push ebp | ||
22 | mov eax, DWORD PTR [esi] | ||
23 | mov ebx, DWORD PTR 28[esp] | ||
24 | mov edi, DWORD PTR 4[esi] | ||
25 | ; | ||
26 | ; IP | ||
27 | rol eax, 4 | ||
28 | mov esi, eax | ||
29 | xor eax, edi | ||
30 | and eax, 0f0f0f0f0h | ||
31 | xor esi, eax | ||
32 | xor edi, eax | ||
33 | ; | ||
34 | rol edi, 20 | ||
35 | mov eax, edi | ||
36 | xor edi, esi | ||
37 | and edi, 0fff0000fh | ||
38 | xor eax, edi | ||
39 | xor esi, edi | ||
40 | ; | ||
41 | rol eax, 14 | ||
42 | mov edi, eax | ||
43 | xor eax, esi | ||
44 | and eax, 033333333h | ||
45 | xor edi, eax | ||
46 | xor esi, eax | ||
47 | ; | ||
48 | rol esi, 22 | ||
49 | mov eax, esi | ||
50 | xor esi, edi | ||
51 | and esi, 003fc03fch | ||
52 | xor eax, esi | ||
53 | xor edi, esi | ||
54 | ; | ||
55 | rol eax, 9 | ||
56 | mov esi, eax | ||
57 | xor eax, edi | ||
58 | and eax, 0aaaaaaaah | ||
59 | xor esi, eax | ||
60 | xor edi, eax | ||
61 | ; | ||
62 | rol edi, 1 | ||
63 | mov ebp, DWORD PTR 24[esp] | ||
64 | cmp ebx, 0 | ||
65 | je $L000start_decrypt | ||
66 | ; | ||
67 | ; Round 0 | ||
68 | mov eax, DWORD PTR [ebp] | ||
69 | xor ebx, ebx | ||
70 | mov edx, DWORD PTR 4[ebp] | ||
71 | xor eax, esi | ||
72 | xor edx, esi | ||
73 | and eax, 0fcfcfcfch | ||
74 | and edx, 0cfcfcfcfh | ||
75 | mov bl, al | ||
76 | mov cl, ah | ||
77 | ror edx, 4 | ||
78 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
79 | mov bl, dl | ||
80 | xor edi, ebp | ||
81 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
82 | xor edi, ebp | ||
83 | mov cl, dh | ||
84 | shr eax, 16 | ||
85 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
86 | xor edi, ebp | ||
87 | mov bl, ah | ||
88 | shr edx, 16 | ||
89 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
90 | xor edi, ebp | ||
91 | mov ebp, DWORD PTR 24[esp] | ||
92 | mov cl, dh | ||
93 | and eax, 0ffh | ||
94 | and edx, 0ffh | ||
95 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
96 | xor edi, ebx | ||
97 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
98 | xor edi, ebx | ||
99 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
100 | xor edi, ebx | ||
101 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
102 | xor edi, ebx | ||
103 | ; | ||
104 | ; Round 1 | ||
105 | mov eax, DWORD PTR 8[ebp] | ||
106 | xor ebx, ebx | ||
107 | mov edx, DWORD PTR 12[ebp] | ||
108 | xor eax, edi | ||
109 | xor edx, edi | ||
110 | and eax, 0fcfcfcfch | ||
111 | and edx, 0cfcfcfcfh | ||
112 | mov bl, al | ||
113 | mov cl, ah | ||
114 | ror edx, 4 | ||
115 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
116 | mov bl, dl | ||
117 | xor esi, ebp | ||
118 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
119 | xor esi, ebp | ||
120 | mov cl, dh | ||
121 | shr eax, 16 | ||
122 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
123 | xor esi, ebp | ||
124 | mov bl, ah | ||
125 | shr edx, 16 | ||
126 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
127 | xor esi, ebp | ||
128 | mov ebp, DWORD PTR 24[esp] | ||
129 | mov cl, dh | ||
130 | and eax, 0ffh | ||
131 | and edx, 0ffh | ||
132 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
133 | xor esi, ebx | ||
134 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
135 | xor esi, ebx | ||
136 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
137 | xor esi, ebx | ||
138 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
139 | xor esi, ebx | ||
140 | ; | ||
141 | ; Round 2 | ||
142 | mov eax, DWORD PTR 16[ebp] | ||
143 | xor ebx, ebx | ||
144 | mov edx, DWORD PTR 20[ebp] | ||
145 | xor eax, esi | ||
146 | xor edx, esi | ||
147 | and eax, 0fcfcfcfch | ||
148 | and edx, 0cfcfcfcfh | ||
149 | mov bl, al | ||
150 | mov cl, ah | ||
151 | ror edx, 4 | ||
152 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
153 | mov bl, dl | ||
154 | xor edi, ebp | ||
155 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
156 | xor edi, ebp | ||
157 | mov cl, dh | ||
158 | shr eax, 16 | ||
159 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
160 | xor edi, ebp | ||
161 | mov bl, ah | ||
162 | shr edx, 16 | ||
163 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
164 | xor edi, ebp | ||
165 | mov ebp, DWORD PTR 24[esp] | ||
166 | mov cl, dh | ||
167 | and eax, 0ffh | ||
168 | and edx, 0ffh | ||
169 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
170 | xor edi, ebx | ||
171 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
172 | xor edi, ebx | ||
173 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
174 | xor edi, ebx | ||
175 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
176 | xor edi, ebx | ||
177 | ; | ||
178 | ; Round 3 | ||
179 | mov eax, DWORD PTR 24[ebp] | ||
180 | xor ebx, ebx | ||
181 | mov edx, DWORD PTR 28[ebp] | ||
182 | xor eax, edi | ||
183 | xor edx, edi | ||
184 | and eax, 0fcfcfcfch | ||
185 | and edx, 0cfcfcfcfh | ||
186 | mov bl, al | ||
187 | mov cl, ah | ||
188 | ror edx, 4 | ||
189 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
190 | mov bl, dl | ||
191 | xor esi, ebp | ||
192 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
193 | xor esi, ebp | ||
194 | mov cl, dh | ||
195 | shr eax, 16 | ||
196 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
197 | xor esi, ebp | ||
198 | mov bl, ah | ||
199 | shr edx, 16 | ||
200 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
201 | xor esi, ebp | ||
202 | mov ebp, DWORD PTR 24[esp] | ||
203 | mov cl, dh | ||
204 | and eax, 0ffh | ||
205 | and edx, 0ffh | ||
206 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
207 | xor esi, ebx | ||
208 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
209 | xor esi, ebx | ||
210 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
211 | xor esi, ebx | ||
212 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
213 | xor esi, ebx | ||
214 | ; | ||
215 | ; Round 4 | ||
216 | mov eax, DWORD PTR 32[ebp] | ||
217 | xor ebx, ebx | ||
218 | mov edx, DWORD PTR 36[ebp] | ||
219 | xor eax, esi | ||
220 | xor edx, esi | ||
221 | and eax, 0fcfcfcfch | ||
222 | and edx, 0cfcfcfcfh | ||
223 | mov bl, al | ||
224 | mov cl, ah | ||
225 | ror edx, 4 | ||
226 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
227 | mov bl, dl | ||
228 | xor edi, ebp | ||
229 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
230 | xor edi, ebp | ||
231 | mov cl, dh | ||
232 | shr eax, 16 | ||
233 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
234 | xor edi, ebp | ||
235 | mov bl, ah | ||
236 | shr edx, 16 | ||
237 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
238 | xor edi, ebp | ||
239 | mov ebp, DWORD PTR 24[esp] | ||
240 | mov cl, dh | ||
241 | and eax, 0ffh | ||
242 | and edx, 0ffh | ||
243 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
244 | xor edi, ebx | ||
245 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
246 | xor edi, ebx | ||
247 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
248 | xor edi, ebx | ||
249 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
250 | xor edi, ebx | ||
251 | ; | ||
252 | ; Round 5 | ||
253 | mov eax, DWORD PTR 40[ebp] | ||
254 | xor ebx, ebx | ||
255 | mov edx, DWORD PTR 44[ebp] | ||
256 | xor eax, edi | ||
257 | xor edx, edi | ||
258 | and eax, 0fcfcfcfch | ||
259 | and edx, 0cfcfcfcfh | ||
260 | mov bl, al | ||
261 | mov cl, ah | ||
262 | ror edx, 4 | ||
263 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
264 | mov bl, dl | ||
265 | xor esi, ebp | ||
266 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
267 | xor esi, ebp | ||
268 | mov cl, dh | ||
269 | shr eax, 16 | ||
270 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
271 | xor esi, ebp | ||
272 | mov bl, ah | ||
273 | shr edx, 16 | ||
274 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
275 | xor esi, ebp | ||
276 | mov ebp, DWORD PTR 24[esp] | ||
277 | mov cl, dh | ||
278 | and eax, 0ffh | ||
279 | and edx, 0ffh | ||
280 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
281 | xor esi, ebx | ||
282 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
283 | xor esi, ebx | ||
284 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
285 | xor esi, ebx | ||
286 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
287 | xor esi, ebx | ||
288 | ; | ||
289 | ; Round 6 | ||
290 | mov eax, DWORD PTR 48[ebp] | ||
291 | xor ebx, ebx | ||
292 | mov edx, DWORD PTR 52[ebp] | ||
293 | xor eax, esi | ||
294 | xor edx, esi | ||
295 | and eax, 0fcfcfcfch | ||
296 | and edx, 0cfcfcfcfh | ||
297 | mov bl, al | ||
298 | mov cl, ah | ||
299 | ror edx, 4 | ||
300 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
301 | mov bl, dl | ||
302 | xor edi, ebp | ||
303 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
304 | xor edi, ebp | ||
305 | mov cl, dh | ||
306 | shr eax, 16 | ||
307 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
308 | xor edi, ebp | ||
309 | mov bl, ah | ||
310 | shr edx, 16 | ||
311 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
312 | xor edi, ebp | ||
313 | mov ebp, DWORD PTR 24[esp] | ||
314 | mov cl, dh | ||
315 | and eax, 0ffh | ||
316 | and edx, 0ffh | ||
317 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
318 | xor edi, ebx | ||
319 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
320 | xor edi, ebx | ||
321 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
322 | xor edi, ebx | ||
323 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
324 | xor edi, ebx | ||
325 | ; | ||
326 | ; Round 7 | ||
327 | mov eax, DWORD PTR 56[ebp] | ||
328 | xor ebx, ebx | ||
329 | mov edx, DWORD PTR 60[ebp] | ||
330 | xor eax, edi | ||
331 | xor edx, edi | ||
332 | and eax, 0fcfcfcfch | ||
333 | and edx, 0cfcfcfcfh | ||
334 | mov bl, al | ||
335 | mov cl, ah | ||
336 | ror edx, 4 | ||
337 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
338 | mov bl, dl | ||
339 | xor esi, ebp | ||
340 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
341 | xor esi, ebp | ||
342 | mov cl, dh | ||
343 | shr eax, 16 | ||
344 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
345 | xor esi, ebp | ||
346 | mov bl, ah | ||
347 | shr edx, 16 | ||
348 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
349 | xor esi, ebp | ||
350 | mov ebp, DWORD PTR 24[esp] | ||
351 | mov cl, dh | ||
352 | and eax, 0ffh | ||
353 | and edx, 0ffh | ||
354 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
355 | xor esi, ebx | ||
356 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
357 | xor esi, ebx | ||
358 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
359 | xor esi, ebx | ||
360 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
361 | xor esi, ebx | ||
362 | ; | ||
363 | ; Round 8 | ||
364 | mov eax, DWORD PTR 64[ebp] | ||
365 | xor ebx, ebx | ||
366 | mov edx, DWORD PTR 68[ebp] | ||
367 | xor eax, esi | ||
368 | xor edx, esi | ||
369 | and eax, 0fcfcfcfch | ||
370 | and edx, 0cfcfcfcfh | ||
371 | mov bl, al | ||
372 | mov cl, ah | ||
373 | ror edx, 4 | ||
374 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
375 | mov bl, dl | ||
376 | xor edi, ebp | ||
377 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
378 | xor edi, ebp | ||
379 | mov cl, dh | ||
380 | shr eax, 16 | ||
381 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
382 | xor edi, ebp | ||
383 | mov bl, ah | ||
384 | shr edx, 16 | ||
385 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
386 | xor edi, ebp | ||
387 | mov ebp, DWORD PTR 24[esp] | ||
388 | mov cl, dh | ||
389 | and eax, 0ffh | ||
390 | and edx, 0ffh | ||
391 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
392 | xor edi, ebx | ||
393 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
394 | xor edi, ebx | ||
395 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
396 | xor edi, ebx | ||
397 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
398 | xor edi, ebx | ||
399 | ; | ||
400 | ; Round 9 | ||
401 | mov eax, DWORD PTR 72[ebp] | ||
402 | xor ebx, ebx | ||
403 | mov edx, DWORD PTR 76[ebp] | ||
404 | xor eax, edi | ||
405 | xor edx, edi | ||
406 | and eax, 0fcfcfcfch | ||
407 | and edx, 0cfcfcfcfh | ||
408 | mov bl, al | ||
409 | mov cl, ah | ||
410 | ror edx, 4 | ||
411 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
412 | mov bl, dl | ||
413 | xor esi, ebp | ||
414 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
415 | xor esi, ebp | ||
416 | mov cl, dh | ||
417 | shr eax, 16 | ||
418 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
419 | xor esi, ebp | ||
420 | mov bl, ah | ||
421 | shr edx, 16 | ||
422 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
423 | xor esi, ebp | ||
424 | mov ebp, DWORD PTR 24[esp] | ||
425 | mov cl, dh | ||
426 | and eax, 0ffh | ||
427 | and edx, 0ffh | ||
428 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
429 | xor esi, ebx | ||
430 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
431 | xor esi, ebx | ||
432 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
433 | xor esi, ebx | ||
434 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
435 | xor esi, ebx | ||
436 | ; | ||
437 | ; Round 10 | ||
438 | mov eax, DWORD PTR 80[ebp] | ||
439 | xor ebx, ebx | ||
440 | mov edx, DWORD PTR 84[ebp] | ||
441 | xor eax, esi | ||
442 | xor edx, esi | ||
443 | and eax, 0fcfcfcfch | ||
444 | and edx, 0cfcfcfcfh | ||
445 | mov bl, al | ||
446 | mov cl, ah | ||
447 | ror edx, 4 | ||
448 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
449 | mov bl, dl | ||
450 | xor edi, ebp | ||
451 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
452 | xor edi, ebp | ||
453 | mov cl, dh | ||
454 | shr eax, 16 | ||
455 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
456 | xor edi, ebp | ||
457 | mov bl, ah | ||
458 | shr edx, 16 | ||
459 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
460 | xor edi, ebp | ||
461 | mov ebp, DWORD PTR 24[esp] | ||
462 | mov cl, dh | ||
463 | and eax, 0ffh | ||
464 | and edx, 0ffh | ||
465 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
466 | xor edi, ebx | ||
467 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
468 | xor edi, ebx | ||
469 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
470 | xor edi, ebx | ||
471 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
472 | xor edi, ebx | ||
473 | ; | ||
474 | ; Round 11 | ||
475 | mov eax, DWORD PTR 88[ebp] | ||
476 | xor ebx, ebx | ||
477 | mov edx, DWORD PTR 92[ebp] | ||
478 | xor eax, edi | ||
479 | xor edx, edi | ||
480 | and eax, 0fcfcfcfch | ||
481 | and edx, 0cfcfcfcfh | ||
482 | mov bl, al | ||
483 | mov cl, ah | ||
484 | ror edx, 4 | ||
485 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
486 | mov bl, dl | ||
487 | xor esi, ebp | ||
488 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
489 | xor esi, ebp | ||
490 | mov cl, dh | ||
491 | shr eax, 16 | ||
492 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
493 | xor esi, ebp | ||
494 | mov bl, ah | ||
495 | shr edx, 16 | ||
496 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
497 | xor esi, ebp | ||
498 | mov ebp, DWORD PTR 24[esp] | ||
499 | mov cl, dh | ||
500 | and eax, 0ffh | ||
501 | and edx, 0ffh | ||
502 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
503 | xor esi, ebx | ||
504 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
505 | xor esi, ebx | ||
506 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
507 | xor esi, ebx | ||
508 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
509 | xor esi, ebx | ||
510 | ; | ||
511 | ; Round 12 | ||
512 | mov eax, DWORD PTR 96[ebp] | ||
513 | xor ebx, ebx | ||
514 | mov edx, DWORD PTR 100[ebp] | ||
515 | xor eax, esi | ||
516 | xor edx, esi | ||
517 | and eax, 0fcfcfcfch | ||
518 | and edx, 0cfcfcfcfh | ||
519 | mov bl, al | ||
520 | mov cl, ah | ||
521 | ror edx, 4 | ||
522 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
523 | mov bl, dl | ||
524 | xor edi, ebp | ||
525 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
526 | xor edi, ebp | ||
527 | mov cl, dh | ||
528 | shr eax, 16 | ||
529 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
530 | xor edi, ebp | ||
531 | mov bl, ah | ||
532 | shr edx, 16 | ||
533 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
534 | xor edi, ebp | ||
535 | mov ebp, DWORD PTR 24[esp] | ||
536 | mov cl, dh | ||
537 | and eax, 0ffh | ||
538 | and edx, 0ffh | ||
539 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
540 | xor edi, ebx | ||
541 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
542 | xor edi, ebx | ||
543 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
544 | xor edi, ebx | ||
545 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
546 | xor edi, ebx | ||
547 | ; | ||
548 | ; Round 13 | ||
549 | mov eax, DWORD PTR 104[ebp] | ||
550 | xor ebx, ebx | ||
551 | mov edx, DWORD PTR 108[ebp] | ||
552 | xor eax, edi | ||
553 | xor edx, edi | ||
554 | and eax, 0fcfcfcfch | ||
555 | and edx, 0cfcfcfcfh | ||
556 | mov bl, al | ||
557 | mov cl, ah | ||
558 | ror edx, 4 | ||
559 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
560 | mov bl, dl | ||
561 | xor esi, ebp | ||
562 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
563 | xor esi, ebp | ||
564 | mov cl, dh | ||
565 | shr eax, 16 | ||
566 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
567 | xor esi, ebp | ||
568 | mov bl, ah | ||
569 | shr edx, 16 | ||
570 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
571 | xor esi, ebp | ||
572 | mov ebp, DWORD PTR 24[esp] | ||
573 | mov cl, dh | ||
574 | and eax, 0ffh | ||
575 | and edx, 0ffh | ||
576 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
577 | xor esi, ebx | ||
578 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
579 | xor esi, ebx | ||
580 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
581 | xor esi, ebx | ||
582 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
583 | xor esi, ebx | ||
584 | ; | ||
585 | ; Round 14 | ||
586 | mov eax, DWORD PTR 112[ebp] | ||
587 | xor ebx, ebx | ||
588 | mov edx, DWORD PTR 116[ebp] | ||
589 | xor eax, esi | ||
590 | xor edx, esi | ||
591 | and eax, 0fcfcfcfch | ||
592 | and edx, 0cfcfcfcfh | ||
593 | mov bl, al | ||
594 | mov cl, ah | ||
595 | ror edx, 4 | ||
596 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
597 | mov bl, dl | ||
598 | xor edi, ebp | ||
599 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
600 | xor edi, ebp | ||
601 | mov cl, dh | ||
602 | shr eax, 16 | ||
603 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
604 | xor edi, ebp | ||
605 | mov bl, ah | ||
606 | shr edx, 16 | ||
607 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
608 | xor edi, ebp | ||
609 | mov ebp, DWORD PTR 24[esp] | ||
610 | mov cl, dh | ||
611 | and eax, 0ffh | ||
612 | and edx, 0ffh | ||
613 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
614 | xor edi, ebx | ||
615 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
616 | xor edi, ebx | ||
617 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
618 | xor edi, ebx | ||
619 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
620 | xor edi, ebx | ||
621 | ; | ||
622 | ; Round 15 | ||
623 | mov eax, DWORD PTR 120[ebp] | ||
624 | xor ebx, ebx | ||
625 | mov edx, DWORD PTR 124[ebp] | ||
626 | xor eax, edi | ||
627 | xor edx, edi | ||
628 | and eax, 0fcfcfcfch | ||
629 | and edx, 0cfcfcfcfh | ||
630 | mov bl, al | ||
631 | mov cl, ah | ||
632 | ror edx, 4 | ||
633 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
634 | mov bl, dl | ||
635 | xor esi, ebp | ||
636 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
637 | xor esi, ebp | ||
638 | mov cl, dh | ||
639 | shr eax, 16 | ||
640 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
641 | xor esi, ebp | ||
642 | mov bl, ah | ||
643 | shr edx, 16 | ||
644 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
645 | xor esi, ebp | ||
646 | mov ebp, DWORD PTR 24[esp] | ||
647 | mov cl, dh | ||
648 | and eax, 0ffh | ||
649 | and edx, 0ffh | ||
650 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
651 | xor esi, ebx | ||
652 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
653 | xor esi, ebx | ||
654 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
655 | xor esi, ebx | ||
656 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
657 | xor esi, ebx | ||
658 | jmp $L001end | ||
659 | $L000start_decrypt: | ||
660 | ; | ||
661 | ; Round 15 | ||
662 | mov eax, DWORD PTR 120[ebp] | ||
663 | xor ebx, ebx | ||
664 | mov edx, DWORD PTR 124[ebp] | ||
665 | xor eax, esi | ||
666 | xor edx, esi | ||
667 | and eax, 0fcfcfcfch | ||
668 | and edx, 0cfcfcfcfh | ||
669 | mov bl, al | ||
670 | mov cl, ah | ||
671 | ror edx, 4 | ||
672 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
673 | mov bl, dl | ||
674 | xor edi, ebp | ||
675 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
676 | xor edi, ebp | ||
677 | mov cl, dh | ||
678 | shr eax, 16 | ||
679 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
680 | xor edi, ebp | ||
681 | mov bl, ah | ||
682 | shr edx, 16 | ||
683 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
684 | xor edi, ebp | ||
685 | mov ebp, DWORD PTR 24[esp] | ||
686 | mov cl, dh | ||
687 | and eax, 0ffh | ||
688 | and edx, 0ffh | ||
689 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
690 | xor edi, ebx | ||
691 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
692 | xor edi, ebx | ||
693 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
694 | xor edi, ebx | ||
695 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
696 | xor edi, ebx | ||
697 | ; | ||
698 | ; Round 14 | ||
699 | mov eax, DWORD PTR 112[ebp] | ||
700 | xor ebx, ebx | ||
701 | mov edx, DWORD PTR 116[ebp] | ||
702 | xor eax, edi | ||
703 | xor edx, edi | ||
704 | and eax, 0fcfcfcfch | ||
705 | and edx, 0cfcfcfcfh | ||
706 | mov bl, al | ||
707 | mov cl, ah | ||
708 | ror edx, 4 | ||
709 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
710 | mov bl, dl | ||
711 | xor esi, ebp | ||
712 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
713 | xor esi, ebp | ||
714 | mov cl, dh | ||
715 | shr eax, 16 | ||
716 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
717 | xor esi, ebp | ||
718 | mov bl, ah | ||
719 | shr edx, 16 | ||
720 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
721 | xor esi, ebp | ||
722 | mov ebp, DWORD PTR 24[esp] | ||
723 | mov cl, dh | ||
724 | and eax, 0ffh | ||
725 | and edx, 0ffh | ||
726 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
727 | xor esi, ebx | ||
728 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
729 | xor esi, ebx | ||
730 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
731 | xor esi, ebx | ||
732 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
733 | xor esi, ebx | ||
734 | ; | ||
735 | ; Round 13 | ||
736 | mov eax, DWORD PTR 104[ebp] | ||
737 | xor ebx, ebx | ||
738 | mov edx, DWORD PTR 108[ebp] | ||
739 | xor eax, esi | ||
740 | xor edx, esi | ||
741 | and eax, 0fcfcfcfch | ||
742 | and edx, 0cfcfcfcfh | ||
743 | mov bl, al | ||
744 | mov cl, ah | ||
745 | ror edx, 4 | ||
746 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
747 | mov bl, dl | ||
748 | xor edi, ebp | ||
749 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
750 | xor edi, ebp | ||
751 | mov cl, dh | ||
752 | shr eax, 16 | ||
753 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
754 | xor edi, ebp | ||
755 | mov bl, ah | ||
756 | shr edx, 16 | ||
757 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
758 | xor edi, ebp | ||
759 | mov ebp, DWORD PTR 24[esp] | ||
760 | mov cl, dh | ||
761 | and eax, 0ffh | ||
762 | and edx, 0ffh | ||
763 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
764 | xor edi, ebx | ||
765 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
766 | xor edi, ebx | ||
767 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
768 | xor edi, ebx | ||
769 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
770 | xor edi, ebx | ||
771 | ; | ||
772 | ; Round 12 | ||
773 | mov eax, DWORD PTR 96[ebp] | ||
774 | xor ebx, ebx | ||
775 | mov edx, DWORD PTR 100[ebp] | ||
776 | xor eax, edi | ||
777 | xor edx, edi | ||
778 | and eax, 0fcfcfcfch | ||
779 | and edx, 0cfcfcfcfh | ||
780 | mov bl, al | ||
781 | mov cl, ah | ||
782 | ror edx, 4 | ||
783 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
784 | mov bl, dl | ||
785 | xor esi, ebp | ||
786 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
787 | xor esi, ebp | ||
788 | mov cl, dh | ||
789 | shr eax, 16 | ||
790 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
791 | xor esi, ebp | ||
792 | mov bl, ah | ||
793 | shr edx, 16 | ||
794 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
795 | xor esi, ebp | ||
796 | mov ebp, DWORD PTR 24[esp] | ||
797 | mov cl, dh | ||
798 | and eax, 0ffh | ||
799 | and edx, 0ffh | ||
800 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
801 | xor esi, ebx | ||
802 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
803 | xor esi, ebx | ||
804 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
805 | xor esi, ebx | ||
806 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
807 | xor esi, ebx | ||
808 | ; | ||
809 | ; Round 11 | ||
810 | mov eax, DWORD PTR 88[ebp] | ||
811 | xor ebx, ebx | ||
812 | mov edx, DWORD PTR 92[ebp] | ||
813 | xor eax, esi | ||
814 | xor edx, esi | ||
815 | and eax, 0fcfcfcfch | ||
816 | and edx, 0cfcfcfcfh | ||
817 | mov bl, al | ||
818 | mov cl, ah | ||
819 | ror edx, 4 | ||
820 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
821 | mov bl, dl | ||
822 | xor edi, ebp | ||
823 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
824 | xor edi, ebp | ||
825 | mov cl, dh | ||
826 | shr eax, 16 | ||
827 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
828 | xor edi, ebp | ||
829 | mov bl, ah | ||
830 | shr edx, 16 | ||
831 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
832 | xor edi, ebp | ||
833 | mov ebp, DWORD PTR 24[esp] | ||
834 | mov cl, dh | ||
835 | and eax, 0ffh | ||
836 | and edx, 0ffh | ||
837 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
838 | xor edi, ebx | ||
839 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
840 | xor edi, ebx | ||
841 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
842 | xor edi, ebx | ||
843 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
844 | xor edi, ebx | ||
845 | ; | ||
846 | ; Round 10 | ||
847 | mov eax, DWORD PTR 80[ebp] | ||
848 | xor ebx, ebx | ||
849 | mov edx, DWORD PTR 84[ebp] | ||
850 | xor eax, edi | ||
851 | xor edx, edi | ||
852 | and eax, 0fcfcfcfch | ||
853 | and edx, 0cfcfcfcfh | ||
854 | mov bl, al | ||
855 | mov cl, ah | ||
856 | ror edx, 4 | ||
857 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
858 | mov bl, dl | ||
859 | xor esi, ebp | ||
860 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
861 | xor esi, ebp | ||
862 | mov cl, dh | ||
863 | shr eax, 16 | ||
864 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
865 | xor esi, ebp | ||
866 | mov bl, ah | ||
867 | shr edx, 16 | ||
868 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
869 | xor esi, ebp | ||
870 | mov ebp, DWORD PTR 24[esp] | ||
871 | mov cl, dh | ||
872 | and eax, 0ffh | ||
873 | and edx, 0ffh | ||
874 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
875 | xor esi, ebx | ||
876 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
877 | xor esi, ebx | ||
878 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
879 | xor esi, ebx | ||
880 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
881 | xor esi, ebx | ||
882 | ; | ||
883 | ; Round 9 | ||
884 | mov eax, DWORD PTR 72[ebp] | ||
885 | xor ebx, ebx | ||
886 | mov edx, DWORD PTR 76[ebp] | ||
887 | xor eax, esi | ||
888 | xor edx, esi | ||
889 | and eax, 0fcfcfcfch | ||
890 | and edx, 0cfcfcfcfh | ||
891 | mov bl, al | ||
892 | mov cl, ah | ||
893 | ror edx, 4 | ||
894 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
895 | mov bl, dl | ||
896 | xor edi, ebp | ||
897 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
898 | xor edi, ebp | ||
899 | mov cl, dh | ||
900 | shr eax, 16 | ||
901 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
902 | xor edi, ebp | ||
903 | mov bl, ah | ||
904 | shr edx, 16 | ||
905 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
906 | xor edi, ebp | ||
907 | mov ebp, DWORD PTR 24[esp] | ||
908 | mov cl, dh | ||
909 | and eax, 0ffh | ||
910 | and edx, 0ffh | ||
911 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
912 | xor edi, ebx | ||
913 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
914 | xor edi, ebx | ||
915 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
916 | xor edi, ebx | ||
917 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
918 | xor edi, ebx | ||
919 | ; | ||
920 | ; Round 8 | ||
921 | mov eax, DWORD PTR 64[ebp] | ||
922 | xor ebx, ebx | ||
923 | mov edx, DWORD PTR 68[ebp] | ||
924 | xor eax, edi | ||
925 | xor edx, edi | ||
926 | and eax, 0fcfcfcfch | ||
927 | and edx, 0cfcfcfcfh | ||
928 | mov bl, al | ||
929 | mov cl, ah | ||
930 | ror edx, 4 | ||
931 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
932 | mov bl, dl | ||
933 | xor esi, ebp | ||
934 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
935 | xor esi, ebp | ||
936 | mov cl, dh | ||
937 | shr eax, 16 | ||
938 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
939 | xor esi, ebp | ||
940 | mov bl, ah | ||
941 | shr edx, 16 | ||
942 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
943 | xor esi, ebp | ||
944 | mov ebp, DWORD PTR 24[esp] | ||
945 | mov cl, dh | ||
946 | and eax, 0ffh | ||
947 | and edx, 0ffh | ||
948 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
949 | xor esi, ebx | ||
950 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
951 | xor esi, ebx | ||
952 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
953 | xor esi, ebx | ||
954 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
955 | xor esi, ebx | ||
956 | ; | ||
957 | ; Round 7 | ||
958 | mov eax, DWORD PTR 56[ebp] | ||
959 | xor ebx, ebx | ||
960 | mov edx, DWORD PTR 60[ebp] | ||
961 | xor eax, esi | ||
962 | xor edx, esi | ||
963 | and eax, 0fcfcfcfch | ||
964 | and edx, 0cfcfcfcfh | ||
965 | mov bl, al | ||
966 | mov cl, ah | ||
967 | ror edx, 4 | ||
968 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
969 | mov bl, dl | ||
970 | xor edi, ebp | ||
971 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
972 | xor edi, ebp | ||
973 | mov cl, dh | ||
974 | shr eax, 16 | ||
975 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
976 | xor edi, ebp | ||
977 | mov bl, ah | ||
978 | shr edx, 16 | ||
979 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
980 | xor edi, ebp | ||
981 | mov ebp, DWORD PTR 24[esp] | ||
982 | mov cl, dh | ||
983 | and eax, 0ffh | ||
984 | and edx, 0ffh | ||
985 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
986 | xor edi, ebx | ||
987 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
988 | xor edi, ebx | ||
989 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
990 | xor edi, ebx | ||
991 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
992 | xor edi, ebx | ||
993 | ; | ||
994 | ; Round 6 | ||
995 | mov eax, DWORD PTR 48[ebp] | ||
996 | xor ebx, ebx | ||
997 | mov edx, DWORD PTR 52[ebp] | ||
998 | xor eax, edi | ||
999 | xor edx, edi | ||
1000 | and eax, 0fcfcfcfch | ||
1001 | and edx, 0cfcfcfcfh | ||
1002 | mov bl, al | ||
1003 | mov cl, ah | ||
1004 | ror edx, 4 | ||
1005 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1006 | mov bl, dl | ||
1007 | xor esi, ebp | ||
1008 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1009 | xor esi, ebp | ||
1010 | mov cl, dh | ||
1011 | shr eax, 16 | ||
1012 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1013 | xor esi, ebp | ||
1014 | mov bl, ah | ||
1015 | shr edx, 16 | ||
1016 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1017 | xor esi, ebp | ||
1018 | mov ebp, DWORD PTR 24[esp] | ||
1019 | mov cl, dh | ||
1020 | and eax, 0ffh | ||
1021 | and edx, 0ffh | ||
1022 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1023 | xor esi, ebx | ||
1024 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1025 | xor esi, ebx | ||
1026 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1027 | xor esi, ebx | ||
1028 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1029 | xor esi, ebx | ||
1030 | ; | ||
1031 | ; Round 5 | ||
1032 | mov eax, DWORD PTR 40[ebp] | ||
1033 | xor ebx, ebx | ||
1034 | mov edx, DWORD PTR 44[ebp] | ||
1035 | xor eax, esi | ||
1036 | xor edx, esi | ||
1037 | and eax, 0fcfcfcfch | ||
1038 | and edx, 0cfcfcfcfh | ||
1039 | mov bl, al | ||
1040 | mov cl, ah | ||
1041 | ror edx, 4 | ||
1042 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1043 | mov bl, dl | ||
1044 | xor edi, ebp | ||
1045 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1046 | xor edi, ebp | ||
1047 | mov cl, dh | ||
1048 | shr eax, 16 | ||
1049 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1050 | xor edi, ebp | ||
1051 | mov bl, ah | ||
1052 | shr edx, 16 | ||
1053 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1054 | xor edi, ebp | ||
1055 | mov ebp, DWORD PTR 24[esp] | ||
1056 | mov cl, dh | ||
1057 | and eax, 0ffh | ||
1058 | and edx, 0ffh | ||
1059 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1060 | xor edi, ebx | ||
1061 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1062 | xor edi, ebx | ||
1063 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1064 | xor edi, ebx | ||
1065 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1066 | xor edi, ebx | ||
1067 | ; | ||
1068 | ; Round 4 | ||
1069 | mov eax, DWORD PTR 32[ebp] | ||
1070 | xor ebx, ebx | ||
1071 | mov edx, DWORD PTR 36[ebp] | ||
1072 | xor eax, edi | ||
1073 | xor edx, edi | ||
1074 | and eax, 0fcfcfcfch | ||
1075 | and edx, 0cfcfcfcfh | ||
1076 | mov bl, al | ||
1077 | mov cl, ah | ||
1078 | ror edx, 4 | ||
1079 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1080 | mov bl, dl | ||
1081 | xor esi, ebp | ||
1082 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1083 | xor esi, ebp | ||
1084 | mov cl, dh | ||
1085 | shr eax, 16 | ||
1086 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1087 | xor esi, ebp | ||
1088 | mov bl, ah | ||
1089 | shr edx, 16 | ||
1090 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1091 | xor esi, ebp | ||
1092 | mov ebp, DWORD PTR 24[esp] | ||
1093 | mov cl, dh | ||
1094 | and eax, 0ffh | ||
1095 | and edx, 0ffh | ||
1096 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1097 | xor esi, ebx | ||
1098 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1099 | xor esi, ebx | ||
1100 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1101 | xor esi, ebx | ||
1102 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1103 | xor esi, ebx | ||
1104 | ; | ||
1105 | ; Round 3 | ||
1106 | mov eax, DWORD PTR 24[ebp] | ||
1107 | xor ebx, ebx | ||
1108 | mov edx, DWORD PTR 28[ebp] | ||
1109 | xor eax, esi | ||
1110 | xor edx, esi | ||
1111 | and eax, 0fcfcfcfch | ||
1112 | and edx, 0cfcfcfcfh | ||
1113 | mov bl, al | ||
1114 | mov cl, ah | ||
1115 | ror edx, 4 | ||
1116 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1117 | mov bl, dl | ||
1118 | xor edi, ebp | ||
1119 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1120 | xor edi, ebp | ||
1121 | mov cl, dh | ||
1122 | shr eax, 16 | ||
1123 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1124 | xor edi, ebp | ||
1125 | mov bl, ah | ||
1126 | shr edx, 16 | ||
1127 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1128 | xor edi, ebp | ||
1129 | mov ebp, DWORD PTR 24[esp] | ||
1130 | mov cl, dh | ||
1131 | and eax, 0ffh | ||
1132 | and edx, 0ffh | ||
1133 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1134 | xor edi, ebx | ||
1135 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1136 | xor edi, ebx | ||
1137 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1138 | xor edi, ebx | ||
1139 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1140 | xor edi, ebx | ||
1141 | ; | ||
1142 | ; Round 2 | ||
1143 | mov eax, DWORD PTR 16[ebp] | ||
1144 | xor ebx, ebx | ||
1145 | mov edx, DWORD PTR 20[ebp] | ||
1146 | xor eax, edi | ||
1147 | xor edx, edi | ||
1148 | and eax, 0fcfcfcfch | ||
1149 | and edx, 0cfcfcfcfh | ||
1150 | mov bl, al | ||
1151 | mov cl, ah | ||
1152 | ror edx, 4 | ||
1153 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1154 | mov bl, dl | ||
1155 | xor esi, ebp | ||
1156 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1157 | xor esi, ebp | ||
1158 | mov cl, dh | ||
1159 | shr eax, 16 | ||
1160 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1161 | xor esi, ebp | ||
1162 | mov bl, ah | ||
1163 | shr edx, 16 | ||
1164 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1165 | xor esi, ebp | ||
1166 | mov ebp, DWORD PTR 24[esp] | ||
1167 | mov cl, dh | ||
1168 | and eax, 0ffh | ||
1169 | and edx, 0ffh | ||
1170 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1171 | xor esi, ebx | ||
1172 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1173 | xor esi, ebx | ||
1174 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1175 | xor esi, ebx | ||
1176 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1177 | xor esi, ebx | ||
1178 | ; | ||
1179 | ; Round 1 | ||
1180 | mov eax, DWORD PTR 8[ebp] | ||
1181 | xor ebx, ebx | ||
1182 | mov edx, DWORD PTR 12[ebp] | ||
1183 | xor eax, esi | ||
1184 | xor edx, esi | ||
1185 | and eax, 0fcfcfcfch | ||
1186 | and edx, 0cfcfcfcfh | ||
1187 | mov bl, al | ||
1188 | mov cl, ah | ||
1189 | ror edx, 4 | ||
1190 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1191 | mov bl, dl | ||
1192 | xor edi, ebp | ||
1193 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1194 | xor edi, ebp | ||
1195 | mov cl, dh | ||
1196 | shr eax, 16 | ||
1197 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1198 | xor edi, ebp | ||
1199 | mov bl, ah | ||
1200 | shr edx, 16 | ||
1201 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1202 | xor edi, ebp | ||
1203 | mov ebp, DWORD PTR 24[esp] | ||
1204 | mov cl, dh | ||
1205 | and eax, 0ffh | ||
1206 | and edx, 0ffh | ||
1207 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1208 | xor edi, ebx | ||
1209 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1210 | xor edi, ebx | ||
1211 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1212 | xor edi, ebx | ||
1213 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1214 | xor edi, ebx | ||
1215 | ; | ||
1216 | ; Round 0 | ||
1217 | mov eax, DWORD PTR [ebp] | ||
1218 | xor ebx, ebx | ||
1219 | mov edx, DWORD PTR 4[ebp] | ||
1220 | xor eax, edi | ||
1221 | xor edx, edi | ||
1222 | and eax, 0fcfcfcfch | ||
1223 | and edx, 0cfcfcfcfh | ||
1224 | mov bl, al | ||
1225 | mov cl, ah | ||
1226 | ror edx, 4 | ||
1227 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1228 | mov bl, dl | ||
1229 | xor esi, ebp | ||
1230 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1231 | xor esi, ebp | ||
1232 | mov cl, dh | ||
1233 | shr eax, 16 | ||
1234 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1235 | xor esi, ebp | ||
1236 | mov bl, ah | ||
1237 | shr edx, 16 | ||
1238 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1239 | xor esi, ebp | ||
1240 | mov ebp, DWORD PTR 24[esp] | ||
1241 | mov cl, dh | ||
1242 | and eax, 0ffh | ||
1243 | and edx, 0ffh | ||
1244 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1245 | xor esi, ebx | ||
1246 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1247 | xor esi, ebx | ||
1248 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1249 | xor esi, ebx | ||
1250 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1251 | xor esi, ebx | ||
1252 | $L001end: | ||
1253 | ; | ||
1254 | ; FP | ||
1255 | mov edx, DWORD PTR 20[esp] | ||
1256 | ror esi, 1 | ||
1257 | mov eax, edi | ||
1258 | xor edi, esi | ||
1259 | and edi, 0aaaaaaaah | ||
1260 | xor eax, edi | ||
1261 | xor esi, edi | ||
1262 | ; | ||
1263 | rol eax, 23 | ||
1264 | mov edi, eax | ||
1265 | xor eax, esi | ||
1266 | and eax, 003fc03fch | ||
1267 | xor edi, eax | ||
1268 | xor esi, eax | ||
1269 | ; | ||
1270 | rol edi, 10 | ||
1271 | mov eax, edi | ||
1272 | xor edi, esi | ||
1273 | and edi, 033333333h | ||
1274 | xor eax, edi | ||
1275 | xor esi, edi | ||
1276 | ; | ||
1277 | rol esi, 18 | ||
1278 | mov edi, esi | ||
1279 | xor esi, eax | ||
1280 | and esi, 0fff0000fh | ||
1281 | xor edi, esi | ||
1282 | xor eax, esi | ||
1283 | ; | ||
1284 | rol edi, 12 | ||
1285 | mov esi, edi | ||
1286 | xor edi, eax | ||
1287 | and edi, 0f0f0f0f0h | ||
1288 | xor esi, edi | ||
1289 | xor eax, edi | ||
1290 | ; | ||
1291 | ror eax, 4 | ||
1292 | mov DWORD PTR [edx],eax | ||
1293 | mov DWORD PTR 4[edx],esi | ||
1294 | pop ebp | ||
1295 | pop ebx | ||
1296 | pop edi | ||
1297 | pop esi | ||
1298 | ret | ||
1299 | _des_encrypt ENDP | ||
1300 | _TEXT ENDS | ||
1301 | _TEXT SEGMENT | ||
1302 | PUBLIC _des_encrypt2 | ||
1303 | EXTRN _des_SPtrans:DWORD | ||
1304 | _des_encrypt2 PROC NEAR | ||
1305 | push esi | ||
1306 | push edi | ||
1307 | ; | ||
1308 | ; Load the 2 words | ||
1309 | mov eax, DWORD PTR 12[esp] | ||
1310 | xor ecx, ecx | ||
1311 | push ebx | ||
1312 | push ebp | ||
1313 | mov esi, DWORD PTR [eax] | ||
1314 | mov ebx, DWORD PTR 28[esp] | ||
1315 | rol esi, 3 | ||
1316 | mov edi, DWORD PTR 4[eax] | ||
1317 | rol edi, 3 | ||
1318 | mov ebp, DWORD PTR 24[esp] | ||
1319 | cmp ebx, 0 | ||
1320 | je $L002start_decrypt | ||
1321 | ; | ||
1322 | ; Round 0 | ||
1323 | mov eax, DWORD PTR [ebp] | ||
1324 | xor ebx, ebx | ||
1325 | mov edx, DWORD PTR 4[ebp] | ||
1326 | xor eax, esi | ||
1327 | xor edx, esi | ||
1328 | and eax, 0fcfcfcfch | ||
1329 | and edx, 0cfcfcfcfh | ||
1330 | mov bl, al | ||
1331 | mov cl, ah | ||
1332 | ror edx, 4 | ||
1333 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1334 | mov bl, dl | ||
1335 | xor edi, ebp | ||
1336 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1337 | xor edi, ebp | ||
1338 | mov cl, dh | ||
1339 | shr eax, 16 | ||
1340 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1341 | xor edi, ebp | ||
1342 | mov bl, ah | ||
1343 | shr edx, 16 | ||
1344 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1345 | xor edi, ebp | ||
1346 | mov ebp, DWORD PTR 24[esp] | ||
1347 | mov cl, dh | ||
1348 | and eax, 0ffh | ||
1349 | and edx, 0ffh | ||
1350 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1351 | xor edi, ebx | ||
1352 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1353 | xor edi, ebx | ||
1354 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1355 | xor edi, ebx | ||
1356 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1357 | xor edi, ebx | ||
1358 | ; | ||
1359 | ; Round 1 | ||
1360 | mov eax, DWORD PTR 8[ebp] | ||
1361 | xor ebx, ebx | ||
1362 | mov edx, DWORD PTR 12[ebp] | ||
1363 | xor eax, edi | ||
1364 | xor edx, edi | ||
1365 | and eax, 0fcfcfcfch | ||
1366 | and edx, 0cfcfcfcfh | ||
1367 | mov bl, al | ||
1368 | mov cl, ah | ||
1369 | ror edx, 4 | ||
1370 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1371 | mov bl, dl | ||
1372 | xor esi, ebp | ||
1373 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1374 | xor esi, ebp | ||
1375 | mov cl, dh | ||
1376 | shr eax, 16 | ||
1377 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1378 | xor esi, ebp | ||
1379 | mov bl, ah | ||
1380 | shr edx, 16 | ||
1381 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1382 | xor esi, ebp | ||
1383 | mov ebp, DWORD PTR 24[esp] | ||
1384 | mov cl, dh | ||
1385 | and eax, 0ffh | ||
1386 | and edx, 0ffh | ||
1387 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1388 | xor esi, ebx | ||
1389 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1390 | xor esi, ebx | ||
1391 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1392 | xor esi, ebx | ||
1393 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1394 | xor esi, ebx | ||
1395 | ; | ||
1396 | ; Round 2 | ||
1397 | mov eax, DWORD PTR 16[ebp] | ||
1398 | xor ebx, ebx | ||
1399 | mov edx, DWORD PTR 20[ebp] | ||
1400 | xor eax, esi | ||
1401 | xor edx, esi | ||
1402 | and eax, 0fcfcfcfch | ||
1403 | and edx, 0cfcfcfcfh | ||
1404 | mov bl, al | ||
1405 | mov cl, ah | ||
1406 | ror edx, 4 | ||
1407 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1408 | mov bl, dl | ||
1409 | xor edi, ebp | ||
1410 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1411 | xor edi, ebp | ||
1412 | mov cl, dh | ||
1413 | shr eax, 16 | ||
1414 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1415 | xor edi, ebp | ||
1416 | mov bl, ah | ||
1417 | shr edx, 16 | ||
1418 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1419 | xor edi, ebp | ||
1420 | mov ebp, DWORD PTR 24[esp] | ||
1421 | mov cl, dh | ||
1422 | and eax, 0ffh | ||
1423 | and edx, 0ffh | ||
1424 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1425 | xor edi, ebx | ||
1426 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1427 | xor edi, ebx | ||
1428 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1429 | xor edi, ebx | ||
1430 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1431 | xor edi, ebx | ||
1432 | ; | ||
1433 | ; Round 3 | ||
1434 | mov eax, DWORD PTR 24[ebp] | ||
1435 | xor ebx, ebx | ||
1436 | mov edx, DWORD PTR 28[ebp] | ||
1437 | xor eax, edi | ||
1438 | xor edx, edi | ||
1439 | and eax, 0fcfcfcfch | ||
1440 | and edx, 0cfcfcfcfh | ||
1441 | mov bl, al | ||
1442 | mov cl, ah | ||
1443 | ror edx, 4 | ||
1444 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1445 | mov bl, dl | ||
1446 | xor esi, ebp | ||
1447 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1448 | xor esi, ebp | ||
1449 | mov cl, dh | ||
1450 | shr eax, 16 | ||
1451 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1452 | xor esi, ebp | ||
1453 | mov bl, ah | ||
1454 | shr edx, 16 | ||
1455 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1456 | xor esi, ebp | ||
1457 | mov ebp, DWORD PTR 24[esp] | ||
1458 | mov cl, dh | ||
1459 | and eax, 0ffh | ||
1460 | and edx, 0ffh | ||
1461 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1462 | xor esi, ebx | ||
1463 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1464 | xor esi, ebx | ||
1465 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1466 | xor esi, ebx | ||
1467 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1468 | xor esi, ebx | ||
1469 | ; | ||
1470 | ; Round 4 | ||
1471 | mov eax, DWORD PTR 32[ebp] | ||
1472 | xor ebx, ebx | ||
1473 | mov edx, DWORD PTR 36[ebp] | ||
1474 | xor eax, esi | ||
1475 | xor edx, esi | ||
1476 | and eax, 0fcfcfcfch | ||
1477 | and edx, 0cfcfcfcfh | ||
1478 | mov bl, al | ||
1479 | mov cl, ah | ||
1480 | ror edx, 4 | ||
1481 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1482 | mov bl, dl | ||
1483 | xor edi, ebp | ||
1484 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1485 | xor edi, ebp | ||
1486 | mov cl, dh | ||
1487 | shr eax, 16 | ||
1488 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1489 | xor edi, ebp | ||
1490 | mov bl, ah | ||
1491 | shr edx, 16 | ||
1492 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1493 | xor edi, ebp | ||
1494 | mov ebp, DWORD PTR 24[esp] | ||
1495 | mov cl, dh | ||
1496 | and eax, 0ffh | ||
1497 | and edx, 0ffh | ||
1498 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1499 | xor edi, ebx | ||
1500 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1501 | xor edi, ebx | ||
1502 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1503 | xor edi, ebx | ||
1504 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1505 | xor edi, ebx | ||
1506 | ; | ||
1507 | ; Round 5 | ||
1508 | mov eax, DWORD PTR 40[ebp] | ||
1509 | xor ebx, ebx | ||
1510 | mov edx, DWORD PTR 44[ebp] | ||
1511 | xor eax, edi | ||
1512 | xor edx, edi | ||
1513 | and eax, 0fcfcfcfch | ||
1514 | and edx, 0cfcfcfcfh | ||
1515 | mov bl, al | ||
1516 | mov cl, ah | ||
1517 | ror edx, 4 | ||
1518 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1519 | mov bl, dl | ||
1520 | xor esi, ebp | ||
1521 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1522 | xor esi, ebp | ||
1523 | mov cl, dh | ||
1524 | shr eax, 16 | ||
1525 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1526 | xor esi, ebp | ||
1527 | mov bl, ah | ||
1528 | shr edx, 16 | ||
1529 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1530 | xor esi, ebp | ||
1531 | mov ebp, DWORD PTR 24[esp] | ||
1532 | mov cl, dh | ||
1533 | and eax, 0ffh | ||
1534 | and edx, 0ffh | ||
1535 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1536 | xor esi, ebx | ||
1537 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1538 | xor esi, ebx | ||
1539 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1540 | xor esi, ebx | ||
1541 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1542 | xor esi, ebx | ||
1543 | ; | ||
1544 | ; Round 6 | ||
1545 | mov eax, DWORD PTR 48[ebp] | ||
1546 | xor ebx, ebx | ||
1547 | mov edx, DWORD PTR 52[ebp] | ||
1548 | xor eax, esi | ||
1549 | xor edx, esi | ||
1550 | and eax, 0fcfcfcfch | ||
1551 | and edx, 0cfcfcfcfh | ||
1552 | mov bl, al | ||
1553 | mov cl, ah | ||
1554 | ror edx, 4 | ||
1555 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1556 | mov bl, dl | ||
1557 | xor edi, ebp | ||
1558 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1559 | xor edi, ebp | ||
1560 | mov cl, dh | ||
1561 | shr eax, 16 | ||
1562 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1563 | xor edi, ebp | ||
1564 | mov bl, ah | ||
1565 | shr edx, 16 | ||
1566 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1567 | xor edi, ebp | ||
1568 | mov ebp, DWORD PTR 24[esp] | ||
1569 | mov cl, dh | ||
1570 | and eax, 0ffh | ||
1571 | and edx, 0ffh | ||
1572 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1573 | xor edi, ebx | ||
1574 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1575 | xor edi, ebx | ||
1576 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1577 | xor edi, ebx | ||
1578 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1579 | xor edi, ebx | ||
1580 | ; | ||
1581 | ; Round 7 | ||
1582 | mov eax, DWORD PTR 56[ebp] | ||
1583 | xor ebx, ebx | ||
1584 | mov edx, DWORD PTR 60[ebp] | ||
1585 | xor eax, edi | ||
1586 | xor edx, edi | ||
1587 | and eax, 0fcfcfcfch | ||
1588 | and edx, 0cfcfcfcfh | ||
1589 | mov bl, al | ||
1590 | mov cl, ah | ||
1591 | ror edx, 4 | ||
1592 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1593 | mov bl, dl | ||
1594 | xor esi, ebp | ||
1595 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1596 | xor esi, ebp | ||
1597 | mov cl, dh | ||
1598 | shr eax, 16 | ||
1599 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1600 | xor esi, ebp | ||
1601 | mov bl, ah | ||
1602 | shr edx, 16 | ||
1603 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1604 | xor esi, ebp | ||
1605 | mov ebp, DWORD PTR 24[esp] | ||
1606 | mov cl, dh | ||
1607 | and eax, 0ffh | ||
1608 | and edx, 0ffh | ||
1609 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1610 | xor esi, ebx | ||
1611 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1612 | xor esi, ebx | ||
1613 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1614 | xor esi, ebx | ||
1615 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1616 | xor esi, ebx | ||
1617 | ; | ||
1618 | ; Round 8 | ||
1619 | mov eax, DWORD PTR 64[ebp] | ||
1620 | xor ebx, ebx | ||
1621 | mov edx, DWORD PTR 68[ebp] | ||
1622 | xor eax, esi | ||
1623 | xor edx, esi | ||
1624 | and eax, 0fcfcfcfch | ||
1625 | and edx, 0cfcfcfcfh | ||
1626 | mov bl, al | ||
1627 | mov cl, ah | ||
1628 | ror edx, 4 | ||
1629 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1630 | mov bl, dl | ||
1631 | xor edi, ebp | ||
1632 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1633 | xor edi, ebp | ||
1634 | mov cl, dh | ||
1635 | shr eax, 16 | ||
1636 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1637 | xor edi, ebp | ||
1638 | mov bl, ah | ||
1639 | shr edx, 16 | ||
1640 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1641 | xor edi, ebp | ||
1642 | mov ebp, DWORD PTR 24[esp] | ||
1643 | mov cl, dh | ||
1644 | and eax, 0ffh | ||
1645 | and edx, 0ffh | ||
1646 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1647 | xor edi, ebx | ||
1648 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1649 | xor edi, ebx | ||
1650 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1651 | xor edi, ebx | ||
1652 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1653 | xor edi, ebx | ||
1654 | ; | ||
1655 | ; Round 9 | ||
1656 | mov eax, DWORD PTR 72[ebp] | ||
1657 | xor ebx, ebx | ||
1658 | mov edx, DWORD PTR 76[ebp] | ||
1659 | xor eax, edi | ||
1660 | xor edx, edi | ||
1661 | and eax, 0fcfcfcfch | ||
1662 | and edx, 0cfcfcfcfh | ||
1663 | mov bl, al | ||
1664 | mov cl, ah | ||
1665 | ror edx, 4 | ||
1666 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1667 | mov bl, dl | ||
1668 | xor esi, ebp | ||
1669 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1670 | xor esi, ebp | ||
1671 | mov cl, dh | ||
1672 | shr eax, 16 | ||
1673 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1674 | xor esi, ebp | ||
1675 | mov bl, ah | ||
1676 | shr edx, 16 | ||
1677 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1678 | xor esi, ebp | ||
1679 | mov ebp, DWORD PTR 24[esp] | ||
1680 | mov cl, dh | ||
1681 | and eax, 0ffh | ||
1682 | and edx, 0ffh | ||
1683 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1684 | xor esi, ebx | ||
1685 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1686 | xor esi, ebx | ||
1687 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1688 | xor esi, ebx | ||
1689 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1690 | xor esi, ebx | ||
1691 | ; | ||
1692 | ; Round 10 | ||
1693 | mov eax, DWORD PTR 80[ebp] | ||
1694 | xor ebx, ebx | ||
1695 | mov edx, DWORD PTR 84[ebp] | ||
1696 | xor eax, esi | ||
1697 | xor edx, esi | ||
1698 | and eax, 0fcfcfcfch | ||
1699 | and edx, 0cfcfcfcfh | ||
1700 | mov bl, al | ||
1701 | mov cl, ah | ||
1702 | ror edx, 4 | ||
1703 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1704 | mov bl, dl | ||
1705 | xor edi, ebp | ||
1706 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1707 | xor edi, ebp | ||
1708 | mov cl, dh | ||
1709 | shr eax, 16 | ||
1710 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1711 | xor edi, ebp | ||
1712 | mov bl, ah | ||
1713 | shr edx, 16 | ||
1714 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1715 | xor edi, ebp | ||
1716 | mov ebp, DWORD PTR 24[esp] | ||
1717 | mov cl, dh | ||
1718 | and eax, 0ffh | ||
1719 | and edx, 0ffh | ||
1720 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1721 | xor edi, ebx | ||
1722 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1723 | xor edi, ebx | ||
1724 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1725 | xor edi, ebx | ||
1726 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1727 | xor edi, ebx | ||
1728 | ; | ||
1729 | ; Round 11 | ||
1730 | mov eax, DWORD PTR 88[ebp] | ||
1731 | xor ebx, ebx | ||
1732 | mov edx, DWORD PTR 92[ebp] | ||
1733 | xor eax, edi | ||
1734 | xor edx, edi | ||
1735 | and eax, 0fcfcfcfch | ||
1736 | and edx, 0cfcfcfcfh | ||
1737 | mov bl, al | ||
1738 | mov cl, ah | ||
1739 | ror edx, 4 | ||
1740 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1741 | mov bl, dl | ||
1742 | xor esi, ebp | ||
1743 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1744 | xor esi, ebp | ||
1745 | mov cl, dh | ||
1746 | shr eax, 16 | ||
1747 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1748 | xor esi, ebp | ||
1749 | mov bl, ah | ||
1750 | shr edx, 16 | ||
1751 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1752 | xor esi, ebp | ||
1753 | mov ebp, DWORD PTR 24[esp] | ||
1754 | mov cl, dh | ||
1755 | and eax, 0ffh | ||
1756 | and edx, 0ffh | ||
1757 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1758 | xor esi, ebx | ||
1759 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1760 | xor esi, ebx | ||
1761 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1762 | xor esi, ebx | ||
1763 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1764 | xor esi, ebx | ||
1765 | ; | ||
1766 | ; Round 12 | ||
1767 | mov eax, DWORD PTR 96[ebp] | ||
1768 | xor ebx, ebx | ||
1769 | mov edx, DWORD PTR 100[ebp] | ||
1770 | xor eax, esi | ||
1771 | xor edx, esi | ||
1772 | and eax, 0fcfcfcfch | ||
1773 | and edx, 0cfcfcfcfh | ||
1774 | mov bl, al | ||
1775 | mov cl, ah | ||
1776 | ror edx, 4 | ||
1777 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1778 | mov bl, dl | ||
1779 | xor edi, ebp | ||
1780 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1781 | xor edi, ebp | ||
1782 | mov cl, dh | ||
1783 | shr eax, 16 | ||
1784 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1785 | xor edi, ebp | ||
1786 | mov bl, ah | ||
1787 | shr edx, 16 | ||
1788 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1789 | xor edi, ebp | ||
1790 | mov ebp, DWORD PTR 24[esp] | ||
1791 | mov cl, dh | ||
1792 | and eax, 0ffh | ||
1793 | and edx, 0ffh | ||
1794 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1795 | xor edi, ebx | ||
1796 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1797 | xor edi, ebx | ||
1798 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1799 | xor edi, ebx | ||
1800 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1801 | xor edi, ebx | ||
1802 | ; | ||
1803 | ; Round 13 | ||
1804 | mov eax, DWORD PTR 104[ebp] | ||
1805 | xor ebx, ebx | ||
1806 | mov edx, DWORD PTR 108[ebp] | ||
1807 | xor eax, edi | ||
1808 | xor edx, edi | ||
1809 | and eax, 0fcfcfcfch | ||
1810 | and edx, 0cfcfcfcfh | ||
1811 | mov bl, al | ||
1812 | mov cl, ah | ||
1813 | ror edx, 4 | ||
1814 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1815 | mov bl, dl | ||
1816 | xor esi, ebp | ||
1817 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1818 | xor esi, ebp | ||
1819 | mov cl, dh | ||
1820 | shr eax, 16 | ||
1821 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1822 | xor esi, ebp | ||
1823 | mov bl, ah | ||
1824 | shr edx, 16 | ||
1825 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1826 | xor esi, ebp | ||
1827 | mov ebp, DWORD PTR 24[esp] | ||
1828 | mov cl, dh | ||
1829 | and eax, 0ffh | ||
1830 | and edx, 0ffh | ||
1831 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1832 | xor esi, ebx | ||
1833 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1834 | xor esi, ebx | ||
1835 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1836 | xor esi, ebx | ||
1837 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1838 | xor esi, ebx | ||
1839 | ; | ||
1840 | ; Round 14 | ||
1841 | mov eax, DWORD PTR 112[ebp] | ||
1842 | xor ebx, ebx | ||
1843 | mov edx, DWORD PTR 116[ebp] | ||
1844 | xor eax, esi | ||
1845 | xor edx, esi | ||
1846 | and eax, 0fcfcfcfch | ||
1847 | and edx, 0cfcfcfcfh | ||
1848 | mov bl, al | ||
1849 | mov cl, ah | ||
1850 | ror edx, 4 | ||
1851 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1852 | mov bl, dl | ||
1853 | xor edi, ebp | ||
1854 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1855 | xor edi, ebp | ||
1856 | mov cl, dh | ||
1857 | shr eax, 16 | ||
1858 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1859 | xor edi, ebp | ||
1860 | mov bl, ah | ||
1861 | shr edx, 16 | ||
1862 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1863 | xor edi, ebp | ||
1864 | mov ebp, DWORD PTR 24[esp] | ||
1865 | mov cl, dh | ||
1866 | and eax, 0ffh | ||
1867 | and edx, 0ffh | ||
1868 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1869 | xor edi, ebx | ||
1870 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1871 | xor edi, ebx | ||
1872 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1873 | xor edi, ebx | ||
1874 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1875 | xor edi, ebx | ||
1876 | ; | ||
1877 | ; Round 15 | ||
1878 | mov eax, DWORD PTR 120[ebp] | ||
1879 | xor ebx, ebx | ||
1880 | mov edx, DWORD PTR 124[ebp] | ||
1881 | xor eax, edi | ||
1882 | xor edx, edi | ||
1883 | and eax, 0fcfcfcfch | ||
1884 | and edx, 0cfcfcfcfh | ||
1885 | mov bl, al | ||
1886 | mov cl, ah | ||
1887 | ror edx, 4 | ||
1888 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1889 | mov bl, dl | ||
1890 | xor esi, ebp | ||
1891 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1892 | xor esi, ebp | ||
1893 | mov cl, dh | ||
1894 | shr eax, 16 | ||
1895 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1896 | xor esi, ebp | ||
1897 | mov bl, ah | ||
1898 | shr edx, 16 | ||
1899 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1900 | xor esi, ebp | ||
1901 | mov ebp, DWORD PTR 24[esp] | ||
1902 | mov cl, dh | ||
1903 | and eax, 0ffh | ||
1904 | and edx, 0ffh | ||
1905 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1906 | xor esi, ebx | ||
1907 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1908 | xor esi, ebx | ||
1909 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1910 | xor esi, ebx | ||
1911 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1912 | xor esi, ebx | ||
1913 | jmp $L003end | ||
1914 | $L002start_decrypt: | ||
1915 | ; | ||
1916 | ; Round 15 | ||
1917 | mov eax, DWORD PTR 120[ebp] | ||
1918 | xor ebx, ebx | ||
1919 | mov edx, DWORD PTR 124[ebp] | ||
1920 | xor eax, esi | ||
1921 | xor edx, esi | ||
1922 | and eax, 0fcfcfcfch | ||
1923 | and edx, 0cfcfcfcfh | ||
1924 | mov bl, al | ||
1925 | mov cl, ah | ||
1926 | ror edx, 4 | ||
1927 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1928 | mov bl, dl | ||
1929 | xor edi, ebp | ||
1930 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1931 | xor edi, ebp | ||
1932 | mov cl, dh | ||
1933 | shr eax, 16 | ||
1934 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1935 | xor edi, ebp | ||
1936 | mov bl, ah | ||
1937 | shr edx, 16 | ||
1938 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1939 | xor edi, ebp | ||
1940 | mov ebp, DWORD PTR 24[esp] | ||
1941 | mov cl, dh | ||
1942 | and eax, 0ffh | ||
1943 | and edx, 0ffh | ||
1944 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1945 | xor edi, ebx | ||
1946 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1947 | xor edi, ebx | ||
1948 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1949 | xor edi, ebx | ||
1950 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1951 | xor edi, ebx | ||
1952 | ; | ||
1953 | ; Round 14 | ||
1954 | mov eax, DWORD PTR 112[ebp] | ||
1955 | xor ebx, ebx | ||
1956 | mov edx, DWORD PTR 116[ebp] | ||
1957 | xor eax, edi | ||
1958 | xor edx, edi | ||
1959 | and eax, 0fcfcfcfch | ||
1960 | and edx, 0cfcfcfcfh | ||
1961 | mov bl, al | ||
1962 | mov cl, ah | ||
1963 | ror edx, 4 | ||
1964 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
1965 | mov bl, dl | ||
1966 | xor esi, ebp | ||
1967 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
1968 | xor esi, ebp | ||
1969 | mov cl, dh | ||
1970 | shr eax, 16 | ||
1971 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
1972 | xor esi, ebp | ||
1973 | mov bl, ah | ||
1974 | shr edx, 16 | ||
1975 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
1976 | xor esi, ebp | ||
1977 | mov ebp, DWORD PTR 24[esp] | ||
1978 | mov cl, dh | ||
1979 | and eax, 0ffh | ||
1980 | and edx, 0ffh | ||
1981 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
1982 | xor esi, ebx | ||
1983 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
1984 | xor esi, ebx | ||
1985 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
1986 | xor esi, ebx | ||
1987 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
1988 | xor esi, ebx | ||
1989 | ; | ||
1990 | ; Round 13 | ||
1991 | mov eax, DWORD PTR 104[ebp] | ||
1992 | xor ebx, ebx | ||
1993 | mov edx, DWORD PTR 108[ebp] | ||
1994 | xor eax, esi | ||
1995 | xor edx, esi | ||
1996 | and eax, 0fcfcfcfch | ||
1997 | and edx, 0cfcfcfcfh | ||
1998 | mov bl, al | ||
1999 | mov cl, ah | ||
2000 | ror edx, 4 | ||
2001 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
2002 | mov bl, dl | ||
2003 | xor edi, ebp | ||
2004 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
2005 | xor edi, ebp | ||
2006 | mov cl, dh | ||
2007 | shr eax, 16 | ||
2008 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
2009 | xor edi, ebp | ||
2010 | mov bl, ah | ||
2011 | shr edx, 16 | ||
2012 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
2013 | xor edi, ebp | ||
2014 | mov ebp, DWORD PTR 24[esp] | ||
2015 | mov cl, dh | ||
2016 | and eax, 0ffh | ||
2017 | and edx, 0ffh | ||
2018 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
2019 | xor edi, ebx | ||
2020 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
2021 | xor edi, ebx | ||
2022 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
2023 | xor edi, ebx | ||
2024 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
2025 | xor edi, ebx | ||
2026 | ; | ||
2027 | ; Round 12 | ||
2028 | mov eax, DWORD PTR 96[ebp] | ||
2029 | xor ebx, ebx | ||
2030 | mov edx, DWORD PTR 100[ebp] | ||
2031 | xor eax, edi | ||
2032 | xor edx, edi | ||
2033 | and eax, 0fcfcfcfch | ||
2034 | and edx, 0cfcfcfcfh | ||
2035 | mov bl, al | ||
2036 | mov cl, ah | ||
2037 | ror edx, 4 | ||
2038 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
2039 | mov bl, dl | ||
2040 | xor esi, ebp | ||
2041 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
2042 | xor esi, ebp | ||
2043 | mov cl, dh | ||
2044 | shr eax, 16 | ||
2045 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
2046 | xor esi, ebp | ||
2047 | mov bl, ah | ||
2048 | shr edx, 16 | ||
2049 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
2050 | xor esi, ebp | ||
2051 | mov ebp, DWORD PTR 24[esp] | ||
2052 | mov cl, dh | ||
2053 | and eax, 0ffh | ||
2054 | and edx, 0ffh | ||
2055 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
2056 | xor esi, ebx | ||
2057 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
2058 | xor esi, ebx | ||
2059 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
2060 | xor esi, ebx | ||
2061 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
2062 | xor esi, ebx | ||
2063 | ; | ||
2064 | ; Round 11 | ||
2065 | mov eax, DWORD PTR 88[ebp] | ||
2066 | xor ebx, ebx | ||
2067 | mov edx, DWORD PTR 92[ebp] | ||
2068 | xor eax, esi | ||
2069 | xor edx, esi | ||
2070 | and eax, 0fcfcfcfch | ||
2071 | and edx, 0cfcfcfcfh | ||
2072 | mov bl, al | ||
2073 | mov cl, ah | ||
2074 | ror edx, 4 | ||
2075 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
2076 | mov bl, dl | ||
2077 | xor edi, ebp | ||
2078 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
2079 | xor edi, ebp | ||
2080 | mov cl, dh | ||
2081 | shr eax, 16 | ||
2082 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
2083 | xor edi, ebp | ||
2084 | mov bl, ah | ||
2085 | shr edx, 16 | ||
2086 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
2087 | xor edi, ebp | ||
2088 | mov ebp, DWORD PTR 24[esp] | ||
2089 | mov cl, dh | ||
2090 | and eax, 0ffh | ||
2091 | and edx, 0ffh | ||
2092 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
2093 | xor edi, ebx | ||
2094 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
2095 | xor edi, ebx | ||
2096 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
2097 | xor edi, ebx | ||
2098 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
2099 | xor edi, ebx | ||
2100 | ; | ||
2101 | ; Round 10 | ||
2102 | mov eax, DWORD PTR 80[ebp] | ||
2103 | xor ebx, ebx | ||
2104 | mov edx, DWORD PTR 84[ebp] | ||
2105 | xor eax, edi | ||
2106 | xor edx, edi | ||
2107 | and eax, 0fcfcfcfch | ||
2108 | and edx, 0cfcfcfcfh | ||
2109 | mov bl, al | ||
2110 | mov cl, ah | ||
2111 | ror edx, 4 | ||
2112 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
2113 | mov bl, dl | ||
2114 | xor esi, ebp | ||
2115 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
2116 | xor esi, ebp | ||
2117 | mov cl, dh | ||
2118 | shr eax, 16 | ||
2119 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
2120 | xor esi, ebp | ||
2121 | mov bl, ah | ||
2122 | shr edx, 16 | ||
2123 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
2124 | xor esi, ebp | ||
2125 | mov ebp, DWORD PTR 24[esp] | ||
2126 | mov cl, dh | ||
2127 | and eax, 0ffh | ||
2128 | and edx, 0ffh | ||
2129 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
2130 | xor esi, ebx | ||
2131 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
2132 | xor esi, ebx | ||
2133 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
2134 | xor esi, ebx | ||
2135 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
2136 | xor esi, ebx | ||
2137 | ; | ||
2138 | ; Round 9 | ||
2139 | mov eax, DWORD PTR 72[ebp] | ||
2140 | xor ebx, ebx | ||
2141 | mov edx, DWORD PTR 76[ebp] | ||
2142 | xor eax, esi | ||
2143 | xor edx, esi | ||
2144 | and eax, 0fcfcfcfch | ||
2145 | and edx, 0cfcfcfcfh | ||
2146 | mov bl, al | ||
2147 | mov cl, ah | ||
2148 | ror edx, 4 | ||
2149 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
2150 | mov bl, dl | ||
2151 | xor edi, ebp | ||
2152 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
2153 | xor edi, ebp | ||
2154 | mov cl, dh | ||
2155 | shr eax, 16 | ||
2156 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
2157 | xor edi, ebp | ||
2158 | mov bl, ah | ||
2159 | shr edx, 16 | ||
2160 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
2161 | xor edi, ebp | ||
2162 | mov ebp, DWORD PTR 24[esp] | ||
2163 | mov cl, dh | ||
2164 | and eax, 0ffh | ||
2165 | and edx, 0ffh | ||
2166 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
2167 | xor edi, ebx | ||
2168 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
2169 | xor edi, ebx | ||
2170 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
2171 | xor edi, ebx | ||
2172 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
2173 | xor edi, ebx | ||
2174 | ; | ||
2175 | ; Round 8 | ||
2176 | mov eax, DWORD PTR 64[ebp] | ||
2177 | xor ebx, ebx | ||
2178 | mov edx, DWORD PTR 68[ebp] | ||
2179 | xor eax, edi | ||
2180 | xor edx, edi | ||
2181 | and eax, 0fcfcfcfch | ||
2182 | and edx, 0cfcfcfcfh | ||
2183 | mov bl, al | ||
2184 | mov cl, ah | ||
2185 | ror edx, 4 | ||
2186 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
2187 | mov bl, dl | ||
2188 | xor esi, ebp | ||
2189 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
2190 | xor esi, ebp | ||
2191 | mov cl, dh | ||
2192 | shr eax, 16 | ||
2193 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
2194 | xor esi, ebp | ||
2195 | mov bl, ah | ||
2196 | shr edx, 16 | ||
2197 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
2198 | xor esi, ebp | ||
2199 | mov ebp, DWORD PTR 24[esp] | ||
2200 | mov cl, dh | ||
2201 | and eax, 0ffh | ||
2202 | and edx, 0ffh | ||
2203 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
2204 | xor esi, ebx | ||
2205 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
2206 | xor esi, ebx | ||
2207 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
2208 | xor esi, ebx | ||
2209 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
2210 | xor esi, ebx | ||
2211 | ; | ||
2212 | ; Round 7 | ||
2213 | mov eax, DWORD PTR 56[ebp] | ||
2214 | xor ebx, ebx | ||
2215 | mov edx, DWORD PTR 60[ebp] | ||
2216 | xor eax, esi | ||
2217 | xor edx, esi | ||
2218 | and eax, 0fcfcfcfch | ||
2219 | and edx, 0cfcfcfcfh | ||
2220 | mov bl, al | ||
2221 | mov cl, ah | ||
2222 | ror edx, 4 | ||
2223 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
2224 | mov bl, dl | ||
2225 | xor edi, ebp | ||
2226 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
2227 | xor edi, ebp | ||
2228 | mov cl, dh | ||
2229 | shr eax, 16 | ||
2230 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
2231 | xor edi, ebp | ||
2232 | mov bl, ah | ||
2233 | shr edx, 16 | ||
2234 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
2235 | xor edi, ebp | ||
2236 | mov ebp, DWORD PTR 24[esp] | ||
2237 | mov cl, dh | ||
2238 | and eax, 0ffh | ||
2239 | and edx, 0ffh | ||
2240 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
2241 | xor edi, ebx | ||
2242 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
2243 | xor edi, ebx | ||
2244 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
2245 | xor edi, ebx | ||
2246 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
2247 | xor edi, ebx | ||
2248 | ; | ||
2249 | ; Round 6 | ||
2250 | mov eax, DWORD PTR 48[ebp] | ||
2251 | xor ebx, ebx | ||
2252 | mov edx, DWORD PTR 52[ebp] | ||
2253 | xor eax, edi | ||
2254 | xor edx, edi | ||
2255 | and eax, 0fcfcfcfch | ||
2256 | and edx, 0cfcfcfcfh | ||
2257 | mov bl, al | ||
2258 | mov cl, ah | ||
2259 | ror edx, 4 | ||
2260 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
2261 | mov bl, dl | ||
2262 | xor esi, ebp | ||
2263 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
2264 | xor esi, ebp | ||
2265 | mov cl, dh | ||
2266 | shr eax, 16 | ||
2267 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
2268 | xor esi, ebp | ||
2269 | mov bl, ah | ||
2270 | shr edx, 16 | ||
2271 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
2272 | xor esi, ebp | ||
2273 | mov ebp, DWORD PTR 24[esp] | ||
2274 | mov cl, dh | ||
2275 | and eax, 0ffh | ||
2276 | and edx, 0ffh | ||
2277 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
2278 | xor esi, ebx | ||
2279 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
2280 | xor esi, ebx | ||
2281 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
2282 | xor esi, ebx | ||
2283 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
2284 | xor esi, ebx | ||
2285 | ; | ||
2286 | ; Round 5 | ||
2287 | mov eax, DWORD PTR 40[ebp] | ||
2288 | xor ebx, ebx | ||
2289 | mov edx, DWORD PTR 44[ebp] | ||
2290 | xor eax, esi | ||
2291 | xor edx, esi | ||
2292 | and eax, 0fcfcfcfch | ||
2293 | and edx, 0cfcfcfcfh | ||
2294 | mov bl, al | ||
2295 | mov cl, ah | ||
2296 | ror edx, 4 | ||
2297 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
2298 | mov bl, dl | ||
2299 | xor edi, ebp | ||
2300 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
2301 | xor edi, ebp | ||
2302 | mov cl, dh | ||
2303 | shr eax, 16 | ||
2304 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
2305 | xor edi, ebp | ||
2306 | mov bl, ah | ||
2307 | shr edx, 16 | ||
2308 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
2309 | xor edi, ebp | ||
2310 | mov ebp, DWORD PTR 24[esp] | ||
2311 | mov cl, dh | ||
2312 | and eax, 0ffh | ||
2313 | and edx, 0ffh | ||
2314 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
2315 | xor edi, ebx | ||
2316 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
2317 | xor edi, ebx | ||
2318 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
2319 | xor edi, ebx | ||
2320 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
2321 | xor edi, ebx | ||
2322 | ; | ||
2323 | ; Round 4 | ||
2324 | mov eax, DWORD PTR 32[ebp] | ||
2325 | xor ebx, ebx | ||
2326 | mov edx, DWORD PTR 36[ebp] | ||
2327 | xor eax, edi | ||
2328 | xor edx, edi | ||
2329 | and eax, 0fcfcfcfch | ||
2330 | and edx, 0cfcfcfcfh | ||
2331 | mov bl, al | ||
2332 | mov cl, ah | ||
2333 | ror edx, 4 | ||
2334 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
2335 | mov bl, dl | ||
2336 | xor esi, ebp | ||
2337 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
2338 | xor esi, ebp | ||
2339 | mov cl, dh | ||
2340 | shr eax, 16 | ||
2341 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
2342 | xor esi, ebp | ||
2343 | mov bl, ah | ||
2344 | shr edx, 16 | ||
2345 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
2346 | xor esi, ebp | ||
2347 | mov ebp, DWORD PTR 24[esp] | ||
2348 | mov cl, dh | ||
2349 | and eax, 0ffh | ||
2350 | and edx, 0ffh | ||
2351 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
2352 | xor esi, ebx | ||
2353 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
2354 | xor esi, ebx | ||
2355 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
2356 | xor esi, ebx | ||
2357 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
2358 | xor esi, ebx | ||
2359 | ; | ||
2360 | ; Round 3 | ||
2361 | mov eax, DWORD PTR 24[ebp] | ||
2362 | xor ebx, ebx | ||
2363 | mov edx, DWORD PTR 28[ebp] | ||
2364 | xor eax, esi | ||
2365 | xor edx, esi | ||
2366 | and eax, 0fcfcfcfch | ||
2367 | and edx, 0cfcfcfcfh | ||
2368 | mov bl, al | ||
2369 | mov cl, ah | ||
2370 | ror edx, 4 | ||
2371 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
2372 | mov bl, dl | ||
2373 | xor edi, ebp | ||
2374 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
2375 | xor edi, ebp | ||
2376 | mov cl, dh | ||
2377 | shr eax, 16 | ||
2378 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
2379 | xor edi, ebp | ||
2380 | mov bl, ah | ||
2381 | shr edx, 16 | ||
2382 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
2383 | xor edi, ebp | ||
2384 | mov ebp, DWORD PTR 24[esp] | ||
2385 | mov cl, dh | ||
2386 | and eax, 0ffh | ||
2387 | and edx, 0ffh | ||
2388 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
2389 | xor edi, ebx | ||
2390 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
2391 | xor edi, ebx | ||
2392 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
2393 | xor edi, ebx | ||
2394 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
2395 | xor edi, ebx | ||
2396 | ; | ||
2397 | ; Round 2 | ||
2398 | mov eax, DWORD PTR 16[ebp] | ||
2399 | xor ebx, ebx | ||
2400 | mov edx, DWORD PTR 20[ebp] | ||
2401 | xor eax, edi | ||
2402 | xor edx, edi | ||
2403 | and eax, 0fcfcfcfch | ||
2404 | and edx, 0cfcfcfcfh | ||
2405 | mov bl, al | ||
2406 | mov cl, ah | ||
2407 | ror edx, 4 | ||
2408 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
2409 | mov bl, dl | ||
2410 | xor esi, ebp | ||
2411 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
2412 | xor esi, ebp | ||
2413 | mov cl, dh | ||
2414 | shr eax, 16 | ||
2415 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
2416 | xor esi, ebp | ||
2417 | mov bl, ah | ||
2418 | shr edx, 16 | ||
2419 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
2420 | xor esi, ebp | ||
2421 | mov ebp, DWORD PTR 24[esp] | ||
2422 | mov cl, dh | ||
2423 | and eax, 0ffh | ||
2424 | and edx, 0ffh | ||
2425 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
2426 | xor esi, ebx | ||
2427 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
2428 | xor esi, ebx | ||
2429 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
2430 | xor esi, ebx | ||
2431 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
2432 | xor esi, ebx | ||
2433 | ; | ||
2434 | ; Round 1 | ||
2435 | mov eax, DWORD PTR 8[ebp] | ||
2436 | xor ebx, ebx | ||
2437 | mov edx, DWORD PTR 12[ebp] | ||
2438 | xor eax, esi | ||
2439 | xor edx, esi | ||
2440 | and eax, 0fcfcfcfch | ||
2441 | and edx, 0cfcfcfcfh | ||
2442 | mov bl, al | ||
2443 | mov cl, ah | ||
2444 | ror edx, 4 | ||
2445 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
2446 | mov bl, dl | ||
2447 | xor edi, ebp | ||
2448 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
2449 | xor edi, ebp | ||
2450 | mov cl, dh | ||
2451 | shr eax, 16 | ||
2452 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
2453 | xor edi, ebp | ||
2454 | mov bl, ah | ||
2455 | shr edx, 16 | ||
2456 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
2457 | xor edi, ebp | ||
2458 | mov ebp, DWORD PTR 24[esp] | ||
2459 | mov cl, dh | ||
2460 | and eax, 0ffh | ||
2461 | and edx, 0ffh | ||
2462 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
2463 | xor edi, ebx | ||
2464 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
2465 | xor edi, ebx | ||
2466 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
2467 | xor edi, ebx | ||
2468 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
2469 | xor edi, ebx | ||
2470 | ; | ||
2471 | ; Round 0 | ||
2472 | mov eax, DWORD PTR [ebp] | ||
2473 | xor ebx, ebx | ||
2474 | mov edx, DWORD PTR 4[ebp] | ||
2475 | xor eax, edi | ||
2476 | xor edx, edi | ||
2477 | and eax, 0fcfcfcfch | ||
2478 | and edx, 0cfcfcfcfh | ||
2479 | mov bl, al | ||
2480 | mov cl, ah | ||
2481 | ror edx, 4 | ||
2482 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
2483 | mov bl, dl | ||
2484 | xor esi, ebp | ||
2485 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
2486 | xor esi, ebp | ||
2487 | mov cl, dh | ||
2488 | shr eax, 16 | ||
2489 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
2490 | xor esi, ebp | ||
2491 | mov bl, ah | ||
2492 | shr edx, 16 | ||
2493 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
2494 | xor esi, ebp | ||
2495 | mov ebp, DWORD PTR 24[esp] | ||
2496 | mov cl, dh | ||
2497 | and eax, 0ffh | ||
2498 | and edx, 0ffh | ||
2499 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
2500 | xor esi, ebx | ||
2501 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
2502 | xor esi, ebx | ||
2503 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
2504 | xor esi, ebx | ||
2505 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
2506 | xor esi, ebx | ||
2507 | $L003end: | ||
2508 | ; | ||
2509 | ; Fixup | ||
2510 | ror edi, 3 | ||
2511 | mov eax, DWORD PTR 20[esp] | ||
2512 | ror esi, 3 | ||
2513 | mov DWORD PTR [eax],edi | ||
2514 | mov DWORD PTR 4[eax],esi | ||
2515 | pop ebp | ||
2516 | pop ebx | ||
2517 | pop edi | ||
2518 | pop esi | ||
2519 | ret | ||
2520 | _des_encrypt2 ENDP | ||
2521 | _TEXT ENDS | ||
2522 | _TEXT SEGMENT | ||
2523 | PUBLIC _des_encrypt3 | ||
2524 | |||
2525 | _des_encrypt3 PROC NEAR | ||
2526 | push ebx | ||
2527 | mov ebx, DWORD PTR 8[esp] | ||
2528 | push ebp | ||
2529 | push esi | ||
2530 | push edi | ||
2531 | ; | ||
2532 | ; Load the data words | ||
2533 | mov edi, DWORD PTR [ebx] | ||
2534 | mov esi, DWORD PTR 4[ebx] | ||
2535 | sub esp, 12 | ||
2536 | ; | ||
2537 | ; IP | ||
2538 | rol edi, 4 | ||
2539 | mov edx, edi | ||
2540 | xor edi, esi | ||
2541 | and edi, 0f0f0f0f0h | ||
2542 | xor edx, edi | ||
2543 | xor esi, edi | ||
2544 | ; | ||
2545 | rol esi, 20 | ||
2546 | mov edi, esi | ||
2547 | xor esi, edx | ||
2548 | and esi, 0fff0000fh | ||
2549 | xor edi, esi | ||
2550 | xor edx, esi | ||
2551 | ; | ||
2552 | rol edi, 14 | ||
2553 | mov esi, edi | ||
2554 | xor edi, edx | ||
2555 | and edi, 033333333h | ||
2556 | xor esi, edi | ||
2557 | xor edx, edi | ||
2558 | ; | ||
2559 | rol edx, 22 | ||
2560 | mov edi, edx | ||
2561 | xor edx, esi | ||
2562 | and edx, 003fc03fch | ||
2563 | xor edi, edx | ||
2564 | xor esi, edx | ||
2565 | ; | ||
2566 | rol edi, 9 | ||
2567 | mov edx, edi | ||
2568 | xor edi, esi | ||
2569 | and edi, 0aaaaaaaah | ||
2570 | xor edx, edi | ||
2571 | xor esi, edi | ||
2572 | ; | ||
2573 | ror edx, 3 | ||
2574 | ror esi, 2 | ||
2575 | mov DWORD PTR 4[ebx],esi | ||
2576 | mov eax, DWORD PTR 36[esp] | ||
2577 | mov DWORD PTR [ebx],edx | ||
2578 | mov edi, DWORD PTR 40[esp] | ||
2579 | mov esi, DWORD PTR 44[esp] | ||
2580 | mov DWORD PTR 8[esp],1 | ||
2581 | mov DWORD PTR 4[esp],eax | ||
2582 | mov DWORD PTR [esp],ebx | ||
2583 | call _des_encrypt2 | ||
2584 | mov DWORD PTR 8[esp],0 | ||
2585 | mov DWORD PTR 4[esp],edi | ||
2586 | mov DWORD PTR [esp],ebx | ||
2587 | call _des_encrypt2 | ||
2588 | mov DWORD PTR 8[esp],1 | ||
2589 | mov DWORD PTR 4[esp],esi | ||
2590 | mov DWORD PTR [esp],ebx | ||
2591 | call _des_encrypt2 | ||
2592 | add esp, 12 | ||
2593 | mov edi, DWORD PTR [ebx] | ||
2594 | mov esi, DWORD PTR 4[ebx] | ||
2595 | ; | ||
2596 | ; FP | ||
2597 | rol esi, 2 | ||
2598 | rol edi, 3 | ||
2599 | mov eax, edi | ||
2600 | xor edi, esi | ||
2601 | and edi, 0aaaaaaaah | ||
2602 | xor eax, edi | ||
2603 | xor esi, edi | ||
2604 | ; | ||
2605 | rol eax, 23 | ||
2606 | mov edi, eax | ||
2607 | xor eax, esi | ||
2608 | and eax, 003fc03fch | ||
2609 | xor edi, eax | ||
2610 | xor esi, eax | ||
2611 | ; | ||
2612 | rol edi, 10 | ||
2613 | mov eax, edi | ||
2614 | xor edi, esi | ||
2615 | and edi, 033333333h | ||
2616 | xor eax, edi | ||
2617 | xor esi, edi | ||
2618 | ; | ||
2619 | rol esi, 18 | ||
2620 | mov edi, esi | ||
2621 | xor esi, eax | ||
2622 | and esi, 0fff0000fh | ||
2623 | xor edi, esi | ||
2624 | xor eax, esi | ||
2625 | ; | ||
2626 | rol edi, 12 | ||
2627 | mov esi, edi | ||
2628 | xor edi, eax | ||
2629 | and edi, 0f0f0f0f0h | ||
2630 | xor esi, edi | ||
2631 | xor eax, edi | ||
2632 | ; | ||
2633 | ror eax, 4 | ||
2634 | mov DWORD PTR [ebx],eax | ||
2635 | mov DWORD PTR 4[ebx],esi | ||
2636 | pop edi | ||
2637 | pop esi | ||
2638 | pop ebp | ||
2639 | pop ebx | ||
2640 | ret | ||
2641 | _des_encrypt3 ENDP | ||
2642 | _TEXT ENDS | ||
2643 | _TEXT SEGMENT | ||
2644 | PUBLIC _des_decrypt3 | ||
2645 | |||
2646 | _des_decrypt3 PROC NEAR | ||
2647 | push ebx | ||
2648 | mov ebx, DWORD PTR 8[esp] | ||
2649 | push ebp | ||
2650 | push esi | ||
2651 | push edi | ||
2652 | ; | ||
2653 | ; Load the data words | ||
2654 | mov edi, DWORD PTR [ebx] | ||
2655 | mov esi, DWORD PTR 4[ebx] | ||
2656 | sub esp, 12 | ||
2657 | ; | ||
2658 | ; IP | ||
2659 | rol edi, 4 | ||
2660 | mov edx, edi | ||
2661 | xor edi, esi | ||
2662 | and edi, 0f0f0f0f0h | ||
2663 | xor edx, edi | ||
2664 | xor esi, edi | ||
2665 | ; | ||
2666 | rol esi, 20 | ||
2667 | mov edi, esi | ||
2668 | xor esi, edx | ||
2669 | and esi, 0fff0000fh | ||
2670 | xor edi, esi | ||
2671 | xor edx, esi | ||
2672 | ; | ||
2673 | rol edi, 14 | ||
2674 | mov esi, edi | ||
2675 | xor edi, edx | ||
2676 | and edi, 033333333h | ||
2677 | xor esi, edi | ||
2678 | xor edx, edi | ||
2679 | ; | ||
2680 | rol edx, 22 | ||
2681 | mov edi, edx | ||
2682 | xor edx, esi | ||
2683 | and edx, 003fc03fch | ||
2684 | xor edi, edx | ||
2685 | xor esi, edx | ||
2686 | ; | ||
2687 | rol edi, 9 | ||
2688 | mov edx, edi | ||
2689 | xor edi, esi | ||
2690 | and edi, 0aaaaaaaah | ||
2691 | xor edx, edi | ||
2692 | xor esi, edi | ||
2693 | ; | ||
2694 | ror edx, 3 | ||
2695 | ror esi, 2 | ||
2696 | mov DWORD PTR 4[ebx],esi | ||
2697 | mov esi, DWORD PTR 36[esp] | ||
2698 | mov DWORD PTR [ebx],edx | ||
2699 | mov edi, DWORD PTR 40[esp] | ||
2700 | mov eax, DWORD PTR 44[esp] | ||
2701 | mov DWORD PTR 8[esp],0 | ||
2702 | mov DWORD PTR 4[esp],eax | ||
2703 | mov DWORD PTR [esp],ebx | ||
2704 | call _des_encrypt2 | ||
2705 | mov DWORD PTR 8[esp],1 | ||
2706 | mov DWORD PTR 4[esp],edi | ||
2707 | mov DWORD PTR [esp],ebx | ||
2708 | call _des_encrypt2 | ||
2709 | mov DWORD PTR 8[esp],0 | ||
2710 | mov DWORD PTR 4[esp],esi | ||
2711 | mov DWORD PTR [esp],ebx | ||
2712 | call _des_encrypt2 | ||
2713 | add esp, 12 | ||
2714 | mov edi, DWORD PTR [ebx] | ||
2715 | mov esi, DWORD PTR 4[ebx] | ||
2716 | ; | ||
2717 | ; FP | ||
2718 | rol esi, 2 | ||
2719 | rol edi, 3 | ||
2720 | mov eax, edi | ||
2721 | xor edi, esi | ||
2722 | and edi, 0aaaaaaaah | ||
2723 | xor eax, edi | ||
2724 | xor esi, edi | ||
2725 | ; | ||
2726 | rol eax, 23 | ||
2727 | mov edi, eax | ||
2728 | xor eax, esi | ||
2729 | and eax, 003fc03fch | ||
2730 | xor edi, eax | ||
2731 | xor esi, eax | ||
2732 | ; | ||
2733 | rol edi, 10 | ||
2734 | mov eax, edi | ||
2735 | xor edi, esi | ||
2736 | and edi, 033333333h | ||
2737 | xor eax, edi | ||
2738 | xor esi, edi | ||
2739 | ; | ||
2740 | rol esi, 18 | ||
2741 | mov edi, esi | ||
2742 | xor esi, eax | ||
2743 | and esi, 0fff0000fh | ||
2744 | xor edi, esi | ||
2745 | xor eax, esi | ||
2746 | ; | ||
2747 | rol edi, 12 | ||
2748 | mov esi, edi | ||
2749 | xor edi, eax | ||
2750 | and edi, 0f0f0f0f0h | ||
2751 | xor esi, edi | ||
2752 | xor eax, edi | ||
2753 | ; | ||
2754 | ror eax, 4 | ||
2755 | mov DWORD PTR [ebx],eax | ||
2756 | mov DWORD PTR 4[ebx],esi | ||
2757 | pop edi | ||
2758 | pop esi | ||
2759 | pop ebp | ||
2760 | pop ebx | ||
2761 | ret | ||
2762 | _des_decrypt3 ENDP | ||
2763 | _TEXT ENDS | ||
2764 | _TEXT SEGMENT | ||
2765 | PUBLIC _des_ncbc_encrypt | ||
2766 | |||
2767 | _des_ncbc_encrypt PROC NEAR | ||
2768 | ; | ||
2769 | push ebp | ||
2770 | push ebx | ||
2771 | push esi | ||
2772 | push edi | ||
2773 | mov ebp, DWORD PTR 28[esp] | ||
2774 | ; getting iv ptr from parameter 4 | ||
2775 | mov ebx, DWORD PTR 36[esp] | ||
2776 | mov esi, DWORD PTR [ebx] | ||
2777 | mov edi, DWORD PTR 4[ebx] | ||
2778 | push edi | ||
2779 | push esi | ||
2780 | push edi | ||
2781 | push esi | ||
2782 | mov ebx, esp | ||
2783 | mov esi, DWORD PTR 36[esp] | ||
2784 | mov edi, DWORD PTR 40[esp] | ||
2785 | ; getting encrypt flag from parameter 5 | ||
2786 | mov ecx, DWORD PTR 56[esp] | ||
2787 | ; get and push parameter 5 | ||
2788 | push ecx | ||
2789 | ; get and push parameter 3 | ||
2790 | mov eax, DWORD PTR 52[esp] | ||
2791 | push eax | ||
2792 | push ebx | ||
2793 | cmp ecx, 0 | ||
2794 | jz $L004decrypt | ||
2795 | and ebp, 4294967288 | ||
2796 | mov eax, DWORD PTR 12[esp] | ||
2797 | mov ebx, DWORD PTR 16[esp] | ||
2798 | jz $L005encrypt_finish | ||
2799 | L006encrypt_loop: | ||
2800 | mov ecx, DWORD PTR [esi] | ||
2801 | mov edx, DWORD PTR 4[esi] | ||
2802 | xor eax, ecx | ||
2803 | xor ebx, edx | ||
2804 | mov DWORD PTR 12[esp],eax | ||
2805 | mov DWORD PTR 16[esp],ebx | ||
2806 | call _des_encrypt | ||
2807 | mov eax, DWORD PTR 12[esp] | ||
2808 | mov ebx, DWORD PTR 16[esp] | ||
2809 | mov DWORD PTR [edi],eax | ||
2810 | mov DWORD PTR 4[edi],ebx | ||
2811 | add esi, 8 | ||
2812 | add edi, 8 | ||
2813 | sub ebp, 8 | ||
2814 | jnz L006encrypt_loop | ||
2815 | $L005encrypt_finish: | ||
2816 | mov ebp, DWORD PTR 56[esp] | ||
2817 | and ebp, 7 | ||
2818 | jz $L007finish | ||
2819 | xor ecx, ecx | ||
2820 | xor edx, edx | ||
2821 | mov ebp, DWORD PTR $L008cbc_enc_jmp_table[ebp*4] | ||
2822 | jmp ebp | ||
2823 | L009ej7: | ||
2824 | mov dh, BYTE PTR 6[esi] | ||
2825 | shl edx, 8 | ||
2826 | L010ej6: | ||
2827 | mov dh, BYTE PTR 5[esi] | ||
2828 | L011ej5: | ||
2829 | mov dl, BYTE PTR 4[esi] | ||
2830 | L012ej4: | ||
2831 | mov ecx, DWORD PTR [esi] | ||
2832 | jmp $L013ejend | ||
2833 | L014ej3: | ||
2834 | mov ch, BYTE PTR 2[esi] | ||
2835 | shl ecx, 8 | ||
2836 | L015ej2: | ||
2837 | mov ch, BYTE PTR 1[esi] | ||
2838 | L016ej1: | ||
2839 | mov cl, BYTE PTR [esi] | ||
2840 | $L013ejend: | ||
2841 | xor eax, ecx | ||
2842 | xor ebx, edx | ||
2843 | mov DWORD PTR 12[esp],eax | ||
2844 | mov DWORD PTR 16[esp],ebx | ||
2845 | call _des_encrypt | ||
2846 | mov eax, DWORD PTR 12[esp] | ||
2847 | mov ebx, DWORD PTR 16[esp] | ||
2848 | mov DWORD PTR [edi],eax | ||
2849 | mov DWORD PTR 4[edi],ebx | ||
2850 | jmp $L007finish | ||
2851 | $L004decrypt: | ||
2852 | and ebp, 4294967288 | ||
2853 | mov eax, DWORD PTR 20[esp] | ||
2854 | mov ebx, DWORD PTR 24[esp] | ||
2855 | jz $L017decrypt_finish | ||
2856 | L018decrypt_loop: | ||
2857 | mov eax, DWORD PTR [esi] | ||
2858 | mov ebx, DWORD PTR 4[esi] | ||
2859 | mov DWORD PTR 12[esp],eax | ||
2860 | mov DWORD PTR 16[esp],ebx | ||
2861 | call _des_encrypt | ||
2862 | mov eax, DWORD PTR 12[esp] | ||
2863 | mov ebx, DWORD PTR 16[esp] | ||
2864 | mov ecx, DWORD PTR 20[esp] | ||
2865 | mov edx, DWORD PTR 24[esp] | ||
2866 | xor ecx, eax | ||
2867 | xor edx, ebx | ||
2868 | mov eax, DWORD PTR [esi] | ||
2869 | mov ebx, DWORD PTR 4[esi] | ||
2870 | mov DWORD PTR [edi],ecx | ||
2871 | mov DWORD PTR 4[edi],edx | ||
2872 | mov DWORD PTR 20[esp],eax | ||
2873 | mov DWORD PTR 24[esp],ebx | ||
2874 | add esi, 8 | ||
2875 | add edi, 8 | ||
2876 | sub ebp, 8 | ||
2877 | jnz L018decrypt_loop | ||
2878 | $L017decrypt_finish: | ||
2879 | mov ebp, DWORD PTR 56[esp] | ||
2880 | and ebp, 7 | ||
2881 | jz $L007finish | ||
2882 | mov eax, DWORD PTR [esi] | ||
2883 | mov ebx, DWORD PTR 4[esi] | ||
2884 | mov DWORD PTR 12[esp],eax | ||
2885 | mov DWORD PTR 16[esp],ebx | ||
2886 | call _des_encrypt | ||
2887 | mov eax, DWORD PTR 12[esp] | ||
2888 | mov ebx, DWORD PTR 16[esp] | ||
2889 | mov ecx, DWORD PTR 20[esp] | ||
2890 | mov edx, DWORD PTR 24[esp] | ||
2891 | xor ecx, eax | ||
2892 | xor edx, ebx | ||
2893 | mov eax, DWORD PTR [esi] | ||
2894 | mov ebx, DWORD PTR 4[esi] | ||
2895 | L019dj7: | ||
2896 | ror edx, 16 | ||
2897 | mov BYTE PTR 6[edi],dl | ||
2898 | shr edx, 16 | ||
2899 | L020dj6: | ||
2900 | mov BYTE PTR 5[edi],dh | ||
2901 | L021dj5: | ||
2902 | mov BYTE PTR 4[edi],dl | ||
2903 | L022dj4: | ||
2904 | mov DWORD PTR [edi],ecx | ||
2905 | jmp $L023djend | ||
2906 | L024dj3: | ||
2907 | ror ecx, 16 | ||
2908 | mov BYTE PTR 2[edi],cl | ||
2909 | shl ecx, 16 | ||
2910 | L025dj2: | ||
2911 | mov BYTE PTR 1[esi],ch | ||
2912 | L026dj1: | ||
2913 | mov BYTE PTR [esi], cl | ||
2914 | $L023djend: | ||
2915 | jmp $L007finish | ||
2916 | $L007finish: | ||
2917 | mov ecx, DWORD PTR 64[esp] | ||
2918 | add esp, 28 | ||
2919 | mov DWORD PTR [ecx],eax | ||
2920 | mov DWORD PTR 4[ecx],ebx | ||
2921 | pop edi | ||
2922 | pop esi | ||
2923 | pop ebx | ||
2924 | pop ebp | ||
2925 | ret | ||
2926 | $L008cbc_enc_jmp_table: | ||
2927 | DD 0 | ||
2928 | DD L016ej1 | ||
2929 | DD L015ej2 | ||
2930 | DD L014ej3 | ||
2931 | DD L012ej4 | ||
2932 | DD L011ej5 | ||
2933 | DD L010ej6 | ||
2934 | DD L009ej7 | ||
2935 | L027cbc_dec_jmp_table: | ||
2936 | DD 0 | ||
2937 | DD L026dj1 | ||
2938 | DD L025dj2 | ||
2939 | DD L024dj3 | ||
2940 | DD L022dj4 | ||
2941 | DD L021dj5 | ||
2942 | DD L020dj6 | ||
2943 | DD L019dj7 | ||
2944 | _des_ncbc_encrypt ENDP | ||
2945 | _TEXT ENDS | ||
2946 | _TEXT SEGMENT | ||
2947 | PUBLIC _des_ede3_cbc_encrypt | ||
2948 | |||
2949 | _des_ede3_cbc_encrypt PROC NEAR | ||
2950 | ; | ||
2951 | push ebp | ||
2952 | push ebx | ||
2953 | push esi | ||
2954 | push edi | ||
2955 | mov ebp, DWORD PTR 28[esp] | ||
2956 | ; getting iv ptr from parameter 6 | ||
2957 | mov ebx, DWORD PTR 44[esp] | ||
2958 | mov esi, DWORD PTR [ebx] | ||
2959 | mov edi, DWORD PTR 4[ebx] | ||
2960 | push edi | ||
2961 | push esi | ||
2962 | push edi | ||
2963 | push esi | ||
2964 | mov ebx, esp | ||
2965 | mov esi, DWORD PTR 36[esp] | ||
2966 | mov edi, DWORD PTR 40[esp] | ||
2967 | ; getting encrypt flag from parameter 7 | ||
2968 | mov ecx, DWORD PTR 64[esp] | ||
2969 | ; get and push parameter 5 | ||
2970 | mov eax, DWORD PTR 56[esp] | ||
2971 | push eax | ||
2972 | ; get and push parameter 4 | ||
2973 | mov eax, DWORD PTR 56[esp] | ||
2974 | push eax | ||
2975 | ; get and push parameter 3 | ||
2976 | mov eax, DWORD PTR 56[esp] | ||
2977 | push eax | ||
2978 | push ebx | ||
2979 | cmp ecx, 0 | ||
2980 | jz $L028decrypt | ||
2981 | and ebp, 4294967288 | ||
2982 | mov eax, DWORD PTR 16[esp] | ||
2983 | mov ebx, DWORD PTR 20[esp] | ||
2984 | jz $L029encrypt_finish | ||
2985 | L030encrypt_loop: | ||
2986 | mov ecx, DWORD PTR [esi] | ||
2987 | mov edx, DWORD PTR 4[esi] | ||
2988 | xor eax, ecx | ||
2989 | xor ebx, edx | ||
2990 | mov DWORD PTR 16[esp],eax | ||
2991 | mov DWORD PTR 20[esp],ebx | ||
2992 | call _des_encrypt3 | ||
2993 | mov eax, DWORD PTR 16[esp] | ||
2994 | mov ebx, DWORD PTR 20[esp] | ||
2995 | mov DWORD PTR [edi],eax | ||
2996 | mov DWORD PTR 4[edi],ebx | ||
2997 | add esi, 8 | ||
2998 | add edi, 8 | ||
2999 | sub ebp, 8 | ||
3000 | jnz L030encrypt_loop | ||
3001 | $L029encrypt_finish: | ||
3002 | mov ebp, DWORD PTR 60[esp] | ||
3003 | and ebp, 7 | ||
3004 | jz $L031finish | ||
3005 | xor ecx, ecx | ||
3006 | xor edx, edx | ||
3007 | mov ebp, DWORD PTR $L032cbc_enc_jmp_table[ebp*4] | ||
3008 | jmp ebp | ||
3009 | L033ej7: | ||
3010 | mov dh, BYTE PTR 6[esi] | ||
3011 | shl edx, 8 | ||
3012 | L034ej6: | ||
3013 | mov dh, BYTE PTR 5[esi] | ||
3014 | L035ej5: | ||
3015 | mov dl, BYTE PTR 4[esi] | ||
3016 | L036ej4: | ||
3017 | mov ecx, DWORD PTR [esi] | ||
3018 | jmp $L037ejend | ||
3019 | L038ej3: | ||
3020 | mov ch, BYTE PTR 2[esi] | ||
3021 | shl ecx, 8 | ||
3022 | L039ej2: | ||
3023 | mov ch, BYTE PTR 1[esi] | ||
3024 | L040ej1: | ||
3025 | mov cl, BYTE PTR [esi] | ||
3026 | $L037ejend: | ||
3027 | xor eax, ecx | ||
3028 | xor ebx, edx | ||
3029 | mov DWORD PTR 16[esp],eax | ||
3030 | mov DWORD PTR 20[esp],ebx | ||
3031 | call _des_encrypt3 | ||
3032 | mov eax, DWORD PTR 16[esp] | ||
3033 | mov ebx, DWORD PTR 20[esp] | ||
3034 | mov DWORD PTR [edi],eax | ||
3035 | mov DWORD PTR 4[edi],ebx | ||
3036 | jmp $L031finish | ||
3037 | $L028decrypt: | ||
3038 | and ebp, 4294967288 | ||
3039 | mov eax, DWORD PTR 24[esp] | ||
3040 | mov ebx, DWORD PTR 28[esp] | ||
3041 | jz $L041decrypt_finish | ||
3042 | L042decrypt_loop: | ||
3043 | mov eax, DWORD PTR [esi] | ||
3044 | mov ebx, DWORD PTR 4[esi] | ||
3045 | mov DWORD PTR 16[esp],eax | ||
3046 | mov DWORD PTR 20[esp],ebx | ||
3047 | call _des_decrypt3 | ||
3048 | mov eax, DWORD PTR 16[esp] | ||
3049 | mov ebx, DWORD PTR 20[esp] | ||
3050 | mov ecx, DWORD PTR 24[esp] | ||
3051 | mov edx, DWORD PTR 28[esp] | ||
3052 | xor ecx, eax | ||
3053 | xor edx, ebx | ||
3054 | mov eax, DWORD PTR [esi] | ||
3055 | mov ebx, DWORD PTR 4[esi] | ||
3056 | mov DWORD PTR [edi],ecx | ||
3057 | mov DWORD PTR 4[edi],edx | ||
3058 | mov DWORD PTR 24[esp],eax | ||
3059 | mov DWORD PTR 28[esp],ebx | ||
3060 | add esi, 8 | ||
3061 | add edi, 8 | ||
3062 | sub ebp, 8 | ||
3063 | jnz L042decrypt_loop | ||
3064 | $L041decrypt_finish: | ||
3065 | mov ebp, DWORD PTR 60[esp] | ||
3066 | and ebp, 7 | ||
3067 | jz $L031finish | ||
3068 | mov eax, DWORD PTR [esi] | ||
3069 | mov ebx, DWORD PTR 4[esi] | ||
3070 | mov DWORD PTR 16[esp],eax | ||
3071 | mov DWORD PTR 20[esp],ebx | ||
3072 | call _des_decrypt3 | ||
3073 | mov eax, DWORD PTR 16[esp] | ||
3074 | mov ebx, DWORD PTR 20[esp] | ||
3075 | mov ecx, DWORD PTR 24[esp] | ||
3076 | mov edx, DWORD PTR 28[esp] | ||
3077 | xor ecx, eax | ||
3078 | xor edx, ebx | ||
3079 | mov eax, DWORD PTR [esi] | ||
3080 | mov ebx, DWORD PTR 4[esi] | ||
3081 | L043dj7: | ||
3082 | ror edx, 16 | ||
3083 | mov BYTE PTR 6[edi],dl | ||
3084 | shr edx, 16 | ||
3085 | L044dj6: | ||
3086 | mov BYTE PTR 5[edi],dh | ||
3087 | L045dj5: | ||
3088 | mov BYTE PTR 4[edi],dl | ||
3089 | L046dj4: | ||
3090 | mov DWORD PTR [edi],ecx | ||
3091 | jmp $L047djend | ||
3092 | L048dj3: | ||
3093 | ror ecx, 16 | ||
3094 | mov BYTE PTR 2[edi],cl | ||
3095 | shl ecx, 16 | ||
3096 | L049dj2: | ||
3097 | mov BYTE PTR 1[esi],ch | ||
3098 | L050dj1: | ||
3099 | mov BYTE PTR [esi], cl | ||
3100 | $L047djend: | ||
3101 | jmp $L031finish | ||
3102 | $L031finish: | ||
3103 | mov ecx, DWORD PTR 76[esp] | ||
3104 | add esp, 32 | ||
3105 | mov DWORD PTR [ecx],eax | ||
3106 | mov DWORD PTR 4[ecx],ebx | ||
3107 | pop edi | ||
3108 | pop esi | ||
3109 | pop ebx | ||
3110 | pop ebp | ||
3111 | ret | ||
3112 | $L032cbc_enc_jmp_table: | ||
3113 | DD 0 | ||
3114 | DD L040ej1 | ||
3115 | DD L039ej2 | ||
3116 | DD L038ej3 | ||
3117 | DD L036ej4 | ||
3118 | DD L035ej5 | ||
3119 | DD L034ej6 | ||
3120 | DD L033ej7 | ||
3121 | L051cbc_dec_jmp_table: | ||
3122 | DD 0 | ||
3123 | DD L050dj1 | ||
3124 | DD L049dj2 | ||
3125 | DD L048dj3 | ||
3126 | DD L046dj4 | ||
3127 | DD L045dj5 | ||
3128 | DD L044dj6 | ||
3129 | DD L043dj7 | ||
3130 | _des_ede3_cbc_encrypt ENDP | ||
3131 | _TEXT ENDS | ||
3132 | END | ||
diff --git a/src/lib/libssl/src/crypto/des/asm/y-win32.asm b/src/lib/libssl/src/crypto/des/asm/y-win32.asm index af5c102422..e69de29bb2 100644 --- a/src/lib/libssl/src/crypto/des/asm/y-win32.asm +++ b/src/lib/libssl/src/crypto/des/asm/y-win32.asm | |||
@@ -1,929 +0,0 @@ | |||
1 | ; Don't even think of reading this code | ||
2 | ; It was automatically generated by crypt586.pl | ||
3 | ; Which is a perl program used to generate the x86 assember for | ||
4 | ; any of elf, a.out, BSDI,Win32, or Solaris | ||
5 | ; eric <eay@cryptsoft.com> | ||
6 | ; | ||
7 | TITLE crypt586.asm | ||
8 | .386 | ||
9 | .model FLAT | ||
10 | _TEXT SEGMENT | ||
11 | PUBLIC _fcrypt_body | ||
12 | EXTRN _des_SPtrans:DWORD | ||
13 | _fcrypt_body PROC NEAR | ||
14 | push ebp | ||
15 | push ebx | ||
16 | push esi | ||
17 | push edi | ||
18 | ; | ||
19 | ; Load the 2 words | ||
20 | xor edi, edi | ||
21 | xor esi, esi | ||
22 | mov ebp, DWORD PTR 24[esp] | ||
23 | push 25 | ||
24 | L000start: | ||
25 | ; | ||
26 | ; Round 0 | ||
27 | mov eax, DWORD PTR 32[esp] | ||
28 | mov edx, esi | ||
29 | shr edx, 16 | ||
30 | mov ecx, DWORD PTR 36[esp] | ||
31 | xor edx, esi | ||
32 | and eax, edx | ||
33 | and edx, ecx | ||
34 | mov ebx, eax | ||
35 | shl ebx, 16 | ||
36 | mov ecx, edx | ||
37 | shl ecx, 16 | ||
38 | xor eax, ebx | ||
39 | xor edx, ecx | ||
40 | mov ebx, DWORD PTR [ebp] | ||
41 | xor eax, ebx | ||
42 | mov ecx, DWORD PTR 4[ebp] | ||
43 | xor eax, esi | ||
44 | xor edx, esi | ||
45 | xor edx, ecx | ||
46 | and eax, 0fcfcfcfch | ||
47 | xor ebx, ebx | ||
48 | and edx, 0cfcfcfcfh | ||
49 | xor ecx, ecx | ||
50 | mov bl, al | ||
51 | mov cl, ah | ||
52 | ror edx, 4 | ||
53 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
54 | mov bl, dl | ||
55 | xor edi, ebp | ||
56 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
57 | xor edi, ebp | ||
58 | mov cl, dh | ||
59 | shr eax, 16 | ||
60 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
61 | xor edi, ebp | ||
62 | mov bl, ah | ||
63 | shr edx, 16 | ||
64 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
65 | xor edi, ebp | ||
66 | mov ebp, DWORD PTR 28[esp] | ||
67 | mov cl, dh | ||
68 | and eax, 0ffh | ||
69 | and edx, 0ffh | ||
70 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
71 | xor edi, ebx | ||
72 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
73 | xor edi, ebx | ||
74 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
75 | xor edi, ebx | ||
76 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
77 | xor edi, ebx | ||
78 | ; | ||
79 | ; Round 1 | ||
80 | mov eax, DWORD PTR 32[esp] | ||
81 | mov edx, edi | ||
82 | shr edx, 16 | ||
83 | mov ecx, DWORD PTR 36[esp] | ||
84 | xor edx, edi | ||
85 | and eax, edx | ||
86 | and edx, ecx | ||
87 | mov ebx, eax | ||
88 | shl ebx, 16 | ||
89 | mov ecx, edx | ||
90 | shl ecx, 16 | ||
91 | xor eax, ebx | ||
92 | xor edx, ecx | ||
93 | mov ebx, DWORD PTR 8[ebp] | ||
94 | xor eax, ebx | ||
95 | mov ecx, DWORD PTR 12[ebp] | ||
96 | xor eax, edi | ||
97 | xor edx, edi | ||
98 | xor edx, ecx | ||
99 | and eax, 0fcfcfcfch | ||
100 | xor ebx, ebx | ||
101 | and edx, 0cfcfcfcfh | ||
102 | xor ecx, ecx | ||
103 | mov bl, al | ||
104 | mov cl, ah | ||
105 | ror edx, 4 | ||
106 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
107 | mov bl, dl | ||
108 | xor esi, ebp | ||
109 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
110 | xor esi, ebp | ||
111 | mov cl, dh | ||
112 | shr eax, 16 | ||
113 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
114 | xor esi, ebp | ||
115 | mov bl, ah | ||
116 | shr edx, 16 | ||
117 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
118 | xor esi, ebp | ||
119 | mov ebp, DWORD PTR 28[esp] | ||
120 | mov cl, dh | ||
121 | and eax, 0ffh | ||
122 | and edx, 0ffh | ||
123 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
124 | xor esi, ebx | ||
125 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
126 | xor esi, ebx | ||
127 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
128 | xor esi, ebx | ||
129 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
130 | xor esi, ebx | ||
131 | ; | ||
132 | ; Round 2 | ||
133 | mov eax, DWORD PTR 32[esp] | ||
134 | mov edx, esi | ||
135 | shr edx, 16 | ||
136 | mov ecx, DWORD PTR 36[esp] | ||
137 | xor edx, esi | ||
138 | and eax, edx | ||
139 | and edx, ecx | ||
140 | mov ebx, eax | ||
141 | shl ebx, 16 | ||
142 | mov ecx, edx | ||
143 | shl ecx, 16 | ||
144 | xor eax, ebx | ||
145 | xor edx, ecx | ||
146 | mov ebx, DWORD PTR 16[ebp] | ||
147 | xor eax, ebx | ||
148 | mov ecx, DWORD PTR 20[ebp] | ||
149 | xor eax, esi | ||
150 | xor edx, esi | ||
151 | xor edx, ecx | ||
152 | and eax, 0fcfcfcfch | ||
153 | xor ebx, ebx | ||
154 | and edx, 0cfcfcfcfh | ||
155 | xor ecx, ecx | ||
156 | mov bl, al | ||
157 | mov cl, ah | ||
158 | ror edx, 4 | ||
159 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
160 | mov bl, dl | ||
161 | xor edi, ebp | ||
162 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
163 | xor edi, ebp | ||
164 | mov cl, dh | ||
165 | shr eax, 16 | ||
166 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
167 | xor edi, ebp | ||
168 | mov bl, ah | ||
169 | shr edx, 16 | ||
170 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
171 | xor edi, ebp | ||
172 | mov ebp, DWORD PTR 28[esp] | ||
173 | mov cl, dh | ||
174 | and eax, 0ffh | ||
175 | and edx, 0ffh | ||
176 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
177 | xor edi, ebx | ||
178 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
179 | xor edi, ebx | ||
180 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
181 | xor edi, ebx | ||
182 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
183 | xor edi, ebx | ||
184 | ; | ||
185 | ; Round 3 | ||
186 | mov eax, DWORD PTR 32[esp] | ||
187 | mov edx, edi | ||
188 | shr edx, 16 | ||
189 | mov ecx, DWORD PTR 36[esp] | ||
190 | xor edx, edi | ||
191 | and eax, edx | ||
192 | and edx, ecx | ||
193 | mov ebx, eax | ||
194 | shl ebx, 16 | ||
195 | mov ecx, edx | ||
196 | shl ecx, 16 | ||
197 | xor eax, ebx | ||
198 | xor edx, ecx | ||
199 | mov ebx, DWORD PTR 24[ebp] | ||
200 | xor eax, ebx | ||
201 | mov ecx, DWORD PTR 28[ebp] | ||
202 | xor eax, edi | ||
203 | xor edx, edi | ||
204 | xor edx, ecx | ||
205 | and eax, 0fcfcfcfch | ||
206 | xor ebx, ebx | ||
207 | and edx, 0cfcfcfcfh | ||
208 | xor ecx, ecx | ||
209 | mov bl, al | ||
210 | mov cl, ah | ||
211 | ror edx, 4 | ||
212 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
213 | mov bl, dl | ||
214 | xor esi, ebp | ||
215 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
216 | xor esi, ebp | ||
217 | mov cl, dh | ||
218 | shr eax, 16 | ||
219 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
220 | xor esi, ebp | ||
221 | mov bl, ah | ||
222 | shr edx, 16 | ||
223 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
224 | xor esi, ebp | ||
225 | mov ebp, DWORD PTR 28[esp] | ||
226 | mov cl, dh | ||
227 | and eax, 0ffh | ||
228 | and edx, 0ffh | ||
229 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
230 | xor esi, ebx | ||
231 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
232 | xor esi, ebx | ||
233 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
234 | xor esi, ebx | ||
235 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
236 | xor esi, ebx | ||
237 | ; | ||
238 | ; Round 4 | ||
239 | mov eax, DWORD PTR 32[esp] | ||
240 | mov edx, esi | ||
241 | shr edx, 16 | ||
242 | mov ecx, DWORD PTR 36[esp] | ||
243 | xor edx, esi | ||
244 | and eax, edx | ||
245 | and edx, ecx | ||
246 | mov ebx, eax | ||
247 | shl ebx, 16 | ||
248 | mov ecx, edx | ||
249 | shl ecx, 16 | ||
250 | xor eax, ebx | ||
251 | xor edx, ecx | ||
252 | mov ebx, DWORD PTR 32[ebp] | ||
253 | xor eax, ebx | ||
254 | mov ecx, DWORD PTR 36[ebp] | ||
255 | xor eax, esi | ||
256 | xor edx, esi | ||
257 | xor edx, ecx | ||
258 | and eax, 0fcfcfcfch | ||
259 | xor ebx, ebx | ||
260 | and edx, 0cfcfcfcfh | ||
261 | xor ecx, ecx | ||
262 | mov bl, al | ||
263 | mov cl, ah | ||
264 | ror edx, 4 | ||
265 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
266 | mov bl, dl | ||
267 | xor edi, ebp | ||
268 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
269 | xor edi, ebp | ||
270 | mov cl, dh | ||
271 | shr eax, 16 | ||
272 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
273 | xor edi, ebp | ||
274 | mov bl, ah | ||
275 | shr edx, 16 | ||
276 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
277 | xor edi, ebp | ||
278 | mov ebp, DWORD PTR 28[esp] | ||
279 | mov cl, dh | ||
280 | and eax, 0ffh | ||
281 | and edx, 0ffh | ||
282 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
283 | xor edi, ebx | ||
284 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
285 | xor edi, ebx | ||
286 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
287 | xor edi, ebx | ||
288 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
289 | xor edi, ebx | ||
290 | ; | ||
291 | ; Round 5 | ||
292 | mov eax, DWORD PTR 32[esp] | ||
293 | mov edx, edi | ||
294 | shr edx, 16 | ||
295 | mov ecx, DWORD PTR 36[esp] | ||
296 | xor edx, edi | ||
297 | and eax, edx | ||
298 | and edx, ecx | ||
299 | mov ebx, eax | ||
300 | shl ebx, 16 | ||
301 | mov ecx, edx | ||
302 | shl ecx, 16 | ||
303 | xor eax, ebx | ||
304 | xor edx, ecx | ||
305 | mov ebx, DWORD PTR 40[ebp] | ||
306 | xor eax, ebx | ||
307 | mov ecx, DWORD PTR 44[ebp] | ||
308 | xor eax, edi | ||
309 | xor edx, edi | ||
310 | xor edx, ecx | ||
311 | and eax, 0fcfcfcfch | ||
312 | xor ebx, ebx | ||
313 | and edx, 0cfcfcfcfh | ||
314 | xor ecx, ecx | ||
315 | mov bl, al | ||
316 | mov cl, ah | ||
317 | ror edx, 4 | ||
318 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
319 | mov bl, dl | ||
320 | xor esi, ebp | ||
321 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
322 | xor esi, ebp | ||
323 | mov cl, dh | ||
324 | shr eax, 16 | ||
325 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
326 | xor esi, ebp | ||
327 | mov bl, ah | ||
328 | shr edx, 16 | ||
329 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
330 | xor esi, ebp | ||
331 | mov ebp, DWORD PTR 28[esp] | ||
332 | mov cl, dh | ||
333 | and eax, 0ffh | ||
334 | and edx, 0ffh | ||
335 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
336 | xor esi, ebx | ||
337 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
338 | xor esi, ebx | ||
339 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
340 | xor esi, ebx | ||
341 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
342 | xor esi, ebx | ||
343 | ; | ||
344 | ; Round 6 | ||
345 | mov eax, DWORD PTR 32[esp] | ||
346 | mov edx, esi | ||
347 | shr edx, 16 | ||
348 | mov ecx, DWORD PTR 36[esp] | ||
349 | xor edx, esi | ||
350 | and eax, edx | ||
351 | and edx, ecx | ||
352 | mov ebx, eax | ||
353 | shl ebx, 16 | ||
354 | mov ecx, edx | ||
355 | shl ecx, 16 | ||
356 | xor eax, ebx | ||
357 | xor edx, ecx | ||
358 | mov ebx, DWORD PTR 48[ebp] | ||
359 | xor eax, ebx | ||
360 | mov ecx, DWORD PTR 52[ebp] | ||
361 | xor eax, esi | ||
362 | xor edx, esi | ||
363 | xor edx, ecx | ||
364 | and eax, 0fcfcfcfch | ||
365 | xor ebx, ebx | ||
366 | and edx, 0cfcfcfcfh | ||
367 | xor ecx, ecx | ||
368 | mov bl, al | ||
369 | mov cl, ah | ||
370 | ror edx, 4 | ||
371 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
372 | mov bl, dl | ||
373 | xor edi, ebp | ||
374 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
375 | xor edi, ebp | ||
376 | mov cl, dh | ||
377 | shr eax, 16 | ||
378 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
379 | xor edi, ebp | ||
380 | mov bl, ah | ||
381 | shr edx, 16 | ||
382 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
383 | xor edi, ebp | ||
384 | mov ebp, DWORD PTR 28[esp] | ||
385 | mov cl, dh | ||
386 | and eax, 0ffh | ||
387 | and edx, 0ffh | ||
388 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
389 | xor edi, ebx | ||
390 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
391 | xor edi, ebx | ||
392 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
393 | xor edi, ebx | ||
394 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
395 | xor edi, ebx | ||
396 | ; | ||
397 | ; Round 7 | ||
398 | mov eax, DWORD PTR 32[esp] | ||
399 | mov edx, edi | ||
400 | shr edx, 16 | ||
401 | mov ecx, DWORD PTR 36[esp] | ||
402 | xor edx, edi | ||
403 | and eax, edx | ||
404 | and edx, ecx | ||
405 | mov ebx, eax | ||
406 | shl ebx, 16 | ||
407 | mov ecx, edx | ||
408 | shl ecx, 16 | ||
409 | xor eax, ebx | ||
410 | xor edx, ecx | ||
411 | mov ebx, DWORD PTR 56[ebp] | ||
412 | xor eax, ebx | ||
413 | mov ecx, DWORD PTR 60[ebp] | ||
414 | xor eax, edi | ||
415 | xor edx, edi | ||
416 | xor edx, ecx | ||
417 | and eax, 0fcfcfcfch | ||
418 | xor ebx, ebx | ||
419 | and edx, 0cfcfcfcfh | ||
420 | xor ecx, ecx | ||
421 | mov bl, al | ||
422 | mov cl, ah | ||
423 | ror edx, 4 | ||
424 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
425 | mov bl, dl | ||
426 | xor esi, ebp | ||
427 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
428 | xor esi, ebp | ||
429 | mov cl, dh | ||
430 | shr eax, 16 | ||
431 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
432 | xor esi, ebp | ||
433 | mov bl, ah | ||
434 | shr edx, 16 | ||
435 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
436 | xor esi, ebp | ||
437 | mov ebp, DWORD PTR 28[esp] | ||
438 | mov cl, dh | ||
439 | and eax, 0ffh | ||
440 | and edx, 0ffh | ||
441 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
442 | xor esi, ebx | ||
443 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
444 | xor esi, ebx | ||
445 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
446 | xor esi, ebx | ||
447 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
448 | xor esi, ebx | ||
449 | ; | ||
450 | ; Round 8 | ||
451 | mov eax, DWORD PTR 32[esp] | ||
452 | mov edx, esi | ||
453 | shr edx, 16 | ||
454 | mov ecx, DWORD PTR 36[esp] | ||
455 | xor edx, esi | ||
456 | and eax, edx | ||
457 | and edx, ecx | ||
458 | mov ebx, eax | ||
459 | shl ebx, 16 | ||
460 | mov ecx, edx | ||
461 | shl ecx, 16 | ||
462 | xor eax, ebx | ||
463 | xor edx, ecx | ||
464 | mov ebx, DWORD PTR 64[ebp] | ||
465 | xor eax, ebx | ||
466 | mov ecx, DWORD PTR 68[ebp] | ||
467 | xor eax, esi | ||
468 | xor edx, esi | ||
469 | xor edx, ecx | ||
470 | and eax, 0fcfcfcfch | ||
471 | xor ebx, ebx | ||
472 | and edx, 0cfcfcfcfh | ||
473 | xor ecx, ecx | ||
474 | mov bl, al | ||
475 | mov cl, ah | ||
476 | ror edx, 4 | ||
477 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
478 | mov bl, dl | ||
479 | xor edi, ebp | ||
480 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
481 | xor edi, ebp | ||
482 | mov cl, dh | ||
483 | shr eax, 16 | ||
484 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
485 | xor edi, ebp | ||
486 | mov bl, ah | ||
487 | shr edx, 16 | ||
488 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
489 | xor edi, ebp | ||
490 | mov ebp, DWORD PTR 28[esp] | ||
491 | mov cl, dh | ||
492 | and eax, 0ffh | ||
493 | and edx, 0ffh | ||
494 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
495 | xor edi, ebx | ||
496 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
497 | xor edi, ebx | ||
498 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
499 | xor edi, ebx | ||
500 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
501 | xor edi, ebx | ||
502 | ; | ||
503 | ; Round 9 | ||
504 | mov eax, DWORD PTR 32[esp] | ||
505 | mov edx, edi | ||
506 | shr edx, 16 | ||
507 | mov ecx, DWORD PTR 36[esp] | ||
508 | xor edx, edi | ||
509 | and eax, edx | ||
510 | and edx, ecx | ||
511 | mov ebx, eax | ||
512 | shl ebx, 16 | ||
513 | mov ecx, edx | ||
514 | shl ecx, 16 | ||
515 | xor eax, ebx | ||
516 | xor edx, ecx | ||
517 | mov ebx, DWORD PTR 72[ebp] | ||
518 | xor eax, ebx | ||
519 | mov ecx, DWORD PTR 76[ebp] | ||
520 | xor eax, edi | ||
521 | xor edx, edi | ||
522 | xor edx, ecx | ||
523 | and eax, 0fcfcfcfch | ||
524 | xor ebx, ebx | ||
525 | and edx, 0cfcfcfcfh | ||
526 | xor ecx, ecx | ||
527 | mov bl, al | ||
528 | mov cl, ah | ||
529 | ror edx, 4 | ||
530 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
531 | mov bl, dl | ||
532 | xor esi, ebp | ||
533 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
534 | xor esi, ebp | ||
535 | mov cl, dh | ||
536 | shr eax, 16 | ||
537 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
538 | xor esi, ebp | ||
539 | mov bl, ah | ||
540 | shr edx, 16 | ||
541 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
542 | xor esi, ebp | ||
543 | mov ebp, DWORD PTR 28[esp] | ||
544 | mov cl, dh | ||
545 | and eax, 0ffh | ||
546 | and edx, 0ffh | ||
547 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
548 | xor esi, ebx | ||
549 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
550 | xor esi, ebx | ||
551 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
552 | xor esi, ebx | ||
553 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
554 | xor esi, ebx | ||
555 | ; | ||
556 | ; Round 10 | ||
557 | mov eax, DWORD PTR 32[esp] | ||
558 | mov edx, esi | ||
559 | shr edx, 16 | ||
560 | mov ecx, DWORD PTR 36[esp] | ||
561 | xor edx, esi | ||
562 | and eax, edx | ||
563 | and edx, ecx | ||
564 | mov ebx, eax | ||
565 | shl ebx, 16 | ||
566 | mov ecx, edx | ||
567 | shl ecx, 16 | ||
568 | xor eax, ebx | ||
569 | xor edx, ecx | ||
570 | mov ebx, DWORD PTR 80[ebp] | ||
571 | xor eax, ebx | ||
572 | mov ecx, DWORD PTR 84[ebp] | ||
573 | xor eax, esi | ||
574 | xor edx, esi | ||
575 | xor edx, ecx | ||
576 | and eax, 0fcfcfcfch | ||
577 | xor ebx, ebx | ||
578 | and edx, 0cfcfcfcfh | ||
579 | xor ecx, ecx | ||
580 | mov bl, al | ||
581 | mov cl, ah | ||
582 | ror edx, 4 | ||
583 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
584 | mov bl, dl | ||
585 | xor edi, ebp | ||
586 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
587 | xor edi, ebp | ||
588 | mov cl, dh | ||
589 | shr eax, 16 | ||
590 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
591 | xor edi, ebp | ||
592 | mov bl, ah | ||
593 | shr edx, 16 | ||
594 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
595 | xor edi, ebp | ||
596 | mov ebp, DWORD PTR 28[esp] | ||
597 | mov cl, dh | ||
598 | and eax, 0ffh | ||
599 | and edx, 0ffh | ||
600 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
601 | xor edi, ebx | ||
602 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
603 | xor edi, ebx | ||
604 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
605 | xor edi, ebx | ||
606 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
607 | xor edi, ebx | ||
608 | ; | ||
609 | ; Round 11 | ||
610 | mov eax, DWORD PTR 32[esp] | ||
611 | mov edx, edi | ||
612 | shr edx, 16 | ||
613 | mov ecx, DWORD PTR 36[esp] | ||
614 | xor edx, edi | ||
615 | and eax, edx | ||
616 | and edx, ecx | ||
617 | mov ebx, eax | ||
618 | shl ebx, 16 | ||
619 | mov ecx, edx | ||
620 | shl ecx, 16 | ||
621 | xor eax, ebx | ||
622 | xor edx, ecx | ||
623 | mov ebx, DWORD PTR 88[ebp] | ||
624 | xor eax, ebx | ||
625 | mov ecx, DWORD PTR 92[ebp] | ||
626 | xor eax, edi | ||
627 | xor edx, edi | ||
628 | xor edx, ecx | ||
629 | and eax, 0fcfcfcfch | ||
630 | xor ebx, ebx | ||
631 | and edx, 0cfcfcfcfh | ||
632 | xor ecx, ecx | ||
633 | mov bl, al | ||
634 | mov cl, ah | ||
635 | ror edx, 4 | ||
636 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
637 | mov bl, dl | ||
638 | xor esi, ebp | ||
639 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
640 | xor esi, ebp | ||
641 | mov cl, dh | ||
642 | shr eax, 16 | ||
643 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
644 | xor esi, ebp | ||
645 | mov bl, ah | ||
646 | shr edx, 16 | ||
647 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
648 | xor esi, ebp | ||
649 | mov ebp, DWORD PTR 28[esp] | ||
650 | mov cl, dh | ||
651 | and eax, 0ffh | ||
652 | and edx, 0ffh | ||
653 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
654 | xor esi, ebx | ||
655 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
656 | xor esi, ebx | ||
657 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
658 | xor esi, ebx | ||
659 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
660 | xor esi, ebx | ||
661 | ; | ||
662 | ; Round 12 | ||
663 | mov eax, DWORD PTR 32[esp] | ||
664 | mov edx, esi | ||
665 | shr edx, 16 | ||
666 | mov ecx, DWORD PTR 36[esp] | ||
667 | xor edx, esi | ||
668 | and eax, edx | ||
669 | and edx, ecx | ||
670 | mov ebx, eax | ||
671 | shl ebx, 16 | ||
672 | mov ecx, edx | ||
673 | shl ecx, 16 | ||
674 | xor eax, ebx | ||
675 | xor edx, ecx | ||
676 | mov ebx, DWORD PTR 96[ebp] | ||
677 | xor eax, ebx | ||
678 | mov ecx, DWORD PTR 100[ebp] | ||
679 | xor eax, esi | ||
680 | xor edx, esi | ||
681 | xor edx, ecx | ||
682 | and eax, 0fcfcfcfch | ||
683 | xor ebx, ebx | ||
684 | and edx, 0cfcfcfcfh | ||
685 | xor ecx, ecx | ||
686 | mov bl, al | ||
687 | mov cl, ah | ||
688 | ror edx, 4 | ||
689 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
690 | mov bl, dl | ||
691 | xor edi, ebp | ||
692 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
693 | xor edi, ebp | ||
694 | mov cl, dh | ||
695 | shr eax, 16 | ||
696 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
697 | xor edi, ebp | ||
698 | mov bl, ah | ||
699 | shr edx, 16 | ||
700 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
701 | xor edi, ebp | ||
702 | mov ebp, DWORD PTR 28[esp] | ||
703 | mov cl, dh | ||
704 | and eax, 0ffh | ||
705 | and edx, 0ffh | ||
706 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
707 | xor edi, ebx | ||
708 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
709 | xor edi, ebx | ||
710 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
711 | xor edi, ebx | ||
712 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
713 | xor edi, ebx | ||
714 | ; | ||
715 | ; Round 13 | ||
716 | mov eax, DWORD PTR 32[esp] | ||
717 | mov edx, edi | ||
718 | shr edx, 16 | ||
719 | mov ecx, DWORD PTR 36[esp] | ||
720 | xor edx, edi | ||
721 | and eax, edx | ||
722 | and edx, ecx | ||
723 | mov ebx, eax | ||
724 | shl ebx, 16 | ||
725 | mov ecx, edx | ||
726 | shl ecx, 16 | ||
727 | xor eax, ebx | ||
728 | xor edx, ecx | ||
729 | mov ebx, DWORD PTR 104[ebp] | ||
730 | xor eax, ebx | ||
731 | mov ecx, DWORD PTR 108[ebp] | ||
732 | xor eax, edi | ||
733 | xor edx, edi | ||
734 | xor edx, ecx | ||
735 | and eax, 0fcfcfcfch | ||
736 | xor ebx, ebx | ||
737 | and edx, 0cfcfcfcfh | ||
738 | xor ecx, ecx | ||
739 | mov bl, al | ||
740 | mov cl, ah | ||
741 | ror edx, 4 | ||
742 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
743 | mov bl, dl | ||
744 | xor esi, ebp | ||
745 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
746 | xor esi, ebp | ||
747 | mov cl, dh | ||
748 | shr eax, 16 | ||
749 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
750 | xor esi, ebp | ||
751 | mov bl, ah | ||
752 | shr edx, 16 | ||
753 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
754 | xor esi, ebp | ||
755 | mov ebp, DWORD PTR 28[esp] | ||
756 | mov cl, dh | ||
757 | and eax, 0ffh | ||
758 | and edx, 0ffh | ||
759 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
760 | xor esi, ebx | ||
761 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
762 | xor esi, ebx | ||
763 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
764 | xor esi, ebx | ||
765 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
766 | xor esi, ebx | ||
767 | ; | ||
768 | ; Round 14 | ||
769 | mov eax, DWORD PTR 32[esp] | ||
770 | mov edx, esi | ||
771 | shr edx, 16 | ||
772 | mov ecx, DWORD PTR 36[esp] | ||
773 | xor edx, esi | ||
774 | and eax, edx | ||
775 | and edx, ecx | ||
776 | mov ebx, eax | ||
777 | shl ebx, 16 | ||
778 | mov ecx, edx | ||
779 | shl ecx, 16 | ||
780 | xor eax, ebx | ||
781 | xor edx, ecx | ||
782 | mov ebx, DWORD PTR 112[ebp] | ||
783 | xor eax, ebx | ||
784 | mov ecx, DWORD PTR 116[ebp] | ||
785 | xor eax, esi | ||
786 | xor edx, esi | ||
787 | xor edx, ecx | ||
788 | and eax, 0fcfcfcfch | ||
789 | xor ebx, ebx | ||
790 | and edx, 0cfcfcfcfh | ||
791 | xor ecx, ecx | ||
792 | mov bl, al | ||
793 | mov cl, ah | ||
794 | ror edx, 4 | ||
795 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
796 | mov bl, dl | ||
797 | xor edi, ebp | ||
798 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
799 | xor edi, ebp | ||
800 | mov cl, dh | ||
801 | shr eax, 16 | ||
802 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
803 | xor edi, ebp | ||
804 | mov bl, ah | ||
805 | shr edx, 16 | ||
806 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
807 | xor edi, ebp | ||
808 | mov ebp, DWORD PTR 28[esp] | ||
809 | mov cl, dh | ||
810 | and eax, 0ffh | ||
811 | and edx, 0ffh | ||
812 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
813 | xor edi, ebx | ||
814 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
815 | xor edi, ebx | ||
816 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
817 | xor edi, ebx | ||
818 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
819 | xor edi, ebx | ||
820 | ; | ||
821 | ; Round 15 | ||
822 | mov eax, DWORD PTR 32[esp] | ||
823 | mov edx, edi | ||
824 | shr edx, 16 | ||
825 | mov ecx, DWORD PTR 36[esp] | ||
826 | xor edx, edi | ||
827 | and eax, edx | ||
828 | and edx, ecx | ||
829 | mov ebx, eax | ||
830 | shl ebx, 16 | ||
831 | mov ecx, edx | ||
832 | shl ecx, 16 | ||
833 | xor eax, ebx | ||
834 | xor edx, ecx | ||
835 | mov ebx, DWORD PTR 120[ebp] | ||
836 | xor eax, ebx | ||
837 | mov ecx, DWORD PTR 124[ebp] | ||
838 | xor eax, edi | ||
839 | xor edx, edi | ||
840 | xor edx, ecx | ||
841 | and eax, 0fcfcfcfch | ||
842 | xor ebx, ebx | ||
843 | and edx, 0cfcfcfcfh | ||
844 | xor ecx, ecx | ||
845 | mov bl, al | ||
846 | mov cl, ah | ||
847 | ror edx, 4 | ||
848 | mov ebp, DWORD PTR _des_SPtrans[ebx] | ||
849 | mov bl, dl | ||
850 | xor esi, ebp | ||
851 | mov ebp, DWORD PTR _des_SPtrans[0200h+ecx] | ||
852 | xor esi, ebp | ||
853 | mov cl, dh | ||
854 | shr eax, 16 | ||
855 | mov ebp, DWORD PTR _des_SPtrans[0100h+ebx] | ||
856 | xor esi, ebp | ||
857 | mov bl, ah | ||
858 | shr edx, 16 | ||
859 | mov ebp, DWORD PTR _des_SPtrans[0300h+ecx] | ||
860 | xor esi, ebp | ||
861 | mov ebp, DWORD PTR 28[esp] | ||
862 | mov cl, dh | ||
863 | and eax, 0ffh | ||
864 | and edx, 0ffh | ||
865 | mov ebx, DWORD PTR _des_SPtrans[0600h+ebx] | ||
866 | xor esi, ebx | ||
867 | mov ebx, DWORD PTR _des_SPtrans[0700h+ecx] | ||
868 | xor esi, ebx | ||
869 | mov ebx, DWORD PTR _des_SPtrans[0400h+eax] | ||
870 | xor esi, ebx | ||
871 | mov ebx, DWORD PTR _des_SPtrans[0500h+edx] | ||
872 | xor esi, ebx | ||
873 | mov ebx, DWORD PTR [esp] | ||
874 | mov eax, edi | ||
875 | dec ebx | ||
876 | mov edi, esi | ||
877 | mov esi, eax | ||
878 | mov DWORD PTR [esp],ebx | ||
879 | jnz L000start | ||
880 | ; | ||
881 | ; FP | ||
882 | mov edx, DWORD PTR 24[esp] | ||
883 | ror edi, 1 | ||
884 | mov eax, esi | ||
885 | xor esi, edi | ||
886 | and esi, 0aaaaaaaah | ||
887 | xor eax, esi | ||
888 | xor edi, esi | ||
889 | ; | ||
890 | rol eax, 23 | ||
891 | mov esi, eax | ||
892 | xor eax, edi | ||
893 | and eax, 003fc03fch | ||
894 | xor esi, eax | ||
895 | xor edi, eax | ||
896 | ; | ||
897 | rol esi, 10 | ||
898 | mov eax, esi | ||
899 | xor esi, edi | ||
900 | and esi, 033333333h | ||
901 | xor eax, esi | ||
902 | xor edi, esi | ||
903 | ; | ||
904 | rol edi, 18 | ||
905 | mov esi, edi | ||
906 | xor edi, eax | ||
907 | and edi, 0fff0000fh | ||
908 | xor esi, edi | ||
909 | xor eax, edi | ||
910 | ; | ||
911 | rol esi, 12 | ||
912 | mov edi, esi | ||
913 | xor esi, eax | ||
914 | and esi, 0f0f0f0f0h | ||
915 | xor edi, esi | ||
916 | xor eax, esi | ||
917 | ; | ||
918 | ror eax, 4 | ||
919 | mov DWORD PTR [edx],eax | ||
920 | mov DWORD PTR 4[edx],edi | ||
921 | pop ecx | ||
922 | pop edi | ||
923 | pop esi | ||
924 | pop ebx | ||
925 | pop ebp | ||
926 | ret | ||
927 | _fcrypt_body ENDP | ||
928 | _TEXT ENDS | ||
929 | END | ||
diff --git a/src/lib/libssl/src/crypto/des/des.c b/src/lib/libssl/src/crypto/des/des.c index 91d7153b34..0197489c9e 100644 --- a/src/lib/libssl/src/crypto/des/des.c +++ b/src/lib/libssl/src/crypto/des/des.c | |||
@@ -58,6 +58,7 @@ | |||
58 | 58 | ||
59 | #include <stdio.h> | 59 | #include <stdio.h> |
60 | #include <stdlib.h> | 60 | #include <stdlib.h> |
61 | #include <string.h> | ||
61 | #ifndef MSDOS | 62 | #ifndef MSDOS |
62 | #ifndef VMS | 63 | #ifndef VMS |
63 | #include <openssl/opensslconf.h> | 64 | #include <openssl/opensslconf.h> |
@@ -69,7 +70,7 @@ | |||
69 | #include <math.h> | 70 | #include <math.h> |
70 | #endif /* __DECC */ | 71 | #endif /* __DECC */ |
71 | #endif /* VMS */ | 72 | #endif /* VMS */ |
72 | #else | 73 | #else /* MSDOS */ |
73 | #include <io.h> | 74 | #include <io.h> |
74 | #endif | 75 | #endif |
75 | 76 | ||
@@ -88,10 +89,6 @@ | |||
88 | #include <openssl/des.h> | 89 | #include <openssl/des.h> |
89 | #include <openssl/rand.h> | 90 | #include <openssl/rand.h> |
90 | 91 | ||
91 | #if defined(__STDC__) || defined(VMS) || defined(M_XENIX) || defined(MSDOS) | ||
92 | #include <string.h> | ||
93 | #endif | ||
94 | |||
95 | void usage(void); | 92 | void usage(void); |
96 | void doencryption(void); | 93 | void doencryption(void); |
97 | int uufwrite(unsigned char *data, int size, unsigned int num, FILE *fp); | 94 | int uufwrite(unsigned char *data, int size, unsigned int num, FILE *fp); |
diff --git a/src/lib/libssl/src/crypto/des/des.h b/src/lib/libssl/src/crypto/des/des.h index 98a9c4127c..ead67986d9 100644 --- a/src/lib/libssl/src/crypto/des/des.h +++ b/src/lib/libssl/src/crypto/des/des.h | |||
@@ -78,10 +78,7 @@ extern "C" { | |||
78 | typedef unsigned char des_cblock[8]; | 78 | typedef unsigned char des_cblock[8]; |
79 | typedef /* const */ unsigned char const_des_cblock[8]; | 79 | typedef /* const */ unsigned char const_des_cblock[8]; |
80 | /* With "const", gcc 2.8.1 on Solaris thinks that des_cblock * | 80 | /* With "const", gcc 2.8.1 on Solaris thinks that des_cblock * |
81 | * and const_des_cblock * are incompatible pointer types. | 81 | * and const_des_cblock * are incompatible pointer types. */ |
82 | * I haven't seen that warning on other systems ... I'll look | ||
83 | * what the standard says. */ | ||
84 | |||
85 | 82 | ||
86 | typedef struct des_ks_struct | 83 | typedef struct des_ks_struct |
87 | { | 84 | { |
@@ -141,8 +138,26 @@ void des_cfb_encrypt(const unsigned char *in,unsigned char *out,int numbits, | |||
141 | int enc); | 138 | int enc); |
142 | void des_ecb_encrypt(const_des_cblock *input,des_cblock *output, | 139 | void des_ecb_encrypt(const_des_cblock *input,des_cblock *output, |
143 | des_key_schedule ks,int enc); | 140 | des_key_schedule ks,int enc); |
141 | |||
142 | /* This is the DES encryption function that gets called by just about | ||
143 | every other DES routine in the library. You should not use this | ||
144 | function except to implement 'modes' of DES. I say this because the | ||
145 | functions that call this routine do the conversion from 'char *' to | ||
146 | long, and this needs to be done to make sure 'non-aligned' memory | ||
147 | access do not occur. The characters are loaded 'little endian'. | ||
148 | Data is a pointer to 2 unsigned long's and ks is the | ||
149 | des_key_schedule to use. enc, is non zero specifies encryption, | ||
150 | zero if decryption. */ | ||
144 | void des_encrypt(DES_LONG *data,des_key_schedule ks, int enc); | 151 | void des_encrypt(DES_LONG *data,des_key_schedule ks, int enc); |
152 | |||
153 | /* This functions is the same as des_encrypt() except that the DES | ||
154 | initial permutation (IP) and final permutation (FP) have been left | ||
155 | out. As for des_encrypt(), you should not use this function. | ||
156 | It is used by the routines in the library that implement triple DES. | ||
157 | IP() des_encrypt2() des_encrypt2() des_encrypt2() FP() is the same | ||
158 | as des_encrypt() des_encrypt() des_encrypt() except faster :-). */ | ||
145 | void des_encrypt2(DES_LONG *data,des_key_schedule ks, int enc); | 159 | void des_encrypt2(DES_LONG *data,des_key_schedule ks, int enc); |
160 | |||
146 | void des_encrypt3(DES_LONG *data, des_key_schedule ks1, | 161 | void des_encrypt3(DES_LONG *data, des_key_schedule ks1, |
147 | des_key_schedule ks2, des_key_schedule ks3); | 162 | des_key_schedule ks2, des_key_schedule ks3); |
148 | void des_decrypt3(DES_LONG *data, des_key_schedule ks1, | 163 | void des_decrypt3(DES_LONG *data, des_key_schedule ks1, |
@@ -192,6 +207,7 @@ int des_read_2passwords(des_cblock *key1,des_cblock *key2, | |||
192 | const char *prompt,int verify); | 207 | const char *prompt,int verify); |
193 | int des_read_pw_string(char *buf,int length,const char *prompt,int verify); | 208 | int des_read_pw_string(char *buf,int length,const char *prompt,int verify); |
194 | void des_set_odd_parity(des_cblock *key); | 209 | void des_set_odd_parity(des_cblock *key); |
210 | int des_check_key_parity(const_des_cblock *key); | ||
195 | int des_is_weak_key(const_des_cblock *key); | 211 | int des_is_weak_key(const_des_cblock *key); |
196 | /* des_set_key (= set_key = des_key_sched = key_sched) calls | 212 | /* des_set_key (= set_key = des_key_sched = key_sched) calls |
197 | * des_set_key_checked if global variable des_check_key is set, | 213 | * des_set_key_checked if global variable des_check_key is set, |
@@ -209,9 +225,6 @@ void des_ofb64_encrypt(const unsigned char *in,unsigned char *out,long length, | |||
209 | des_key_schedule schedule,des_cblock *ivec,int *num); | 225 | des_key_schedule schedule,des_cblock *ivec,int *num); |
210 | int des_read_pw(char *buf,char *buff,int size,const char *prompt,int verify); | 226 | int des_read_pw(char *buf,char *buff,int size,const char *prompt,int verify); |
211 | 227 | ||
212 | /* Extra functions from Mark Murray <mark@grondar.za> */ | ||
213 | void des_cblock_print_file(const_des_cblock *cb, FILE *fp); | ||
214 | |||
215 | /* The following definitions provide compatibility with the MIT Kerberos | 228 | /* The following definitions provide compatibility with the MIT Kerberos |
216 | * library. The des_key_schedule structure is not binary compatible. */ | 229 | * library. The des_key_schedule structure is not binary compatible. */ |
217 | 230 | ||
@@ -241,11 +254,11 @@ void des_cblock_print_file(const_des_cblock *cb, FILE *fp); | |||
241 | # define xcbc_encrypt des_xcbc_encrypt | 254 | # define xcbc_encrypt des_xcbc_encrypt |
242 | # define cbc_cksum des_cbc_cksum | 255 | # define cbc_cksum des_cbc_cksum |
243 | # define quad_cksum des_quad_cksum | 256 | # define quad_cksum des_quad_cksum |
257 | # define check_parity des_check_key_parity | ||
244 | #endif | 258 | #endif |
245 | 259 | ||
246 | typedef des_key_schedule bit_64; | 260 | typedef des_key_schedule bit_64; |
247 | #define des_fixup_key_parity des_set_odd_parity | 261 | #define des_fixup_key_parity des_set_odd_parity |
248 | #define des_check_key_parity check_parity | ||
249 | 262 | ||
250 | #ifdef __cplusplus | 263 | #ifdef __cplusplus |
251 | } | 264 | } |
diff --git a/src/lib/libssl/src/crypto/des/des.man b/src/lib/libssl/src/crypto/des/des.man index 7e06a1851a..e69de29bb2 100644 --- a/src/lib/libssl/src/crypto/des/des.man +++ b/src/lib/libssl/src/crypto/des/des.man | |||
@@ -1,186 +0,0 @@ | |||
1 | .TH DES 1 | ||
2 | .SH NAME | ||
3 | des - encrypt or decrypt data using Data Encryption Standard | ||
4 | .SH SYNOPSIS | ||
5 | .B des | ||
6 | ( | ||
7 | .B \-e | ||
8 | | | ||
9 | .B \-E | ||
10 | ) | ( | ||
11 | .B \-d | ||
12 | | | ||
13 | .B \-D | ||
14 | ) | ( | ||
15 | .B \-\fR[\fPcC\fR][\fPckname\fR]\fP | ||
16 | ) | | ||
17 | [ | ||
18 | .B \-b3hfs | ||
19 | ] [ | ||
20 | .B \-k | ||
21 | .I key | ||
22 | ] | ||
23 | ] [ | ||
24 | .B \-u\fR[\fIuuname\fR] | ||
25 | [ | ||
26 | .I input-file | ||
27 | [ | ||
28 | .I output-file | ||
29 | ] ] | ||
30 | .SH DESCRIPTION | ||
31 | .B des | ||
32 | encrypts and decrypts data using the | ||
33 | Data Encryption Standard algorithm. | ||
34 | One of | ||
35 | .B \-e, \-E | ||
36 | (for encrypt) or | ||
37 | .B \-d, \-D | ||
38 | (for decrypt) must be specified. | ||
39 | It is also possible to use | ||
40 | .B \-c | ||
41 | or | ||
42 | .B \-C | ||
43 | in conjunction or instead of the a encrypt/decrypt option to generate | ||
44 | a 16 character hexadecimal checksum, generated via the | ||
45 | .I des_cbc_cksum. | ||
46 | .LP | ||
47 | Two standard encryption modes are supported by the | ||
48 | .B des | ||
49 | program, Cipher Block Chaining (the default) and Electronic Code Book | ||
50 | (specified with | ||
51 | .B \-b | ||
52 | ). | ||
53 | .LP | ||
54 | The key used for the DES | ||
55 | algorithm is obtained by prompting the user unless the | ||
56 | .B `\-k | ||
57 | .I key' | ||
58 | option is given. | ||
59 | If the key is an argument to the | ||
60 | .B des | ||
61 | command, it is potentially visible to users executing | ||
62 | .BR ps (1) | ||
63 | or a derivative. To minimise this possibility, | ||
64 | .B des | ||
65 | takes care to destroy the key argument immediately upon entry. | ||
66 | If your shell keeps a history file be careful to make sure it is not | ||
67 | world readable. | ||
68 | .LP | ||
69 | Since this program attempts to maintain compatability with sunOS's | ||
70 | des(1) command, there are 2 different methods used to convert the user | ||
71 | supplied key to a des key. | ||
72 | Whenever and one or more of | ||
73 | .B \-E, \-D, \-C | ||
74 | or | ||
75 | .B \-3 | ||
76 | options are used, the key conversion procedure will not be compatible | ||
77 | with the sunOS des(1) version but will use all the user supplied | ||
78 | character to generate the des key. | ||
79 | .B des | ||
80 | command reads from standard input unless | ||
81 | .I input-file | ||
82 | is specified and writes to standard output unless | ||
83 | .I output-file | ||
84 | is given. | ||
85 | .SH OPTIONS | ||
86 | .TP | ||
87 | .B \-b | ||
88 | Select ECB | ||
89 | (eight bytes at a time) encryption mode. | ||
90 | .TP | ||
91 | .B \-3 | ||
92 | Encrypt using triple encryption. | ||
93 | By default triple cbc encryption is used but if the | ||
94 | .B \-b | ||
95 | option is used then triple ecb encryption is performed. | ||
96 | If the key is less than 8 characters long, the flag has no effect. | ||
97 | .TP | ||
98 | .B \-e | ||
99 | Encrypt data using an 8 byte key in a manner compatible with sunOS | ||
100 | des(1). | ||
101 | .TP | ||
102 | .B \-E | ||
103 | Encrypt data using a key of nearly unlimited length (1024 bytes). | ||
104 | This will product a more secure encryption. | ||
105 | .TP | ||
106 | .B \-d | ||
107 | Decrypt data that was encrypted with the \-e option. | ||
108 | .TP | ||
109 | .B \-D | ||
110 | Decrypt data that was encrypted with the \-E option. | ||
111 | .TP | ||
112 | .B \-c | ||
113 | Generate a 16 character hexadecimal cbc checksum and output this to | ||
114 | stderr. | ||
115 | If a filename was specified after the | ||
116 | .B \-c | ||
117 | option, the checksum is output to that file. | ||
118 | The checksum is generated using a key generated in a sunOS compatible | ||
119 | manner. | ||
120 | .TP | ||
121 | .B \-C | ||
122 | A cbc checksum is generated in the same manner as described for the | ||
123 | .B \-c | ||
124 | option but the DES key is generated in the same manner as used for the | ||
125 | .B \-E | ||
126 | and | ||
127 | .B \-D | ||
128 | options | ||
129 | .TP | ||
130 | .B \-f | ||
131 | Does nothing - allowed for compatibility with sunOS des(1) command. | ||
132 | .TP | ||
133 | .B \-s | ||
134 | Does nothing - allowed for compatibility with sunOS des(1) command. | ||
135 | .TP | ||
136 | .B "\-k \fIkey\fP" | ||
137 | Use the encryption | ||
138 | .I key | ||
139 | specified. | ||
140 | .TP | ||
141 | .B "\-h" | ||
142 | The | ||
143 | .I key | ||
144 | is assumed to be a 16 character hexadecimal number. | ||
145 | If the | ||
146 | .B "\-3" | ||
147 | option is used the key is assumed to be a 32 character hexadecimal | ||
148 | number. | ||
149 | .TP | ||
150 | .B \-u | ||
151 | This flag is used to read and write uuencoded files. If decrypting, | ||
152 | the input file is assumed to contain uuencoded, DES encrypted data. | ||
153 | If encrypting, the characters following the -u are used as the name of | ||
154 | the uuencoded file to embed in the begin line of the uuencoded | ||
155 | output. If there is no name specified after the -u, the name text.des | ||
156 | will be embedded in the header. | ||
157 | .SH SEE ALSO | ||
158 | .B ps (1) | ||
159 | .B des_crypt(3) | ||
160 | .SH BUGS | ||
161 | .LP | ||
162 | The problem with using the | ||
163 | .B -e | ||
164 | option is the short key length. | ||
165 | It would be better to use a real 56-bit key rather than an | ||
166 | ASCII-based 56-bit pattern. Knowing that the key was derived from ASCII | ||
167 | radically reduces the time necessary for a brute-force cryptographic attack. | ||
168 | My attempt to remove this problem is to add an alternative text-key to | ||
169 | DES-key function. This alternative function (accessed via | ||
170 | .B -E, -D, -S | ||
171 | and | ||
172 | .B -3 | ||
173 | ) | ||
174 | uses DES to help generate the key. | ||
175 | .LP | ||
176 | Be carefully when using the -u option. Doing des -ud <filename> will | ||
177 | not decrypt filename (the -u option will gobble the d option). | ||
178 | .LP | ||
179 | The VMS operating system operates in a world where files are always a | ||
180 | multiple of 512 bytes. This causes problems when encrypted data is | ||
181 | send from unix to VMS since a 88 byte file will suddenly be padded | ||
182 | with 424 null bytes. To get around this problem, use the -u option | ||
183 | to uuencode the data before it is send to the VMS system. | ||
184 | .SH AUTHOR | ||
185 | .LP | ||
186 | Eric Young (eay@cryptsoft.com) | ||
diff --git a/src/lib/libssl/src/crypto/des/des.pl b/src/lib/libssl/src/crypto/des/des.pl index 8a3f7e3ed6..e69de29bb2 100644 --- a/src/lib/libssl/src/crypto/des/des.pl +++ b/src/lib/libssl/src/crypto/des/des.pl | |||
@@ -1,552 +0,0 @@ | |||
1 | #!/usr/local/bin/perl | ||
2 | # des.pl - eric young 22/11/1991 eay@cryptsoft.com | ||
3 | # | ||
4 | # Copyright (C) 1993 Eric Young | ||
5 | # | ||
6 | # 11 April 1996 - patched to circumvent Perl 5 (through 5.002) problem | ||
7 | # with sign-extension on right shift operations. | ||
8 | # Ed Kubaitis - ejk@uiuc.edu | ||
9 | # | ||
10 | # eay - 92/08/31 - I think I have fixed all problems for 64bit | ||
11 | # versions of perl but I could be wrong since I have not tested it yet :-). | ||
12 | # | ||
13 | # This is an implementation of DES in perl. | ||
14 | # The two routines (des_set_key and des_ecb_encrypt) | ||
15 | # take 8 byte objects as arguments. | ||
16 | # | ||
17 | # des_set_key takes an 8 byte string as a key and returns a key schedule | ||
18 | # for use in calls to des_ecb_encrypt. | ||
19 | # des_ecb_encrypt takes three arguments, the first is a key schedule | ||
20 | # (make sure to pass it by reference with the *), the second is 1 | ||
21 | # to encrypt, 0 to decrypt. The third argument is an 8 byte object | ||
22 | # to encrypt. The function returns an 8 byte object that has been | ||
23 | # DES encrypted. | ||
24 | # | ||
25 | # example: | ||
26 | # require 'des.pl' | ||
27 | # | ||
28 | # $key =pack("C8",0x12,0x23,0x45,0x67,0x89,0xab,0xcd,0xef); | ||
29 | # @ks= &des_set_key($key); | ||
30 | # | ||
31 | # $outbytes= &des_ecb_encrypt(*ks,1,$data); | ||
32 | # @enc =unpack("C8",$outbytes); | ||
33 | # | ||
34 | |||
35 | package des; | ||
36 | |||
37 | eval("use integer;") if (int($]) > 4); | ||
38 | |||
39 | # The following 8 arrays are used in des_set_key | ||
40 | @skb0=( | ||
41 | # for C bits (numbered as per FIPS 46) 1 2 3 4 5 6 | ||
42 | 0x00000000,0x00000010,0x20000000,0x20000010, | ||
43 | 0x00010000,0x00010010,0x20010000,0x20010010, | ||
44 | 0x00000800,0x00000810,0x20000800,0x20000810, | ||
45 | 0x00010800,0x00010810,0x20010800,0x20010810, | ||
46 | 0x00000020,0x00000030,0x20000020,0x20000030, | ||
47 | 0x00010020,0x00010030,0x20010020,0x20010030, | ||
48 | 0x00000820,0x00000830,0x20000820,0x20000830, | ||
49 | 0x00010820,0x00010830,0x20010820,0x20010830, | ||
50 | 0x00080000,0x00080010,0x20080000,0x20080010, | ||
51 | 0x00090000,0x00090010,0x20090000,0x20090010, | ||
52 | 0x00080800,0x00080810,0x20080800,0x20080810, | ||
53 | 0x00090800,0x00090810,0x20090800,0x20090810, | ||
54 | 0x00080020,0x00080030,0x20080020,0x20080030, | ||
55 | 0x00090020,0x00090030,0x20090020,0x20090030, | ||
56 | 0x00080820,0x00080830,0x20080820,0x20080830, | ||
57 | 0x00090820,0x00090830,0x20090820,0x20090830, | ||
58 | ); | ||
59 | @skb1=( | ||
60 | # for C bits (numbered as per FIPS 46) 7 8 10 11 12 13 | ||
61 | 0x00000000,0x02000000,0x00002000,0x02002000, | ||
62 | 0x00200000,0x02200000,0x00202000,0x02202000, | ||
63 | 0x00000004,0x02000004,0x00002004,0x02002004, | ||
64 | 0x00200004,0x02200004,0x00202004,0x02202004, | ||
65 | 0x00000400,0x02000400,0x00002400,0x02002400, | ||
66 | 0x00200400,0x02200400,0x00202400,0x02202400, | ||
67 | 0x00000404,0x02000404,0x00002404,0x02002404, | ||
68 | 0x00200404,0x02200404,0x00202404,0x02202404, | ||
69 | 0x10000000,0x12000000,0x10002000,0x12002000, | ||
70 | 0x10200000,0x12200000,0x10202000,0x12202000, | ||
71 | 0x10000004,0x12000004,0x10002004,0x12002004, | ||
72 | 0x10200004,0x12200004,0x10202004,0x12202004, | ||
73 | 0x10000400,0x12000400,0x10002400,0x12002400, | ||
74 | 0x10200400,0x12200400,0x10202400,0x12202400, | ||
75 | 0x10000404,0x12000404,0x10002404,0x12002404, | ||
76 | 0x10200404,0x12200404,0x10202404,0x12202404, | ||
77 | ); | ||
78 | @skb2=( | ||
79 | # for C bits (numbered as per FIPS 46) 14 15 16 17 19 20 | ||
80 | 0x00000000,0x00000001,0x00040000,0x00040001, | ||
81 | 0x01000000,0x01000001,0x01040000,0x01040001, | ||
82 | 0x00000002,0x00000003,0x00040002,0x00040003, | ||
83 | 0x01000002,0x01000003,0x01040002,0x01040003, | ||
84 | 0x00000200,0x00000201,0x00040200,0x00040201, | ||
85 | 0x01000200,0x01000201,0x01040200,0x01040201, | ||
86 | 0x00000202,0x00000203,0x00040202,0x00040203, | ||
87 | 0x01000202,0x01000203,0x01040202,0x01040203, | ||
88 | 0x08000000,0x08000001,0x08040000,0x08040001, | ||
89 | 0x09000000,0x09000001,0x09040000,0x09040001, | ||
90 | 0x08000002,0x08000003,0x08040002,0x08040003, | ||
91 | 0x09000002,0x09000003,0x09040002,0x09040003, | ||
92 | 0x08000200,0x08000201,0x08040200,0x08040201, | ||
93 | 0x09000200,0x09000201,0x09040200,0x09040201, | ||
94 | 0x08000202,0x08000203,0x08040202,0x08040203, | ||
95 | 0x09000202,0x09000203,0x09040202,0x09040203, | ||
96 | ); | ||
97 | @skb3=( | ||
98 | # for C bits (numbered as per FIPS 46) 21 23 24 26 27 28 | ||
99 | 0x00000000,0x00100000,0x00000100,0x00100100, | ||
100 | 0x00000008,0x00100008,0x00000108,0x00100108, | ||
101 | 0x00001000,0x00101000,0x00001100,0x00101100, | ||
102 | 0x00001008,0x00101008,0x00001108,0x00101108, | ||
103 | 0x04000000,0x04100000,0x04000100,0x04100100, | ||
104 | 0x04000008,0x04100008,0x04000108,0x04100108, | ||
105 | 0x04001000,0x04101000,0x04001100,0x04101100, | ||
106 | 0x04001008,0x04101008,0x04001108,0x04101108, | ||
107 | 0x00020000,0x00120000,0x00020100,0x00120100, | ||
108 | 0x00020008,0x00120008,0x00020108,0x00120108, | ||
109 | 0x00021000,0x00121000,0x00021100,0x00121100, | ||
110 | 0x00021008,0x00121008,0x00021108,0x00121108, | ||
111 | 0x04020000,0x04120000,0x04020100,0x04120100, | ||
112 | 0x04020008,0x04120008,0x04020108,0x04120108, | ||
113 | 0x04021000,0x04121000,0x04021100,0x04121100, | ||
114 | 0x04021008,0x04121008,0x04021108,0x04121108, | ||
115 | ); | ||
116 | @skb4=( | ||
117 | # for D bits (numbered as per FIPS 46) 1 2 3 4 5 6 | ||
118 | 0x00000000,0x10000000,0x00010000,0x10010000, | ||
119 | 0x00000004,0x10000004,0x00010004,0x10010004, | ||
120 | 0x20000000,0x30000000,0x20010000,0x30010000, | ||
121 | 0x20000004,0x30000004,0x20010004,0x30010004, | ||
122 | 0x00100000,0x10100000,0x00110000,0x10110000, | ||
123 | 0x00100004,0x10100004,0x00110004,0x10110004, | ||
124 | 0x20100000,0x30100000,0x20110000,0x30110000, | ||
125 | 0x20100004,0x30100004,0x20110004,0x30110004, | ||
126 | 0x00001000,0x10001000,0x00011000,0x10011000, | ||
127 | 0x00001004,0x10001004,0x00011004,0x10011004, | ||
128 | 0x20001000,0x30001000,0x20011000,0x30011000, | ||
129 | 0x20001004,0x30001004,0x20011004,0x30011004, | ||
130 | 0x00101000,0x10101000,0x00111000,0x10111000, | ||
131 | 0x00101004,0x10101004,0x00111004,0x10111004, | ||
132 | 0x20101000,0x30101000,0x20111000,0x30111000, | ||
133 | 0x20101004,0x30101004,0x20111004,0x30111004, | ||
134 | ); | ||
135 | @skb5=( | ||
136 | # for D bits (numbered as per FIPS 46) 8 9 11 12 13 14 | ||
137 | 0x00000000,0x08000000,0x00000008,0x08000008, | ||
138 | 0x00000400,0x08000400,0x00000408,0x08000408, | ||
139 | 0x00020000,0x08020000,0x00020008,0x08020008, | ||
140 | 0x00020400,0x08020400,0x00020408,0x08020408, | ||
141 | 0x00000001,0x08000001,0x00000009,0x08000009, | ||
142 | 0x00000401,0x08000401,0x00000409,0x08000409, | ||
143 | 0x00020001,0x08020001,0x00020009,0x08020009, | ||
144 | 0x00020401,0x08020401,0x00020409,0x08020409, | ||
145 | 0x02000000,0x0A000000,0x02000008,0x0A000008, | ||
146 | 0x02000400,0x0A000400,0x02000408,0x0A000408, | ||
147 | 0x02020000,0x0A020000,0x02020008,0x0A020008, | ||
148 | 0x02020400,0x0A020400,0x02020408,0x0A020408, | ||
149 | 0x02000001,0x0A000001,0x02000009,0x0A000009, | ||
150 | 0x02000401,0x0A000401,0x02000409,0x0A000409, | ||
151 | 0x02020001,0x0A020001,0x02020009,0x0A020009, | ||
152 | 0x02020401,0x0A020401,0x02020409,0x0A020409, | ||
153 | ); | ||
154 | @skb6=( | ||
155 | # for D bits (numbered as per FIPS 46) 16 17 18 19 20 21 | ||
156 | 0x00000000,0x00000100,0x00080000,0x00080100, | ||
157 | 0x01000000,0x01000100,0x01080000,0x01080100, | ||
158 | 0x00000010,0x00000110,0x00080010,0x00080110, | ||
159 | 0x01000010,0x01000110,0x01080010,0x01080110, | ||
160 | 0x00200000,0x00200100,0x00280000,0x00280100, | ||
161 | 0x01200000,0x01200100,0x01280000,0x01280100, | ||
162 | 0x00200010,0x00200110,0x00280010,0x00280110, | ||
163 | 0x01200010,0x01200110,0x01280010,0x01280110, | ||
164 | 0x00000200,0x00000300,0x00080200,0x00080300, | ||
165 | 0x01000200,0x01000300,0x01080200,0x01080300, | ||
166 | 0x00000210,0x00000310,0x00080210,0x00080310, | ||
167 | 0x01000210,0x01000310,0x01080210,0x01080310, | ||
168 | 0x00200200,0x00200300,0x00280200,0x00280300, | ||
169 | 0x01200200,0x01200300,0x01280200,0x01280300, | ||
170 | 0x00200210,0x00200310,0x00280210,0x00280310, | ||
171 | 0x01200210,0x01200310,0x01280210,0x01280310, | ||
172 | ); | ||
173 | @skb7=( | ||
174 | # for D bits (numbered as per FIPS 46) 22 23 24 25 27 28 | ||
175 | 0x00000000,0x04000000,0x00040000,0x04040000, | ||
176 | 0x00000002,0x04000002,0x00040002,0x04040002, | ||
177 | 0x00002000,0x04002000,0x00042000,0x04042000, | ||
178 | 0x00002002,0x04002002,0x00042002,0x04042002, | ||
179 | 0x00000020,0x04000020,0x00040020,0x04040020, | ||
180 | 0x00000022,0x04000022,0x00040022,0x04040022, | ||
181 | 0x00002020,0x04002020,0x00042020,0x04042020, | ||
182 | 0x00002022,0x04002022,0x00042022,0x04042022, | ||
183 | 0x00000800,0x04000800,0x00040800,0x04040800, | ||
184 | 0x00000802,0x04000802,0x00040802,0x04040802, | ||
185 | 0x00002800,0x04002800,0x00042800,0x04042800, | ||
186 | 0x00002802,0x04002802,0x00042802,0x04042802, | ||
187 | 0x00000820,0x04000820,0x00040820,0x04040820, | ||
188 | 0x00000822,0x04000822,0x00040822,0x04040822, | ||
189 | 0x00002820,0x04002820,0x00042820,0x04042820, | ||
190 | 0x00002822,0x04002822,0x00042822,0x04042822, | ||
191 | ); | ||
192 | |||
193 | @shifts2=(0,0,1,1,1,1,1,1,0,1,1,1,1,1,1,0); | ||
194 | |||
195 | # used in ecb_encrypt | ||
196 | @SP0=( | ||
197 | 0x00410100, 0x00010000, 0x40400000, 0x40410100, | ||
198 | 0x00400000, 0x40010100, 0x40010000, 0x40400000, | ||
199 | 0x40010100, 0x00410100, 0x00410000, 0x40000100, | ||
200 | 0x40400100, 0x00400000, 0x00000000, 0x40010000, | ||
201 | 0x00010000, 0x40000000, 0x00400100, 0x00010100, | ||
202 | 0x40410100, 0x00410000, 0x40000100, 0x00400100, | ||
203 | 0x40000000, 0x00000100, 0x00010100, 0x40410000, | ||
204 | 0x00000100, 0x40400100, 0x40410000, 0x00000000, | ||
205 | 0x00000000, 0x40410100, 0x00400100, 0x40010000, | ||
206 | 0x00410100, 0x00010000, 0x40000100, 0x00400100, | ||
207 | 0x40410000, 0x00000100, 0x00010100, 0x40400000, | ||
208 | 0x40010100, 0x40000000, 0x40400000, 0x00410000, | ||
209 | 0x40410100, 0x00010100, 0x00410000, 0x40400100, | ||
210 | 0x00400000, 0x40000100, 0x40010000, 0x00000000, | ||
211 | 0x00010000, 0x00400000, 0x40400100, 0x00410100, | ||
212 | 0x40000000, 0x40410000, 0x00000100, 0x40010100, | ||
213 | ); | ||
214 | @SP1=( | ||
215 | 0x08021002, 0x00000000, 0x00021000, 0x08020000, | ||
216 | 0x08000002, 0x00001002, 0x08001000, 0x00021000, | ||
217 | 0x00001000, 0x08020002, 0x00000002, 0x08001000, | ||
218 | 0x00020002, 0x08021000, 0x08020000, 0x00000002, | ||
219 | 0x00020000, 0x08001002, 0x08020002, 0x00001000, | ||
220 | 0x00021002, 0x08000000, 0x00000000, 0x00020002, | ||
221 | 0x08001002, 0x00021002, 0x08021000, 0x08000002, | ||
222 | 0x08000000, 0x00020000, 0x00001002, 0x08021002, | ||
223 | 0x00020002, 0x08021000, 0x08001000, 0x00021002, | ||
224 | 0x08021002, 0x00020002, 0x08000002, 0x00000000, | ||
225 | 0x08000000, 0x00001002, 0x00020000, 0x08020002, | ||
226 | 0x00001000, 0x08000000, 0x00021002, 0x08001002, | ||
227 | 0x08021000, 0x00001000, 0x00000000, 0x08000002, | ||
228 | 0x00000002, 0x08021002, 0x00021000, 0x08020000, | ||
229 | 0x08020002, 0x00020000, 0x00001002, 0x08001000, | ||
230 | 0x08001002, 0x00000002, 0x08020000, 0x00021000, | ||
231 | ); | ||
232 | @SP2=( | ||
233 | 0x20800000, 0x00808020, 0x00000020, 0x20800020, | ||
234 | 0x20008000, 0x00800000, 0x20800020, 0x00008020, | ||
235 | 0x00800020, 0x00008000, 0x00808000, 0x20000000, | ||
236 | 0x20808020, 0x20000020, 0x20000000, 0x20808000, | ||
237 | 0x00000000, 0x20008000, 0x00808020, 0x00000020, | ||
238 | 0x20000020, 0x20808020, 0x00008000, 0x20800000, | ||
239 | 0x20808000, 0x00800020, 0x20008020, 0x00808000, | ||
240 | 0x00008020, 0x00000000, 0x00800000, 0x20008020, | ||
241 | 0x00808020, 0x00000020, 0x20000000, 0x00008000, | ||
242 | 0x20000020, 0x20008000, 0x00808000, 0x20800020, | ||
243 | 0x00000000, 0x00808020, 0x00008020, 0x20808000, | ||
244 | 0x20008000, 0x00800000, 0x20808020, 0x20000000, | ||
245 | 0x20008020, 0x20800000, 0x00800000, 0x20808020, | ||
246 | 0x00008000, 0x00800020, 0x20800020, 0x00008020, | ||
247 | 0x00800020, 0x00000000, 0x20808000, 0x20000020, | ||
248 | 0x20800000, 0x20008020, 0x00000020, 0x00808000, | ||
249 | ); | ||
250 | @SP3=( | ||
251 | 0x00080201, 0x02000200, 0x00000001, 0x02080201, | ||
252 | 0x00000000, 0x02080000, 0x02000201, 0x00080001, | ||
253 | 0x02080200, 0x02000001, 0x02000000, 0x00000201, | ||
254 | 0x02000001, 0x00080201, 0x00080000, 0x02000000, | ||
255 | 0x02080001, 0x00080200, 0x00000200, 0x00000001, | ||
256 | 0x00080200, 0x02000201, 0x02080000, 0x00000200, | ||
257 | 0x00000201, 0x00000000, 0x00080001, 0x02080200, | ||
258 | 0x02000200, 0x02080001, 0x02080201, 0x00080000, | ||
259 | 0x02080001, 0x00000201, 0x00080000, 0x02000001, | ||
260 | 0x00080200, 0x02000200, 0x00000001, 0x02080000, | ||
261 | 0x02000201, 0x00000000, 0x00000200, 0x00080001, | ||
262 | 0x00000000, 0x02080001, 0x02080200, 0x00000200, | ||
263 | 0x02000000, 0x02080201, 0x00080201, 0x00080000, | ||
264 | 0x02080201, 0x00000001, 0x02000200, 0x00080201, | ||
265 | 0x00080001, 0x00080200, 0x02080000, 0x02000201, | ||
266 | 0x00000201, 0x02000000, 0x02000001, 0x02080200, | ||
267 | ); | ||
268 | @SP4=( | ||
269 | 0x01000000, 0x00002000, 0x00000080, 0x01002084, | ||
270 | 0x01002004, 0x01000080, 0x00002084, 0x01002000, | ||
271 | 0x00002000, 0x00000004, 0x01000004, 0x00002080, | ||
272 | 0x01000084, 0x01002004, 0x01002080, 0x00000000, | ||
273 | 0x00002080, 0x01000000, 0x00002004, 0x00000084, | ||
274 | 0x01000080, 0x00002084, 0x00000000, 0x01000004, | ||
275 | 0x00000004, 0x01000084, 0x01002084, 0x00002004, | ||
276 | 0x01002000, 0x00000080, 0x00000084, 0x01002080, | ||
277 | 0x01002080, 0x01000084, 0x00002004, 0x01002000, | ||
278 | 0x00002000, 0x00000004, 0x01000004, 0x01000080, | ||
279 | 0x01000000, 0x00002080, 0x01002084, 0x00000000, | ||
280 | 0x00002084, 0x01000000, 0x00000080, 0x00002004, | ||
281 | 0x01000084, 0x00000080, 0x00000000, 0x01002084, | ||
282 | 0x01002004, 0x01002080, 0x00000084, 0x00002000, | ||
283 | 0x00002080, 0x01002004, 0x01000080, 0x00000084, | ||
284 | 0x00000004, 0x00002084, 0x01002000, 0x01000004, | ||
285 | ); | ||
286 | @SP5=( | ||
287 | 0x10000008, 0x00040008, 0x00000000, 0x10040400, | ||
288 | 0x00040008, 0x00000400, 0x10000408, 0x00040000, | ||
289 | 0x00000408, 0x10040408, 0x00040400, 0x10000000, | ||
290 | 0x10000400, 0x10000008, 0x10040000, 0x00040408, | ||
291 | 0x00040000, 0x10000408, 0x10040008, 0x00000000, | ||
292 | 0x00000400, 0x00000008, 0x10040400, 0x10040008, | ||
293 | 0x10040408, 0x10040000, 0x10000000, 0x00000408, | ||
294 | 0x00000008, 0x00040400, 0x00040408, 0x10000400, | ||
295 | 0x00000408, 0x10000000, 0x10000400, 0x00040408, | ||
296 | 0x10040400, 0x00040008, 0x00000000, 0x10000400, | ||
297 | 0x10000000, 0x00000400, 0x10040008, 0x00040000, | ||
298 | 0x00040008, 0x10040408, 0x00040400, 0x00000008, | ||
299 | 0x10040408, 0x00040400, 0x00040000, 0x10000408, | ||
300 | 0x10000008, 0x10040000, 0x00040408, 0x00000000, | ||
301 | 0x00000400, 0x10000008, 0x10000408, 0x10040400, | ||
302 | 0x10040000, 0x00000408, 0x00000008, 0x10040008, | ||
303 | ); | ||
304 | @SP6=( | ||
305 | 0x00000800, 0x00000040, 0x00200040, 0x80200000, | ||
306 | 0x80200840, 0x80000800, 0x00000840, 0x00000000, | ||
307 | 0x00200000, 0x80200040, 0x80000040, 0x00200800, | ||
308 | 0x80000000, 0x00200840, 0x00200800, 0x80000040, | ||
309 | 0x80200040, 0x00000800, 0x80000800, 0x80200840, | ||
310 | 0x00000000, 0x00200040, 0x80200000, 0x00000840, | ||
311 | 0x80200800, 0x80000840, 0x00200840, 0x80000000, | ||
312 | 0x80000840, 0x80200800, 0x00000040, 0x00200000, | ||
313 | 0x80000840, 0x00200800, 0x80200800, 0x80000040, | ||
314 | 0x00000800, 0x00000040, 0x00200000, 0x80200800, | ||
315 | 0x80200040, 0x80000840, 0x00000840, 0x00000000, | ||
316 | 0x00000040, 0x80200000, 0x80000000, 0x00200040, | ||
317 | 0x00000000, 0x80200040, 0x00200040, 0x00000840, | ||
318 | 0x80000040, 0x00000800, 0x80200840, 0x00200000, | ||
319 | 0x00200840, 0x80000000, 0x80000800, 0x80200840, | ||
320 | 0x80200000, 0x00200840, 0x00200800, 0x80000800, | ||
321 | ); | ||
322 | @SP7=( | ||
323 | 0x04100010, 0x04104000, 0x00004010, 0x00000000, | ||
324 | 0x04004000, 0x00100010, 0x04100000, 0x04104010, | ||
325 | 0x00000010, 0x04000000, 0x00104000, 0x00004010, | ||
326 | 0x00104010, 0x04004010, 0x04000010, 0x04100000, | ||
327 | 0x00004000, 0x00104010, 0x00100010, 0x04004000, | ||
328 | 0x04104010, 0x04000010, 0x00000000, 0x00104000, | ||
329 | 0x04000000, 0x00100000, 0x04004010, 0x04100010, | ||
330 | 0x00100000, 0x00004000, 0x04104000, 0x00000010, | ||
331 | 0x00100000, 0x00004000, 0x04000010, 0x04104010, | ||
332 | 0x00004010, 0x04000000, 0x00000000, 0x00104000, | ||
333 | 0x04100010, 0x04004010, 0x04004000, 0x00100010, | ||
334 | 0x04104000, 0x00000010, 0x00100010, 0x04004000, | ||
335 | 0x04104010, 0x00100000, 0x04100000, 0x04000010, | ||
336 | 0x00104000, 0x00004010, 0x04004010, 0x04100000, | ||
337 | 0x00000010, 0x04104000, 0x00104010, 0x00000000, | ||
338 | 0x04000000, 0x04100010, 0x00004000, 0x00104010, | ||
339 | ); | ||
340 | |||
341 | sub main'des_set_key | ||
342 | { | ||
343 | local($param)=@_; | ||
344 | local(@key); | ||
345 | local($c,$d,$i,$s,$t); | ||
346 | local(@ks)=(); | ||
347 | |||
348 | # Get the bytes in the order we want. | ||
349 | @key=unpack("C8",$param); | ||
350 | |||
351 | $c= ($key[0] )| | ||
352 | ($key[1]<< 8)| | ||
353 | ($key[2]<<16)| | ||
354 | ($key[3]<<24); | ||
355 | $d= ($key[4] )| | ||
356 | ($key[5]<< 8)| | ||
357 | ($key[6]<<16)| | ||
358 | ($key[7]<<24); | ||
359 | |||
360 | &doPC1(*c,*d); | ||
361 | |||
362 | for $i (@shifts2) | ||
363 | { | ||
364 | if ($i) | ||
365 | { | ||
366 | $c=($c>>2)|($c<<26); | ||
367 | $d=($d>>2)|($d<<26); | ||
368 | } | ||
369 | else | ||
370 | { | ||
371 | $c=($c>>1)|($c<<27); | ||
372 | $d=($d>>1)|($d<<27); | ||
373 | } | ||
374 | $c&=0x0fffffff; | ||
375 | $d&=0x0fffffff; | ||
376 | $s= $skb0[ ($c )&0x3f ]| | ||
377 | $skb1[(($c>> 6)&0x03)|(($c>> 7)&0x3c)]| | ||
378 | $skb2[(($c>>13)&0x0f)|(($c>>14)&0x30)]| | ||
379 | $skb3[(($c>>20)&0x01)|(($c>>21)&0x06) | | ||
380 | (($c>>22)&0x38)]; | ||
381 | $t= $skb4[ ($d )&0x3f ]| | ||
382 | $skb5[(($d>> 7)&0x03)|(($d>> 8)&0x3c)]| | ||
383 | $skb6[ ($d>>15)&0x3f ]| | ||
384 | $skb7[(($d>>21)&0x0f)|(($d>>22)&0x30)]; | ||
385 | push(@ks,(($t<<16)|($s&0x0000ffff))&0xffffffff); | ||
386 | $s= (($s>>16)&0x0000ffff)|($t&0xffff0000) ; | ||
387 | push(@ks,(($s<<4)|(($s>>28)&0xf))&0xffffffff); | ||
388 | } | ||
389 | @ks; | ||
390 | } | ||
391 | |||
392 | sub doPC1 | ||
393 | { | ||
394 | local(*a,*b)=@_; | ||
395 | local($t); | ||
396 | |||
397 | $t=(($b>>4)^$a)&0x0f0f0f0f; | ||
398 | $b^=($t<<4); $a^=$t; | ||
399 | # do $a first | ||
400 | $t=(($a<<18)^$a)&0xcccc0000; | ||
401 | $a=$a^$t^(($t>>18)&0x00003fff); | ||
402 | $t=(($a<<17)^$a)&0xaaaa0000; | ||
403 | $a=$a^$t^(($t>>17)&0x00007fff); | ||
404 | $t=(($a<< 8)^$a)&0x00ff0000; | ||
405 | $a=$a^$t^(($t>> 8)&0x00ffffff); | ||
406 | $t=(($a<<17)^$a)&0xaaaa0000; | ||
407 | $a=$a^$t^(($t>>17)&0x00007fff); | ||
408 | |||
409 | # now do $b | ||
410 | $t=(($b<<24)^$b)&0xff000000; | ||
411 | $b=$b^$t^(($t>>24)&0x000000ff); | ||
412 | $t=(($b<< 8)^$b)&0x00ff0000; | ||
413 | $b=$b^$t^(($t>> 8)&0x00ffffff); | ||
414 | $t=(($b<<14)^$b)&0x33330000; | ||
415 | $b=$b^$t^(($t>>14)&0x0003ffff); | ||
416 | $b=(($b&0x00aa00aa)<<7)|(($b&0x55005500)>>7)|($b&0xaa55aa55); | ||
417 | $b=(($b>>8)&0x00ffffff)|((($a&0xf0000000)>>4)&0x0fffffff); | ||
418 | $a&=0x0fffffff; | ||
419 | } | ||
420 | |||
421 | sub doIP | ||
422 | { | ||
423 | local(*a,*b)=@_; | ||
424 | local($t); | ||
425 | |||
426 | $t=(($b>> 4)^$a)&0x0f0f0f0f; | ||
427 | $b^=($t<< 4); $a^=$t; | ||
428 | $t=(($a>>16)^$b)&0x0000ffff; | ||
429 | $a^=($t<<16); $b^=$t; | ||
430 | $t=(($b>> 2)^$a)&0x33333333; | ||
431 | $b^=($t<< 2); $a^=$t; | ||
432 | $t=(($a>> 8)^$b)&0x00ff00ff; | ||
433 | $a^=($t<< 8); $b^=$t; | ||
434 | $t=(($b>> 1)^$a)&0x55555555; | ||
435 | $b^=($t<< 1); $a^=$t; | ||
436 | $t=$a; | ||
437 | $a=$b&0xffffffff; | ||
438 | $b=$t&0xffffffff; | ||
439 | } | ||
440 | |||
441 | sub doFP | ||
442 | { | ||
443 | local(*a,*b)=@_; | ||
444 | local($t); | ||
445 | |||
446 | $t=(($b>> 1)^$a)&0x55555555; | ||
447 | $b^=($t<< 1); $a^=$t; | ||
448 | $t=(($a>> 8)^$b)&0x00ff00ff; | ||
449 | $a^=($t<< 8); $b^=$t; | ||
450 | $t=(($b>> 2)^$a)&0x33333333; | ||
451 | $b^=($t<< 2); $a^=$t; | ||
452 | $t=(($a>>16)^$b)&0x0000ffff; | ||
453 | $a^=($t<<16); $b^=$t; | ||
454 | $t=(($b>> 4)^$a)&0x0f0f0f0f; | ||
455 | $b^=($t<< 4); $a^=$t; | ||
456 | $a&=0xffffffff; | ||
457 | $b&=0xffffffff; | ||
458 | } | ||
459 | |||
460 | sub main'des_ecb_encrypt | ||
461 | { | ||
462 | local(*ks,$encrypt,$in)=@_; | ||
463 | local($l,$r,$i,$t,$u,@input); | ||
464 | |||
465 | @input=unpack("C8",$in); | ||
466 | # Get the bytes in the order we want. | ||
467 | $l= ($input[0] )| | ||
468 | ($input[1]<< 8)| | ||
469 | ($input[2]<<16)| | ||
470 | ($input[3]<<24); | ||
471 | $r= ($input[4] )| | ||
472 | ($input[5]<< 8)| | ||
473 | ($input[6]<<16)| | ||
474 | ($input[7]<<24); | ||
475 | |||
476 | $l&=0xffffffff; | ||
477 | $r&=0xffffffff; | ||
478 | &doIP(*l,*r); | ||
479 | if ($encrypt) | ||
480 | { | ||
481 | for ($i=0; $i<32; $i+=4) | ||
482 | { | ||
483 | $t=((($r&0x7fffffff)<<1)|(($r>>31)&0x00000001)); | ||
484 | $u=$t^$ks[$i ]; | ||
485 | $t=$t^$ks[$i+1]; | ||
486 | $t2=(($t&0x0000000f)<<28); | ||
487 | |||
488 | $t=((($t>>4)&0x0fffffff)|(($t&0x0000000f)<<28)); | ||
489 | $l^= $SP1[ $t &0x3f]| | ||
490 | $SP3[($t>> 8)&0x3f]| | ||
491 | $SP5[($t>>16)&0x3f]| | ||
492 | $SP7[($t>>24)&0x3f]| | ||
493 | $SP0[ $u &0x3f]| | ||
494 | $SP2[($u>> 8)&0x3f]| | ||
495 | $SP4[($u>>16)&0x3f]| | ||
496 | $SP6[($u>>24)&0x3f]; | ||
497 | |||
498 | $t=(($l<<1)|(($l>>31)&0x1))&0xffffffff; | ||
499 | $u=$t^$ks[$i+2]; | ||
500 | $t=$t^$ks[$i+3]; | ||
501 | $t=((($t>>4)&0x0fffffff)|($t<<28))&0xffffffff; | ||
502 | $r^= $SP1[ $t &0x3f]| | ||
503 | $SP3[($t>> 8)&0x3f]| | ||
504 | $SP5[($t>>16)&0x3f]| | ||
505 | $SP7[($t>>24)&0x3f]| | ||
506 | $SP0[ $u &0x3f]| | ||
507 | $SP2[($u>> 8)&0x3f]| | ||
508 | $SP4[($u>>16)&0x3f]| | ||
509 | $SP6[($u>>24)&0x3f]; | ||
510 | } | ||
511 | } | ||
512 | else | ||
513 | { | ||
514 | for ($i=30; $i>0; $i-=4) | ||
515 | { | ||
516 | $t=(($r<<1)|(($r>>31)&0x1))&0xffffffff; | ||
517 | $u=$t^$ks[$i ]; | ||
518 | $t=$t^$ks[$i+1]; | ||
519 | $t=((($t>>4)&0x0fffffff)|($t<<28))&0xffffffff; | ||
520 | $l^= $SP1[ $t &0x3f]| | ||
521 | $SP3[($t>> 8)&0x3f]| | ||
522 | $SP5[($t>>16)&0x3f]| | ||
523 | $SP7[($t>>24)&0x3f]| | ||
524 | $SP0[ $u &0x3f]| | ||
525 | $SP2[($u>> 8)&0x3f]| | ||
526 | $SP4[($u>>16)&0x3f]| | ||
527 | $SP6[($u>>24)&0x3f]; | ||
528 | |||
529 | $t=(($l<<1)|(($l>>31)&0x1))&0xffffffff; | ||
530 | $u=$t^$ks[$i-2]; | ||
531 | $t=$t^$ks[$i-1]; | ||
532 | $t=((($t>>4)&0x0fffffff)|($t<<28))&0xffffffff; | ||
533 | $r^= $SP1[ $t &0x3f]| | ||
534 | $SP3[($t>> 8)&0x3f]| | ||
535 | $SP5[($t>>16)&0x3f]| | ||
536 | $SP7[($t>>24)&0x3f]| | ||
537 | $SP0[ $u &0x3f]| | ||
538 | $SP2[($u>> 8)&0x3f]| | ||
539 | $SP4[($u>>16)&0x3f]| | ||
540 | $SP6[($u>>24)&0x3f]; | ||
541 | } | ||
542 | } | ||
543 | &doFP(*l,*r); | ||
544 | pack("C8",$l&0xff, | ||
545 | ($l>> 8)&0x00ffffff, | ||
546 | ($l>>16)&0x0000ffff, | ||
547 | ($l>>24)&0x000000ff, | ||
548 | $r&0xff, | ||
549 | ($r>> 8)&0x00ffffff, | ||
550 | ($r>>16)&0x0000ffff, | ||
551 | ($r>>24)&0x000000ff); | ||
552 | } | ||
diff --git a/src/lib/libssl/src/crypto/des/des.pod b/src/lib/libssl/src/crypto/des/des.pod new file mode 100644 index 0000000000..bf479e83d2 --- /dev/null +++ b/src/lib/libssl/src/crypto/des/des.pod | |||
@@ -0,0 +1,217 @@ | |||
1 | =pod | ||
2 | |||
3 | =head1 NAME | ||
4 | |||
5 | des - encrypt or decrypt data using Data Encryption Standard | ||
6 | |||
7 | =head1 SYNOPSIS | ||
8 | |||
9 | B<des> | ||
10 | ( | ||
11 | B<-e> | ||
12 | | | ||
13 | B<-E> | ||
14 | ) | ( | ||
15 | B<-d> | ||
16 | | | ||
17 | B<-D> | ||
18 | ) | ( | ||
19 | B<->[B<cC>][B<ckname>] | ||
20 | ) | | ||
21 | [ | ||
22 | B<-b3hfs> | ||
23 | ] [ | ||
24 | B<-k> | ||
25 | I<key> | ||
26 | ] | ||
27 | ] [ | ||
28 | B<-u>[I<uuname>] | ||
29 | [ | ||
30 | I<input-file> | ||
31 | [ | ||
32 | I<output-file> | ||
33 | ] ] | ||
34 | |||
35 | =head1 NOTE | ||
36 | |||
37 | This page describes the B<des> stand-alone program, not the B<openssl des> | ||
38 | command. | ||
39 | |||
40 | =head1 DESCRIPTION | ||
41 | |||
42 | B<des> | ||
43 | encrypts and decrypts data using the | ||
44 | Data Encryption Standard algorithm. | ||
45 | One of | ||
46 | B<-e>, B<-E> | ||
47 | (for encrypt) or | ||
48 | B<-d>, B<-D> | ||
49 | (for decrypt) must be specified. | ||
50 | It is also possible to use | ||
51 | B<-c> | ||
52 | or | ||
53 | B<-C> | ||
54 | in conjunction or instead of the a encrypt/decrypt option to generate | ||
55 | a 16 character hexadecimal checksum, generated via the | ||
56 | I<des_cbc_cksum>. | ||
57 | |||
58 | Two standard encryption modes are supported by the | ||
59 | B<des> | ||
60 | program, Cipher Block Chaining (the default) and Electronic Code Book | ||
61 | (specified with | ||
62 | B<-b>). | ||
63 | |||
64 | The key used for the DES | ||
65 | algorithm is obtained by prompting the user unless the | ||
66 | B<-k> | ||
67 | I<key> | ||
68 | option is given. | ||
69 | If the key is an argument to the | ||
70 | B<des> | ||
71 | command, it is potentially visible to users executing | ||
72 | ps(1) | ||
73 | or a derivative. To minimise this possibility, | ||
74 | B<des> | ||
75 | takes care to destroy the key argument immediately upon entry. | ||
76 | If your shell keeps a history file be careful to make sure it is not | ||
77 | world readable. | ||
78 | |||
79 | Since this program attempts to maintain compatibility with sunOS's | ||
80 | des(1) command, there are 2 different methods used to convert the user | ||
81 | supplied key to a des key. | ||
82 | Whenever and one or more of | ||
83 | B<-E>, B<-D>, B<-C> | ||
84 | or | ||
85 | B<-3> | ||
86 | options are used, the key conversion procedure will not be compatible | ||
87 | with the sunOS des(1) version but will use all the user supplied | ||
88 | character to generate the des key. | ||
89 | B<des> | ||
90 | command reads from standard input unless | ||
91 | I<input-file> | ||
92 | is specified and writes to standard output unless | ||
93 | I<output-file> | ||
94 | is given. | ||
95 | |||
96 | =head1 OPTIONS | ||
97 | |||
98 | =over 4 | ||
99 | |||
100 | =item B<-b> | ||
101 | |||
102 | Select ECB | ||
103 | (eight bytes at a time) encryption mode. | ||
104 | |||
105 | =item B<-3> | ||
106 | |||
107 | Encrypt using triple encryption. | ||
108 | By default triple cbc encryption is used but if the | ||
109 | B<-b> | ||
110 | option is used then triple ECB encryption is performed. | ||
111 | If the key is less than 8 characters long, the flag has no effect. | ||
112 | |||
113 | =item B<-e> | ||
114 | |||
115 | Encrypt data using an 8 byte key in a manner compatible with sunOS | ||
116 | des(1). | ||
117 | |||
118 | =item B<-E> | ||
119 | |||
120 | Encrypt data using a key of nearly unlimited length (1024 bytes). | ||
121 | This will product a more secure encryption. | ||
122 | |||
123 | =item B<-d> | ||
124 | |||
125 | Decrypt data that was encrypted with the B<-e> option. | ||
126 | |||
127 | =item B<-D> | ||
128 | |||
129 | Decrypt data that was encrypted with the B<-E> option. | ||
130 | |||
131 | =item B<-c> | ||
132 | |||
133 | Generate a 16 character hexadecimal cbc checksum and output this to | ||
134 | stderr. | ||
135 | If a filename was specified after the | ||
136 | B<-c> | ||
137 | option, the checksum is output to that file. | ||
138 | The checksum is generated using a key generated in a sunOS compatible | ||
139 | manner. | ||
140 | |||
141 | =item B<-C> | ||
142 | |||
143 | A cbc checksum is generated in the same manner as described for the | ||
144 | B<-c> | ||
145 | option but the DES key is generated in the same manner as used for the | ||
146 | B<-E> | ||
147 | and | ||
148 | B<-D> | ||
149 | options | ||
150 | |||
151 | =item B<-f> | ||
152 | |||
153 | Does nothing - allowed for compatibility with sunOS des(1) command. | ||
154 | |||
155 | =item B<-s> | ||
156 | |||
157 | Does nothing - allowed for compatibility with sunOS des(1) command. | ||
158 | |||
159 | =item B<-k> I<key> | ||
160 | |||
161 | Use the encryption | ||
162 | I<key> | ||
163 | specified. | ||
164 | |||
165 | =item B<-h> | ||
166 | |||
167 | The | ||
168 | I<key> | ||
169 | is assumed to be a 16 character hexadecimal number. | ||
170 | If the | ||
171 | B<-3> | ||
172 | option is used the key is assumed to be a 32 character hexadecimal | ||
173 | number. | ||
174 | |||
175 | =item B<-u> | ||
176 | |||
177 | This flag is used to read and write uuencoded files. If decrypting, | ||
178 | the input file is assumed to contain uuencoded, DES encrypted data. | ||
179 | If encrypting, the characters following the B<-u> are used as the name of | ||
180 | the uuencoded file to embed in the begin line of the uuencoded | ||
181 | output. If there is no name specified after the B<-u>, the name text.des | ||
182 | will be embedded in the header. | ||
183 | |||
184 | =head1 SEE ALSO | ||
185 | |||
186 | ps(1), | ||
187 | L<des_crypt(3)|des_crypt(3)> | ||
188 | |||
189 | =head1 BUGS | ||
190 | |||
191 | The problem with using the | ||
192 | B<-e> | ||
193 | option is the short key length. | ||
194 | It would be better to use a real 56-bit key rather than an | ||
195 | ASCII-based 56-bit pattern. Knowing that the key was derived from ASCII | ||
196 | radically reduces the time necessary for a brute-force cryptographic attack. | ||
197 | My attempt to remove this problem is to add an alternative text-key to | ||
198 | DES-key function. This alternative function (accessed via | ||
199 | B<-E>, B<-D>, B<-S> | ||
200 | and | ||
201 | B<-3>) | ||
202 | uses DES to help generate the key. | ||
203 | |||
204 | Be carefully when using the B<-u> option. Doing B<des -ud> I<filename> will | ||
205 | not decrypt filename (the B<-u> option will gobble the B<-d> option). | ||
206 | |||
207 | The VMS operating system operates in a world where files are always a | ||
208 | multiple of 512 bytes. This causes problems when encrypted data is | ||
209 | send from Unix to VMS since a 88 byte file will suddenly be padded | ||
210 | with 424 null bytes. To get around this problem, use the B<-u> option | ||
211 | to uuencode the data before it is send to the VMS system. | ||
212 | |||
213 | =head1 AUTHOR | ||
214 | |||
215 | Eric Young (eay@cryptsoft.com) | ||
216 | |||
217 | =cut | ||
diff --git a/src/lib/libssl/src/crypto/des/des_crypt.man b/src/lib/libssl/src/crypto/des/des_crypt.man index 0ecc416877..e69de29bb2 100644 --- a/src/lib/libssl/src/crypto/des/des_crypt.man +++ b/src/lib/libssl/src/crypto/des/des_crypt.man | |||
@@ -1,508 +0,0 @@ | |||
1 | .TH DES_CRYPT 3 | ||
2 | .SH NAME | ||
3 | des_read_password, des_read_2password, | ||
4 | des_string_to_key, des_string_to_2key, des_read_pw_string, | ||
5 | des_random_key, des_set_key, | ||
6 | des_key_sched, des_ecb_encrypt, des_ecb3_encrypt, des_cbc_encrypt, | ||
7 | des_3cbc_encrypt, | ||
8 | des_pcbc_encrypt, des_cfb_encrypt, des_ofb_encrypt, | ||
9 | des_cbc_cksum, des_quad_cksum, | ||
10 | des_enc_read, des_enc_write, des_set_odd_parity, | ||
11 | des_is_weak_key, crypt \- (non USA) DES encryption | ||
12 | .SH SYNOPSIS | ||
13 | .nf | ||
14 | .nj | ||
15 | .ft B | ||
16 | #include <des.h> | ||
17 | .PP | ||
18 | .B int des_read_password(key,prompt,verify) | ||
19 | des_cblock *key; | ||
20 | char *prompt; | ||
21 | int verify; | ||
22 | .PP | ||
23 | .B int des_read_2password(key1,key2,prompt,verify) | ||
24 | des_cblock *key1,*key2; | ||
25 | char *prompt; | ||
26 | int verify; | ||
27 | .PP | ||
28 | .B int des_string_to_key(str,key) | ||
29 | char *str; | ||
30 | des_cblock *key; | ||
31 | .PP | ||
32 | .B int des_string_to_2keys(str,key1,key2) | ||
33 | char *str; | ||
34 | des_cblock *key1,*key2; | ||
35 | .PP | ||
36 | .B int des_read_pw_string(buf,length,prompt,verify) | ||
37 | char *buf; | ||
38 | int length; | ||
39 | char *prompt; | ||
40 | int verify; | ||
41 | .PP | ||
42 | .B int des_random_key(key) | ||
43 | des_cblock *key; | ||
44 | .PP | ||
45 | .B int des_set_key(key,schedule) | ||
46 | des_cblock *key; | ||
47 | des_key_schedule schedule; | ||
48 | .PP | ||
49 | .B int des_key_sched(key,schedule) | ||
50 | des_cblock *key; | ||
51 | des_key_schedule schedule; | ||
52 | .PP | ||
53 | .B int des_ecb_encrypt(input,output,schedule,encrypt) | ||
54 | des_cblock *input; | ||
55 | des_cblock *output; | ||
56 | des_key_schedule schedule; | ||
57 | int encrypt; | ||
58 | .PP | ||
59 | .B int des_ecb3_encrypt(input,output,ks1,ks2,encrypt) | ||
60 | des_cblock *input; | ||
61 | des_cblock *output; | ||
62 | des_key_schedule ks1,ks2; | ||
63 | int encrypt; | ||
64 | .PP | ||
65 | .B int des_cbc_encrypt(input,output,length,schedule,ivec,encrypt) | ||
66 | des_cblock *input; | ||
67 | des_cblock *output; | ||
68 | long length; | ||
69 | des_key_schedule schedule; | ||
70 | des_cblock *ivec; | ||
71 | int encrypt; | ||
72 | .PP | ||
73 | .B int des_3cbc_encrypt(input,output,length,sk1,sk2,ivec1,ivec2,encrypt) | ||
74 | des_cblock *input; | ||
75 | des_cblock *output; | ||
76 | long length; | ||
77 | des_key_schedule sk1; | ||
78 | des_key_schedule sk2; | ||
79 | des_cblock *ivec1; | ||
80 | des_cblock *ivec2; | ||
81 | int encrypt; | ||
82 | .PP | ||
83 | .B int des_pcbc_encrypt(input,output,length,schedule,ivec,encrypt) | ||
84 | des_cblock *input; | ||
85 | des_cblock *output; | ||
86 | long length; | ||
87 | des_key_schedule schedule; | ||
88 | des_cblock *ivec; | ||
89 | int encrypt; | ||
90 | .PP | ||
91 | .B int des_cfb_encrypt(input,output,numbits,length,schedule,ivec,encrypt) | ||
92 | unsigned char *input; | ||
93 | unsigned char *output; | ||
94 | int numbits; | ||
95 | long length; | ||
96 | des_key_schedule schedule; | ||
97 | des_cblock *ivec; | ||
98 | int encrypt; | ||
99 | .PP | ||
100 | .B int des_ofb_encrypt(input,output,numbits,length,schedule,ivec) | ||
101 | unsigned char *input,*output; | ||
102 | int numbits; | ||
103 | long length; | ||
104 | des_key_schedule schedule; | ||
105 | des_cblock *ivec; | ||
106 | .PP | ||
107 | .B unsigned long des_cbc_cksum(input,output,length,schedule,ivec) | ||
108 | des_cblock *input; | ||
109 | des_cblock *output; | ||
110 | long length; | ||
111 | des_key_schedule schedule; | ||
112 | des_cblock *ivec; | ||
113 | .PP | ||
114 | .B unsigned long des_quad_cksum(input,output,length,out_count,seed) | ||
115 | des_cblock *input; | ||
116 | des_cblock *output; | ||
117 | long length; | ||
118 | int out_count; | ||
119 | des_cblock *seed; | ||
120 | .PP | ||
121 | .B int des_check_key; | ||
122 | .PP | ||
123 | .B int des_enc_read(fd,buf,len,sched,iv) | ||
124 | int fd; | ||
125 | char *buf; | ||
126 | int len; | ||
127 | des_key_schedule sched; | ||
128 | des_cblock *iv; | ||
129 | .PP | ||
130 | .B int des_enc_write(fd,buf,len,sched,iv) | ||
131 | int fd; | ||
132 | char *buf; | ||
133 | int len; | ||
134 | des_key_schedule sched; | ||
135 | des_cblock *iv; | ||
136 | .PP | ||
137 | .B extern int des_rw_mode; | ||
138 | .PP | ||
139 | .B void des_set_odd_parity(key) | ||
140 | des_cblock *key; | ||
141 | .PP | ||
142 | .B int des_is_weak_key(key) | ||
143 | des_cblock *key; | ||
144 | .PP | ||
145 | .B char *crypt(passwd,salt) | ||
146 | char *passwd; | ||
147 | char *salt; | ||
148 | .PP | ||
149 | .fi | ||
150 | .SH DESCRIPTION | ||
151 | This library contains a fast implementation of the DES encryption | ||
152 | algorithm. | ||
153 | .PP | ||
154 | There are two phases to the use of DES encryption. | ||
155 | The first is the generation of a | ||
156 | .I des_key_schedule | ||
157 | from a key, | ||
158 | the second is the actual encryption. | ||
159 | A des key is of type | ||
160 | .I des_cblock. | ||
161 | This type is made from 8 characters with odd parity. | ||
162 | The least significant bit in the character is the parity bit. | ||
163 | The key schedule is an expanded form of the key; it is used to speed the | ||
164 | encryption process. | ||
165 | .PP | ||
166 | .I des_read_password | ||
167 | writes the string specified by prompt to the standard output, | ||
168 | turns off echo and reads an input string from standard input | ||
169 | until terminated with a newline. | ||
170 | If verify is non-zero, it prompts and reads the input again and verifies | ||
171 | that both entered passwords are the same. | ||
172 | The entered string is converted into a des key by using the | ||
173 | .I des_string_to_key | ||
174 | routine. | ||
175 | The new key is placed in the | ||
176 | .I des_cblock | ||
177 | that was passed (by reference) to the routine. | ||
178 | If there were no errors, | ||
179 | .I des_read_password | ||
180 | returns 0, | ||
181 | -1 is returned if there was a terminal error and 1 is returned for | ||
182 | any other error. | ||
183 | .PP | ||
184 | .I des_read_2password | ||
185 | operates in the same way as | ||
186 | .I des_read_password | ||
187 | except that it generates 2 keys by using the | ||
188 | .I des_string_to_2key | ||
189 | function. | ||
190 | .PP | ||
191 | .I des_read_pw_string | ||
192 | is called by | ||
193 | .I des_read_password | ||
194 | to read and verify a string from a terminal device. | ||
195 | The string is returned in | ||
196 | .I buf. | ||
197 | The size of | ||
198 | .I buf | ||
199 | is passed to the routine via the | ||
200 | .I length | ||
201 | parameter. | ||
202 | .PP | ||
203 | .I des_string_to_key | ||
204 | converts a string into a valid des key. | ||
205 | .PP | ||
206 | .I des_string_to_2key | ||
207 | converts a string into 2 valid des keys. | ||
208 | This routine is best suited for used to generate keys for use with | ||
209 | .I des_ecb3_encrypt. | ||
210 | .PP | ||
211 | .I des_random_key | ||
212 | returns a random key that is made of a combination of process id, | ||
213 | time and an increasing counter. | ||
214 | .PP | ||
215 | Before a des key can be used it is converted into a | ||
216 | .I des_key_schedule | ||
217 | via the | ||
218 | .I des_set_key | ||
219 | routine. | ||
220 | If the | ||
221 | .I des_check_key | ||
222 | flag is non-zero, | ||
223 | .I des_set_key | ||
224 | will check that the key passed is of odd parity and is not a week or | ||
225 | semi-weak key. | ||
226 | If the parity is wrong, | ||
227 | then -1 is returned. | ||
228 | If the key is a weak key, | ||
229 | then -2 is returned. | ||
230 | If an error is returned, | ||
231 | the key schedule is not generated. | ||
232 | .PP | ||
233 | .I des_key_sched | ||
234 | is another name for the | ||
235 | .I des_set_key | ||
236 | function. | ||
237 | .PP | ||
238 | The following routines mostly operate on an input and output stream of | ||
239 | .I des_cblock's. | ||
240 | .PP | ||
241 | .I des_ecb_encrypt | ||
242 | is the basic DES encryption routine that encrypts or decrypts a single 8-byte | ||
243 | .I des_cblock | ||
244 | in | ||
245 | .I electronic code book | ||
246 | mode. | ||
247 | It always transforms the input data, pointed to by | ||
248 | .I input, | ||
249 | into the output data, | ||
250 | pointed to by the | ||
251 | .I output | ||
252 | argument. | ||
253 | If the | ||
254 | .I encrypt | ||
255 | argument is non-zero (DES_ENCRYPT), | ||
256 | the | ||
257 | .I input | ||
258 | (cleartext) is encrypted in to the | ||
259 | .I output | ||
260 | (ciphertext) using the key_schedule specified by the | ||
261 | .I schedule | ||
262 | argument, | ||
263 | previously set via | ||
264 | .I des_set_key. | ||
265 | If | ||
266 | .I encrypt | ||
267 | is zero (DES_DECRYPT), | ||
268 | the | ||
269 | .I input | ||
270 | (now ciphertext) | ||
271 | is decrypted into the | ||
272 | .I output | ||
273 | (now cleartext). | ||
274 | Input and output may overlap. | ||
275 | No meaningful value is returned. | ||
276 | .PP | ||
277 | .I des_ecb3_encrypt | ||
278 | encrypts/decrypts the | ||
279 | .I input | ||
280 | block by using triple ecb DES encryption. | ||
281 | This involves encrypting the input with | ||
282 | .I ks1, | ||
283 | decryption with the key schedule | ||
284 | .I ks2, | ||
285 | and then encryption with the first again. | ||
286 | This routine greatly reduces the chances of brute force breaking of | ||
287 | DES and has the advantage of if | ||
288 | .I ks1 | ||
289 | and | ||
290 | .I ks2 | ||
291 | are the same, it is equivalent to just encryption using ecb mode and | ||
292 | .I ks1 | ||
293 | as the key. | ||
294 | .PP | ||
295 | .I des_cbc_encrypt | ||
296 | encrypts/decrypts using the | ||
297 | .I cipher-block-chaining | ||
298 | mode of DES. | ||
299 | If the | ||
300 | .I encrypt | ||
301 | argument is non-zero, | ||
302 | the routine cipher-block-chain encrypts the cleartext data pointed to by the | ||
303 | .I input | ||
304 | argument into the ciphertext pointed to by the | ||
305 | .I output | ||
306 | argument, | ||
307 | using the key schedule provided by the | ||
308 | .I schedule | ||
309 | argument, | ||
310 | and initialisation vector provided by the | ||
311 | .I ivec | ||
312 | argument. | ||
313 | If the | ||
314 | .I length | ||
315 | argument is not an integral multiple of eight bytes, | ||
316 | the last block is copied to a temporary area and zero filled. | ||
317 | The output is always | ||
318 | an integral multiple of eight bytes. | ||
319 | To make multiple cbc encrypt calls on a large amount of data appear to | ||
320 | be one | ||
321 | .I des_cbc_encrypt | ||
322 | call, the | ||
323 | .I ivec | ||
324 | of subsequent calls should be the last 8 bytes of the output. | ||
325 | .PP | ||
326 | .I des_3cbc_encrypt | ||
327 | encrypts/decrypts the | ||
328 | .I input | ||
329 | block by using triple cbc DES encryption. | ||
330 | This involves encrypting the input with key schedule | ||
331 | .I ks1, | ||
332 | decryption with the key schedule | ||
333 | .I ks2, | ||
334 | and then encryption with the first again. | ||
335 | 2 initialisation vectors are required, | ||
336 | .I ivec1 | ||
337 | and | ||
338 | .I ivec2. | ||
339 | Unlike | ||
340 | .I des_cbc_encrypt, | ||
341 | these initialisation vectors are modified by the subroutine. | ||
342 | This routine greatly reduces the chances of brute force breaking of | ||
343 | DES and has the advantage of if | ||
344 | .I ks1 | ||
345 | and | ||
346 | .I ks2 | ||
347 | are the same, it is equivalent to just encryption using cbc mode and | ||
348 | .I ks1 | ||
349 | as the key. | ||
350 | .PP | ||
351 | .I des_pcbc_encrypt | ||
352 | encrypt/decrypts using a modified block chaining mode. | ||
353 | It provides better error propagation characteristics than cbc | ||
354 | encryption. | ||
355 | .PP | ||
356 | .I des_cfb_encrypt | ||
357 | encrypt/decrypts using cipher feedback mode. This method takes an | ||
358 | array of characters as input and outputs and array of characters. It | ||
359 | does not require any padding to 8 character groups. Note: the ivec | ||
360 | variable is changed and the new changed value needs to be passed to | ||
361 | the next call to this function. Since this function runs a complete | ||
362 | DES ecb encryption per numbits, this function is only suggested for | ||
363 | use when sending small numbers of characters. | ||
364 | .PP | ||
365 | .I des_ofb_encrypt | ||
366 | encrypt using output feedback mode. This method takes an | ||
367 | array of characters as input and outputs and array of characters. It | ||
368 | does not require any padding to 8 character groups. Note: the ivec | ||
369 | variable is changed and the new changed value needs to be passed to | ||
370 | the next call to this function. Since this function runs a complete | ||
371 | DES ecb encryption per numbits, this function is only suggested for | ||
372 | use when sending small numbers of characters. | ||
373 | .PP | ||
374 | .I des_cbc_cksum | ||
375 | produces an 8 byte checksum based on the input stream (via cbc encryption). | ||
376 | The last 4 bytes of the checksum is returned and the complete 8 bytes is | ||
377 | placed in | ||
378 | .I output. | ||
379 | .PP | ||
380 | .I des_quad_cksum | ||
381 | returns a 4 byte checksum from the input bytes. | ||
382 | The algorithm can be iterated over the input, | ||
383 | depending on | ||
384 | .I out_count, | ||
385 | 1, 2, 3 or 4 times. | ||
386 | If | ||
387 | .I output | ||
388 | is non-NULL, | ||
389 | the 8 bytes generated by each pass are written into | ||
390 | .I output. | ||
391 | .PP | ||
392 | .I des_enc_write | ||
393 | is used to write | ||
394 | .I len | ||
395 | bytes | ||
396 | to file descriptor | ||
397 | .I fd | ||
398 | from buffer | ||
399 | .I buf. | ||
400 | The data is encrypted via | ||
401 | .I pcbc_encrypt | ||
402 | (default) using | ||
403 | .I sched | ||
404 | for the key and | ||
405 | .I iv | ||
406 | as a starting vector. | ||
407 | The actual data send down | ||
408 | .I fd | ||
409 | consists of 4 bytes (in network byte order) containing the length of the | ||
410 | following encrypted data. The encrypted data then follows, padded with random | ||
411 | data out to a multiple of 8 bytes. | ||
412 | .PP | ||
413 | .I des_enc_read | ||
414 | is used to read | ||
415 | .I len | ||
416 | bytes | ||
417 | from file descriptor | ||
418 | .I fd | ||
419 | into buffer | ||
420 | .I buf. | ||
421 | The data being read from | ||
422 | .I fd | ||
423 | is assumed to have come from | ||
424 | .I des_enc_write | ||
425 | and is decrypted using | ||
426 | .I sched | ||
427 | for the key schedule and | ||
428 | .I iv | ||
429 | for the initial vector. | ||
430 | The | ||
431 | .I des_enc_read/des_enc_write | ||
432 | pair can be used to read/write to files, pipes and sockets. | ||
433 | I have used them in implementing a version of rlogin in which all | ||
434 | data is encrypted. | ||
435 | .PP | ||
436 | .I des_rw_mode | ||
437 | is used to specify the encryption mode to use with | ||
438 | .I des_enc_read | ||
439 | and | ||
440 | .I des_end_write. | ||
441 | If set to | ||
442 | .I DES_PCBC_MODE | ||
443 | (the default), des_pcbc_encrypt is used. | ||
444 | If set to | ||
445 | .I DES_CBC_MODE | ||
446 | des_cbc_encrypt is used. | ||
447 | These two routines and the variable are not part of the normal MIT library. | ||
448 | .PP | ||
449 | .I des_set_odd_parity | ||
450 | sets the parity of the passed | ||
451 | .I key | ||
452 | to odd. This routine is not part of the standard MIT library. | ||
453 | .PP | ||
454 | .I des_is_weak_key | ||
455 | returns 1 is the passed key is a weak key (pick again :-), | ||
456 | 0 if it is ok. | ||
457 | This routine is not part of the standard MIT library. | ||
458 | .PP | ||
459 | .I crypt | ||
460 | is a replacement for the normal system crypt. | ||
461 | It is much faster than the system crypt. | ||
462 | .PP | ||
463 | .SH FILES | ||
464 | /usr/include/des.h | ||
465 | .br | ||
466 | /usr/lib/libdes.a | ||
467 | .PP | ||
468 | The encryption routines have been tested on 16bit, 32bit and 64bit | ||
469 | machines of various endian and even works under VMS. | ||
470 | .PP | ||
471 | .SH BUGS | ||
472 | .PP | ||
473 | If you think this manual is sparse, | ||
474 | read the des_crypt(3) manual from the MIT kerberos (or bones outside | ||
475 | of the USA) distribution. | ||
476 | .PP | ||
477 | .I des_cfb_encrypt | ||
478 | and | ||
479 | .I des_ofb_encrypt | ||
480 | operates on input of 8 bits. What this means is that if you set | ||
481 | numbits to 12, and length to 2, the first 12 bits will come from the 1st | ||
482 | input byte and the low half of the second input byte. The second 12 | ||
483 | bits will have the low 8 bits taken from the 3rd input byte and the | ||
484 | top 4 bits taken from the 4th input byte. The same holds for output. | ||
485 | This function has been implemented this way because most people will | ||
486 | be using a multiple of 8 and because once you get into pulling bytes input | ||
487 | bytes apart things get ugly! | ||
488 | .PP | ||
489 | .I des_read_pw_string | ||
490 | is the most machine/OS dependent function and normally generates the | ||
491 | most problems when porting this code. | ||
492 | .PP | ||
493 | .I des_string_to_key | ||
494 | is probably different from the MIT version since there are lots | ||
495 | of fun ways to implement one-way encryption of a text string. | ||
496 | .PP | ||
497 | The routines are optimised for 32 bit machines and so are not efficient | ||
498 | on IBM PCs. | ||
499 | .PP | ||
500 | NOTE: extensive work has been done on this library since this document | ||
501 | was origionally written. Please try to read des.doc from the libdes | ||
502 | distribution since it is far more upto date and documents more of the | ||
503 | functions. Libdes is now also being shipped as part of SSLeay, a | ||
504 | general cryptographic library that amonst other things implements | ||
505 | netscapes SSL protocoll. The most recent version can be found in | ||
506 | SSLeay distributions. | ||
507 | .SH AUTHOR | ||
508 | Eric Young (eay@cryptsoft.com) | ||
diff --git a/src/lib/libssl/src/crypto/des/des_locl.h b/src/lib/libssl/src/crypto/des/des_locl.h index 4dfed199a7..1ace8f5930 100644 --- a/src/lib/libssl/src/crypto/des/des_locl.h +++ b/src/lib/libssl/src/crypto/des/des_locl.h | |||
@@ -155,7 +155,7 @@ | |||
155 | } \ | 155 | } \ |
156 | } | 156 | } |
157 | 157 | ||
158 | #if defined(WIN32) | 158 | #if defined(WIN32) && defined(_MSC_VER) |
159 | #define ROTATE(a,n) (_lrotr(a,n)) | 159 | #define ROTATE(a,n) (_lrotr(a,n)) |
160 | #else | 160 | #else |
161 | #define ROTATE(a,n) (((a)>>(n))+((a)<<(32-(n)))) | 161 | #define ROTATE(a,n) (((a)>>(n))+((a)<<(32-(n)))) |
diff --git a/src/lib/libssl/src/crypto/des/destest.c b/src/lib/libssl/src/crypto/des/destest.c index 9ad4ecb072..df0d615d6b 100644 --- a/src/lib/libssl/src/crypto/des/destest.c +++ b/src/lib/libssl/src/crypto/des/destest.c | |||
@@ -336,8 +336,15 @@ int main(int argc, char *argv[]) | |||
336 | unsigned char cbc_in[40]; | 336 | unsigned char cbc_in[40]; |
337 | unsigned char cbc_out[40]; | 337 | unsigned char cbc_out[40]; |
338 | DES_LONG cs; | 338 | DES_LONG cs; |
339 | unsigned char qret[4][4],cret[8]; | 339 | unsigned char cret[8]; |
340 | DES_LONG lqret[4]; | 340 | #ifdef _CRAY |
341 | struct { | ||
342 | int a:32; | ||
343 | int b:32; | ||
344 | } lqret[2]; | ||
345 | #else | ||
346 | DES_LONG lqret[4]; | ||
347 | #endif | ||
341 | int num; | 348 | int num; |
342 | char *str; | 349 | char *str; |
343 | 350 | ||
@@ -701,43 +708,40 @@ plain[8+4], plain[8+5], plain[8+6], plain[8+7]); | |||
701 | } | 708 | } |
702 | 709 | ||
703 | printf("Doing quad_cksum\n"); | 710 | printf("Doing quad_cksum\n"); |
704 | /* This is obviously done this way especially to puzzle me. Although | 711 | cs=quad_cksum(cbc_data,(des_cblock *)lqret, |
705 | quad_cksum returns up to 4 groups of 8 bytes, this test gets it to | 712 | (long)strlen((char *)cbc_data),2,(des_cblock *)cbc_iv); |
706 | produce 2 groups then treats them as 4 groups of 4 bytes. | 713 | if (cs != 0x70d7a63aL) |
707 | Ben 13 Feb 1999 */ | ||
708 | cs=quad_cksum(cbc_data,(des_cblock *)qret,strlen((char *)cbc_data),2, | ||
709 | &cbc_iv); | ||
710 | |||
711 | { /* Big-endian fix */ | ||
712 | static DES_LONG l=1; | ||
713 | static unsigned char *c=(unsigned char *)&l; | ||
714 | DES_LONG ll; | ||
715 | |||
716 | j=sizeof(lqret[0])-4; | ||
717 | for (i=0; i<4; i++) | ||
718 | { | 714 | { |
719 | lqret[i]=0; | 715 | printf("quad_cksum error, ret %08lx should be 70d7a63a\n", |
720 | memcpy(&(lqret[i]),&(qret[i][0]),4); | 716 | (unsigned long)cs); |
721 | if (!c[0] && (j > 0)) | 717 | err=1; |
722 | lqret[i]=lqret[i]>>(j*8); /* For Cray */ | ||
723 | } | 718 | } |
724 | 719 | #ifdef _CRAY | |
725 | if (!c[0]) | 720 | if (lqret[0].a != 0x327eba8dL) |
726 | { | 721 | { |
727 | ll=lqret[0]^lqret[3]; | 722 | printf("quad_cksum error, out[0] %08lx is not %08lx\n", |
728 | lqret[0]^=ll; | 723 | (unsigned long)lqret[0].a,0x327eba8dUL); |
729 | lqret[3]^=ll; | 724 | err=1; |
730 | ll=lqret[1]^lqret[2]; | ||
731 | lqret[1]^=ll; | ||
732 | lqret[2]^=ll; | ||
733 | } | 725 | } |
734 | } | 726 | if (lqret[0].b != 0x201a49ccL) |
735 | if (cs != 0x70d7a63aL) | ||
736 | { | 727 | { |
737 | printf("quad_cksum error, ret %08lx should be 70d7a63a\n", | 728 | printf("quad_cksum error, out[1] %08lx is not %08lx\n", |
738 | (unsigned long)cs); | 729 | (unsigned long)lqret[0].b,0x201a49ccUL); |
730 | err=1; | ||
731 | } | ||
732 | if (lqret[1].a != 0x70d7a63aL) | ||
733 | { | ||
734 | printf("quad_cksum error, out[2] %08lx is not %08lx\n", | ||
735 | (unsigned long)lqret[1].a,0x70d7a63aUL); | ||
739 | err=1; | 736 | err=1; |
740 | } | 737 | } |
738 | if (lqret[1].b != 0x501c2c26L) | ||
739 | { | ||
740 | printf("quad_cksum error, out[3] %08lx is not %08lx\n", | ||
741 | (unsigned long)lqret[1].b,0x501c2c26UL); | ||
742 | err=1; | ||
743 | } | ||
744 | #else | ||
741 | if (lqret[0] != 0x327eba8dL) | 745 | if (lqret[0] != 0x327eba8dL) |
742 | { | 746 | { |
743 | printf("quad_cksum error, out[0] %08lx is not %08lx\n", | 747 | printf("quad_cksum error, out[0] %08lx is not %08lx\n", |
@@ -763,6 +767,7 @@ plain[8+4], plain[8+5], plain[8+6], plain[8+7]); | |||
763 | err=1; | 767 | err=1; |
764 | } | 768 | } |
765 | #endif | 769 | #endif |
770 | #endif | ||
766 | 771 | ||
767 | printf("input word alignment test"); | 772 | printf("input word alignment test"); |
768 | for (i=0; i<4; i++) | 773 | for (i=0; i<4; i++) |
diff --git a/src/lib/libssl/src/crypto/des/doIP b/src/lib/libssl/src/crypto/des/doIP index 18cf231303..e69de29bb2 100644 --- a/src/lib/libssl/src/crypto/des/doIP +++ b/src/lib/libssl/src/crypto/des/doIP | |||
@@ -1,46 +0,0 @@ | |||
1 | #!/usr/local/bin/perl | ||
2 | |||
3 | @l=( | ||
4 | 0, 1, 2, 3, 4, 5, 6, 7, | ||
5 | 8, 9,10,11,12,13,14,15, | ||
6 | 16,17,18,19,20,21,22,23, | ||
7 | 24,25,26,27,28,29,30,31 | ||
8 | ); | ||
9 | @r=( | ||
10 | 32,33,34,35,36,37,38,39, | ||
11 | 40,41,42,43,44,45,46,47, | ||
12 | 48,49,50,51,52,53,54,55, | ||
13 | 56,57,58,59,60,61,62,63 | ||
14 | ); | ||
15 | |||
16 | require 'shifts.pl'; | ||
17 | |||
18 | sub PERM_OP | ||
19 | { | ||
20 | local(*a,*b,*t,$n,$m)=@_; | ||
21 | |||
22 | @z=&shift(*a,-$n); | ||
23 | @z=&xor(*b,*z); | ||
24 | @z=&and(*z,$m); | ||
25 | @b=&xor(*b,*z); | ||
26 | @z=&shift(*z,$n); | ||
27 | @a=&xor(*a,*z); | ||
28 | } | ||
29 | |||
30 | |||
31 | @L=@l; | ||
32 | @R=@r; | ||
33 | &PERM_OP(*R,*L,*T,4,0x0f0f0f0f); | ||
34 | &PERM_OP(*L,*R,*T,16,0x0000ffff); | ||
35 | &PERM_OP(*R,*L,*T,2,0x33333333); | ||
36 | &PERM_OP(*L,*R,*T,8,0x00ff00ff); | ||
37 | &PERM_OP(*R,*L,*T,1,0x55555555); | ||
38 | &printit(@L); | ||
39 | &printit(@R); | ||
40 | &PERM_OP(*R,*L,*T,1,0x55555555); | ||
41 | &PERM_OP(*L,*R,*T,8,0x00ff00ff); | ||
42 | &PERM_OP(*R,*L,*T,2,0x33333333); | ||
43 | &PERM_OP(*L,*R,*T,16,0x0000ffff); | ||
44 | &PERM_OP(*R,*L,*T,4,0x0f0f0f0f); | ||
45 | &printit(@L); | ||
46 | &printit(@R); | ||
diff --git a/src/lib/libssl/src/crypto/des/doPC1 b/src/lib/libssl/src/crypto/des/doPC1 index 096afd8c46..e69de29bb2 100644 --- a/src/lib/libssl/src/crypto/des/doPC1 +++ b/src/lib/libssl/src/crypto/des/doPC1 | |||
@@ -1,110 +0,0 @@ | |||
1 | #!/usr/local/bin/perl | ||
2 | |||
3 | @l=( | ||
4 | 0, 1, 2, 3, 4, 5, 6, 7, | ||
5 | 8, 9,10,11,12,13,14,15, | ||
6 | 16,17,18,19,20,21,22,23, | ||
7 | 24,25,26,27,28,29,30,31 | ||
8 | ); | ||
9 | @r=( | ||
10 | 32,33,34,35,36,37,38,39, | ||
11 | 40,41,42,43,44,45,46,47, | ||
12 | 48,49,50,51,52,53,54,55, | ||
13 | 56,57,58,59,60,61,62,63 | ||
14 | ); | ||
15 | |||
16 | require 'shifts.pl'; | ||
17 | |||
18 | sub PERM_OP | ||
19 | { | ||
20 | local(*a,*b,*t,$n,$m)=@_; | ||
21 | |||
22 | @z=&shift(*a,-$n); | ||
23 | @z=&xor(*b,*z); | ||
24 | @z=&and(*z,$m); | ||
25 | @b=&xor(*b,*z); | ||
26 | @z=&shift(*z,$n); | ||
27 | @a=&xor(*a,*z); | ||
28 | } | ||
29 | |||
30 | sub HPERM_OP2 | ||
31 | { | ||
32 | local(*a,*t,$n,$m)=@_; | ||
33 | local(@x,@y,$i); | ||
34 | |||
35 | @z=&shift(*a,16-$n); | ||
36 | @z=&xor(*a,*z); | ||
37 | @z=&and(*z,$m); | ||
38 | @a=&xor(*a,*z); | ||
39 | @z=&shift(*z,$n-16); | ||
40 | @a=&xor(*a,*z); | ||
41 | } | ||
42 | |||
43 | sub HPERM_OP | ||
44 | { | ||
45 | local(*a,*t,$n,$m)=@_; | ||
46 | local(@x,@y,$i); | ||
47 | |||
48 | for ($i=0; $i<16; $i++) | ||
49 | { | ||
50 | $x[$i]=$a[$i]; | ||
51 | $y[$i]=$a[16+$i]; | ||
52 | } | ||
53 | @z=&shift(*x,-$n); | ||
54 | @z=&xor(*y,*z); | ||
55 | @z=&and(*z,$m); | ||
56 | @y=&xor(*y,*z); | ||
57 | @z=&shift(*z,$n); | ||
58 | @x=&xor(*x,*z); | ||
59 | for ($i=0; $i<16; $i++) | ||
60 | { | ||
61 | $a[$i]=$x[$i]; | ||
62 | $a[16+$i]=$y[$i]; | ||
63 | } | ||
64 | } | ||
65 | |||
66 | @L=@l; | ||
67 | @R=@r; | ||
68 | |||
69 | print "---\n"; &printit(@R); | ||
70 | &PERM_OP(*R,*L,*T,4,0x0f0f0f0f); | ||
71 | print "---\n"; &printit(@R); | ||
72 | &HPERM_OP2(*L,*T,-2,0xcccc0000); | ||
73 | &HPERM_OP2(*R,*T,-2,0xcccc0000); | ||
74 | print "---\n"; &printit(@R); | ||
75 | &PERM_OP(*R,*L,*T,1,0x55555555); | ||
76 | print "---\n"; &printit(@R); | ||
77 | &PERM_OP(*L,*R,*T,8,0x00ff00ff); | ||
78 | print "---\n"; &printit(@R); | ||
79 | &PERM_OP(*R,*L,*T,1,0x55555555); | ||
80 | print "---\n"; &printit(@R); | ||
81 | # &printit(@L); | ||
82 | &printit(@R); | ||
83 | print <<"EOF"; | ||
84 | ============================== | ||
85 | 63 55 47 39 31 23 15 7 | ||
86 | 62 54 46 38 30 22 14 6 | ||
87 | 61 53 45 37 29 21 13 5 | ||
88 | 60 52 44 36 -- -- -- -- | ||
89 | |||
90 | 57 49 41 33 25 17 9 1 | ||
91 | 58 50 42 34 26 18 10 2 | ||
92 | 59 51 43 35 27 19 11 3 | ||
93 | 28 20 12 4 -- -- -- -- | ||
94 | EOF | ||
95 | exit(1); | ||
96 | @A=&and(*R,0x000000ff); | ||
97 | @A=&shift(*A,16); | ||
98 | @B=&and(*R,0x0000ff00); | ||
99 | @C=&and(*R,0x00ff0000); | ||
100 | @C=&shift(*C,-16); | ||
101 | @D=&and(*L,0xf0000000); | ||
102 | @D=&shift(*D,-4); | ||
103 | @A=&or(*A,*B); | ||
104 | @B=&or(*D,*C); | ||
105 | @R=&or(*A,*B); | ||
106 | @L=&and(*L,0x0fffffff); | ||
107 | |||
108 | &printit(@L); | ||
109 | &printit(@R); | ||
110 | |||
diff --git a/src/lib/libssl/src/crypto/des/doPC2 b/src/lib/libssl/src/crypto/des/doPC2 index fa5cf74cf7..e69de29bb2 100644 --- a/src/lib/libssl/src/crypto/des/doPC2 +++ b/src/lib/libssl/src/crypto/des/doPC2 | |||
@@ -1,94 +0,0 @@ | |||
1 | #!/usr/local/bin/perl | ||
2 | |||
3 | @PC2_C=(14,17,11,24, 1, 5, | ||
4 | 3,28,15, 6,21,10, | ||
5 | 23,19,12, 4,26, 8, | ||
6 | 16, 7,27,20,13, 2, | ||
7 | ); | ||
8 | |||
9 | @PC2_D=(41,52,31,37,47,55, | ||
10 | 30,40,51,45,33,48, | ||
11 | 44,49,39,56,34,53, | ||
12 | 46,42,50,36,29,32, | ||
13 | ); | ||
14 | |||
15 | $i=0; | ||
16 | foreach (@PC2_C) { | ||
17 | $_--; | ||
18 | # printf "%2d,",$_; | ||
19 | $C{$_}=$i; | ||
20 | ++$i; | ||
21 | # print "\n" if ((($i) % 8) == 0); | ||
22 | } | ||
23 | $i=0; | ||
24 | #print "\n"; | ||
25 | foreach (@PC2_D) { | ||
26 | $_-=28; | ||
27 | $_--; | ||
28 | # printf "%2d,",$_; | ||
29 | $D{$_}=$i; | ||
30 | $i++; | ||
31 | # print "\n" if ((($i) % 8) == 0); | ||
32 | } | ||
33 | |||
34 | #print "\n"; | ||
35 | foreach $i (0 .. 27) | ||
36 | { | ||
37 | $_=$C{$i}; | ||
38 | # printf "%2d,",$_; | ||
39 | $i++; | ||
40 | # print "\n" if ((($i) % 8) == 0); | ||
41 | } | ||
42 | #print "\n"; | ||
43 | |||
44 | #print "\n"; | ||
45 | foreach $i (0 .. 27) | ||
46 | { | ||
47 | $_=$D{$i}; | ||
48 | # printf "%2d,",$_; | ||
49 | $i++; | ||
50 | # print "\n" if ((($i) % 8) == 0); | ||
51 | } | ||
52 | #print "\n"; | ||
53 | |||
54 | print "static ulong skb[8][64]={\n"; | ||
55 | &doit("C",*C, 0, 1, 2, 3, 4, 5); | ||
56 | &doit("C",*C, 6, 7, 9,10,11,12); | ||
57 | &doit("C",*C,13,14,15,16,18,19); | ||
58 | &doit("C",*C,20,22,23,25,26,27); | ||
59 | |||
60 | &doit("D",*D, 0, 1, 2, 3, 4, 5); | ||
61 | &doit("D",*D, 7, 8,10,11,12,13); | ||
62 | &doit("D",*D,15,16,17,18,19,20); | ||
63 | &doit("D",*D,21,22,23,24,26,27); | ||
64 | print "};\n"; | ||
65 | |||
66 | sub doit | ||
67 | { | ||
68 | local($l,*A,@b)=@_; | ||
69 | local(@out); | ||
70 | |||
71 | printf("/* for $l bits (numbered as per FIPS 46) %d %d %d %d %d %d */\n", | ||
72 | $b[0]+1, $b[1]+1, $b[2]+1, $b[3]+1, $b[4]+1, $b[5]+1); | ||
73 | for ($i=0; $i<64; $i++) | ||
74 | { | ||
75 | $out[$i]=0; | ||
76 | $j=1; | ||
77 | #print "\n"; | ||
78 | for ($k=0; $k<6; $k++) | ||
79 | { | ||
80 | $l=$A{$b[$k]}; | ||
81 | #print"$l - "; | ||
82 | if ((1<<$k) & $i) | ||
83 | { | ||
84 | $ll=int($l/6)*8+($l%6); | ||
85 | $out[$i]|=1<<($ll); | ||
86 | } | ||
87 | } | ||
88 | $pp=$out[$i]; | ||
89 | $pp=($pp&0xff0000ff)| (($pp&0x00ff0000)>>8)| | ||
90 | (($pp&0x0000ff00)<<8); | ||
91 | printf("0x%08X,",$pp); | ||
92 | print "\n" if (($i+1) % 4 == 0); | ||
93 | } | ||
94 | } | ||
diff --git a/src/lib/libssl/src/crypto/des/fcrypt.c b/src/lib/libssl/src/crypto/des/fcrypt.c index fa1b8aa34a..9b21f81cc2 100644 --- a/src/lib/libssl/src/crypto/des/fcrypt.c +++ b/src/lib/libssl/src/crypto/des/fcrypt.c | |||
@@ -3,7 +3,6 @@ | |||
3 | 3 | ||
4 | /* This version of crypt has been developed from my MIT compatible | 4 | /* This version of crypt has been developed from my MIT compatible |
5 | * DES library. | 5 | * DES library. |
6 | * The library is available at pub/Crypto/DES at ftp.psy.uq.oz.au | ||
7 | * Eric Young (eay@cryptsoft.com) | 6 | * Eric Young (eay@cryptsoft.com) |
8 | */ | 7 | */ |
9 | 8 | ||
diff --git a/src/lib/libssl/src/crypto/des/fcrypt_b.c b/src/lib/libssl/src/crypto/des/fcrypt_b.c index 83c94054e3..22c87f5983 100644 --- a/src/lib/libssl/src/crypto/des/fcrypt_b.c +++ b/src/lib/libssl/src/crypto/des/fcrypt_b.c | |||
@@ -97,7 +97,7 @@ void fcrypt_body(DES_LONG *out, des_key_schedule ks, DES_LONG Eswap0, | |||
97 | 97 | ||
98 | for (j=0; j<25; j++) | 98 | for (j=0; j<25; j++) |
99 | { | 99 | { |
100 | #ifdef DES_UNROLL | 100 | #ifndef DES_UNROLL |
101 | register int i; | 101 | register int i; |
102 | 102 | ||
103 | for (i=0; i<32; i+=8) | 103 | for (i=0; i<32; i+=8) |
diff --git a/src/lib/libssl/src/crypto/des/ncbc_enc.c b/src/lib/libssl/src/crypto/des/ncbc_enc.c index e0e67a417d..3b681691a9 100644 --- a/src/lib/libssl/src/crypto/des/ncbc_enc.c +++ b/src/lib/libssl/src/crypto/des/ncbc_enc.c | |||
@@ -1,4 +1,9 @@ | |||
1 | /* crypto/des/ncbc_enc.c */ | 1 | /* crypto/des/ncbc_enc.c */ |
2 | /* | ||
3 | * #included by: | ||
4 | * cbc_enc.c (des_cbc_encrypt) | ||
5 | * des_enc.c (des_ncbc_encrypt) | ||
6 | */ | ||
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 7 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 8 | * All rights reserved. |
4 | * | 9 | * |
diff --git a/src/lib/libssl/src/crypto/des/podd.h b/src/lib/libssl/src/crypto/des/podd.h index 1b2bfe0843..e69de29bb2 100644 --- a/src/lib/libssl/src/crypto/des/podd.h +++ b/src/lib/libssl/src/crypto/des/podd.h | |||
@@ -1,75 +0,0 @@ | |||
1 | /* crypto/des/podd.h */ | ||
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
3 | * All rights reserved. | ||
4 | * | ||
5 | * This package is an SSL implementation written | ||
6 | * by Eric Young (eay@cryptsoft.com). | ||
7 | * The implementation was written so as to conform with Netscapes SSL. | ||
8 | * | ||
9 | * This library is free for commercial and non-commercial use as long as | ||
10 | * the following conditions are aheared to. The following conditions | ||
11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
13 | * included with this distribution is covered by the same copyright terms | ||
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
15 | * | ||
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
17 | * the code are not to be removed. | ||
18 | * If this package is used in a product, Eric Young should be given attribution | ||
19 | * as the author of the parts of the library used. | ||
20 | * This can be in the form of a textual message at program startup or | ||
21 | * in documentation (online or textual) provided with the package. | ||
22 | * | ||
23 | * Redistribution and use in source and binary forms, with or without | ||
24 | * modification, are permitted provided that the following conditions | ||
25 | * are met: | ||
26 | * 1. Redistributions of source code must retain the copyright | ||
27 | * notice, this list of conditions and the following disclaimer. | ||
28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
29 | * notice, this list of conditions and the following disclaimer in the | ||
30 | * documentation and/or other materials provided with the distribution. | ||
31 | * 3. All advertising materials mentioning features or use of this software | ||
32 | * must display the following acknowledgement: | ||
33 | * "This product includes cryptographic software written by | ||
34 | * Eric Young (eay@cryptsoft.com)" | ||
35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
36 | * being used are not cryptographic related :-). | ||
37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
38 | * the apps directory (application code) you must include an acknowledgement: | ||
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
40 | * | ||
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
51 | * SUCH DAMAGE. | ||
52 | * | ||
53 | * The licence and distribution terms for any publically available version or | ||
54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
55 | * copied and put under another distribution licence | ||
56 | * [including the GNU Public Licence.] | ||
57 | */ | ||
58 | |||
59 | static const unsigned char odd_parity[256]={ | ||
60 | 1, 1, 2, 2, 4, 4, 7, 7, 8, 8, 11, 11, 13, 13, 14, 14, | ||
61 | 16, 16, 19, 19, 21, 21, 22, 22, 25, 25, 26, 26, 28, 28, 31, 31, | ||
62 | 32, 32, 35, 35, 37, 37, 38, 38, 41, 41, 42, 42, 44, 44, 47, 47, | ||
63 | 49, 49, 50, 50, 52, 52, 55, 55, 56, 56, 59, 59, 61, 61, 62, 62, | ||
64 | 64, 64, 67, 67, 69, 69, 70, 70, 73, 73, 74, 74, 76, 76, 79, 79, | ||
65 | 81, 81, 82, 82, 84, 84, 87, 87, 88, 88, 91, 91, 93, 93, 94, 94, | ||
66 | 97, 97, 98, 98,100,100,103,103,104,104,107,107,109,109,110,110, | ||
67 | 112,112,115,115,117,117,118,118,121,121,122,122,124,124,127,127, | ||
68 | 128,128,131,131,133,133,134,134,137,137,138,138,140,140,143,143, | ||
69 | 145,145,146,146,148,148,151,151,152,152,155,155,157,157,158,158, | ||
70 | 161,161,162,162,164,164,167,167,168,168,171,171,173,173,174,174, | ||
71 | 176,176,179,179,181,181,182,182,185,185,186,186,188,188,191,191, | ||
72 | 193,193,194,194,196,196,199,199,200,200,203,203,205,205,206,206, | ||
73 | 208,208,211,211,213,213,214,214,217,217,218,218,220,220,223,223, | ||
74 | 224,224,227,227,229,229,230,230,233,233,234,234,236,236,239,239, | ||
75 | 241,241,242,242,244,244,247,247,248,248,251,251,253,253,254,254}; | ||
diff --git a/src/lib/libssl/src/crypto/des/qud_cksm.c b/src/lib/libssl/src/crypto/des/qud_cksm.c index 6ce8c61b42..5f0ec5387f 100644 --- a/src/lib/libssl/src/crypto/des/qud_cksm.c +++ b/src/lib/libssl/src/crypto/des/qud_cksm.c | |||
@@ -80,10 +80,14 @@ DES_LONG des_quad_cksum(const unsigned char *input, des_cblock output[], | |||
80 | int i; | 80 | int i; |
81 | long l; | 81 | long l; |
82 | const unsigned char *cp; | 82 | const unsigned char *cp; |
83 | unsigned char *lp; | 83 | #ifdef _CRAY |
84 | short *lp; | ||
85 | #else | ||
86 | DES_LONG *lp; | ||
87 | #endif | ||
84 | 88 | ||
85 | if (out_count < 1) out_count=1; | 89 | if (out_count < 1) out_count=1; |
86 | lp = &(output[0])[0]; | 90 | lp = (DES_LONG *) &(output[0])[0]; |
87 | 91 | ||
88 | z0=Q_B0((*seed)[0])|Q_B1((*seed)[1])|Q_B2((*seed)[2])|Q_B3((*seed)[3]); | 92 | z0=Q_B0((*seed)[0])|Q_B1((*seed)[1])|Q_B2((*seed)[2])|Q_B3((*seed)[3]); |
89 | z1=Q_B0((*seed)[4])|Q_B1((*seed)[5])|Q_B2((*seed)[6])|Q_B3((*seed)[7]); | 93 | z1=Q_B0((*seed)[4])|Q_B1((*seed)[5])|Q_B2((*seed)[6])|Q_B3((*seed)[7]); |
@@ -114,25 +118,10 @@ DES_LONG des_quad_cksum(const unsigned char *input, des_cblock output[], | |||
114 | } | 118 | } |
115 | if (lp != NULL) | 119 | if (lp != NULL) |
116 | { | 120 | { |
117 | /* I believe I finally have things worked out. | 121 | /* The MIT library assumes that the checksum is |
118 | * The MIT library assumes that the checksum | 122 | * composed of 2*out_count 32 bit ints */ |
119 | * is one huge number and it is returned in a | 123 | *lp++ = z0; |
120 | * host dependant byte order. | 124 | *lp++ = z1; |
121 | */ | ||
122 | static DES_LONG ltmp=1; | ||
123 | static unsigned char *c=(unsigned char *)<mp; | ||
124 | |||
125 | if (c[0]) | ||
126 | { | ||
127 | l2c(z0,lp); | ||
128 | l2c(z1,lp); | ||
129 | } | ||
130 | else | ||
131 | { | ||
132 | lp = &(output[out_count-i-1])[0]; | ||
133 | l2n(z1,lp); | ||
134 | l2n(z0,lp); | ||
135 | } | ||
136 | } | 125 | } |
137 | } | 126 | } |
138 | return(z0); | 127 | return(z0); |
diff --git a/src/lib/libssl/src/crypto/des/rand_key.c b/src/lib/libssl/src/crypto/des/rand_key.c index 7816a8f25c..ee1a6c274e 100644 --- a/src/lib/libssl/src/crypto/des/rand_key.c +++ b/src/lib/libssl/src/crypto/des/rand_key.c | |||
@@ -63,7 +63,11 @@ void des_random_seed(des_cblock *key) | |||
63 | 63 | ||
64 | int des_random_key(des_cblock *ret) | 64 | int des_random_key(des_cblock *ret) |
65 | { | 65 | { |
66 | int r = RAND_bytes((unsigned char *)ret, sizeof(des_cblock)); | 66 | do |
67 | { | ||
68 | if (RAND_bytes((unsigned char *)ret, sizeof(des_cblock)) != 1) | ||
69 | return (0); | ||
70 | } while (des_is_weak_key(ret)); | ||
67 | des_set_odd_parity(ret); | 71 | des_set_odd_parity(ret); |
68 | return r; | 72 | return (1); |
69 | } | 73 | } |
diff --git a/src/lib/libssl/src/crypto/des/set_key.c b/src/lib/libssl/src/crypto/des/set_key.c index bbdc71ba6b..09afd4fc03 100644 --- a/src/lib/libssl/src/crypto/des/set_key.c +++ b/src/lib/libssl/src/crypto/des/set_key.c | |||
@@ -64,12 +64,27 @@ | |||
64 | * 1.0 First working version | 64 | * 1.0 First working version |
65 | */ | 65 | */ |
66 | #include "des_locl.h" | 66 | #include "des_locl.h" |
67 | #include "podd.h" | ||
68 | #include "sk.h" | ||
69 | 67 | ||
70 | static int check_parity(const_des_cblock *key); | ||
71 | OPENSSL_GLOBAL int des_check_key=0; | 68 | OPENSSL_GLOBAL int des_check_key=0; |
72 | 69 | ||
70 | static const unsigned char odd_parity[256]={ | ||
71 | 1, 1, 2, 2, 4, 4, 7, 7, 8, 8, 11, 11, 13, 13, 14, 14, | ||
72 | 16, 16, 19, 19, 21, 21, 22, 22, 25, 25, 26, 26, 28, 28, 31, 31, | ||
73 | 32, 32, 35, 35, 37, 37, 38, 38, 41, 41, 42, 42, 44, 44, 47, 47, | ||
74 | 49, 49, 50, 50, 52, 52, 55, 55, 56, 56, 59, 59, 61, 61, 62, 62, | ||
75 | 64, 64, 67, 67, 69, 69, 70, 70, 73, 73, 74, 74, 76, 76, 79, 79, | ||
76 | 81, 81, 82, 82, 84, 84, 87, 87, 88, 88, 91, 91, 93, 93, 94, 94, | ||
77 | 97, 97, 98, 98,100,100,103,103,104,104,107,107,109,109,110,110, | ||
78 | 112,112,115,115,117,117,118,118,121,121,122,122,124,124,127,127, | ||
79 | 128,128,131,131,133,133,134,134,137,137,138,138,140,140,143,143, | ||
80 | 145,145,146,146,148,148,151,151,152,152,155,155,157,157,158,158, | ||
81 | 161,161,162,162,164,164,167,167,168,168,171,171,173,173,174,174, | ||
82 | 176,176,179,179,181,181,182,182,185,185,186,186,188,188,191,191, | ||
83 | 193,193,194,194,196,196,199,199,200,200,203,203,205,205,206,206, | ||
84 | 208,208,211,211,213,213,214,214,217,217,218,218,220,220,223,223, | ||
85 | 224,224,227,227,229,229,230,230,233,233,234,234,236,236,239,239, | ||
86 | 241,241,242,242,244,244,247,247,248,248,251,251,253,253,254,254}; | ||
87 | |||
73 | void des_set_odd_parity(des_cblock *key) | 88 | void des_set_odd_parity(des_cblock *key) |
74 | { | 89 | { |
75 | int i; | 90 | int i; |
@@ -78,7 +93,7 @@ void des_set_odd_parity(des_cblock *key) | |||
78 | (*key)[i]=odd_parity[(*key)[i]]; | 93 | (*key)[i]=odd_parity[(*key)[i]]; |
79 | } | 94 | } |
80 | 95 | ||
81 | static int check_parity(const_des_cblock *key) | 96 | int des_check_key_parity(const_des_cblock *key) |
82 | { | 97 | { |
83 | int i; | 98 | int i; |
84 | 99 | ||
@@ -145,6 +160,153 @@ int des_is_weak_key(const_des_cblock *key) | |||
145 | #define HPERM_OP(a,t,n,m) ((t)=((((a)<<(16-(n)))^(a))&(m)),\ | 160 | #define HPERM_OP(a,t,n,m) ((t)=((((a)<<(16-(n)))^(a))&(m)),\ |
146 | (a)=(a)^(t)^(t>>(16-(n)))) | 161 | (a)=(a)^(t)^(t>>(16-(n)))) |
147 | 162 | ||
163 | static const DES_LONG des_skb[8][64]={ | ||
164 | { | ||
165 | /* for C bits (numbered as per FIPS 46) 1 2 3 4 5 6 */ | ||
166 | 0x00000000L,0x00000010L,0x20000000L,0x20000010L, | ||
167 | 0x00010000L,0x00010010L,0x20010000L,0x20010010L, | ||
168 | 0x00000800L,0x00000810L,0x20000800L,0x20000810L, | ||
169 | 0x00010800L,0x00010810L,0x20010800L,0x20010810L, | ||
170 | 0x00000020L,0x00000030L,0x20000020L,0x20000030L, | ||
171 | 0x00010020L,0x00010030L,0x20010020L,0x20010030L, | ||
172 | 0x00000820L,0x00000830L,0x20000820L,0x20000830L, | ||
173 | 0x00010820L,0x00010830L,0x20010820L,0x20010830L, | ||
174 | 0x00080000L,0x00080010L,0x20080000L,0x20080010L, | ||
175 | 0x00090000L,0x00090010L,0x20090000L,0x20090010L, | ||
176 | 0x00080800L,0x00080810L,0x20080800L,0x20080810L, | ||
177 | 0x00090800L,0x00090810L,0x20090800L,0x20090810L, | ||
178 | 0x00080020L,0x00080030L,0x20080020L,0x20080030L, | ||
179 | 0x00090020L,0x00090030L,0x20090020L,0x20090030L, | ||
180 | 0x00080820L,0x00080830L,0x20080820L,0x20080830L, | ||
181 | 0x00090820L,0x00090830L,0x20090820L,0x20090830L, | ||
182 | },{ | ||
183 | /* for C bits (numbered as per FIPS 46) 7 8 10 11 12 13 */ | ||
184 | 0x00000000L,0x02000000L,0x00002000L,0x02002000L, | ||
185 | 0x00200000L,0x02200000L,0x00202000L,0x02202000L, | ||
186 | 0x00000004L,0x02000004L,0x00002004L,0x02002004L, | ||
187 | 0x00200004L,0x02200004L,0x00202004L,0x02202004L, | ||
188 | 0x00000400L,0x02000400L,0x00002400L,0x02002400L, | ||
189 | 0x00200400L,0x02200400L,0x00202400L,0x02202400L, | ||
190 | 0x00000404L,0x02000404L,0x00002404L,0x02002404L, | ||
191 | 0x00200404L,0x02200404L,0x00202404L,0x02202404L, | ||
192 | 0x10000000L,0x12000000L,0x10002000L,0x12002000L, | ||
193 | 0x10200000L,0x12200000L,0x10202000L,0x12202000L, | ||
194 | 0x10000004L,0x12000004L,0x10002004L,0x12002004L, | ||
195 | 0x10200004L,0x12200004L,0x10202004L,0x12202004L, | ||
196 | 0x10000400L,0x12000400L,0x10002400L,0x12002400L, | ||
197 | 0x10200400L,0x12200400L,0x10202400L,0x12202400L, | ||
198 | 0x10000404L,0x12000404L,0x10002404L,0x12002404L, | ||
199 | 0x10200404L,0x12200404L,0x10202404L,0x12202404L, | ||
200 | },{ | ||
201 | /* for C bits (numbered as per FIPS 46) 14 15 16 17 19 20 */ | ||
202 | 0x00000000L,0x00000001L,0x00040000L,0x00040001L, | ||
203 | 0x01000000L,0x01000001L,0x01040000L,0x01040001L, | ||
204 | 0x00000002L,0x00000003L,0x00040002L,0x00040003L, | ||
205 | 0x01000002L,0x01000003L,0x01040002L,0x01040003L, | ||
206 | 0x00000200L,0x00000201L,0x00040200L,0x00040201L, | ||
207 | 0x01000200L,0x01000201L,0x01040200L,0x01040201L, | ||
208 | 0x00000202L,0x00000203L,0x00040202L,0x00040203L, | ||
209 | 0x01000202L,0x01000203L,0x01040202L,0x01040203L, | ||
210 | 0x08000000L,0x08000001L,0x08040000L,0x08040001L, | ||
211 | 0x09000000L,0x09000001L,0x09040000L,0x09040001L, | ||
212 | 0x08000002L,0x08000003L,0x08040002L,0x08040003L, | ||
213 | 0x09000002L,0x09000003L,0x09040002L,0x09040003L, | ||
214 | 0x08000200L,0x08000201L,0x08040200L,0x08040201L, | ||
215 | 0x09000200L,0x09000201L,0x09040200L,0x09040201L, | ||
216 | 0x08000202L,0x08000203L,0x08040202L,0x08040203L, | ||
217 | 0x09000202L,0x09000203L,0x09040202L,0x09040203L, | ||
218 | },{ | ||
219 | /* for C bits (numbered as per FIPS 46) 21 23 24 26 27 28 */ | ||
220 | 0x00000000L,0x00100000L,0x00000100L,0x00100100L, | ||
221 | 0x00000008L,0x00100008L,0x00000108L,0x00100108L, | ||
222 | 0x00001000L,0x00101000L,0x00001100L,0x00101100L, | ||
223 | 0x00001008L,0x00101008L,0x00001108L,0x00101108L, | ||
224 | 0x04000000L,0x04100000L,0x04000100L,0x04100100L, | ||
225 | 0x04000008L,0x04100008L,0x04000108L,0x04100108L, | ||
226 | 0x04001000L,0x04101000L,0x04001100L,0x04101100L, | ||
227 | 0x04001008L,0x04101008L,0x04001108L,0x04101108L, | ||
228 | 0x00020000L,0x00120000L,0x00020100L,0x00120100L, | ||
229 | 0x00020008L,0x00120008L,0x00020108L,0x00120108L, | ||
230 | 0x00021000L,0x00121000L,0x00021100L,0x00121100L, | ||
231 | 0x00021008L,0x00121008L,0x00021108L,0x00121108L, | ||
232 | 0x04020000L,0x04120000L,0x04020100L,0x04120100L, | ||
233 | 0x04020008L,0x04120008L,0x04020108L,0x04120108L, | ||
234 | 0x04021000L,0x04121000L,0x04021100L,0x04121100L, | ||
235 | 0x04021008L,0x04121008L,0x04021108L,0x04121108L, | ||
236 | },{ | ||
237 | /* for D bits (numbered as per FIPS 46) 1 2 3 4 5 6 */ | ||
238 | 0x00000000L,0x10000000L,0x00010000L,0x10010000L, | ||
239 | 0x00000004L,0x10000004L,0x00010004L,0x10010004L, | ||
240 | 0x20000000L,0x30000000L,0x20010000L,0x30010000L, | ||
241 | 0x20000004L,0x30000004L,0x20010004L,0x30010004L, | ||
242 | 0x00100000L,0x10100000L,0x00110000L,0x10110000L, | ||
243 | 0x00100004L,0x10100004L,0x00110004L,0x10110004L, | ||
244 | 0x20100000L,0x30100000L,0x20110000L,0x30110000L, | ||
245 | 0x20100004L,0x30100004L,0x20110004L,0x30110004L, | ||
246 | 0x00001000L,0x10001000L,0x00011000L,0x10011000L, | ||
247 | 0x00001004L,0x10001004L,0x00011004L,0x10011004L, | ||
248 | 0x20001000L,0x30001000L,0x20011000L,0x30011000L, | ||
249 | 0x20001004L,0x30001004L,0x20011004L,0x30011004L, | ||
250 | 0x00101000L,0x10101000L,0x00111000L,0x10111000L, | ||
251 | 0x00101004L,0x10101004L,0x00111004L,0x10111004L, | ||
252 | 0x20101000L,0x30101000L,0x20111000L,0x30111000L, | ||
253 | 0x20101004L,0x30101004L,0x20111004L,0x30111004L, | ||
254 | },{ | ||
255 | /* for D bits (numbered as per FIPS 46) 8 9 11 12 13 14 */ | ||
256 | 0x00000000L,0x08000000L,0x00000008L,0x08000008L, | ||
257 | 0x00000400L,0x08000400L,0x00000408L,0x08000408L, | ||
258 | 0x00020000L,0x08020000L,0x00020008L,0x08020008L, | ||
259 | 0x00020400L,0x08020400L,0x00020408L,0x08020408L, | ||
260 | 0x00000001L,0x08000001L,0x00000009L,0x08000009L, | ||
261 | 0x00000401L,0x08000401L,0x00000409L,0x08000409L, | ||
262 | 0x00020001L,0x08020001L,0x00020009L,0x08020009L, | ||
263 | 0x00020401L,0x08020401L,0x00020409L,0x08020409L, | ||
264 | 0x02000000L,0x0A000000L,0x02000008L,0x0A000008L, | ||
265 | 0x02000400L,0x0A000400L,0x02000408L,0x0A000408L, | ||
266 | 0x02020000L,0x0A020000L,0x02020008L,0x0A020008L, | ||
267 | 0x02020400L,0x0A020400L,0x02020408L,0x0A020408L, | ||
268 | 0x02000001L,0x0A000001L,0x02000009L,0x0A000009L, | ||
269 | 0x02000401L,0x0A000401L,0x02000409L,0x0A000409L, | ||
270 | 0x02020001L,0x0A020001L,0x02020009L,0x0A020009L, | ||
271 | 0x02020401L,0x0A020401L,0x02020409L,0x0A020409L, | ||
272 | },{ | ||
273 | /* for D bits (numbered as per FIPS 46) 16 17 18 19 20 21 */ | ||
274 | 0x00000000L,0x00000100L,0x00080000L,0x00080100L, | ||
275 | 0x01000000L,0x01000100L,0x01080000L,0x01080100L, | ||
276 | 0x00000010L,0x00000110L,0x00080010L,0x00080110L, | ||
277 | 0x01000010L,0x01000110L,0x01080010L,0x01080110L, | ||
278 | 0x00200000L,0x00200100L,0x00280000L,0x00280100L, | ||
279 | 0x01200000L,0x01200100L,0x01280000L,0x01280100L, | ||
280 | 0x00200010L,0x00200110L,0x00280010L,0x00280110L, | ||
281 | 0x01200010L,0x01200110L,0x01280010L,0x01280110L, | ||
282 | 0x00000200L,0x00000300L,0x00080200L,0x00080300L, | ||
283 | 0x01000200L,0x01000300L,0x01080200L,0x01080300L, | ||
284 | 0x00000210L,0x00000310L,0x00080210L,0x00080310L, | ||
285 | 0x01000210L,0x01000310L,0x01080210L,0x01080310L, | ||
286 | 0x00200200L,0x00200300L,0x00280200L,0x00280300L, | ||
287 | 0x01200200L,0x01200300L,0x01280200L,0x01280300L, | ||
288 | 0x00200210L,0x00200310L,0x00280210L,0x00280310L, | ||
289 | 0x01200210L,0x01200310L,0x01280210L,0x01280310L, | ||
290 | },{ | ||
291 | /* for D bits (numbered as per FIPS 46) 22 23 24 25 27 28 */ | ||
292 | 0x00000000L,0x04000000L,0x00040000L,0x04040000L, | ||
293 | 0x00000002L,0x04000002L,0x00040002L,0x04040002L, | ||
294 | 0x00002000L,0x04002000L,0x00042000L,0x04042000L, | ||
295 | 0x00002002L,0x04002002L,0x00042002L,0x04042002L, | ||
296 | 0x00000020L,0x04000020L,0x00040020L,0x04040020L, | ||
297 | 0x00000022L,0x04000022L,0x00040022L,0x04040022L, | ||
298 | 0x00002020L,0x04002020L,0x00042020L,0x04042020L, | ||
299 | 0x00002022L,0x04002022L,0x00042022L,0x04042022L, | ||
300 | 0x00000800L,0x04000800L,0x00040800L,0x04040800L, | ||
301 | 0x00000802L,0x04000802L,0x00040802L,0x04040802L, | ||
302 | 0x00002800L,0x04002800L,0x00042800L,0x04042800L, | ||
303 | 0x00002802L,0x04002802L,0x00042802L,0x04042802L, | ||
304 | 0x00000820L,0x04000820L,0x00040820L,0x04040820L, | ||
305 | 0x00000822L,0x04000822L,0x00040822L,0x04040822L, | ||
306 | 0x00002820L,0x04002820L,0x00042820L,0x04042820L, | ||
307 | 0x00002822L,0x04002822L,0x00042822L,0x04042822L, | ||
308 | }}; | ||
309 | |||
148 | int des_set_key(const_des_cblock *key, des_key_schedule schedule) | 310 | int des_set_key(const_des_cblock *key, des_key_schedule schedule) |
149 | { | 311 | { |
150 | if (des_check_key) | 312 | if (des_check_key) |
@@ -164,7 +326,7 @@ int des_set_key(const_des_cblock *key, des_key_schedule schedule) | |||
164 | */ | 326 | */ |
165 | int des_set_key_checked(const_des_cblock *key, des_key_schedule schedule) | 327 | int des_set_key_checked(const_des_cblock *key, des_key_schedule schedule) |
166 | { | 328 | { |
167 | if (!check_parity(key)) | 329 | if (!des_check_key_parity(key)) |
168 | return(-1); | 330 | return(-1); |
169 | if (des_is_weak_key(key)) | 331 | if (des_is_weak_key(key)) |
170 | return(-2); | 332 | return(-2); |
@@ -186,20 +348,7 @@ void des_set_key_unchecked(const_des_cblock *key, des_key_schedule schedule) | |||
186 | c2l(in,c); | 348 | c2l(in,c); |
187 | c2l(in,d); | 349 | c2l(in,d); |
188 | 350 | ||
189 | /* do PC1 in 60 simple operations */ | 351 | /* do PC1 in 47 simple operations :-) |
190 | /* PERM_OP(d,c,t,4,0x0f0f0f0fL); | ||
191 | HPERM_OP(c,t,-2, 0xcccc0000L); | ||
192 | HPERM_OP(c,t,-1, 0xaaaa0000L); | ||
193 | HPERM_OP(c,t, 8, 0x00ff0000L); | ||
194 | HPERM_OP(c,t,-1, 0xaaaa0000L); | ||
195 | HPERM_OP(d,t,-8, 0xff000000L); | ||
196 | HPERM_OP(d,t, 8, 0x00ff0000L); | ||
197 | HPERM_OP(d,t, 2, 0x33330000L); | ||
198 | d=((d&0x00aa00aaL)<<7L)|((d&0x55005500L)>>7L)|(d&0xaa55aa55L); | ||
199 | d=(d>>8)|((c&0xf0000000L)>>4); | ||
200 | c&=0x0fffffffL; */ | ||
201 | |||
202 | /* I now do it in 47 simple operations :-) | ||
203 | * Thanks to John Fletcher (john_fletcher@lccmail.ocf.llnl.gov) | 352 | * Thanks to John Fletcher (john_fletcher@lccmail.ocf.llnl.gov) |
204 | * for the inspiration. :-) */ | 353 | * for the inspiration. :-) */ |
205 | PERM_OP (d,c,t,4,0x0f0f0f0fL); | 354 | PERM_OP (d,c,t,4,0x0f0f0f0fL); |
@@ -223,9 +372,9 @@ void des_set_key_unchecked(const_des_cblock *key, des_key_schedule schedule) | |||
223 | /* could be a few less shifts but I am to lazy at this | 372 | /* could be a few less shifts but I am to lazy at this |
224 | * point in time to investigate */ | 373 | * point in time to investigate */ |
225 | s= des_skb[0][ (c )&0x3f ]| | 374 | s= des_skb[0][ (c )&0x3f ]| |
226 | des_skb[1][((c>> 6)&0x03)|((c>> 7L)&0x3c)]| | 375 | des_skb[1][((c>> 6L)&0x03)|((c>> 7L)&0x3c)]| |
227 | des_skb[2][((c>>13)&0x0f)|((c>>14L)&0x30)]| | 376 | des_skb[2][((c>>13L)&0x0f)|((c>>14L)&0x30)]| |
228 | des_skb[3][((c>>20)&0x01)|((c>>21L)&0x06) | | 377 | des_skb[3][((c>>20L)&0x01)|((c>>21L)&0x06) | |
229 | ((c>>22L)&0x38)]; | 378 | ((c>>22L)&0x38)]; |
230 | t= des_skb[4][ (d )&0x3f ]| | 379 | t= des_skb[4][ (d )&0x3f ]| |
231 | des_skb[5][((d>> 7L)&0x03)|((d>> 8L)&0x3c)]| | 380 | des_skb[5][((d>> 7L)&0x03)|((d>> 8L)&0x3c)]| |
@@ -245,3 +394,9 @@ int des_key_sched(const_des_cblock *key, des_key_schedule schedule) | |||
245 | { | 394 | { |
246 | return(des_set_key(key,schedule)); | 395 | return(des_set_key(key,schedule)); |
247 | } | 396 | } |
397 | |||
398 | #undef des_fixup_key_parity | ||
399 | void des_fixup_key_parity(des_cblock *key) | ||
400 | { | ||
401 | des_set_odd_parity(key); | ||
402 | } | ||
diff --git a/src/lib/libssl/src/crypto/des/shifts.pl b/src/lib/libssl/src/crypto/des/shifts.pl index ba686d8ef5..e69de29bb2 100644 --- a/src/lib/libssl/src/crypto/des/shifts.pl +++ b/src/lib/libssl/src/crypto/des/shifts.pl | |||
@@ -1,198 +0,0 @@ | |||
1 | #!/usr/local/bin/perl | ||
2 | |||
3 | sub lab_shift | ||
4 | { | ||
5 | local(*a,$n)=@_; | ||
6 | local(@r,$i,$j,$k,$d,@z); | ||
7 | |||
8 | @r=&shift(*a,$n); | ||
9 | foreach $i (0 .. 31) | ||
10 | { | ||
11 | @z=split(/\^/,$r[$i]); | ||
12 | for ($j=0; $j <= $#z; $j++) | ||
13 | { | ||
14 | ($d)=($z[$j] =~ /^(..)/); | ||
15 | ($k)=($z[$j] =~ /\[(.*)\]$/); | ||
16 | $k.=",$n" if ($k ne ""); | ||
17 | $k="$n" if ($k eq ""); | ||
18 | $d="$d[$k]"; | ||
19 | $z[$j]=$d; | ||
20 | } | ||
21 | $r[$i]=join('^',@z); | ||
22 | } | ||
23 | return(@r); | ||
24 | } | ||
25 | |||
26 | sub shift | ||
27 | { | ||
28 | local(*a,$n)=@_; | ||
29 | local(@f); | ||
30 | |||
31 | if ($n > 0) | ||
32 | { | ||
33 | @f=&shiftl(*a,$n); | ||
34 | } | ||
35 | else | ||
36 | { | ||
37 | @f=&shiftr(*a,-$n); | ||
38 | } | ||
39 | return(@f); | ||
40 | } | ||
41 | |||
42 | sub rotate | ||
43 | { | ||
44 | local(*a,$n)=@_; | ||
45 | local(@f); | ||
46 | |||
47 | if ($n > 0) | ||
48 | { @f=&rotatel(*a,$n); } | ||
49 | else | ||
50 | { @f=&rotater(*a,-$n); } | ||
51 | return(@f); | ||
52 | } | ||
53 | |||
54 | sub rotater | ||
55 | { | ||
56 | local(*a,$n)=@_; | ||
57 | local(@f,@g); | ||
58 | |||
59 | @f=&shiftr(*a,$n); | ||
60 | @g=&shiftl(*a,32-$n); | ||
61 | $#f=31; | ||
62 | $#g=31; | ||
63 | return(&or(*f,*g)); | ||
64 | } | ||
65 | |||
66 | sub rotatel | ||
67 | { | ||
68 | local(*a,$n)=@_; | ||
69 | local(@f,@g); | ||
70 | |||
71 | @f=&shiftl(*a,$n); | ||
72 | @g=&shiftr(*a,32-$n); | ||
73 | $#f=31; | ||
74 | $#g=31; | ||
75 | return(&or(*f,*g)); | ||
76 | } | ||
77 | |||
78 | sub shiftr | ||
79 | { | ||
80 | local(*a,$n)=@_; | ||
81 | local(@r,$i); | ||
82 | |||
83 | $#r=31; | ||
84 | foreach $i (0 .. 31) | ||
85 | { | ||
86 | if (($i+$n) > 31) | ||
87 | { | ||
88 | $r[$i]="--"; | ||
89 | } | ||
90 | else | ||
91 | { | ||
92 | $r[$i]=$a[$i+$n]; | ||
93 | } | ||
94 | } | ||
95 | return(@r); | ||
96 | } | ||
97 | |||
98 | sub shiftl | ||
99 | { | ||
100 | local(*a,$n)=@_; | ||
101 | local(@r,$i); | ||
102 | |||
103 | $#r=31; | ||
104 | foreach $i (0 .. 31) | ||
105 | { | ||
106 | if ($i < $n) | ||
107 | { | ||
108 | $r[$i]="--"; | ||
109 | } | ||
110 | else | ||
111 | { | ||
112 | $r[$i]=$a[$i-$n]; | ||
113 | } | ||
114 | } | ||
115 | return(@r); | ||
116 | } | ||
117 | |||
118 | sub printit | ||
119 | { | ||
120 | local(@a)=@_; | ||
121 | local($i); | ||
122 | |||
123 | foreach $i (0 .. 31) | ||
124 | { | ||
125 | printf "%2s ",$a[$i]; | ||
126 | print "\n" if (($i%8) == 7); | ||
127 | } | ||
128 | print "\n"; | ||
129 | } | ||
130 | |||
131 | sub xor | ||
132 | { | ||
133 | local(*a,*b)=@_; | ||
134 | local(@r,$i); | ||
135 | |||
136 | $#r=31; | ||
137 | foreach $i (0 .. 31) | ||
138 | { | ||
139 | $r[$i]=&compress($a[$i].'^'.$b[$i]); | ||
140 | # $r[$i]=$a[$i]."^".$b[$i]; | ||
141 | } | ||
142 | return(@r); | ||
143 | } | ||
144 | |||
145 | sub and | ||
146 | { | ||
147 | local(*a,$m)=@_; | ||
148 | local(@r,$i); | ||
149 | |||
150 | $#r=31; | ||
151 | foreach $i (0 .. 31) | ||
152 | { | ||
153 | $r[$i]=(($m & (1<<$i))?($a[$i]):('--')); | ||
154 | } | ||
155 | return(@r); | ||
156 | } | ||
157 | |||
158 | sub or | ||
159 | { | ||
160 | local(*a,*b)=@_; | ||
161 | local(@r,$i); | ||
162 | |||
163 | $#r=31; | ||
164 | foreach $i (0 .. 31) | ||
165 | { | ||
166 | $r[$i]='--' if (($a[$i] eq '--') && ($b[$i] eq '--')); | ||
167 | $r[$i]=$a[$i] if (($a[$i] ne '--') && ($b[$i] eq '--')); | ||
168 | $r[$i]=$b[$i] if (($a[$i] eq '--') && ($b[$i] ne '--')); | ||
169 | $r[$i]='++' if (($a[$i] ne '--') && ($b[$i] ne '--')); | ||
170 | } | ||
171 | return(@r); | ||
172 | } | ||
173 | |||
174 | sub compress | ||
175 | { | ||
176 | local($s)=@_; | ||
177 | local($_,$i,@a,%a,$r); | ||
178 | |||
179 | $s =~ s/\^\^/\^/g; | ||
180 | $s =~ s/^\^//; | ||
181 | $s =~ s/\^$//; | ||
182 | @a=split(/\^/,$s); | ||
183 | |||
184 | while ($#a >= 0) | ||
185 | { | ||
186 | $_=shift(@a); | ||
187 | next unless /\d/; | ||
188 | $a{$_}++; | ||
189 | } | ||
190 | foreach $i (sort keys %a) | ||
191 | { | ||
192 | next if ($a{$i}%2 == 0); | ||
193 | $r.="$i^"; | ||
194 | } | ||
195 | chop($r); | ||
196 | return($r); | ||
197 | } | ||
198 | 1; | ||
diff --git a/src/lib/libssl/src/crypto/des/sk.h b/src/lib/libssl/src/crypto/des/sk.h index f2ade88c7c..e69de29bb2 100644 --- a/src/lib/libssl/src/crypto/des/sk.h +++ b/src/lib/libssl/src/crypto/des/sk.h | |||
@@ -1,204 +0,0 @@ | |||
1 | /* crypto/des/sk.h */ | ||
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
3 | * All rights reserved. | ||
4 | * | ||
5 | * This package is an SSL implementation written | ||
6 | * by Eric Young (eay@cryptsoft.com). | ||
7 | * The implementation was written so as to conform with Netscapes SSL. | ||
8 | * | ||
9 | * This library is free for commercial and non-commercial use as long as | ||
10 | * the following conditions are aheared to. The following conditions | ||
11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
13 | * included with this distribution is covered by the same copyright terms | ||
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
15 | * | ||
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
17 | * the code are not to be removed. | ||
18 | * If this package is used in a product, Eric Young should be given attribution | ||
19 | * as the author of the parts of the library used. | ||
20 | * This can be in the form of a textual message at program startup or | ||
21 | * in documentation (online or textual) provided with the package. | ||
22 | * | ||
23 | * Redistribution and use in source and binary forms, with or without | ||
24 | * modification, are permitted provided that the following conditions | ||
25 | * are met: | ||
26 | * 1. Redistributions of source code must retain the copyright | ||
27 | * notice, this list of conditions and the following disclaimer. | ||
28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
29 | * notice, this list of conditions and the following disclaimer in the | ||
30 | * documentation and/or other materials provided with the distribution. | ||
31 | * 3. All advertising materials mentioning features or use of this software | ||
32 | * must display the following acknowledgement: | ||
33 | * "This product includes cryptographic software written by | ||
34 | * Eric Young (eay@cryptsoft.com)" | ||
35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
36 | * being used are not cryptographic related :-). | ||
37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
38 | * the apps directory (application code) you must include an acknowledgement: | ||
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
40 | * | ||
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
51 | * SUCH DAMAGE. | ||
52 | * | ||
53 | * The licence and distribution terms for any publically available version or | ||
54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
55 | * copied and put under another distribution licence | ||
56 | * [including the GNU Public Licence.] | ||
57 | */ | ||
58 | |||
59 | static const DES_LONG des_skb[8][64]={ | ||
60 | { | ||
61 | /* for C bits (numbered as per FIPS 46) 1 2 3 4 5 6 */ | ||
62 | 0x00000000L,0x00000010L,0x20000000L,0x20000010L, | ||
63 | 0x00010000L,0x00010010L,0x20010000L,0x20010010L, | ||
64 | 0x00000800L,0x00000810L,0x20000800L,0x20000810L, | ||
65 | 0x00010800L,0x00010810L,0x20010800L,0x20010810L, | ||
66 | 0x00000020L,0x00000030L,0x20000020L,0x20000030L, | ||
67 | 0x00010020L,0x00010030L,0x20010020L,0x20010030L, | ||
68 | 0x00000820L,0x00000830L,0x20000820L,0x20000830L, | ||
69 | 0x00010820L,0x00010830L,0x20010820L,0x20010830L, | ||
70 | 0x00080000L,0x00080010L,0x20080000L,0x20080010L, | ||
71 | 0x00090000L,0x00090010L,0x20090000L,0x20090010L, | ||
72 | 0x00080800L,0x00080810L,0x20080800L,0x20080810L, | ||
73 | 0x00090800L,0x00090810L,0x20090800L,0x20090810L, | ||
74 | 0x00080020L,0x00080030L,0x20080020L,0x20080030L, | ||
75 | 0x00090020L,0x00090030L,0x20090020L,0x20090030L, | ||
76 | 0x00080820L,0x00080830L,0x20080820L,0x20080830L, | ||
77 | 0x00090820L,0x00090830L,0x20090820L,0x20090830L, | ||
78 | },{ | ||
79 | /* for C bits (numbered as per FIPS 46) 7 8 10 11 12 13 */ | ||
80 | 0x00000000L,0x02000000L,0x00002000L,0x02002000L, | ||
81 | 0x00200000L,0x02200000L,0x00202000L,0x02202000L, | ||
82 | 0x00000004L,0x02000004L,0x00002004L,0x02002004L, | ||
83 | 0x00200004L,0x02200004L,0x00202004L,0x02202004L, | ||
84 | 0x00000400L,0x02000400L,0x00002400L,0x02002400L, | ||
85 | 0x00200400L,0x02200400L,0x00202400L,0x02202400L, | ||
86 | 0x00000404L,0x02000404L,0x00002404L,0x02002404L, | ||
87 | 0x00200404L,0x02200404L,0x00202404L,0x02202404L, | ||
88 | 0x10000000L,0x12000000L,0x10002000L,0x12002000L, | ||
89 | 0x10200000L,0x12200000L,0x10202000L,0x12202000L, | ||
90 | 0x10000004L,0x12000004L,0x10002004L,0x12002004L, | ||
91 | 0x10200004L,0x12200004L,0x10202004L,0x12202004L, | ||
92 | 0x10000400L,0x12000400L,0x10002400L,0x12002400L, | ||
93 | 0x10200400L,0x12200400L,0x10202400L,0x12202400L, | ||
94 | 0x10000404L,0x12000404L,0x10002404L,0x12002404L, | ||
95 | 0x10200404L,0x12200404L,0x10202404L,0x12202404L, | ||
96 | },{ | ||
97 | /* for C bits (numbered as per FIPS 46) 14 15 16 17 19 20 */ | ||
98 | 0x00000000L,0x00000001L,0x00040000L,0x00040001L, | ||
99 | 0x01000000L,0x01000001L,0x01040000L,0x01040001L, | ||
100 | 0x00000002L,0x00000003L,0x00040002L,0x00040003L, | ||
101 | 0x01000002L,0x01000003L,0x01040002L,0x01040003L, | ||
102 | 0x00000200L,0x00000201L,0x00040200L,0x00040201L, | ||
103 | 0x01000200L,0x01000201L,0x01040200L,0x01040201L, | ||
104 | 0x00000202L,0x00000203L,0x00040202L,0x00040203L, | ||
105 | 0x01000202L,0x01000203L,0x01040202L,0x01040203L, | ||
106 | 0x08000000L,0x08000001L,0x08040000L,0x08040001L, | ||
107 | 0x09000000L,0x09000001L,0x09040000L,0x09040001L, | ||
108 | 0x08000002L,0x08000003L,0x08040002L,0x08040003L, | ||
109 | 0x09000002L,0x09000003L,0x09040002L,0x09040003L, | ||
110 | 0x08000200L,0x08000201L,0x08040200L,0x08040201L, | ||
111 | 0x09000200L,0x09000201L,0x09040200L,0x09040201L, | ||
112 | 0x08000202L,0x08000203L,0x08040202L,0x08040203L, | ||
113 | 0x09000202L,0x09000203L,0x09040202L,0x09040203L, | ||
114 | },{ | ||
115 | /* for C bits (numbered as per FIPS 46) 21 23 24 26 27 28 */ | ||
116 | 0x00000000L,0x00100000L,0x00000100L,0x00100100L, | ||
117 | 0x00000008L,0x00100008L,0x00000108L,0x00100108L, | ||
118 | 0x00001000L,0x00101000L,0x00001100L,0x00101100L, | ||
119 | 0x00001008L,0x00101008L,0x00001108L,0x00101108L, | ||
120 | 0x04000000L,0x04100000L,0x04000100L,0x04100100L, | ||
121 | 0x04000008L,0x04100008L,0x04000108L,0x04100108L, | ||
122 | 0x04001000L,0x04101000L,0x04001100L,0x04101100L, | ||
123 | 0x04001008L,0x04101008L,0x04001108L,0x04101108L, | ||
124 | 0x00020000L,0x00120000L,0x00020100L,0x00120100L, | ||
125 | 0x00020008L,0x00120008L,0x00020108L,0x00120108L, | ||
126 | 0x00021000L,0x00121000L,0x00021100L,0x00121100L, | ||
127 | 0x00021008L,0x00121008L,0x00021108L,0x00121108L, | ||
128 | 0x04020000L,0x04120000L,0x04020100L,0x04120100L, | ||
129 | 0x04020008L,0x04120008L,0x04020108L,0x04120108L, | ||
130 | 0x04021000L,0x04121000L,0x04021100L,0x04121100L, | ||
131 | 0x04021008L,0x04121008L,0x04021108L,0x04121108L, | ||
132 | },{ | ||
133 | /* for D bits (numbered as per FIPS 46) 1 2 3 4 5 6 */ | ||
134 | 0x00000000L,0x10000000L,0x00010000L,0x10010000L, | ||
135 | 0x00000004L,0x10000004L,0x00010004L,0x10010004L, | ||
136 | 0x20000000L,0x30000000L,0x20010000L,0x30010000L, | ||
137 | 0x20000004L,0x30000004L,0x20010004L,0x30010004L, | ||
138 | 0x00100000L,0x10100000L,0x00110000L,0x10110000L, | ||
139 | 0x00100004L,0x10100004L,0x00110004L,0x10110004L, | ||
140 | 0x20100000L,0x30100000L,0x20110000L,0x30110000L, | ||
141 | 0x20100004L,0x30100004L,0x20110004L,0x30110004L, | ||
142 | 0x00001000L,0x10001000L,0x00011000L,0x10011000L, | ||
143 | 0x00001004L,0x10001004L,0x00011004L,0x10011004L, | ||
144 | 0x20001000L,0x30001000L,0x20011000L,0x30011000L, | ||
145 | 0x20001004L,0x30001004L,0x20011004L,0x30011004L, | ||
146 | 0x00101000L,0x10101000L,0x00111000L,0x10111000L, | ||
147 | 0x00101004L,0x10101004L,0x00111004L,0x10111004L, | ||
148 | 0x20101000L,0x30101000L,0x20111000L,0x30111000L, | ||
149 | 0x20101004L,0x30101004L,0x20111004L,0x30111004L, | ||
150 | },{ | ||
151 | /* for D bits (numbered as per FIPS 46) 8 9 11 12 13 14 */ | ||
152 | 0x00000000L,0x08000000L,0x00000008L,0x08000008L, | ||
153 | 0x00000400L,0x08000400L,0x00000408L,0x08000408L, | ||
154 | 0x00020000L,0x08020000L,0x00020008L,0x08020008L, | ||
155 | 0x00020400L,0x08020400L,0x00020408L,0x08020408L, | ||
156 | 0x00000001L,0x08000001L,0x00000009L,0x08000009L, | ||
157 | 0x00000401L,0x08000401L,0x00000409L,0x08000409L, | ||
158 | 0x00020001L,0x08020001L,0x00020009L,0x08020009L, | ||
159 | 0x00020401L,0x08020401L,0x00020409L,0x08020409L, | ||
160 | 0x02000000L,0x0A000000L,0x02000008L,0x0A000008L, | ||
161 | 0x02000400L,0x0A000400L,0x02000408L,0x0A000408L, | ||
162 | 0x02020000L,0x0A020000L,0x02020008L,0x0A020008L, | ||
163 | 0x02020400L,0x0A020400L,0x02020408L,0x0A020408L, | ||
164 | 0x02000001L,0x0A000001L,0x02000009L,0x0A000009L, | ||
165 | 0x02000401L,0x0A000401L,0x02000409L,0x0A000409L, | ||
166 | 0x02020001L,0x0A020001L,0x02020009L,0x0A020009L, | ||
167 | 0x02020401L,0x0A020401L,0x02020409L,0x0A020409L, | ||
168 | },{ | ||
169 | /* for D bits (numbered as per FIPS 46) 16 17 18 19 20 21 */ | ||
170 | 0x00000000L,0x00000100L,0x00080000L,0x00080100L, | ||
171 | 0x01000000L,0x01000100L,0x01080000L,0x01080100L, | ||
172 | 0x00000010L,0x00000110L,0x00080010L,0x00080110L, | ||
173 | 0x01000010L,0x01000110L,0x01080010L,0x01080110L, | ||
174 | 0x00200000L,0x00200100L,0x00280000L,0x00280100L, | ||
175 | 0x01200000L,0x01200100L,0x01280000L,0x01280100L, | ||
176 | 0x00200010L,0x00200110L,0x00280010L,0x00280110L, | ||
177 | 0x01200010L,0x01200110L,0x01280010L,0x01280110L, | ||
178 | 0x00000200L,0x00000300L,0x00080200L,0x00080300L, | ||
179 | 0x01000200L,0x01000300L,0x01080200L,0x01080300L, | ||
180 | 0x00000210L,0x00000310L,0x00080210L,0x00080310L, | ||
181 | 0x01000210L,0x01000310L,0x01080210L,0x01080310L, | ||
182 | 0x00200200L,0x00200300L,0x00280200L,0x00280300L, | ||
183 | 0x01200200L,0x01200300L,0x01280200L,0x01280300L, | ||
184 | 0x00200210L,0x00200310L,0x00280210L,0x00280310L, | ||
185 | 0x01200210L,0x01200310L,0x01280210L,0x01280310L, | ||
186 | },{ | ||
187 | /* for D bits (numbered as per FIPS 46) 22 23 24 25 27 28 */ | ||
188 | 0x00000000L,0x04000000L,0x00040000L,0x04040000L, | ||
189 | 0x00000002L,0x04000002L,0x00040002L,0x04040002L, | ||
190 | 0x00002000L,0x04002000L,0x00042000L,0x04042000L, | ||
191 | 0x00002002L,0x04002002L,0x00042002L,0x04042002L, | ||
192 | 0x00000020L,0x04000020L,0x00040020L,0x04040020L, | ||
193 | 0x00000022L,0x04000022L,0x00040022L,0x04040022L, | ||
194 | 0x00002020L,0x04002020L,0x00042020L,0x04042020L, | ||
195 | 0x00002022L,0x04002022L,0x00042022L,0x04042022L, | ||
196 | 0x00000800L,0x04000800L,0x00040800L,0x04040800L, | ||
197 | 0x00000802L,0x04000802L,0x00040802L,0x04040802L, | ||
198 | 0x00002800L,0x04002800L,0x00042800L,0x04042800L, | ||
199 | 0x00002802L,0x04002802L,0x00042802L,0x04042802L, | ||
200 | 0x00000820L,0x04000820L,0x00040820L,0x04040820L, | ||
201 | 0x00000822L,0x04000822L,0x00040822L,0x04040822L, | ||
202 | 0x00002820L,0x04002820L,0x00042820L,0x04042820L, | ||
203 | 0x00002822L,0x04002822L,0x00042822L,0x04042822L, | ||
204 | }}; | ||
diff --git a/src/lib/libssl/src/crypto/des/testdes.pl b/src/lib/libssl/src/crypto/des/testdes.pl index 01a165a963..e69de29bb2 100644 --- a/src/lib/libssl/src/crypto/des/testdes.pl +++ b/src/lib/libssl/src/crypto/des/testdes.pl | |||
@@ -1,167 +0,0 @@ | |||
1 | #!/usr/local/bin/perl | ||
2 | |||
3 | # des.pl tesing code | ||
4 | |||
5 | require 'des.pl'; | ||
6 | |||
7 | $num_tests=34; | ||
8 | @key_data=( | ||
9 | 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, | ||
10 | 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, | ||
11 | 0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00, | ||
12 | 0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11, | ||
13 | 0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF, | ||
14 | 0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11, | ||
15 | 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, | ||
16 | 0xFE,0xDC,0xBA,0x98,0x76,0x54,0x32,0x10, | ||
17 | 0x7C,0xA1,0x10,0x45,0x4A,0x1A,0x6E,0x57, | ||
18 | 0x01,0x31,0xD9,0x61,0x9D,0xC1,0x37,0x6E, | ||
19 | 0x07,0xA1,0x13,0x3E,0x4A,0x0B,0x26,0x86, | ||
20 | 0x38,0x49,0x67,0x4C,0x26,0x02,0x31,0x9E, | ||
21 | 0x04,0xB9,0x15,0xBA,0x43,0xFE,0xB5,0xB6, | ||
22 | 0x01,0x13,0xB9,0x70,0xFD,0x34,0xF2,0xCE, | ||
23 | 0x01,0x70,0xF1,0x75,0x46,0x8F,0xB5,0xE6, | ||
24 | 0x43,0x29,0x7F,0xAD,0x38,0xE3,0x73,0xFE, | ||
25 | 0x07,0xA7,0x13,0x70,0x45,0xDA,0x2A,0x16, | ||
26 | 0x04,0x68,0x91,0x04,0xC2,0xFD,0x3B,0x2F, | ||
27 | 0x37,0xD0,0x6B,0xB5,0x16,0xCB,0x75,0x46, | ||
28 | 0x1F,0x08,0x26,0x0D,0x1A,0xC2,0x46,0x5E, | ||
29 | 0x58,0x40,0x23,0x64,0x1A,0xBA,0x61,0x76, | ||
30 | 0x02,0x58,0x16,0x16,0x46,0x29,0xB0,0x07, | ||
31 | 0x49,0x79,0x3E,0xBC,0x79,0xB3,0x25,0x8F, | ||
32 | 0x4F,0xB0,0x5E,0x15,0x15,0xAB,0x73,0xA7, | ||
33 | 0x49,0xE9,0x5D,0x6D,0x4C,0xA2,0x29,0xBF, | ||
34 | 0x01,0x83,0x10,0xDC,0x40,0x9B,0x26,0xD6, | ||
35 | 0x1C,0x58,0x7F,0x1C,0x13,0x92,0x4F,0xEF, | ||
36 | 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, | ||
37 | 0x1F,0x1F,0x1F,0x1F,0x0E,0x0E,0x0E,0x0E, | ||
38 | 0xE0,0xFE,0xE0,0xFE,0xF1,0xFE,0xF1,0xFE, | ||
39 | 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, | ||
40 | 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, | ||
41 | 0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF, | ||
42 | 0xFE,0xDC,0xBA,0x98,0x76,0x54,0x32,0x10, | ||
43 | ); | ||
44 | |||
45 | @plain_data=( | ||
46 | 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, | ||
47 | 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, | ||
48 | 0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x01, | ||
49 | 0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11, | ||
50 | 0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11, | ||
51 | 0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF, | ||
52 | 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, | ||
53 | 0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF, | ||
54 | 0x01,0xA1,0xD6,0xD0,0x39,0x77,0x67,0x42, | ||
55 | 0x5C,0xD5,0x4C,0xA8,0x3D,0xEF,0x57,0xDA, | ||
56 | 0x02,0x48,0xD4,0x38,0x06,0xF6,0x71,0x72, | ||
57 | 0x51,0x45,0x4B,0x58,0x2D,0xDF,0x44,0x0A, | ||
58 | 0x42,0xFD,0x44,0x30,0x59,0x57,0x7F,0xA2, | ||
59 | 0x05,0x9B,0x5E,0x08,0x51,0xCF,0x14,0x3A, | ||
60 | 0x07,0x56,0xD8,0xE0,0x77,0x47,0x61,0xD2, | ||
61 | 0x76,0x25,0x14,0xB8,0x29,0xBF,0x48,0x6A, | ||
62 | 0x3B,0xDD,0x11,0x90,0x49,0x37,0x28,0x02, | ||
63 | 0x26,0x95,0x5F,0x68,0x35,0xAF,0x60,0x9A, | ||
64 | 0x16,0x4D,0x5E,0x40,0x4F,0x27,0x52,0x32, | ||
65 | 0x6B,0x05,0x6E,0x18,0x75,0x9F,0x5C,0xCA, | ||
66 | 0x00,0x4B,0xD6,0xEF,0x09,0x17,0x60,0x62, | ||
67 | 0x48,0x0D,0x39,0x00,0x6E,0xE7,0x62,0xF2, | ||
68 | 0x43,0x75,0x40,0xC8,0x69,0x8F,0x3C,0xFA, | ||
69 | 0x07,0x2D,0x43,0xA0,0x77,0x07,0x52,0x92, | ||
70 | 0x02,0xFE,0x55,0x77,0x81,0x17,0xF1,0x2A, | ||
71 | 0x1D,0x9D,0x5C,0x50,0x18,0xF7,0x28,0xC2, | ||
72 | 0x30,0x55,0x32,0x28,0x6D,0x6F,0x29,0x5A, | ||
73 | 0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF, | ||
74 | 0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF, | ||
75 | 0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF, | ||
76 | 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, | ||
77 | 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, | ||
78 | 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, | ||
79 | 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF); | ||
80 | |||
81 | @cipher_data=( | ||
82 | 0x8C,0xA6,0x4D,0xE9,0xC1,0xB1,0x23,0xA7, | ||
83 | 0x73,0x59,0xB2,0x16,0x3E,0x4E,0xDC,0x58, | ||
84 | 0x95,0x8E,0x6E,0x62,0x7A,0x05,0x55,0x7B, | ||
85 | 0xF4,0x03,0x79,0xAB,0x9E,0x0E,0xC5,0x33, | ||
86 | 0x17,0x66,0x8D,0xFC,0x72,0x92,0x53,0x2D, | ||
87 | 0x8A,0x5A,0xE1,0xF8,0x1A,0xB8,0xF2,0xDD, | ||
88 | 0x8C,0xA6,0x4D,0xE9,0xC1,0xB1,0x23,0xA7, | ||
89 | 0xED,0x39,0xD9,0x50,0xFA,0x74,0xBC,0xC4, | ||
90 | 0x69,0x0F,0x5B,0x0D,0x9A,0x26,0x93,0x9B, | ||
91 | 0x7A,0x38,0x9D,0x10,0x35,0x4B,0xD2,0x71, | ||
92 | 0x86,0x8E,0xBB,0x51,0xCA,0xB4,0x59,0x9A, | ||
93 | 0x71,0x78,0x87,0x6E,0x01,0xF1,0x9B,0x2A, | ||
94 | 0xAF,0x37,0xFB,0x42,0x1F,0x8C,0x40,0x95, | ||
95 | 0x86,0xA5,0x60,0xF1,0x0E,0xC6,0xD8,0x5B, | ||
96 | 0x0C,0xD3,0xDA,0x02,0x00,0x21,0xDC,0x09, | ||
97 | 0xEA,0x67,0x6B,0x2C,0xB7,0xDB,0x2B,0x7A, | ||
98 | 0xDF,0xD6,0x4A,0x81,0x5C,0xAF,0x1A,0x0F, | ||
99 | 0x5C,0x51,0x3C,0x9C,0x48,0x86,0xC0,0x88, | ||
100 | 0x0A,0x2A,0xEE,0xAE,0x3F,0xF4,0xAB,0x77, | ||
101 | 0xEF,0x1B,0xF0,0x3E,0x5D,0xFA,0x57,0x5A, | ||
102 | 0x88,0xBF,0x0D,0xB6,0xD7,0x0D,0xEE,0x56, | ||
103 | 0xA1,0xF9,0x91,0x55,0x41,0x02,0x0B,0x56, | ||
104 | 0x6F,0xBF,0x1C,0xAF,0xCF,0xFD,0x05,0x56, | ||
105 | 0x2F,0x22,0xE4,0x9B,0xAB,0x7C,0xA1,0xAC, | ||
106 | 0x5A,0x6B,0x61,0x2C,0xC2,0x6C,0xCE,0x4A, | ||
107 | 0x5F,0x4C,0x03,0x8E,0xD1,0x2B,0x2E,0x41, | ||
108 | 0x63,0xFA,0xC0,0xD0,0x34,0xD9,0xF7,0x93, | ||
109 | 0x61,0x7B,0x3A,0x0C,0xE8,0xF0,0x71,0x00, | ||
110 | 0xDB,0x95,0x86,0x05,0xF8,0xC8,0xC6,0x06, | ||
111 | 0xED,0xBF,0xD1,0xC6,0x6C,0x29,0xCC,0xC7, | ||
112 | 0x35,0x55,0x50,0xB2,0x15,0x0E,0x24,0x51, | ||
113 | 0xCA,0xAA,0xAF,0x4D,0xEA,0xF1,0xDB,0xAE, | ||
114 | 0xD5,0xD4,0x4F,0xF7,0x20,0x68,0x3D,0x0D, | ||
115 | 0x2A,0x2B,0xB0,0x08,0xDF,0x97,0xC2,0xF2); | ||
116 | |||
117 | print "Doing ecb tests\n"; | ||
118 | for ($i=0; $i<$num_tests; $i++) | ||
119 | { | ||
120 | printf "Doing test $i\n"; | ||
121 | $key =pack("C8",splice(@key_data ,0,8)); | ||
122 | $data=pack("C8",splice(@plain_data ,0,8)); | ||
123 | $res =pack("C8",splice(@cipher_data,0,8)); | ||
124 | |||
125 | @ks= &des_set_key($key); | ||
126 | $out1= &des_ecb_encrypt(*ks,1,$data); | ||
127 | $out2= &des_ecb_encrypt(*ks,0,$out1); | ||
128 | $out3= &des_ecb_encrypt(*ks,0,$res); | ||
129 | &eprint("encryption failure",$res,$out1) | ||
130 | if ($out1 ne $res); | ||
131 | &eprint("encryption/decryption failure",$data,$out2) | ||
132 | if ($out2 ne $data); | ||
133 | &eprint("decryption failure",$data,$out3) | ||
134 | if ($data ne $out3); | ||
135 | } | ||
136 | print "Done\n"; | ||
137 | |||
138 | print "doing speed test over 30 seconds\n"; | ||
139 | $SIG{'ALRM'}='done'; | ||
140 | sub done {$done=1;} | ||
141 | $done=0; | ||
142 | |||
143 | $count=0; | ||
144 | $d=pack("C8",0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef); | ||
145 | @ks= &des_set_key($d); | ||
146 | alarm(30); | ||
147 | $start=(times)[0]; | ||
148 | while (!$done) | ||
149 | { | ||
150 | $count++; | ||
151 | $d=&des_ecb_encrypt(*ks,1,$d); | ||
152 | } | ||
153 | $end=(times)[0]; | ||
154 | $t=$end-$start; | ||
155 | printf "$count DESs in %.2f seconds is %.2f DESs/sec or %.2f bytes/sec\n", | ||
156 | 1.0*$t,1.0*$count/$t,$count*8.0/$t; | ||
157 | |||
158 | sub eprint | ||
159 | { | ||
160 | local($s,$c,$e)=@_; | ||
161 | local(@k); | ||
162 | |||
163 | @k=unpack("C8",$c); | ||
164 | printf "%02x%02x%02x%02x %02x%02x%02x%02x - ",unpack("C8",$c); | ||
165 | printf "%02x%02x%02x%02x %02x%02x%02x%02x :",unpack("C8",$e); | ||
166 | print " $s\n"; | ||
167 | } | ||
diff --git a/src/lib/libssl/src/crypto/dh/dh_err.c b/src/lib/libssl/src/crypto/dh/dh_err.c index 0348bd24a2..ff2d1684c2 100644 --- a/src/lib/libssl/src/crypto/dh/dh_err.c +++ b/src/lib/libssl/src/crypto/dh/dh_err.c | |||
@@ -54,7 +54,8 @@ | |||
54 | */ | 54 | */ |
55 | 55 | ||
56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes |
57 | * made to it will be overwritten when the script next updates this file. | 57 | * made to it will be overwritten when the script next updates this file, |
58 | * only reason strings will be preserved. | ||
58 | */ | 59 | */ |
59 | 60 | ||
60 | #include <stdio.h> | 61 | #include <stdio.h> |
diff --git a/src/lib/libssl/src/crypto/dsa/dsa_err.c b/src/lib/libssl/src/crypto/dsa/dsa_err.c index 38e4af968c..2b3ab3a9ad 100644 --- a/src/lib/libssl/src/crypto/dsa/dsa_err.c +++ b/src/lib/libssl/src/crypto/dsa/dsa_err.c | |||
@@ -54,7 +54,8 @@ | |||
54 | */ | 54 | */ |
55 | 55 | ||
56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes |
57 | * made to it will be overwritten when the script next updates this file. | 57 | * made to it will be overwritten when the script next updates this file, |
58 | * only reason strings will be preserved. | ||
58 | */ | 59 | */ |
59 | 60 | ||
60 | #include <stdio.h> | 61 | #include <stdio.h> |
diff --git a/src/lib/libssl/src/crypto/dsa/dsa_key.c b/src/lib/libssl/src/crypto/dsa/dsa_key.c index ab7f38fc7c..5aef2d5fcf 100644 --- a/src/lib/libssl/src/crypto/dsa/dsa_key.c +++ b/src/lib/libssl/src/crypto/dsa/dsa_key.c | |||
@@ -84,7 +84,8 @@ int DSA_generate_key(DSA *dsa) | |||
84 | i=BN_num_bits(dsa->q); | 84 | i=BN_num_bits(dsa->q); |
85 | for (;;) | 85 | for (;;) |
86 | { | 86 | { |
87 | BN_rand(priv_key,i,1,0); | 87 | if (!BN_rand(priv_key,i,1,0)) |
88 | goto err; | ||
88 | if (BN_cmp(priv_key,dsa->q) >= 0) | 89 | if (BN_cmp(priv_key,dsa->q) >= 0) |
89 | BN_sub(priv_key,priv_key,dsa->q); | 90 | BN_sub(priv_key,priv_key,dsa->q); |
90 | if (!BN_is_zero(priv_key)) break; | 91 | if (!BN_is_zero(priv_key)) break; |
diff --git a/src/lib/libssl/src/crypto/err/err.c b/src/lib/libssl/src/crypto/err/err.c index 93c64cbc4f..eb8c76aa0b 100644 --- a/src/lib/libssl/src/crypto/err/err.c +++ b/src/lib/libssl/src/crypto/err/err.c | |||
@@ -55,9 +55,63 @@ | |||
55 | * copied and put under another distribution licence | 55 | * copied and put under another distribution licence |
56 | * [including the GNU Public Licence.] | 56 | * [including the GNU Public Licence.] |
57 | */ | 57 | */ |
58 | /* ==================================================================== | ||
59 | * Copyright (c) 1998-2000 The OpenSSL Project. All rights reserved. | ||
60 | * | ||
61 | * Redistribution and use in source and binary forms, with or without | ||
62 | * modification, are permitted provided that the following conditions | ||
63 | * are met: | ||
64 | * | ||
65 | * 1. Redistributions of source code must retain the above copyright | ||
66 | * notice, this list of conditions and the following disclaimer. | ||
67 | * | ||
68 | * 2. Redistributions in binary form must reproduce the above copyright | ||
69 | * notice, this list of conditions and the following disclaimer in | ||
70 | * the documentation and/or other materials provided with the | ||
71 | * distribution. | ||
72 | * | ||
73 | * 3. All advertising materials mentioning features or use of this | ||
74 | * software must display the following acknowledgment: | ||
75 | * "This product includes software developed by the OpenSSL Project | ||
76 | * for use in the OpenSSL Toolkit. (http://www.openssl.org/)" | ||
77 | * | ||
78 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
79 | * endorse or promote products derived from this software without | ||
80 | * prior written permission. For written permission, please contact | ||
81 | * openssl-core@openssl.org. | ||
82 | * | ||
83 | * 5. Products derived from this software may not be called "OpenSSL" | ||
84 | * nor may "OpenSSL" appear in their names without prior written | ||
85 | * permission of the OpenSSL Project. | ||
86 | * | ||
87 | * 6. Redistributions of any form whatsoever must retain the following | ||
88 | * acknowledgment: | ||
89 | * "This product includes software developed by the OpenSSL Project | ||
90 | * for use in the OpenSSL Toolkit (http://www.openssl.org/)" | ||
91 | * | ||
92 | * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
93 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
94 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
95 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
96 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
97 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
98 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
99 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
100 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
101 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
102 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
103 | * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
104 | * ==================================================================== | ||
105 | * | ||
106 | * This product includes cryptographic software written by Eric Young | ||
107 | * (eay@cryptsoft.com). This product includes software written by Tim | ||
108 | * Hudson (tjh@cryptsoft.com). | ||
109 | * | ||
110 | */ | ||
58 | 111 | ||
59 | #include <stdio.h> | 112 | #include <stdio.h> |
60 | #include <stdarg.h> | 113 | #include <stdarg.h> |
114 | #include <string.h> | ||
61 | #include <openssl/lhash.h> | 115 | #include <openssl/lhash.h> |
62 | #include <openssl/crypto.h> | 116 | #include <openssl/crypto.h> |
63 | #include "cryptlib.h" | 117 | #include "cryptlib.h" |
@@ -154,6 +208,54 @@ static ERR_STRING_DATA ERR_str_reasons[]= | |||
154 | 208 | ||
155 | {0,NULL}, | 209 | {0,NULL}, |
156 | }; | 210 | }; |
211 | |||
212 | |||
213 | #define NUM_SYS_STR_REASONS 127 | ||
214 | #define LEN_SYS_STR_REASON 32 | ||
215 | |||
216 | static ERR_STRING_DATA SYS_str_reasons[NUM_SYS_STR_REASONS + 1]; | ||
217 | /* SYS_str_reasons is filled with copies of strerror() results at | ||
218 | * initialization. | ||
219 | * 'errno' values up to 127 should cover all usual errors, | ||
220 | * others will be displayed numerically by ERR_error_string. | ||
221 | * It is crucial that we have something for each reason code | ||
222 | * that occurs in ERR_str_reasons, or bogus reason strings | ||
223 | * will be returned for SYSerr(), which always gets an errno | ||
224 | * value and never one of those 'standard' reason codes. */ | ||
225 | |||
226 | static void build_SYS_str_reasons() | ||
227 | { | ||
228 | /* Malloc cannot be used here, use static storage instead */ | ||
229 | static char strerror_tab[NUM_SYS_STR_REASONS][LEN_SYS_STR_REASON]; | ||
230 | int i; | ||
231 | |||
232 | CRYPTO_w_lock(CRYPTO_LOCK_ERR_HASH); | ||
233 | |||
234 | for (i = 1; i <= NUM_SYS_STR_REASONS; i++) | ||
235 | { | ||
236 | ERR_STRING_DATA *str = &SYS_str_reasons[i - 1]; | ||
237 | |||
238 | str->error = (unsigned long)i; | ||
239 | if (str->string == NULL) | ||
240 | { | ||
241 | char (*dest)[LEN_SYS_STR_REASON] = &(strerror_tab[i - 1]); | ||
242 | char *src = strerror(i); | ||
243 | if (src != NULL) | ||
244 | { | ||
245 | strncpy(*dest, src, sizeof *dest); | ||
246 | (*dest)[sizeof *dest - 1] = '\0'; | ||
247 | str->string = *dest; | ||
248 | } | ||
249 | } | ||
250 | if (str->string == NULL) | ||
251 | str->string = "unknown"; | ||
252 | } | ||
253 | |||
254 | /* Now we still have SYS_str_reasons[NUM_SYS_STR_REASONS] = {0, NULL}, | ||
255 | * as required by ERR_load_strings. */ | ||
256 | |||
257 | CRYPTO_w_unlock(CRYPTO_LOCK_ERR_HASH); | ||
258 | } | ||
157 | #endif | 259 | #endif |
158 | 260 | ||
159 | #define err_clear_data(p,i) \ | 261 | #define err_clear_data(p,i) \ |
@@ -191,14 +293,16 @@ void ERR_load_ERR_strings(void) | |||
191 | CRYPTO_w_unlock(CRYPTO_LOCK_ERR); | 293 | CRYPTO_w_unlock(CRYPTO_LOCK_ERR); |
192 | return; | 294 | return; |
193 | } | 295 | } |
194 | init=0; | ||
195 | CRYPTO_w_unlock(CRYPTO_LOCK_ERR); | 296 | CRYPTO_w_unlock(CRYPTO_LOCK_ERR); |
196 | 297 | ||
197 | #ifndef NO_ERR | 298 | #ifndef NO_ERR |
198 | ERR_load_strings(0,ERR_str_libraries); | 299 | ERR_load_strings(0,ERR_str_libraries); |
199 | ERR_load_strings(0,ERR_str_reasons); | 300 | ERR_load_strings(0,ERR_str_reasons); |
200 | ERR_load_strings(ERR_LIB_SYS,ERR_str_functs); | 301 | ERR_load_strings(ERR_LIB_SYS,ERR_str_functs); |
302 | build_SYS_str_reasons(); | ||
303 | ERR_load_strings(ERR_LIB_SYS,SYS_str_reasons); | ||
201 | #endif | 304 | #endif |
305 | init=0; | ||
202 | } | 306 | } |
203 | } | 307 | } |
204 | 308 | ||
diff --git a/src/lib/libssl/src/crypto/evp/evp_err.c b/src/lib/libssl/src/crypto/evp/evp_err.c index 97953a0fc1..fc149cbb1a 100644 --- a/src/lib/libssl/src/crypto/evp/evp_err.c +++ b/src/lib/libssl/src/crypto/evp/evp_err.c | |||
@@ -54,7 +54,8 @@ | |||
54 | */ | 54 | */ |
55 | 55 | ||
56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes |
57 | * made to it will be overwritten when the script next updates this file. | 57 | * made to it will be overwritten when the script next updates this file, |
58 | * only reason strings will be preserved. | ||
58 | */ | 59 | */ |
59 | 60 | ||
60 | #include <stdio.h> | 61 | #include <stdio.h> |
diff --git a/src/lib/libssl/src/crypto/evp/evp_pkey.c b/src/lib/libssl/src/crypto/evp/evp_pkey.c index d5e6f5880f..4ab091fa56 100644 --- a/src/lib/libssl/src/crypto/evp/evp_pkey.c +++ b/src/lib/libssl/src/crypto/evp/evp_pkey.c | |||
@@ -133,7 +133,7 @@ EVP_PKEY *EVP_PKCS82PKEY (PKCS8_PRIV_KEY_INFO *p8) | |||
133 | * SEQUENCE {parameters, priv_key} | 133 | * SEQUENCE {parameters, priv_key} |
134 | * SEQUENCE {pub_key, priv_key} | 134 | * SEQUENCE {pub_key, priv_key} |
135 | */ | 135 | */ |
136 | 136 | ||
137 | t1 = (ASN1_TYPE *)sk_value(ndsa, 0); | 137 | t1 = (ASN1_TYPE *)sk_value(ndsa, 0); |
138 | t2 = (ASN1_TYPE *)sk_value(ndsa, 1); | 138 | t2 = (ASN1_TYPE *)sk_value(ndsa, 1); |
139 | if(t1->type == V_ASN1_SEQUENCE) { | 139 | if(t1->type == V_ASN1_SEQUENCE) { |
@@ -152,7 +152,14 @@ EVP_PKEY *EVP_PKCS82PKEY (PKCS8_PRIV_KEY_INFO *p8) | |||
152 | goto dsaerr; | 152 | goto dsaerr; |
153 | } | 153 | } |
154 | privkey = t2->value.integer; | 154 | privkey = t2->value.integer; |
155 | } else if (!(privkey=d2i_ASN1_INTEGER (NULL, &p, pkeylen))) { | 155 | } else { |
156 | if (!(privkey=d2i_ASN1_INTEGER (NULL, &p, pkeylen))) { | ||
157 | EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_DECODE_ERROR); | ||
158 | goto dsaerr; | ||
159 | } | ||
160 | param = p8->pkeyalg->parameter; | ||
161 | } | ||
162 | if (!param || (param->type != V_ASN1_SEQUENCE)) { | ||
156 | EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_DECODE_ERROR); | 163 | EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_DECODE_ERROR); |
157 | goto dsaerr; | 164 | goto dsaerr; |
158 | } | 165 | } |
@@ -186,7 +193,8 @@ EVP_PKEY *EVP_PKCS82PKEY (PKCS8_PRIV_KEY_INFO *p8) | |||
186 | 193 | ||
187 | EVP_PKEY_assign_DSA(pkey, dsa); | 194 | EVP_PKEY_assign_DSA(pkey, dsa); |
188 | BN_CTX_free (ctx); | 195 | BN_CTX_free (ctx); |
189 | sk_pop_free(ndsa, ASN1_TYPE_free); | 196 | if(ndsa) sk_pop_free(ndsa, ASN1_TYPE_free); |
197 | else ASN1_INTEGER_free(privkey); | ||
190 | break; | 198 | break; |
191 | dsaerr: | 199 | dsaerr: |
192 | BN_CTX_free (ctx); | 200 | BN_CTX_free (ctx); |
diff --git a/src/lib/libssl/src/crypto/evp/names.c b/src/lib/libssl/src/crypto/evp/names.c index 3e8f460328..620f43feaa 100644 --- a/src/lib/libssl/src/crypto/evp/names.c +++ b/src/lib/libssl/src/crypto/evp/names.c | |||
@@ -114,5 +114,10 @@ void EVP_cleanup(void) | |||
114 | { | 114 | { |
115 | OBJ_NAME_cleanup(OBJ_NAME_TYPE_CIPHER_METH); | 115 | OBJ_NAME_cleanup(OBJ_NAME_TYPE_CIPHER_METH); |
116 | OBJ_NAME_cleanup(OBJ_NAME_TYPE_MD_METH); | 116 | OBJ_NAME_cleanup(OBJ_NAME_TYPE_MD_METH); |
117 | /* The above calls will only clean out the contents of the name | ||
118 | hash table, but not the hash table itself. The following line | ||
119 | does that part. -- Richard Levitte */ | ||
120 | OBJ_NAME_cleanup(-1); | ||
121 | |||
117 | EVP_PBE_cleanup(); | 122 | EVP_PBE_cleanup(); |
118 | } | 123 | } |
diff --git a/src/lib/libssl/src/crypto/hmac/hmac.c b/src/lib/libssl/src/crypto/hmac/hmac.c index 23b7c98f8f..e1ec79e093 100644 --- a/src/lib/libssl/src/crypto/hmac/hmac.c +++ b/src/lib/libssl/src/crypto/hmac/hmac.c | |||
@@ -88,9 +88,11 @@ void HMAC_Init(HMAC_CTX *ctx, const void *key, int len, | |||
88 | else | 88 | else |
89 | { | 89 | { |
90 | memcpy(ctx->key,key,len); | 90 | memcpy(ctx->key,key,len); |
91 | memset(&(ctx->key[len]),0,sizeof(ctx->key)-len); | ||
92 | ctx->key_length=len; | 91 | ctx->key_length=len; |
93 | } | 92 | } |
93 | if(ctx->key_length != HMAC_MAX_MD_CBLOCK) | ||
94 | memset(&ctx->key[ctx->key_length], 0, | ||
95 | HMAC_MAX_MD_CBLOCK - ctx->key_length); | ||
94 | } | 96 | } |
95 | 97 | ||
96 | if (reset) | 98 | if (reset) |
diff --git a/src/lib/libssl/src/crypto/lhash/lhash.c b/src/lib/libssl/src/crypto/lhash/lhash.c index 6a340a2403..7eb92a18bc 100644 --- a/src/lib/libssl/src/crypto/lhash/lhash.c +++ b/src/lib/libssl/src/crypto/lhash/lhash.c | |||
@@ -159,7 +159,7 @@ void lh_free(LHASH *lh) | |||
159 | unsigned int i; | 159 | unsigned int i; |
160 | LHASH_NODE *n,*nn; | 160 | LHASH_NODE *n,*nn; |
161 | 161 | ||
162 | if(lh == NULL) | 162 | if (lh == NULL) |
163 | return; | 163 | return; |
164 | 164 | ||
165 | for (i=0; i<lh->num_nodes; i++) | 165 | for (i=0; i<lh->num_nodes; i++) |
@@ -422,21 +422,6 @@ static LHASH_NODE **getrn(LHASH *lh, void *data, unsigned long *rhash) | |||
422 | return(ret); | 422 | return(ret); |
423 | } | 423 | } |
424 | 424 | ||
425 | /* | ||
426 | unsigned long lh_strhash(char *str) | ||
427 | { | ||
428 | int i,l; | ||
429 | unsigned long ret=0; | ||
430 | unsigned short *s; | ||
431 | |||
432 | if (str == NULL) return(0); | ||
433 | l=(strlen(str)+1)/2; | ||
434 | s=(unsigned short *)str; | ||
435 | for (i=0; i<l; i++) | ||
436 | ret^=(s[i]<<(i&0x0f)); | ||
437 | return(ret); | ||
438 | } */ | ||
439 | |||
440 | /* The following hash seems to work very well on normal text strings | 425 | /* The following hash seems to work very well on normal text strings |
441 | * no collisions on /usr/dict/words and it distributes on %2^n quite | 426 | * no collisions on /usr/dict/words and it distributes on %2^n quite |
442 | * well, not as good as MD5, but still good. | 427 | * well, not as good as MD5, but still good. |
@@ -470,3 +455,7 @@ unsigned long lh_strhash(const char *c) | |||
470 | return((ret>>16)^ret); | 455 | return((ret>>16)^ret); |
471 | } | 456 | } |
472 | 457 | ||
458 | unsigned long lh_num_items(LHASH *lh) | ||
459 | { | ||
460 | return lh ? lh->num_items : 0; | ||
461 | } | ||
diff --git a/src/lib/libssl/src/crypto/lhash/lhash.h b/src/lib/libssl/src/crypto/lhash/lhash.h index 6f6eeb2698..d315fd9c6d 100644 --- a/src/lib/libssl/src/crypto/lhash/lhash.h +++ b/src/lib/libssl/src/crypto/lhash/lhash.h | |||
@@ -124,6 +124,7 @@ void *lh_retrieve(LHASH *lh, void *data); | |||
124 | void lh_doall(LHASH *lh, void (*func)(/*void *b*/)); | 124 | void lh_doall(LHASH *lh, void (*func)(/*void *b*/)); |
125 | void lh_doall_arg(LHASH *lh, void (*func)(/*void *a,void *b*/),void *arg); | 125 | void lh_doall_arg(LHASH *lh, void (*func)(/*void *a,void *b*/),void *arg); |
126 | unsigned long lh_strhash(const char *c); | 126 | unsigned long lh_strhash(const char *c); |
127 | unsigned long lh_num_items(LHASH *lh); | ||
127 | 128 | ||
128 | #ifndef NO_FP_API | 129 | #ifndef NO_FP_API |
129 | void lh_stats(LHASH *lh, FILE *out); | 130 | void lh_stats(LHASH *lh, FILE *out); |
diff --git a/src/lib/libssl/src/crypto/md5/Makefile.ssl b/src/lib/libssl/src/crypto/md5/Makefile.ssl index d50f967be7..45fbd04239 100644 --- a/src/lib/libssl/src/crypto/md5/Makefile.ssl +++ b/src/lib/libssl/src/crypto/md5/Makefile.ssl | |||
@@ -55,7 +55,7 @@ lib: $(LIBOBJ) | |||
55 | 55 | ||
56 | # elf | 56 | # elf |
57 | asm/mx86-elf.o: asm/mx86unix.cpp | 57 | asm/mx86-elf.o: asm/mx86unix.cpp |
58 | $(CPP) -DELF asm/mx86unix.cpp | as -o asm/mx86-elf.o | 58 | $(CPP) -DELF -x c asm/mx86unix.cpp | as -o asm/mx86-elf.o |
59 | 59 | ||
60 | # solaris | 60 | # solaris |
61 | asm/mx86-sol.o: asm/mx86unix.cpp | 61 | asm/mx86-sol.o: asm/mx86unix.cpp |
@@ -71,7 +71,7 @@ asm/mx86-out.o: asm/mx86unix.cpp | |||
71 | asm/mx86bsdi.o: asm/mx86unix.cpp | 71 | asm/mx86bsdi.o: asm/mx86unix.cpp |
72 | $(CPP) -DBSDI asm/mx86unix.cpp | sed 's/ :/:/' | as -o asm/mx86bsdi.o | 72 | $(CPP) -DBSDI asm/mx86unix.cpp | sed 's/ :/:/' | as -o asm/mx86bsdi.o |
73 | 73 | ||
74 | asm/mx86unix.cpp: asm/md5-586.pl | 74 | asm/mx86unix.cpp: asm/md5-586.pl ../perlasm/x86asm.pl |
75 | (cd asm; $(PERL) md5-586.pl cpp >mx86unix.cpp) | 75 | (cd asm; $(PERL) md5-586.pl cpp >mx86unix.cpp) |
76 | 76 | ||
77 | asm/md5-sparcv8plus.o: asm/md5-sparcv9.S | 77 | asm/md5-sparcv8plus.o: asm/md5-sparcv9.S |
diff --git a/src/lib/libssl/src/crypto/md5/Makefile.uni b/src/lib/libssl/src/crypto/md5/Makefile.uni index d21c72f3ea..e69de29bb2 100644 --- a/src/lib/libssl/src/crypto/md5/Makefile.uni +++ b/src/lib/libssl/src/crypto/md5/Makefile.uni | |||
@@ -1,110 +0,0 @@ | |||
1 | # Targets | ||
2 | # make - twidle the options yourself :-) | ||
3 | # make cc - standard cc options | ||
4 | # make gcc - standard gcc options | ||
5 | # make x86-elf - linux-elf etc | ||
6 | # make x86-out - linux-a.out, FreeBSD etc | ||
7 | # make x86-solaris | ||
8 | # make x86-bdsi | ||
9 | |||
10 | DIR= md5 | ||
11 | TOP= . | ||
12 | CC= gcc | ||
13 | CFLAG= -O3 -fomit-frame-pointer | ||
14 | |||
15 | CPP= $(CC) -E | ||
16 | INCLUDES= | ||
17 | INSTALLTOP=/usr/local/lib | ||
18 | MAKE= make | ||
19 | MAKEDEPEND= makedepend | ||
20 | MAKEFILE= Makefile.uni | ||
21 | AR= ar r | ||
22 | RANLIB= ranlib | ||
23 | |||
24 | MD5_ASM_OBJ= | ||
25 | |||
26 | CFLAGS= $(INCLUDES) $(CFLAG) | ||
27 | |||
28 | GENERAL=Makefile | ||
29 | TEST=md5test | ||
30 | APPS=md5 | ||
31 | |||
32 | LIB=libmd5.a | ||
33 | LIBSRC=md5_dgst.c md5_one.c | ||
34 | LIBOBJ=md5_dgst.o md5_one.o $(MD5_ASM_OBJ) | ||
35 | |||
36 | SRC= $(LIBSRC) | ||
37 | |||
38 | EXHEADER= md5.h | ||
39 | HEADER= md5_locl.h $(EXHEADER) | ||
40 | |||
41 | ALL= $(GENERAL) $(SRC) $(HEADER) | ||
42 | |||
43 | all: $(LIB) $(TEST) $(APPS) | ||
44 | |||
45 | $(LIB): $(LIBOBJ) | ||
46 | $(AR) $(LIB) $(LIBOBJ) | ||
47 | $(RANLIB) $(LIB) | ||
48 | |||
49 | # elf | ||
50 | asm/mx86-elf.o: asm/mx86unix.cpp | ||
51 | $(CPP) -DELF asm/mx86unix.cpp | as -o asm/mx86-elf.o | ||
52 | |||
53 | # solaris | ||
54 | asm/mx86-sol.o: asm/mx86unix.cpp | ||
55 | $(CC) -E -DSOL asm/mx86unix.cpp | sed 's/^#.*//' > asm/mx86-sol.s | ||
56 | as -o asm/mx86-sol.o asm/mx86-sol.s | ||
57 | rm -f asm/mx86-sol.s | ||
58 | |||
59 | # a.out | ||
60 | asm/mx86-out.o: asm/mx86unix.cpp | ||
61 | $(CPP) -DOUT asm/mx86unix.cpp | as -o asm/mx86-out.o | ||
62 | |||
63 | # bsdi | ||
64 | asm/mx86bsdi.o: asm/mx86unix.cpp | ||
65 | $(CPP) -DBSDI asm/mx86unix.cpp | as -o asm/mx86bsdi.o | ||
66 | |||
67 | asm/mx86unix.cpp: | ||
68 | (cd asm; perl md5-586.pl cpp >mx86unix.cpp) | ||
69 | |||
70 | test: $(TEST) | ||
71 | ./$(TEST) | ||
72 | |||
73 | $(TEST): $(TEST).c $(LIB) | ||
74 | $(CC) -o $(TEST) $(CFLAGS) $(TEST).c $(LIB) | ||
75 | |||
76 | $(APPS): $(APPS).c $(LIB) | ||
77 | $(CC) -o $(APPS) $(CFLAGS) $(APPS).c $(LIB) | ||
78 | |||
79 | lint: | ||
80 | lint -DLINT $(INCLUDES) $(SRC)>fluff | ||
81 | |||
82 | depend: | ||
83 | $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) | ||
84 | |||
85 | dclean: | ||
86 | perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new | ||
87 | mv -f Makefile.new $(MAKEFILE) | ||
88 | |||
89 | clean: | ||
90 | /bin/rm -f $(LIB) $(TEST) $(APPS) *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff | ||
91 | |||
92 | cc: | ||
93 | $(MAKE) MD5_ASM_OBJ="" CC="cc" CFLAG="-O" all | ||
94 | |||
95 | gcc: | ||
96 | $(MAKE) MD5_ASM_OBJ="" CC="gcc" CFLAGS="-O3 -fomit-frame-pointer" all | ||
97 | |||
98 | x86-elf: | ||
99 | $(MAKE) MD5_ASM_OBJ="asm/mx86-elf.o" CFLAG="-DELF -DMD5_ASM -DL_ENDIAN $(CFLAGS)" all | ||
100 | |||
101 | x86-out: | ||
102 | $(MAKE) MD5_ASM_OBJ="asm/mx86-out.o" CFLAG="-DOUT -DMD5_ASM -DL_ENDIAN $(CFLAGS)" all | ||
103 | |||
104 | x86-solaris: | ||
105 | $(MAKE) MD5_ASM_OBJ="asm/mx86-sol.o" CFLAG="-DSOL -DMD5_ASM -DL_ENDIAN $(CFLAGS)" all | ||
106 | |||
107 | x86-bdsi: | ||
108 | $(MAKE) MD5_ASM_OBJ="asm/mx86-bdsi.o" CFLAG="-DBDSI -DMD5_ASM -DL_ENDIAN $(CFLAGS)" all | ||
109 | |||
110 | # DO NOT DELETE THIS LINE -- make depend depends on it. | ||
diff --git a/src/lib/libssl/src/crypto/md5/asm/m5-win32.asm b/src/lib/libssl/src/crypto/md5/asm/m5-win32.asm index 51f5f17ca3..e69de29bb2 100644 --- a/src/lib/libssl/src/crypto/md5/asm/m5-win32.asm +++ b/src/lib/libssl/src/crypto/md5/asm/m5-win32.asm | |||
@@ -1,687 +0,0 @@ | |||
1 | ; Don't even think of reading this code | ||
2 | ; It was automatically generated by md5-586.pl | ||
3 | ; Which is a perl program used to generate the x86 assember for | ||
4 | ; any of elf, a.out, BSDI,Win32, or Solaris | ||
5 | ; eric <eay@cryptsoft.com> | ||
6 | ; | ||
7 | TITLE md5-586.asm | ||
8 | .386 | ||
9 | .model FLAT | ||
10 | _TEXT SEGMENT | ||
11 | PUBLIC _md5_block_asm_host_order | ||
12 | |||
13 | _md5_block_asm_host_order PROC NEAR | ||
14 | push esi | ||
15 | push edi | ||
16 | mov edi, DWORD PTR 12[esp] | ||
17 | mov esi, DWORD PTR 16[esp] | ||
18 | mov ecx, DWORD PTR 20[esp] | ||
19 | push ebp | ||
20 | shl ecx, 6 | ||
21 | push ebx | ||
22 | add ecx, esi | ||
23 | sub ecx, 64 | ||
24 | mov eax, DWORD PTR [edi] | ||
25 | push ecx | ||
26 | mov ebx, DWORD PTR 4[edi] | ||
27 | mov ecx, DWORD PTR 8[edi] | ||
28 | mov edx, DWORD PTR 12[edi] | ||
29 | L000start: | ||
30 | ; | ||
31 | ; R0 section | ||
32 | mov edi, ecx | ||
33 | mov ebp, DWORD PTR [esi] | ||
34 | ; R0 0 | ||
35 | xor edi, edx | ||
36 | and edi, ebx | ||
37 | lea eax, DWORD PTR 3614090360[ebp*1+eax] | ||
38 | xor edi, edx | ||
39 | add eax, edi | ||
40 | mov edi, ebx | ||
41 | rol eax, 7 | ||
42 | mov ebp, DWORD PTR 4[esi] | ||
43 | add eax, ebx | ||
44 | ; R0 1 | ||
45 | xor edi, ecx | ||
46 | and edi, eax | ||
47 | lea edx, DWORD PTR 3905402710[ebp*1+edx] | ||
48 | xor edi, ecx | ||
49 | add edx, edi | ||
50 | mov edi, eax | ||
51 | rol edx, 12 | ||
52 | mov ebp, DWORD PTR 8[esi] | ||
53 | add edx, eax | ||
54 | ; R0 2 | ||
55 | xor edi, ebx | ||
56 | and edi, edx | ||
57 | lea ecx, DWORD PTR 606105819[ebp*1+ecx] | ||
58 | xor edi, ebx | ||
59 | add ecx, edi | ||
60 | mov edi, edx | ||
61 | rol ecx, 17 | ||
62 | mov ebp, DWORD PTR 12[esi] | ||
63 | add ecx, edx | ||
64 | ; R0 3 | ||
65 | xor edi, eax | ||
66 | and edi, ecx | ||
67 | lea ebx, DWORD PTR 3250441966[ebp*1+ebx] | ||
68 | xor edi, eax | ||
69 | add ebx, edi | ||
70 | mov edi, ecx | ||
71 | rol ebx, 22 | ||
72 | mov ebp, DWORD PTR 16[esi] | ||
73 | add ebx, ecx | ||
74 | ; R0 4 | ||
75 | xor edi, edx | ||
76 | and edi, ebx | ||
77 | lea eax, DWORD PTR 4118548399[ebp*1+eax] | ||
78 | xor edi, edx | ||
79 | add eax, edi | ||
80 | mov edi, ebx | ||
81 | rol eax, 7 | ||
82 | mov ebp, DWORD PTR 20[esi] | ||
83 | add eax, ebx | ||
84 | ; R0 5 | ||
85 | xor edi, ecx | ||
86 | and edi, eax | ||
87 | lea edx, DWORD PTR 1200080426[ebp*1+edx] | ||
88 | xor edi, ecx | ||
89 | add edx, edi | ||
90 | mov edi, eax | ||
91 | rol edx, 12 | ||
92 | mov ebp, DWORD PTR 24[esi] | ||
93 | add edx, eax | ||
94 | ; R0 6 | ||
95 | xor edi, ebx | ||
96 | and edi, edx | ||
97 | lea ecx, DWORD PTR 2821735955[ebp*1+ecx] | ||
98 | xor edi, ebx | ||
99 | add ecx, edi | ||
100 | mov edi, edx | ||
101 | rol ecx, 17 | ||
102 | mov ebp, DWORD PTR 28[esi] | ||
103 | add ecx, edx | ||
104 | ; R0 7 | ||
105 | xor edi, eax | ||
106 | and edi, ecx | ||
107 | lea ebx, DWORD PTR 4249261313[ebp*1+ebx] | ||
108 | xor edi, eax | ||
109 | add ebx, edi | ||
110 | mov edi, ecx | ||
111 | rol ebx, 22 | ||
112 | mov ebp, DWORD PTR 32[esi] | ||
113 | add ebx, ecx | ||
114 | ; R0 8 | ||
115 | xor edi, edx | ||
116 | and edi, ebx | ||
117 | lea eax, DWORD PTR 1770035416[ebp*1+eax] | ||
118 | xor edi, edx | ||
119 | add eax, edi | ||
120 | mov edi, ebx | ||
121 | rol eax, 7 | ||
122 | mov ebp, DWORD PTR 36[esi] | ||
123 | add eax, ebx | ||
124 | ; R0 9 | ||
125 | xor edi, ecx | ||
126 | and edi, eax | ||
127 | lea edx, DWORD PTR 2336552879[ebp*1+edx] | ||
128 | xor edi, ecx | ||
129 | add edx, edi | ||
130 | mov edi, eax | ||
131 | rol edx, 12 | ||
132 | mov ebp, DWORD PTR 40[esi] | ||
133 | add edx, eax | ||
134 | ; R0 10 | ||
135 | xor edi, ebx | ||
136 | and edi, edx | ||
137 | lea ecx, DWORD PTR 4294925233[ebp*1+ecx] | ||
138 | xor edi, ebx | ||
139 | add ecx, edi | ||
140 | mov edi, edx | ||
141 | rol ecx, 17 | ||
142 | mov ebp, DWORD PTR 44[esi] | ||
143 | add ecx, edx | ||
144 | ; R0 11 | ||
145 | xor edi, eax | ||
146 | and edi, ecx | ||
147 | lea ebx, DWORD PTR 2304563134[ebp*1+ebx] | ||
148 | xor edi, eax | ||
149 | add ebx, edi | ||
150 | mov edi, ecx | ||
151 | rol ebx, 22 | ||
152 | mov ebp, DWORD PTR 48[esi] | ||
153 | add ebx, ecx | ||
154 | ; R0 12 | ||
155 | xor edi, edx | ||
156 | and edi, ebx | ||
157 | lea eax, DWORD PTR 1804603682[ebp*1+eax] | ||
158 | xor edi, edx | ||
159 | add eax, edi | ||
160 | mov edi, ebx | ||
161 | rol eax, 7 | ||
162 | mov ebp, DWORD PTR 52[esi] | ||
163 | add eax, ebx | ||
164 | ; R0 13 | ||
165 | xor edi, ecx | ||
166 | and edi, eax | ||
167 | lea edx, DWORD PTR 4254626195[ebp*1+edx] | ||
168 | xor edi, ecx | ||
169 | add edx, edi | ||
170 | mov edi, eax | ||
171 | rol edx, 12 | ||
172 | mov ebp, DWORD PTR 56[esi] | ||
173 | add edx, eax | ||
174 | ; R0 14 | ||
175 | xor edi, ebx | ||
176 | and edi, edx | ||
177 | lea ecx, DWORD PTR 2792965006[ebp*1+ecx] | ||
178 | xor edi, ebx | ||
179 | add ecx, edi | ||
180 | mov edi, edx | ||
181 | rol ecx, 17 | ||
182 | mov ebp, DWORD PTR 60[esi] | ||
183 | add ecx, edx | ||
184 | ; R0 15 | ||
185 | xor edi, eax | ||
186 | and edi, ecx | ||
187 | lea ebx, DWORD PTR 1236535329[ebp*1+ebx] | ||
188 | xor edi, eax | ||
189 | add ebx, edi | ||
190 | mov edi, ecx | ||
191 | rol ebx, 22 | ||
192 | mov ebp, DWORD PTR 4[esi] | ||
193 | add ebx, ecx | ||
194 | ; | ||
195 | ; R1 section | ||
196 | ; R1 16 | ||
197 | lea eax, DWORD PTR 4129170786[ebp*1+eax] | ||
198 | xor edi, ebx | ||
199 | and edi, edx | ||
200 | mov ebp, DWORD PTR 24[esi] | ||
201 | xor edi, ecx | ||
202 | add eax, edi | ||
203 | mov edi, ebx | ||
204 | rol eax, 5 | ||
205 | add eax, ebx | ||
206 | ; R1 17 | ||
207 | lea edx, DWORD PTR 3225465664[ebp*1+edx] | ||
208 | xor edi, eax | ||
209 | and edi, ecx | ||
210 | mov ebp, DWORD PTR 44[esi] | ||
211 | xor edi, ebx | ||
212 | add edx, edi | ||
213 | mov edi, eax | ||
214 | rol edx, 9 | ||
215 | add edx, eax | ||
216 | ; R1 18 | ||
217 | lea ecx, DWORD PTR 643717713[ebp*1+ecx] | ||
218 | xor edi, edx | ||
219 | and edi, ebx | ||
220 | mov ebp, DWORD PTR [esi] | ||
221 | xor edi, eax | ||
222 | add ecx, edi | ||
223 | mov edi, edx | ||
224 | rol ecx, 14 | ||
225 | add ecx, edx | ||
226 | ; R1 19 | ||
227 | lea ebx, DWORD PTR 3921069994[ebp*1+ebx] | ||
228 | xor edi, ecx | ||
229 | and edi, eax | ||
230 | mov ebp, DWORD PTR 20[esi] | ||
231 | xor edi, edx | ||
232 | add ebx, edi | ||
233 | mov edi, ecx | ||
234 | rol ebx, 20 | ||
235 | add ebx, ecx | ||
236 | ; R1 20 | ||
237 | lea eax, DWORD PTR 3593408605[ebp*1+eax] | ||
238 | xor edi, ebx | ||
239 | and edi, edx | ||
240 | mov ebp, DWORD PTR 40[esi] | ||
241 | xor edi, ecx | ||
242 | add eax, edi | ||
243 | mov edi, ebx | ||
244 | rol eax, 5 | ||
245 | add eax, ebx | ||
246 | ; R1 21 | ||
247 | lea edx, DWORD PTR 38016083[ebp*1+edx] | ||
248 | xor edi, eax | ||
249 | and edi, ecx | ||
250 | mov ebp, DWORD PTR 60[esi] | ||
251 | xor edi, ebx | ||
252 | add edx, edi | ||
253 | mov edi, eax | ||
254 | rol edx, 9 | ||
255 | add edx, eax | ||
256 | ; R1 22 | ||
257 | lea ecx, DWORD PTR 3634488961[ebp*1+ecx] | ||
258 | xor edi, edx | ||
259 | and edi, ebx | ||
260 | mov ebp, DWORD PTR 16[esi] | ||
261 | xor edi, eax | ||
262 | add ecx, edi | ||
263 | mov edi, edx | ||
264 | rol ecx, 14 | ||
265 | add ecx, edx | ||
266 | ; R1 23 | ||
267 | lea ebx, DWORD PTR 3889429448[ebp*1+ebx] | ||
268 | xor edi, ecx | ||
269 | and edi, eax | ||
270 | mov ebp, DWORD PTR 36[esi] | ||
271 | xor edi, edx | ||
272 | add ebx, edi | ||
273 | mov edi, ecx | ||
274 | rol ebx, 20 | ||
275 | add ebx, ecx | ||
276 | ; R1 24 | ||
277 | lea eax, DWORD PTR 568446438[ebp*1+eax] | ||
278 | xor edi, ebx | ||
279 | and edi, edx | ||
280 | mov ebp, DWORD PTR 56[esi] | ||
281 | xor edi, ecx | ||
282 | add eax, edi | ||
283 | mov edi, ebx | ||
284 | rol eax, 5 | ||
285 | add eax, ebx | ||
286 | ; R1 25 | ||
287 | lea edx, DWORD PTR 3275163606[ebp*1+edx] | ||
288 | xor edi, eax | ||
289 | and edi, ecx | ||
290 | mov ebp, DWORD PTR 12[esi] | ||
291 | xor edi, ebx | ||
292 | add edx, edi | ||
293 | mov edi, eax | ||
294 | rol edx, 9 | ||
295 | add edx, eax | ||
296 | ; R1 26 | ||
297 | lea ecx, DWORD PTR 4107603335[ebp*1+ecx] | ||
298 | xor edi, edx | ||
299 | and edi, ebx | ||
300 | mov ebp, DWORD PTR 32[esi] | ||
301 | xor edi, eax | ||
302 | add ecx, edi | ||
303 | mov edi, edx | ||
304 | rol ecx, 14 | ||
305 | add ecx, edx | ||
306 | ; R1 27 | ||
307 | lea ebx, DWORD PTR 1163531501[ebp*1+ebx] | ||
308 | xor edi, ecx | ||
309 | and edi, eax | ||
310 | mov ebp, DWORD PTR 52[esi] | ||
311 | xor edi, edx | ||
312 | add ebx, edi | ||
313 | mov edi, ecx | ||
314 | rol ebx, 20 | ||
315 | add ebx, ecx | ||
316 | ; R1 28 | ||
317 | lea eax, DWORD PTR 2850285829[ebp*1+eax] | ||
318 | xor edi, ebx | ||
319 | and edi, edx | ||
320 | mov ebp, DWORD PTR 8[esi] | ||
321 | xor edi, ecx | ||
322 | add eax, edi | ||
323 | mov edi, ebx | ||
324 | rol eax, 5 | ||
325 | add eax, ebx | ||
326 | ; R1 29 | ||
327 | lea edx, DWORD PTR 4243563512[ebp*1+edx] | ||
328 | xor edi, eax | ||
329 | and edi, ecx | ||
330 | mov ebp, DWORD PTR 28[esi] | ||
331 | xor edi, ebx | ||
332 | add edx, edi | ||
333 | mov edi, eax | ||
334 | rol edx, 9 | ||
335 | add edx, eax | ||
336 | ; R1 30 | ||
337 | lea ecx, DWORD PTR 1735328473[ebp*1+ecx] | ||
338 | xor edi, edx | ||
339 | and edi, ebx | ||
340 | mov ebp, DWORD PTR 48[esi] | ||
341 | xor edi, eax | ||
342 | add ecx, edi | ||
343 | mov edi, edx | ||
344 | rol ecx, 14 | ||
345 | add ecx, edx | ||
346 | ; R1 31 | ||
347 | lea ebx, DWORD PTR 2368359562[ebp*1+ebx] | ||
348 | xor edi, ecx | ||
349 | and edi, eax | ||
350 | mov ebp, DWORD PTR 20[esi] | ||
351 | xor edi, edx | ||
352 | add ebx, edi | ||
353 | mov edi, ecx | ||
354 | rol ebx, 20 | ||
355 | add ebx, ecx | ||
356 | ; | ||
357 | ; R2 section | ||
358 | ; R2 32 | ||
359 | xor edi, edx | ||
360 | xor edi, ebx | ||
361 | lea eax, DWORD PTR 4294588738[ebp*1+eax] | ||
362 | add eax, edi | ||
363 | rol eax, 4 | ||
364 | mov ebp, DWORD PTR 32[esi] | ||
365 | mov edi, ebx | ||
366 | ; R2 33 | ||
367 | lea edx, DWORD PTR 2272392833[ebp*1+edx] | ||
368 | add eax, ebx | ||
369 | xor edi, ecx | ||
370 | xor edi, eax | ||
371 | mov ebp, DWORD PTR 44[esi] | ||
372 | add edx, edi | ||
373 | mov edi, eax | ||
374 | rol edx, 11 | ||
375 | add edx, eax | ||
376 | ; R2 34 | ||
377 | xor edi, ebx | ||
378 | xor edi, edx | ||
379 | lea ecx, DWORD PTR 1839030562[ebp*1+ecx] | ||
380 | add ecx, edi | ||
381 | rol ecx, 16 | ||
382 | mov ebp, DWORD PTR 56[esi] | ||
383 | mov edi, edx | ||
384 | ; R2 35 | ||
385 | lea ebx, DWORD PTR 4259657740[ebp*1+ebx] | ||
386 | add ecx, edx | ||
387 | xor edi, eax | ||
388 | xor edi, ecx | ||
389 | mov ebp, DWORD PTR 4[esi] | ||
390 | add ebx, edi | ||
391 | mov edi, ecx | ||
392 | rol ebx, 23 | ||
393 | add ebx, ecx | ||
394 | ; R2 36 | ||
395 | xor edi, edx | ||
396 | xor edi, ebx | ||
397 | lea eax, DWORD PTR 2763975236[ebp*1+eax] | ||
398 | add eax, edi | ||
399 | rol eax, 4 | ||
400 | mov ebp, DWORD PTR 16[esi] | ||
401 | mov edi, ebx | ||
402 | ; R2 37 | ||
403 | lea edx, DWORD PTR 1272893353[ebp*1+edx] | ||
404 | add eax, ebx | ||
405 | xor edi, ecx | ||
406 | xor edi, eax | ||
407 | mov ebp, DWORD PTR 28[esi] | ||
408 | add edx, edi | ||
409 | mov edi, eax | ||
410 | rol edx, 11 | ||
411 | add edx, eax | ||
412 | ; R2 38 | ||
413 | xor edi, ebx | ||
414 | xor edi, edx | ||
415 | lea ecx, DWORD PTR 4139469664[ebp*1+ecx] | ||
416 | add ecx, edi | ||
417 | rol ecx, 16 | ||
418 | mov ebp, DWORD PTR 40[esi] | ||
419 | mov edi, edx | ||
420 | ; R2 39 | ||
421 | lea ebx, DWORD PTR 3200236656[ebp*1+ebx] | ||
422 | add ecx, edx | ||
423 | xor edi, eax | ||
424 | xor edi, ecx | ||
425 | mov ebp, DWORD PTR 52[esi] | ||
426 | add ebx, edi | ||
427 | mov edi, ecx | ||
428 | rol ebx, 23 | ||
429 | add ebx, ecx | ||
430 | ; R2 40 | ||
431 | xor edi, edx | ||
432 | xor edi, ebx | ||
433 | lea eax, DWORD PTR 681279174[ebp*1+eax] | ||
434 | add eax, edi | ||
435 | rol eax, 4 | ||
436 | mov ebp, DWORD PTR [esi] | ||
437 | mov edi, ebx | ||
438 | ; R2 41 | ||
439 | lea edx, DWORD PTR 3936430074[ebp*1+edx] | ||
440 | add eax, ebx | ||
441 | xor edi, ecx | ||
442 | xor edi, eax | ||
443 | mov ebp, DWORD PTR 12[esi] | ||
444 | add edx, edi | ||
445 | mov edi, eax | ||
446 | rol edx, 11 | ||
447 | add edx, eax | ||
448 | ; R2 42 | ||
449 | xor edi, ebx | ||
450 | xor edi, edx | ||
451 | lea ecx, DWORD PTR 3572445317[ebp*1+ecx] | ||
452 | add ecx, edi | ||
453 | rol ecx, 16 | ||
454 | mov ebp, DWORD PTR 24[esi] | ||
455 | mov edi, edx | ||
456 | ; R2 43 | ||
457 | lea ebx, DWORD PTR 76029189[ebp*1+ebx] | ||
458 | add ecx, edx | ||
459 | xor edi, eax | ||
460 | xor edi, ecx | ||
461 | mov ebp, DWORD PTR 36[esi] | ||
462 | add ebx, edi | ||
463 | mov edi, ecx | ||
464 | rol ebx, 23 | ||
465 | add ebx, ecx | ||
466 | ; R2 44 | ||
467 | xor edi, edx | ||
468 | xor edi, ebx | ||
469 | lea eax, DWORD PTR 3654602809[ebp*1+eax] | ||
470 | add eax, edi | ||
471 | rol eax, 4 | ||
472 | mov ebp, DWORD PTR 48[esi] | ||
473 | mov edi, ebx | ||
474 | ; R2 45 | ||
475 | lea edx, DWORD PTR 3873151461[ebp*1+edx] | ||
476 | add eax, ebx | ||
477 | xor edi, ecx | ||
478 | xor edi, eax | ||
479 | mov ebp, DWORD PTR 60[esi] | ||
480 | add edx, edi | ||
481 | mov edi, eax | ||
482 | rol edx, 11 | ||
483 | add edx, eax | ||
484 | ; R2 46 | ||
485 | xor edi, ebx | ||
486 | xor edi, edx | ||
487 | lea ecx, DWORD PTR 530742520[ebp*1+ecx] | ||
488 | add ecx, edi | ||
489 | rol ecx, 16 | ||
490 | mov ebp, DWORD PTR 8[esi] | ||
491 | mov edi, edx | ||
492 | ; R2 47 | ||
493 | lea ebx, DWORD PTR 3299628645[ebp*1+ebx] | ||
494 | add ecx, edx | ||
495 | xor edi, eax | ||
496 | xor edi, ecx | ||
497 | mov ebp, DWORD PTR [esi] | ||
498 | add ebx, edi | ||
499 | mov edi, -1 | ||
500 | rol ebx, 23 | ||
501 | add ebx, ecx | ||
502 | ; | ||
503 | ; R3 section | ||
504 | ; R3 48 | ||
505 | xor edi, edx | ||
506 | or edi, ebx | ||
507 | lea eax, DWORD PTR 4096336452[ebp*1+eax] | ||
508 | xor edi, ecx | ||
509 | mov ebp, DWORD PTR 28[esi] | ||
510 | add eax, edi | ||
511 | mov edi, -1 | ||
512 | rol eax, 6 | ||
513 | xor edi, ecx | ||
514 | add eax, ebx | ||
515 | ; R3 49 | ||
516 | or edi, eax | ||
517 | lea edx, DWORD PTR 1126891415[ebp*1+edx] | ||
518 | xor edi, ebx | ||
519 | mov ebp, DWORD PTR 56[esi] | ||
520 | add edx, edi | ||
521 | mov edi, -1 | ||
522 | rol edx, 10 | ||
523 | xor edi, ebx | ||
524 | add edx, eax | ||
525 | ; R3 50 | ||
526 | or edi, edx | ||
527 | lea ecx, DWORD PTR 2878612391[ebp*1+ecx] | ||
528 | xor edi, eax | ||
529 | mov ebp, DWORD PTR 20[esi] | ||
530 | add ecx, edi | ||
531 | mov edi, -1 | ||
532 | rol ecx, 15 | ||
533 | xor edi, eax | ||
534 | add ecx, edx | ||
535 | ; R3 51 | ||
536 | or edi, ecx | ||
537 | lea ebx, DWORD PTR 4237533241[ebp*1+ebx] | ||
538 | xor edi, edx | ||
539 | mov ebp, DWORD PTR 48[esi] | ||
540 | add ebx, edi | ||
541 | mov edi, -1 | ||
542 | rol ebx, 21 | ||
543 | xor edi, edx | ||
544 | add ebx, ecx | ||
545 | ; R3 52 | ||
546 | or edi, ebx | ||
547 | lea eax, DWORD PTR 1700485571[ebp*1+eax] | ||
548 | xor edi, ecx | ||
549 | mov ebp, DWORD PTR 12[esi] | ||
550 | add eax, edi | ||
551 | mov edi, -1 | ||
552 | rol eax, 6 | ||
553 | xor edi, ecx | ||
554 | add eax, ebx | ||
555 | ; R3 53 | ||
556 | or edi, eax | ||
557 | lea edx, DWORD PTR 2399980690[ebp*1+edx] | ||
558 | xor edi, ebx | ||
559 | mov ebp, DWORD PTR 40[esi] | ||
560 | add edx, edi | ||
561 | mov edi, -1 | ||
562 | rol edx, 10 | ||
563 | xor edi, ebx | ||
564 | add edx, eax | ||
565 | ; R3 54 | ||
566 | or edi, edx | ||
567 | lea ecx, DWORD PTR 4293915773[ebp*1+ecx] | ||
568 | xor edi, eax | ||
569 | mov ebp, DWORD PTR 4[esi] | ||
570 | add ecx, edi | ||
571 | mov edi, -1 | ||
572 | rol ecx, 15 | ||
573 | xor edi, eax | ||
574 | add ecx, edx | ||
575 | ; R3 55 | ||
576 | or edi, ecx | ||
577 | lea ebx, DWORD PTR 2240044497[ebp*1+ebx] | ||
578 | xor edi, edx | ||
579 | mov ebp, DWORD PTR 32[esi] | ||
580 | add ebx, edi | ||
581 | mov edi, -1 | ||
582 | rol ebx, 21 | ||
583 | xor edi, edx | ||
584 | add ebx, ecx | ||
585 | ; R3 56 | ||
586 | or edi, ebx | ||
587 | lea eax, DWORD PTR 1873313359[ebp*1+eax] | ||
588 | xor edi, ecx | ||
589 | mov ebp, DWORD PTR 60[esi] | ||
590 | add eax, edi | ||
591 | mov edi, -1 | ||
592 | rol eax, 6 | ||
593 | xor edi, ecx | ||
594 | add eax, ebx | ||
595 | ; R3 57 | ||
596 | or edi, eax | ||
597 | lea edx, DWORD PTR 4264355552[ebp*1+edx] | ||
598 | xor edi, ebx | ||
599 | mov ebp, DWORD PTR 24[esi] | ||
600 | add edx, edi | ||
601 | mov edi, -1 | ||
602 | rol edx, 10 | ||
603 | xor edi, ebx | ||
604 | add edx, eax | ||
605 | ; R3 58 | ||
606 | or edi, edx | ||
607 | lea ecx, DWORD PTR 2734768916[ebp*1+ecx] | ||
608 | xor edi, eax | ||
609 | mov ebp, DWORD PTR 52[esi] | ||
610 | add ecx, edi | ||
611 | mov edi, -1 | ||
612 | rol ecx, 15 | ||
613 | xor edi, eax | ||
614 | add ecx, edx | ||
615 | ; R3 59 | ||
616 | or edi, ecx | ||
617 | lea ebx, DWORD PTR 1309151649[ebp*1+ebx] | ||
618 | xor edi, edx | ||
619 | mov ebp, DWORD PTR 16[esi] | ||
620 | add ebx, edi | ||
621 | mov edi, -1 | ||
622 | rol ebx, 21 | ||
623 | xor edi, edx | ||
624 | add ebx, ecx | ||
625 | ; R3 60 | ||
626 | or edi, ebx | ||
627 | lea eax, DWORD PTR 4149444226[ebp*1+eax] | ||
628 | xor edi, ecx | ||
629 | mov ebp, DWORD PTR 44[esi] | ||
630 | add eax, edi | ||
631 | mov edi, -1 | ||
632 | rol eax, 6 | ||
633 | xor edi, ecx | ||
634 | add eax, ebx | ||
635 | ; R3 61 | ||
636 | or edi, eax | ||
637 | lea edx, DWORD PTR 3174756917[ebp*1+edx] | ||
638 | xor edi, ebx | ||
639 | mov ebp, DWORD PTR 8[esi] | ||
640 | add edx, edi | ||
641 | mov edi, -1 | ||
642 | rol edx, 10 | ||
643 | xor edi, ebx | ||
644 | add edx, eax | ||
645 | ; R3 62 | ||
646 | or edi, edx | ||
647 | lea ecx, DWORD PTR 718787259[ebp*1+ecx] | ||
648 | xor edi, eax | ||
649 | mov ebp, DWORD PTR 36[esi] | ||
650 | add ecx, edi | ||
651 | mov edi, -1 | ||
652 | rol ecx, 15 | ||
653 | xor edi, eax | ||
654 | add ecx, edx | ||
655 | ; R3 63 | ||
656 | or edi, ecx | ||
657 | lea ebx, DWORD PTR 3951481745[ebp*1+ebx] | ||
658 | xor edi, edx | ||
659 | mov ebp, DWORD PTR 24[esp] | ||
660 | add ebx, edi | ||
661 | add esi, 64 | ||
662 | rol ebx, 21 | ||
663 | mov edi, DWORD PTR [ebp] | ||
664 | add ebx, ecx | ||
665 | add eax, edi | ||
666 | mov edi, DWORD PTR 4[ebp] | ||
667 | add ebx, edi | ||
668 | mov edi, DWORD PTR 8[ebp] | ||
669 | add ecx, edi | ||
670 | mov edi, DWORD PTR 12[ebp] | ||
671 | add edx, edi | ||
672 | mov DWORD PTR [ebp],eax | ||
673 | mov DWORD PTR 4[ebp],ebx | ||
674 | mov edi, DWORD PTR [esp] | ||
675 | mov DWORD PTR 8[ebp],ecx | ||
676 | mov DWORD PTR 12[ebp],edx | ||
677 | cmp edi, esi | ||
678 | jge L000start | ||
679 | pop eax | ||
680 | pop ebx | ||
681 | pop ebp | ||
682 | pop edi | ||
683 | pop esi | ||
684 | ret | ||
685 | _md5_block_asm_host_order ENDP | ||
686 | _TEXT ENDS | ||
687 | END | ||
diff --git a/src/lib/libssl/src/crypto/md5/md5_locl.h b/src/lib/libssl/src/crypto/md5/md5_locl.h index 06af633228..c912484122 100644 --- a/src/lib/libssl/src/crypto/md5/md5_locl.h +++ b/src/lib/libssl/src/crypto/md5/md5_locl.h | |||
@@ -135,11 +135,7 @@ void md5_block_data_order (MD5_CTX *c, const void *p,int num); | |||
135 | */ | 135 | */ |
136 | #endif | 136 | #endif |
137 | 137 | ||
138 | #ifndef FLAT_INC | ||
139 | #include "../md32_common.h" | ||
140 | #else | ||
141 | #include "md32_common.h" | 138 | #include "md32_common.h" |
142 | #endif | ||
143 | 139 | ||
144 | /* | 140 | /* |
145 | #define F(x,y,z) (((x) & (y)) | ((~(x)) & (z))) | 141 | #define F(x,y,z) (((x) & (y)) | ((~(x)) & (z))) |
diff --git a/src/lib/libssl/src/crypto/mem_dbg.c b/src/lib/libssl/src/crypto/mem_dbg.c index 14770c0733..a399485300 100644 --- a/src/lib/libssl/src/crypto/mem_dbg.c +++ b/src/lib/libssl/src/crypto/mem_dbg.c | |||
@@ -640,19 +640,54 @@ void CRYPTO_mem_leaks(BIO *b) | |||
640 | MEM_LEAK ml; | 640 | MEM_LEAK ml; |
641 | char buf[80]; | 641 | char buf[80]; |
642 | 642 | ||
643 | if (mh == NULL) return; | 643 | if (mh == NULL && amih == NULL) |
644 | return; | ||
644 | ml.bio=b; | 645 | ml.bio=b; |
645 | ml.bytes=0; | 646 | ml.bytes=0; |
646 | ml.chunks=0; | 647 | ml.chunks=0; |
647 | CRYPTO_w_lock(CRYPTO_LOCK_MALLOC2); | 648 | MemCheck_off(); /* obtains CRYPTO_LOCK_MALLOC2 */ |
648 | lh_doall_arg(mh,(void (*)())print_leak,(char *)&ml); | 649 | if (mh != NULL) |
649 | CRYPTO_w_unlock(CRYPTO_LOCK_MALLOC2); | 650 | lh_doall_arg(mh,(void (*)())print_leak,(char *)&ml); |
650 | if (ml.chunks != 0) | 651 | if (ml.chunks != 0) |
651 | { | 652 | { |
652 | sprintf(buf,"%ld bytes leaked in %d chunks\n", | 653 | sprintf(buf,"%ld bytes leaked in %d chunks\n", |
653 | ml.bytes,ml.chunks); | 654 | ml.bytes,ml.chunks); |
654 | BIO_puts(b,buf); | 655 | BIO_puts(b,buf); |
655 | } | 656 | } |
657 | else | ||
658 | { | ||
659 | /* Make sure that, if we found no leaks, memory-leak debugging itself | ||
660 | * does not introduce memory leaks (which might irritate | ||
661 | * external debugging tools). | ||
662 | * (When someone enables leak checking, but does not call | ||
663 | * this function, we declare it to be their fault.) | ||
664 | * | ||
665 | * XXX This should be in CRYPTO_mem_leaks_cb, | ||
666 | * and CRYPTO_mem_leaks should be implemented by | ||
667 | * using CRYPTO_mem_leaks_cb. | ||
668 | * (Also their should be a variant of lh_doall_arg | ||
669 | * that takes a function pointer instead of a void *; | ||
670 | * this would obviate the ugly and illegal | ||
671 | * void_fn_to_char kludge in CRYPTO_mem_leaks_cb. | ||
672 | * Otherwise the code police will come and get us.) | ||
673 | */ | ||
674 | CRYPTO_w_lock(CRYPTO_LOCK_MALLOC); | ||
675 | if (mh != NULL) | ||
676 | { | ||
677 | lh_free(mh); | ||
678 | mh = NULL; | ||
679 | } | ||
680 | if (amih != NULL) | ||
681 | { | ||
682 | if (lh_num_items(amih) == 0) | ||
683 | { | ||
684 | lh_free(amih); | ||
685 | amih = NULL; | ||
686 | } | ||
687 | } | ||
688 | CRYPTO_w_unlock(CRYPTO_LOCK_MALLOC); | ||
689 | } | ||
690 | MemCheck_on(); /* releases CRYPTO_LOCK_MALLOC2 */ | ||
656 | 691 | ||
657 | #if 0 | 692 | #if 0 |
658 | lh_stats_bio(mh,b); | 693 | lh_stats_bio(mh,b); |
diff --git a/src/lib/libssl/src/crypto/objects/o_names.c b/src/lib/libssl/src/crypto/objects/o_names.c index d654eb220e..d9389a5e5a 100644 --- a/src/lib/libssl/src/crypto/objects/o_names.c +++ b/src/lib/libssl/src/crypto/objects/o_names.c | |||
@@ -22,7 +22,7 @@ typedef struct name_funcs_st | |||
22 | DECLARE_STACK_OF(NAME_FUNCS) | 22 | DECLARE_STACK_OF(NAME_FUNCS) |
23 | IMPLEMENT_STACK_OF(NAME_FUNCS) | 23 | IMPLEMENT_STACK_OF(NAME_FUNCS) |
24 | 24 | ||
25 | STACK_OF(NAME_FUNCS) *name_funcs_stack; | 25 | static STACK_OF(NAME_FUNCS) *name_funcs_stack; |
26 | 26 | ||
27 | static unsigned long obj_name_hash(OBJ_NAME *a); | 27 | static unsigned long obj_name_hash(OBJ_NAME *a); |
28 | static int obj_name_cmp(OBJ_NAME *a,OBJ_NAME *b); | 28 | static int obj_name_cmp(OBJ_NAME *a,OBJ_NAME *b); |
diff --git a/src/lib/libssl/src/crypto/objects/obj_err.c b/src/lib/libssl/src/crypto/objects/obj_err.c index cef401db27..7aec0ed47a 100644 --- a/src/lib/libssl/src/crypto/objects/obj_err.c +++ b/src/lib/libssl/src/crypto/objects/obj_err.c | |||
@@ -54,7 +54,8 @@ | |||
54 | */ | 54 | */ |
55 | 55 | ||
56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes |
57 | * made to it will be overwritten when the script next updates this file. | 57 | * made to it will be overwritten when the script next updates this file, |
58 | * only reason strings will be preserved. | ||
58 | */ | 59 | */ |
59 | 60 | ||
60 | #include <stdio.h> | 61 | #include <stdio.h> |
diff --git a/src/lib/libssl/src/crypto/objects/objects.h b/src/lib/libssl/src/crypto/objects/objects.h index d1a5ad2502..95c8a21568 100644 --- a/src/lib/libssl/src/crypto/objects/objects.h +++ b/src/lib/libssl/src/crypto/objects/objects.h | |||
@@ -949,7 +949,7 @@ extern "C" { | |||
949 | #define NID_ad_ca_issuers 179 | 949 | #define NID_ad_ca_issuers 179 |
950 | #define OBJ_ad_ca_issuers OBJ_id_ad,2L | 950 | #define OBJ_ad_ca_issuers OBJ_id_ad,2L |
951 | 951 | ||
952 | #define SN_OSCP_sign "OCSPSigning" | 952 | #define SN_OCSP_sign "OCSPSigning" |
953 | #define LN_OCSP_sign "OCSP Signing" | 953 | #define LN_OCSP_sign "OCSP Signing" |
954 | #define NID_OCSP_sign 180 | 954 | #define NID_OCSP_sign 180 |
955 | #define OBJ_OCSP_sign OBJ_id_kp,9L | 955 | #define OBJ_OCSP_sign OBJ_id_kp,9L |
diff --git a/src/lib/libssl/src/crypto/opensslv.h b/src/lib/libssl/src/crypto/opensslv.h index 55d5d06cf5..55ec97389f 100644 --- a/src/lib/libssl/src/crypto/opensslv.h +++ b/src/lib/libssl/src/crypto/opensslv.h | |||
@@ -2,20 +2,31 @@ | |||
2 | #define HEADER_OPENSSLV_H | 2 | #define HEADER_OPENSSLV_H |
3 | 3 | ||
4 | /* Numeric release version identifier: | 4 | /* Numeric release version identifier: |
5 | * MMNNFFRBB: major minor fix final beta/patch | 5 | * MMNNFFPPS: major minor fix patch status |
6 | * The status nibble has one of the values 0 for development, 1 to e for betas | ||
7 | * 1 to 14, and f for release. The patch level is exactly that. | ||
6 | * For example: | 8 | * For example: |
7 | * 0.9.3-dev 0x00903000 | 9 | * 0.9.3-dev 0x00903000 |
8 | * 0.9.3beta1 0x00903001 | 10 | * 0.9.3-beta1 0x00903001 |
9 | * 0.9.3beta2-dev 0x00903002 | 11 | * 0.9.3-beta2-dev 0x00903002 |
10 | * 0.9.3beta2 0x00903002 (same as ...beta2-dev) | 12 | * 0.9.3-beta2 0x00903002 (same as ...beta2-dev) |
11 | * 0.9.3 0x00903100 | 13 | * 0.9.3 0x0090300f |
12 | * 0.9.3a 0x00903101 | 14 | * 0.9.3a 0x0090301f |
13 | * 0.9.4 0x00904100 | 15 | * 0.9.4 0x0090400f |
14 | * 1.2.3z 0x1020311a | 16 | * 1.2.3z 0x102031af |
17 | * | ||
18 | * For continuity reasons (because 0.9.5 is already out, and is coded | ||
19 | * 0x00905100), between 0.9.5 and 0.9.6 the coding of the patch level | ||
20 | * part is slightly different, by setting the highest bit. This means | ||
21 | * that 0.9.5a looks like this: 0x0090581f. At 0.9.6, we can start | ||
22 | * with 0x0090600S... | ||
23 | * | ||
15 | * (Prior to 0.9.3-dev a different scheme was used: 0.9.2b is 0x0922.) | 24 | * (Prior to 0.9.3-dev a different scheme was used: 0.9.2b is 0x0922.) |
25 | * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for | ||
26 | * major minor fix final patch/beta) | ||
16 | */ | 27 | */ |
17 | #define OPENSSL_VERSION_NUMBER 0x00905100L | 28 | #define OPENSSL_VERSION_NUMBER 0x0090581fL |
18 | #define OPENSSL_VERSION_TEXT "OpenSSL 0.9.5 28 Feb 2000" | 29 | #define OPENSSL_VERSION_TEXT "OpenSSL 0.9.5a 1 Apr 2000" |
19 | #define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT | 30 | #define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT |
20 | 31 | ||
21 | #endif /* HEADER_OPENSSLV_H */ | 32 | #endif /* HEADER_OPENSSLV_H */ |
diff --git a/src/lib/libssl/src/crypto/pem/pem_err.c b/src/lib/libssl/src/crypto/pem/pem_err.c index 642129da20..8b1789b11c 100644 --- a/src/lib/libssl/src/crypto/pem/pem_err.c +++ b/src/lib/libssl/src/crypto/pem/pem_err.c | |||
@@ -54,7 +54,8 @@ | |||
54 | */ | 54 | */ |
55 | 55 | ||
56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes |
57 | * made to it will be overwritten when the script next updates this file. | 57 | * made to it will be overwritten when the script next updates this file, |
58 | * only reason strings will be preserved. | ||
58 | */ | 59 | */ |
59 | 60 | ||
60 | #include <stdio.h> | 61 | #include <stdio.h> |
diff --git a/src/lib/libssl/src/crypto/pem/pem_lib.c b/src/lib/libssl/src/crypto/pem/pem_lib.c index 072211ba0f..b5e0a650f8 100644 --- a/src/lib/libssl/src/crypto/pem/pem_lib.c +++ b/src/lib/libssl/src/crypto/pem/pem_lib.c | |||
@@ -373,7 +373,7 @@ int PEM_ASN1_write_bio(int (*i2d)(), const char *name, BIO *bp, char *x, | |||
373 | kstr=(unsigned char *)buf; | 373 | kstr=(unsigned char *)buf; |
374 | } | 374 | } |
375 | RAND_add(data,i,0);/* put in the RSA key. */ | 375 | RAND_add(data,i,0);/* put in the RSA key. */ |
376 | if (RAND_bytes(iv,8) <= 0) /* Generate a salt */ | 376 | if (RAND_pseudo_bytes(iv,8) < 0) /* Generate a salt */ |
377 | goto err; | 377 | goto err; |
378 | /* The 'iv' is used as the iv and as a salt. It is | 378 | /* The 'iv' is used as the iv and as a salt. It is |
379 | * NOT taken from the BytesToKey function */ | 379 | * NOT taken from the BytesToKey function */ |
diff --git a/src/lib/libssl/src/crypto/perlasm/x86asm.pl b/src/lib/libssl/src/crypto/perlasm/x86asm.pl index 44e330eb8d..81c6e64e87 100644 --- a/src/lib/libssl/src/crypto/perlasm/x86asm.pl +++ b/src/lib/libssl/src/crypto/perlasm/x86asm.pl | |||
@@ -18,11 +18,13 @@ sub main'asm_init | |||
18 | ($type,$fn,$i386)=@_; | 18 | ($type,$fn,$i386)=@_; |
19 | $filename=$fn; | 19 | $filename=$fn; |
20 | 20 | ||
21 | $cpp=$sol=$aout=$win32=0; | 21 | $cpp=$sol=$aout=$win32=$gaswin=0; |
22 | if ( ($type eq "elf")) | 22 | if ( ($type eq "elf")) |
23 | { require "x86unix.pl"; } | 23 | { require "x86unix.pl"; } |
24 | elsif ( ($type eq "a.out")) | 24 | elsif ( ($type eq "a.out")) |
25 | { $aout=1; require "x86unix.pl"; } | 25 | { $aout=1; require "x86unix.pl"; } |
26 | elsif ( ($type eq "gaswin")) | ||
27 | { $gaswin=1; $aout=1; require "x86unix.pl"; } | ||
26 | elsif ( ($type eq "sol")) | 28 | elsif ( ($type eq "sol")) |
27 | { $sol=1; require "x86unix.pl"; } | 29 | { $sol=1; require "x86unix.pl"; } |
28 | elsif ( ($type eq "cpp")) | 30 | elsif ( ($type eq "cpp")) |
@@ -50,7 +52,7 @@ EOF | |||
50 | &comment("Don't even think of reading this code"); | 52 | &comment("Don't even think of reading this code"); |
51 | &comment("It was automatically generated by $filename"); | 53 | &comment("It was automatically generated by $filename"); |
52 | &comment("Which is a perl program used to generate the x86 assember for"); | 54 | &comment("Which is a perl program used to generate the x86 assember for"); |
53 | &comment("any of elf, a.out, BSDI,Win32, or Solaris"); | 55 | &comment("any of elf, a.out, BSDI, Win32, gaswin (for GNU as on Win32) or Solaris"); |
54 | &comment("eric <eay\@cryptsoft.com>"); | 56 | &comment("eric <eay\@cryptsoft.com>"); |
55 | &comment(""); | 57 | &comment(""); |
56 | 58 | ||
diff --git a/src/lib/libssl/src/crypto/perlasm/x86ms.pl b/src/lib/libssl/src/crypto/perlasm/x86ms.pl index 252a57bdb5..206452341d 100644 --- a/src/lib/libssl/src/crypto/perlasm/x86ms.pl +++ b/src/lib/libssl/src/crypto/perlasm/x86ms.pl | |||
@@ -341,7 +341,7 @@ sub main'set_label | |||
341 | $label{$_[0]}="${label}${_[0]}"; | 341 | $label{$_[0]}="${label}${_[0]}"; |
342 | $label++; | 342 | $label++; |
343 | } | 343 | } |
344 | if((defined $_[1]) && ($_[1] == 1)) | 344 | if((defined $_[2]) && ($_[2] == 1)) |
345 | { | 345 | { |
346 | push(@out,"$label{$_[0]}::\n"); | 346 | push(@out,"$label{$_[0]}::\n"); |
347 | } | 347 | } |
diff --git a/src/lib/libssl/src/crypto/perlasm/x86unix.pl b/src/lib/libssl/src/crypto/perlasm/x86unix.pl index 60d75f5ce4..309060ea00 100644 --- a/src/lib/libssl/src/crypto/perlasm/x86unix.pl +++ b/src/lib/libssl/src/crypto/perlasm/x86unix.pl | |||
@@ -292,6 +292,8 @@ EOF | |||
292 | push(@out,$tmp); | 292 | push(@out,$tmp); |
293 | if ($main'cpp) | 293 | if ($main'cpp) |
294 | { $tmp=push(@out,"\tTYPE($func,\@function)\n"); } | 294 | { $tmp=push(@out,"\tTYPE($func,\@function)\n"); } |
295 | elsif ($main'gaswin) | ||
296 | { $tmp=push(@out,"\t.def\t$func;\t.scl\t2;\t.type\t32;\t.endef\n"); } | ||
295 | else { $tmp=push(@out,"\t.type\t$func,\@function\n"); } | 297 | else { $tmp=push(@out,"\t.type\t$func,\@function\n"); } |
296 | push(@out,"$func:\n"); | 298 | push(@out,"$func:\n"); |
297 | $tmp=<<"EOF"; | 299 | $tmp=<<"EOF"; |
@@ -320,6 +322,8 @@ EOF | |||
320 | push(@out,$tmp); | 322 | push(@out,$tmp); |
321 | if ($main'cpp) | 323 | if ($main'cpp) |
322 | { push(@out,"\tTYPE($func,\@function)\n"); } | 324 | { push(@out,"\tTYPE($func,\@function)\n"); } |
325 | elsif ($main'gaswin) | ||
326 | { $tmp=push(@out,"\t.def\t$func;\t.scl\t2;\t.type\t32;\t.endef\n"); } | ||
323 | else { push(@out,"\t.type $func,\@function\n"); } | 327 | else { push(@out,"\t.type $func,\@function\n"); } |
324 | push(@out,"$func:\n"); | 328 | push(@out,"$func:\n"); |
325 | $stack=4; | 329 | $stack=4; |
@@ -342,6 +346,8 @@ EOF | |||
342 | push(@out,$tmp); | 346 | push(@out,$tmp); |
343 | if ($main'cpp) | 347 | if ($main'cpp) |
344 | { push(@out,"\tSIZE($func,.${func}_end-$func)\n"); } | 348 | { push(@out,"\tSIZE($func,.${func}_end-$func)\n"); } |
349 | elsif ($main'gaswin) | ||
350 | { $tmp=push(@out,"\t.align 4\n"); } | ||
345 | else { push(@out,"\t.size\t$func,.${func}_end-$func\n"); } | 351 | else { push(@out,"\t.size\t$func,.${func}_end-$func\n"); } |
346 | push(@out,".ident \"$func\"\n"); | 352 | push(@out,".ident \"$func\"\n"); |
347 | $stack=0; | 353 | $stack=0; |
@@ -371,6 +377,8 @@ sub main'function_end_B | |||
371 | push(@out,".L_${func}_end:\n"); | 377 | push(@out,".L_${func}_end:\n"); |
372 | if ($main'cpp) | 378 | if ($main'cpp) |
373 | { push(@out,"\tSIZE($func,.L_${func}_end-$func)\n"); } | 379 | { push(@out,"\tSIZE($func,.L_${func}_end-$func)\n"); } |
380 | elsif ($main'gaswin) | ||
381 | { push(@out,"\t.align 4\n"); } | ||
374 | else { push(@out,"\t.size\t$func,.L_${func}_end-$func\n"); } | 382 | else { push(@out,"\t.size\t$func,.L_${func}_end-$func\n"); } |
375 | push(@out,".ident \"desasm.pl\"\n"); | 383 | push(@out,".ident \"desasm.pl\"\n"); |
376 | $stack=0; | 384 | $stack=0; |
diff --git a/src/lib/libssl/src/crypto/pkcs12/p12_crt.c b/src/lib/libssl/src/crypto/pkcs12/p12_crt.c index 56d88b0759..ee8aed54c7 100644 --- a/src/lib/libssl/src/crypto/pkcs12/p12_crt.c +++ b/src/lib/libssl/src/crypto/pkcs12/p12_crt.c | |||
@@ -61,7 +61,7 @@ | |||
61 | #include <openssl/pkcs12.h> | 61 | #include <openssl/pkcs12.h> |
62 | 62 | ||
63 | PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert, | 63 | PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert, |
64 | STACK *ca, int nid_key, int nid_cert, int iter, int mac_iter, | 64 | STACK_OF(X509) *ca, int nid_key, int nid_cert, int iter, int mac_iter, |
65 | int keytype) | 65 | int keytype) |
66 | { | 66 | { |
67 | PKCS12 *p12; | 67 | PKCS12 *p12; |
@@ -103,8 +103,8 @@ PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert, | |||
103 | 103 | ||
104 | /* Add all other certificates */ | 104 | /* Add all other certificates */ |
105 | if(ca) { | 105 | if(ca) { |
106 | for(i = 0; i < sk_num(ca); i++) { | 106 | for(i = 0; i < sk_X509_num(ca); i++) { |
107 | tcert = (X509 *)sk_value(ca, i); | 107 | tcert = sk_X509_value(ca, i); |
108 | if(!(bag = M_PKCS12_x5092certbag(tcert))) return NULL; | 108 | if(!(bag = M_PKCS12_x5092certbag(tcert))) return NULL; |
109 | if(!sk_push(bags, (char *)bag)) { | 109 | if(!sk_push(bags, (char *)bag)) { |
110 | PKCS12err(PKCS12_F_PKCS12_CREATE,ERR_R_MALLOC_FAILURE); | 110 | PKCS12err(PKCS12_F_PKCS12_CREATE,ERR_R_MALLOC_FAILURE); |
diff --git a/src/lib/libssl/src/crypto/pkcs12/p12_key.c b/src/lib/libssl/src/crypto/pkcs12/p12_key.c index 02fdd20e2f..b364671ed2 100644 --- a/src/lib/libssl/src/crypto/pkcs12/p12_key.c +++ b/src/lib/libssl/src/crypto/pkcs12/p12_key.c | |||
@@ -104,6 +104,14 @@ int PKCS12_key_gen_uni (unsigned char *pass, int passlen, unsigned char *salt, | |||
104 | #ifdef DEBUG_KEYGEN | 104 | #ifdef DEBUG_KEYGEN |
105 | unsigned char *tmpout = out; | 105 | unsigned char *tmpout = out; |
106 | int tmpn = n; | 106 | int tmpn = n; |
107 | #endif | ||
108 | |||
109 | if (!pass) { | ||
110 | PKCS12err(PKCS12_F_PKCS12_KEY_GEN_UNI,ERR_R_PASSED_NULL_PARAMETER); | ||
111 | return 0; | ||
112 | } | ||
113 | |||
114 | #ifdef DEBUG_KEYGEN | ||
107 | fprintf(stderr, "KEYGEN DEBUG\n"); | 115 | fprintf(stderr, "KEYGEN DEBUG\n"); |
108 | fprintf(stderr, "ID %d, ITER %d\n", id, iter); | 116 | fprintf(stderr, "ID %d, ITER %d\n", id, iter); |
109 | fprintf(stderr, "Password (length %d):\n", passlen); | 117 | fprintf(stderr, "Password (length %d):\n", passlen); |
diff --git a/src/lib/libssl/src/crypto/pkcs12/p12_kiss.c b/src/lib/libssl/src/crypto/pkcs12/p12_kiss.c index 08a60556e0..ee257ffbad 100644 --- a/src/lib/libssl/src/crypto/pkcs12/p12_kiss.c +++ b/src/lib/libssl/src/crypto/pkcs12/p12_kiss.c | |||
@@ -62,9 +62,17 @@ | |||
62 | 62 | ||
63 | /* Simplified PKCS#12 routines */ | 63 | /* Simplified PKCS#12 routines */ |
64 | 64 | ||
65 | static int parse_pk12( PKCS12 *p12, const char *pass, int passlen, EVP_PKEY **pkey, X509 **cert, STACK **ca); | 65 | static int parse_pk12( PKCS12 *p12, const char *pass, int passlen, |
66 | static int parse_bags( STACK *bags, const char *pass, int passlen, EVP_PKEY **pkey, X509 **cert, STACK **ca, ASN1_OCTET_STRING **keyid, char *keymatch); | 66 | EVP_PKEY **pkey, X509 **cert, STACK_OF(X509) **ca); |
67 | static int parse_bag( PKCS12_SAFEBAG *bag, const char *pass, int passlen, EVP_PKEY **pkey, X509 **cert, STACK **ca, ASN1_OCTET_STRING **keyid, char *keymatch); | 67 | |
68 | static int parse_bags( STACK *bags, const char *pass, int passlen, | ||
69 | EVP_PKEY **pkey, X509 **cert, STACK_OF(X509) **ca, | ||
70 | ASN1_OCTET_STRING **keyid, char *keymatch); | ||
71 | |||
72 | static int parse_bag( PKCS12_SAFEBAG *bag, const char *pass, int passlen, | ||
73 | EVP_PKEY **pkey, X509 **cert, STACK_OF(X509) **ca, | ||
74 | ASN1_OCTET_STRING **keyid, char *keymatch); | ||
75 | |||
68 | /* Parse and decrypt a PKCS#12 structure returning user key, user cert | 76 | /* Parse and decrypt a PKCS#12 structure returning user key, user cert |
69 | * and other (CA) certs. Note either ca should be NULL, *ca should be NULL, | 77 | * and other (CA) certs. Note either ca should be NULL, *ca should be NULL, |
70 | * or it should point to a valid STACK structure. pkey and cert can be | 78 | * or it should point to a valid STACK structure. pkey and cert can be |
@@ -72,54 +80,59 @@ static int parse_bag( PKCS12_SAFEBAG *bag, const char *pass, int passlen, EVP_PK | |||
72 | */ | 80 | */ |
73 | 81 | ||
74 | int PKCS12_parse (PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert, | 82 | int PKCS12_parse (PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert, |
75 | STACK **ca) | 83 | STACK_OF(X509) **ca) |
76 | { | 84 | { |
77 | 85 | ||
78 | /* Check for NULL PKCS12 structure */ | 86 | /* Check for NULL PKCS12 structure */ |
79 | |||
80 | if(!p12) { | ||
81 | PKCS12err(PKCS12_F_PKCS12_PARSE,PKCS12_R_INVALID_NULL_PKCS12_POINTER); | ||
82 | return 0; | ||
83 | } | ||
84 | 87 | ||
85 | /* Allocate stack for ca certificates if needed */ | 88 | if(!p12) |
86 | if ((ca != NULL) && (*ca == NULL)) { | 89 | { |
87 | if (!(*ca = sk_new(NULL))) { | 90 | PKCS12err(PKCS12_F_PKCS12_PARSE,PKCS12_R_INVALID_NULL_PKCS12_POINTER); |
88 | PKCS12err(PKCS12_F_PKCS12_PARSE,ERR_R_MALLOC_FAILURE); | ||
89 | return 0; | 91 | return 0; |
90 | } | 92 | } |
91 | } | 93 | |
94 | /* Allocate stack for ca certificates if needed */ | ||
95 | if ((ca != NULL) && (*ca == NULL)) | ||
96 | { | ||
97 | if (!(*ca = sk_X509_new(NULL))) | ||
98 | { | ||
99 | PKCS12err(PKCS12_F_PKCS12_PARSE,ERR_R_MALLOC_FAILURE); | ||
100 | return 0; | ||
101 | } | ||
102 | } | ||
92 | 103 | ||
93 | if(pkey) *pkey = NULL; | 104 | if(pkey) *pkey = NULL; |
94 | if(cert) *cert = NULL; | 105 | if(cert) *cert = NULL; |
95 | 106 | ||
96 | /* Check the mac */ | 107 | /* Check the mac */ |
97 | 108 | ||
98 | if (!PKCS12_verify_mac (p12, pass, -1)) { | 109 | if (!PKCS12_verify_mac (p12, pass, -1)) |
99 | PKCS12err(PKCS12_F_PKCS12_PARSE,PKCS12_R_MAC_VERIFY_FAILURE); | 110 | { |
100 | goto err; | 111 | PKCS12err(PKCS12_F_PKCS12_PARSE,PKCS12_R_MAC_VERIFY_FAILURE); |
101 | } | 112 | goto err; |
113 | } | ||
102 | 114 | ||
103 | if (!parse_pk12 (p12, pass, -1, pkey, cert, ca)) { | 115 | if (!parse_pk12 (p12, pass, -1, pkey, cert, ca)) |
104 | PKCS12err(PKCS12_F_PKCS12_PARSE,PKCS12_R_PARSE_ERROR); | 116 | { |
105 | goto err; | 117 | PKCS12err(PKCS12_F_PKCS12_PARSE,PKCS12_R_PARSE_ERROR); |
106 | } | 118 | goto err; |
119 | } | ||
107 | 120 | ||
108 | return 1; | 121 | return 1; |
109 | 122 | ||
110 | err: | 123 | err: |
111 | 124 | ||
112 | if (pkey && *pkey) EVP_PKEY_free (*pkey); | 125 | if (pkey && *pkey) EVP_PKEY_free (*pkey); |
113 | if (cert && *cert) X509_free (*cert); | 126 | if (cert && *cert) X509_free (*cert); |
114 | if (ca) sk_pop_free (*ca, X509_free); | 127 | if (ca) sk_X509_pop_free (*ca, X509_free); |
115 | return 0; | 128 | return 0; |
116 | 129 | ||
117 | } | 130 | } |
118 | 131 | ||
119 | /* Parse the outer PKCS#12 structure */ | 132 | /* Parse the outer PKCS#12 structure */ |
120 | 133 | ||
121 | static int parse_pk12 (PKCS12 *p12, const char *pass, int passlen, | 134 | static int parse_pk12 (PKCS12 *p12, const char *pass, int passlen, |
122 | EVP_PKEY **pkey, X509 **cert, STACK **ca) | 135 | EVP_PKEY **pkey, X509 **cert, STACK_OF(X509) **ca) |
123 | { | 136 | { |
124 | STACK *asafes, *bags; | 137 | STACK *asafes, *bags; |
125 | int i, bagnid; | 138 | int i, bagnid; |
@@ -154,7 +167,7 @@ static int parse_pk12 (PKCS12 *p12, const char *pass, int passlen, | |||
154 | 167 | ||
155 | 168 | ||
156 | static int parse_bags (STACK *bags, const char *pass, int passlen, | 169 | static int parse_bags (STACK *bags, const char *pass, int passlen, |
157 | EVP_PKEY **pkey, X509 **cert, STACK **ca, | 170 | EVP_PKEY **pkey, X509 **cert, STACK_OF(X509) **ca, |
158 | ASN1_OCTET_STRING **keyid, char *keymatch) | 171 | ASN1_OCTET_STRING **keyid, char *keymatch) |
159 | { | 172 | { |
160 | int i; | 173 | int i; |
@@ -171,7 +184,7 @@ static int parse_bags (STACK *bags, const char *pass, int passlen, | |||
171 | #define MATCH_ALL 0x3 | 184 | #define MATCH_ALL 0x3 |
172 | 185 | ||
173 | static int parse_bag(PKCS12_SAFEBAG *bag, const char *pass, int passlen, | 186 | static int parse_bag(PKCS12_SAFEBAG *bag, const char *pass, int passlen, |
174 | EVP_PKEY **pkey, X509 **cert, STACK **ca, | 187 | EVP_PKEY **pkey, X509 **cert, STACK_OF(X509) **ca, |
175 | ASN1_OCTET_STRING **keyid, | 188 | ASN1_OCTET_STRING **keyid, |
176 | char *keymatch) | 189 | char *keymatch) |
177 | { | 190 | { |
@@ -221,7 +234,10 @@ static int parse_bag(PKCS12_SAFEBAG *bag, const char *pass, int passlen, | |||
221 | if (lkey) { | 234 | if (lkey) { |
222 | *keymatch |= MATCH_CERT; | 235 | *keymatch |= MATCH_CERT; |
223 | if (cert) *cert = x509; | 236 | if (cert) *cert = x509; |
224 | } else if (ca) sk_push (*ca, (char *)x509); | 237 | } else { |
238 | if(ca) sk_X509_push (*ca, x509); | ||
239 | else X509_free(x509); | ||
240 | } | ||
225 | break; | 241 | break; |
226 | 242 | ||
227 | case NID_safeContentsBag: | 243 | case NID_safeContentsBag: |
diff --git a/src/lib/libssl/src/crypto/pkcs12/p12_mutl.c b/src/lib/libssl/src/crypto/pkcs12/p12_mutl.c index f1094b3840..369257ed4c 100644 --- a/src/lib/libssl/src/crypto/pkcs12/p12_mutl.c +++ b/src/lib/libssl/src/crypto/pkcs12/p12_mutl.c | |||
@@ -157,7 +157,7 @@ int PKCS12_setup_mac (PKCS12 *p12, int iter, unsigned char *salt, int saltlen, | |||
157 | return 0; | 157 | return 0; |
158 | } | 158 | } |
159 | if (!salt) { | 159 | if (!salt) { |
160 | if (RAND_bytes (p12->mac->salt->data, saltlen) <= 0) | 160 | if (RAND_pseudo_bytes (p12->mac->salt->data, saltlen) < 0) |
161 | return 0; | 161 | return 0; |
162 | } | 162 | } |
163 | else memcpy (p12->mac->salt->data, salt, saltlen); | 163 | else memcpy (p12->mac->salt->data, salt, saltlen); |
diff --git a/src/lib/libssl/src/crypto/pkcs12/pk12err.c b/src/lib/libssl/src/crypto/pkcs12/pk12err.c index 9d8de10e1e..12db54f49e 100644 --- a/src/lib/libssl/src/crypto/pkcs12/pk12err.c +++ b/src/lib/libssl/src/crypto/pkcs12/pk12err.c | |||
@@ -54,7 +54,8 @@ | |||
54 | */ | 54 | */ |
55 | 55 | ||
56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes |
57 | * made to it will be overwritten when the script next updates this file. | 57 | * made to it will be overwritten when the script next updates this file, |
58 | * only reason strings will be preserved. | ||
58 | */ | 59 | */ |
59 | 60 | ||
60 | #include <stdio.h> | 61 | #include <stdio.h> |
diff --git a/src/lib/libssl/src/crypto/pkcs12/pkcs12.h b/src/lib/libssl/src/crypto/pkcs12/pkcs12.h index 254000fa12..dad356c00f 100644 --- a/src/lib/libssl/src/crypto/pkcs12/pkcs12.h +++ b/src/lib/libssl/src/crypto/pkcs12/pkcs12.h | |||
@@ -265,9 +265,9 @@ void PKCS12_SAFEBAG_free(PKCS12_SAFEBAG *a); | |||
265 | void ERR_load_PKCS12_strings(void); | 265 | void ERR_load_PKCS12_strings(void); |
266 | void PKCS12_PBE_add(void); | 266 | void PKCS12_PBE_add(void); |
267 | int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert, | 267 | int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert, |
268 | STACK **ca); | 268 | STACK_OF(X509) **ca); |
269 | PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert, | 269 | PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert, |
270 | STACK *ca, int nid_key, int nid_cert, int iter, | 270 | STACK_OF(X509) *ca, int nid_key, int nid_cert, int iter, |
271 | int mac_iter, int keytype); | 271 | int mac_iter, int keytype); |
272 | int i2d_PKCS12_bio(BIO *bp, PKCS12 *p12); | 272 | int i2d_PKCS12_bio(BIO *bp, PKCS12 *p12); |
273 | int i2d_PKCS12_fp(FILE *fp, PKCS12 *p12); | 273 | int i2d_PKCS12_fp(FILE *fp, PKCS12 *p12); |
diff --git a/src/lib/libssl/src/crypto/pkcs7/README b/src/lib/libssl/src/crypto/pkcs7/README index 27001c6970..e69de29bb2 100644 --- a/src/lib/libssl/src/crypto/pkcs7/README +++ b/src/lib/libssl/src/crypto/pkcs7/README | |||
@@ -1,5 +0,0 @@ | |||
1 | WARNING | ||
2 | |||
3 | Everything in this directory is experimental and is subject to change. | ||
4 | |||
5 | Do not rely on the stuff in here not changing in the next release | ||
diff --git a/src/lib/libssl/src/crypto/pkcs7/pk7_doit.c b/src/lib/libssl/src/crypto/pkcs7/pk7_doit.c index 80ac5e34b4..4ab24a86f5 100644 --- a/src/lib/libssl/src/crypto/pkcs7/pk7_doit.c +++ b/src/lib/libssl/src/crypto/pkcs7/pk7_doit.c | |||
@@ -699,6 +699,7 @@ int PKCS7_dataVerify(X509_STORE *cert_store, X509_STORE_CTX *ctx, BIO *bio, | |||
699 | if (i <= 0) | 699 | if (i <= 0) |
700 | { | 700 | { |
701 | PKCS7err(PKCS7_F_PKCS7_DATAVERIFY,ERR_R_X509_LIB); | 701 | PKCS7err(PKCS7_F_PKCS7_DATAVERIFY,ERR_R_X509_LIB); |
702 | X509_STORE_CTX_cleanup(ctx); | ||
702 | goto err; | 703 | goto err; |
703 | } | 704 | } |
704 | X509_STORE_CTX_cleanup(ctx); | 705 | X509_STORE_CTX_cleanup(ctx); |
diff --git a/src/lib/libssl/src/crypto/pkcs7/pkcs7err.c b/src/lib/libssl/src/crypto/pkcs7/pkcs7err.c index 813a8af9ed..8ded8913db 100644 --- a/src/lib/libssl/src/crypto/pkcs7/pkcs7err.c +++ b/src/lib/libssl/src/crypto/pkcs7/pkcs7err.c | |||
@@ -54,7 +54,8 @@ | |||
54 | */ | 54 | */ |
55 | 55 | ||
56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes |
57 | * made to it will be overwritten when the script next updates this file. | 57 | * made to it will be overwritten when the script next updates this file, |
58 | * only reason strings will be preserved. | ||
58 | */ | 59 | */ |
59 | 60 | ||
60 | #include <stdio.h> | 61 | #include <stdio.h> |
diff --git a/src/lib/libssl/src/crypto/rand/md_rand.c b/src/lib/libssl/src/crypto/rand/md_rand.c index 6b158f0349..da4258c479 100644 --- a/src/lib/libssl/src/crypto/rand/md_rand.c +++ b/src/lib/libssl/src/crypto/rand/md_rand.c | |||
@@ -55,6 +55,59 @@ | |||
55 | * copied and put under another distribution licence | 55 | * copied and put under another distribution licence |
56 | * [including the GNU Public Licence.] | 56 | * [including the GNU Public Licence.] |
57 | */ | 57 | */ |
58 | /* ==================================================================== | ||
59 | * Copyright (c) 1998-2000 The OpenSSL Project. All rights reserved. | ||
60 | * | ||
61 | * Redistribution and use in source and binary forms, with or without | ||
62 | * modification, are permitted provided that the following conditions | ||
63 | * are met: | ||
64 | * | ||
65 | * 1. Redistributions of source code must retain the above copyright | ||
66 | * notice, this list of conditions and the following disclaimer. | ||
67 | * | ||
68 | * 2. Redistributions in binary form must reproduce the above copyright | ||
69 | * notice, this list of conditions and the following disclaimer in | ||
70 | * the documentation and/or other materials provided with the | ||
71 | * distribution. | ||
72 | * | ||
73 | * 3. All advertising materials mentioning features or use of this | ||
74 | * software must display the following acknowledgment: | ||
75 | * "This product includes software developed by the OpenSSL Project | ||
76 | * for use in the OpenSSL Toolkit. (http://www.openssl.org/)" | ||
77 | * | ||
78 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
79 | * endorse or promote products derived from this software without | ||
80 | * prior written permission. For written permission, please contact | ||
81 | * openssl-core@openssl.org. | ||
82 | * | ||
83 | * 5. Products derived from this software may not be called "OpenSSL" | ||
84 | * nor may "OpenSSL" appear in their names without prior written | ||
85 | * permission of the OpenSSL Project. | ||
86 | * | ||
87 | * 6. Redistributions of any form whatsoever must retain the following | ||
88 | * acknowledgment: | ||
89 | * "This product includes software developed by the OpenSSL Project | ||
90 | * for use in the OpenSSL Toolkit (http://www.openssl.org/)" | ||
91 | * | ||
92 | * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
93 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
94 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
95 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
96 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
97 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
98 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
99 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
100 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
101 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
102 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
103 | * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
104 | * ==================================================================== | ||
105 | * | ||
106 | * This product includes cryptographic software written by Eric Young | ||
107 | * (eay@cryptsoft.com). This product includes software written by Tim | ||
108 | * Hudson (tjh@cryptsoft.com). | ||
109 | * | ||
110 | */ | ||
58 | 111 | ||
59 | #define ENTROPY_NEEDED 16 /* require 128 bits = 16 bytes of randomness */ | 112 | #define ENTROPY_NEEDED 16 /* require 128 bits = 16 bytes of randomness */ |
60 | 113 | ||
@@ -130,6 +183,10 @@ | |||
130 | 183 | ||
131 | #include <openssl/rand.h> | 184 | #include <openssl/rand.h> |
132 | 185 | ||
186 | #ifdef BN_DEBUG | ||
187 | # define PREDICT | ||
188 | #endif | ||
189 | |||
133 | /* #define NORAND 1 */ | 190 | /* #define NORAND 1 */ |
134 | /* #define PREDICT 1 */ | 191 | /* #define PREDICT 1 */ |
135 | 192 | ||
@@ -141,6 +198,10 @@ static long md_count[2]={0,0}; | |||
141 | static double entropy=0; | 198 | static double entropy=0; |
142 | static int initialized=0; | 199 | static int initialized=0; |
143 | 200 | ||
201 | #ifdef PREDICT | ||
202 | int rand_predictable=0; | ||
203 | #endif | ||
204 | |||
144 | const char *RAND_version="RAND" OPENSSL_VERSION_PTEXT; | 205 | const char *RAND_version="RAND" OPENSSL_VERSION_PTEXT; |
145 | 206 | ||
146 | static void ssleay_rand_cleanup(void); | 207 | static void ssleay_rand_cleanup(void); |
@@ -148,6 +209,7 @@ static void ssleay_rand_seed(const void *buf, int num); | |||
148 | static void ssleay_rand_add(const void *buf, int num, double add_entropy); | 209 | static void ssleay_rand_add(const void *buf, int num, double add_entropy); |
149 | static int ssleay_rand_bytes(unsigned char *buf, int num); | 210 | static int ssleay_rand_bytes(unsigned char *buf, int num); |
150 | static int ssleay_rand_pseudo_bytes(unsigned char *buf, int num); | 211 | static int ssleay_rand_pseudo_bytes(unsigned char *buf, int num); |
212 | static int ssleay_rand_status(void); | ||
151 | 213 | ||
152 | RAND_METHOD rand_ssleay_meth={ | 214 | RAND_METHOD rand_ssleay_meth={ |
153 | ssleay_rand_seed, | 215 | ssleay_rand_seed, |
@@ -155,6 +217,7 @@ RAND_METHOD rand_ssleay_meth={ | |||
155 | ssleay_rand_cleanup, | 217 | ssleay_rand_cleanup, |
156 | ssleay_rand_add, | 218 | ssleay_rand_add, |
157 | ssleay_rand_pseudo_bytes, | 219 | ssleay_rand_pseudo_bytes, |
220 | ssleay_rand_status | ||
158 | }; | 221 | }; |
159 | 222 | ||
160 | RAND_METHOD *RAND_SSLeay(void) | 223 | RAND_METHOD *RAND_SSLeay(void) |
@@ -306,6 +369,10 @@ static void ssleay_rand_initialize(void) | |||
306 | FILE *fh; | 369 | FILE *fh; |
307 | #endif | 370 | #endif |
308 | 371 | ||
372 | #ifdef NORAND | ||
373 | return; | ||
374 | #endif | ||
375 | |||
309 | CRYPTO_w_unlock(CRYPTO_LOCK_RAND); | 376 | CRYPTO_w_unlock(CRYPTO_LOCK_RAND); |
310 | /* put in some default random data, we need more than just this */ | 377 | /* put in some default random data, we need more than just this */ |
311 | #ifndef GETPID_IS_MEANINGLESS | 378 | #ifndef GETPID_IS_MEANINGLESS |
@@ -354,13 +421,14 @@ static int ssleay_rand_bytes(unsigned char *buf, int num) | |||
354 | #endif | 421 | #endif |
355 | 422 | ||
356 | #ifdef PREDICT | 423 | #ifdef PREDICT |
357 | { | 424 | if (rand_predictable) |
358 | static unsigned char val=0; | 425 | { |
426 | static unsigned char val=0; | ||
359 | 427 | ||
360 | for (i=0; i<num; i++) | 428 | for (i=0; i<num; i++) |
361 | buf[i]=val++; | 429 | buf[i]=val++; |
362 | return(1); | 430 | return(1); |
363 | } | 431 | } |
364 | #endif | 432 | #endif |
365 | 433 | ||
366 | /* | 434 | /* |
@@ -489,17 +557,66 @@ static int ssleay_rand_pseudo_bytes(unsigned char *buf, int num) | |||
489 | return (ret); | 557 | return (ret); |
490 | } | 558 | } |
491 | 559 | ||
492 | int RAND_status(void) | 560 | static int ssleay_rand_status(void) |
493 | { | 561 | { |
562 | int ret; | ||
563 | |||
564 | CRYPTO_w_lock(CRYPTO_LOCK_RAND); | ||
565 | |||
494 | if (!initialized) | 566 | if (!initialized) |
495 | ssleay_rand_initialize(); | 567 | ssleay_rand_initialize(); |
496 | return (entropy >= ENTROPY_NEEDED); | 568 | ret = entropy >= ENTROPY_NEEDED; |
569 | |||
570 | CRYPTO_w_unlock(CRYPTO_LOCK_RAND); | ||
571 | |||
572 | return ret; | ||
497 | } | 573 | } |
498 | 574 | ||
499 | #ifdef WINDOWS | 575 | #ifdef WINDOWS |
500 | #include <windows.h> | 576 | #include <windows.h> |
501 | #include <openssl/rand.h> | 577 | #include <openssl/rand.h> |
502 | 578 | ||
579 | int RAND_event(UINT iMsg, WPARAM wParam, LPARAM lParam) | ||
580 | { | ||
581 | double add_entropy=0; | ||
582 | SYSTEMTIME t; | ||
583 | |||
584 | switch (iMsg) | ||
585 | { | ||
586 | case WM_KEYDOWN: | ||
587 | { | ||
588 | static WPARAM key; | ||
589 | if (key != wParam) | ||
590 | add_entropy = 0.05; | ||
591 | key = wParam; | ||
592 | } | ||
593 | break; | ||
594 | case WM_MOUSEMOVE: | ||
595 | { | ||
596 | static int lastx,lasty,lastdx,lastdy; | ||
597 | int x,y,dx,dy; | ||
598 | |||
599 | x=LOWORD(lParam); | ||
600 | y=HIWORD(lParam); | ||
601 | dx=lastx-x; | ||
602 | dy=lasty-y; | ||
603 | if (dx != 0 && dy != 0 && dx-lastdx != 0 && dy-lastdy != 0) | ||
604 | add_entropy=.2; | ||
605 | lastx=x, lasty=y; | ||
606 | lastdx=dx, lastdy=dy; | ||
607 | } | ||
608 | break; | ||
609 | } | ||
610 | |||
611 | GetSystemTime(&t); | ||
612 | RAND_add(&iMsg, sizeof(iMsg), add_entropy); | ||
613 | RAND_add(&wParam, sizeof(wParam), 0); | ||
614 | RAND_add(&lParam, sizeof(lParam), 0); | ||
615 | RAND_add(&t, sizeof(t), 0); | ||
616 | |||
617 | return (RAND_status()); | ||
618 | } | ||
619 | |||
503 | /***************************************************************************** | 620 | /***************************************************************************** |
504 | * Initialisation function for the SSL random generator. Takes the contents | 621 | * Initialisation function for the SSL random generator. Takes the contents |
505 | * of the screen as random seed. | 622 | * of the screen as random seed. |
diff --git a/src/lib/libssl/src/crypto/rand/rand.h b/src/lib/libssl/src/crypto/rand/rand.h index 28f45ec052..2973ee90e4 100644 --- a/src/lib/libssl/src/crypto/rand/rand.h +++ b/src/lib/libssl/src/crypto/rand/rand.h | |||
@@ -70,8 +70,13 @@ typedef struct rand_meth_st | |||
70 | void (*cleanup)(void); | 70 | void (*cleanup)(void); |
71 | void (*add)(const void *buf, int num, double entropy); | 71 | void (*add)(const void *buf, int num, double entropy); |
72 | int (*pseudorand)(unsigned char *buf, int num); | 72 | int (*pseudorand)(unsigned char *buf, int num); |
73 | int (*status)(void); | ||
73 | } RAND_METHOD; | 74 | } RAND_METHOD; |
74 | 75 | ||
76 | #ifdef BN_DEBUG | ||
77 | extern int rand_predictable; | ||
78 | #endif | ||
79 | |||
75 | void RAND_set_rand_method(RAND_METHOD *meth); | 80 | void RAND_set_rand_method(RAND_METHOD *meth); |
76 | RAND_METHOD *RAND_get_rand_method(void ); | 81 | RAND_METHOD *RAND_get_rand_method(void ); |
77 | RAND_METHOD *RAND_SSLeay(void); | 82 | RAND_METHOD *RAND_SSLeay(void); |
@@ -85,8 +90,10 @@ int RAND_write_file(const char *file); | |||
85 | const char *RAND_file_name(char *file,int num); | 90 | const char *RAND_file_name(char *file,int num); |
86 | int RAND_status(void); | 91 | int RAND_status(void); |
87 | int RAND_egd(const char *path); | 92 | int RAND_egd(const char *path); |
88 | #ifdef WINDOWS | 93 | #if defined(WINDOWS) || defined(WIN32) |
94 | #include <windows.h> | ||
89 | void RAND_screen(void); | 95 | void RAND_screen(void); |
96 | int RAND_event(UINT, WPARAM, LPARAM); | ||
90 | #endif | 97 | #endif |
91 | void ERR_load_RAND_strings(void); | 98 | void ERR_load_RAND_strings(void); |
92 | 99 | ||
diff --git a/src/lib/libssl/src/crypto/rand/rand_egd.c b/src/lib/libssl/src/crypto/rand/rand_egd.c index d834408bd4..380c7828c3 100644 --- a/src/lib/libssl/src/crypto/rand/rand_egd.c +++ b/src/lib/libssl/src/crypto/rand/rand_egd.c | |||
@@ -97,7 +97,7 @@ int RAND_egd(const char *path) | |||
97 | buf[1] = 255; | 97 | buf[1] = 255; |
98 | write(fd, buf, 2); | 98 | write(fd, buf, 2); |
99 | if (read(fd, buf, 1) != 1) goto err; | 99 | if (read(fd, buf, 1) != 1) goto err; |
100 | if (buf[0] == 0) goto err; | 100 | if (buf[0] == 0) goto err; |
101 | num = read(fd, buf, 255); | 101 | num = read(fd, buf, 255); |
102 | if (num < 1) goto err; | 102 | if (num < 1) goto err; |
103 | RAND_seed(buf, num); | 103 | RAND_seed(buf, num); |
diff --git a/src/lib/libssl/src/crypto/rand/rand_err.c b/src/lib/libssl/src/crypto/rand/rand_err.c index d1263edf80..1af0aa0b8a 100644 --- a/src/lib/libssl/src/crypto/rand/rand_err.c +++ b/src/lib/libssl/src/crypto/rand/rand_err.c | |||
@@ -54,7 +54,8 @@ | |||
54 | */ | 54 | */ |
55 | 55 | ||
56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes |
57 | * made to it will be overwritten when the script next updates this file. | 57 | * made to it will be overwritten when the script next updates this file, |
58 | * only reason strings will be preserved. | ||
58 | */ | 59 | */ |
59 | 60 | ||
60 | #include <stdio.h> | 61 | #include <stdio.h> |
@@ -71,7 +72,7 @@ static ERR_STRING_DATA RAND_str_functs[]= | |||
71 | 72 | ||
72 | static ERR_STRING_DATA RAND_str_reasons[]= | 73 | static ERR_STRING_DATA RAND_str_reasons[]= |
73 | { | 74 | { |
74 | {RAND_R_PRNG_NOT_SEEDED ,"prng not seeded"}, | 75 | {RAND_R_PRNG_NOT_SEEDED ,"PRNG not seeded"}, |
75 | {0,NULL} | 76 | {0,NULL} |
76 | }; | 77 | }; |
77 | 78 | ||
diff --git a/src/lib/libssl/src/crypto/rand/rand_lib.c b/src/lib/libssl/src/crypto/rand/rand_lib.c index b09a300c46..7da74aab0e 100644 --- a/src/lib/libssl/src/crypto/rand/rand_lib.c +++ b/src/lib/libssl/src/crypto/rand/rand_lib.c | |||
@@ -108,3 +108,10 @@ int RAND_pseudo_bytes(unsigned char *buf, int num) | |||
108 | return rand_meth->pseudorand(buf,num); | 108 | return rand_meth->pseudorand(buf,num); |
109 | return(-1); | 109 | return(-1); |
110 | } | 110 | } |
111 | |||
112 | int RAND_status(void) | ||
113 | { | ||
114 | if (rand_meth != NULL) | ||
115 | return rand_meth->status(); | ||
116 | return 0; | ||
117 | } | ||
diff --git a/src/lib/libssl/src/crypto/rand/randfile.c b/src/lib/libssl/src/crypto/rand/randfile.c index 658a8d6b65..9ff3974cc7 100644 --- a/src/lib/libssl/src/crypto/rand/randfile.c +++ b/src/lib/libssl/src/crypto/rand/randfile.c | |||
@@ -133,35 +133,20 @@ int RAND_write_file(const char *file) | |||
133 | int i,ret=0,err=0; | 133 | int i,ret=0,err=0; |
134 | FILE *out = NULL; | 134 | FILE *out = NULL; |
135 | int n; | 135 | int n; |
136 | 136 | ||
137 | #ifdef VMS | 137 | #if defined(O_CREAT) && defined(O_EXCL) && !defined(WIN32) |
138 | /* Under VMS, fopen(file, "wb") will create a new version of the | 138 | /* For some reason Win32 can't write to files created this way */ |
139 | same file. This is not good, so let's try updating an existing | 139 | |
140 | one, and create file only if it doesn't already exist. */ | 140 | /* chmod(..., 0600) is too late to protect the file, |
141 | /* At the same time, if we just update a file, we also need to | 141 | * permissions should be restrictive from the start */ |
142 | truncate it, and unfortunately, ftruncate() and truncate() do | 142 | int fd = open(file, O_CREAT | O_EXCL, 0600); |
143 | not exist everywhere. All that remains is to delete old versions | 143 | if (fd != -1) |
144 | of the random data file (done at the end). */ | 144 | out = fdopen(fd, "wb"); |
145 | #if 0 | ||
146 | out=fopen(file,"rb+"); | ||
147 | if (out == NULL && errno != ENOENT) | ||
148 | goto err; | ||
149 | #endif | ||
150 | #endif | 145 | #endif |
146 | if (out == NULL) | ||
147 | out = fopen(file,"wb"); | ||
148 | if (out == NULL) goto err; | ||
151 | 149 | ||
152 | if (out == NULL) | ||
153 | { | ||
154 | #if defined O_CREAT && defined O_EXCL | ||
155 | /* chmod(..., 0600) is too late to protect the file, | ||
156 | * permissions should be restrictive from the start */ | ||
157 | int fd = open(file, O_CREAT | O_EXCL, 0600); | ||
158 | if (fd != -1) | ||
159 | out = fdopen(fd, "wb"); | ||
160 | #else | ||
161 | out=fopen(file,"wb"); | ||
162 | #endif | ||
163 | } | ||
164 | if (out == NULL) goto err; | ||
165 | #ifndef NO_CHMOD | 150 | #ifndef NO_CHMOD |
166 | chmod(file,0600); | 151 | chmod(file,0600); |
167 | #endif | 152 | #endif |
@@ -180,14 +165,8 @@ int RAND_write_file(const char *file) | |||
180 | } | 165 | } |
181 | ret+=i; | 166 | ret+=i; |
182 | if (n <= 0) break; | 167 | if (n <= 0) break; |
183 | } | 168 | } |
184 | #ifdef VMS | 169 | #ifdef VMS |
185 | /* We may have updated an existing file using mode "rb+", | ||
186 | * now remove any old extra bytes */ | ||
187 | #if 0 | ||
188 | if (ret > 0) | ||
189 | ftruncate(fileno(out), ret); | ||
190 | #else | ||
191 | /* Try to delete older versions of the file, until there aren't | 170 | /* Try to delete older versions of the file, until there aren't |
192 | any */ | 171 | any */ |
193 | { | 172 | { |
@@ -205,8 +184,7 @@ int RAND_write_file(const char *file) | |||
205 | some point... */ | 184 | some point... */ |
206 | } | 185 | } |
207 | } | 186 | } |
208 | #endif | 187 | #endif /* VMS */ |
209 | #endif | ||
210 | 188 | ||
211 | fclose(out); | 189 | fclose(out); |
212 | memset(buf,0,BUFSIZE); | 190 | memset(buf,0,BUFSIZE); |
diff --git a/src/lib/libssl/src/crypto/rc2/Makefile.uni b/src/lib/libssl/src/crypto/rc2/Makefile.uni index 4dc20c6fcf..e69de29bb2 100644 --- a/src/lib/libssl/src/crypto/rc2/Makefile.uni +++ b/src/lib/libssl/src/crypto/rc2/Makefile.uni | |||
@@ -1,73 +0,0 @@ | |||
1 | # Targets | ||
2 | # make - twidle the options yourself :-) | ||
3 | # make cc - standard cc options | ||
4 | # make gcc - standard gcc options | ||
5 | |||
6 | DIR= rc2 | ||
7 | TOP= . | ||
8 | CC= gcc | ||
9 | CFLAG= -O3 -fomit-frame-pointer | ||
10 | |||
11 | CPP= $(CC) -E | ||
12 | INCLUDES= | ||
13 | INSTALLTOP=/usr/local/lib | ||
14 | MAKE= make | ||
15 | MAKEDEPEND= makedepend | ||
16 | MAKEFILE= Makefile.uni | ||
17 | AR= ar r | ||
18 | RANLIB= ranlib | ||
19 | |||
20 | IDEA_ENC=rc2_cbc.o | ||
21 | |||
22 | CFLAGS= $(INCLUDES) $(CFLAG) | ||
23 | |||
24 | GENERAL=Makefile | ||
25 | TEST=rc2test | ||
26 | APPS=rc2speed | ||
27 | |||
28 | LIB=librc2.a | ||
29 | LIBSRC=rc2_skey.c rc2_ecb.c rc2_cbc.c rc2cfb64.c rc2ofb64.c | ||
30 | LIBOBJ=rc2_skey.o rc2_ecb.o $(IDEA_ENC) rc2cfb64.o rc2ofb64.o | ||
31 | |||
32 | SRC= $(LIBSRC) | ||
33 | |||
34 | EXHEADER= rc2.h | ||
35 | HEADER= rc2_locl.h $(EXHEADER) | ||
36 | |||
37 | ALL= $(GENERAL) $(SRC) $(HEADER) | ||
38 | |||
39 | all: $(LIB) $(TEST) $(APPS) | ||
40 | |||
41 | $(LIB): $(LIBOBJ) | ||
42 | $(AR) $(LIB) $(LIBOBJ) | ||
43 | $(RANLIB) $(LIB) | ||
44 | |||
45 | test: $(TEST) | ||
46 | ./$(TEST) | ||
47 | |||
48 | $(TEST): $(TEST).c $(LIB) | ||
49 | $(CC) -o $(TEST) $(CFLAGS) $(TEST).c $(LIB) | ||
50 | |||
51 | $(APPS): $(APPS).c $(LIB) | ||
52 | $(CC) -o $(APPS) $(CFLAGS) $(APPS).c $(LIB) | ||
53 | |||
54 | lint: | ||
55 | lint -DLINT $(INCLUDES) $(SRC)>fluff | ||
56 | |||
57 | depend: | ||
58 | $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) | ||
59 | |||
60 | dclean: | ||
61 | perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new | ||
62 | mv -f Makefile.new $(MAKEFILE) | ||
63 | |||
64 | clean: | ||
65 | /bin/rm -f $(LIB) $(TEST) $(APPS) *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff | ||
66 | |||
67 | cc: | ||
68 | $(MAKE) CC="cc" CFLAG="-O" all | ||
69 | |||
70 | gcc: | ||
71 | $(MAKE) CC="gcc" CFLAGS="-O3 -fomit-frame-pointer" all | ||
72 | |||
73 | # DO NOT DELETE THIS LINE -- make depend depends on it. | ||
diff --git a/src/lib/libssl/src/crypto/rc4/Makefile.ssl b/src/lib/libssl/src/crypto/rc4/Makefile.ssl index 2ea95f0298..8d2a795c22 100644 --- a/src/lib/libssl/src/crypto/rc4/Makefile.ssl +++ b/src/lib/libssl/src/crypto/rc4/Makefile.ssl | |||
@@ -5,6 +5,7 @@ | |||
5 | DIR= rc4 | 5 | DIR= rc4 |
6 | TOP= ../.. | 6 | TOP= ../.. |
7 | CC= cc | 7 | CC= cc |
8 | CPP= $(CC) -E | ||
8 | INCLUDES= | 9 | INCLUDES= |
9 | CFLAG=-g | 10 | CFLAG=-g |
10 | INSTALL_PREFIX= | 11 | INSTALL_PREFIX= |
@@ -51,7 +52,7 @@ lib: $(LIBOBJ) | |||
51 | 52 | ||
52 | # elf | 53 | # elf |
53 | asm/rx86-elf.o: asm/rx86unix.cpp | 54 | asm/rx86-elf.o: asm/rx86unix.cpp |
54 | $(CPP) -DELF asm/rx86unix.cpp | as -o asm/rx86-elf.o | 55 | $(CPP) -DELF -x c asm/rx86unix.cpp | as -o asm/rx86-elf.o |
55 | 56 | ||
56 | # solaris | 57 | # solaris |
57 | asm/rx86-sol.o: asm/rx86unix.cpp | 58 | asm/rx86-sol.o: asm/rx86unix.cpp |
@@ -67,7 +68,7 @@ asm/rx86-out.o: asm/rx86unix.cpp | |||
67 | asm/rx86bsdi.o: asm/rx86unix.cpp | 68 | asm/rx86bsdi.o: asm/rx86unix.cpp |
68 | $(CPP) -DBSDI asm/rx86unix.cpp | sed 's/ :/:/' | as -o asm/rx86bsdi.o | 69 | $(CPP) -DBSDI asm/rx86unix.cpp | sed 's/ :/:/' | as -o asm/rx86bsdi.o |
69 | 70 | ||
70 | asm/rx86unix.cpp: asm/rc4-586.pl | 71 | asm/rx86unix.cpp: asm/rc4-586.pl ../perlasm/x86asm.pl |
71 | (cd asm; $(PERL) rc4-586.pl cpp >rx86unix.cpp) | 72 | (cd asm; $(PERL) rc4-586.pl cpp >rx86unix.cpp) |
72 | 73 | ||
73 | files: | 74 | files: |
diff --git a/src/lib/libssl/src/crypto/rc4/Makefile.uni b/src/lib/libssl/src/crypto/rc4/Makefile.uni index 855d9e50f3..e69de29bb2 100644 --- a/src/lib/libssl/src/crypto/rc4/Makefile.uni +++ b/src/lib/libssl/src/crypto/rc4/Makefile.uni | |||
@@ -1,103 +0,0 @@ | |||
1 | # Targets | ||
2 | # make - twidle the options yourself :-) | ||
3 | # make cc - standard cc options | ||
4 | # make gcc - standard gcc options | ||
5 | # make x86-elf - linux-elf etc | ||
6 | # make x86-out - linux-a.out, FreeBSD etc | ||
7 | # make x86-solaris | ||
8 | # make x86-bdsi | ||
9 | |||
10 | DIR= rc4 | ||
11 | TOP= . | ||
12 | CC= gcc | ||
13 | CFLAG= -O3 -fomit-frame-pointer | ||
14 | |||
15 | CPP= $(CC) -E | ||
16 | INCLUDES= | ||
17 | INSTALLTOP=/usr/local/lib | ||
18 | MAKE= make | ||
19 | MAKEDEPEND= makedepend | ||
20 | MAKEFILE= Makefile.uni | ||
21 | AR= ar r | ||
22 | RANLIB= ranlib | ||
23 | |||
24 | RC4_ENC=rc4_enc.o | ||
25 | # or use | ||
26 | #RC4_ENC=asm/rx86-elf.o | ||
27 | #RC4_ENC=asm/rx86-out.o | ||
28 | #RC4_ENC=asm/rx86-sol.o | ||
29 | #RC4_ENC=asm/rx86bdsi.o | ||
30 | |||
31 | CFLAGS= $(INCLUDES) $(CFLAG) | ||
32 | |||
33 | GENERAL=Makefile | ||
34 | TEST=rc4test | ||
35 | APPS=rc4speed | ||
36 | |||
37 | LIB=librc4.a | ||
38 | LIBSRC=rc4_skey.c rc4_enc.c | ||
39 | LIBOBJ=rc4_skey.o $(RC4_ENC) | ||
40 | |||
41 | SRC= $(LIBSRC) | ||
42 | |||
43 | EXHEADER= rc4.h | ||
44 | HEADER= $(EXHEADER) rc4_locl.h | ||
45 | |||
46 | ALL= $(GENERAL) $(SRC) $(HEADER) | ||
47 | |||
48 | all: $(LIB) $(TEST) $(APPS) | ||
49 | |||
50 | $(LIB): $(LIBOBJ) | ||
51 | $(AR) $(LIB) $(LIBOBJ) | ||
52 | $(RANLIB) $(LIB) | ||
53 | |||
54 | # elf | ||
55 | asm/rx86-elf.o: asm/rx86unix.cpp | ||
56 | $(CPP) -DELF asm/rx86unix.cpp | as -o asm/rx86-elf.o | ||
57 | |||
58 | # solaris | ||
59 | asm/rx86-sol.o: asm/rx86unix.cpp | ||
60 | $(CC) -E -DSOL asm/rx86unix.cpp | sed 's/^#.*//' > asm/rx86-sol.s | ||
61 | as -o asm/rx86-sol.o asm/rx86-sol.s | ||
62 | rm -f asm/rx86-sol.s | ||
63 | |||
64 | # a.out | ||
65 | asm/rx86-out.o: asm/rx86unix.cpp | ||
66 | $(CPP) -DOUT asm/rx86unix.cpp | as -o asm/rx86-out.o | ||
67 | |||
68 | # bsdi | ||
69 | asm/rx86bsdi.o: asm/rx86unix.cpp | ||
70 | $(CPP) -DBSDI asm/rx86unix.cpp | as -o asm/rx86bsdi.o | ||
71 | |||
72 | asm/rx86unix.cpp: | ||
73 | (cd asm; perl rc4-586.pl cpp >rx86unix.cpp) | ||
74 | |||
75 | test: $(TEST) | ||
76 | ./$(TEST) | ||
77 | |||
78 | $(TEST): $(TEST).c $(LIB) | ||
79 | $(CC) -o $(TEST) $(CFLAGS) $(TEST).c $(LIB) | ||
80 | |||
81 | $(APPS): $(APPS).c $(LIB) | ||
82 | $(CC) -o $(APPS) $(CFLAGS) $(APPS).c $(LIB) | ||
83 | |||
84 | lint: | ||
85 | lint -DLINT $(INCLUDES) $(SRC)>fluff | ||
86 | |||
87 | depend: | ||
88 | $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) | ||
89 | |||
90 | dclean: | ||
91 | perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new | ||
92 | mv -f Makefile.new $(MAKEFILE) | ||
93 | |||
94 | clean: | ||
95 | /bin/rm -f $(LIB) $(TEST) $(APPS) *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff | ||
96 | |||
97 | cc: | ||
98 | $(MAKE) CC="cc" CFLAG="-O" all | ||
99 | |||
100 | gcc: | ||
101 | $(MAKE) CC="gcc" CFLAGS="-O3 -fomit-frame-pointer" all | ||
102 | |||
103 | # DO NOT DELETE THIS LINE -- make depend depends on it. | ||
diff --git a/src/lib/libssl/src/crypto/rc4/asm/r4-win32.asm b/src/lib/libssl/src/crypto/rc4/asm/r4-win32.asm index 70b0f7484c..e69de29bb2 100644 --- a/src/lib/libssl/src/crypto/rc4/asm/r4-win32.asm +++ b/src/lib/libssl/src/crypto/rc4/asm/r4-win32.asm | |||
@@ -1,314 +0,0 @@ | |||
1 | ; Don't even think of reading this code | ||
2 | ; It was automatically generated by rc4-586.pl | ||
3 | ; Which is a perl program used to generate the x86 assember for | ||
4 | ; any of elf, a.out, BSDI,Win32, or Solaris | ||
5 | ; eric <eay@cryptsoft.com> | ||
6 | ; | ||
7 | TITLE rc4-586.asm | ||
8 | .386 | ||
9 | .model FLAT | ||
10 | _TEXT SEGMENT | ||
11 | PUBLIC _RC4 | ||
12 | |||
13 | _RC4 PROC NEAR | ||
14 | ; | ||
15 | push ebp | ||
16 | push ebx | ||
17 | mov ebp, DWORD PTR 12[esp] | ||
18 | mov ebx, DWORD PTR 16[esp] | ||
19 | push esi | ||
20 | push edi | ||
21 | mov ecx, DWORD PTR [ebp] | ||
22 | mov edx, DWORD PTR 4[ebp] | ||
23 | mov esi, DWORD PTR 28[esp] | ||
24 | inc ecx | ||
25 | sub esp, 12 | ||
26 | add ebp, 8 | ||
27 | and ecx, 255 | ||
28 | lea ebx, DWORD PTR [esi+ebx-8] | ||
29 | mov edi, DWORD PTR 44[esp] | ||
30 | mov DWORD PTR 8[esp],ebx | ||
31 | mov eax, DWORD PTR [ecx*4+ebp] | ||
32 | cmp ebx, esi | ||
33 | jl $L000end | ||
34 | L001start: | ||
35 | add esi, 8 | ||
36 | ; Round 0 | ||
37 | add edx, eax | ||
38 | and edx, 255 | ||
39 | inc ecx | ||
40 | mov ebx, DWORD PTR [edx*4+ebp] | ||
41 | mov DWORD PTR [ecx*4+ebp-4],ebx | ||
42 | add ebx, eax | ||
43 | and ecx, 255 | ||
44 | and ebx, 255 | ||
45 | mov DWORD PTR [edx*4+ebp],eax | ||
46 | nop | ||
47 | mov ebx, DWORD PTR [ebx*4+ebp] | ||
48 | mov eax, DWORD PTR [ecx*4+ebp] | ||
49 | mov BYTE PTR [esp], bl | ||
50 | ; Round 1 | ||
51 | add edx, eax | ||
52 | and edx, 255 | ||
53 | inc ecx | ||
54 | mov ebx, DWORD PTR [edx*4+ebp] | ||
55 | mov DWORD PTR [ecx*4+ebp-4],ebx | ||
56 | add ebx, eax | ||
57 | and ecx, 255 | ||
58 | and ebx, 255 | ||
59 | mov DWORD PTR [edx*4+ebp],eax | ||
60 | nop | ||
61 | mov ebx, DWORD PTR [ebx*4+ebp] | ||
62 | mov eax, DWORD PTR [ecx*4+ebp] | ||
63 | mov BYTE PTR 1[esp],bl | ||
64 | ; Round 2 | ||
65 | add edx, eax | ||
66 | and edx, 255 | ||
67 | inc ecx | ||
68 | mov ebx, DWORD PTR [edx*4+ebp] | ||
69 | mov DWORD PTR [ecx*4+ebp-4],ebx | ||
70 | add ebx, eax | ||
71 | and ecx, 255 | ||
72 | and ebx, 255 | ||
73 | mov DWORD PTR [edx*4+ebp],eax | ||
74 | nop | ||
75 | mov ebx, DWORD PTR [ebx*4+ebp] | ||
76 | mov eax, DWORD PTR [ecx*4+ebp] | ||
77 | mov BYTE PTR 2[esp],bl | ||
78 | ; Round 3 | ||
79 | add edx, eax | ||
80 | and edx, 255 | ||
81 | inc ecx | ||
82 | mov ebx, DWORD PTR [edx*4+ebp] | ||
83 | mov DWORD PTR [ecx*4+ebp-4],ebx | ||
84 | add ebx, eax | ||
85 | and ecx, 255 | ||
86 | and ebx, 255 | ||
87 | mov DWORD PTR [edx*4+ebp],eax | ||
88 | nop | ||
89 | mov ebx, DWORD PTR [ebx*4+ebp] | ||
90 | mov eax, DWORD PTR [ecx*4+ebp] | ||
91 | mov BYTE PTR 3[esp],bl | ||
92 | ; Round 4 | ||
93 | add edx, eax | ||
94 | and edx, 255 | ||
95 | inc ecx | ||
96 | mov ebx, DWORD PTR [edx*4+ebp] | ||
97 | mov DWORD PTR [ecx*4+ebp-4],ebx | ||
98 | add ebx, eax | ||
99 | and ecx, 255 | ||
100 | and ebx, 255 | ||
101 | mov DWORD PTR [edx*4+ebp],eax | ||
102 | nop | ||
103 | mov ebx, DWORD PTR [ebx*4+ebp] | ||
104 | mov eax, DWORD PTR [ecx*4+ebp] | ||
105 | mov BYTE PTR 4[esp],bl | ||
106 | ; Round 5 | ||
107 | add edx, eax | ||
108 | and edx, 255 | ||
109 | inc ecx | ||
110 | mov ebx, DWORD PTR [edx*4+ebp] | ||
111 | mov DWORD PTR [ecx*4+ebp-4],ebx | ||
112 | add ebx, eax | ||
113 | and ecx, 255 | ||
114 | and ebx, 255 | ||
115 | mov DWORD PTR [edx*4+ebp],eax | ||
116 | nop | ||
117 | mov ebx, DWORD PTR [ebx*4+ebp] | ||
118 | mov eax, DWORD PTR [ecx*4+ebp] | ||
119 | mov BYTE PTR 5[esp],bl | ||
120 | ; Round 6 | ||
121 | add edx, eax | ||
122 | and edx, 255 | ||
123 | inc ecx | ||
124 | mov ebx, DWORD PTR [edx*4+ebp] | ||
125 | mov DWORD PTR [ecx*4+ebp-4],ebx | ||
126 | add ebx, eax | ||
127 | and ecx, 255 | ||
128 | and ebx, 255 | ||
129 | mov DWORD PTR [edx*4+ebp],eax | ||
130 | nop | ||
131 | mov ebx, DWORD PTR [ebx*4+ebp] | ||
132 | mov eax, DWORD PTR [ecx*4+ebp] | ||
133 | mov BYTE PTR 6[esp],bl | ||
134 | ; Round 7 | ||
135 | add edx, eax | ||
136 | and edx, 255 | ||
137 | inc ecx | ||
138 | mov ebx, DWORD PTR [edx*4+ebp] | ||
139 | mov DWORD PTR [ecx*4+ebp-4],ebx | ||
140 | add ebx, eax | ||
141 | and ecx, 255 | ||
142 | and ebx, 255 | ||
143 | mov DWORD PTR [edx*4+ebp],eax | ||
144 | nop | ||
145 | mov ebx, DWORD PTR [ebx*4+ebp] | ||
146 | add edi, 8 | ||
147 | mov BYTE PTR 7[esp],bl | ||
148 | ; apply the cipher text | ||
149 | mov eax, DWORD PTR [esp] | ||
150 | mov ebx, DWORD PTR [esi-8] | ||
151 | xor eax, ebx | ||
152 | mov ebx, DWORD PTR [esi-4] | ||
153 | mov DWORD PTR [edi-8],eax | ||
154 | mov eax, DWORD PTR 4[esp] | ||
155 | xor eax, ebx | ||
156 | mov ebx, DWORD PTR 8[esp] | ||
157 | mov DWORD PTR [edi-4],eax | ||
158 | mov eax, DWORD PTR [ecx*4+ebp] | ||
159 | cmp esi, ebx | ||
160 | jle L001start | ||
161 | $L000end: | ||
162 | ; Round 0 | ||
163 | add ebx, 8 | ||
164 | inc esi | ||
165 | cmp ebx, esi | ||
166 | jl $L002finished | ||
167 | mov DWORD PTR 8[esp],ebx | ||
168 | add edx, eax | ||
169 | and edx, 255 | ||
170 | inc ecx | ||
171 | mov ebx, DWORD PTR [edx*4+ebp] | ||
172 | mov DWORD PTR [ecx*4+ebp-4],ebx | ||
173 | add ebx, eax | ||
174 | and ecx, 255 | ||
175 | and ebx, 255 | ||
176 | mov DWORD PTR [edx*4+ebp],eax | ||
177 | nop | ||
178 | mov ebx, DWORD PTR [ebx*4+ebp] | ||
179 | mov eax, DWORD PTR [ecx*4+ebp] | ||
180 | mov bh, BYTE PTR [esi-1] | ||
181 | xor bl, bh | ||
182 | mov BYTE PTR [edi], bl | ||
183 | ; Round 1 | ||
184 | mov ebx, DWORD PTR 8[esp] | ||
185 | cmp ebx, esi | ||
186 | jle $L002finished | ||
187 | inc esi | ||
188 | add edx, eax | ||
189 | and edx, 255 | ||
190 | inc ecx | ||
191 | mov ebx, DWORD PTR [edx*4+ebp] | ||
192 | mov DWORD PTR [ecx*4+ebp-4],ebx | ||
193 | add ebx, eax | ||
194 | and ecx, 255 | ||
195 | and ebx, 255 | ||
196 | mov DWORD PTR [edx*4+ebp],eax | ||
197 | nop | ||
198 | mov ebx, DWORD PTR [ebx*4+ebp] | ||
199 | mov eax, DWORD PTR [ecx*4+ebp] | ||
200 | mov bh, BYTE PTR [esi-1] | ||
201 | xor bl, bh | ||
202 | mov BYTE PTR 1[edi],bl | ||
203 | ; Round 2 | ||
204 | mov ebx, DWORD PTR 8[esp] | ||
205 | cmp ebx, esi | ||
206 | jle $L002finished | ||
207 | inc esi | ||
208 | add edx, eax | ||
209 | and edx, 255 | ||
210 | inc ecx | ||
211 | mov ebx, DWORD PTR [edx*4+ebp] | ||
212 | mov DWORD PTR [ecx*4+ebp-4],ebx | ||
213 | add ebx, eax | ||
214 | and ecx, 255 | ||
215 | and ebx, 255 | ||
216 | mov DWORD PTR [edx*4+ebp],eax | ||
217 | nop | ||
218 | mov ebx, DWORD PTR [ebx*4+ebp] | ||
219 | mov eax, DWORD PTR [ecx*4+ebp] | ||
220 | mov bh, BYTE PTR [esi-1] | ||
221 | xor bl, bh | ||
222 | mov BYTE PTR 2[edi],bl | ||
223 | ; Round 3 | ||
224 | mov ebx, DWORD PTR 8[esp] | ||
225 | cmp ebx, esi | ||
226 | jle $L002finished | ||
227 | inc esi | ||
228 | add edx, eax | ||
229 | and edx, 255 | ||
230 | inc ecx | ||
231 | mov ebx, DWORD PTR [edx*4+ebp] | ||
232 | mov DWORD PTR [ecx*4+ebp-4],ebx | ||
233 | add ebx, eax | ||
234 | and ecx, 255 | ||
235 | and ebx, 255 | ||
236 | mov DWORD PTR [edx*4+ebp],eax | ||
237 | nop | ||
238 | mov ebx, DWORD PTR [ebx*4+ebp] | ||
239 | mov eax, DWORD PTR [ecx*4+ebp] | ||
240 | mov bh, BYTE PTR [esi-1] | ||
241 | xor bl, bh | ||
242 | mov BYTE PTR 3[edi],bl | ||
243 | ; Round 4 | ||
244 | mov ebx, DWORD PTR 8[esp] | ||
245 | cmp ebx, esi | ||
246 | jle $L002finished | ||
247 | inc esi | ||
248 | add edx, eax | ||
249 | and edx, 255 | ||
250 | inc ecx | ||
251 | mov ebx, DWORD PTR [edx*4+ebp] | ||
252 | mov DWORD PTR [ecx*4+ebp-4],ebx | ||
253 | add ebx, eax | ||
254 | and ecx, 255 | ||
255 | and ebx, 255 | ||
256 | mov DWORD PTR [edx*4+ebp],eax | ||
257 | nop | ||
258 | mov ebx, DWORD PTR [ebx*4+ebp] | ||
259 | mov eax, DWORD PTR [ecx*4+ebp] | ||
260 | mov bh, BYTE PTR [esi-1] | ||
261 | xor bl, bh | ||
262 | mov BYTE PTR 4[edi],bl | ||
263 | ; Round 5 | ||
264 | mov ebx, DWORD PTR 8[esp] | ||
265 | cmp ebx, esi | ||
266 | jle $L002finished | ||
267 | inc esi | ||
268 | add edx, eax | ||
269 | and edx, 255 | ||
270 | inc ecx | ||
271 | mov ebx, DWORD PTR [edx*4+ebp] | ||
272 | mov DWORD PTR [ecx*4+ebp-4],ebx | ||
273 | add ebx, eax | ||
274 | and ecx, 255 | ||
275 | and ebx, 255 | ||
276 | mov DWORD PTR [edx*4+ebp],eax | ||
277 | nop | ||
278 | mov ebx, DWORD PTR [ebx*4+ebp] | ||
279 | mov eax, DWORD PTR [ecx*4+ebp] | ||
280 | mov bh, BYTE PTR [esi-1] | ||
281 | xor bl, bh | ||
282 | mov BYTE PTR 5[edi],bl | ||
283 | ; Round 6 | ||
284 | mov ebx, DWORD PTR 8[esp] | ||
285 | cmp ebx, esi | ||
286 | jle $L002finished | ||
287 | inc esi | ||
288 | add edx, eax | ||
289 | and edx, 255 | ||
290 | inc ecx | ||
291 | mov ebx, DWORD PTR [edx*4+ebp] | ||
292 | mov DWORD PTR [ecx*4+ebp-4],ebx | ||
293 | add ebx, eax | ||
294 | and ecx, 255 | ||
295 | and ebx, 255 | ||
296 | mov DWORD PTR [edx*4+ebp],eax | ||
297 | nop | ||
298 | mov ebx, DWORD PTR [ebx*4+ebp] | ||
299 | mov bh, BYTE PTR [esi-1] | ||
300 | xor bl, bh | ||
301 | mov BYTE PTR 6[edi],bl | ||
302 | $L002finished: | ||
303 | dec ecx | ||
304 | add esp, 12 | ||
305 | mov DWORD PTR [ebp-4],edx | ||
306 | mov BYTE PTR [ebp-8],cl | ||
307 | pop edi | ||
308 | pop esi | ||
309 | pop ebx | ||
310 | pop ebp | ||
311 | ret | ||
312 | _RC4 ENDP | ||
313 | _TEXT ENDS | ||
314 | END | ||
diff --git a/src/lib/libssl/src/crypto/rc5/Makefile.ssl b/src/lib/libssl/src/crypto/rc5/Makefile.ssl index 35abb9d0d1..5a54a162ba 100644 --- a/src/lib/libssl/src/crypto/rc5/Makefile.ssl +++ b/src/lib/libssl/src/crypto/rc5/Makefile.ssl | |||
@@ -49,7 +49,7 @@ lib: $(LIBOBJ) | |||
49 | 49 | ||
50 | # elf | 50 | # elf |
51 | asm/r586-elf.o: asm/r586unix.cpp | 51 | asm/r586-elf.o: asm/r586unix.cpp |
52 | $(CPP) -DELF asm/r586unix.cpp | as -o asm/r586-elf.o | 52 | $(CPP) -DELF -x c asm/r586unix.cpp | as -o asm/r586-elf.o |
53 | 53 | ||
54 | # solaris | 54 | # solaris |
55 | asm/r586-sol.o: asm/r586unix.cpp | 55 | asm/r586-sol.o: asm/r586unix.cpp |
@@ -65,7 +65,7 @@ asm/r586-out.o: asm/r586unix.cpp | |||
65 | asm/r586bsdi.o: asm/r586unix.cpp | 65 | asm/r586bsdi.o: asm/r586unix.cpp |
66 | $(CPP) -DBSDI asm/r586unix.cpp | sed 's/ :/:/' | as -o asm/r586bsdi.o | 66 | $(CPP) -DBSDI asm/r586unix.cpp | sed 's/ :/:/' | as -o asm/r586bsdi.o |
67 | 67 | ||
68 | asm/r586unix.cpp: | 68 | asm/r586unix.cpp: asm/rc5-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl |
69 | (cd asm; $(PERL) rc5-586.pl cpp >r586unix.cpp) | 69 | (cd asm; $(PERL) rc5-586.pl cpp >r586unix.cpp) |
70 | 70 | ||
71 | files: | 71 | files: |
diff --git a/src/lib/libssl/src/crypto/rc5/Makefile.uni b/src/lib/libssl/src/crypto/rc5/Makefile.uni index 4dc20c6fcf..e69de29bb2 100644 --- a/src/lib/libssl/src/crypto/rc5/Makefile.uni +++ b/src/lib/libssl/src/crypto/rc5/Makefile.uni | |||
@@ -1,73 +0,0 @@ | |||
1 | # Targets | ||
2 | # make - twidle the options yourself :-) | ||
3 | # make cc - standard cc options | ||
4 | # make gcc - standard gcc options | ||
5 | |||
6 | DIR= rc2 | ||
7 | TOP= . | ||
8 | CC= gcc | ||
9 | CFLAG= -O3 -fomit-frame-pointer | ||
10 | |||
11 | CPP= $(CC) -E | ||
12 | INCLUDES= | ||
13 | INSTALLTOP=/usr/local/lib | ||
14 | MAKE= make | ||
15 | MAKEDEPEND= makedepend | ||
16 | MAKEFILE= Makefile.uni | ||
17 | AR= ar r | ||
18 | RANLIB= ranlib | ||
19 | |||
20 | IDEA_ENC=rc2_cbc.o | ||
21 | |||
22 | CFLAGS= $(INCLUDES) $(CFLAG) | ||
23 | |||
24 | GENERAL=Makefile | ||
25 | TEST=rc2test | ||
26 | APPS=rc2speed | ||
27 | |||
28 | LIB=librc2.a | ||
29 | LIBSRC=rc2_skey.c rc2_ecb.c rc2_cbc.c rc2cfb64.c rc2ofb64.c | ||
30 | LIBOBJ=rc2_skey.o rc2_ecb.o $(IDEA_ENC) rc2cfb64.o rc2ofb64.o | ||
31 | |||
32 | SRC= $(LIBSRC) | ||
33 | |||
34 | EXHEADER= rc2.h | ||
35 | HEADER= rc2_locl.h $(EXHEADER) | ||
36 | |||
37 | ALL= $(GENERAL) $(SRC) $(HEADER) | ||
38 | |||
39 | all: $(LIB) $(TEST) $(APPS) | ||
40 | |||
41 | $(LIB): $(LIBOBJ) | ||
42 | $(AR) $(LIB) $(LIBOBJ) | ||
43 | $(RANLIB) $(LIB) | ||
44 | |||
45 | test: $(TEST) | ||
46 | ./$(TEST) | ||
47 | |||
48 | $(TEST): $(TEST).c $(LIB) | ||
49 | $(CC) -o $(TEST) $(CFLAGS) $(TEST).c $(LIB) | ||
50 | |||
51 | $(APPS): $(APPS).c $(LIB) | ||
52 | $(CC) -o $(APPS) $(CFLAGS) $(APPS).c $(LIB) | ||
53 | |||
54 | lint: | ||
55 | lint -DLINT $(INCLUDES) $(SRC)>fluff | ||
56 | |||
57 | depend: | ||
58 | $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) | ||
59 | |||
60 | dclean: | ||
61 | perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new | ||
62 | mv -f Makefile.new $(MAKEFILE) | ||
63 | |||
64 | clean: | ||
65 | /bin/rm -f $(LIB) $(TEST) $(APPS) *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff | ||
66 | |||
67 | cc: | ||
68 | $(MAKE) CC="cc" CFLAG="-O" all | ||
69 | |||
70 | gcc: | ||
71 | $(MAKE) CC="gcc" CFLAGS="-O3 -fomit-frame-pointer" all | ||
72 | |||
73 | # DO NOT DELETE THIS LINE -- make depend depends on it. | ||
diff --git a/src/lib/libssl/src/crypto/rc5/asm/r5-win32.asm b/src/lib/libssl/src/crypto/rc5/asm/r5-win32.asm index f43d3711f0..e69de29bb2 100644 --- a/src/lib/libssl/src/crypto/rc5/asm/r5-win32.asm +++ b/src/lib/libssl/src/crypto/rc5/asm/r5-win32.asm | |||
@@ -1,574 +0,0 @@ | |||
1 | ; Don't even think of reading this code | ||
2 | ; It was automatically generated by rc5-586.pl | ||
3 | ; Which is a perl program used to generate the x86 assember for | ||
4 | ; any of elf, a.out, BSDI,Win32, or Solaris | ||
5 | ; eric <eay@cryptsoft.com> | ||
6 | ; | ||
7 | TITLE rc5-586.asm | ||
8 | .386 | ||
9 | .model FLAT | ||
10 | _TEXT SEGMENT | ||
11 | PUBLIC _RC5_32_encrypt | ||
12 | |||
13 | _RC5_32_encrypt PROC NEAR | ||
14 | ; | ||
15 | push ebp | ||
16 | push esi | ||
17 | push edi | ||
18 | mov edx, DWORD PTR 16[esp] | ||
19 | mov ebp, DWORD PTR 20[esp] | ||
20 | ; Load the 2 words | ||
21 | mov edi, DWORD PTR [edx] | ||
22 | mov esi, DWORD PTR 4[edx] | ||
23 | push ebx | ||
24 | mov ebx, DWORD PTR [ebp] | ||
25 | add edi, DWORD PTR 4[ebp] | ||
26 | add esi, DWORD PTR 8[ebp] | ||
27 | xor edi, esi | ||
28 | mov eax, DWORD PTR 12[ebp] | ||
29 | mov ecx, esi | ||
30 | rol edi, cl | ||
31 | add edi, eax | ||
32 | xor esi, edi | ||
33 | mov eax, DWORD PTR 16[ebp] | ||
34 | mov ecx, edi | ||
35 | rol esi, cl | ||
36 | add esi, eax | ||
37 | xor edi, esi | ||
38 | mov eax, DWORD PTR 20[ebp] | ||
39 | mov ecx, esi | ||
40 | rol edi, cl | ||
41 | add edi, eax | ||
42 | xor esi, edi | ||
43 | mov eax, DWORD PTR 24[ebp] | ||
44 | mov ecx, edi | ||
45 | rol esi, cl | ||
46 | add esi, eax | ||
47 | xor edi, esi | ||
48 | mov eax, DWORD PTR 28[ebp] | ||
49 | mov ecx, esi | ||
50 | rol edi, cl | ||
51 | add edi, eax | ||
52 | xor esi, edi | ||
53 | mov eax, DWORD PTR 32[ebp] | ||
54 | mov ecx, edi | ||
55 | rol esi, cl | ||
56 | add esi, eax | ||
57 | xor edi, esi | ||
58 | mov eax, DWORD PTR 36[ebp] | ||
59 | mov ecx, esi | ||
60 | rol edi, cl | ||
61 | add edi, eax | ||
62 | xor esi, edi | ||
63 | mov eax, DWORD PTR 40[ebp] | ||
64 | mov ecx, edi | ||
65 | rol esi, cl | ||
66 | add esi, eax | ||
67 | xor edi, esi | ||
68 | mov eax, DWORD PTR 44[ebp] | ||
69 | mov ecx, esi | ||
70 | rol edi, cl | ||
71 | add edi, eax | ||
72 | xor esi, edi | ||
73 | mov eax, DWORD PTR 48[ebp] | ||
74 | mov ecx, edi | ||
75 | rol esi, cl | ||
76 | add esi, eax | ||
77 | xor edi, esi | ||
78 | mov eax, DWORD PTR 52[ebp] | ||
79 | mov ecx, esi | ||
80 | rol edi, cl | ||
81 | add edi, eax | ||
82 | xor esi, edi | ||
83 | mov eax, DWORD PTR 56[ebp] | ||
84 | mov ecx, edi | ||
85 | rol esi, cl | ||
86 | add esi, eax | ||
87 | xor edi, esi | ||
88 | mov eax, DWORD PTR 60[ebp] | ||
89 | mov ecx, esi | ||
90 | rol edi, cl | ||
91 | add edi, eax | ||
92 | xor esi, edi | ||
93 | mov eax, DWORD PTR 64[ebp] | ||
94 | mov ecx, edi | ||
95 | rol esi, cl | ||
96 | add esi, eax | ||
97 | xor edi, esi | ||
98 | mov eax, DWORD PTR 68[ebp] | ||
99 | mov ecx, esi | ||
100 | rol edi, cl | ||
101 | add edi, eax | ||
102 | xor esi, edi | ||
103 | mov eax, DWORD PTR 72[ebp] | ||
104 | mov ecx, edi | ||
105 | rol esi, cl | ||
106 | add esi, eax | ||
107 | cmp ebx, 8 | ||
108 | je $L000rc5_exit | ||
109 | xor edi, esi | ||
110 | mov eax, DWORD PTR 76[ebp] | ||
111 | mov ecx, esi | ||
112 | rol edi, cl | ||
113 | add edi, eax | ||
114 | xor esi, edi | ||
115 | mov eax, DWORD PTR 80[ebp] | ||
116 | mov ecx, edi | ||
117 | rol esi, cl | ||
118 | add esi, eax | ||
119 | xor edi, esi | ||
120 | mov eax, DWORD PTR 84[ebp] | ||
121 | mov ecx, esi | ||
122 | rol edi, cl | ||
123 | add edi, eax | ||
124 | xor esi, edi | ||
125 | mov eax, DWORD PTR 88[ebp] | ||
126 | mov ecx, edi | ||
127 | rol esi, cl | ||
128 | add esi, eax | ||
129 | xor edi, esi | ||
130 | mov eax, DWORD PTR 92[ebp] | ||
131 | mov ecx, esi | ||
132 | rol edi, cl | ||
133 | add edi, eax | ||
134 | xor esi, edi | ||
135 | mov eax, DWORD PTR 96[ebp] | ||
136 | mov ecx, edi | ||
137 | rol esi, cl | ||
138 | add esi, eax | ||
139 | xor edi, esi | ||
140 | mov eax, DWORD PTR 100[ebp] | ||
141 | mov ecx, esi | ||
142 | rol edi, cl | ||
143 | add edi, eax | ||
144 | xor esi, edi | ||
145 | mov eax, DWORD PTR 104[ebp] | ||
146 | mov ecx, edi | ||
147 | rol esi, cl | ||
148 | add esi, eax | ||
149 | cmp ebx, 12 | ||
150 | je $L000rc5_exit | ||
151 | xor edi, esi | ||
152 | mov eax, DWORD PTR 108[ebp] | ||
153 | mov ecx, esi | ||
154 | rol edi, cl | ||
155 | add edi, eax | ||
156 | xor esi, edi | ||
157 | mov eax, DWORD PTR 112[ebp] | ||
158 | mov ecx, edi | ||
159 | rol esi, cl | ||
160 | add esi, eax | ||
161 | xor edi, esi | ||
162 | mov eax, DWORD PTR 116[ebp] | ||
163 | mov ecx, esi | ||
164 | rol edi, cl | ||
165 | add edi, eax | ||
166 | xor esi, edi | ||
167 | mov eax, DWORD PTR 120[ebp] | ||
168 | mov ecx, edi | ||
169 | rol esi, cl | ||
170 | add esi, eax | ||
171 | xor edi, esi | ||
172 | mov eax, DWORD PTR 124[ebp] | ||
173 | mov ecx, esi | ||
174 | rol edi, cl | ||
175 | add edi, eax | ||
176 | xor esi, edi | ||
177 | mov eax, DWORD PTR 128[ebp] | ||
178 | mov ecx, edi | ||
179 | rol esi, cl | ||
180 | add esi, eax | ||
181 | xor edi, esi | ||
182 | mov eax, DWORD PTR 132[ebp] | ||
183 | mov ecx, esi | ||
184 | rol edi, cl | ||
185 | add edi, eax | ||
186 | xor esi, edi | ||
187 | mov eax, DWORD PTR 136[ebp] | ||
188 | mov ecx, edi | ||
189 | rol esi, cl | ||
190 | add esi, eax | ||
191 | $L000rc5_exit: | ||
192 | mov DWORD PTR [edx],edi | ||
193 | mov DWORD PTR 4[edx],esi | ||
194 | pop ebx | ||
195 | pop edi | ||
196 | pop esi | ||
197 | pop ebp | ||
198 | ret | ||
199 | _RC5_32_encrypt ENDP | ||
200 | _TEXT ENDS | ||
201 | _TEXT SEGMENT | ||
202 | PUBLIC _RC5_32_decrypt | ||
203 | |||
204 | _RC5_32_decrypt PROC NEAR | ||
205 | ; | ||
206 | push ebp | ||
207 | push esi | ||
208 | push edi | ||
209 | mov edx, DWORD PTR 16[esp] | ||
210 | mov ebp, DWORD PTR 20[esp] | ||
211 | ; Load the 2 words | ||
212 | mov edi, DWORD PTR [edx] | ||
213 | mov esi, DWORD PTR 4[edx] | ||
214 | push ebx | ||
215 | mov ebx, DWORD PTR [ebp] | ||
216 | cmp ebx, 12 | ||
217 | je $L001rc5_dec_12 | ||
218 | cmp ebx, 8 | ||
219 | je $L002rc5_dec_8 | ||
220 | mov eax, DWORD PTR 136[ebp] | ||
221 | sub esi, eax | ||
222 | mov ecx, edi | ||
223 | ror esi, cl | ||
224 | xor esi, edi | ||
225 | mov eax, DWORD PTR 132[ebp] | ||
226 | sub edi, eax | ||
227 | mov ecx, esi | ||
228 | ror edi, cl | ||
229 | xor edi, esi | ||
230 | mov eax, DWORD PTR 128[ebp] | ||
231 | sub esi, eax | ||
232 | mov ecx, edi | ||
233 | ror esi, cl | ||
234 | xor esi, edi | ||
235 | mov eax, DWORD PTR 124[ebp] | ||
236 | sub edi, eax | ||
237 | mov ecx, esi | ||
238 | ror edi, cl | ||
239 | xor edi, esi | ||
240 | mov eax, DWORD PTR 120[ebp] | ||
241 | sub esi, eax | ||
242 | mov ecx, edi | ||
243 | ror esi, cl | ||
244 | xor esi, edi | ||
245 | mov eax, DWORD PTR 116[ebp] | ||
246 | sub edi, eax | ||
247 | mov ecx, esi | ||
248 | ror edi, cl | ||
249 | xor edi, esi | ||
250 | mov eax, DWORD PTR 112[ebp] | ||
251 | sub esi, eax | ||
252 | mov ecx, edi | ||
253 | ror esi, cl | ||
254 | xor esi, edi | ||
255 | mov eax, DWORD PTR 108[ebp] | ||
256 | sub edi, eax | ||
257 | mov ecx, esi | ||
258 | ror edi, cl | ||
259 | xor edi, esi | ||
260 | $L001rc5_dec_12: | ||
261 | mov eax, DWORD PTR 104[ebp] | ||
262 | sub esi, eax | ||
263 | mov ecx, edi | ||
264 | ror esi, cl | ||
265 | xor esi, edi | ||
266 | mov eax, DWORD PTR 100[ebp] | ||
267 | sub edi, eax | ||
268 | mov ecx, esi | ||
269 | ror edi, cl | ||
270 | xor edi, esi | ||
271 | mov eax, DWORD PTR 96[ebp] | ||
272 | sub esi, eax | ||
273 | mov ecx, edi | ||
274 | ror esi, cl | ||
275 | xor esi, edi | ||
276 | mov eax, DWORD PTR 92[ebp] | ||
277 | sub edi, eax | ||
278 | mov ecx, esi | ||
279 | ror edi, cl | ||
280 | xor edi, esi | ||
281 | mov eax, DWORD PTR 88[ebp] | ||
282 | sub esi, eax | ||
283 | mov ecx, edi | ||
284 | ror esi, cl | ||
285 | xor esi, edi | ||
286 | mov eax, DWORD PTR 84[ebp] | ||
287 | sub edi, eax | ||
288 | mov ecx, esi | ||
289 | ror edi, cl | ||
290 | xor edi, esi | ||
291 | mov eax, DWORD PTR 80[ebp] | ||
292 | sub esi, eax | ||
293 | mov ecx, edi | ||
294 | ror esi, cl | ||
295 | xor esi, edi | ||
296 | mov eax, DWORD PTR 76[ebp] | ||
297 | sub edi, eax | ||
298 | mov ecx, esi | ||
299 | ror edi, cl | ||
300 | xor edi, esi | ||
301 | $L002rc5_dec_8: | ||
302 | mov eax, DWORD PTR 72[ebp] | ||
303 | sub esi, eax | ||
304 | mov ecx, edi | ||
305 | ror esi, cl | ||
306 | xor esi, edi | ||
307 | mov eax, DWORD PTR 68[ebp] | ||
308 | sub edi, eax | ||
309 | mov ecx, esi | ||
310 | ror edi, cl | ||
311 | xor edi, esi | ||
312 | mov eax, DWORD PTR 64[ebp] | ||
313 | sub esi, eax | ||
314 | mov ecx, edi | ||
315 | ror esi, cl | ||
316 | xor esi, edi | ||
317 | mov eax, DWORD PTR 60[ebp] | ||
318 | sub edi, eax | ||
319 | mov ecx, esi | ||
320 | ror edi, cl | ||
321 | xor edi, esi | ||
322 | mov eax, DWORD PTR 56[ebp] | ||
323 | sub esi, eax | ||
324 | mov ecx, edi | ||
325 | ror esi, cl | ||
326 | xor esi, edi | ||
327 | mov eax, DWORD PTR 52[ebp] | ||
328 | sub edi, eax | ||
329 | mov ecx, esi | ||
330 | ror edi, cl | ||
331 | xor edi, esi | ||
332 | mov eax, DWORD PTR 48[ebp] | ||
333 | sub esi, eax | ||
334 | mov ecx, edi | ||
335 | ror esi, cl | ||
336 | xor esi, edi | ||
337 | mov eax, DWORD PTR 44[ebp] | ||
338 | sub edi, eax | ||
339 | mov ecx, esi | ||
340 | ror edi, cl | ||
341 | xor edi, esi | ||
342 | mov eax, DWORD PTR 40[ebp] | ||
343 | sub esi, eax | ||
344 | mov ecx, edi | ||
345 | ror esi, cl | ||
346 | xor esi, edi | ||
347 | mov eax, DWORD PTR 36[ebp] | ||
348 | sub edi, eax | ||
349 | mov ecx, esi | ||
350 | ror edi, cl | ||
351 | xor edi, esi | ||
352 | mov eax, DWORD PTR 32[ebp] | ||
353 | sub esi, eax | ||
354 | mov ecx, edi | ||
355 | ror esi, cl | ||
356 | xor esi, edi | ||
357 | mov eax, DWORD PTR 28[ebp] | ||
358 | sub edi, eax | ||
359 | mov ecx, esi | ||
360 | ror edi, cl | ||
361 | xor edi, esi | ||
362 | mov eax, DWORD PTR 24[ebp] | ||
363 | sub esi, eax | ||
364 | mov ecx, edi | ||
365 | ror esi, cl | ||
366 | xor esi, edi | ||
367 | mov eax, DWORD PTR 20[ebp] | ||
368 | sub edi, eax | ||
369 | mov ecx, esi | ||
370 | ror edi, cl | ||
371 | xor edi, esi | ||
372 | mov eax, DWORD PTR 16[ebp] | ||
373 | sub esi, eax | ||
374 | mov ecx, edi | ||
375 | ror esi, cl | ||
376 | xor esi, edi | ||
377 | mov eax, DWORD PTR 12[ebp] | ||
378 | sub edi, eax | ||
379 | mov ecx, esi | ||
380 | ror edi, cl | ||
381 | xor edi, esi | ||
382 | sub esi, DWORD PTR 8[ebp] | ||
383 | sub edi, DWORD PTR 4[ebp] | ||
384 | L003rc5_exit: | ||
385 | mov DWORD PTR [edx],edi | ||
386 | mov DWORD PTR 4[edx],esi | ||
387 | pop ebx | ||
388 | pop edi | ||
389 | pop esi | ||
390 | pop ebp | ||
391 | ret | ||
392 | _RC5_32_decrypt ENDP | ||
393 | _TEXT ENDS | ||
394 | _TEXT SEGMENT | ||
395 | PUBLIC _RC5_32_cbc_encrypt | ||
396 | |||
397 | _RC5_32_cbc_encrypt PROC NEAR | ||
398 | ; | ||
399 | push ebp | ||
400 | push ebx | ||
401 | push esi | ||
402 | push edi | ||
403 | mov ebp, DWORD PTR 28[esp] | ||
404 | ; getting iv ptr from parameter 4 | ||
405 | mov ebx, DWORD PTR 36[esp] | ||
406 | mov esi, DWORD PTR [ebx] | ||
407 | mov edi, DWORD PTR 4[ebx] | ||
408 | push edi | ||
409 | push esi | ||
410 | push edi | ||
411 | push esi | ||
412 | mov ebx, esp | ||
413 | mov esi, DWORD PTR 36[esp] | ||
414 | mov edi, DWORD PTR 40[esp] | ||
415 | ; getting encrypt flag from parameter 5 | ||
416 | mov ecx, DWORD PTR 56[esp] | ||
417 | ; get and push parameter 3 | ||
418 | mov eax, DWORD PTR 48[esp] | ||
419 | push eax | ||
420 | push ebx | ||
421 | cmp ecx, 0 | ||
422 | jz $L004decrypt | ||
423 | and ebp, 4294967288 | ||
424 | mov eax, DWORD PTR 8[esp] | ||
425 | mov ebx, DWORD PTR 12[esp] | ||
426 | jz $L005encrypt_finish | ||
427 | L006encrypt_loop: | ||
428 | mov ecx, DWORD PTR [esi] | ||
429 | mov edx, DWORD PTR 4[esi] | ||
430 | xor eax, ecx | ||
431 | xor ebx, edx | ||
432 | mov DWORD PTR 8[esp],eax | ||
433 | mov DWORD PTR 12[esp],ebx | ||
434 | call _RC5_32_encrypt | ||
435 | mov eax, DWORD PTR 8[esp] | ||
436 | mov ebx, DWORD PTR 12[esp] | ||
437 | mov DWORD PTR [edi],eax | ||
438 | mov DWORD PTR 4[edi],ebx | ||
439 | add esi, 8 | ||
440 | add edi, 8 | ||
441 | sub ebp, 8 | ||
442 | jnz L006encrypt_loop | ||
443 | $L005encrypt_finish: | ||
444 | mov ebp, DWORD PTR 52[esp] | ||
445 | and ebp, 7 | ||
446 | jz $L007finish | ||
447 | xor ecx, ecx | ||
448 | xor edx, edx | ||
449 | mov ebp, DWORD PTR $L008cbc_enc_jmp_table[ebp*4] | ||
450 | jmp ebp | ||
451 | L009ej7: | ||
452 | mov dh, BYTE PTR 6[esi] | ||
453 | shl edx, 8 | ||
454 | L010ej6: | ||
455 | mov dh, BYTE PTR 5[esi] | ||
456 | L011ej5: | ||
457 | mov dl, BYTE PTR 4[esi] | ||
458 | L012ej4: | ||
459 | mov ecx, DWORD PTR [esi] | ||
460 | jmp $L013ejend | ||
461 | L014ej3: | ||
462 | mov ch, BYTE PTR 2[esi] | ||
463 | shl ecx, 8 | ||
464 | L015ej2: | ||
465 | mov ch, BYTE PTR 1[esi] | ||
466 | L016ej1: | ||
467 | mov cl, BYTE PTR [esi] | ||
468 | $L013ejend: | ||
469 | xor eax, ecx | ||
470 | xor ebx, edx | ||
471 | mov DWORD PTR 8[esp],eax | ||
472 | mov DWORD PTR 12[esp],ebx | ||
473 | call _RC5_32_encrypt | ||
474 | mov eax, DWORD PTR 8[esp] | ||
475 | mov ebx, DWORD PTR 12[esp] | ||
476 | mov DWORD PTR [edi],eax | ||
477 | mov DWORD PTR 4[edi],ebx | ||
478 | jmp $L007finish | ||
479 | $L004decrypt: | ||
480 | and ebp, 4294967288 | ||
481 | mov eax, DWORD PTR 16[esp] | ||
482 | mov ebx, DWORD PTR 20[esp] | ||
483 | jz $L017decrypt_finish | ||
484 | L018decrypt_loop: | ||
485 | mov eax, DWORD PTR [esi] | ||
486 | mov ebx, DWORD PTR 4[esi] | ||
487 | mov DWORD PTR 8[esp],eax | ||
488 | mov DWORD PTR 12[esp],ebx | ||
489 | call _RC5_32_decrypt | ||
490 | mov eax, DWORD PTR 8[esp] | ||
491 | mov ebx, DWORD PTR 12[esp] | ||
492 | mov ecx, DWORD PTR 16[esp] | ||
493 | mov edx, DWORD PTR 20[esp] | ||
494 | xor ecx, eax | ||
495 | xor edx, ebx | ||
496 | mov eax, DWORD PTR [esi] | ||
497 | mov ebx, DWORD PTR 4[esi] | ||
498 | mov DWORD PTR [edi],ecx | ||
499 | mov DWORD PTR 4[edi],edx | ||
500 | mov DWORD PTR 16[esp],eax | ||
501 | mov DWORD PTR 20[esp],ebx | ||
502 | add esi, 8 | ||
503 | add edi, 8 | ||
504 | sub ebp, 8 | ||
505 | jnz L018decrypt_loop | ||
506 | $L017decrypt_finish: | ||
507 | mov ebp, DWORD PTR 52[esp] | ||
508 | and ebp, 7 | ||
509 | jz $L007finish | ||
510 | mov eax, DWORD PTR [esi] | ||
511 | mov ebx, DWORD PTR 4[esi] | ||
512 | mov DWORD PTR 8[esp],eax | ||
513 | mov DWORD PTR 12[esp],ebx | ||
514 | call _RC5_32_decrypt | ||
515 | mov eax, DWORD PTR 8[esp] | ||
516 | mov ebx, DWORD PTR 12[esp] | ||
517 | mov ecx, DWORD PTR 16[esp] | ||
518 | mov edx, DWORD PTR 20[esp] | ||
519 | xor ecx, eax | ||
520 | xor edx, ebx | ||
521 | mov eax, DWORD PTR [esi] | ||
522 | mov ebx, DWORD PTR 4[esi] | ||
523 | L019dj7: | ||
524 | ror edx, 16 | ||
525 | mov BYTE PTR 6[edi],dl | ||
526 | shr edx, 16 | ||
527 | L020dj6: | ||
528 | mov BYTE PTR 5[edi],dh | ||
529 | L021dj5: | ||
530 | mov BYTE PTR 4[edi],dl | ||
531 | L022dj4: | ||
532 | mov DWORD PTR [edi],ecx | ||
533 | jmp $L023djend | ||
534 | L024dj3: | ||
535 | ror ecx, 16 | ||
536 | mov BYTE PTR 2[edi],cl | ||
537 | shl ecx, 16 | ||
538 | L025dj2: | ||
539 | mov BYTE PTR 1[esi],ch | ||
540 | L026dj1: | ||
541 | mov BYTE PTR [esi], cl | ||
542 | $L023djend: | ||
543 | jmp $L007finish | ||
544 | $L007finish: | ||
545 | mov ecx, DWORD PTR 60[esp] | ||
546 | add esp, 24 | ||
547 | mov DWORD PTR [ecx],eax | ||
548 | mov DWORD PTR 4[ecx],ebx | ||
549 | pop edi | ||
550 | pop esi | ||
551 | pop ebx | ||
552 | pop ebp | ||
553 | ret | ||
554 | $L008cbc_enc_jmp_table: | ||
555 | DD 0 | ||
556 | DD L016ej1 | ||
557 | DD L015ej2 | ||
558 | DD L014ej3 | ||
559 | DD L012ej4 | ||
560 | DD L011ej5 | ||
561 | DD L010ej6 | ||
562 | DD L009ej7 | ||
563 | L027cbc_dec_jmp_table: | ||
564 | DD 0 | ||
565 | DD L026dj1 | ||
566 | DD L025dj2 | ||
567 | DD L024dj3 | ||
568 | DD L022dj4 | ||
569 | DD L021dj5 | ||
570 | DD L020dj6 | ||
571 | DD L019dj7 | ||
572 | _RC5_32_cbc_encrypt ENDP | ||
573 | _TEXT ENDS | ||
574 | END | ||
diff --git a/src/lib/libssl/src/crypto/ripemd/Makefile.ssl b/src/lib/libssl/src/crypto/ripemd/Makefile.ssl index c6153d4361..6ada9f067b 100644 --- a/src/lib/libssl/src/crypto/ripemd/Makefile.ssl +++ b/src/lib/libssl/src/crypto/ripemd/Makefile.ssl | |||
@@ -47,7 +47,7 @@ lib: $(LIBOBJ) | |||
47 | 47 | ||
48 | # elf | 48 | # elf |
49 | asm/rm86-elf.o: asm/rm86unix.cpp | 49 | asm/rm86-elf.o: asm/rm86unix.cpp |
50 | $(CPP) -DELF asm/rm86unix.cpp | as -o asm/rm86-elf.o | 50 | $(CPP) -DELF -x c asm/rm86unix.cpp | as -o asm/rm86-elf.o |
51 | 51 | ||
52 | # solaris | 52 | # solaris |
53 | asm/rm86-sol.o: asm/rm86unix.cpp | 53 | asm/rm86-sol.o: asm/rm86unix.cpp |
@@ -63,7 +63,7 @@ asm/rm86-out.o: asm/rm86unix.cpp | |||
63 | asm/rm86bsdi.o: asm/rm86unix.cpp | 63 | asm/rm86bsdi.o: asm/rm86unix.cpp |
64 | $(CPP) -DBSDI asm/rm86unix.cpp | sed 's/ :/:/' | as -o asm/rm86bsdi.o | 64 | $(CPP) -DBSDI asm/rm86unix.cpp | sed 's/ :/:/' | as -o asm/rm86bsdi.o |
65 | 65 | ||
66 | asm/rm86unix.cpp: asm/rmd-586.pl | 66 | asm/rm86unix.cpp: asm/rmd-586.pl ../perlasm/x86asm.pl |
67 | (cd asm; $(PERL) rmd-586.pl cpp >rm86unix.cpp) | 67 | (cd asm; $(PERL) rmd-586.pl cpp >rm86unix.cpp) |
68 | 68 | ||
69 | files: | 69 | files: |
diff --git a/src/lib/libssl/src/crypto/ripemd/Makefile.uni b/src/lib/libssl/src/crypto/ripemd/Makefile.uni index 5310020eb1..e69de29bb2 100644 --- a/src/lib/libssl/src/crypto/ripemd/Makefile.uni +++ b/src/lib/libssl/src/crypto/ripemd/Makefile.uni | |||
@@ -1,109 +0,0 @@ | |||
1 | # Targets | ||
2 | # make - twidle the options yourself :-) | ||
3 | # make cc - standard cc options | ||
4 | # make gcc - standard gcc options | ||
5 | # make x86-elf - linux-elf etc | ||
6 | # make x86-out - linux-a.out, FreeBSD etc | ||
7 | # make x86-solaris | ||
8 | # make x86-bdsi | ||
9 | |||
10 | DIR= md5 | ||
11 | TOP= . | ||
12 | CC= gcc | ||
13 | CFLAG= -O3 -fomit-frame-pointer | ||
14 | |||
15 | CPP= $(CC) -E | ||
16 | INCLUDES= | ||
17 | INSTALLTOP=/usr/local/lib | ||
18 | MAKE= make | ||
19 | MAKEDEPEND= makedepend | ||
20 | MAKEFILE= Makefile.uni | ||
21 | AR= ar r | ||
22 | |||
23 | MD5_ASM_OBJ= | ||
24 | |||
25 | CFLAGS= $(INCLUDES) $(CFLAG) | ||
26 | |||
27 | GENERAL=Makefile | ||
28 | TEST=md5test | ||
29 | APPS=md5 | ||
30 | |||
31 | LIB=libmd5.a | ||
32 | LIBSRC=md5_dgst.c md5_one.c | ||
33 | LIBOBJ=md5_dgst.o md5_one.o $(MD5_ASM_OBJ) | ||
34 | |||
35 | SRC= $(LIBSRC) | ||
36 | |||
37 | EXHEADER= md5.h | ||
38 | HEADER= md5_locl.h $(EXHEADER) | ||
39 | |||
40 | ALL= $(GENERAL) $(SRC) $(HEADER) | ||
41 | |||
42 | all: $(LIB) $(TEST) $(APPS) | ||
43 | |||
44 | $(LIB): $(LIBOBJ) | ||
45 | $(AR) $(LIB) $(LIBOBJ) | ||
46 | $(RANLIB) $(LIB) | ||
47 | |||
48 | # elf | ||
49 | asm/mx86-elf.o: asm/mx86unix.cpp | ||
50 | $(CPP) -DELF asm/mx86unix.cpp | as -o asm/mx86-elf.o | ||
51 | |||
52 | # solaris | ||
53 | asm/mx86-sol.o: asm/mx86unix.cpp | ||
54 | $(CC) -E -DSOL asm/mx86unix.cpp | sed 's/^#.*//' > asm/mx86-sol.s | ||
55 | as -o asm/mx86-sol.o asm/mx86-sol.s | ||
56 | rm -f asm/mx86-sol.s | ||
57 | |||
58 | # a.out | ||
59 | asm/mx86-out.o: asm/mx86unix.cpp | ||
60 | $(CPP) -DOUT asm/mx86unix.cpp | as -o asm/mx86-out.o | ||
61 | |||
62 | # bsdi | ||
63 | asm/mx86bsdi.o: asm/mx86unix.cpp | ||
64 | $(CPP) -DBSDI asm/mx86unix.cpp | as -o asm/mx86bsdi.o | ||
65 | |||
66 | asm/mx86unix.cpp: | ||
67 | (cd asm; perl md5-586.pl cpp >mx86unix.cpp) | ||
68 | |||
69 | test: $(TEST) | ||
70 | ./$(TEST) | ||
71 | |||
72 | $(TEST): $(TEST).c $(LIB) | ||
73 | $(CC) -o $(TEST) $(CFLAGS) $(TEST).c $(LIB) | ||
74 | |||
75 | $(APPS): $(APPS).c $(LIB) | ||
76 | $(CC) -o $(APPS) $(CFLAGS) $(APPS).c $(LIB) | ||
77 | |||
78 | lint: | ||
79 | lint -DLINT $(INCLUDES) $(SRC)>fluff | ||
80 | |||
81 | depend: | ||
82 | $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) | ||
83 | |||
84 | dclean: | ||
85 | perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new | ||
86 | mv -f Makefile.new $(MAKEFILE) | ||
87 | |||
88 | clean: | ||
89 | /bin/rm -f $(LIB) $(TEST) $(APPS) *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff | ||
90 | |||
91 | cc: | ||
92 | $(MAKE) MD5_ASM_OBJ="" CC="cc" CFLAG="-O" all | ||
93 | |||
94 | gcc: | ||
95 | $(MAKE) MD5_ASM_OBJ="" CC="gcc" CFLAGS="-O3 -fomit-frame-pointer" all | ||
96 | |||
97 | x86-elf: | ||
98 | $(MAKE) MD5_ASM_OBJ="asm/mx86-elf.o" CFLAG="-DELF -DMD5_ASM -DL_ENDIAN $(CFLAGS)" all | ||
99 | |||
100 | x86-out: | ||
101 | $(MAKE) MD5_ASM_OBJ="asm/mx86-out.o" CFLAG="-DOUT -DMD5_ASM -DL_ENDIAN $(CFLAGS)" all | ||
102 | |||
103 | x86-solaris: | ||
104 | $(MAKE) MD5_ASM_OBJ="asm/mx86-sol.o" CFLAG="-DSOL -DMD5_ASM -DL_ENDIAN $(CFLAGS)" all | ||
105 | |||
106 | x86-bdsi: | ||
107 | $(MAKE) MD5_ASM_OBJ="asm/mx86-bdsi.o" CFLAG="-DBDSI -DMD5_ASM -DL_ENDIAN $(CFLAGS)" all | ||
108 | |||
109 | # DO NOT DELETE THIS LINE -- make depend depends on it. | ||
diff --git a/src/lib/libssl/src/crypto/ripemd/asm/rm-win32.asm b/src/lib/libssl/src/crypto/ripemd/asm/rm-win32.asm index f07d517857..e69de29bb2 100644 --- a/src/lib/libssl/src/crypto/ripemd/asm/rm-win32.asm +++ b/src/lib/libssl/src/crypto/ripemd/asm/rm-win32.asm | |||
@@ -1,1973 +0,0 @@ | |||
1 | ; Don't even think of reading this code | ||
2 | ; It was automatically generated by rmd-586.pl | ||
3 | ; Which is a perl program used to generate the x86 assember for | ||
4 | ; any of elf, a.out, BSDI,Win32, or Solaris | ||
5 | ; eric <eay@cryptsoft.com> | ||
6 | ; | ||
7 | TITLE rmd-586.asm | ||
8 | .386 | ||
9 | .model FLAT | ||
10 | _TEXT SEGMENT | ||
11 | PUBLIC _ripemd160_block_asm_host_order | ||
12 | |||
13 | _ripemd160_block_asm_host_order PROC NEAR | ||
14 | mov edx, DWORD PTR 4[esp] | ||
15 | mov eax, DWORD PTR 8[esp] | ||
16 | push esi | ||
17 | mov ecx, DWORD PTR [edx] | ||
18 | push edi | ||
19 | mov esi, DWORD PTR 4[edx] | ||
20 | push ebp | ||
21 | mov edi, DWORD PTR 8[edx] | ||
22 | push ebx | ||
23 | sub esp, 108 | ||
24 | L000start: | ||
25 | ; | ||
26 | mov ebx, DWORD PTR [eax] | ||
27 | mov ebp, DWORD PTR 4[eax] | ||
28 | mov DWORD PTR [esp],ebx | ||
29 | mov DWORD PTR 4[esp],ebp | ||
30 | mov ebx, DWORD PTR 8[eax] | ||
31 | mov ebp, DWORD PTR 12[eax] | ||
32 | mov DWORD PTR 8[esp],ebx | ||
33 | mov DWORD PTR 12[esp],ebp | ||
34 | mov ebx, DWORD PTR 16[eax] | ||
35 | mov ebp, DWORD PTR 20[eax] | ||
36 | mov DWORD PTR 16[esp],ebx | ||
37 | mov DWORD PTR 20[esp],ebp | ||
38 | mov ebx, DWORD PTR 24[eax] | ||
39 | mov ebp, DWORD PTR 28[eax] | ||
40 | mov DWORD PTR 24[esp],ebx | ||
41 | mov DWORD PTR 28[esp],ebp | ||
42 | mov ebx, DWORD PTR 32[eax] | ||
43 | mov ebp, DWORD PTR 36[eax] | ||
44 | mov DWORD PTR 32[esp],ebx | ||
45 | mov DWORD PTR 36[esp],ebp | ||
46 | mov ebx, DWORD PTR 40[eax] | ||
47 | mov ebp, DWORD PTR 44[eax] | ||
48 | mov DWORD PTR 40[esp],ebx | ||
49 | mov DWORD PTR 44[esp],ebp | ||
50 | mov ebx, DWORD PTR 48[eax] | ||
51 | mov ebp, DWORD PTR 52[eax] | ||
52 | mov DWORD PTR 48[esp],ebx | ||
53 | mov DWORD PTR 52[esp],ebp | ||
54 | mov ebx, DWORD PTR 56[eax] | ||
55 | mov ebp, DWORD PTR 60[eax] | ||
56 | mov DWORD PTR 56[esp],ebx | ||
57 | mov DWORD PTR 60[esp],ebp | ||
58 | mov eax, edi | ||
59 | mov ebx, DWORD PTR 12[edx] | ||
60 | mov ebp, DWORD PTR 16[edx] | ||
61 | ; 0 | ||
62 | xor eax, ebx | ||
63 | mov edx, DWORD PTR [esp] | ||
64 | xor eax, esi | ||
65 | add ecx, edx | ||
66 | rol edi, 10 | ||
67 | add ecx, eax | ||
68 | mov eax, esi | ||
69 | rol ecx, 11 | ||
70 | add ecx, ebp | ||
71 | ; 1 | ||
72 | xor eax, edi | ||
73 | mov edx, DWORD PTR 4[esp] | ||
74 | xor eax, ecx | ||
75 | add ebp, eax | ||
76 | mov eax, ecx | ||
77 | rol esi, 10 | ||
78 | add ebp, edx | ||
79 | xor eax, esi | ||
80 | rol ebp, 14 | ||
81 | add ebp, ebx | ||
82 | ; 2 | ||
83 | mov edx, DWORD PTR 8[esp] | ||
84 | xor eax, ebp | ||
85 | add ebx, edx | ||
86 | rol ecx, 10 | ||
87 | add ebx, eax | ||
88 | mov eax, ebp | ||
89 | rol ebx, 15 | ||
90 | add ebx, edi | ||
91 | ; 3 | ||
92 | xor eax, ecx | ||
93 | mov edx, DWORD PTR 12[esp] | ||
94 | xor eax, ebx | ||
95 | add edi, eax | ||
96 | mov eax, ebx | ||
97 | rol ebp, 10 | ||
98 | add edi, edx | ||
99 | xor eax, ebp | ||
100 | rol edi, 12 | ||
101 | add edi, esi | ||
102 | ; 4 | ||
103 | mov edx, DWORD PTR 16[esp] | ||
104 | xor eax, edi | ||
105 | add esi, edx | ||
106 | rol ebx, 10 | ||
107 | add esi, eax | ||
108 | mov eax, edi | ||
109 | rol esi, 5 | ||
110 | add esi, ecx | ||
111 | ; 5 | ||
112 | xor eax, ebx | ||
113 | mov edx, DWORD PTR 20[esp] | ||
114 | xor eax, esi | ||
115 | add ecx, eax | ||
116 | mov eax, esi | ||
117 | rol edi, 10 | ||
118 | add ecx, edx | ||
119 | xor eax, edi | ||
120 | rol ecx, 8 | ||
121 | add ecx, ebp | ||
122 | ; 6 | ||
123 | mov edx, DWORD PTR 24[esp] | ||
124 | xor eax, ecx | ||
125 | add ebp, edx | ||
126 | rol esi, 10 | ||
127 | add ebp, eax | ||
128 | mov eax, ecx | ||
129 | rol ebp, 7 | ||
130 | add ebp, ebx | ||
131 | ; 7 | ||
132 | xor eax, esi | ||
133 | mov edx, DWORD PTR 28[esp] | ||
134 | xor eax, ebp | ||
135 | add ebx, eax | ||
136 | mov eax, ebp | ||
137 | rol ecx, 10 | ||
138 | add ebx, edx | ||
139 | xor eax, ecx | ||
140 | rol ebx, 9 | ||
141 | add ebx, edi | ||
142 | ; 8 | ||
143 | mov edx, DWORD PTR 32[esp] | ||
144 | xor eax, ebx | ||
145 | add edi, edx | ||
146 | rol ebp, 10 | ||
147 | add edi, eax | ||
148 | mov eax, ebx | ||
149 | rol edi, 11 | ||
150 | add edi, esi | ||
151 | ; 9 | ||
152 | xor eax, ebp | ||
153 | mov edx, DWORD PTR 36[esp] | ||
154 | xor eax, edi | ||
155 | add esi, eax | ||
156 | mov eax, edi | ||
157 | rol ebx, 10 | ||
158 | add esi, edx | ||
159 | xor eax, ebx | ||
160 | rol esi, 13 | ||
161 | add esi, ecx | ||
162 | ; 10 | ||
163 | mov edx, DWORD PTR 40[esp] | ||
164 | xor eax, esi | ||
165 | add ecx, edx | ||
166 | rol edi, 10 | ||
167 | add ecx, eax | ||
168 | mov eax, esi | ||
169 | rol ecx, 14 | ||
170 | add ecx, ebp | ||
171 | ; 11 | ||
172 | xor eax, edi | ||
173 | mov edx, DWORD PTR 44[esp] | ||
174 | xor eax, ecx | ||
175 | add ebp, eax | ||
176 | mov eax, ecx | ||
177 | rol esi, 10 | ||
178 | add ebp, edx | ||
179 | xor eax, esi | ||
180 | rol ebp, 15 | ||
181 | add ebp, ebx | ||
182 | ; 12 | ||
183 | mov edx, DWORD PTR 48[esp] | ||
184 | xor eax, ebp | ||
185 | add ebx, edx | ||
186 | rol ecx, 10 | ||
187 | add ebx, eax | ||
188 | mov eax, ebp | ||
189 | rol ebx, 6 | ||
190 | add ebx, edi | ||
191 | ; 13 | ||
192 | xor eax, ecx | ||
193 | mov edx, DWORD PTR 52[esp] | ||
194 | xor eax, ebx | ||
195 | add edi, eax | ||
196 | mov eax, ebx | ||
197 | rol ebp, 10 | ||
198 | add edi, edx | ||
199 | xor eax, ebp | ||
200 | rol edi, 7 | ||
201 | add edi, esi | ||
202 | ; 14 | ||
203 | mov edx, DWORD PTR 56[esp] | ||
204 | xor eax, edi | ||
205 | add esi, edx | ||
206 | rol ebx, 10 | ||
207 | add esi, eax | ||
208 | mov eax, edi | ||
209 | rol esi, 9 | ||
210 | add esi, ecx | ||
211 | ; 15 | ||
212 | xor eax, ebx | ||
213 | mov edx, DWORD PTR 60[esp] | ||
214 | xor eax, esi | ||
215 | add ecx, eax | ||
216 | mov eax, -1 | ||
217 | rol edi, 10 | ||
218 | add ecx, edx | ||
219 | mov edx, DWORD PTR 28[esp] | ||
220 | rol ecx, 8 | ||
221 | add ecx, ebp | ||
222 | ; 16 | ||
223 | add ebp, edx | ||
224 | mov edx, esi | ||
225 | sub eax, ecx | ||
226 | and edx, ecx | ||
227 | and eax, edi | ||
228 | or edx, eax | ||
229 | mov eax, DWORD PTR 16[esp] | ||
230 | rol esi, 10 | ||
231 | lea ebp, DWORD PTR 1518500249[edx*1+ebp] | ||
232 | mov edx, -1 | ||
233 | rol ebp, 7 | ||
234 | add ebp, ebx | ||
235 | ; 17 | ||
236 | add ebx, eax | ||
237 | mov eax, ecx | ||
238 | sub edx, ebp | ||
239 | and eax, ebp | ||
240 | and edx, esi | ||
241 | or eax, edx | ||
242 | mov edx, DWORD PTR 52[esp] | ||
243 | rol ecx, 10 | ||
244 | lea ebx, DWORD PTR 1518500249[eax*1+ebx] | ||
245 | mov eax, -1 | ||
246 | rol ebx, 6 | ||
247 | add ebx, edi | ||
248 | ; 18 | ||
249 | add edi, edx | ||
250 | mov edx, ebp | ||
251 | sub eax, ebx | ||
252 | and edx, ebx | ||
253 | and eax, ecx | ||
254 | or edx, eax | ||
255 | mov eax, DWORD PTR 4[esp] | ||
256 | rol ebp, 10 | ||
257 | lea edi, DWORD PTR 1518500249[edx*1+edi] | ||
258 | mov edx, -1 | ||
259 | rol edi, 8 | ||
260 | add edi, esi | ||
261 | ; 19 | ||
262 | add esi, eax | ||
263 | mov eax, ebx | ||
264 | sub edx, edi | ||
265 | and eax, edi | ||
266 | and edx, ebp | ||
267 | or eax, edx | ||
268 | mov edx, DWORD PTR 40[esp] | ||
269 | rol ebx, 10 | ||
270 | lea esi, DWORD PTR 1518500249[eax*1+esi] | ||
271 | mov eax, -1 | ||
272 | rol esi, 13 | ||
273 | add esi, ecx | ||
274 | ; 20 | ||
275 | add ecx, edx | ||
276 | mov edx, edi | ||
277 | sub eax, esi | ||
278 | and edx, esi | ||
279 | and eax, ebx | ||
280 | or edx, eax | ||
281 | mov eax, DWORD PTR 24[esp] | ||
282 | rol edi, 10 | ||
283 | lea ecx, DWORD PTR 1518500249[edx*1+ecx] | ||
284 | mov edx, -1 | ||
285 | rol ecx, 11 | ||
286 | add ecx, ebp | ||
287 | ; 21 | ||
288 | add ebp, eax | ||
289 | mov eax, esi | ||
290 | sub edx, ecx | ||
291 | and eax, ecx | ||
292 | and edx, edi | ||
293 | or eax, edx | ||
294 | mov edx, DWORD PTR 60[esp] | ||
295 | rol esi, 10 | ||
296 | lea ebp, DWORD PTR 1518500249[eax*1+ebp] | ||
297 | mov eax, -1 | ||
298 | rol ebp, 9 | ||
299 | add ebp, ebx | ||
300 | ; 22 | ||
301 | add ebx, edx | ||
302 | mov edx, ecx | ||
303 | sub eax, ebp | ||
304 | and edx, ebp | ||
305 | and eax, esi | ||
306 | or edx, eax | ||
307 | mov eax, DWORD PTR 12[esp] | ||
308 | rol ecx, 10 | ||
309 | lea ebx, DWORD PTR 1518500249[edx*1+ebx] | ||
310 | mov edx, -1 | ||
311 | rol ebx, 7 | ||
312 | add ebx, edi | ||
313 | ; 23 | ||
314 | add edi, eax | ||
315 | mov eax, ebp | ||
316 | sub edx, ebx | ||
317 | and eax, ebx | ||
318 | and edx, ecx | ||
319 | or eax, edx | ||
320 | mov edx, DWORD PTR 48[esp] | ||
321 | rol ebp, 10 | ||
322 | lea edi, DWORD PTR 1518500249[eax*1+edi] | ||
323 | mov eax, -1 | ||
324 | rol edi, 15 | ||
325 | add edi, esi | ||
326 | ; 24 | ||
327 | add esi, edx | ||
328 | mov edx, ebx | ||
329 | sub eax, edi | ||
330 | and edx, edi | ||
331 | and eax, ebp | ||
332 | or edx, eax | ||
333 | mov eax, DWORD PTR [esp] | ||
334 | rol ebx, 10 | ||
335 | lea esi, DWORD PTR 1518500249[edx*1+esi] | ||
336 | mov edx, -1 | ||
337 | rol esi, 7 | ||
338 | add esi, ecx | ||
339 | ; 25 | ||
340 | add ecx, eax | ||
341 | mov eax, edi | ||
342 | sub edx, esi | ||
343 | and eax, esi | ||
344 | and edx, ebx | ||
345 | or eax, edx | ||
346 | mov edx, DWORD PTR 36[esp] | ||
347 | rol edi, 10 | ||
348 | lea ecx, DWORD PTR 1518500249[eax*1+ecx] | ||
349 | mov eax, -1 | ||
350 | rol ecx, 12 | ||
351 | add ecx, ebp | ||
352 | ; 26 | ||
353 | add ebp, edx | ||
354 | mov edx, esi | ||
355 | sub eax, ecx | ||
356 | and edx, ecx | ||
357 | and eax, edi | ||
358 | or edx, eax | ||
359 | mov eax, DWORD PTR 20[esp] | ||
360 | rol esi, 10 | ||
361 | lea ebp, DWORD PTR 1518500249[edx*1+ebp] | ||
362 | mov edx, -1 | ||
363 | rol ebp, 15 | ||
364 | add ebp, ebx | ||
365 | ; 27 | ||
366 | add ebx, eax | ||
367 | mov eax, ecx | ||
368 | sub edx, ebp | ||
369 | and eax, ebp | ||
370 | and edx, esi | ||
371 | or eax, edx | ||
372 | mov edx, DWORD PTR 8[esp] | ||
373 | rol ecx, 10 | ||
374 | lea ebx, DWORD PTR 1518500249[eax*1+ebx] | ||
375 | mov eax, -1 | ||
376 | rol ebx, 9 | ||
377 | add ebx, edi | ||
378 | ; 28 | ||
379 | add edi, edx | ||
380 | mov edx, ebp | ||
381 | sub eax, ebx | ||
382 | and edx, ebx | ||
383 | and eax, ecx | ||
384 | or edx, eax | ||
385 | mov eax, DWORD PTR 56[esp] | ||
386 | rol ebp, 10 | ||
387 | lea edi, DWORD PTR 1518500249[edx*1+edi] | ||
388 | mov edx, -1 | ||
389 | rol edi, 11 | ||
390 | add edi, esi | ||
391 | ; 29 | ||
392 | add esi, eax | ||
393 | mov eax, ebx | ||
394 | sub edx, edi | ||
395 | and eax, edi | ||
396 | and edx, ebp | ||
397 | or eax, edx | ||
398 | mov edx, DWORD PTR 44[esp] | ||
399 | rol ebx, 10 | ||
400 | lea esi, DWORD PTR 1518500249[eax*1+esi] | ||
401 | mov eax, -1 | ||
402 | rol esi, 7 | ||
403 | add esi, ecx | ||
404 | ; 30 | ||
405 | add ecx, edx | ||
406 | mov edx, edi | ||
407 | sub eax, esi | ||
408 | and edx, esi | ||
409 | and eax, ebx | ||
410 | or edx, eax | ||
411 | mov eax, DWORD PTR 32[esp] | ||
412 | rol edi, 10 | ||
413 | lea ecx, DWORD PTR 1518500249[edx*1+ecx] | ||
414 | mov edx, -1 | ||
415 | rol ecx, 13 | ||
416 | add ecx, ebp | ||
417 | ; 31 | ||
418 | add ebp, eax | ||
419 | mov eax, esi | ||
420 | sub edx, ecx | ||
421 | and eax, ecx | ||
422 | and edx, edi | ||
423 | or eax, edx | ||
424 | mov edx, -1 | ||
425 | rol esi, 10 | ||
426 | lea ebp, DWORD PTR 1518500249[eax*1+ebp] | ||
427 | sub edx, ecx | ||
428 | rol ebp, 12 | ||
429 | add ebp, ebx | ||
430 | ; 32 | ||
431 | mov eax, DWORD PTR 12[esp] | ||
432 | or edx, ebp | ||
433 | add ebx, eax | ||
434 | xor edx, esi | ||
435 | mov eax, -1 | ||
436 | rol ecx, 10 | ||
437 | lea ebx, DWORD PTR 1859775393[edx*1+ebx] | ||
438 | sub eax, ebp | ||
439 | rol ebx, 11 | ||
440 | add ebx, edi | ||
441 | ; 33 | ||
442 | mov edx, DWORD PTR 40[esp] | ||
443 | or eax, ebx | ||
444 | add edi, edx | ||
445 | xor eax, ecx | ||
446 | mov edx, -1 | ||
447 | rol ebp, 10 | ||
448 | lea edi, DWORD PTR 1859775393[eax*1+edi] | ||
449 | sub edx, ebx | ||
450 | rol edi, 13 | ||
451 | add edi, esi | ||
452 | ; 34 | ||
453 | mov eax, DWORD PTR 56[esp] | ||
454 | or edx, edi | ||
455 | add esi, eax | ||
456 | xor edx, ebp | ||
457 | mov eax, -1 | ||
458 | rol ebx, 10 | ||
459 | lea esi, DWORD PTR 1859775393[edx*1+esi] | ||
460 | sub eax, edi | ||
461 | rol esi, 6 | ||
462 | add esi, ecx | ||
463 | ; 35 | ||
464 | mov edx, DWORD PTR 16[esp] | ||
465 | or eax, esi | ||
466 | add ecx, edx | ||
467 | xor eax, ebx | ||
468 | mov edx, -1 | ||
469 | rol edi, 10 | ||
470 | lea ecx, DWORD PTR 1859775393[eax*1+ecx] | ||
471 | sub edx, esi | ||
472 | rol ecx, 7 | ||
473 | add ecx, ebp | ||
474 | ; 36 | ||
475 | mov eax, DWORD PTR 36[esp] | ||
476 | or edx, ecx | ||
477 | add ebp, eax | ||
478 | xor edx, edi | ||
479 | mov eax, -1 | ||
480 | rol esi, 10 | ||
481 | lea ebp, DWORD PTR 1859775393[edx*1+ebp] | ||
482 | sub eax, ecx | ||
483 | rol ebp, 14 | ||
484 | add ebp, ebx | ||
485 | ; 37 | ||
486 | mov edx, DWORD PTR 60[esp] | ||
487 | or eax, ebp | ||
488 | add ebx, edx | ||
489 | xor eax, esi | ||
490 | mov edx, -1 | ||
491 | rol ecx, 10 | ||
492 | lea ebx, DWORD PTR 1859775393[eax*1+ebx] | ||
493 | sub edx, ebp | ||
494 | rol ebx, 9 | ||
495 | add ebx, edi | ||
496 | ; 38 | ||
497 | mov eax, DWORD PTR 32[esp] | ||
498 | or edx, ebx | ||
499 | add edi, eax | ||
500 | xor edx, ecx | ||
501 | mov eax, -1 | ||
502 | rol ebp, 10 | ||
503 | lea edi, DWORD PTR 1859775393[edx*1+edi] | ||
504 | sub eax, ebx | ||
505 | rol edi, 13 | ||
506 | add edi, esi | ||
507 | ; 39 | ||
508 | mov edx, DWORD PTR 4[esp] | ||
509 | or eax, edi | ||
510 | add esi, edx | ||
511 | xor eax, ebp | ||
512 | mov edx, -1 | ||
513 | rol ebx, 10 | ||
514 | lea esi, DWORD PTR 1859775393[eax*1+esi] | ||
515 | sub edx, edi | ||
516 | rol esi, 15 | ||
517 | add esi, ecx | ||
518 | ; 40 | ||
519 | mov eax, DWORD PTR 8[esp] | ||
520 | or edx, esi | ||
521 | add ecx, eax | ||
522 | xor edx, ebx | ||
523 | mov eax, -1 | ||
524 | rol edi, 10 | ||
525 | lea ecx, DWORD PTR 1859775393[edx*1+ecx] | ||
526 | sub eax, esi | ||
527 | rol ecx, 14 | ||
528 | add ecx, ebp | ||
529 | ; 41 | ||
530 | mov edx, DWORD PTR 28[esp] | ||
531 | or eax, ecx | ||
532 | add ebp, edx | ||
533 | xor eax, edi | ||
534 | mov edx, -1 | ||
535 | rol esi, 10 | ||
536 | lea ebp, DWORD PTR 1859775393[eax*1+ebp] | ||
537 | sub edx, ecx | ||
538 | rol ebp, 8 | ||
539 | add ebp, ebx | ||
540 | ; 42 | ||
541 | mov eax, DWORD PTR [esp] | ||
542 | or edx, ebp | ||
543 | add ebx, eax | ||
544 | xor edx, esi | ||
545 | mov eax, -1 | ||
546 | rol ecx, 10 | ||
547 | lea ebx, DWORD PTR 1859775393[edx*1+ebx] | ||
548 | sub eax, ebp | ||
549 | rol ebx, 13 | ||
550 | add ebx, edi | ||
551 | ; 43 | ||
552 | mov edx, DWORD PTR 24[esp] | ||
553 | or eax, ebx | ||
554 | add edi, edx | ||
555 | xor eax, ecx | ||
556 | mov edx, -1 | ||
557 | rol ebp, 10 | ||
558 | lea edi, DWORD PTR 1859775393[eax*1+edi] | ||
559 | sub edx, ebx | ||
560 | rol edi, 6 | ||
561 | add edi, esi | ||
562 | ; 44 | ||
563 | mov eax, DWORD PTR 52[esp] | ||
564 | or edx, edi | ||
565 | add esi, eax | ||
566 | xor edx, ebp | ||
567 | mov eax, -1 | ||
568 | rol ebx, 10 | ||
569 | lea esi, DWORD PTR 1859775393[edx*1+esi] | ||
570 | sub eax, edi | ||
571 | rol esi, 5 | ||
572 | add esi, ecx | ||
573 | ; 45 | ||
574 | mov edx, DWORD PTR 44[esp] | ||
575 | or eax, esi | ||
576 | add ecx, edx | ||
577 | xor eax, ebx | ||
578 | mov edx, -1 | ||
579 | rol edi, 10 | ||
580 | lea ecx, DWORD PTR 1859775393[eax*1+ecx] | ||
581 | sub edx, esi | ||
582 | rol ecx, 12 | ||
583 | add ecx, ebp | ||
584 | ; 46 | ||
585 | mov eax, DWORD PTR 20[esp] | ||
586 | or edx, ecx | ||
587 | add ebp, eax | ||
588 | xor edx, edi | ||
589 | mov eax, -1 | ||
590 | rol esi, 10 | ||
591 | lea ebp, DWORD PTR 1859775393[edx*1+ebp] | ||
592 | sub eax, ecx | ||
593 | rol ebp, 7 | ||
594 | add ebp, ebx | ||
595 | ; 47 | ||
596 | mov edx, DWORD PTR 48[esp] | ||
597 | or eax, ebp | ||
598 | add ebx, edx | ||
599 | xor eax, esi | ||
600 | mov edx, -1 | ||
601 | rol ecx, 10 | ||
602 | lea ebx, DWORD PTR 1859775393[eax*1+ebx] | ||
603 | mov eax, ecx | ||
604 | rol ebx, 5 | ||
605 | add ebx, edi | ||
606 | ; 48 | ||
607 | sub edx, ecx | ||
608 | and eax, ebx | ||
609 | and edx, ebp | ||
610 | or edx, eax | ||
611 | mov eax, DWORD PTR 4[esp] | ||
612 | rol ebp, 10 | ||
613 | lea edi, DWORD PTR 2400959708[edx+edi] | ||
614 | mov edx, -1 | ||
615 | add edi, eax | ||
616 | mov eax, ebp | ||
617 | rol edi, 11 | ||
618 | add edi, esi | ||
619 | ; 49 | ||
620 | sub edx, ebp | ||
621 | and eax, edi | ||
622 | and edx, ebx | ||
623 | or edx, eax | ||
624 | mov eax, DWORD PTR 36[esp] | ||
625 | rol ebx, 10 | ||
626 | lea esi, DWORD PTR 2400959708[edx+esi] | ||
627 | mov edx, -1 | ||
628 | add esi, eax | ||
629 | mov eax, ebx | ||
630 | rol esi, 12 | ||
631 | add esi, ecx | ||
632 | ; 50 | ||
633 | sub edx, ebx | ||
634 | and eax, esi | ||
635 | and edx, edi | ||
636 | or edx, eax | ||
637 | mov eax, DWORD PTR 44[esp] | ||
638 | rol edi, 10 | ||
639 | lea ecx, DWORD PTR 2400959708[edx+ecx] | ||
640 | mov edx, -1 | ||
641 | add ecx, eax | ||
642 | mov eax, edi | ||
643 | rol ecx, 14 | ||
644 | add ecx, ebp | ||
645 | ; 51 | ||
646 | sub edx, edi | ||
647 | and eax, ecx | ||
648 | and edx, esi | ||
649 | or edx, eax | ||
650 | mov eax, DWORD PTR 40[esp] | ||
651 | rol esi, 10 | ||
652 | lea ebp, DWORD PTR 2400959708[edx+ebp] | ||
653 | mov edx, -1 | ||
654 | add ebp, eax | ||
655 | mov eax, esi | ||
656 | rol ebp, 15 | ||
657 | add ebp, ebx | ||
658 | ; 52 | ||
659 | sub edx, esi | ||
660 | and eax, ebp | ||
661 | and edx, ecx | ||
662 | or edx, eax | ||
663 | mov eax, DWORD PTR [esp] | ||
664 | rol ecx, 10 | ||
665 | lea ebx, DWORD PTR 2400959708[edx+ebx] | ||
666 | mov edx, -1 | ||
667 | add ebx, eax | ||
668 | mov eax, ecx | ||
669 | rol ebx, 14 | ||
670 | add ebx, edi | ||
671 | ; 53 | ||
672 | sub edx, ecx | ||
673 | and eax, ebx | ||
674 | and edx, ebp | ||
675 | or edx, eax | ||
676 | mov eax, DWORD PTR 32[esp] | ||
677 | rol ebp, 10 | ||
678 | lea edi, DWORD PTR 2400959708[edx+edi] | ||
679 | mov edx, -1 | ||
680 | add edi, eax | ||
681 | mov eax, ebp | ||
682 | rol edi, 15 | ||
683 | add edi, esi | ||
684 | ; 54 | ||
685 | sub edx, ebp | ||
686 | and eax, edi | ||
687 | and edx, ebx | ||
688 | or edx, eax | ||
689 | mov eax, DWORD PTR 48[esp] | ||
690 | rol ebx, 10 | ||
691 | lea esi, DWORD PTR 2400959708[edx+esi] | ||
692 | mov edx, -1 | ||
693 | add esi, eax | ||
694 | mov eax, ebx | ||
695 | rol esi, 9 | ||
696 | add esi, ecx | ||
697 | ; 55 | ||
698 | sub edx, ebx | ||
699 | and eax, esi | ||
700 | and edx, edi | ||
701 | or edx, eax | ||
702 | mov eax, DWORD PTR 16[esp] | ||
703 | rol edi, 10 | ||
704 | lea ecx, DWORD PTR 2400959708[edx+ecx] | ||
705 | mov edx, -1 | ||
706 | add ecx, eax | ||
707 | mov eax, edi | ||
708 | rol ecx, 8 | ||
709 | add ecx, ebp | ||
710 | ; 56 | ||
711 | sub edx, edi | ||
712 | and eax, ecx | ||
713 | and edx, esi | ||
714 | or edx, eax | ||
715 | mov eax, DWORD PTR 52[esp] | ||
716 | rol esi, 10 | ||
717 | lea ebp, DWORD PTR 2400959708[edx+ebp] | ||
718 | mov edx, -1 | ||
719 | add ebp, eax | ||
720 | mov eax, esi | ||
721 | rol ebp, 9 | ||
722 | add ebp, ebx | ||
723 | ; 57 | ||
724 | sub edx, esi | ||
725 | and eax, ebp | ||
726 | and edx, ecx | ||
727 | or edx, eax | ||
728 | mov eax, DWORD PTR 12[esp] | ||
729 | rol ecx, 10 | ||
730 | lea ebx, DWORD PTR 2400959708[edx+ebx] | ||
731 | mov edx, -1 | ||
732 | add ebx, eax | ||
733 | mov eax, ecx | ||
734 | rol ebx, 14 | ||
735 | add ebx, edi | ||
736 | ; 58 | ||
737 | sub edx, ecx | ||
738 | and eax, ebx | ||
739 | and edx, ebp | ||
740 | or edx, eax | ||
741 | mov eax, DWORD PTR 28[esp] | ||
742 | rol ebp, 10 | ||
743 | lea edi, DWORD PTR 2400959708[edx+edi] | ||
744 | mov edx, -1 | ||
745 | add edi, eax | ||
746 | mov eax, ebp | ||
747 | rol edi, 5 | ||
748 | add edi, esi | ||
749 | ; 59 | ||
750 | sub edx, ebp | ||
751 | and eax, edi | ||
752 | and edx, ebx | ||
753 | or edx, eax | ||
754 | mov eax, DWORD PTR 60[esp] | ||
755 | rol ebx, 10 | ||
756 | lea esi, DWORD PTR 2400959708[edx+esi] | ||
757 | mov edx, -1 | ||
758 | add esi, eax | ||
759 | mov eax, ebx | ||
760 | rol esi, 6 | ||
761 | add esi, ecx | ||
762 | ; 60 | ||
763 | sub edx, ebx | ||
764 | and eax, esi | ||
765 | and edx, edi | ||
766 | or edx, eax | ||
767 | mov eax, DWORD PTR 56[esp] | ||
768 | rol edi, 10 | ||
769 | lea ecx, DWORD PTR 2400959708[edx+ecx] | ||
770 | mov edx, -1 | ||
771 | add ecx, eax | ||
772 | mov eax, edi | ||
773 | rol ecx, 8 | ||
774 | add ecx, ebp | ||
775 | ; 61 | ||
776 | sub edx, edi | ||
777 | and eax, ecx | ||
778 | and edx, esi | ||
779 | or edx, eax | ||
780 | mov eax, DWORD PTR 20[esp] | ||
781 | rol esi, 10 | ||
782 | lea ebp, DWORD PTR 2400959708[edx+ebp] | ||
783 | mov edx, -1 | ||
784 | add ebp, eax | ||
785 | mov eax, esi | ||
786 | rol ebp, 6 | ||
787 | add ebp, ebx | ||
788 | ; 62 | ||
789 | sub edx, esi | ||
790 | and eax, ebp | ||
791 | and edx, ecx | ||
792 | or edx, eax | ||
793 | mov eax, DWORD PTR 24[esp] | ||
794 | rol ecx, 10 | ||
795 | lea ebx, DWORD PTR 2400959708[edx+ebx] | ||
796 | mov edx, -1 | ||
797 | add ebx, eax | ||
798 | mov eax, ecx | ||
799 | rol ebx, 5 | ||
800 | add ebx, edi | ||
801 | ; 63 | ||
802 | sub edx, ecx | ||
803 | and eax, ebx | ||
804 | and edx, ebp | ||
805 | or edx, eax | ||
806 | mov eax, DWORD PTR 8[esp] | ||
807 | rol ebp, 10 | ||
808 | lea edi, DWORD PTR 2400959708[edx+edi] | ||
809 | mov edx, -1 | ||
810 | add edi, eax | ||
811 | sub edx, ebp | ||
812 | rol edi, 12 | ||
813 | add edi, esi | ||
814 | ; 64 | ||
815 | mov eax, DWORD PTR 16[esp] | ||
816 | or edx, ebx | ||
817 | add esi, eax | ||
818 | xor edx, edi | ||
819 | mov eax, -1 | ||
820 | rol ebx, 10 | ||
821 | lea esi, DWORD PTR 2840853838[edx*1+esi] | ||
822 | sub eax, ebx | ||
823 | rol esi, 9 | ||
824 | add esi, ecx | ||
825 | ; 65 | ||
826 | mov edx, DWORD PTR [esp] | ||
827 | or eax, edi | ||
828 | add ecx, edx | ||
829 | xor eax, esi | ||
830 | mov edx, -1 | ||
831 | rol edi, 10 | ||
832 | lea ecx, DWORD PTR 2840853838[eax*1+ecx] | ||
833 | sub edx, edi | ||
834 | rol ecx, 15 | ||
835 | add ecx, ebp | ||
836 | ; 66 | ||
837 | mov eax, DWORD PTR 20[esp] | ||
838 | or edx, esi | ||
839 | add ebp, eax | ||
840 | xor edx, ecx | ||
841 | mov eax, -1 | ||
842 | rol esi, 10 | ||
843 | lea ebp, DWORD PTR 2840853838[edx*1+ebp] | ||
844 | sub eax, esi | ||
845 | rol ebp, 5 | ||
846 | add ebp, ebx | ||
847 | ; 67 | ||
848 | mov edx, DWORD PTR 36[esp] | ||
849 | or eax, ecx | ||
850 | add ebx, edx | ||
851 | xor eax, ebp | ||
852 | mov edx, -1 | ||
853 | rol ecx, 10 | ||
854 | lea ebx, DWORD PTR 2840853838[eax*1+ebx] | ||
855 | sub edx, ecx | ||
856 | rol ebx, 11 | ||
857 | add ebx, edi | ||
858 | ; 68 | ||
859 | mov eax, DWORD PTR 28[esp] | ||
860 | or edx, ebp | ||
861 | add edi, eax | ||
862 | xor edx, ebx | ||
863 | mov eax, -1 | ||
864 | rol ebp, 10 | ||
865 | lea edi, DWORD PTR 2840853838[edx*1+edi] | ||
866 | sub eax, ebp | ||
867 | rol edi, 6 | ||
868 | add edi, esi | ||
869 | ; 69 | ||
870 | mov edx, DWORD PTR 48[esp] | ||
871 | or eax, ebx | ||
872 | add esi, edx | ||
873 | xor eax, edi | ||
874 | mov edx, -1 | ||
875 | rol ebx, 10 | ||
876 | lea esi, DWORD PTR 2840853838[eax*1+esi] | ||
877 | sub edx, ebx | ||
878 | rol esi, 8 | ||
879 | add esi, ecx | ||
880 | ; 70 | ||
881 | mov eax, DWORD PTR 8[esp] | ||
882 | or edx, edi | ||
883 | add ecx, eax | ||
884 | xor edx, esi | ||
885 | mov eax, -1 | ||
886 | rol edi, 10 | ||
887 | lea ecx, DWORD PTR 2840853838[edx*1+ecx] | ||
888 | sub eax, edi | ||
889 | rol ecx, 13 | ||
890 | add ecx, ebp | ||
891 | ; 71 | ||
892 | mov edx, DWORD PTR 40[esp] | ||
893 | or eax, esi | ||
894 | add ebp, edx | ||
895 | xor eax, ecx | ||
896 | mov edx, -1 | ||
897 | rol esi, 10 | ||
898 | lea ebp, DWORD PTR 2840853838[eax*1+ebp] | ||
899 | sub edx, esi | ||
900 | rol ebp, 12 | ||
901 | add ebp, ebx | ||
902 | ; 72 | ||
903 | mov eax, DWORD PTR 56[esp] | ||
904 | or edx, ecx | ||
905 | add ebx, eax | ||
906 | xor edx, ebp | ||
907 | mov eax, -1 | ||
908 | rol ecx, 10 | ||
909 | lea ebx, DWORD PTR 2840853838[edx*1+ebx] | ||
910 | sub eax, ecx | ||
911 | rol ebx, 5 | ||
912 | add ebx, edi | ||
913 | ; 73 | ||
914 | mov edx, DWORD PTR 4[esp] | ||
915 | or eax, ebp | ||
916 | add edi, edx | ||
917 | xor eax, ebx | ||
918 | mov edx, -1 | ||
919 | rol ebp, 10 | ||
920 | lea edi, DWORD PTR 2840853838[eax*1+edi] | ||
921 | sub edx, ebp | ||
922 | rol edi, 12 | ||
923 | add edi, esi | ||
924 | ; 74 | ||
925 | mov eax, DWORD PTR 12[esp] | ||
926 | or edx, ebx | ||
927 | add esi, eax | ||
928 | xor edx, edi | ||
929 | mov eax, -1 | ||
930 | rol ebx, 10 | ||
931 | lea esi, DWORD PTR 2840853838[edx*1+esi] | ||
932 | sub eax, ebx | ||
933 | rol esi, 13 | ||
934 | add esi, ecx | ||
935 | ; 75 | ||
936 | mov edx, DWORD PTR 32[esp] | ||
937 | or eax, edi | ||
938 | add ecx, edx | ||
939 | xor eax, esi | ||
940 | mov edx, -1 | ||
941 | rol edi, 10 | ||
942 | lea ecx, DWORD PTR 2840853838[eax*1+ecx] | ||
943 | sub edx, edi | ||
944 | rol ecx, 14 | ||
945 | add ecx, ebp | ||
946 | ; 76 | ||
947 | mov eax, DWORD PTR 44[esp] | ||
948 | or edx, esi | ||
949 | add ebp, eax | ||
950 | xor edx, ecx | ||
951 | mov eax, -1 | ||
952 | rol esi, 10 | ||
953 | lea ebp, DWORD PTR 2840853838[edx*1+ebp] | ||
954 | sub eax, esi | ||
955 | rol ebp, 11 | ||
956 | add ebp, ebx | ||
957 | ; 77 | ||
958 | mov edx, DWORD PTR 24[esp] | ||
959 | or eax, ecx | ||
960 | add ebx, edx | ||
961 | xor eax, ebp | ||
962 | mov edx, -1 | ||
963 | rol ecx, 10 | ||
964 | lea ebx, DWORD PTR 2840853838[eax*1+ebx] | ||
965 | sub edx, ecx | ||
966 | rol ebx, 8 | ||
967 | add ebx, edi | ||
968 | ; 78 | ||
969 | mov eax, DWORD PTR 60[esp] | ||
970 | or edx, ebp | ||
971 | add edi, eax | ||
972 | xor edx, ebx | ||
973 | mov eax, -1 | ||
974 | rol ebp, 10 | ||
975 | lea edi, DWORD PTR 2840853838[edx*1+edi] | ||
976 | sub eax, ebp | ||
977 | rol edi, 5 | ||
978 | add edi, esi | ||
979 | ; 79 | ||
980 | mov edx, DWORD PTR 52[esp] | ||
981 | or eax, ebx | ||
982 | add esi, edx | ||
983 | xor eax, edi | ||
984 | mov edx, DWORD PTR 128[esp] | ||
985 | rol ebx, 10 | ||
986 | lea esi, DWORD PTR 2840853838[eax*1+esi] | ||
987 | mov DWORD PTR 64[esp],ecx | ||
988 | rol esi, 6 | ||
989 | add esi, ecx | ||
990 | mov ecx, DWORD PTR [edx] | ||
991 | mov DWORD PTR 68[esp],esi | ||
992 | mov DWORD PTR 72[esp],edi | ||
993 | mov esi, DWORD PTR 4[edx] | ||
994 | mov DWORD PTR 76[esp],ebx | ||
995 | mov edi, DWORD PTR 8[edx] | ||
996 | mov DWORD PTR 80[esp],ebp | ||
997 | mov ebx, DWORD PTR 12[edx] | ||
998 | mov ebp, DWORD PTR 16[edx] | ||
999 | ; 80 | ||
1000 | mov edx, -1 | ||
1001 | sub edx, ebx | ||
1002 | mov eax, DWORD PTR 20[esp] | ||
1003 | or edx, edi | ||
1004 | add ecx, eax | ||
1005 | xor edx, esi | ||
1006 | mov eax, -1 | ||
1007 | rol edi, 10 | ||
1008 | lea ecx, DWORD PTR 1352829926[edx*1+ecx] | ||
1009 | sub eax, edi | ||
1010 | rol ecx, 8 | ||
1011 | add ecx, ebp | ||
1012 | ; 81 | ||
1013 | mov edx, DWORD PTR 56[esp] | ||
1014 | or eax, esi | ||
1015 | add ebp, edx | ||
1016 | xor eax, ecx | ||
1017 | mov edx, -1 | ||
1018 | rol esi, 10 | ||
1019 | lea ebp, DWORD PTR 1352829926[eax*1+ebp] | ||
1020 | sub edx, esi | ||
1021 | rol ebp, 9 | ||
1022 | add ebp, ebx | ||
1023 | ; 82 | ||
1024 | mov eax, DWORD PTR 28[esp] | ||
1025 | or edx, ecx | ||
1026 | add ebx, eax | ||
1027 | xor edx, ebp | ||
1028 | mov eax, -1 | ||
1029 | rol ecx, 10 | ||
1030 | lea ebx, DWORD PTR 1352829926[edx*1+ebx] | ||
1031 | sub eax, ecx | ||
1032 | rol ebx, 9 | ||
1033 | add ebx, edi | ||
1034 | ; 83 | ||
1035 | mov edx, DWORD PTR [esp] | ||
1036 | or eax, ebp | ||
1037 | add edi, edx | ||
1038 | xor eax, ebx | ||
1039 | mov edx, -1 | ||
1040 | rol ebp, 10 | ||
1041 | lea edi, DWORD PTR 1352829926[eax*1+edi] | ||
1042 | sub edx, ebp | ||
1043 | rol edi, 11 | ||
1044 | add edi, esi | ||
1045 | ; 84 | ||
1046 | mov eax, DWORD PTR 36[esp] | ||
1047 | or edx, ebx | ||
1048 | add esi, eax | ||
1049 | xor edx, edi | ||
1050 | mov eax, -1 | ||
1051 | rol ebx, 10 | ||
1052 | lea esi, DWORD PTR 1352829926[edx*1+esi] | ||
1053 | sub eax, ebx | ||
1054 | rol esi, 13 | ||
1055 | add esi, ecx | ||
1056 | ; 85 | ||
1057 | mov edx, DWORD PTR 8[esp] | ||
1058 | or eax, edi | ||
1059 | add ecx, edx | ||
1060 | xor eax, esi | ||
1061 | mov edx, -1 | ||
1062 | rol edi, 10 | ||
1063 | lea ecx, DWORD PTR 1352829926[eax*1+ecx] | ||
1064 | sub edx, edi | ||
1065 | rol ecx, 15 | ||
1066 | add ecx, ebp | ||
1067 | ; 86 | ||
1068 | mov eax, DWORD PTR 44[esp] | ||
1069 | or edx, esi | ||
1070 | add ebp, eax | ||
1071 | xor edx, ecx | ||
1072 | mov eax, -1 | ||
1073 | rol esi, 10 | ||
1074 | lea ebp, DWORD PTR 1352829926[edx*1+ebp] | ||
1075 | sub eax, esi | ||
1076 | rol ebp, 15 | ||
1077 | add ebp, ebx | ||
1078 | ; 87 | ||
1079 | mov edx, DWORD PTR 16[esp] | ||
1080 | or eax, ecx | ||
1081 | add ebx, edx | ||
1082 | xor eax, ebp | ||
1083 | mov edx, -1 | ||
1084 | rol ecx, 10 | ||
1085 | lea ebx, DWORD PTR 1352829926[eax*1+ebx] | ||
1086 | sub edx, ecx | ||
1087 | rol ebx, 5 | ||
1088 | add ebx, edi | ||
1089 | ; 88 | ||
1090 | mov eax, DWORD PTR 52[esp] | ||
1091 | or edx, ebp | ||
1092 | add edi, eax | ||
1093 | xor edx, ebx | ||
1094 | mov eax, -1 | ||
1095 | rol ebp, 10 | ||
1096 | lea edi, DWORD PTR 1352829926[edx*1+edi] | ||
1097 | sub eax, ebp | ||
1098 | rol edi, 7 | ||
1099 | add edi, esi | ||
1100 | ; 89 | ||
1101 | mov edx, DWORD PTR 24[esp] | ||
1102 | or eax, ebx | ||
1103 | add esi, edx | ||
1104 | xor eax, edi | ||
1105 | mov edx, -1 | ||
1106 | rol ebx, 10 | ||
1107 | lea esi, DWORD PTR 1352829926[eax*1+esi] | ||
1108 | sub edx, ebx | ||
1109 | rol esi, 7 | ||
1110 | add esi, ecx | ||
1111 | ; 90 | ||
1112 | mov eax, DWORD PTR 60[esp] | ||
1113 | or edx, edi | ||
1114 | add ecx, eax | ||
1115 | xor edx, esi | ||
1116 | mov eax, -1 | ||
1117 | rol edi, 10 | ||
1118 | lea ecx, DWORD PTR 1352829926[edx*1+ecx] | ||
1119 | sub eax, edi | ||
1120 | rol ecx, 8 | ||
1121 | add ecx, ebp | ||
1122 | ; 91 | ||
1123 | mov edx, DWORD PTR 32[esp] | ||
1124 | or eax, esi | ||
1125 | add ebp, edx | ||
1126 | xor eax, ecx | ||
1127 | mov edx, -1 | ||
1128 | rol esi, 10 | ||
1129 | lea ebp, DWORD PTR 1352829926[eax*1+ebp] | ||
1130 | sub edx, esi | ||
1131 | rol ebp, 11 | ||
1132 | add ebp, ebx | ||
1133 | ; 92 | ||
1134 | mov eax, DWORD PTR 4[esp] | ||
1135 | or edx, ecx | ||
1136 | add ebx, eax | ||
1137 | xor edx, ebp | ||
1138 | mov eax, -1 | ||
1139 | rol ecx, 10 | ||
1140 | lea ebx, DWORD PTR 1352829926[edx*1+ebx] | ||
1141 | sub eax, ecx | ||
1142 | rol ebx, 14 | ||
1143 | add ebx, edi | ||
1144 | ; 93 | ||
1145 | mov edx, DWORD PTR 40[esp] | ||
1146 | or eax, ebp | ||
1147 | add edi, edx | ||
1148 | xor eax, ebx | ||
1149 | mov edx, -1 | ||
1150 | rol ebp, 10 | ||
1151 | lea edi, DWORD PTR 1352829926[eax*1+edi] | ||
1152 | sub edx, ebp | ||
1153 | rol edi, 14 | ||
1154 | add edi, esi | ||
1155 | ; 94 | ||
1156 | mov eax, DWORD PTR 12[esp] | ||
1157 | or edx, ebx | ||
1158 | add esi, eax | ||
1159 | xor edx, edi | ||
1160 | mov eax, -1 | ||
1161 | rol ebx, 10 | ||
1162 | lea esi, DWORD PTR 1352829926[edx*1+esi] | ||
1163 | sub eax, ebx | ||
1164 | rol esi, 12 | ||
1165 | add esi, ecx | ||
1166 | ; 95 | ||
1167 | mov edx, DWORD PTR 48[esp] | ||
1168 | or eax, edi | ||
1169 | add ecx, edx | ||
1170 | xor eax, esi | ||
1171 | mov edx, -1 | ||
1172 | rol edi, 10 | ||
1173 | lea ecx, DWORD PTR 1352829926[eax*1+ecx] | ||
1174 | mov eax, edi | ||
1175 | rol ecx, 6 | ||
1176 | add ecx, ebp | ||
1177 | ; 96 | ||
1178 | sub edx, edi | ||
1179 | and eax, ecx | ||
1180 | and edx, esi | ||
1181 | or edx, eax | ||
1182 | mov eax, DWORD PTR 24[esp] | ||
1183 | rol esi, 10 | ||
1184 | lea ebp, DWORD PTR 1548603684[edx+ebp] | ||
1185 | mov edx, -1 | ||
1186 | add ebp, eax | ||
1187 | mov eax, esi | ||
1188 | rol ebp, 9 | ||
1189 | add ebp, ebx | ||
1190 | ; 97 | ||
1191 | sub edx, esi | ||
1192 | and eax, ebp | ||
1193 | and edx, ecx | ||
1194 | or edx, eax | ||
1195 | mov eax, DWORD PTR 44[esp] | ||
1196 | rol ecx, 10 | ||
1197 | lea ebx, DWORD PTR 1548603684[edx+ebx] | ||
1198 | mov edx, -1 | ||
1199 | add ebx, eax | ||
1200 | mov eax, ecx | ||
1201 | rol ebx, 13 | ||
1202 | add ebx, edi | ||
1203 | ; 98 | ||
1204 | sub edx, ecx | ||
1205 | and eax, ebx | ||
1206 | and edx, ebp | ||
1207 | or edx, eax | ||
1208 | mov eax, DWORD PTR 12[esp] | ||
1209 | rol ebp, 10 | ||
1210 | lea edi, DWORD PTR 1548603684[edx+edi] | ||
1211 | mov edx, -1 | ||
1212 | add edi, eax | ||
1213 | mov eax, ebp | ||
1214 | rol edi, 15 | ||
1215 | add edi, esi | ||
1216 | ; 99 | ||
1217 | sub edx, ebp | ||
1218 | and eax, edi | ||
1219 | and edx, ebx | ||
1220 | or edx, eax | ||
1221 | mov eax, DWORD PTR 28[esp] | ||
1222 | rol ebx, 10 | ||
1223 | lea esi, DWORD PTR 1548603684[edx+esi] | ||
1224 | mov edx, -1 | ||
1225 | add esi, eax | ||
1226 | mov eax, ebx | ||
1227 | rol esi, 7 | ||
1228 | add esi, ecx | ||
1229 | ; 100 | ||
1230 | sub edx, ebx | ||
1231 | and eax, esi | ||
1232 | and edx, edi | ||
1233 | or edx, eax | ||
1234 | mov eax, DWORD PTR [esp] | ||
1235 | rol edi, 10 | ||
1236 | lea ecx, DWORD PTR 1548603684[edx+ecx] | ||
1237 | mov edx, -1 | ||
1238 | add ecx, eax | ||
1239 | mov eax, edi | ||
1240 | rol ecx, 12 | ||
1241 | add ecx, ebp | ||
1242 | ; 101 | ||
1243 | sub edx, edi | ||
1244 | and eax, ecx | ||
1245 | and edx, esi | ||
1246 | or edx, eax | ||
1247 | mov eax, DWORD PTR 52[esp] | ||
1248 | rol esi, 10 | ||
1249 | lea ebp, DWORD PTR 1548603684[edx+ebp] | ||
1250 | mov edx, -1 | ||
1251 | add ebp, eax | ||
1252 | mov eax, esi | ||
1253 | rol ebp, 8 | ||
1254 | add ebp, ebx | ||
1255 | ; 102 | ||
1256 | sub edx, esi | ||
1257 | and eax, ebp | ||
1258 | and edx, ecx | ||
1259 | or edx, eax | ||
1260 | mov eax, DWORD PTR 20[esp] | ||
1261 | rol ecx, 10 | ||
1262 | lea ebx, DWORD PTR 1548603684[edx+ebx] | ||
1263 | mov edx, -1 | ||
1264 | add ebx, eax | ||
1265 | mov eax, ecx | ||
1266 | rol ebx, 9 | ||
1267 | add ebx, edi | ||
1268 | ; 103 | ||
1269 | sub edx, ecx | ||
1270 | and eax, ebx | ||
1271 | and edx, ebp | ||
1272 | or edx, eax | ||
1273 | mov eax, DWORD PTR 40[esp] | ||
1274 | rol ebp, 10 | ||
1275 | lea edi, DWORD PTR 1548603684[edx+edi] | ||
1276 | mov edx, -1 | ||
1277 | add edi, eax | ||
1278 | mov eax, ebp | ||
1279 | rol edi, 11 | ||
1280 | add edi, esi | ||
1281 | ; 104 | ||
1282 | sub edx, ebp | ||
1283 | and eax, edi | ||
1284 | and edx, ebx | ||
1285 | or edx, eax | ||
1286 | mov eax, DWORD PTR 56[esp] | ||
1287 | rol ebx, 10 | ||
1288 | lea esi, DWORD PTR 1548603684[edx+esi] | ||
1289 | mov edx, -1 | ||
1290 | add esi, eax | ||
1291 | mov eax, ebx | ||
1292 | rol esi, 7 | ||
1293 | add esi, ecx | ||
1294 | ; 105 | ||
1295 | sub edx, ebx | ||
1296 | and eax, esi | ||
1297 | and edx, edi | ||
1298 | or edx, eax | ||
1299 | mov eax, DWORD PTR 60[esp] | ||
1300 | rol edi, 10 | ||
1301 | lea ecx, DWORD PTR 1548603684[edx+ecx] | ||
1302 | mov edx, -1 | ||
1303 | add ecx, eax | ||
1304 | mov eax, edi | ||
1305 | rol ecx, 7 | ||
1306 | add ecx, ebp | ||
1307 | ; 106 | ||
1308 | sub edx, edi | ||
1309 | and eax, ecx | ||
1310 | and edx, esi | ||
1311 | or edx, eax | ||
1312 | mov eax, DWORD PTR 32[esp] | ||
1313 | rol esi, 10 | ||
1314 | lea ebp, DWORD PTR 1548603684[edx+ebp] | ||
1315 | mov edx, -1 | ||
1316 | add ebp, eax | ||
1317 | mov eax, esi | ||
1318 | rol ebp, 12 | ||
1319 | add ebp, ebx | ||
1320 | ; 107 | ||
1321 | sub edx, esi | ||
1322 | and eax, ebp | ||
1323 | and edx, ecx | ||
1324 | or edx, eax | ||
1325 | mov eax, DWORD PTR 48[esp] | ||
1326 | rol ecx, 10 | ||
1327 | lea ebx, DWORD PTR 1548603684[edx+ebx] | ||
1328 | mov edx, -1 | ||
1329 | add ebx, eax | ||
1330 | mov eax, ecx | ||
1331 | rol ebx, 7 | ||
1332 | add ebx, edi | ||
1333 | ; 108 | ||
1334 | sub edx, ecx | ||
1335 | and eax, ebx | ||
1336 | and edx, ebp | ||
1337 | or edx, eax | ||
1338 | mov eax, DWORD PTR 16[esp] | ||
1339 | rol ebp, 10 | ||
1340 | lea edi, DWORD PTR 1548603684[edx+edi] | ||
1341 | mov edx, -1 | ||
1342 | add edi, eax | ||
1343 | mov eax, ebp | ||
1344 | rol edi, 6 | ||
1345 | add edi, esi | ||
1346 | ; 109 | ||
1347 | sub edx, ebp | ||
1348 | and eax, edi | ||
1349 | and edx, ebx | ||
1350 | or edx, eax | ||
1351 | mov eax, DWORD PTR 36[esp] | ||
1352 | rol ebx, 10 | ||
1353 | lea esi, DWORD PTR 1548603684[edx+esi] | ||
1354 | mov edx, -1 | ||
1355 | add esi, eax | ||
1356 | mov eax, ebx | ||
1357 | rol esi, 15 | ||
1358 | add esi, ecx | ||
1359 | ; 110 | ||
1360 | sub edx, ebx | ||
1361 | and eax, esi | ||
1362 | and edx, edi | ||
1363 | or edx, eax | ||
1364 | mov eax, DWORD PTR 4[esp] | ||
1365 | rol edi, 10 | ||
1366 | lea ecx, DWORD PTR 1548603684[edx+ecx] | ||
1367 | mov edx, -1 | ||
1368 | add ecx, eax | ||
1369 | mov eax, edi | ||
1370 | rol ecx, 13 | ||
1371 | add ecx, ebp | ||
1372 | ; 111 | ||
1373 | sub edx, edi | ||
1374 | and eax, ecx | ||
1375 | and edx, esi | ||
1376 | or edx, eax | ||
1377 | mov eax, DWORD PTR 8[esp] | ||
1378 | rol esi, 10 | ||
1379 | lea ebp, DWORD PTR 1548603684[edx+ebp] | ||
1380 | mov edx, -1 | ||
1381 | add ebp, eax | ||
1382 | sub edx, ecx | ||
1383 | rol ebp, 11 | ||
1384 | add ebp, ebx | ||
1385 | ; 112 | ||
1386 | mov eax, DWORD PTR 60[esp] | ||
1387 | or edx, ebp | ||
1388 | add ebx, eax | ||
1389 | xor edx, esi | ||
1390 | mov eax, -1 | ||
1391 | rol ecx, 10 | ||
1392 | lea ebx, DWORD PTR 1836072691[edx*1+ebx] | ||
1393 | sub eax, ebp | ||
1394 | rol ebx, 9 | ||
1395 | add ebx, edi | ||
1396 | ; 113 | ||
1397 | mov edx, DWORD PTR 20[esp] | ||
1398 | or eax, ebx | ||
1399 | add edi, edx | ||
1400 | xor eax, ecx | ||
1401 | mov edx, -1 | ||
1402 | rol ebp, 10 | ||
1403 | lea edi, DWORD PTR 1836072691[eax*1+edi] | ||
1404 | sub edx, ebx | ||
1405 | rol edi, 7 | ||
1406 | add edi, esi | ||
1407 | ; 114 | ||
1408 | mov eax, DWORD PTR 4[esp] | ||
1409 | or edx, edi | ||
1410 | add esi, eax | ||
1411 | xor edx, ebp | ||
1412 | mov eax, -1 | ||
1413 | rol ebx, 10 | ||
1414 | lea esi, DWORD PTR 1836072691[edx*1+esi] | ||
1415 | sub eax, edi | ||
1416 | rol esi, 15 | ||
1417 | add esi, ecx | ||
1418 | ; 115 | ||
1419 | mov edx, DWORD PTR 12[esp] | ||
1420 | or eax, esi | ||
1421 | add ecx, edx | ||
1422 | xor eax, ebx | ||
1423 | mov edx, -1 | ||
1424 | rol edi, 10 | ||
1425 | lea ecx, DWORD PTR 1836072691[eax*1+ecx] | ||
1426 | sub edx, esi | ||
1427 | rol ecx, 11 | ||
1428 | add ecx, ebp | ||
1429 | ; 116 | ||
1430 | mov eax, DWORD PTR 28[esp] | ||
1431 | or edx, ecx | ||
1432 | add ebp, eax | ||
1433 | xor edx, edi | ||
1434 | mov eax, -1 | ||
1435 | rol esi, 10 | ||
1436 | lea ebp, DWORD PTR 1836072691[edx*1+ebp] | ||
1437 | sub eax, ecx | ||
1438 | rol ebp, 8 | ||
1439 | add ebp, ebx | ||
1440 | ; 117 | ||
1441 | mov edx, DWORD PTR 56[esp] | ||
1442 | or eax, ebp | ||
1443 | add ebx, edx | ||
1444 | xor eax, esi | ||
1445 | mov edx, -1 | ||
1446 | rol ecx, 10 | ||
1447 | lea ebx, DWORD PTR 1836072691[eax*1+ebx] | ||
1448 | sub edx, ebp | ||
1449 | rol ebx, 6 | ||
1450 | add ebx, edi | ||
1451 | ; 118 | ||
1452 | mov eax, DWORD PTR 24[esp] | ||
1453 | or edx, ebx | ||
1454 | add edi, eax | ||
1455 | xor edx, ecx | ||
1456 | mov eax, -1 | ||
1457 | rol ebp, 10 | ||
1458 | lea edi, DWORD PTR 1836072691[edx*1+edi] | ||
1459 | sub eax, ebx | ||
1460 | rol edi, 6 | ||
1461 | add edi, esi | ||
1462 | ; 119 | ||
1463 | mov edx, DWORD PTR 36[esp] | ||
1464 | or eax, edi | ||
1465 | add esi, edx | ||
1466 | xor eax, ebp | ||
1467 | mov edx, -1 | ||
1468 | rol ebx, 10 | ||
1469 | lea esi, DWORD PTR 1836072691[eax*1+esi] | ||
1470 | sub edx, edi | ||
1471 | rol esi, 14 | ||
1472 | add esi, ecx | ||
1473 | ; 120 | ||
1474 | mov eax, DWORD PTR 44[esp] | ||
1475 | or edx, esi | ||
1476 | add ecx, eax | ||
1477 | xor edx, ebx | ||
1478 | mov eax, -1 | ||
1479 | rol edi, 10 | ||
1480 | lea ecx, DWORD PTR 1836072691[edx*1+ecx] | ||
1481 | sub eax, esi | ||
1482 | rol ecx, 12 | ||
1483 | add ecx, ebp | ||
1484 | ; 121 | ||
1485 | mov edx, DWORD PTR 32[esp] | ||
1486 | or eax, ecx | ||
1487 | add ebp, edx | ||
1488 | xor eax, edi | ||
1489 | mov edx, -1 | ||
1490 | rol esi, 10 | ||
1491 | lea ebp, DWORD PTR 1836072691[eax*1+ebp] | ||
1492 | sub edx, ecx | ||
1493 | rol ebp, 13 | ||
1494 | add ebp, ebx | ||
1495 | ; 122 | ||
1496 | mov eax, DWORD PTR 48[esp] | ||
1497 | or edx, ebp | ||
1498 | add ebx, eax | ||
1499 | xor edx, esi | ||
1500 | mov eax, -1 | ||
1501 | rol ecx, 10 | ||
1502 | lea ebx, DWORD PTR 1836072691[edx*1+ebx] | ||
1503 | sub eax, ebp | ||
1504 | rol ebx, 5 | ||
1505 | add ebx, edi | ||
1506 | ; 123 | ||
1507 | mov edx, DWORD PTR 8[esp] | ||
1508 | or eax, ebx | ||
1509 | add edi, edx | ||
1510 | xor eax, ecx | ||
1511 | mov edx, -1 | ||
1512 | rol ebp, 10 | ||
1513 | lea edi, DWORD PTR 1836072691[eax*1+edi] | ||
1514 | sub edx, ebx | ||
1515 | rol edi, 14 | ||
1516 | add edi, esi | ||
1517 | ; 124 | ||
1518 | mov eax, DWORD PTR 40[esp] | ||
1519 | or edx, edi | ||
1520 | add esi, eax | ||
1521 | xor edx, ebp | ||
1522 | mov eax, -1 | ||
1523 | rol ebx, 10 | ||
1524 | lea esi, DWORD PTR 1836072691[edx*1+esi] | ||
1525 | sub eax, edi | ||
1526 | rol esi, 13 | ||
1527 | add esi, ecx | ||
1528 | ; 125 | ||
1529 | mov edx, DWORD PTR [esp] | ||
1530 | or eax, esi | ||
1531 | add ecx, edx | ||
1532 | xor eax, ebx | ||
1533 | mov edx, -1 | ||
1534 | rol edi, 10 | ||
1535 | lea ecx, DWORD PTR 1836072691[eax*1+ecx] | ||
1536 | sub edx, esi | ||
1537 | rol ecx, 13 | ||
1538 | add ecx, ebp | ||
1539 | ; 126 | ||
1540 | mov eax, DWORD PTR 16[esp] | ||
1541 | or edx, ecx | ||
1542 | add ebp, eax | ||
1543 | xor edx, edi | ||
1544 | mov eax, -1 | ||
1545 | rol esi, 10 | ||
1546 | lea ebp, DWORD PTR 1836072691[edx*1+ebp] | ||
1547 | sub eax, ecx | ||
1548 | rol ebp, 7 | ||
1549 | add ebp, ebx | ||
1550 | ; 127 | ||
1551 | mov edx, DWORD PTR 52[esp] | ||
1552 | or eax, ebp | ||
1553 | add ebx, edx | ||
1554 | xor eax, esi | ||
1555 | mov edx, DWORD PTR 32[esp] | ||
1556 | rol ecx, 10 | ||
1557 | lea ebx, DWORD PTR 1836072691[eax*1+ebx] | ||
1558 | mov eax, -1 | ||
1559 | rol ebx, 5 | ||
1560 | add ebx, edi | ||
1561 | ; 128 | ||
1562 | add edi, edx | ||
1563 | mov edx, ebp | ||
1564 | sub eax, ebx | ||
1565 | and edx, ebx | ||
1566 | and eax, ecx | ||
1567 | or edx, eax | ||
1568 | mov eax, DWORD PTR 24[esp] | ||
1569 | rol ebp, 10 | ||
1570 | lea edi, DWORD PTR 2053994217[edx*1+edi] | ||
1571 | mov edx, -1 | ||
1572 | rol edi, 15 | ||
1573 | add edi, esi | ||
1574 | ; 129 | ||
1575 | add esi, eax | ||
1576 | mov eax, ebx | ||
1577 | sub edx, edi | ||
1578 | and eax, edi | ||
1579 | and edx, ebp | ||
1580 | or eax, edx | ||
1581 | mov edx, DWORD PTR 16[esp] | ||
1582 | rol ebx, 10 | ||
1583 | lea esi, DWORD PTR 2053994217[eax*1+esi] | ||
1584 | mov eax, -1 | ||
1585 | rol esi, 5 | ||
1586 | add esi, ecx | ||
1587 | ; 130 | ||
1588 | add ecx, edx | ||
1589 | mov edx, edi | ||
1590 | sub eax, esi | ||
1591 | and edx, esi | ||
1592 | and eax, ebx | ||
1593 | or edx, eax | ||
1594 | mov eax, DWORD PTR 4[esp] | ||
1595 | rol edi, 10 | ||
1596 | lea ecx, DWORD PTR 2053994217[edx*1+ecx] | ||
1597 | mov edx, -1 | ||
1598 | rol ecx, 8 | ||
1599 | add ecx, ebp | ||
1600 | ; 131 | ||
1601 | add ebp, eax | ||
1602 | mov eax, esi | ||
1603 | sub edx, ecx | ||
1604 | and eax, ecx | ||
1605 | and edx, edi | ||
1606 | or eax, edx | ||
1607 | mov edx, DWORD PTR 12[esp] | ||
1608 | rol esi, 10 | ||
1609 | lea ebp, DWORD PTR 2053994217[eax*1+ebp] | ||
1610 | mov eax, -1 | ||
1611 | rol ebp, 11 | ||
1612 | add ebp, ebx | ||
1613 | ; 132 | ||
1614 | add ebx, edx | ||
1615 | mov edx, ecx | ||
1616 | sub eax, ebp | ||
1617 | and edx, ebp | ||
1618 | and eax, esi | ||
1619 | or edx, eax | ||
1620 | mov eax, DWORD PTR 44[esp] | ||
1621 | rol ecx, 10 | ||
1622 | lea ebx, DWORD PTR 2053994217[edx*1+ebx] | ||
1623 | mov edx, -1 | ||
1624 | rol ebx, 14 | ||
1625 | add ebx, edi | ||
1626 | ; 133 | ||
1627 | add edi, eax | ||
1628 | mov eax, ebp | ||
1629 | sub edx, ebx | ||
1630 | and eax, ebx | ||
1631 | and edx, ecx | ||
1632 | or eax, edx | ||
1633 | mov edx, DWORD PTR 60[esp] | ||
1634 | rol ebp, 10 | ||
1635 | lea edi, DWORD PTR 2053994217[eax*1+edi] | ||
1636 | mov eax, -1 | ||
1637 | rol edi, 14 | ||
1638 | add edi, esi | ||
1639 | ; 134 | ||
1640 | add esi, edx | ||
1641 | mov edx, ebx | ||
1642 | sub eax, edi | ||
1643 | and edx, edi | ||
1644 | and eax, ebp | ||
1645 | or edx, eax | ||
1646 | mov eax, DWORD PTR [esp] | ||
1647 | rol ebx, 10 | ||
1648 | lea esi, DWORD PTR 2053994217[edx*1+esi] | ||
1649 | mov edx, -1 | ||
1650 | rol esi, 6 | ||
1651 | add esi, ecx | ||
1652 | ; 135 | ||
1653 | add ecx, eax | ||
1654 | mov eax, edi | ||
1655 | sub edx, esi | ||
1656 | and eax, esi | ||
1657 | and edx, ebx | ||
1658 | or eax, edx | ||
1659 | mov edx, DWORD PTR 20[esp] | ||
1660 | rol edi, 10 | ||
1661 | lea ecx, DWORD PTR 2053994217[eax*1+ecx] | ||
1662 | mov eax, -1 | ||
1663 | rol ecx, 14 | ||
1664 | add ecx, ebp | ||
1665 | ; 136 | ||
1666 | add ebp, edx | ||
1667 | mov edx, esi | ||
1668 | sub eax, ecx | ||
1669 | and edx, ecx | ||
1670 | and eax, edi | ||
1671 | or edx, eax | ||
1672 | mov eax, DWORD PTR 48[esp] | ||
1673 | rol esi, 10 | ||
1674 | lea ebp, DWORD PTR 2053994217[edx*1+ebp] | ||
1675 | mov edx, -1 | ||
1676 | rol ebp, 6 | ||
1677 | add ebp, ebx | ||
1678 | ; 137 | ||
1679 | add ebx, eax | ||
1680 | mov eax, ecx | ||
1681 | sub edx, ebp | ||
1682 | and eax, ebp | ||
1683 | and edx, esi | ||
1684 | or eax, edx | ||
1685 | mov edx, DWORD PTR 8[esp] | ||
1686 | rol ecx, 10 | ||
1687 | lea ebx, DWORD PTR 2053994217[eax*1+ebx] | ||
1688 | mov eax, -1 | ||
1689 | rol ebx, 9 | ||
1690 | add ebx, edi | ||
1691 | ; 138 | ||
1692 | add edi, edx | ||
1693 | mov edx, ebp | ||
1694 | sub eax, ebx | ||
1695 | and edx, ebx | ||
1696 | and eax, ecx | ||
1697 | or edx, eax | ||
1698 | mov eax, DWORD PTR 52[esp] | ||
1699 | rol ebp, 10 | ||
1700 | lea edi, DWORD PTR 2053994217[edx*1+edi] | ||
1701 | mov edx, -1 | ||
1702 | rol edi, 12 | ||
1703 | add edi, esi | ||
1704 | ; 139 | ||
1705 | add esi, eax | ||
1706 | mov eax, ebx | ||
1707 | sub edx, edi | ||
1708 | and eax, edi | ||
1709 | and edx, ebp | ||
1710 | or eax, edx | ||
1711 | mov edx, DWORD PTR 36[esp] | ||
1712 | rol ebx, 10 | ||
1713 | lea esi, DWORD PTR 2053994217[eax*1+esi] | ||
1714 | mov eax, -1 | ||
1715 | rol esi, 9 | ||
1716 | add esi, ecx | ||
1717 | ; 140 | ||
1718 | add ecx, edx | ||
1719 | mov edx, edi | ||
1720 | sub eax, esi | ||
1721 | and edx, esi | ||
1722 | and eax, ebx | ||
1723 | or edx, eax | ||
1724 | mov eax, DWORD PTR 28[esp] | ||
1725 | rol edi, 10 | ||
1726 | lea ecx, DWORD PTR 2053994217[edx*1+ecx] | ||
1727 | mov edx, -1 | ||
1728 | rol ecx, 12 | ||
1729 | add ecx, ebp | ||
1730 | ; 141 | ||
1731 | add ebp, eax | ||
1732 | mov eax, esi | ||
1733 | sub edx, ecx | ||
1734 | and eax, ecx | ||
1735 | and edx, edi | ||
1736 | or eax, edx | ||
1737 | mov edx, DWORD PTR 40[esp] | ||
1738 | rol esi, 10 | ||
1739 | lea ebp, DWORD PTR 2053994217[eax*1+ebp] | ||
1740 | mov eax, -1 | ||
1741 | rol ebp, 5 | ||
1742 | add ebp, ebx | ||
1743 | ; 142 | ||
1744 | add ebx, edx | ||
1745 | mov edx, ecx | ||
1746 | sub eax, ebp | ||
1747 | and edx, ebp | ||
1748 | and eax, esi | ||
1749 | or edx, eax | ||
1750 | mov eax, DWORD PTR 56[esp] | ||
1751 | rol ecx, 10 | ||
1752 | lea ebx, DWORD PTR 2053994217[edx*1+ebx] | ||
1753 | mov edx, -1 | ||
1754 | rol ebx, 15 | ||
1755 | add ebx, edi | ||
1756 | ; 143 | ||
1757 | add edi, eax | ||
1758 | mov eax, ebp | ||
1759 | sub edx, ebx | ||
1760 | and eax, ebx | ||
1761 | and edx, ecx | ||
1762 | or edx, eax | ||
1763 | mov eax, ebx | ||
1764 | rol ebp, 10 | ||
1765 | lea edi, DWORD PTR 2053994217[edx*1+edi] | ||
1766 | xor eax, ebp | ||
1767 | rol edi, 8 | ||
1768 | add edi, esi | ||
1769 | ; 144 | ||
1770 | mov edx, DWORD PTR 48[esp] | ||
1771 | xor eax, edi | ||
1772 | add esi, edx | ||
1773 | rol ebx, 10 | ||
1774 | add esi, eax | ||
1775 | mov eax, edi | ||
1776 | rol esi, 8 | ||
1777 | add esi, ecx | ||
1778 | ; 145 | ||
1779 | xor eax, ebx | ||
1780 | mov edx, DWORD PTR 60[esp] | ||
1781 | xor eax, esi | ||
1782 | add ecx, eax | ||
1783 | mov eax, esi | ||
1784 | rol edi, 10 | ||
1785 | add ecx, edx | ||
1786 | xor eax, edi | ||
1787 | rol ecx, 5 | ||
1788 | add ecx, ebp | ||
1789 | ; 146 | ||
1790 | mov edx, DWORD PTR 40[esp] | ||
1791 | xor eax, ecx | ||
1792 | add ebp, edx | ||
1793 | rol esi, 10 | ||
1794 | add ebp, eax | ||
1795 | mov eax, ecx | ||
1796 | rol ebp, 12 | ||
1797 | add ebp, ebx | ||
1798 | ; 147 | ||
1799 | xor eax, esi | ||
1800 | mov edx, DWORD PTR 16[esp] | ||
1801 | xor eax, ebp | ||
1802 | add ebx, eax | ||
1803 | mov eax, ebp | ||
1804 | rol ecx, 10 | ||
1805 | add ebx, edx | ||
1806 | xor eax, ecx | ||
1807 | rol ebx, 9 | ||
1808 | add ebx, edi | ||
1809 | ; 148 | ||
1810 | mov edx, DWORD PTR 4[esp] | ||
1811 | xor eax, ebx | ||
1812 | add edi, edx | ||
1813 | rol ebp, 10 | ||
1814 | add edi, eax | ||
1815 | mov eax, ebx | ||
1816 | rol edi, 12 | ||
1817 | add edi, esi | ||
1818 | ; 149 | ||
1819 | xor eax, ebp | ||
1820 | mov edx, DWORD PTR 20[esp] | ||
1821 | xor eax, edi | ||
1822 | add esi, eax | ||
1823 | mov eax, edi | ||
1824 | rol ebx, 10 | ||
1825 | add esi, edx | ||
1826 | xor eax, ebx | ||
1827 | rol esi, 5 | ||
1828 | add esi, ecx | ||
1829 | ; 150 | ||
1830 | mov edx, DWORD PTR 32[esp] | ||
1831 | xor eax, esi | ||
1832 | add ecx, edx | ||
1833 | rol edi, 10 | ||
1834 | add ecx, eax | ||
1835 | mov eax, esi | ||
1836 | rol ecx, 14 | ||
1837 | add ecx, ebp | ||
1838 | ; 151 | ||
1839 | xor eax, edi | ||
1840 | mov edx, DWORD PTR 28[esp] | ||
1841 | xor eax, ecx | ||
1842 | add ebp, eax | ||
1843 | mov eax, ecx | ||
1844 | rol esi, 10 | ||
1845 | add ebp, edx | ||
1846 | xor eax, esi | ||
1847 | rol ebp, 6 | ||
1848 | add ebp, ebx | ||
1849 | ; 152 | ||
1850 | mov edx, DWORD PTR 24[esp] | ||
1851 | xor eax, ebp | ||
1852 | add ebx, edx | ||
1853 | rol ecx, 10 | ||
1854 | add ebx, eax | ||
1855 | mov eax, ebp | ||
1856 | rol ebx, 8 | ||
1857 | add ebx, edi | ||
1858 | ; 153 | ||
1859 | xor eax, ecx | ||
1860 | mov edx, DWORD PTR 8[esp] | ||
1861 | xor eax, ebx | ||
1862 | add edi, eax | ||
1863 | mov eax, ebx | ||
1864 | rol ebp, 10 | ||
1865 | add edi, edx | ||
1866 | xor eax, ebp | ||
1867 | rol edi, 13 | ||
1868 | add edi, esi | ||
1869 | ; 154 | ||
1870 | mov edx, DWORD PTR 52[esp] | ||
1871 | xor eax, edi | ||
1872 | add esi, edx | ||
1873 | rol ebx, 10 | ||
1874 | add esi, eax | ||
1875 | mov eax, edi | ||
1876 | rol esi, 6 | ||
1877 | add esi, ecx | ||
1878 | ; 155 | ||
1879 | xor eax, ebx | ||
1880 | mov edx, DWORD PTR 56[esp] | ||
1881 | xor eax, esi | ||
1882 | add ecx, eax | ||
1883 | mov eax, esi | ||
1884 | rol edi, 10 | ||
1885 | add ecx, edx | ||
1886 | xor eax, edi | ||
1887 | rol ecx, 5 | ||
1888 | add ecx, ebp | ||
1889 | ; 156 | ||
1890 | mov edx, DWORD PTR [esp] | ||
1891 | xor eax, ecx | ||
1892 | add ebp, edx | ||
1893 | rol esi, 10 | ||
1894 | add ebp, eax | ||
1895 | mov eax, ecx | ||
1896 | rol ebp, 15 | ||
1897 | add ebp, ebx | ||
1898 | ; 157 | ||
1899 | xor eax, esi | ||
1900 | mov edx, DWORD PTR 12[esp] | ||
1901 | xor eax, ebp | ||
1902 | add ebx, eax | ||
1903 | mov eax, ebp | ||
1904 | rol ecx, 10 | ||
1905 | add ebx, edx | ||
1906 | xor eax, ecx | ||
1907 | rol ebx, 13 | ||
1908 | add ebx, edi | ||
1909 | ; 158 | ||
1910 | mov edx, DWORD PTR 36[esp] | ||
1911 | xor eax, ebx | ||
1912 | add edi, edx | ||
1913 | rol ebp, 10 | ||
1914 | add edi, eax | ||
1915 | mov eax, ebx | ||
1916 | rol edi, 11 | ||
1917 | add edi, esi | ||
1918 | ; 159 | ||
1919 | xor eax, ebp | ||
1920 | mov edx, DWORD PTR 44[esp] | ||
1921 | xor eax, edi | ||
1922 | add esi, eax | ||
1923 | rol ebx, 10 | ||
1924 | add esi, edx | ||
1925 | mov edx, DWORD PTR 128[esp] | ||
1926 | rol esi, 11 | ||
1927 | add esi, ecx | ||
1928 | mov eax, DWORD PTR 4[edx] | ||
1929 | add ebx, eax | ||
1930 | mov eax, DWORD PTR 72[esp] | ||
1931 | add ebx, eax | ||
1932 | mov eax, DWORD PTR 8[edx] | ||
1933 | add ebp, eax | ||
1934 | mov eax, DWORD PTR 76[esp] | ||
1935 | add ebp, eax | ||
1936 | mov eax, DWORD PTR 12[edx] | ||
1937 | add ecx, eax | ||
1938 | mov eax, DWORD PTR 80[esp] | ||
1939 | add ecx, eax | ||
1940 | mov eax, DWORD PTR 16[edx] | ||
1941 | add esi, eax | ||
1942 | mov eax, DWORD PTR 64[esp] | ||
1943 | add esi, eax | ||
1944 | mov eax, DWORD PTR [edx] | ||
1945 | add edi, eax | ||
1946 | mov eax, DWORD PTR 68[esp] | ||
1947 | add edi, eax | ||
1948 | mov eax, DWORD PTR 136[esp] | ||
1949 | mov DWORD PTR [edx],ebx | ||
1950 | mov DWORD PTR 4[edx],ebp | ||
1951 | mov DWORD PTR 8[edx],ecx | ||
1952 | sub eax, 1 | ||
1953 | mov DWORD PTR 12[edx],esi | ||
1954 | mov DWORD PTR 16[edx],edi | ||
1955 | jle $L001get_out | ||
1956 | mov DWORD PTR 136[esp],eax | ||
1957 | mov edi, ecx | ||
1958 | mov eax, DWORD PTR 132[esp] | ||
1959 | mov ecx, ebx | ||
1960 | add eax, 64 | ||
1961 | mov esi, ebp | ||
1962 | mov DWORD PTR 132[esp],eax | ||
1963 | jmp L000start | ||
1964 | $L001get_out: | ||
1965 | add esp, 108 | ||
1966 | pop ebx | ||
1967 | pop ebp | ||
1968 | pop edi | ||
1969 | pop esi | ||
1970 | ret | ||
1971 | _ripemd160_block_asm_host_order ENDP | ||
1972 | _TEXT ENDS | ||
1973 | END | ||
diff --git a/src/lib/libssl/src/crypto/ripemd/rmd_locl.h b/src/lib/libssl/src/crypto/ripemd/rmd_locl.h index 145cf316b9..f537b88867 100644 --- a/src/lib/libssl/src/crypto/ripemd/rmd_locl.h +++ b/src/lib/libssl/src/crypto/ripemd/rmd_locl.h | |||
@@ -106,11 +106,7 @@ void ripemd160_block_data_order (RIPEMD160_CTX *c, const void *p,int num); | |||
106 | #define HASH_BLOCK_DATA_ORDER ripemd160_block_data_order | 106 | #define HASH_BLOCK_DATA_ORDER ripemd160_block_data_order |
107 | #endif | 107 | #endif |
108 | 108 | ||
109 | #ifndef FLAT_INC | ||
110 | #include "../md32_common.h" | ||
111 | #else | ||
112 | #include "md32_common.h" | 109 | #include "md32_common.h" |
113 | #endif | ||
114 | 110 | ||
115 | #if 0 | 111 | #if 0 |
116 | #define F1(x,y,z) ((x)^(y)^(z)) | 112 | #define F1(x,y,z) ((x)^(y)^(z)) |
diff --git a/src/lib/libssl/src/crypto/rsa/rsa_err.c b/src/lib/libssl/src/crypto/rsa/rsa_err.c index 5cfbea2b03..1cde7c0da4 100644 --- a/src/lib/libssl/src/crypto/rsa/rsa_err.c +++ b/src/lib/libssl/src/crypto/rsa/rsa_err.c | |||
@@ -54,7 +54,8 @@ | |||
54 | */ | 54 | */ |
55 | 55 | ||
56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes |
57 | * made to it will be overwritten when the script next updates this file. | 57 | * made to it will be overwritten when the script next updates this file, |
58 | * only reason strings will be preserved. | ||
58 | */ | 59 | */ |
59 | 60 | ||
60 | #include <stdio.h> | 61 | #include <stdio.h> |
diff --git a/src/lib/libssl/src/crypto/sha/Makefile.ssl b/src/lib/libssl/src/crypto/sha/Makefile.ssl index 79ef43aa34..72acd8f046 100644 --- a/src/lib/libssl/src/crypto/sha/Makefile.ssl +++ b/src/lib/libssl/src/crypto/sha/Makefile.ssl | |||
@@ -5,6 +5,7 @@ | |||
5 | DIR= sha | 5 | DIR= sha |
6 | TOP= ../.. | 6 | TOP= ../.. |
7 | CC= cc | 7 | CC= cc |
8 | CPP= $(CC) -E | ||
8 | INCLUDES= | 9 | INCLUDES= |
9 | CFLAG=-g | 10 | CFLAG=-g |
10 | INSTALL_PREFIX= | 11 | INSTALL_PREFIX= |
@@ -46,7 +47,7 @@ lib: $(LIBOBJ) | |||
46 | 47 | ||
47 | # elf | 48 | # elf |
48 | asm/sx86-elf.o: asm/sx86unix.cpp | 49 | asm/sx86-elf.o: asm/sx86unix.cpp |
49 | $(CPP) -DELF asm/sx86unix.cpp | as -o asm/sx86-elf.o | 50 | $(CPP) -DELF -x c asm/sx86unix.cpp | as -o asm/sx86-elf.o |
50 | 51 | ||
51 | # solaris | 52 | # solaris |
52 | asm/sx86-sol.o: asm/sx86unix.cpp | 53 | asm/sx86-sol.o: asm/sx86unix.cpp |
@@ -62,7 +63,7 @@ asm/sx86-out.o: asm/sx86unix.cpp | |||
62 | asm/sx86bsdi.o: asm/sx86unix.cpp | 63 | asm/sx86bsdi.o: asm/sx86unix.cpp |
63 | $(CPP) -DBSDI asm/sx86unix.cpp | sed 's/ :/:/' | as -o asm/sx86bsdi.o | 64 | $(CPP) -DBSDI asm/sx86unix.cpp | sed 's/ :/:/' | as -o asm/sx86bsdi.o |
64 | 65 | ||
65 | asm/sx86unix.cpp: | 66 | asm/sx86unix.cpp: asm/sha1-586.pl ../perlasm/x86asm.pl |
66 | (cd asm; $(PERL) sha1-586.pl cpp $(PROCESSOR) >sx86unix.cpp) | 67 | (cd asm; $(PERL) sha1-586.pl cpp $(PROCESSOR) >sx86unix.cpp) |
67 | 68 | ||
68 | files: | 69 | files: |
diff --git a/src/lib/libssl/src/crypto/sha/Makefile.uni b/src/lib/libssl/src/crypto/sha/Makefile.uni index b7ec5caa4e..e69de29bb2 100644 --- a/src/lib/libssl/src/crypto/sha/Makefile.uni +++ b/src/lib/libssl/src/crypto/sha/Makefile.uni | |||
@@ -1,122 +0,0 @@ | |||
1 | # Targets | ||
2 | # make - twidle the options yourself :-) | ||
3 | # make cc - standard cc options | ||
4 | # make gcc - standard gcc options | ||
5 | # make x86-elf - linux-elf etc | ||
6 | # make x86-out - linux-a.out, FreeBSD etc | ||
7 | # make x86-solaris | ||
8 | # make x86-bdsi | ||
9 | |||
10 | DIR= sha | ||
11 | TOP= . | ||
12 | CC= gcc | ||
13 | CFLAG= -O3 -fomit-frame-pointer | ||
14 | |||
15 | CPP= $(CC) -E | ||
16 | INCLUDES= | ||
17 | INSTALLTOP=/usr/local/lib | ||
18 | MAKE= make | ||
19 | MAKEDEPEND= makedepend | ||
20 | MAKEFILE= Makefile.uni | ||
21 | AR= ar r | ||
22 | |||
23 | SHA_ASM_OBJ= | ||
24 | |||
25 | CFLAGS= $(INCLUDES) $(CFLAG) | ||
26 | |||
27 | GENERAL=Makefile | ||
28 | |||
29 | TEST1=shatest | ||
30 | TEST2=sha1test | ||
31 | APP1=sha | ||
32 | APP2=sha1 | ||
33 | |||
34 | TEST=$(TEST1) $(TEST2) | ||
35 | APPS=$(APP1) $(APP2) | ||
36 | |||
37 | LIB=libsha.a | ||
38 | LIBSRC=sha_dgst.c sha1dgst.c sha_one.c sha1_one.c | ||
39 | LIBOBJ=sha_dgst.o sha1dgst.o sha_one.o sha1_one.o $(SHA_ASM_OBJ) | ||
40 | |||
41 | SRC= $(LIBSRC) | ||
42 | |||
43 | EXHEADER= sha.h | ||
44 | HEADER= sha_locl.h $(EXHEADER) | ||
45 | |||
46 | ALL= $(GENERAL) $(SRC) $(HEADER) | ||
47 | |||
48 | all: $(LIB) $(TEST) $(APPS) | ||
49 | |||
50 | $(LIB): $(LIBOBJ) | ||
51 | $(AR) $(LIB) $(LIBOBJ) | ||
52 | $(RANLIB) $(LIB) | ||
53 | |||
54 | # elf | ||
55 | asm/sx86-elf.o: asm/sx86unix.cpp | ||
56 | $(CPP) -DELF asm/sx86unix.cpp | as -o asm/sx86-elf.o | ||
57 | |||
58 | # solaris | ||
59 | asm/sx86-sol.o: asm/sx86unix.cpp | ||
60 | $(CC) -E -DSOL asm/sx86unix.cpp | sed 's/^#.*//' > asm/sx86-sol.s | ||
61 | as -o asm/sx86-sol.o asm/sx86-sol.s | ||
62 | rm -f asm/sx86-sol.s | ||
63 | |||
64 | # a.out | ||
65 | asm/sx86-out.o: asm/sx86unix.cpp | ||
66 | $(CPP) -DOUT asm/sx86unix.cpp | as -o asm/sx86-out.o | ||
67 | |||
68 | # bsdi | ||
69 | asm/sx86bsdi.o: asm/sx86unix.cpp | ||
70 | $(CPP) -DBSDI asm/sx86unix.cpp | as -o asm/sx86bsdi.o | ||
71 | |||
72 | asm/sx86unix.cpp: | ||
73 | (cd asm; perl sha1-586.pl cpp >sx86unix.cpp) | ||
74 | |||
75 | test: $(TEST) | ||
76 | ./$(TEST1) | ||
77 | ./$(TEST2) | ||
78 | |||
79 | $(TEST1): $(TEST1).c $(LIB) | ||
80 | $(CC) -o $(TEST1) $(CFLAGS) $(TEST1).c $(LIB) | ||
81 | |||
82 | $(TEST2): $(TEST2).c $(LIB) | ||
83 | $(CC) -o $(TEST2) $(CFLAGS) $(TEST2).c $(LIB) | ||
84 | |||
85 | $(APP1): $(APP1).c $(LIB) | ||
86 | $(CC) -o $(APP1) $(CFLAGS) $(APP1).c $(LIB) | ||
87 | |||
88 | $(APP2): $(APP2).c $(LIB) | ||
89 | $(CC) -o $(APP2) $(CFLAGS) $(APP2).c $(LIB) | ||
90 | |||
91 | lint: | ||
92 | lint -DLINT $(INCLUDES) $(SRC)>fluff | ||
93 | |||
94 | depend: | ||
95 | $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) | ||
96 | |||
97 | dclean: | ||
98 | perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new | ||
99 | mv -f Makefile.new $(MAKEFILE) | ||
100 | |||
101 | clean: | ||
102 | /bin/rm -f $(LIB) $(TEST) $(APPS) *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff | ||
103 | |||
104 | cc: | ||
105 | $(MAKE) SHA_ASM_OBJ="" CC="cc" CFLAG="-O" all | ||
106 | |||
107 | gcc: | ||
108 | $(MAKE) SHA_ASM_OBJ="" CC="gcc" CFLAGS="-O3 -fomit-frame-pointer" all | ||
109 | |||
110 | x86-elf: | ||
111 | $(MAKE) SHA_ASM_OBJ="asm/sx86-elf.o" CFLAG="-DELF -DSHA1_ASM -DL_ENDIAN $(CFLAGS)" all | ||
112 | |||
113 | x86-out: | ||
114 | $(MAKE) SHA_ASM_OBJ="asm/sx86-out.o" CFLAG="-DOUT -DSHA1_ASM -DL_ENDIAN $(CFLAGS)" all | ||
115 | |||
116 | x86-solaris: | ||
117 | $(MAKE) SHA_ASM_OBJ="asm/sx86-sol.o" CFLAG="-DSOL -DSHA1_ASM -DL_ENDIAN $(CFLAGS)" all | ||
118 | |||
119 | x86-bdsi: | ||
120 | $(MAKE) SHA_ASM_OBJ="asm/sx86-bdsi.o" CFLAG="-DBDSI -DSHA1_ASM -DL_ENDIAN $(CFLAGS)" all | ||
121 | |||
122 | # DO NOT DELETE THIS LINE -- make depend depends on it. | ||
diff --git a/src/lib/libssl/src/crypto/sha/asm/s1-win32.asm b/src/lib/libssl/src/crypto/sha/asm/s1-win32.asm index 699afdb022..e69de29bb2 100644 --- a/src/lib/libssl/src/crypto/sha/asm/s1-win32.asm +++ b/src/lib/libssl/src/crypto/sha/asm/s1-win32.asm | |||
@@ -1,1716 +0,0 @@ | |||
1 | ; Don't even think of reading this code | ||
2 | ; It was automatically generated by sha1-586.pl | ||
3 | ; Which is a perl program used to generate the x86 assember for | ||
4 | ; any of elf, a.out, BSDI,Win32, or Solaris | ||
5 | ; eric <eay@cryptsoft.com> | ||
6 | ; | ||
7 | TITLE sha1-586.asm | ||
8 | .486 | ||
9 | .model FLAT | ||
10 | _TEXT SEGMENT | ||
11 | PUBLIC _sha1_block_asm_data_order | ||
12 | |||
13 | _sha1_block_asm_data_order PROC NEAR | ||
14 | mov ecx, DWORD PTR 12[esp] | ||
15 | push esi | ||
16 | shl ecx, 6 | ||
17 | mov esi, DWORD PTR 12[esp] | ||
18 | push ebp | ||
19 | add ecx, esi | ||
20 | push ebx | ||
21 | mov ebp, DWORD PTR 16[esp] | ||
22 | push edi | ||
23 | mov edx, DWORD PTR 12[ebp] | ||
24 | sub esp, 108 | ||
25 | mov edi, DWORD PTR 16[ebp] | ||
26 | mov ebx, DWORD PTR 8[ebp] | ||
27 | mov DWORD PTR 68[esp],ecx | ||
28 | ; First we need to setup the X array | ||
29 | L000start: | ||
30 | ; First, load the words onto the stack in network byte order | ||
31 | mov eax, DWORD PTR [esi] | ||
32 | mov ecx, DWORD PTR 4[esi] | ||
33 | bswap eax | ||
34 | bswap ecx | ||
35 | mov DWORD PTR [esp],eax | ||
36 | mov DWORD PTR 4[esp],ecx | ||
37 | mov eax, DWORD PTR 8[esi] | ||
38 | mov ecx, DWORD PTR 12[esi] | ||
39 | bswap eax | ||
40 | bswap ecx | ||
41 | mov DWORD PTR 8[esp],eax | ||
42 | mov DWORD PTR 12[esp],ecx | ||
43 | mov eax, DWORD PTR 16[esi] | ||
44 | mov ecx, DWORD PTR 20[esi] | ||
45 | bswap eax | ||
46 | bswap ecx | ||
47 | mov DWORD PTR 16[esp],eax | ||
48 | mov DWORD PTR 20[esp],ecx | ||
49 | mov eax, DWORD PTR 24[esi] | ||
50 | mov ecx, DWORD PTR 28[esi] | ||
51 | bswap eax | ||
52 | bswap ecx | ||
53 | mov DWORD PTR 24[esp],eax | ||
54 | mov DWORD PTR 28[esp],ecx | ||
55 | mov eax, DWORD PTR 32[esi] | ||
56 | mov ecx, DWORD PTR 36[esi] | ||
57 | bswap eax | ||
58 | bswap ecx | ||
59 | mov DWORD PTR 32[esp],eax | ||
60 | mov DWORD PTR 36[esp],ecx | ||
61 | mov eax, DWORD PTR 40[esi] | ||
62 | mov ecx, DWORD PTR 44[esi] | ||
63 | bswap eax | ||
64 | bswap ecx | ||
65 | mov DWORD PTR 40[esp],eax | ||
66 | mov DWORD PTR 44[esp],ecx | ||
67 | mov eax, DWORD PTR 48[esi] | ||
68 | mov ecx, DWORD PTR 52[esi] | ||
69 | bswap eax | ||
70 | bswap ecx | ||
71 | mov DWORD PTR 48[esp],eax | ||
72 | mov DWORD PTR 52[esp],ecx | ||
73 | mov eax, DWORD PTR 56[esi] | ||
74 | mov ecx, DWORD PTR 60[esi] | ||
75 | bswap eax | ||
76 | bswap ecx | ||
77 | mov DWORD PTR 56[esp],eax | ||
78 | mov DWORD PTR 60[esp],ecx | ||
79 | ; We now have the X array on the stack | ||
80 | ; starting at sp-4 | ||
81 | mov DWORD PTR 132[esp],esi | ||
82 | L001shortcut: | ||
83 | ; | ||
84 | ; Start processing | ||
85 | mov eax, DWORD PTR [ebp] | ||
86 | mov ecx, DWORD PTR 4[ebp] | ||
87 | ; 00_15 0 | ||
88 | mov esi, ebx | ||
89 | mov ebp, eax | ||
90 | xor esi, edx | ||
91 | rol ebp, 5 | ||
92 | and esi, ecx | ||
93 | add ebp, edi | ||
94 | ror ecx, 1 | ||
95 | mov edi, DWORD PTR [esp] | ||
96 | ror ecx, 1 | ||
97 | xor esi, edx | ||
98 | lea ebp, DWORD PTR 1518500249[edi*1+ebp] | ||
99 | mov edi, ecx | ||
100 | add esi, ebp | ||
101 | xor edi, ebx | ||
102 | mov ebp, esi | ||
103 | and edi, eax | ||
104 | rol ebp, 5 | ||
105 | add ebp, edx | ||
106 | mov edx, DWORD PTR 4[esp] | ||
107 | ror eax, 1 | ||
108 | xor edi, ebx | ||
109 | ror eax, 1 | ||
110 | lea ebp, DWORD PTR 1518500249[edx*1+ebp] | ||
111 | add edi, ebp | ||
112 | ; 00_15 2 | ||
113 | mov edx, eax | ||
114 | mov ebp, edi | ||
115 | xor edx, ecx | ||
116 | rol ebp, 5 | ||
117 | and edx, esi | ||
118 | add ebp, ebx | ||
119 | ror esi, 1 | ||
120 | mov ebx, DWORD PTR 8[esp] | ||
121 | ror esi, 1 | ||
122 | xor edx, ecx | ||
123 | lea ebp, DWORD PTR 1518500249[ebx*1+ebp] | ||
124 | mov ebx, esi | ||
125 | add edx, ebp | ||
126 | xor ebx, eax | ||
127 | mov ebp, edx | ||
128 | and ebx, edi | ||
129 | rol ebp, 5 | ||
130 | add ebp, ecx | ||
131 | mov ecx, DWORD PTR 12[esp] | ||
132 | ror edi, 1 | ||
133 | xor ebx, eax | ||
134 | ror edi, 1 | ||
135 | lea ebp, DWORD PTR 1518500249[ecx*1+ebp] | ||
136 | add ebx, ebp | ||
137 | ; 00_15 4 | ||
138 | mov ecx, edi | ||
139 | mov ebp, ebx | ||
140 | xor ecx, esi | ||
141 | rol ebp, 5 | ||
142 | and ecx, edx | ||
143 | add ebp, eax | ||
144 | ror edx, 1 | ||
145 | mov eax, DWORD PTR 16[esp] | ||
146 | ror edx, 1 | ||
147 | xor ecx, esi | ||
148 | lea ebp, DWORD PTR 1518500249[eax*1+ebp] | ||
149 | mov eax, edx | ||
150 | add ecx, ebp | ||
151 | xor eax, edi | ||
152 | mov ebp, ecx | ||
153 | and eax, ebx | ||
154 | rol ebp, 5 | ||
155 | add ebp, esi | ||
156 | mov esi, DWORD PTR 20[esp] | ||
157 | ror ebx, 1 | ||
158 | xor eax, edi | ||
159 | ror ebx, 1 | ||
160 | lea ebp, DWORD PTR 1518500249[esi*1+ebp] | ||
161 | add eax, ebp | ||
162 | ; 00_15 6 | ||
163 | mov esi, ebx | ||
164 | mov ebp, eax | ||
165 | xor esi, edx | ||
166 | rol ebp, 5 | ||
167 | and esi, ecx | ||
168 | add ebp, edi | ||
169 | ror ecx, 1 | ||
170 | mov edi, DWORD PTR 24[esp] | ||
171 | ror ecx, 1 | ||
172 | xor esi, edx | ||
173 | lea ebp, DWORD PTR 1518500249[edi*1+ebp] | ||
174 | mov edi, ecx | ||
175 | add esi, ebp | ||
176 | xor edi, ebx | ||
177 | mov ebp, esi | ||
178 | and edi, eax | ||
179 | rol ebp, 5 | ||
180 | add ebp, edx | ||
181 | mov edx, DWORD PTR 28[esp] | ||
182 | ror eax, 1 | ||
183 | xor edi, ebx | ||
184 | ror eax, 1 | ||
185 | lea ebp, DWORD PTR 1518500249[edx*1+ebp] | ||
186 | add edi, ebp | ||
187 | ; 00_15 8 | ||
188 | mov edx, eax | ||
189 | mov ebp, edi | ||
190 | xor edx, ecx | ||
191 | rol ebp, 5 | ||
192 | and edx, esi | ||
193 | add ebp, ebx | ||
194 | ror esi, 1 | ||
195 | mov ebx, DWORD PTR 32[esp] | ||
196 | ror esi, 1 | ||
197 | xor edx, ecx | ||
198 | lea ebp, DWORD PTR 1518500249[ebx*1+ebp] | ||
199 | mov ebx, esi | ||
200 | add edx, ebp | ||
201 | xor ebx, eax | ||
202 | mov ebp, edx | ||
203 | and ebx, edi | ||
204 | rol ebp, 5 | ||
205 | add ebp, ecx | ||
206 | mov ecx, DWORD PTR 36[esp] | ||
207 | ror edi, 1 | ||
208 | xor ebx, eax | ||
209 | ror edi, 1 | ||
210 | lea ebp, DWORD PTR 1518500249[ecx*1+ebp] | ||
211 | add ebx, ebp | ||
212 | ; 00_15 10 | ||
213 | mov ecx, edi | ||
214 | mov ebp, ebx | ||
215 | xor ecx, esi | ||
216 | rol ebp, 5 | ||
217 | and ecx, edx | ||
218 | add ebp, eax | ||
219 | ror edx, 1 | ||
220 | mov eax, DWORD PTR 40[esp] | ||
221 | ror edx, 1 | ||
222 | xor ecx, esi | ||
223 | lea ebp, DWORD PTR 1518500249[eax*1+ebp] | ||
224 | mov eax, edx | ||
225 | add ecx, ebp | ||
226 | xor eax, edi | ||
227 | mov ebp, ecx | ||
228 | and eax, ebx | ||
229 | rol ebp, 5 | ||
230 | add ebp, esi | ||
231 | mov esi, DWORD PTR 44[esp] | ||
232 | ror ebx, 1 | ||
233 | xor eax, edi | ||
234 | ror ebx, 1 | ||
235 | lea ebp, DWORD PTR 1518500249[esi*1+ebp] | ||
236 | add eax, ebp | ||
237 | ; 00_15 12 | ||
238 | mov esi, ebx | ||
239 | mov ebp, eax | ||
240 | xor esi, edx | ||
241 | rol ebp, 5 | ||
242 | and esi, ecx | ||
243 | add ebp, edi | ||
244 | ror ecx, 1 | ||
245 | mov edi, DWORD PTR 48[esp] | ||
246 | ror ecx, 1 | ||
247 | xor esi, edx | ||
248 | lea ebp, DWORD PTR 1518500249[edi*1+ebp] | ||
249 | mov edi, ecx | ||
250 | add esi, ebp | ||
251 | xor edi, ebx | ||
252 | mov ebp, esi | ||
253 | and edi, eax | ||
254 | rol ebp, 5 | ||
255 | add ebp, edx | ||
256 | mov edx, DWORD PTR 52[esp] | ||
257 | ror eax, 1 | ||
258 | xor edi, ebx | ||
259 | ror eax, 1 | ||
260 | lea ebp, DWORD PTR 1518500249[edx*1+ebp] | ||
261 | add edi, ebp | ||
262 | ; 00_15 14 | ||
263 | mov edx, eax | ||
264 | mov ebp, edi | ||
265 | xor edx, ecx | ||
266 | rol ebp, 5 | ||
267 | and edx, esi | ||
268 | add ebp, ebx | ||
269 | ror esi, 1 | ||
270 | mov ebx, DWORD PTR 56[esp] | ||
271 | ror esi, 1 | ||
272 | xor edx, ecx | ||
273 | lea ebp, DWORD PTR 1518500249[ebx*1+ebp] | ||
274 | mov ebx, esi | ||
275 | add edx, ebp | ||
276 | xor ebx, eax | ||
277 | mov ebp, edx | ||
278 | and ebx, edi | ||
279 | rol ebp, 5 | ||
280 | add ebp, ecx | ||
281 | mov ecx, DWORD PTR 60[esp] | ||
282 | ror edi, 1 | ||
283 | xor ebx, eax | ||
284 | ror edi, 1 | ||
285 | lea ebp, DWORD PTR 1518500249[ecx*1+ebp] | ||
286 | add ebx, ebp | ||
287 | ; 16_19 16 | ||
288 | nop | ||
289 | mov ebp, DWORD PTR [esp] | ||
290 | mov ecx, DWORD PTR 8[esp] | ||
291 | xor ecx, ebp | ||
292 | mov ebp, DWORD PTR 32[esp] | ||
293 | xor ecx, ebp | ||
294 | mov ebp, DWORD PTR 52[esp] | ||
295 | xor ecx, ebp | ||
296 | mov ebp, edi | ||
297 | rol ecx, 1 | ||
298 | xor ebp, esi | ||
299 | mov DWORD PTR [esp],ecx | ||
300 | and ebp, edx | ||
301 | lea ecx, DWORD PTR 1518500249[eax*1+ecx] | ||
302 | xor ebp, esi | ||
303 | mov eax, ebx | ||
304 | add ecx, ebp | ||
305 | rol eax, 5 | ||
306 | ror edx, 1 | ||
307 | add ecx, eax | ||
308 | mov eax, DWORD PTR 4[esp] | ||
309 | mov ebp, DWORD PTR 12[esp] | ||
310 | xor eax, ebp | ||
311 | mov ebp, DWORD PTR 36[esp] | ||
312 | xor eax, ebp | ||
313 | mov ebp, DWORD PTR 56[esp] | ||
314 | ror edx, 1 | ||
315 | xor eax, ebp | ||
316 | rol eax, 1 | ||
317 | mov ebp, edx | ||
318 | xor ebp, edi | ||
319 | mov DWORD PTR 4[esp],eax | ||
320 | and ebp, ebx | ||
321 | lea eax, DWORD PTR 1518500249[esi*1+eax] | ||
322 | xor ebp, edi | ||
323 | mov esi, ecx | ||
324 | rol esi, 5 | ||
325 | ror ebx, 1 | ||
326 | add eax, esi | ||
327 | ror ebx, 1 | ||
328 | add eax, ebp | ||
329 | ; 16_19 18 | ||
330 | mov ebp, DWORD PTR 8[esp] | ||
331 | mov esi, DWORD PTR 16[esp] | ||
332 | xor esi, ebp | ||
333 | mov ebp, DWORD PTR 40[esp] | ||
334 | xor esi, ebp | ||
335 | mov ebp, DWORD PTR 60[esp] | ||
336 | xor esi, ebp | ||
337 | mov ebp, ebx | ||
338 | rol esi, 1 | ||
339 | xor ebp, edx | ||
340 | mov DWORD PTR 8[esp],esi | ||
341 | and ebp, ecx | ||
342 | lea esi, DWORD PTR 1518500249[edi*1+esi] | ||
343 | xor ebp, edx | ||
344 | mov edi, eax | ||
345 | add esi, ebp | ||
346 | rol edi, 5 | ||
347 | ror ecx, 1 | ||
348 | add esi, edi | ||
349 | mov edi, DWORD PTR 12[esp] | ||
350 | mov ebp, DWORD PTR 20[esp] | ||
351 | xor edi, ebp | ||
352 | mov ebp, DWORD PTR 44[esp] | ||
353 | xor edi, ebp | ||
354 | mov ebp, DWORD PTR [esp] | ||
355 | ror ecx, 1 | ||
356 | xor edi, ebp | ||
357 | rol edi, 1 | ||
358 | mov ebp, ecx | ||
359 | xor ebp, ebx | ||
360 | mov DWORD PTR 12[esp],edi | ||
361 | and ebp, eax | ||
362 | lea edi, DWORD PTR 1518500249[edx*1+edi] | ||
363 | xor ebp, ebx | ||
364 | mov edx, esi | ||
365 | rol edx, 5 | ||
366 | ror eax, 1 | ||
367 | add edi, edx | ||
368 | ror eax, 1 | ||
369 | add edi, ebp | ||
370 | ; 20_39 20 | ||
371 | mov edx, DWORD PTR 16[esp] | ||
372 | mov ebp, DWORD PTR 24[esp] | ||
373 | xor edx, ebp | ||
374 | mov ebp, DWORD PTR 48[esp] | ||
375 | xor edx, ebp | ||
376 | mov ebp, DWORD PTR 4[esp] | ||
377 | xor edx, ebp | ||
378 | mov ebp, esi | ||
379 | rol edx, 1 | ||
380 | xor ebp, eax | ||
381 | mov DWORD PTR 16[esp],edx | ||
382 | xor ebp, ecx | ||
383 | lea edx, DWORD PTR 1859775393[ebx*1+edx] | ||
384 | mov ebx, edi | ||
385 | rol ebx, 5 | ||
386 | ror esi, 1 | ||
387 | add ebx, ebp | ||
388 | ror esi, 1 | ||
389 | add edx, ebx | ||
390 | ; 20_39 21 | ||
391 | mov ebx, DWORD PTR 20[esp] | ||
392 | mov ebp, DWORD PTR 28[esp] | ||
393 | xor ebx, ebp | ||
394 | mov ebp, DWORD PTR 52[esp] | ||
395 | xor ebx, ebp | ||
396 | mov ebp, DWORD PTR 8[esp] | ||
397 | xor ebx, ebp | ||
398 | mov ebp, edi | ||
399 | rol ebx, 1 | ||
400 | xor ebp, esi | ||
401 | mov DWORD PTR 20[esp],ebx | ||
402 | xor ebp, eax | ||
403 | lea ebx, DWORD PTR 1859775393[ecx*1+ebx] | ||
404 | mov ecx, edx | ||
405 | rol ecx, 5 | ||
406 | ror edi, 1 | ||
407 | add ecx, ebp | ||
408 | ror edi, 1 | ||
409 | add ebx, ecx | ||
410 | ; 20_39 22 | ||
411 | mov ecx, DWORD PTR 24[esp] | ||
412 | mov ebp, DWORD PTR 32[esp] | ||
413 | xor ecx, ebp | ||
414 | mov ebp, DWORD PTR 56[esp] | ||
415 | xor ecx, ebp | ||
416 | mov ebp, DWORD PTR 12[esp] | ||
417 | xor ecx, ebp | ||
418 | mov ebp, edx | ||
419 | rol ecx, 1 | ||
420 | xor ebp, edi | ||
421 | mov DWORD PTR 24[esp],ecx | ||
422 | xor ebp, esi | ||
423 | lea ecx, DWORD PTR 1859775393[eax*1+ecx] | ||
424 | mov eax, ebx | ||
425 | rol eax, 5 | ||
426 | ror edx, 1 | ||
427 | add eax, ebp | ||
428 | ror edx, 1 | ||
429 | add ecx, eax | ||
430 | ; 20_39 23 | ||
431 | mov eax, DWORD PTR 28[esp] | ||
432 | mov ebp, DWORD PTR 36[esp] | ||
433 | xor eax, ebp | ||
434 | mov ebp, DWORD PTR 60[esp] | ||
435 | xor eax, ebp | ||
436 | mov ebp, DWORD PTR 16[esp] | ||
437 | xor eax, ebp | ||
438 | mov ebp, ebx | ||
439 | rol eax, 1 | ||
440 | xor ebp, edx | ||
441 | mov DWORD PTR 28[esp],eax | ||
442 | xor ebp, edi | ||
443 | lea eax, DWORD PTR 1859775393[esi*1+eax] | ||
444 | mov esi, ecx | ||
445 | rol esi, 5 | ||
446 | ror ebx, 1 | ||
447 | add esi, ebp | ||
448 | ror ebx, 1 | ||
449 | add eax, esi | ||
450 | ; 20_39 24 | ||
451 | mov esi, DWORD PTR 32[esp] | ||
452 | mov ebp, DWORD PTR 40[esp] | ||
453 | xor esi, ebp | ||
454 | mov ebp, DWORD PTR [esp] | ||
455 | xor esi, ebp | ||
456 | mov ebp, DWORD PTR 20[esp] | ||
457 | xor esi, ebp | ||
458 | mov ebp, ecx | ||
459 | rol esi, 1 | ||
460 | xor ebp, ebx | ||
461 | mov DWORD PTR 32[esp],esi | ||
462 | xor ebp, edx | ||
463 | lea esi, DWORD PTR 1859775393[edi*1+esi] | ||
464 | mov edi, eax | ||
465 | rol edi, 5 | ||
466 | ror ecx, 1 | ||
467 | add edi, ebp | ||
468 | ror ecx, 1 | ||
469 | add esi, edi | ||
470 | ; 20_39 25 | ||
471 | mov edi, DWORD PTR 36[esp] | ||
472 | mov ebp, DWORD PTR 44[esp] | ||
473 | xor edi, ebp | ||
474 | mov ebp, DWORD PTR 4[esp] | ||
475 | xor edi, ebp | ||
476 | mov ebp, DWORD PTR 24[esp] | ||
477 | xor edi, ebp | ||
478 | mov ebp, eax | ||
479 | rol edi, 1 | ||
480 | xor ebp, ecx | ||
481 | mov DWORD PTR 36[esp],edi | ||
482 | xor ebp, ebx | ||
483 | lea edi, DWORD PTR 1859775393[edx*1+edi] | ||
484 | mov edx, esi | ||
485 | rol edx, 5 | ||
486 | ror eax, 1 | ||
487 | add edx, ebp | ||
488 | ror eax, 1 | ||
489 | add edi, edx | ||
490 | ; 20_39 26 | ||
491 | mov edx, DWORD PTR 40[esp] | ||
492 | mov ebp, DWORD PTR 48[esp] | ||
493 | xor edx, ebp | ||
494 | mov ebp, DWORD PTR 8[esp] | ||
495 | xor edx, ebp | ||
496 | mov ebp, DWORD PTR 28[esp] | ||
497 | xor edx, ebp | ||
498 | mov ebp, esi | ||
499 | rol edx, 1 | ||
500 | xor ebp, eax | ||
501 | mov DWORD PTR 40[esp],edx | ||
502 | xor ebp, ecx | ||
503 | lea edx, DWORD PTR 1859775393[ebx*1+edx] | ||
504 | mov ebx, edi | ||
505 | rol ebx, 5 | ||
506 | ror esi, 1 | ||
507 | add ebx, ebp | ||
508 | ror esi, 1 | ||
509 | add edx, ebx | ||
510 | ; 20_39 27 | ||
511 | mov ebx, DWORD PTR 44[esp] | ||
512 | mov ebp, DWORD PTR 52[esp] | ||
513 | xor ebx, ebp | ||
514 | mov ebp, DWORD PTR 12[esp] | ||
515 | xor ebx, ebp | ||
516 | mov ebp, DWORD PTR 32[esp] | ||
517 | xor ebx, ebp | ||
518 | mov ebp, edi | ||
519 | rol ebx, 1 | ||
520 | xor ebp, esi | ||
521 | mov DWORD PTR 44[esp],ebx | ||
522 | xor ebp, eax | ||
523 | lea ebx, DWORD PTR 1859775393[ecx*1+ebx] | ||
524 | mov ecx, edx | ||
525 | rol ecx, 5 | ||
526 | ror edi, 1 | ||
527 | add ecx, ebp | ||
528 | ror edi, 1 | ||
529 | add ebx, ecx | ||
530 | ; 20_39 28 | ||
531 | mov ecx, DWORD PTR 48[esp] | ||
532 | mov ebp, DWORD PTR 56[esp] | ||
533 | xor ecx, ebp | ||
534 | mov ebp, DWORD PTR 16[esp] | ||
535 | xor ecx, ebp | ||
536 | mov ebp, DWORD PTR 36[esp] | ||
537 | xor ecx, ebp | ||
538 | mov ebp, edx | ||
539 | rol ecx, 1 | ||
540 | xor ebp, edi | ||
541 | mov DWORD PTR 48[esp],ecx | ||
542 | xor ebp, esi | ||
543 | lea ecx, DWORD PTR 1859775393[eax*1+ecx] | ||
544 | mov eax, ebx | ||
545 | rol eax, 5 | ||
546 | ror edx, 1 | ||
547 | add eax, ebp | ||
548 | ror edx, 1 | ||
549 | add ecx, eax | ||
550 | ; 20_39 29 | ||
551 | mov eax, DWORD PTR 52[esp] | ||
552 | mov ebp, DWORD PTR 60[esp] | ||
553 | xor eax, ebp | ||
554 | mov ebp, DWORD PTR 20[esp] | ||
555 | xor eax, ebp | ||
556 | mov ebp, DWORD PTR 40[esp] | ||
557 | xor eax, ebp | ||
558 | mov ebp, ebx | ||
559 | rol eax, 1 | ||
560 | xor ebp, edx | ||
561 | mov DWORD PTR 52[esp],eax | ||
562 | xor ebp, edi | ||
563 | lea eax, DWORD PTR 1859775393[esi*1+eax] | ||
564 | mov esi, ecx | ||
565 | rol esi, 5 | ||
566 | ror ebx, 1 | ||
567 | add esi, ebp | ||
568 | ror ebx, 1 | ||
569 | add eax, esi | ||
570 | ; 20_39 30 | ||
571 | mov esi, DWORD PTR 56[esp] | ||
572 | mov ebp, DWORD PTR [esp] | ||
573 | xor esi, ebp | ||
574 | mov ebp, DWORD PTR 24[esp] | ||
575 | xor esi, ebp | ||
576 | mov ebp, DWORD PTR 44[esp] | ||
577 | xor esi, ebp | ||
578 | mov ebp, ecx | ||
579 | rol esi, 1 | ||
580 | xor ebp, ebx | ||
581 | mov DWORD PTR 56[esp],esi | ||
582 | xor ebp, edx | ||
583 | lea esi, DWORD PTR 1859775393[edi*1+esi] | ||
584 | mov edi, eax | ||
585 | rol edi, 5 | ||
586 | ror ecx, 1 | ||
587 | add edi, ebp | ||
588 | ror ecx, 1 | ||
589 | add esi, edi | ||
590 | ; 20_39 31 | ||
591 | mov edi, DWORD PTR 60[esp] | ||
592 | mov ebp, DWORD PTR 4[esp] | ||
593 | xor edi, ebp | ||
594 | mov ebp, DWORD PTR 28[esp] | ||
595 | xor edi, ebp | ||
596 | mov ebp, DWORD PTR 48[esp] | ||
597 | xor edi, ebp | ||
598 | mov ebp, eax | ||
599 | rol edi, 1 | ||
600 | xor ebp, ecx | ||
601 | mov DWORD PTR 60[esp],edi | ||
602 | xor ebp, ebx | ||
603 | lea edi, DWORD PTR 1859775393[edx*1+edi] | ||
604 | mov edx, esi | ||
605 | rol edx, 5 | ||
606 | ror eax, 1 | ||
607 | add edx, ebp | ||
608 | ror eax, 1 | ||
609 | add edi, edx | ||
610 | ; 20_39 32 | ||
611 | mov edx, DWORD PTR [esp] | ||
612 | mov ebp, DWORD PTR 8[esp] | ||
613 | xor edx, ebp | ||
614 | mov ebp, DWORD PTR 32[esp] | ||
615 | xor edx, ebp | ||
616 | mov ebp, DWORD PTR 52[esp] | ||
617 | xor edx, ebp | ||
618 | mov ebp, esi | ||
619 | rol edx, 1 | ||
620 | xor ebp, eax | ||
621 | mov DWORD PTR [esp],edx | ||
622 | xor ebp, ecx | ||
623 | lea edx, DWORD PTR 1859775393[ebx*1+edx] | ||
624 | mov ebx, edi | ||
625 | rol ebx, 5 | ||
626 | ror esi, 1 | ||
627 | add ebx, ebp | ||
628 | ror esi, 1 | ||
629 | add edx, ebx | ||
630 | ; 20_39 33 | ||
631 | mov ebx, DWORD PTR 4[esp] | ||
632 | mov ebp, DWORD PTR 12[esp] | ||
633 | xor ebx, ebp | ||
634 | mov ebp, DWORD PTR 36[esp] | ||
635 | xor ebx, ebp | ||
636 | mov ebp, DWORD PTR 56[esp] | ||
637 | xor ebx, ebp | ||
638 | mov ebp, edi | ||
639 | rol ebx, 1 | ||
640 | xor ebp, esi | ||
641 | mov DWORD PTR 4[esp],ebx | ||
642 | xor ebp, eax | ||
643 | lea ebx, DWORD PTR 1859775393[ecx*1+ebx] | ||
644 | mov ecx, edx | ||
645 | rol ecx, 5 | ||
646 | ror edi, 1 | ||
647 | add ecx, ebp | ||
648 | ror edi, 1 | ||
649 | add ebx, ecx | ||
650 | ; 20_39 34 | ||
651 | mov ecx, DWORD PTR 8[esp] | ||
652 | mov ebp, DWORD PTR 16[esp] | ||
653 | xor ecx, ebp | ||
654 | mov ebp, DWORD PTR 40[esp] | ||
655 | xor ecx, ebp | ||
656 | mov ebp, DWORD PTR 60[esp] | ||
657 | xor ecx, ebp | ||
658 | mov ebp, edx | ||
659 | rol ecx, 1 | ||
660 | xor ebp, edi | ||
661 | mov DWORD PTR 8[esp],ecx | ||
662 | xor ebp, esi | ||
663 | lea ecx, DWORD PTR 1859775393[eax*1+ecx] | ||
664 | mov eax, ebx | ||
665 | rol eax, 5 | ||
666 | ror edx, 1 | ||
667 | add eax, ebp | ||
668 | ror edx, 1 | ||
669 | add ecx, eax | ||
670 | ; 20_39 35 | ||
671 | mov eax, DWORD PTR 12[esp] | ||
672 | mov ebp, DWORD PTR 20[esp] | ||
673 | xor eax, ebp | ||
674 | mov ebp, DWORD PTR 44[esp] | ||
675 | xor eax, ebp | ||
676 | mov ebp, DWORD PTR [esp] | ||
677 | xor eax, ebp | ||
678 | mov ebp, ebx | ||
679 | rol eax, 1 | ||
680 | xor ebp, edx | ||
681 | mov DWORD PTR 12[esp],eax | ||
682 | xor ebp, edi | ||
683 | lea eax, DWORD PTR 1859775393[esi*1+eax] | ||
684 | mov esi, ecx | ||
685 | rol esi, 5 | ||
686 | ror ebx, 1 | ||
687 | add esi, ebp | ||
688 | ror ebx, 1 | ||
689 | add eax, esi | ||
690 | ; 20_39 36 | ||
691 | mov esi, DWORD PTR 16[esp] | ||
692 | mov ebp, DWORD PTR 24[esp] | ||
693 | xor esi, ebp | ||
694 | mov ebp, DWORD PTR 48[esp] | ||
695 | xor esi, ebp | ||
696 | mov ebp, DWORD PTR 4[esp] | ||
697 | xor esi, ebp | ||
698 | mov ebp, ecx | ||
699 | rol esi, 1 | ||
700 | xor ebp, ebx | ||
701 | mov DWORD PTR 16[esp],esi | ||
702 | xor ebp, edx | ||
703 | lea esi, DWORD PTR 1859775393[edi*1+esi] | ||
704 | mov edi, eax | ||
705 | rol edi, 5 | ||
706 | ror ecx, 1 | ||
707 | add edi, ebp | ||
708 | ror ecx, 1 | ||
709 | add esi, edi | ||
710 | ; 20_39 37 | ||
711 | mov edi, DWORD PTR 20[esp] | ||
712 | mov ebp, DWORD PTR 28[esp] | ||
713 | xor edi, ebp | ||
714 | mov ebp, DWORD PTR 52[esp] | ||
715 | xor edi, ebp | ||
716 | mov ebp, DWORD PTR 8[esp] | ||
717 | xor edi, ebp | ||
718 | mov ebp, eax | ||
719 | rol edi, 1 | ||
720 | xor ebp, ecx | ||
721 | mov DWORD PTR 20[esp],edi | ||
722 | xor ebp, ebx | ||
723 | lea edi, DWORD PTR 1859775393[edx*1+edi] | ||
724 | mov edx, esi | ||
725 | rol edx, 5 | ||
726 | ror eax, 1 | ||
727 | add edx, ebp | ||
728 | ror eax, 1 | ||
729 | add edi, edx | ||
730 | ; 20_39 38 | ||
731 | mov edx, DWORD PTR 24[esp] | ||
732 | mov ebp, DWORD PTR 32[esp] | ||
733 | xor edx, ebp | ||
734 | mov ebp, DWORD PTR 56[esp] | ||
735 | xor edx, ebp | ||
736 | mov ebp, DWORD PTR 12[esp] | ||
737 | xor edx, ebp | ||
738 | mov ebp, esi | ||
739 | rol edx, 1 | ||
740 | xor ebp, eax | ||
741 | mov DWORD PTR 24[esp],edx | ||
742 | xor ebp, ecx | ||
743 | lea edx, DWORD PTR 1859775393[ebx*1+edx] | ||
744 | mov ebx, edi | ||
745 | rol ebx, 5 | ||
746 | ror esi, 1 | ||
747 | add ebx, ebp | ||
748 | ror esi, 1 | ||
749 | add edx, ebx | ||
750 | ; 20_39 39 | ||
751 | mov ebx, DWORD PTR 28[esp] | ||
752 | mov ebp, DWORD PTR 36[esp] | ||
753 | xor ebx, ebp | ||
754 | mov ebp, DWORD PTR 60[esp] | ||
755 | xor ebx, ebp | ||
756 | mov ebp, DWORD PTR 16[esp] | ||
757 | xor ebx, ebp | ||
758 | mov ebp, edi | ||
759 | rol ebx, 1 | ||
760 | xor ebp, esi | ||
761 | mov DWORD PTR 28[esp],ebx | ||
762 | xor ebp, eax | ||
763 | lea ebx, DWORD PTR 1859775393[ecx*1+ebx] | ||
764 | mov ecx, edx | ||
765 | rol ecx, 5 | ||
766 | ror edi, 1 | ||
767 | add ecx, ebp | ||
768 | ror edi, 1 | ||
769 | add ebx, ecx | ||
770 | ; 40_59 40 | ||
771 | mov ecx, DWORD PTR 32[esp] | ||
772 | mov ebp, DWORD PTR 40[esp] | ||
773 | xor ecx, ebp | ||
774 | mov ebp, DWORD PTR [esp] | ||
775 | xor ecx, ebp | ||
776 | mov ebp, DWORD PTR 20[esp] | ||
777 | xor ecx, ebp | ||
778 | mov ebp, edx | ||
779 | rol ecx, 1 | ||
780 | or ebp, edi | ||
781 | mov DWORD PTR 32[esp],ecx | ||
782 | and ebp, esi | ||
783 | lea ecx, DWORD PTR 2400959708[eax*1+ecx] | ||
784 | mov eax, edx | ||
785 | ror edx, 1 | ||
786 | and eax, edi | ||
787 | or ebp, eax | ||
788 | mov eax, ebx | ||
789 | rol eax, 5 | ||
790 | add ebp, eax | ||
791 | mov eax, DWORD PTR 36[esp] | ||
792 | add ecx, ebp | ||
793 | mov ebp, DWORD PTR 44[esp] | ||
794 | xor eax, ebp | ||
795 | mov ebp, DWORD PTR 4[esp] | ||
796 | xor eax, ebp | ||
797 | mov ebp, DWORD PTR 24[esp] | ||
798 | ror edx, 1 | ||
799 | xor eax, ebp | ||
800 | rol eax, 1 | ||
801 | mov ebp, ebx | ||
802 | mov DWORD PTR 36[esp],eax | ||
803 | or ebp, edx | ||
804 | lea eax, DWORD PTR 2400959708[esi*1+eax] | ||
805 | mov esi, ebx | ||
806 | and ebp, edi | ||
807 | and esi, edx | ||
808 | or ebp, esi | ||
809 | mov esi, ecx | ||
810 | rol esi, 5 | ||
811 | ror ebx, 1 | ||
812 | add ebp, esi | ||
813 | ror ebx, 1 | ||
814 | add eax, ebp | ||
815 | ; 40_59 41 | ||
816 | ; 40_59 42 | ||
817 | mov esi, DWORD PTR 40[esp] | ||
818 | mov ebp, DWORD PTR 48[esp] | ||
819 | xor esi, ebp | ||
820 | mov ebp, DWORD PTR 8[esp] | ||
821 | xor esi, ebp | ||
822 | mov ebp, DWORD PTR 28[esp] | ||
823 | xor esi, ebp | ||
824 | mov ebp, ecx | ||
825 | rol esi, 1 | ||
826 | or ebp, ebx | ||
827 | mov DWORD PTR 40[esp],esi | ||
828 | and ebp, edx | ||
829 | lea esi, DWORD PTR 2400959708[edi*1+esi] | ||
830 | mov edi, ecx | ||
831 | ror ecx, 1 | ||
832 | and edi, ebx | ||
833 | or ebp, edi | ||
834 | mov edi, eax | ||
835 | rol edi, 5 | ||
836 | add ebp, edi | ||
837 | mov edi, DWORD PTR 44[esp] | ||
838 | add esi, ebp | ||
839 | mov ebp, DWORD PTR 52[esp] | ||
840 | xor edi, ebp | ||
841 | mov ebp, DWORD PTR 12[esp] | ||
842 | xor edi, ebp | ||
843 | mov ebp, DWORD PTR 32[esp] | ||
844 | ror ecx, 1 | ||
845 | xor edi, ebp | ||
846 | rol edi, 1 | ||
847 | mov ebp, eax | ||
848 | mov DWORD PTR 44[esp],edi | ||
849 | or ebp, ecx | ||
850 | lea edi, DWORD PTR 2400959708[edx*1+edi] | ||
851 | mov edx, eax | ||
852 | and ebp, ebx | ||
853 | and edx, ecx | ||
854 | or ebp, edx | ||
855 | mov edx, esi | ||
856 | rol edx, 5 | ||
857 | ror eax, 1 | ||
858 | add ebp, edx | ||
859 | ror eax, 1 | ||
860 | add edi, ebp | ||
861 | ; 40_59 43 | ||
862 | ; 40_59 44 | ||
863 | mov edx, DWORD PTR 48[esp] | ||
864 | mov ebp, DWORD PTR 56[esp] | ||
865 | xor edx, ebp | ||
866 | mov ebp, DWORD PTR 16[esp] | ||
867 | xor edx, ebp | ||
868 | mov ebp, DWORD PTR 36[esp] | ||
869 | xor edx, ebp | ||
870 | mov ebp, esi | ||
871 | rol edx, 1 | ||
872 | or ebp, eax | ||
873 | mov DWORD PTR 48[esp],edx | ||
874 | and ebp, ecx | ||
875 | lea edx, DWORD PTR 2400959708[ebx*1+edx] | ||
876 | mov ebx, esi | ||
877 | ror esi, 1 | ||
878 | and ebx, eax | ||
879 | or ebp, ebx | ||
880 | mov ebx, edi | ||
881 | rol ebx, 5 | ||
882 | add ebp, ebx | ||
883 | mov ebx, DWORD PTR 52[esp] | ||
884 | add edx, ebp | ||
885 | mov ebp, DWORD PTR 60[esp] | ||
886 | xor ebx, ebp | ||
887 | mov ebp, DWORD PTR 20[esp] | ||
888 | xor ebx, ebp | ||
889 | mov ebp, DWORD PTR 40[esp] | ||
890 | ror esi, 1 | ||
891 | xor ebx, ebp | ||
892 | rol ebx, 1 | ||
893 | mov ebp, edi | ||
894 | mov DWORD PTR 52[esp],ebx | ||
895 | or ebp, esi | ||
896 | lea ebx, DWORD PTR 2400959708[ecx*1+ebx] | ||
897 | mov ecx, edi | ||
898 | and ebp, eax | ||
899 | and ecx, esi | ||
900 | or ebp, ecx | ||
901 | mov ecx, edx | ||
902 | rol ecx, 5 | ||
903 | ror edi, 1 | ||
904 | add ebp, ecx | ||
905 | ror edi, 1 | ||
906 | add ebx, ebp | ||
907 | ; 40_59 45 | ||
908 | ; 40_59 46 | ||
909 | mov ecx, DWORD PTR 56[esp] | ||
910 | mov ebp, DWORD PTR [esp] | ||
911 | xor ecx, ebp | ||
912 | mov ebp, DWORD PTR 24[esp] | ||
913 | xor ecx, ebp | ||
914 | mov ebp, DWORD PTR 44[esp] | ||
915 | xor ecx, ebp | ||
916 | mov ebp, edx | ||
917 | rol ecx, 1 | ||
918 | or ebp, edi | ||
919 | mov DWORD PTR 56[esp],ecx | ||
920 | and ebp, esi | ||
921 | lea ecx, DWORD PTR 2400959708[eax*1+ecx] | ||
922 | mov eax, edx | ||
923 | ror edx, 1 | ||
924 | and eax, edi | ||
925 | or ebp, eax | ||
926 | mov eax, ebx | ||
927 | rol eax, 5 | ||
928 | add ebp, eax | ||
929 | mov eax, DWORD PTR 60[esp] | ||
930 | add ecx, ebp | ||
931 | mov ebp, DWORD PTR 4[esp] | ||
932 | xor eax, ebp | ||
933 | mov ebp, DWORD PTR 28[esp] | ||
934 | xor eax, ebp | ||
935 | mov ebp, DWORD PTR 48[esp] | ||
936 | ror edx, 1 | ||
937 | xor eax, ebp | ||
938 | rol eax, 1 | ||
939 | mov ebp, ebx | ||
940 | mov DWORD PTR 60[esp],eax | ||
941 | or ebp, edx | ||
942 | lea eax, DWORD PTR 2400959708[esi*1+eax] | ||
943 | mov esi, ebx | ||
944 | and ebp, edi | ||
945 | and esi, edx | ||
946 | or ebp, esi | ||
947 | mov esi, ecx | ||
948 | rol esi, 5 | ||
949 | ror ebx, 1 | ||
950 | add ebp, esi | ||
951 | ror ebx, 1 | ||
952 | add eax, ebp | ||
953 | ; 40_59 47 | ||
954 | ; 40_59 48 | ||
955 | mov esi, DWORD PTR [esp] | ||
956 | mov ebp, DWORD PTR 8[esp] | ||
957 | xor esi, ebp | ||
958 | mov ebp, DWORD PTR 32[esp] | ||
959 | xor esi, ebp | ||
960 | mov ebp, DWORD PTR 52[esp] | ||
961 | xor esi, ebp | ||
962 | mov ebp, ecx | ||
963 | rol esi, 1 | ||
964 | or ebp, ebx | ||
965 | mov DWORD PTR [esp],esi | ||
966 | and ebp, edx | ||
967 | lea esi, DWORD PTR 2400959708[edi*1+esi] | ||
968 | mov edi, ecx | ||
969 | ror ecx, 1 | ||
970 | and edi, ebx | ||
971 | or ebp, edi | ||
972 | mov edi, eax | ||
973 | rol edi, 5 | ||
974 | add ebp, edi | ||
975 | mov edi, DWORD PTR 4[esp] | ||
976 | add esi, ebp | ||
977 | mov ebp, DWORD PTR 12[esp] | ||
978 | xor edi, ebp | ||
979 | mov ebp, DWORD PTR 36[esp] | ||
980 | xor edi, ebp | ||
981 | mov ebp, DWORD PTR 56[esp] | ||
982 | ror ecx, 1 | ||
983 | xor edi, ebp | ||
984 | rol edi, 1 | ||
985 | mov ebp, eax | ||
986 | mov DWORD PTR 4[esp],edi | ||
987 | or ebp, ecx | ||
988 | lea edi, DWORD PTR 2400959708[edx*1+edi] | ||
989 | mov edx, eax | ||
990 | and ebp, ebx | ||
991 | and edx, ecx | ||
992 | or ebp, edx | ||
993 | mov edx, esi | ||
994 | rol edx, 5 | ||
995 | ror eax, 1 | ||
996 | add ebp, edx | ||
997 | ror eax, 1 | ||
998 | add edi, ebp | ||
999 | ; 40_59 49 | ||
1000 | ; 40_59 50 | ||
1001 | mov edx, DWORD PTR 8[esp] | ||
1002 | mov ebp, DWORD PTR 16[esp] | ||
1003 | xor edx, ebp | ||
1004 | mov ebp, DWORD PTR 40[esp] | ||
1005 | xor edx, ebp | ||
1006 | mov ebp, DWORD PTR 60[esp] | ||
1007 | xor edx, ebp | ||
1008 | mov ebp, esi | ||
1009 | rol edx, 1 | ||
1010 | or ebp, eax | ||
1011 | mov DWORD PTR 8[esp],edx | ||
1012 | and ebp, ecx | ||
1013 | lea edx, DWORD PTR 2400959708[ebx*1+edx] | ||
1014 | mov ebx, esi | ||
1015 | ror esi, 1 | ||
1016 | and ebx, eax | ||
1017 | or ebp, ebx | ||
1018 | mov ebx, edi | ||
1019 | rol ebx, 5 | ||
1020 | add ebp, ebx | ||
1021 | mov ebx, DWORD PTR 12[esp] | ||
1022 | add edx, ebp | ||
1023 | mov ebp, DWORD PTR 20[esp] | ||
1024 | xor ebx, ebp | ||
1025 | mov ebp, DWORD PTR 44[esp] | ||
1026 | xor ebx, ebp | ||
1027 | mov ebp, DWORD PTR [esp] | ||
1028 | ror esi, 1 | ||
1029 | xor ebx, ebp | ||
1030 | rol ebx, 1 | ||
1031 | mov ebp, edi | ||
1032 | mov DWORD PTR 12[esp],ebx | ||
1033 | or ebp, esi | ||
1034 | lea ebx, DWORD PTR 2400959708[ecx*1+ebx] | ||
1035 | mov ecx, edi | ||
1036 | and ebp, eax | ||
1037 | and ecx, esi | ||
1038 | or ebp, ecx | ||
1039 | mov ecx, edx | ||
1040 | rol ecx, 5 | ||
1041 | ror edi, 1 | ||
1042 | add ebp, ecx | ||
1043 | ror edi, 1 | ||
1044 | add ebx, ebp | ||
1045 | ; 40_59 51 | ||
1046 | ; 40_59 52 | ||
1047 | mov ecx, DWORD PTR 16[esp] | ||
1048 | mov ebp, DWORD PTR 24[esp] | ||
1049 | xor ecx, ebp | ||
1050 | mov ebp, DWORD PTR 48[esp] | ||
1051 | xor ecx, ebp | ||
1052 | mov ebp, DWORD PTR 4[esp] | ||
1053 | xor ecx, ebp | ||
1054 | mov ebp, edx | ||
1055 | rol ecx, 1 | ||
1056 | or ebp, edi | ||
1057 | mov DWORD PTR 16[esp],ecx | ||
1058 | and ebp, esi | ||
1059 | lea ecx, DWORD PTR 2400959708[eax*1+ecx] | ||
1060 | mov eax, edx | ||
1061 | ror edx, 1 | ||
1062 | and eax, edi | ||
1063 | or ebp, eax | ||
1064 | mov eax, ebx | ||
1065 | rol eax, 5 | ||
1066 | add ebp, eax | ||
1067 | mov eax, DWORD PTR 20[esp] | ||
1068 | add ecx, ebp | ||
1069 | mov ebp, DWORD PTR 28[esp] | ||
1070 | xor eax, ebp | ||
1071 | mov ebp, DWORD PTR 52[esp] | ||
1072 | xor eax, ebp | ||
1073 | mov ebp, DWORD PTR 8[esp] | ||
1074 | ror edx, 1 | ||
1075 | xor eax, ebp | ||
1076 | rol eax, 1 | ||
1077 | mov ebp, ebx | ||
1078 | mov DWORD PTR 20[esp],eax | ||
1079 | or ebp, edx | ||
1080 | lea eax, DWORD PTR 2400959708[esi*1+eax] | ||
1081 | mov esi, ebx | ||
1082 | and ebp, edi | ||
1083 | and esi, edx | ||
1084 | or ebp, esi | ||
1085 | mov esi, ecx | ||
1086 | rol esi, 5 | ||
1087 | ror ebx, 1 | ||
1088 | add ebp, esi | ||
1089 | ror ebx, 1 | ||
1090 | add eax, ebp | ||
1091 | ; 40_59 53 | ||
1092 | ; 40_59 54 | ||
1093 | mov esi, DWORD PTR 24[esp] | ||
1094 | mov ebp, DWORD PTR 32[esp] | ||
1095 | xor esi, ebp | ||
1096 | mov ebp, DWORD PTR 56[esp] | ||
1097 | xor esi, ebp | ||
1098 | mov ebp, DWORD PTR 12[esp] | ||
1099 | xor esi, ebp | ||
1100 | mov ebp, ecx | ||
1101 | rol esi, 1 | ||
1102 | or ebp, ebx | ||
1103 | mov DWORD PTR 24[esp],esi | ||
1104 | and ebp, edx | ||
1105 | lea esi, DWORD PTR 2400959708[edi*1+esi] | ||
1106 | mov edi, ecx | ||
1107 | ror ecx, 1 | ||
1108 | and edi, ebx | ||
1109 | or ebp, edi | ||
1110 | mov edi, eax | ||
1111 | rol edi, 5 | ||
1112 | add ebp, edi | ||
1113 | mov edi, DWORD PTR 28[esp] | ||
1114 | add esi, ebp | ||
1115 | mov ebp, DWORD PTR 36[esp] | ||
1116 | xor edi, ebp | ||
1117 | mov ebp, DWORD PTR 60[esp] | ||
1118 | xor edi, ebp | ||
1119 | mov ebp, DWORD PTR 16[esp] | ||
1120 | ror ecx, 1 | ||
1121 | xor edi, ebp | ||
1122 | rol edi, 1 | ||
1123 | mov ebp, eax | ||
1124 | mov DWORD PTR 28[esp],edi | ||
1125 | or ebp, ecx | ||
1126 | lea edi, DWORD PTR 2400959708[edx*1+edi] | ||
1127 | mov edx, eax | ||
1128 | and ebp, ebx | ||
1129 | and edx, ecx | ||
1130 | or ebp, edx | ||
1131 | mov edx, esi | ||
1132 | rol edx, 5 | ||
1133 | ror eax, 1 | ||
1134 | add ebp, edx | ||
1135 | ror eax, 1 | ||
1136 | add edi, ebp | ||
1137 | ; 40_59 55 | ||
1138 | ; 40_59 56 | ||
1139 | mov edx, DWORD PTR 32[esp] | ||
1140 | mov ebp, DWORD PTR 40[esp] | ||
1141 | xor edx, ebp | ||
1142 | mov ebp, DWORD PTR [esp] | ||
1143 | xor edx, ebp | ||
1144 | mov ebp, DWORD PTR 20[esp] | ||
1145 | xor edx, ebp | ||
1146 | mov ebp, esi | ||
1147 | rol edx, 1 | ||
1148 | or ebp, eax | ||
1149 | mov DWORD PTR 32[esp],edx | ||
1150 | and ebp, ecx | ||
1151 | lea edx, DWORD PTR 2400959708[ebx*1+edx] | ||
1152 | mov ebx, esi | ||
1153 | ror esi, 1 | ||
1154 | and ebx, eax | ||
1155 | or ebp, ebx | ||
1156 | mov ebx, edi | ||
1157 | rol ebx, 5 | ||
1158 | add ebp, ebx | ||
1159 | mov ebx, DWORD PTR 36[esp] | ||
1160 | add edx, ebp | ||
1161 | mov ebp, DWORD PTR 44[esp] | ||
1162 | xor ebx, ebp | ||
1163 | mov ebp, DWORD PTR 4[esp] | ||
1164 | xor ebx, ebp | ||
1165 | mov ebp, DWORD PTR 24[esp] | ||
1166 | ror esi, 1 | ||
1167 | xor ebx, ebp | ||
1168 | rol ebx, 1 | ||
1169 | mov ebp, edi | ||
1170 | mov DWORD PTR 36[esp],ebx | ||
1171 | or ebp, esi | ||
1172 | lea ebx, DWORD PTR 2400959708[ecx*1+ebx] | ||
1173 | mov ecx, edi | ||
1174 | and ebp, eax | ||
1175 | and ecx, esi | ||
1176 | or ebp, ecx | ||
1177 | mov ecx, edx | ||
1178 | rol ecx, 5 | ||
1179 | ror edi, 1 | ||
1180 | add ebp, ecx | ||
1181 | ror edi, 1 | ||
1182 | add ebx, ebp | ||
1183 | ; 40_59 57 | ||
1184 | ; 40_59 58 | ||
1185 | mov ecx, DWORD PTR 40[esp] | ||
1186 | mov ebp, DWORD PTR 48[esp] | ||
1187 | xor ecx, ebp | ||
1188 | mov ebp, DWORD PTR 8[esp] | ||
1189 | xor ecx, ebp | ||
1190 | mov ebp, DWORD PTR 28[esp] | ||
1191 | xor ecx, ebp | ||
1192 | mov ebp, edx | ||
1193 | rol ecx, 1 | ||
1194 | or ebp, edi | ||
1195 | mov DWORD PTR 40[esp],ecx | ||
1196 | and ebp, esi | ||
1197 | lea ecx, DWORD PTR 2400959708[eax*1+ecx] | ||
1198 | mov eax, edx | ||
1199 | ror edx, 1 | ||
1200 | and eax, edi | ||
1201 | or ebp, eax | ||
1202 | mov eax, ebx | ||
1203 | rol eax, 5 | ||
1204 | add ebp, eax | ||
1205 | mov eax, DWORD PTR 44[esp] | ||
1206 | add ecx, ebp | ||
1207 | mov ebp, DWORD PTR 52[esp] | ||
1208 | xor eax, ebp | ||
1209 | mov ebp, DWORD PTR 12[esp] | ||
1210 | xor eax, ebp | ||
1211 | mov ebp, DWORD PTR 32[esp] | ||
1212 | ror edx, 1 | ||
1213 | xor eax, ebp | ||
1214 | rol eax, 1 | ||
1215 | mov ebp, ebx | ||
1216 | mov DWORD PTR 44[esp],eax | ||
1217 | or ebp, edx | ||
1218 | lea eax, DWORD PTR 2400959708[esi*1+eax] | ||
1219 | mov esi, ebx | ||
1220 | and ebp, edi | ||
1221 | and esi, edx | ||
1222 | or ebp, esi | ||
1223 | mov esi, ecx | ||
1224 | rol esi, 5 | ||
1225 | ror ebx, 1 | ||
1226 | add ebp, esi | ||
1227 | ror ebx, 1 | ||
1228 | add eax, ebp | ||
1229 | ; 40_59 59 | ||
1230 | ; 20_39 60 | ||
1231 | mov esi, DWORD PTR 48[esp] | ||
1232 | mov ebp, DWORD PTR 56[esp] | ||
1233 | xor esi, ebp | ||
1234 | mov ebp, DWORD PTR 16[esp] | ||
1235 | xor esi, ebp | ||
1236 | mov ebp, DWORD PTR 36[esp] | ||
1237 | xor esi, ebp | ||
1238 | mov ebp, ecx | ||
1239 | rol esi, 1 | ||
1240 | xor ebp, ebx | ||
1241 | mov DWORD PTR 48[esp],esi | ||
1242 | xor ebp, edx | ||
1243 | lea esi, DWORD PTR 3395469782[edi*1+esi] | ||
1244 | mov edi, eax | ||
1245 | rol edi, 5 | ||
1246 | ror ecx, 1 | ||
1247 | add edi, ebp | ||
1248 | ror ecx, 1 | ||
1249 | add esi, edi | ||
1250 | ; 20_39 61 | ||
1251 | mov edi, DWORD PTR 52[esp] | ||
1252 | mov ebp, DWORD PTR 60[esp] | ||
1253 | xor edi, ebp | ||
1254 | mov ebp, DWORD PTR 20[esp] | ||
1255 | xor edi, ebp | ||
1256 | mov ebp, DWORD PTR 40[esp] | ||
1257 | xor edi, ebp | ||
1258 | mov ebp, eax | ||
1259 | rol edi, 1 | ||
1260 | xor ebp, ecx | ||
1261 | mov DWORD PTR 52[esp],edi | ||
1262 | xor ebp, ebx | ||
1263 | lea edi, DWORD PTR 3395469782[edx*1+edi] | ||
1264 | mov edx, esi | ||
1265 | rol edx, 5 | ||
1266 | ror eax, 1 | ||
1267 | add edx, ebp | ||
1268 | ror eax, 1 | ||
1269 | add edi, edx | ||
1270 | ; 20_39 62 | ||
1271 | mov edx, DWORD PTR 56[esp] | ||
1272 | mov ebp, DWORD PTR [esp] | ||
1273 | xor edx, ebp | ||
1274 | mov ebp, DWORD PTR 24[esp] | ||
1275 | xor edx, ebp | ||
1276 | mov ebp, DWORD PTR 44[esp] | ||
1277 | xor edx, ebp | ||
1278 | mov ebp, esi | ||
1279 | rol edx, 1 | ||
1280 | xor ebp, eax | ||
1281 | mov DWORD PTR 56[esp],edx | ||
1282 | xor ebp, ecx | ||
1283 | lea edx, DWORD PTR 3395469782[ebx*1+edx] | ||
1284 | mov ebx, edi | ||
1285 | rol ebx, 5 | ||
1286 | ror esi, 1 | ||
1287 | add ebx, ebp | ||
1288 | ror esi, 1 | ||
1289 | add edx, ebx | ||
1290 | ; 20_39 63 | ||
1291 | mov ebx, DWORD PTR 60[esp] | ||
1292 | mov ebp, DWORD PTR 4[esp] | ||
1293 | xor ebx, ebp | ||
1294 | mov ebp, DWORD PTR 28[esp] | ||
1295 | xor ebx, ebp | ||
1296 | mov ebp, DWORD PTR 48[esp] | ||
1297 | xor ebx, ebp | ||
1298 | mov ebp, edi | ||
1299 | rol ebx, 1 | ||
1300 | xor ebp, esi | ||
1301 | mov DWORD PTR 60[esp],ebx | ||
1302 | xor ebp, eax | ||
1303 | lea ebx, DWORD PTR 3395469782[ecx*1+ebx] | ||
1304 | mov ecx, edx | ||
1305 | rol ecx, 5 | ||
1306 | ror edi, 1 | ||
1307 | add ecx, ebp | ||
1308 | ror edi, 1 | ||
1309 | add ebx, ecx | ||
1310 | ; 20_39 64 | ||
1311 | mov ecx, DWORD PTR [esp] | ||
1312 | mov ebp, DWORD PTR 8[esp] | ||
1313 | xor ecx, ebp | ||
1314 | mov ebp, DWORD PTR 32[esp] | ||
1315 | xor ecx, ebp | ||
1316 | mov ebp, DWORD PTR 52[esp] | ||
1317 | xor ecx, ebp | ||
1318 | mov ebp, edx | ||
1319 | rol ecx, 1 | ||
1320 | xor ebp, edi | ||
1321 | mov DWORD PTR [esp],ecx | ||
1322 | xor ebp, esi | ||
1323 | lea ecx, DWORD PTR 3395469782[eax*1+ecx] | ||
1324 | mov eax, ebx | ||
1325 | rol eax, 5 | ||
1326 | ror edx, 1 | ||
1327 | add eax, ebp | ||
1328 | ror edx, 1 | ||
1329 | add ecx, eax | ||
1330 | ; 20_39 65 | ||
1331 | mov eax, DWORD PTR 4[esp] | ||
1332 | mov ebp, DWORD PTR 12[esp] | ||
1333 | xor eax, ebp | ||
1334 | mov ebp, DWORD PTR 36[esp] | ||
1335 | xor eax, ebp | ||
1336 | mov ebp, DWORD PTR 56[esp] | ||
1337 | xor eax, ebp | ||
1338 | mov ebp, ebx | ||
1339 | rol eax, 1 | ||
1340 | xor ebp, edx | ||
1341 | mov DWORD PTR 4[esp],eax | ||
1342 | xor ebp, edi | ||
1343 | lea eax, DWORD PTR 3395469782[esi*1+eax] | ||
1344 | mov esi, ecx | ||
1345 | rol esi, 5 | ||
1346 | ror ebx, 1 | ||
1347 | add esi, ebp | ||
1348 | ror ebx, 1 | ||
1349 | add eax, esi | ||
1350 | ; 20_39 66 | ||
1351 | mov esi, DWORD PTR 8[esp] | ||
1352 | mov ebp, DWORD PTR 16[esp] | ||
1353 | xor esi, ebp | ||
1354 | mov ebp, DWORD PTR 40[esp] | ||
1355 | xor esi, ebp | ||
1356 | mov ebp, DWORD PTR 60[esp] | ||
1357 | xor esi, ebp | ||
1358 | mov ebp, ecx | ||
1359 | rol esi, 1 | ||
1360 | xor ebp, ebx | ||
1361 | mov DWORD PTR 8[esp],esi | ||
1362 | xor ebp, edx | ||
1363 | lea esi, DWORD PTR 3395469782[edi*1+esi] | ||
1364 | mov edi, eax | ||
1365 | rol edi, 5 | ||
1366 | ror ecx, 1 | ||
1367 | add edi, ebp | ||
1368 | ror ecx, 1 | ||
1369 | add esi, edi | ||
1370 | ; 20_39 67 | ||
1371 | mov edi, DWORD PTR 12[esp] | ||
1372 | mov ebp, DWORD PTR 20[esp] | ||
1373 | xor edi, ebp | ||
1374 | mov ebp, DWORD PTR 44[esp] | ||
1375 | xor edi, ebp | ||
1376 | mov ebp, DWORD PTR [esp] | ||
1377 | xor edi, ebp | ||
1378 | mov ebp, eax | ||
1379 | rol edi, 1 | ||
1380 | xor ebp, ecx | ||
1381 | mov DWORD PTR 12[esp],edi | ||
1382 | xor ebp, ebx | ||
1383 | lea edi, DWORD PTR 3395469782[edx*1+edi] | ||
1384 | mov edx, esi | ||
1385 | rol edx, 5 | ||
1386 | ror eax, 1 | ||
1387 | add edx, ebp | ||
1388 | ror eax, 1 | ||
1389 | add edi, edx | ||
1390 | ; 20_39 68 | ||
1391 | mov edx, DWORD PTR 16[esp] | ||
1392 | mov ebp, DWORD PTR 24[esp] | ||
1393 | xor edx, ebp | ||
1394 | mov ebp, DWORD PTR 48[esp] | ||
1395 | xor edx, ebp | ||
1396 | mov ebp, DWORD PTR 4[esp] | ||
1397 | xor edx, ebp | ||
1398 | mov ebp, esi | ||
1399 | rol edx, 1 | ||
1400 | xor ebp, eax | ||
1401 | mov DWORD PTR 16[esp],edx | ||
1402 | xor ebp, ecx | ||
1403 | lea edx, DWORD PTR 3395469782[ebx*1+edx] | ||
1404 | mov ebx, edi | ||
1405 | rol ebx, 5 | ||
1406 | ror esi, 1 | ||
1407 | add ebx, ebp | ||
1408 | ror esi, 1 | ||
1409 | add edx, ebx | ||
1410 | ; 20_39 69 | ||
1411 | mov ebx, DWORD PTR 20[esp] | ||
1412 | mov ebp, DWORD PTR 28[esp] | ||
1413 | xor ebx, ebp | ||
1414 | mov ebp, DWORD PTR 52[esp] | ||
1415 | xor ebx, ebp | ||
1416 | mov ebp, DWORD PTR 8[esp] | ||
1417 | xor ebx, ebp | ||
1418 | mov ebp, edi | ||
1419 | rol ebx, 1 | ||
1420 | xor ebp, esi | ||
1421 | mov DWORD PTR 20[esp],ebx | ||
1422 | xor ebp, eax | ||
1423 | lea ebx, DWORD PTR 3395469782[ecx*1+ebx] | ||
1424 | mov ecx, edx | ||
1425 | rol ecx, 5 | ||
1426 | ror edi, 1 | ||
1427 | add ecx, ebp | ||
1428 | ror edi, 1 | ||
1429 | add ebx, ecx | ||
1430 | ; 20_39 70 | ||
1431 | mov ecx, DWORD PTR 24[esp] | ||
1432 | mov ebp, DWORD PTR 32[esp] | ||
1433 | xor ecx, ebp | ||
1434 | mov ebp, DWORD PTR 56[esp] | ||
1435 | xor ecx, ebp | ||
1436 | mov ebp, DWORD PTR 12[esp] | ||
1437 | xor ecx, ebp | ||
1438 | mov ebp, edx | ||
1439 | rol ecx, 1 | ||
1440 | xor ebp, edi | ||
1441 | mov DWORD PTR 24[esp],ecx | ||
1442 | xor ebp, esi | ||
1443 | lea ecx, DWORD PTR 3395469782[eax*1+ecx] | ||
1444 | mov eax, ebx | ||
1445 | rol eax, 5 | ||
1446 | ror edx, 1 | ||
1447 | add eax, ebp | ||
1448 | ror edx, 1 | ||
1449 | add ecx, eax | ||
1450 | ; 20_39 71 | ||
1451 | mov eax, DWORD PTR 28[esp] | ||
1452 | mov ebp, DWORD PTR 36[esp] | ||
1453 | xor eax, ebp | ||
1454 | mov ebp, DWORD PTR 60[esp] | ||
1455 | xor eax, ebp | ||
1456 | mov ebp, DWORD PTR 16[esp] | ||
1457 | xor eax, ebp | ||
1458 | mov ebp, ebx | ||
1459 | rol eax, 1 | ||
1460 | xor ebp, edx | ||
1461 | mov DWORD PTR 28[esp],eax | ||
1462 | xor ebp, edi | ||
1463 | lea eax, DWORD PTR 3395469782[esi*1+eax] | ||
1464 | mov esi, ecx | ||
1465 | rol esi, 5 | ||
1466 | ror ebx, 1 | ||
1467 | add esi, ebp | ||
1468 | ror ebx, 1 | ||
1469 | add eax, esi | ||
1470 | ; 20_39 72 | ||
1471 | mov esi, DWORD PTR 32[esp] | ||
1472 | mov ebp, DWORD PTR 40[esp] | ||
1473 | xor esi, ebp | ||
1474 | mov ebp, DWORD PTR [esp] | ||
1475 | xor esi, ebp | ||
1476 | mov ebp, DWORD PTR 20[esp] | ||
1477 | xor esi, ebp | ||
1478 | mov ebp, ecx | ||
1479 | rol esi, 1 | ||
1480 | xor ebp, ebx | ||
1481 | mov DWORD PTR 32[esp],esi | ||
1482 | xor ebp, edx | ||
1483 | lea esi, DWORD PTR 3395469782[edi*1+esi] | ||
1484 | mov edi, eax | ||
1485 | rol edi, 5 | ||
1486 | ror ecx, 1 | ||
1487 | add edi, ebp | ||
1488 | ror ecx, 1 | ||
1489 | add esi, edi | ||
1490 | ; 20_39 73 | ||
1491 | mov edi, DWORD PTR 36[esp] | ||
1492 | mov ebp, DWORD PTR 44[esp] | ||
1493 | xor edi, ebp | ||
1494 | mov ebp, DWORD PTR 4[esp] | ||
1495 | xor edi, ebp | ||
1496 | mov ebp, DWORD PTR 24[esp] | ||
1497 | xor edi, ebp | ||
1498 | mov ebp, eax | ||
1499 | rol edi, 1 | ||
1500 | xor ebp, ecx | ||
1501 | mov DWORD PTR 36[esp],edi | ||
1502 | xor ebp, ebx | ||
1503 | lea edi, DWORD PTR 3395469782[edx*1+edi] | ||
1504 | mov edx, esi | ||
1505 | rol edx, 5 | ||
1506 | ror eax, 1 | ||
1507 | add edx, ebp | ||
1508 | ror eax, 1 | ||
1509 | add edi, edx | ||
1510 | ; 20_39 74 | ||
1511 | mov edx, DWORD PTR 40[esp] | ||
1512 | mov ebp, DWORD PTR 48[esp] | ||
1513 | xor edx, ebp | ||
1514 | mov ebp, DWORD PTR 8[esp] | ||
1515 | xor edx, ebp | ||
1516 | mov ebp, DWORD PTR 28[esp] | ||
1517 | xor edx, ebp | ||
1518 | mov ebp, esi | ||
1519 | rol edx, 1 | ||
1520 | xor ebp, eax | ||
1521 | mov DWORD PTR 40[esp],edx | ||
1522 | xor ebp, ecx | ||
1523 | lea edx, DWORD PTR 3395469782[ebx*1+edx] | ||
1524 | mov ebx, edi | ||
1525 | rol ebx, 5 | ||
1526 | ror esi, 1 | ||
1527 | add ebx, ebp | ||
1528 | ror esi, 1 | ||
1529 | add edx, ebx | ||
1530 | ; 20_39 75 | ||
1531 | mov ebx, DWORD PTR 44[esp] | ||
1532 | mov ebp, DWORD PTR 52[esp] | ||
1533 | xor ebx, ebp | ||
1534 | mov ebp, DWORD PTR 12[esp] | ||
1535 | xor ebx, ebp | ||
1536 | mov ebp, DWORD PTR 32[esp] | ||
1537 | xor ebx, ebp | ||
1538 | mov ebp, edi | ||
1539 | rol ebx, 1 | ||
1540 | xor ebp, esi | ||
1541 | mov DWORD PTR 44[esp],ebx | ||
1542 | xor ebp, eax | ||
1543 | lea ebx, DWORD PTR 3395469782[ecx*1+ebx] | ||
1544 | mov ecx, edx | ||
1545 | rol ecx, 5 | ||
1546 | ror edi, 1 | ||
1547 | add ecx, ebp | ||
1548 | ror edi, 1 | ||
1549 | add ebx, ecx | ||
1550 | ; 20_39 76 | ||
1551 | mov ecx, DWORD PTR 48[esp] | ||
1552 | mov ebp, DWORD PTR 56[esp] | ||
1553 | xor ecx, ebp | ||
1554 | mov ebp, DWORD PTR 16[esp] | ||
1555 | xor ecx, ebp | ||
1556 | mov ebp, DWORD PTR 36[esp] | ||
1557 | xor ecx, ebp | ||
1558 | mov ebp, edx | ||
1559 | rol ecx, 1 | ||
1560 | xor ebp, edi | ||
1561 | mov DWORD PTR 48[esp],ecx | ||
1562 | xor ebp, esi | ||
1563 | lea ecx, DWORD PTR 3395469782[eax*1+ecx] | ||
1564 | mov eax, ebx | ||
1565 | rol eax, 5 | ||
1566 | ror edx, 1 | ||
1567 | add eax, ebp | ||
1568 | ror edx, 1 | ||
1569 | add ecx, eax | ||
1570 | ; 20_39 77 | ||
1571 | mov eax, DWORD PTR 52[esp] | ||
1572 | mov ebp, DWORD PTR 60[esp] | ||
1573 | xor eax, ebp | ||
1574 | mov ebp, DWORD PTR 20[esp] | ||
1575 | xor eax, ebp | ||
1576 | mov ebp, DWORD PTR 40[esp] | ||
1577 | xor eax, ebp | ||
1578 | mov ebp, ebx | ||
1579 | rol eax, 1 | ||
1580 | xor ebp, edx | ||
1581 | mov DWORD PTR 52[esp],eax | ||
1582 | xor ebp, edi | ||
1583 | lea eax, DWORD PTR 3395469782[esi*1+eax] | ||
1584 | mov esi, ecx | ||
1585 | rol esi, 5 | ||
1586 | ror ebx, 1 | ||
1587 | add esi, ebp | ||
1588 | ror ebx, 1 | ||
1589 | add eax, esi | ||
1590 | ; 20_39 78 | ||
1591 | mov esi, DWORD PTR 56[esp] | ||
1592 | mov ebp, DWORD PTR [esp] | ||
1593 | xor esi, ebp | ||
1594 | mov ebp, DWORD PTR 24[esp] | ||
1595 | xor esi, ebp | ||
1596 | mov ebp, DWORD PTR 44[esp] | ||
1597 | xor esi, ebp | ||
1598 | mov ebp, ecx | ||
1599 | rol esi, 1 | ||
1600 | xor ebp, ebx | ||
1601 | mov DWORD PTR 56[esp],esi | ||
1602 | xor ebp, edx | ||
1603 | lea esi, DWORD PTR 3395469782[edi*1+esi] | ||
1604 | mov edi, eax | ||
1605 | rol edi, 5 | ||
1606 | ror ecx, 1 | ||
1607 | add edi, ebp | ||
1608 | ror ecx, 1 | ||
1609 | add esi, edi | ||
1610 | ; 20_39 79 | ||
1611 | mov edi, DWORD PTR 60[esp] | ||
1612 | mov ebp, DWORD PTR 4[esp] | ||
1613 | xor edi, ebp | ||
1614 | mov ebp, DWORD PTR 28[esp] | ||
1615 | xor edi, ebp | ||
1616 | mov ebp, DWORD PTR 48[esp] | ||
1617 | xor edi, ebp | ||
1618 | mov ebp, eax | ||
1619 | rol edi, 1 | ||
1620 | xor ebp, ecx | ||
1621 | mov DWORD PTR 60[esp],edi | ||
1622 | xor ebp, ebx | ||
1623 | lea edi, DWORD PTR 3395469782[edx*1+edi] | ||
1624 | mov edx, esi | ||
1625 | rol edx, 5 | ||
1626 | add edx, ebp | ||
1627 | mov ebp, DWORD PTR 128[esp] | ||
1628 | ror eax, 1 | ||
1629 | add edi, edx | ||
1630 | ror eax, 1 | ||
1631 | ; End processing | ||
1632 | ; | ||
1633 | mov edx, DWORD PTR 12[ebp] | ||
1634 | add edx, ecx | ||
1635 | mov ecx, DWORD PTR 4[ebp] | ||
1636 | add ecx, esi | ||
1637 | mov esi, eax | ||
1638 | mov eax, DWORD PTR [ebp] | ||
1639 | mov DWORD PTR 12[ebp],edx | ||
1640 | add eax, edi | ||
1641 | mov edi, DWORD PTR 16[ebp] | ||
1642 | add edi, ebx | ||
1643 | mov ebx, DWORD PTR 8[ebp] | ||
1644 | add ebx, esi | ||
1645 | mov DWORD PTR [ebp],eax | ||
1646 | mov esi, DWORD PTR 132[esp] | ||
1647 | mov DWORD PTR 8[ebp],ebx | ||
1648 | add esi, 64 | ||
1649 | mov eax, DWORD PTR 68[esp] | ||
1650 | mov DWORD PTR 16[ebp],edi | ||
1651 | cmp esi, eax | ||
1652 | mov DWORD PTR 4[ebp],ecx | ||
1653 | jl L000start | ||
1654 | add esp, 108 | ||
1655 | pop edi | ||
1656 | pop ebx | ||
1657 | pop ebp | ||
1658 | pop esi | ||
1659 | ret | ||
1660 | _TEXT SEGMENT | ||
1661 | PUBLIC _sha1_block_asm_host_order | ||
1662 | |||
1663 | _sha1_block_asm_host_order PROC NEAR | ||
1664 | mov ecx, DWORD PTR 12[esp] | ||
1665 | push esi | ||
1666 | shl ecx, 6 | ||
1667 | mov esi, DWORD PTR 12[esp] | ||
1668 | push ebp | ||
1669 | add ecx, esi | ||
1670 | push ebx | ||
1671 | mov ebp, DWORD PTR 16[esp] | ||
1672 | push edi | ||
1673 | mov edx, DWORD PTR 12[ebp] | ||
1674 | sub esp, 108 | ||
1675 | mov edi, DWORD PTR 16[ebp] | ||
1676 | mov ebx, DWORD PTR 8[ebp] | ||
1677 | mov DWORD PTR 68[esp],ecx | ||
1678 | ; First we need to setup the X array | ||
1679 | mov eax, DWORD PTR [esi] | ||
1680 | mov ecx, DWORD PTR 4[esi] | ||
1681 | mov DWORD PTR [esp],eax | ||
1682 | mov DWORD PTR 4[esp],ecx | ||
1683 | mov eax, DWORD PTR 8[esi] | ||
1684 | mov ecx, DWORD PTR 12[esi] | ||
1685 | mov DWORD PTR 8[esp],eax | ||
1686 | mov DWORD PTR 12[esp],ecx | ||
1687 | mov eax, DWORD PTR 16[esi] | ||
1688 | mov ecx, DWORD PTR 20[esi] | ||
1689 | mov DWORD PTR 16[esp],eax | ||
1690 | mov DWORD PTR 20[esp],ecx | ||
1691 | mov eax, DWORD PTR 24[esi] | ||
1692 | mov ecx, DWORD PTR 28[esi] | ||
1693 | mov DWORD PTR 24[esp],eax | ||
1694 | mov DWORD PTR 28[esp],ecx | ||
1695 | mov eax, DWORD PTR 32[esi] | ||
1696 | mov ecx, DWORD PTR 36[esi] | ||
1697 | mov DWORD PTR 32[esp],eax | ||
1698 | mov DWORD PTR 36[esp],ecx | ||
1699 | mov eax, DWORD PTR 40[esi] | ||
1700 | mov ecx, DWORD PTR 44[esi] | ||
1701 | mov DWORD PTR 40[esp],eax | ||
1702 | mov DWORD PTR 44[esp],ecx | ||
1703 | mov eax, DWORD PTR 48[esi] | ||
1704 | mov ecx, DWORD PTR 52[esi] | ||
1705 | mov DWORD PTR 48[esp],eax | ||
1706 | mov DWORD PTR 52[esp],ecx | ||
1707 | mov eax, DWORD PTR 56[esi] | ||
1708 | mov ecx, DWORD PTR 60[esi] | ||
1709 | mov DWORD PTR 56[esp],eax | ||
1710 | mov DWORD PTR 60[esp],ecx | ||
1711 | jmp L001shortcut | ||
1712 | _sha1_block_asm_host_order ENDP | ||
1713 | _TEXT ENDS | ||
1714 | _sha1_block_asm_data_order ENDP | ||
1715 | _TEXT ENDS | ||
1716 | END | ||
diff --git a/src/lib/libssl/src/crypto/sha/asm/sha1-586.pl b/src/lib/libssl/src/crypto/sha/asm/sha1-586.pl index 48d9192a4e..09df993ecd 100644 --- a/src/lib/libssl/src/crypto/sha/asm/sha1-586.pl +++ b/src/lib/libssl/src/crypto/sha/asm/sha1-586.pl | |||
@@ -392,7 +392,7 @@ sub sha1_block_data | |||
392 | &X_expand("esi"); | 392 | &X_expand("esi"); |
393 | &mov(&wparam(1),"esi"); | 393 | &mov(&wparam(1),"esi"); |
394 | 394 | ||
395 | &set_label("shortcut", 1); | 395 | &set_label("shortcut", 0, 1); |
396 | &comment(""); | 396 | &comment(""); |
397 | &comment("Start processing"); | 397 | &comment("Start processing"); |
398 | 398 | ||
diff --git a/src/lib/libssl/src/crypto/sha/sha_locl.h b/src/lib/libssl/src/crypto/sha/sha_locl.h index 3e6f489b87..2f8aef83f3 100644 --- a/src/lib/libssl/src/crypto/sha/sha_locl.h +++ b/src/lib/libssl/src/crypto/sha/sha_locl.h | |||
@@ -130,11 +130,7 @@ | |||
130 | # error "Either SHA_0 or SHA_1 must be defined." | 130 | # error "Either SHA_0 or SHA_1 must be defined." |
131 | #endif | 131 | #endif |
132 | 132 | ||
133 | #ifndef FLAT_INC | ||
134 | #include "../md32_common.h" | ||
135 | #else | ||
136 | #include "md32_common.h" | 133 | #include "md32_common.h" |
137 | #endif | ||
138 | 134 | ||
139 | #define INIT_DATA_h0 0x67452301UL | 135 | #define INIT_DATA_h0 0x67452301UL |
140 | #define INIT_DATA_h1 0xefcdab89UL | 136 | #define INIT_DATA_h1 0xefcdab89UL |
diff --git a/src/lib/libssl/src/crypto/x509/x509.h b/src/lib/libssl/src/crypto/x509/x509.h index d3336d9ceb..0192272e7c 100644 --- a/src/lib/libssl/src/crypto/x509/x509.h +++ b/src/lib/libssl/src/crypto/x509/x509.h | |||
@@ -284,7 +284,9 @@ DECLARE_STACK_OF(X509_TRUST) | |||
284 | 284 | ||
285 | /* standard trust ids */ | 285 | /* standard trust ids */ |
286 | 286 | ||
287 | #define X509_TRUST_ANY 1 | 287 | #define X509_TRUST_DEFAULT -1 /* Only valid in purpose settings */ |
288 | |||
289 | #define X509_TRUST_COMPAT 1 | ||
288 | #define X509_TRUST_SSL_CLIENT 2 | 290 | #define X509_TRUST_SSL_CLIENT 2 |
289 | #define X509_TRUST_SSL_SERVER 3 | 291 | #define X509_TRUST_SSL_SERVER 3 |
290 | #define X509_TRUST_EMAIL 4 | 292 | #define X509_TRUST_EMAIL 4 |
diff --git a/src/lib/libssl/src/crypto/x509/x509_err.c b/src/lib/libssl/src/crypto/x509/x509_err.c index fdedbdac34..848add56e9 100644 --- a/src/lib/libssl/src/crypto/x509/x509_err.c +++ b/src/lib/libssl/src/crypto/x509/x509_err.c | |||
@@ -54,7 +54,8 @@ | |||
54 | */ | 54 | */ |
55 | 55 | ||
56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes |
57 | * made to it will be overwritten when the script next updates this file. | 57 | * made to it will be overwritten when the script next updates this file, |
58 | * only reason strings will be preserved. | ||
58 | */ | 59 | */ |
59 | 60 | ||
60 | #include <stdio.h> | 61 | #include <stdio.h> |
diff --git a/src/lib/libssl/src/crypto/x509/x509_trs.c b/src/lib/libssl/src/crypto/x509/x509_trs.c index 9f7d67952d..c779aaf94d 100644 --- a/src/lib/libssl/src/crypto/x509/x509_trs.c +++ b/src/lib/libssl/src/crypto/x509/x509_trs.c | |||
@@ -65,7 +65,7 @@ static int tr_cmp(X509_TRUST **a, X509_TRUST **b); | |||
65 | static void trtable_free(X509_TRUST *p); | 65 | static void trtable_free(X509_TRUST *p); |
66 | 66 | ||
67 | static int trust_1oidany(X509_TRUST *trust, X509 *x, int flags); | 67 | static int trust_1oidany(X509_TRUST *trust, X509 *x, int flags); |
68 | static int trust_any(X509_TRUST *trust, X509 *x, int flags); | 68 | static int trust_compat(X509_TRUST *trust, X509 *x, int flags); |
69 | 69 | ||
70 | static int obj_trust(int id, X509 *x, int flags); | 70 | static int obj_trust(int id, X509 *x, int flags); |
71 | static int (*default_trust)(int id, X509 *x, int flags) = obj_trust; | 71 | static int (*default_trust)(int id, X509 *x, int flags) = obj_trust; |
@@ -76,7 +76,7 @@ static int (*default_trust)(int id, X509 *x, int flags) = obj_trust; | |||
76 | */ | 76 | */ |
77 | 77 | ||
78 | static X509_TRUST trstandard[] = { | 78 | static X509_TRUST trstandard[] = { |
79 | {X509_TRUST_ANY, 0, trust_any, "Any", 0, NULL}, | 79 | {X509_TRUST_COMPAT, 0, trust_compat, "compatible", 0, NULL}, |
80 | {X509_TRUST_SSL_CLIENT, 0, trust_1oidany, "SSL Client", NID_client_auth, NULL}, | 80 | {X509_TRUST_SSL_CLIENT, 0, trust_1oidany, "SSL Client", NID_client_auth, NULL}, |
81 | {X509_TRUST_SSL_SERVER, 0, trust_1oidany, "SSL Client", NID_server_auth, NULL}, | 81 | {X509_TRUST_SSL_SERVER, 0, trust_1oidany, "SSL Client", NID_server_auth, NULL}, |
82 | {X509_TRUST_EMAIL, 0, trust_1oidany, "S/MIME email", NID_email_protect, NULL}, | 82 | {X509_TRUST_EMAIL, 0, trust_1oidany, "S/MIME email", NID_email_protect, NULL}, |
@@ -107,8 +107,8 @@ int X509_check_trust(X509 *x, int id, int flags) | |||
107 | X509_TRUST *pt; | 107 | X509_TRUST *pt; |
108 | int idx; | 108 | int idx; |
109 | if(id == -1) return 1; | 109 | if(id == -1) return 1; |
110 | if(!(idx = X509_TRUST_get_by_id(id))) | 110 | idx = X509_TRUST_get_by_id(id); |
111 | return default_trust(id, x, flags); | 111 | if(idx == -1) return default_trust(id, x, flags); |
112 | pt = X509_TRUST_get0(idx); | 112 | pt = X509_TRUST_get0(idx); |
113 | return pt->check_trust(pt, x, flags); | 113 | return pt->check_trust(pt, x, flags); |
114 | } | 114 | } |
@@ -230,6 +230,11 @@ static int trust_1oidany(X509_TRUST *trust, X509 *x, int flags) | |||
230 | /* we don't have any trust settings: for compatibility | 230 | /* we don't have any trust settings: for compatibility |
231 | * we return trusted if it is self signed | 231 | * we return trusted if it is self signed |
232 | */ | 232 | */ |
233 | return trust_compat(trust, x, flags); | ||
234 | } | ||
235 | |||
236 | static int trust_compat(X509_TRUST *trust, X509 *x, int flags) | ||
237 | { | ||
233 | X509_check_purpose(x, -1, 0); | 238 | X509_check_purpose(x, -1, 0); |
234 | if(x->ex_flags & EXFLAG_SS) return X509_TRUST_TRUSTED; | 239 | if(x->ex_flags & EXFLAG_SS) return X509_TRUST_TRUSTED; |
235 | else return X509_TRUST_UNTRUSTED; | 240 | else return X509_TRUST_UNTRUSTED; |
@@ -257,7 +262,3 @@ static int obj_trust(int id, X509 *x, int flags) | |||
257 | return X509_TRUST_UNTRUSTED; | 262 | return X509_TRUST_UNTRUSTED; |
258 | } | 263 | } |
259 | 264 | ||
260 | static int trust_any(X509_TRUST *trust, X509 *x, int flags) | ||
261 | { | ||
262 | return X509_TRUST_TRUSTED; | ||
263 | } | ||
diff --git a/src/lib/libssl/src/crypto/x509/x509_vfy.c b/src/lib/libssl/src/crypto/x509/x509_vfy.c index 4fdff54124..3ddb2303d3 100644 --- a/src/lib/libssl/src/crypto/x509/x509_vfy.c +++ b/src/lib/libssl/src/crypto/x509/x509_vfy.c | |||
@@ -436,11 +436,14 @@ static int internal_verify(X509_STORE_CTX *ctx) | |||
436 | } | 436 | } |
437 | if (X509_verify(xs,pkey) <= 0) | 437 | if (X509_verify(xs,pkey) <= 0) |
438 | { | 438 | { |
439 | EVP_PKEY_free(pkey); | ||
440 | ctx->error=X509_V_ERR_CERT_SIGNATURE_FAILURE; | 439 | ctx->error=X509_V_ERR_CERT_SIGNATURE_FAILURE; |
441 | ctx->current_cert=xs; | 440 | ctx->current_cert=xs; |
442 | ok=(*cb)(0,ctx); | 441 | ok=(*cb)(0,ctx); |
443 | if (!ok) goto end; | 442 | if (!ok) |
443 | { | ||
444 | EVP_PKEY_free(pkey); | ||
445 | goto end; | ||
446 | } | ||
444 | } | 447 | } |
445 | EVP_PKEY_free(pkey); | 448 | EVP_PKEY_free(pkey); |
446 | pkey=NULL; | 449 | pkey=NULL; |
@@ -768,18 +771,25 @@ int X509_STORE_CTX_purpose_inherit(X509_STORE_CTX *ctx, int def_purpose, | |||
768 | if(!purpose) purpose = def_purpose; | 771 | if(!purpose) purpose = def_purpose; |
769 | /* If we have a purpose then check it is valid */ | 772 | /* If we have a purpose then check it is valid */ |
770 | if(purpose) { | 773 | if(purpose) { |
774 | X509_PURPOSE *ptmp; | ||
771 | idx = X509_PURPOSE_get_by_id(purpose); | 775 | idx = X509_PURPOSE_get_by_id(purpose); |
772 | if(idx == -1) { | 776 | if(idx == -1) { |
773 | X509err(X509_F_X509_STORE_CTX_PURPOSE_INHERIT, | 777 | X509err(X509_F_X509_STORE_CTX_PURPOSE_INHERIT, |
774 | X509_R_UNKNOWN_PURPOSE_ID); | 778 | X509_R_UNKNOWN_PURPOSE_ID); |
775 | return 0; | 779 | return 0; |
776 | } | 780 | } |
777 | /* If trust not set then get from purpose default */ | 781 | ptmp = X509_PURPOSE_get0(idx); |
778 | if(!trust) { | 782 | if(ptmp->trust == X509_TRUST_DEFAULT) { |
779 | X509_PURPOSE *ptmp; | 783 | idx = X509_PURPOSE_get_by_id(def_purpose); |
784 | if(idx == -1) { | ||
785 | X509err(X509_F_X509_STORE_CTX_PURPOSE_INHERIT, | ||
786 | X509_R_UNKNOWN_PURPOSE_ID); | ||
787 | return 0; | ||
788 | } | ||
780 | ptmp = X509_PURPOSE_get0(idx); | 789 | ptmp = X509_PURPOSE_get0(idx); |
781 | trust = ptmp->trust; | ||
782 | } | 790 | } |
791 | /* If trust not set then get from purpose default */ | ||
792 | if(!trust) trust = ptmp->trust; | ||
783 | } | 793 | } |
784 | if(trust) { | 794 | if(trust) { |
785 | idx = X509_TRUST_get_by_id(trust); | 795 | idx = X509_TRUST_get_by_id(trust); |
diff --git a/src/lib/libssl/src/crypto/x509/x509name.c b/src/lib/libssl/src/crypto/x509/x509name.c index cf2382d42c..4c20e03ece 100644 --- a/src/lib/libssl/src/crypto/x509/x509name.c +++ b/src/lib/libssl/src/crypto/x509/x509name.c | |||
@@ -352,7 +352,7 @@ int X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *ne, int type, | |||
352 | int i; | 352 | int i; |
353 | 353 | ||
354 | if ((ne == NULL) || ((bytes == NULL) && (len != 0))) return(0); | 354 | if ((ne == NULL) || ((bytes == NULL) && (len != 0))) return(0); |
355 | if(type & MBSTRING_FLAG) | 355 | if((type > 0) && (type & MBSTRING_FLAG)) |
356 | return ASN1_STRING_set_by_NID(&ne->value, bytes, | 356 | return ASN1_STRING_set_by_NID(&ne->value, bytes, |
357 | len, type, | 357 | len, type, |
358 | OBJ_obj2nid(ne->object)) ? 1 : 0; | 358 | OBJ_obj2nid(ne->object)) ? 1 : 0; |
diff --git a/src/lib/libssl/src/crypto/x509v3/v3_purp.c b/src/lib/libssl/src/crypto/x509v3/v3_purp.c index b7494ebcd5..5594a1d64f 100644 --- a/src/lib/libssl/src/crypto/x509v3/v3_purp.c +++ b/src/lib/libssl/src/crypto/x509v3/v3_purp.c | |||
@@ -71,6 +71,7 @@ static int purpose_smime(X509 *x, int ca); | |||
71 | static int check_purpose_smime_sign(X509_PURPOSE *xp, X509 *x, int ca); | 71 | static int check_purpose_smime_sign(X509_PURPOSE *xp, X509 *x, int ca); |
72 | static int check_purpose_smime_encrypt(X509_PURPOSE *xp, X509 *x, int ca); | 72 | static int check_purpose_smime_encrypt(X509_PURPOSE *xp, X509 *x, int ca); |
73 | static int check_purpose_crl_sign(X509_PURPOSE *xp, X509 *x, int ca); | 73 | static int check_purpose_crl_sign(X509_PURPOSE *xp, X509 *x, int ca); |
74 | static int no_check(X509_PURPOSE *xp, X509 *x, int ca); | ||
74 | 75 | ||
75 | static int xp_cmp(X509_PURPOSE **a, X509_PURPOSE **b); | 76 | static int xp_cmp(X509_PURPOSE **a, X509_PURPOSE **b); |
76 | static void xptable_free(X509_PURPOSE *p); | 77 | static void xptable_free(X509_PURPOSE *p); |
@@ -81,7 +82,8 @@ static X509_PURPOSE xstandard[] = { | |||
81 | {X509_PURPOSE_NS_SSL_SERVER, X509_TRUST_SSL_SERVER, 0, check_purpose_ns_ssl_server, "Netscape SSL server", "nssslserver", NULL}, | 82 | {X509_PURPOSE_NS_SSL_SERVER, X509_TRUST_SSL_SERVER, 0, check_purpose_ns_ssl_server, "Netscape SSL server", "nssslserver", NULL}, |
82 | {X509_PURPOSE_SMIME_SIGN, X509_TRUST_EMAIL, 0, check_purpose_smime_sign, "S/MIME signing", "smimesign", NULL}, | 83 | {X509_PURPOSE_SMIME_SIGN, X509_TRUST_EMAIL, 0, check_purpose_smime_sign, "S/MIME signing", "smimesign", NULL}, |
83 | {X509_PURPOSE_SMIME_ENCRYPT, X509_TRUST_EMAIL, 0, check_purpose_smime_encrypt, "S/MIME encryption", "smimeencrypt", NULL}, | 84 | {X509_PURPOSE_SMIME_ENCRYPT, X509_TRUST_EMAIL, 0, check_purpose_smime_encrypt, "S/MIME encryption", "smimeencrypt", NULL}, |
84 | {X509_PURPOSE_CRL_SIGN, X509_TRUST_ANY, 0, check_purpose_crl_sign, "CRL signing", "crlsign", NULL}, | 85 | {X509_PURPOSE_CRL_SIGN, X509_TRUST_COMPAT, 0, check_purpose_crl_sign, "CRL signing", "crlsign", NULL}, |
86 | {X509_PURPOSE_ANY, X509_TRUST_DEFAULT, 0, no_check, "Any Purpose", "any", NULL}, | ||
85 | }; | 87 | }; |
86 | 88 | ||
87 | #define X509_PURPOSE_COUNT (sizeof(xstandard)/sizeof(X509_PURPOSE)) | 89 | #define X509_PURPOSE_COUNT (sizeof(xstandard)/sizeof(X509_PURPOSE)) |
@@ -454,3 +456,8 @@ static int check_purpose_crl_sign(X509_PURPOSE *xp, X509 *x, int ca) | |||
454 | if(ku_reject(x, KU_CRL_SIGN)) return 0; | 456 | if(ku_reject(x, KU_CRL_SIGN)) return 0; |
455 | return 1; | 457 | return 1; |
456 | } | 458 | } |
459 | |||
460 | static int no_check(X509_PURPOSE *xp, X509 *x, int ca) | ||
461 | { | ||
462 | return 1; | ||
463 | } | ||
diff --git a/src/lib/libssl/src/crypto/x509v3/v3err.c b/src/lib/libssl/src/crypto/x509v3/v3err.c index b7d4e350c4..aa4a605dc4 100644 --- a/src/lib/libssl/src/crypto/x509v3/v3err.c +++ b/src/lib/libssl/src/crypto/x509v3/v3err.c | |||
@@ -54,7 +54,8 @@ | |||
54 | */ | 54 | */ |
55 | 55 | ||
56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes |
57 | * made to it will be overwritten when the script next updates this file. | 57 | * made to it will be overwritten when the script next updates this file, |
58 | * only reason strings will be preserved. | ||
58 | */ | 59 | */ |
59 | 60 | ||
60 | #include <stdio.h> | 61 | #include <stdio.h> |
diff --git a/src/lib/libssl/src/crypto/x509v3/x509v3.h b/src/lib/libssl/src/crypto/x509v3/x509v3.h index fe01755797..96ceb7c4fb 100644 --- a/src/lib/libssl/src/crypto/x509v3/x509v3.h +++ b/src/lib/libssl/src/crypto/x509v3/x509v3.h | |||
@@ -179,8 +179,8 @@ union { | |||
179 | } GENERAL_NAME; | 179 | } GENERAL_NAME; |
180 | 180 | ||
181 | typedef struct ACCESS_DESCRIPTION_st { | 181 | typedef struct ACCESS_DESCRIPTION_st { |
182 | ASN1_OBJECT *method; | 182 | ASN1_OBJECT *method; |
183 | GENERAL_NAME *location; | 183 | GENERAL_NAME *location; |
184 | } ACCESS_DESCRIPTION; | 184 | } ACCESS_DESCRIPTION; |
185 | 185 | ||
186 | DECLARE_STACK_OF(GENERAL_NAME) | 186 | DECLARE_STACK_OF(GENERAL_NAME) |
@@ -344,9 +344,10 @@ typedef struct x509_purpose_st { | |||
344 | #define X509_PURPOSE_SMIME_SIGN 4 | 344 | #define X509_PURPOSE_SMIME_SIGN 4 |
345 | #define X509_PURPOSE_SMIME_ENCRYPT 5 | 345 | #define X509_PURPOSE_SMIME_ENCRYPT 5 |
346 | #define X509_PURPOSE_CRL_SIGN 6 | 346 | #define X509_PURPOSE_CRL_SIGN 6 |
347 | #define X509_PURPOSE_ANY 7 | ||
347 | 348 | ||
348 | #define X509_PURPOSE_MIN 1 | 349 | #define X509_PURPOSE_MIN 1 |
349 | #define X509_PURPOSE_MAX 6 | 350 | #define X509_PURPOSE_MAX 7 |
350 | 351 | ||
351 | DECLARE_STACK_OF(X509_PURPOSE) | 352 | DECLARE_STACK_OF(X509_PURPOSE) |
352 | 353 | ||
diff --git a/src/lib/libssl/src/doc/apps/CA.pl.pod b/src/lib/libssl/src/doc/apps/CA.pl.pod index 83e4c0af81..9d287f0c4d 100644 --- a/src/lib/libssl/src/doc/apps/CA.pl.pod +++ b/src/lib/libssl/src/doc/apps/CA.pl.pod | |||
@@ -102,6 +102,35 @@ the request and finally create a PKCS#12 file containing it. | |||
102 | CA.pl -signreq | 102 | CA.pl -signreq |
103 | CA.pl -pkcs12 "My Test Certificate" | 103 | CA.pl -pkcs12 "My Test Certificate" |
104 | 104 | ||
105 | =head1 DSA CERTIFICATES | ||
106 | |||
107 | Although the B<CA.pl> creates RSA CAs and requests it is still possible to | ||
108 | use it with DSA certificates and requests using the L<req(1)|req(1)> command | ||
109 | directly. The following example shows the steps that would typically be taken. | ||
110 | |||
111 | Create some DSA parameters: | ||
112 | |||
113 | openssl dsaparam -out dsap.pem 1024 | ||
114 | |||
115 | Create a DSA CA certificate and private key: | ||
116 | |||
117 | openssl req -x509 -newkey dsa:dsap.pem -keyout cacert.pem -out cacert.pem | ||
118 | |||
119 | Create the CA directories and files: | ||
120 | |||
121 | CA.pl -newca | ||
122 | |||
123 | enter cacert.pem when prompted for the CA file name. | ||
124 | |||
125 | Create a DSA certificate request and privat key (a different set of parameters | ||
126 | can optionally be created first): | ||
127 | |||
128 | openssl req -out newreq.pem -newkey dsa:dsap.pem | ||
129 | |||
130 | Sign the request: | ||
131 | |||
132 | CA.pl -signreq | ||
133 | |||
105 | =head1 NOTES | 134 | =head1 NOTES |
106 | 135 | ||
107 | Most of the filenames mentioned can be modified by editing the B<CA.pl> script. | 136 | Most of the filenames mentioned can be modified by editing the B<CA.pl> script. |
diff --git a/src/lib/libssl/src/doc/apps/dgst.pod b/src/lib/libssl/src/doc/apps/dgst.pod index cbf2cc529a..fcfd3ecf23 100644 --- a/src/lib/libssl/src/doc/apps/dgst.pod +++ b/src/lib/libssl/src/doc/apps/dgst.pod | |||
@@ -6,7 +6,7 @@ dgst, md5, md2, sha1, sha, mdc2, ripemd160 - message digests | |||
6 | 6 | ||
7 | =head1 SYNOPSIS | 7 | =head1 SYNOPSIS |
8 | 8 | ||
9 | [B<dgst>] | 9 | B<openssl> B<dgst> |
10 | [B<-md5|-md2|-sha1|-sha|mdc2|-ripemd160>] | 10 | [B<-md5|-md2|-sha1|-sha|mdc2|-ripemd160>] |
11 | [B<-c>] | 11 | [B<-c>] |
12 | [B<-d>] | 12 | [B<-d>] |
diff --git a/src/lib/libssl/src/doc/apps/dhparam.pod b/src/lib/libssl/src/doc/apps/dhparam.pod index 6b237ec05a..15aabf4ac8 100644 --- a/src/lib/libssl/src/doc/apps/dhparam.pod +++ b/src/lib/libssl/src/doc/apps/dhparam.pod | |||
@@ -6,18 +6,19 @@ dhparam - DH parameter manipulation and generation | |||
6 | 6 | ||
7 | =head1 SYNOPSIS | 7 | =head1 SYNOPSIS |
8 | 8 | ||
9 | B<openssl dh> | 9 | B<openssl dhparam> |
10 | [B<-inform DER|PEM>] | 10 | [B<-inform DER|PEM>] |
11 | [B<-outform DER|PEM>] | 11 | [B<-outform DER|PEM>] |
12 | [B<-in filename>] | 12 | [B<-in> I<filename>] |
13 | [B<-out filename>] | 13 | [B<-out> I<filename>] |
14 | [B<-dsaparam>] | ||
14 | [B<-noout>] | 15 | [B<-noout>] |
15 | [B<-text>] | 16 | [B<-text>] |
16 | [B<-C>] | 17 | [B<-C>] |
17 | [B<-2>] | 18 | [B<-2>] |
18 | [B<-5>] | 19 | [B<-5>] |
19 | [B<-rand file(s)>] | 20 | [B<-rand> I<file(s)>] |
20 | [numbits] | 21 | [I<numbits>] |
21 | 22 | ||
22 | =head1 DESCRIPTION | 23 | =head1 DESCRIPTION |
23 | 24 | ||
@@ -39,23 +40,35 @@ additional header and footer lines. | |||
39 | This specifies the output format, the options have the same meaning as the | 40 | This specifies the output format, the options have the same meaning as the |
40 | B<-inform> option. | 41 | B<-inform> option. |
41 | 42 | ||
42 | =item B<-in filename> | 43 | =item B<-in> I<filename> |
43 | 44 | ||
44 | This specifies the input filename to read parameters from or standard input if | 45 | This specifies the input filename to read parameters from or standard input if |
45 | this option is not specified. | 46 | this option is not specified. |
46 | 47 | ||
47 | =item B<-out filename> | 48 | =item B<-out> I<filename> |
48 | 49 | ||
49 | This specifies the output filename parameters to. Standard output is used | 50 | This specifies the output filename parameters to. Standard output is used |
50 | if this option is not present. The output filename should B<not> be the same | 51 | if this option is not present. The output filename should B<not> be the same |
51 | as the input filename. | 52 | as the input filename. |
52 | 53 | ||
54 | =item B<-dsaparam> | ||
55 | |||
56 | If this option is used, DSA rather than DH parameters are read or created; | ||
57 | they are converted to DH format. Otherwise, "strong" primes (such | ||
58 | that (p-1)/2 is also prime) will be used for DH parameter generation. | ||
59 | |||
60 | DH parameter generation with the B<-dsaparam> option is much faster, | ||
61 | and the recommended exponent length is shorter, which makes DH key | ||
62 | exchange more efficient. Beware that with such DSA-style DH | ||
63 | parameters, a fresh DH key should be created for each use to | ||
64 | avoid small-subgroup attacks that may be possible otherwise. | ||
65 | |||
53 | =item B<-2>, B<-5> | 66 | =item B<-2>, B<-5> |
54 | 67 | ||
55 | The generator to use, either 2 or 5. 2 is the default. If present then the | 68 | The generator to use, either 2 or 5. 2 is the default. If present then the |
56 | input file is ignored and parameters are generated instead. | 69 | input file is ignored and parameters are generated instead. |
57 | 70 | ||
58 | =item B<-rand file(s)> | 71 | =item B<-rand> I<file(s)> |
59 | 72 | ||
60 | a file or files containing random data used to seed the random number | 73 | a file or files containing random data used to seed the random number |
61 | generator, or an EGD socket (see L<RAND_egd(3)|RAND_egd(3)>). | 74 | generator, or an EGD socket (see L<RAND_egd(3)|RAND_egd(3)>). |
@@ -63,10 +76,10 @@ Multiple files can be specified separated by a OS-dependent character. | |||
63 | The separator is B<;> for MS-Windows, B<,> for OpenVSM, and B<:> for | 76 | The separator is B<;> for MS-Windows, B<,> for OpenVSM, and B<:> for |
64 | all others. | 77 | all others. |
65 | 78 | ||
66 | =item B<numbits> | 79 | =item I<numbits> |
67 | 80 | ||
68 | this option specifies that a parameter set should be generated of size | 81 | this option specifies that a parameter set should be generated of size |
69 | B<numbits>. It must be the last option. If not present then a value of 512 | 82 | I<numbits>. It must be the last option. If not present then a value of 512 |
70 | is used. If this option is present then the input file is ignored and | 83 | is used. If this option is present then the input file is ignored and |
71 | parameters are generated instead. | 84 | parameters are generated instead. |
72 | 85 | ||
@@ -81,7 +94,7 @@ this option prints out the DH parameters in human readable form. | |||
81 | =item B<-C> | 94 | =item B<-C> |
82 | 95 | ||
83 | this option converts the parameters into C code. The parameters can then | 96 | this option converts the parameters into C code. The parameters can then |
84 | be loaded by calling the B<get_dhXXX()> function. | 97 | be loaded by calling the B<get_dh>I<numbits>B<()> function. |
85 | 98 | ||
86 | =back | 99 | =back |
87 | 100 | ||
@@ -112,4 +125,9 @@ There should be a way to generate and manipulate DH keys. | |||
112 | 125 | ||
113 | L<dsaparam(1)|dsaparam(1)> | 126 | L<dsaparam(1)|dsaparam(1)> |
114 | 127 | ||
128 | =head1 HISTORY | ||
129 | |||
130 | The B<dhparam> command was added in OpenSSL 0.9.5. | ||
131 | The B<-dsaparam> option was added in OpenSSL 0.9.6. | ||
132 | |||
115 | =cut | 133 | =cut |
diff --git a/src/lib/libssl/src/doc/apps/genrsa.pod b/src/lib/libssl/src/doc/apps/genrsa.pod index a2d878410b..70d35fef0a 100644 --- a/src/lib/libssl/src/doc/apps/genrsa.pod +++ b/src/lib/libssl/src/doc/apps/genrsa.pod | |||
@@ -83,3 +83,6 @@ be much larger (typically 1024 bits). | |||
83 | =head1 SEE ALSO | 83 | =head1 SEE ALSO |
84 | 84 | ||
85 | L<gendsa(1)|gendsa(1)> | 85 | L<gendsa(1)|gendsa(1)> |
86 | |||
87 | =cut | ||
88 | |||
diff --git a/src/lib/libssl/src/doc/apps/openssl.pod b/src/lib/libssl/src/doc/apps/openssl.pod index 9b1320606b..2fc61b6c21 100644 --- a/src/lib/libssl/src/doc/apps/openssl.pod +++ b/src/lib/libssl/src/doc/apps/openssl.pod | |||
@@ -12,6 +12,10 @@ I<command> | |||
12 | [ I<command_opts> ] | 12 | [ I<command_opts> ] |
13 | [ I<command_args> ] | 13 | [ I<command_args> ] |
14 | 14 | ||
15 | B<openssl> [ B<list-standard-commands> | B<list-message-digest-commands> | B<list-cipher-commands> ] | ||
16 | |||
17 | B<openssl> B<no->I<XXX> [ I<arbitrary options> ] | ||
18 | |||
15 | =head1 DESCRIPTION | 19 | =head1 DESCRIPTION |
16 | 20 | ||
17 | OpenSSL is a cryptography toolkit implementing the Secure Sockets Layer (SSL | 21 | OpenSSL is a cryptography toolkit implementing the Secure Sockets Layer (SSL |
@@ -35,6 +39,22 @@ The B<openssl> program provides a rich variety of commands (I<command> in the | |||
35 | SYNOPSIS above), each of which often has a wealth of options and arguments | 39 | SYNOPSIS above), each of which often has a wealth of options and arguments |
36 | (I<command_opts> and I<command_args> in the SYNOPSIS). | 40 | (I<command_opts> and I<command_args> in the SYNOPSIS). |
37 | 41 | ||
42 | The pseudo-commands B<list-standard-commands>, B<list-message-digest-commands>, | ||
43 | and B<list-cipher-commands> output a list (one entry per line) of the names | ||
44 | of all standard commands, message digest commands, or cipher commands, | ||
45 | respectively, that are available in the present B<openssl> utility. | ||
46 | |||
47 | The pseudo-command B<no->I<XXX> tests whether a command of the | ||
48 | specified name is available. If no command named I<XXX> exists, it | ||
49 | returns 0 (success) and prints B<no->I<XXX>; otherwise it returns 1 | ||
50 | and prints I<XXX>. In both cases, the output goes to B<stdout> and | ||
51 | nothing is printed to B<stderr>. Additional command line arguments | ||
52 | are always ignored. Since for each cipher there is a command of the | ||
53 | same name, this provides an easy way for shell scripts to test for the | ||
54 | availability of ciphers in the B<openssl> program. (B<no->I<XXX> is | ||
55 | not able to detect pseudo-commands such as B<quit>, | ||
56 | B<list->I<...>B<-commands>, or B<no->I<XXX> itself.) | ||
57 | |||
38 | =head2 STANDARD COMMANDS | 58 | =head2 STANDARD COMMANDS |
39 | 59 | ||
40 | =over 10 | 60 | =over 10 |
@@ -103,6 +123,10 @@ Generation of hashed passwords. | |||
103 | 123 | ||
104 | PKCS#7 Data Management. | 124 | PKCS#7 Data Management. |
105 | 125 | ||
126 | =item L<B<rand>|rand(1)> | ||
127 | |||
128 | Generate pseudo-random bytes. | ||
129 | |||
106 | =item L<B<req>|req(1)> | 130 | =item L<B<req>|req(1)> |
107 | 131 | ||
108 | X.509 Certificate Signing Request (CSR) Management. | 132 | X.509 Certificate Signing Request (CSR) Management. |
@@ -285,14 +309,17 @@ L<enc(1)|enc(1)>, L<gendsa(1)|gendsa(1)>, | |||
285 | L<genrsa(1)|genrsa(1)>, L<nseq(1)|nseq(1)>, L<openssl(1)|openssl(1)>, | 309 | L<genrsa(1)|genrsa(1)>, L<nseq(1)|nseq(1)>, L<openssl(1)|openssl(1)>, |
286 | L<passwd(1)|passwd(1)>, | 310 | L<passwd(1)|passwd(1)>, |
287 | L<pkcs12(1)|pkcs12(1)>, L<pkcs7(1)|pkcs7(1)>, L<pkcs8(1)|pkcs8(1)>, | 311 | L<pkcs12(1)|pkcs12(1)>, L<pkcs7(1)|pkcs7(1)>, L<pkcs8(1)|pkcs8(1)>, |
288 | L<req(1)|req(1)>, L<rsa(1)|rsa(1)>, L<s_client(1)|s_client(1)>, | 312 | L<rand(1)|rand(1)>, L<req(1)|req(1)>, L<rsa(1)|rsa(1)>, L<s_client(1)|s_client(1)>, |
289 | L<s_server(1)|s_server(1)>, L<smime(1)|smime(1)>, L<spkac(1)|spkac(1)>, | 313 | L<s_server(1)|s_server(1)>, L<smime(1)|smime(1)>, L<spkac(1)|spkac(1)>, |
290 | L<verify(1)|verify(1)>, L<version(1)|version(1)>, L<x509(1)|x509(1)>, | 314 | L<verify(1)|verify(1)>, L<version(1)|version(1)>, L<x509(1)|x509(1)>, |
291 | L<crypto(3)|crypto(3)>, L<ssl(3)|ssl(3)> | 315 | L<crypto(3)|crypto(3)>, L<ssl(3)|ssl(3)> |
292 | 316 | ||
293 | =head1 HISTORY | 317 | =head1 HISTORY |
294 | 318 | ||
295 | The openssl(1) document appeared in OpenSSL 0.9.2 | 319 | The openssl(1) document appeared in OpenSSL 0.9.2. |
320 | The B<list->I<XXX>B<-commands> pseudo-commands were added in OpenSSL 0.9.3; | ||
321 | the B<no->I<XXX> pseudo-commands were added in OpenSSL 0.9.5a. | ||
322 | For notes on the availability of other commands, see their individual | ||
323 | manual pages. | ||
296 | 324 | ||
297 | =cut | 325 | =cut |
298 | |||
diff --git a/src/lib/libssl/src/doc/apps/rand.pod b/src/lib/libssl/src/doc/apps/rand.pod new file mode 100644 index 0000000000..f81eab0457 --- /dev/null +++ b/src/lib/libssl/src/doc/apps/rand.pod | |||
@@ -0,0 +1,50 @@ | |||
1 | =pod | ||
2 | |||
3 | =head1 NAME | ||
4 | |||
5 | rand - generate pseudo-random bytes | ||
6 | |||
7 | =head1 SYNOPSIS | ||
8 | |||
9 | B<openssl rand> | ||
10 | [B<-out> I<file>] | ||
11 | [B<-rand> I<file(s)>] | ||
12 | [B<-base64>] | ||
13 | I<num> | ||
14 | |||
15 | =head1 DESCRIPTION | ||
16 | |||
17 | The B<rand> command outputs I<num> pseudo-random bytes after seeding | ||
18 | the random number generater once. As in other B<openssl> command | ||
19 | line tools, PRNG seeding uses the file I<$HOME/>B<.rnd> or B<.rnd> | ||
20 | in addition to the files given in the B<-rand> option. A new | ||
21 | I<$HOME>/B<.rnd> or B<.rnd> file will be written back if enough | ||
22 | seeding was obtained from these sources. | ||
23 | |||
24 | =head1 OPTIONS | ||
25 | |||
26 | =over 4 | ||
27 | |||
28 | =item B<-out> I<file> | ||
29 | |||
30 | Write to I<file> instead of standard output. | ||
31 | |||
32 | =item B<-rand> I<file(s)> | ||
33 | |||
34 | Use specified file or files or EGD socket (see L<RAND_egd(3)|RAND_egd(3)>) | ||
35 | for seeding the random number generator. | ||
36 | Multiple files can be specified separated by a OS-dependent character. | ||
37 | The separator is B<;> for MS-Windows, B<,> for OpenVSM, and B<:> for | ||
38 | all others. | ||
39 | |||
40 | =item B<-base64> | ||
41 | |||
42 | Perform base64 encoding on the output. | ||
43 | |||
44 | =back | ||
45 | |||
46 | =head1 SEE ALSO | ||
47 | |||
48 | L<RAND_bytes(3)|RAND_bytes(3)> | ||
49 | |||
50 | =cut | ||
diff --git a/src/lib/libssl/src/doc/apps/s_client.pod b/src/lib/libssl/src/doc/apps/s_client.pod index 3ede134164..2f80375319 100644 --- a/src/lib/libssl/src/doc/apps/s_client.pod +++ b/src/lib/libssl/src/doc/apps/s_client.pod | |||
@@ -22,6 +22,7 @@ B<openssl> B<s_client> | |||
22 | [B<-state>] | 22 | [B<-state>] |
23 | [B<-nbio>] | 23 | [B<-nbio>] |
24 | [B<-crlf>] | 24 | [B<-crlf>] |
25 | [B<-ign_eof>] | ||
25 | [B<-quiet>] | 26 | [B<-quiet>] |
26 | [B<-ssl2>] | 27 | [B<-ssl2>] |
27 | [B<-ssl3>] | 28 | [B<-ssl3>] |
@@ -122,9 +123,15 @@ turns on non-blocking I/O | |||
122 | this option translated a line feed from the terminal into CR+LF as required | 123 | this option translated a line feed from the terminal into CR+LF as required |
123 | by some servers. | 124 | by some servers. |
124 | 125 | ||
126 | =item B<-ign_eof> | ||
127 | |||
128 | inhibit shutting down the connection when end of file is reached in the | ||
129 | input. | ||
130 | |||
125 | =item B<-quiet> | 131 | =item B<-quiet> |
126 | 132 | ||
127 | inhibit printing of session and certificate information. | 133 | inhibit printing of session and certificate information. This implicitely |
134 | turns on B<-ign_eof> as well. | ||
128 | 135 | ||
129 | =item B<-ssl2>, B<-ssl3>, B<-tls1>, B<-no_ssl2>, B<-no_ssl3>, B<-no_tls1> | 136 | =item B<-ssl2>, B<-ssl3>, B<-tls1>, B<-no_ssl2>, B<-no_ssl3>, B<-no_tls1> |
130 | 137 | ||
@@ -155,9 +162,10 @@ command for more information. | |||
155 | 162 | ||
156 | If a connection is established with an SSL server then any data received | 163 | If a connection is established with an SSL server then any data received |
157 | from the server is displayed and any key presses will be sent to the | 164 | from the server is displayed and any key presses will be sent to the |
158 | server. If the line begins with an B<R> then the session will be | 165 | server. When used interactively (which means neither B<-quiet> nor B<-ign_eof> |
159 | renegotiated. If the line begins with a B<Q> the connection will be closed | 166 | have been given), the session will be renegociated if the line begins with an |
160 | down. | 167 | B<R>, and if the line begins with a B<Q> or if end of file is reached, the |
168 | connection will be closed down. | ||
161 | 169 | ||
162 | =head1 NOTES | 170 | =head1 NOTES |
163 | 171 | ||
diff --git a/src/lib/libssl/src/doc/apps/x509.pod b/src/lib/libssl/src/doc/apps/x509.pod index b127182bbb..e4ae5468da 100644 --- a/src/lib/libssl/src/doc/apps/x509.pod +++ b/src/lib/libssl/src/doc/apps/x509.pod | |||
@@ -212,9 +212,10 @@ clears all the prohibited or rejected uses of the certificate. | |||
212 | 212 | ||
213 | =item B<-addtrust arg> | 213 | =item B<-addtrust arg> |
214 | 214 | ||
215 | adds a trusted certificate use. Currently acceptable values | 215 | adds a trusted certificate use. Any object name can be used here |
216 | are B<all> (any purpose), B<sslclient> (SSL client use), B<sslserver> | 216 | but currently only B<clientAuth> (SSL client use), B<serverAuth> |
217 | (SSL server use) B<email> (S/MIME email) and B<objsign> (Object signing). | 217 | (SSL server use) and B<emailProtection> (S/MIME email) are used. |
218 | Other OpenSSL applications may define additional uses. | ||
218 | 219 | ||
219 | =item B<-addreject arg> | 220 | =item B<-addreject arg> |
220 | 221 | ||
diff --git a/src/lib/libssl/src/doc/crypto/DH_set_method.pod b/src/lib/libssl/src/doc/crypto/DH_set_method.pod index dca41d8dbc..a8f75bdd9d 100644 --- a/src/lib/libssl/src/doc/crypto/DH_set_method.pod +++ b/src/lib/libssl/src/doc/crypto/DH_set_method.pod | |||
@@ -56,7 +56,7 @@ the default method is used. | |||
56 | /* compute shared secret */ | 56 | /* compute shared secret */ |
57 | int (*compute_key)(unsigned char *key, BIGNUM *pub_key, DH *dh); | 57 | int (*compute_key)(unsigned char *key, BIGNUM *pub_key, DH *dh); |
58 | 58 | ||
59 | /* compute r = a ^ p mod m. May be NULL */ | 59 | /* compute r = a ^ p mod m (May be NULL for some implementations) */ |
60 | int (*bn_mod_exp)(DH *dh, BIGNUM *r, BIGNUM *a, const BIGNUM *p, | 60 | int (*bn_mod_exp)(DH *dh, BIGNUM *r, BIGNUM *a, const BIGNUM *p, |
61 | const BIGNUM *m, BN_CTX *ctx, | 61 | const BIGNUM *m, BN_CTX *ctx, |
62 | BN_MONT_CTX *m_ctx); | 62 | BN_MONT_CTX *m_ctx); |
diff --git a/src/lib/libssl/src/doc/crypto/DSA_set_method.pod b/src/lib/libssl/src/doc/crypto/DSA_set_method.pod index 0b13ec9237..edec46413d 100644 --- a/src/lib/libssl/src/doc/crypto/DSA_set_method.pod +++ b/src/lib/libssl/src/doc/crypto/DSA_set_method.pod | |||
@@ -62,12 +62,13 @@ struct | |||
62 | int (*dsa_do_verify)(const unsigned char *dgst, int dgst_len, | 62 | int (*dsa_do_verify)(const unsigned char *dgst, int dgst_len, |
63 | DSA_SIG *sig, DSA *dsa); | 63 | DSA_SIG *sig, DSA *dsa); |
64 | 64 | ||
65 | /* compute rr = a1^p1 * a2^p2 mod m. May be NULL */ | 65 | /* compute rr = a1^p1 * a2^p2 mod m (May be NULL for some |
66 | implementations) */ | ||
66 | int (*dsa_mod_exp)(DSA *dsa, BIGNUM *rr, BIGNUM *a1, BIGNUM *p1, | 67 | int (*dsa_mod_exp)(DSA *dsa, BIGNUM *rr, BIGNUM *a1, BIGNUM *p1, |
67 | BIGNUM *a2, BIGNUM *p2, BIGNUM *m, | 68 | BIGNUM *a2, BIGNUM *p2, BIGNUM *m, |
68 | BN_CTX *ctx, BN_MONT_CTX *in_mont); | 69 | BN_CTX *ctx, BN_MONT_CTX *in_mont); |
69 | 70 | ||
70 | /* compute r = a ^ p mod m. May be NULL */ | 71 | /* compute r = a ^ p mod m (May be NULL for some implementations) */ |
71 | int (*bn_mod_exp)(DSA *dsa, BIGNUM *r, BIGNUM *a, | 72 | int (*bn_mod_exp)(DSA *dsa, BIGNUM *r, BIGNUM *a, |
72 | const BIGNUM *p, const BIGNUM *m, | 73 | const BIGNUM *p, const BIGNUM *m, |
73 | BN_CTX *ctx, BN_MONT_CTX *m_ctx); | 74 | BN_CTX *ctx, BN_MONT_CTX *m_ctx); |
diff --git a/src/lib/libssl/src/doc/crypto/EVP_OpenInit.pod b/src/lib/libssl/src/doc/crypto/EVP_OpenInit.pod new file mode 100644 index 0000000000..9707a4b399 --- /dev/null +++ b/src/lib/libssl/src/doc/crypto/EVP_OpenInit.pod | |||
@@ -0,0 +1,51 @@ | |||
1 | =pod | ||
2 | |||
3 | =head1 NAME | ||
4 | |||
5 | EVP_OpenInit, EVP_OpenUpdate, EVP_OpenFinal - EVP envelope decryption | ||
6 | |||
7 | =head1 SYNOPSIS | ||
8 | |||
9 | #include <openssl/evp.h> | ||
10 | |||
11 | int EVP_OpenInit(EVP_CIPHER_CTX *ctx,EVP_CIPHER *type,unsigned char *ek, | ||
12 | int ekl,unsigned char *iv,EVP_PKEY *priv); | ||
13 | void EVP_OpenUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, | ||
14 | int *outl, unsigned char *in, int inl); | ||
15 | void EVP_OpenFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, | ||
16 | int *outl); | ||
17 | |||
18 | =head1 DESCRIPTION | ||
19 | |||
20 | The EVP envelope routines are a high level interface to envelope | ||
21 | decryption. They decrypt a public key encrypted symmetric key and | ||
22 | then decrypt data using it. | ||
23 | |||
24 | EVP_OpenInit() initialises a cipher context B<ctx> for decryption | ||
25 | with cipher B<type>. It decrypts the encrypted symmetric key of length | ||
26 | B<ekl> bytes passed in the B<ek> parameter using the private key B<priv>. | ||
27 | The IV is supplied in the B<iv> parameter. | ||
28 | |||
29 | EVP_OpenUpdate() and EVP_OpenFinal() have exactly the same properties | ||
30 | as the EVP_DecryptUpdate() and EVP_DecryptFinal() routines, as | ||
31 | documented on the L<EVP_EncryptInit(3)|EVP_EncryptInit(3)> manual | ||
32 | page. | ||
33 | |||
34 | =head1 RETURN VALUES | ||
35 | |||
36 | EVP_OpenInit() returns -1 on error or an non zero integer (actually the | ||
37 | recovered secret key size) if successful. | ||
38 | |||
39 | EVP_SealUpdate() does not return a value. | ||
40 | |||
41 | EVP_SealFinal() returns 0 if the decrypt failed or 1 for success. | ||
42 | |||
43 | =head1 SEE ALSO | ||
44 | |||
45 | L<evp(3)|evp(3)>,L<rand(3)|rand(3)> | ||
46 | L<EVP_EncryptInit(3)|EVP_EncryptInit(3)>, | ||
47 | L<EVP_SealInit(3)|EVP_SealInit(3)> | ||
48 | |||
49 | =head1 HISTORY | ||
50 | |||
51 | =cut | ||
diff --git a/src/lib/libssl/src/doc/crypto/EVP_SealInit.pod b/src/lib/libssl/src/doc/crypto/EVP_SealInit.pod new file mode 100644 index 0000000000..1579d110fa --- /dev/null +++ b/src/lib/libssl/src/doc/crypto/EVP_SealInit.pod | |||
@@ -0,0 +1,70 @@ | |||
1 | =pod | ||
2 | |||
3 | =head1 NAME | ||
4 | |||
5 | EVP_SealInit, EVP_SealUpdate, EVP_SealFinal - EVP envelope encryption | ||
6 | |||
7 | =head1 SYNOPSIS | ||
8 | |||
9 | #include <openssl/evp.h> | ||
10 | |||
11 | int EVP_SealInit(EVP_CIPHER_CTX *ctx, EVP_CIPHER *type, unsigned char **ek, | ||
12 | int *ekl, unsigned char *iv,EVP_PKEY **pubk, int npubk); | ||
13 | void EVP_SealUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, | ||
14 | int *outl, unsigned char *in, int inl); | ||
15 | void EVP_SealFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, | ||
16 | int *outl); | ||
17 | |||
18 | =head1 DESCRIPTION | ||
19 | |||
20 | The EVP envelope routines are a high level interface to envelope | ||
21 | encryption. They generate a random key and then "envelope" it by | ||
22 | using public key encryption. Data can then be encrypted using this | ||
23 | key. | ||
24 | |||
25 | EVP_SealInit() initialises a cipher context B<ctx> for encryption | ||
26 | with cipher B<type> using a random secret key and IV supplied in | ||
27 | the B<iv> parameter. B<type> is normally supplied by a function such | ||
28 | as EVP_des_cbc(). The secret key is encrypted using one or more public | ||
29 | keys, this allows the same encrypted data to be decrypted using any | ||
30 | of the corresponding private keys. B<ek> is an array of buffers where | ||
31 | the public key encrypted secret key will be written, each buffer must | ||
32 | contain enough room for the corresponding encrypted key: that is | ||
33 | B<ek[i]> must have room for B<EVP_PKEY_size(pubk[i])> bytes. The actual | ||
34 | size of each encrypted secret key is written to the array B<ekl>. B<pubk> is | ||
35 | an array of B<npubk> public keys. | ||
36 | |||
37 | EVP_SealUpdate() and EVP_SealFinal() have exactly the same properties | ||
38 | as the EVP_EncryptUpdate() and EVP_EncryptFinal() routines, as | ||
39 | documented on the L<EVP_EncryptInit(3)|EVP_EncryptInit(3)> manual | ||
40 | page. | ||
41 | |||
42 | =head1 RETURN VALUES | ||
43 | |||
44 | EVP_SealInit() returns -1 on error or B<npubk> if successful. | ||
45 | |||
46 | EVP_SealUpdate() and EVP_SealFinal() do not return values. | ||
47 | |||
48 | =head1 NOTES | ||
49 | |||
50 | Because a random secret key is generated the random number generator | ||
51 | must be seeded before calling EVP_SealInit(). | ||
52 | |||
53 | The public key must be RSA because it is the only OpenSSL public key | ||
54 | algorithm that supports key transport. | ||
55 | |||
56 | Envelope encryption is the usual method of using public key encryption | ||
57 | on large amounts of data, this is because public key encryption is slow | ||
58 | but symmetric encryption is fast. So symmetric encryption is used for | ||
59 | bulk encryption and the small random symmetric key used is transferred | ||
60 | using public key encryption. | ||
61 | |||
62 | =head1 SEE ALSO | ||
63 | |||
64 | L<evp(3)|evp(3)>,L<rand(3)|rand(3)> | ||
65 | L<EVP_EncryptInit(3)|EVP_EncryptInit(3)>, | ||
66 | L<EVP_OpenInit(3)|EVP_OpenInit(3)> | ||
67 | |||
68 | =head1 HISTORY | ||
69 | |||
70 | =cut | ||
diff --git a/src/lib/libssl/src/doc/crypto/EVP_SignInit.pod b/src/lib/libssl/src/doc/crypto/EVP_SignInit.pod new file mode 100644 index 0000000000..bbc9203c9c --- /dev/null +++ b/src/lib/libssl/src/doc/crypto/EVP_SignInit.pod | |||
@@ -0,0 +1,85 @@ | |||
1 | =pod | ||
2 | |||
3 | =head1 NAME | ||
4 | |||
5 | EVP_SignInit, EVP_SignUpdate, EVP_SignFinal - EVP signing functions | ||
6 | |||
7 | =head1 SYNOPSIS | ||
8 | |||
9 | #include <openssl/evp.h> | ||
10 | |||
11 | void EVP_SignInit(EVP_MD_CTX *ctx, const EVP_MD *type); | ||
12 | void EVP_SignUpdate(EVP_MD_CTX *ctx, const void *d, unsigned int cnt); | ||
13 | int EVP_SignFinal(EVP_MD_CTX *ctx,unsigned char *sig,unsigned int *s, EVP_PKEY *pkey); | ||
14 | |||
15 | int EVP_PKEY_size(EVP_PKEY *pkey); | ||
16 | |||
17 | =head1 DESCRIPTION | ||
18 | |||
19 | The EVP signature routines are a high level interface to digital | ||
20 | signatures. | ||
21 | |||
22 | EVP_SignInit() initialises a signing context B<ctx> to using digest | ||
23 | B<type>: this will typically be supplied by a function such as | ||
24 | EVP_sha1(). | ||
25 | |||
26 | EVP_SignUpdate() hashes B<cnt> bytes of data at B<d> into the | ||
27 | signature context B<ctx>. This funtion can be called several times on the | ||
28 | same B<ctx> to include additional data. | ||
29 | |||
30 | EVP_SignFinal() signs the data in B<ctx> using the private key B<pkey> | ||
31 | and places the signature in B<sig>. If the B<s> parameter is not NULL | ||
32 | then the number of bytes of data written (i.e. the length of the signature) | ||
33 | will be written to the integer at B<s>, at most EVP_PKEY_size(pkey) bytes | ||
34 | will be written. After calling EVP_SignFinal() no additional calls to | ||
35 | EVP_SignUpdate() can be made, but EVP_SignInit() can be called to initialiase | ||
36 | a new signature operation. | ||
37 | |||
38 | EVP_PKEY_size() returns the maximum size of a signature in bytes. The actual | ||
39 | signature returned by EVP_SignFinal() may be smaller. | ||
40 | |||
41 | =head1 RETURN VALUES | ||
42 | |||
43 | EVP_SignInit() and EVP_SignUpdate() do not return values. | ||
44 | |||
45 | EVP_SignFinal() returns 1 for success and 0 for failure. | ||
46 | |||
47 | EVP_PKEY_size() returns the maximum size of a signature in bytes. | ||
48 | |||
49 | The error codes can be obtained by L<ERR_get_error(3)|ERR_get_error(3)>. | ||
50 | |||
51 | =head1 NOTES | ||
52 | |||
53 | The B<EVP> interface to digital signatures should almost always be used in | ||
54 | preference to the low level interfaces. This is because the code then becomes | ||
55 | transparent to the algorithm used and much more flexible. | ||
56 | |||
57 | Due to the link between message digests and public key algorithms the correct | ||
58 | digest algorithm must be used with the correct public key type. A list of | ||
59 | algorithms and associated public key algorithms appears in | ||
60 | L<EVP_DigestInit(3)|EVP_DigestInit(3)>. | ||
61 | |||
62 | When signing with DSA private keys the random number generator must be seeded | ||
63 | or the operation will fail. The random number generator does not need to be | ||
64 | seeded for RSA signatures. | ||
65 | |||
66 | =head1 BUGS | ||
67 | |||
68 | Several of the functions do not return values: maybe they should. Although the | ||
69 | internal digest operations will never fail some future hardware based operations | ||
70 | might. | ||
71 | |||
72 | =head1 SEE ALSO | ||
73 | |||
74 | L<EVP_VerifyInit(3)|EVP_VerifyInit(3)>, | ||
75 | L<EVP_DigestInit(3)|EVP_DigestInit(3)>, L<err(3)|err(3)>, | ||
76 | L<evp(3)|evp(3)>, L<hmac(3)|hmac(3)>, L<md2(3)|md2(3)>, | ||
77 | L<md5(3)|md5(3)>, L<mdc2(3)|mdc2(3)>, L<ripemd(3)|ripemd(3)>, | ||
78 | L<sha(3)|sha(3)>, L<digest(1)|digest(1)> | ||
79 | |||
80 | =head1 HISTORY | ||
81 | |||
82 | EVP_SignInit(), EVP_SignUpdate() and EVP_SignFinal() are | ||
83 | available in all versions of SSLeay and OpenSSL. | ||
84 | |||
85 | =cut | ||
diff --git a/src/lib/libssl/src/doc/crypto/EVP_VerifyInit.pod b/src/lib/libssl/src/doc/crypto/EVP_VerifyInit.pod new file mode 100644 index 0000000000..3b5e07f4ad --- /dev/null +++ b/src/lib/libssl/src/doc/crypto/EVP_VerifyInit.pod | |||
@@ -0,0 +1,71 @@ | |||
1 | =pod | ||
2 | |||
3 | =head1 NAME | ||
4 | |||
5 | EVP_VerifyInit, EVP_VerifyUpdate, EVP_VerifyFinal - EVP signature verification functions | ||
6 | |||
7 | =head1 SYNOPSIS | ||
8 | |||
9 | #include <openssl/evp.h> | ||
10 | |||
11 | void EVP_VerifyInit(EVP_MD_CTX *ctx, const EVP_MD *type); | ||
12 | void EVP_VerifyUpdate(EVP_MD_CTX *ctx, const void *d, unsigned int cnt); | ||
13 | int EVP_VerifyFinal(EVP_MD_CTX *ctx,unsigned char *sigbuf, unsigned int siglen,EVP_PKEY *pkey); | ||
14 | |||
15 | =head1 DESCRIPTION | ||
16 | |||
17 | The EVP signature verification routines are a high level interface to digital | ||
18 | signatures. | ||
19 | |||
20 | EVP_VerifyInit() initialises a verification context B<ctx> to using digest | ||
21 | B<type>: this will typically be supplied by a function such as EVP_sha1(). | ||
22 | |||
23 | EVP_VerifyUpdate() hashes B<cnt> bytes of data at B<d> into the | ||
24 | verification context B<ctx>. This funtion can be called several times on the | ||
25 | same B<ctx> to include additional data. | ||
26 | |||
27 | EVP_VerifyFinal() verifies the data in B<ctx> using the public key B<pkey> | ||
28 | and against the B<siglen> bytes at B<sigbuf>. After calling EVP_VerifyFinal() | ||
29 | no additional calls to EVP_VerifyUpdate() can be made, but EVP_VerifyInit() | ||
30 | can be called to initialiase a new verification operation. | ||
31 | |||
32 | =head1 RETURN VALUES | ||
33 | |||
34 | EVP_VerifyInit() and EVP_VerifyUpdate() do not return values. | ||
35 | |||
36 | EVP_VerifyFinal() returns 1 for a correct signature, 0 for failure and -1 if some | ||
37 | other error occurred. | ||
38 | |||
39 | The error codes can be obtained by L<ERR_get_error(3)|ERR_get_error(3)>. | ||
40 | |||
41 | =head1 NOTES | ||
42 | |||
43 | The B<EVP> interface to digital signatures should almost always be used in | ||
44 | preference to the low level interfaces. This is because the code then becomes | ||
45 | transparent to the algorithm used and much more flexible. | ||
46 | |||
47 | Due to the link between message digests and public key algorithms the correct | ||
48 | digest algorithm must be used with the correct public key type. A list of | ||
49 | algorithms and associated public key algorithms appears in | ||
50 | L<EVP_DigestInit(3)|EVP_DigestInit(3)>. | ||
51 | |||
52 | =head1 BUGS | ||
53 | |||
54 | Several of the functions do not return values: maybe they should. Although the | ||
55 | internal digest operations will never fail some future hardware based operations | ||
56 | might. | ||
57 | |||
58 | =head1 SEE ALSO | ||
59 | |||
60 | L<EVP_SignInit(3)|EVP_SignInit(3)>, | ||
61 | L<EVP_DigestInit(3)|EVP_DigestInit(3)>, L<err(3)|err(3)>, | ||
62 | L<evp(3)|evp(3)>, L<hmac(3)|hmac(3)>, L<md2(3)|md2(3)>, | ||
63 | L<md5(3)|md5(3)>, L<mdc2(3)|mdc2(3)>, L<ripemd(3)|ripemd(3)>, | ||
64 | L<sha(3)|sha(3)>, L<digest(1)|digest(1)> | ||
65 | |||
66 | =head1 HISTORY | ||
67 | |||
68 | EVP_VerifyInit(), EVP_VerifyUpdate() and EVP_VerifyFinal() are | ||
69 | available in all versions of SSLeay and OpenSSL. | ||
70 | |||
71 | =cut | ||
diff --git a/src/lib/libssl/src/doc/crypto/RAND_add.pod b/src/lib/libssl/src/doc/crypto/RAND_add.pod index 0a13ec2a92..67c66f3e0c 100644 --- a/src/lib/libssl/src/doc/crypto/RAND_add.pod +++ b/src/lib/libssl/src/doc/crypto/RAND_add.pod | |||
@@ -2,7 +2,8 @@ | |||
2 | 2 | ||
3 | =head1 NAME | 3 | =head1 NAME |
4 | 4 | ||
5 | RAND_add, RAND_seed, RAND_screen - add entropy to the PRNG | 5 | RAND_add, RAND_seed, RAND_status, RAND_event, RAND_screen - add |
6 | entropy to the PRNG | ||
6 | 7 | ||
7 | =head1 SYNOPSIS | 8 | =head1 SYNOPSIS |
8 | 9 | ||
@@ -14,6 +15,7 @@ RAND_add, RAND_seed, RAND_screen - add entropy to the PRNG | |||
14 | 15 | ||
15 | int RAND_status(void); | 16 | int RAND_status(void); |
16 | 17 | ||
18 | int RAND_event(UINT iMsg, WPARAM wParam, LPARAM lParam); | ||
17 | void RAND_screen(void); | 19 | void RAND_screen(void); |
18 | 20 | ||
19 | =head1 DESCRIPTION | 21 | =head1 DESCRIPTION |
@@ -40,17 +42,24 @@ or L<RAND_load_file(3)|RAND_load_file(3)>. | |||
40 | 42 | ||
41 | RAND_seed() is equivalent to RAND_add() when B<num == entropy>. | 43 | RAND_seed() is equivalent to RAND_add() when B<num == entropy>. |
42 | 44 | ||
45 | RAND_event() collects the entropy from Windows events such as mouse | ||
46 | movements and other user interaction. It should be called with the | ||
47 | B<iMsg>, B<wParam> and B<lParam> arguments of I<all> messages sent to | ||
48 | the window procedure. It will estimate the entropy contained in the | ||
49 | event message (if any), and add it to the PRNG. The program can then | ||
50 | process the messages as usual. | ||
51 | |||
43 | The RAND_screen() function is available for the convenience of Windows | 52 | The RAND_screen() function is available for the convenience of Windows |
44 | programmers. It adds the current contents of the screen to the PRNG. | 53 | programmers. It adds the current contents of the screen to the PRNG. |
45 | For applications that can catch Windows events, seeding the PRNG with | 54 | For applications that can catch Windows events, seeding the PRNG by |
46 | the parameters of B<WM_MOUSEMOVE> events is a significantly better | 55 | calling RAND_event() is a significantly better source of |
47 | source of randomness. It should be noted that both methods cannot be | 56 | randomness. It should be noted that both methods cannot be used on |
48 | used on servers that run without user interaction. | 57 | servers that run without user interaction. |
49 | 58 | ||
50 | =head1 RETURN VALUES | 59 | =head1 RETURN VALUES |
51 | 60 | ||
52 | RAND_status() returns 1 if the PRNG has been seeded with enough data, | 61 | RAND_status() and RAND_event() return 1 if the PRNG has been seeded |
53 | 0 otherwise. | 62 | with enough data, 0 otherwise. |
54 | 63 | ||
55 | The other functions do not return values. | 64 | The other functions do not return values. |
56 | 65 | ||
@@ -63,6 +72,6 @@ L<RAND_load_file(3)|RAND_load_file(3)>, L<RAND_cleanup(3)|RAND_cleanup(3)> | |||
63 | 72 | ||
64 | RAND_seed() and RAND_screen() are available in all versions of SSLeay | 73 | RAND_seed() and RAND_screen() are available in all versions of SSLeay |
65 | and OpenSSL. RAND_add() and RAND_status() have been added in OpenSSL | 74 | and OpenSSL. RAND_add() and RAND_status() have been added in OpenSSL |
66 | 0.9.5. | 75 | 0.9.5, RAND_event() in OpenSSL 0.9.5a. |
67 | 76 | ||
68 | =cut | 77 | =cut |
diff --git a/src/lib/libssl/src/doc/crypto/RAND_set_rand_method.pod b/src/lib/libssl/src/doc/crypto/RAND_set_rand_method.pod index 466e9b8767..464eba416d 100644 --- a/src/lib/libssl/src/doc/crypto/RAND_set_rand_method.pod +++ b/src/lib/libssl/src/doc/crypto/RAND_set_rand_method.pod | |||
@@ -34,10 +34,12 @@ RAND_get_rand_method() returns a pointer to the current method. | |||
34 | void (*cleanup)(void); | 34 | void (*cleanup)(void); |
35 | void (*add)(const void *buf, int num, int entropy); | 35 | void (*add)(const void *buf, int num, int entropy); |
36 | int (*pseudorand)(unsigned char *buf, int num); | 36 | int (*pseudorand)(unsigned char *buf, int num); |
37 | int (*status)(void); | ||
37 | } RAND_METHOD; | 38 | } RAND_METHOD; |
38 | 39 | ||
39 | The components point to the implementation of RAND_seed(), | 40 | The components point to the implementation of RAND_seed(), |
40 | RAND_bytes(), RAND_cleanup(), RAND_add() and RAND_pseudo_rand(). | 41 | RAND_bytes(), RAND_cleanup(), RAND_add(), RAND_pseudo_rand() |
42 | and RAND_status(). | ||
41 | Each component may be NULL if the function is not implemented. | 43 | Each component may be NULL if the function is not implemented. |
42 | 44 | ||
43 | =head1 RETURN VALUES | 45 | =head1 RETURN VALUES |
diff --git a/src/lib/libssl/src/doc/crypto/RSA_set_method.pod b/src/lib/libssl/src/doc/crypto/RSA_set_method.pod index deb1183a23..14b0b4cf35 100644 --- a/src/lib/libssl/src/doc/crypto/RSA_set_method.pod +++ b/src/lib/libssl/src/doc/crypto/RSA_set_method.pod | |||
@@ -87,10 +87,11 @@ the default method is used. | |||
87 | int (*rsa_priv_dec)(int flen, unsigned char *from, | 87 | int (*rsa_priv_dec)(int flen, unsigned char *from, |
88 | unsigned char *to, RSA *rsa, int padding); | 88 | unsigned char *to, RSA *rsa, int padding); |
89 | 89 | ||
90 | /* compute r0 = r0 ^ I mod rsa->n. May be NULL */ | 90 | /* compute r0 = r0 ^ I mod rsa->n (May be NULL for some |
91 | implementations) */ | ||
91 | int (*rsa_mod_exp)(BIGNUM *r0, BIGNUM *I, RSA *rsa); | 92 | int (*rsa_mod_exp)(BIGNUM *r0, BIGNUM *I, RSA *rsa); |
92 | 93 | ||
93 | /* compute r = a ^ p mod m. May be NULL */ | 94 | /* compute r = a ^ p mod m (May be NULL for some implementations) */ |
94 | int (*bn_mod_exp)(BIGNUM *r, BIGNUM *a, const BIGNUM *p, | 95 | int (*bn_mod_exp)(BIGNUM *r, BIGNUM *a, const BIGNUM *p, |
95 | const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx); | 96 | const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx); |
96 | 97 | ||
diff --git a/src/lib/libssl/src/doc/crypto/blowfish.pod b/src/lib/libssl/src/doc/crypto/blowfish.pod index e8c7114311..e0b777418f 100644 --- a/src/lib/libssl/src/doc/crypto/blowfish.pod +++ b/src/lib/libssl/src/doc/crypto/blowfish.pod | |||
@@ -57,28 +57,31 @@ everything after the first 64 bits is ignored. | |||
57 | 57 | ||
58 | The mode functions BF_cbc_encrypt(), BF_cfb64_encrypt() and BF_ofb64_encrypt() | 58 | The mode functions BF_cbc_encrypt(), BF_cfb64_encrypt() and BF_ofb64_encrypt() |
59 | all operate on variable length data. They all take an initialisation vector | 59 | all operate on variable length data. They all take an initialisation vector |
60 | B<ivec> which must be initially filled with zeros, but then just need to be | 60 | B<ivec> which needs to be passed along into the next call of the same function |
61 | passed along into the next call of the same function for the same message. | 61 | for the same message. B<ivec> may be initialised with anything, but the |
62 | recipient needs to know what it was initialised with, or it won't be able | ||
63 | to decrypt. Some programs and protocols simplify this, like SSH, where | ||
64 | B<ivec> is simply initialised to zero. | ||
62 | BF_cbc_encrypt() operates of data that is a multiple of 8 bytes long, while | 65 | BF_cbc_encrypt() operates of data that is a multiple of 8 bytes long, while |
63 | BF_cfb64_encrypt() and BF_ofb64_encrypt() are used to encrypt an variable | 66 | BF_cfb64_encrypt() and BF_ofb64_encrypt() are used to encrypt an variable |
64 | number of bytes (the amount does not have to be an exact multiple of 8). The | 67 | number of bytes (the amount does not have to be an exact multiple of 8). The |
65 | purpose of the latter two is to simulate stream ciphers, and therefore, they | 68 | purpose of the latter two is to simulate stream ciphers, and therefore, they |
66 | need the parameter B<num>, which is a pointer to an integer where the current | 69 | need the parameter B<num>, which is a pointer to an integer where the current |
67 | offset in B<ivec> is stored between calls. This integer must be initialised | 70 | offset in B<ivec> is stored between calls. This integer must be initialised |
68 | to zero when B<ivec> is filled with zeros. | 71 | to zero when B<ivec> is initialised. |
69 | 72 | ||
70 | BF_cbc_encrypt() is the Cipher Block Chaining function for Blowfish. It | 73 | BF_cbc_encrypt() is the Cipher Block Chaining function for Blowfish. It |
71 | encrypts or decrypts the 64 bits chunks of B<in> using the key B<schedule>, | 74 | encrypts or decrypts the 64 bits chunks of B<in> using the key B<schedule>, |
72 | putting the result in B<out>. B<enc> decides if encryption (BF_ENCRYPT) or | 75 | putting the result in B<out>. B<enc> decides if encryption (BF_ENCRYPT) or |
73 | decryption (BF_DECRYPT) shall be performed. B<ivec> must point at an 8 byte | 76 | decryption (BF_DECRYPT) shall be performed. B<ivec> must point at an 8 byte |
74 | long initialisation vector, which must be initially filled with zeros. | 77 | long initialisation vector. |
75 | 78 | ||
76 | BF_cfb64_encrypt() is the CFB mode for Blowfish with 64 bit feedback. | 79 | BF_cfb64_encrypt() is the CFB mode for Blowfish with 64 bit feedback. |
77 | It encrypts or decrypts the bytes in B<in> using the key B<schedule>, | 80 | It encrypts or decrypts the bytes in B<in> using the key B<schedule>, |
78 | putting the result in B<out>. B<enc> decides if encryption (B<BF_ENCRYPT>) | 81 | putting the result in B<out>. B<enc> decides if encryption (B<BF_ENCRYPT>) |
79 | or decryption (B<BF_DECRYPT>) shall be performed. B<ivec> must point at an | 82 | or decryption (B<BF_DECRYPT>) shall be performed. B<ivec> must point at an |
80 | 8 byte long initialisation vector, which must be initially filled with zeros. | 83 | 8 byte long initialisation vector. B<num> must point at an integer which must |
81 | B<num> must point at an integer which must be initially zero. | 84 | be initially zero. |
82 | 85 | ||
83 | BF_ofb64_encrypt() is the OFB mode for Blowfish with 64 bit feedback. | 86 | BF_ofb64_encrypt() is the OFB mode for Blowfish with 64 bit feedback. |
84 | It uses the same parameters as BF_cfb64_encrypt(), which must be initialised | 87 | It uses the same parameters as BF_cfb64_encrypt(), which must be initialised |
diff --git a/src/lib/libssl/src/doc/crypto/des.pod b/src/lib/libssl/src/doc/crypto/des.pod new file mode 100644 index 0000000000..c553210ef2 --- /dev/null +++ b/src/lib/libssl/src/doc/crypto/des.pod | |||
@@ -0,0 +1,376 @@ | |||
1 | =pod | ||
2 | |||
3 | =head1 NAME | ||
4 | |||
5 | des_random_key, des_set_key, des_key_sched, des_set_key_checked, | ||
6 | des_set_key_unchecked, des_set_odd_parity, des_is_weak_key, | ||
7 | des_ecb_encrypt, des_ecb2_encrypt, des_ecb3_encrypt, des_ncbc_encrypt, | ||
8 | des_cfb_encrypt, des_ofb_encrypt, des_pcbc_encrypt, des_cfb64_encrypt, | ||
9 | des_ofb64_encrypt, des_xcbc_encrypt, des_ede2_cbc_encrypt, | ||
10 | des_ede2_cfb64_encrypt, des_ede2_ofb64_encrypt, des_ede3_cbc_encrypt, | ||
11 | des_ede3_cbcm_encrypt, des_ede3_cfb64_encrypt, des_ede3_ofb64_encrypt, | ||
12 | des_read_password, des_read_2passwords, des_read_pw_string, | ||
13 | des_cbc_cksum, des_quad_cksum, des_string_to_key, des_string_to_2keys, | ||
14 | des_fcrypt, des_crypt, des_enc_read, des_enc_write - DES encryption | ||
15 | |||
16 | =head1 SYNOPSIS | ||
17 | |||
18 | #include <openssl/des.h> | ||
19 | |||
20 | void des_random_key(des_cblock *ret); | ||
21 | |||
22 | int des_set_key(const_des_cblock *key, des_key_schedule schedule); | ||
23 | int des_key_sched(const_des_cblock *key, des_key_schedule schedule); | ||
24 | int des_set_key_checked(const_des_cblock *key, | ||
25 | des_key_schedule schedule); | ||
26 | void des_set_key_unchecked(const_des_cblock *key, | ||
27 | des_key_schedule schedule); | ||
28 | |||
29 | void des_set_odd_parity(des_cblock *key); | ||
30 | int des_is_weak_key(const_des_cblock *key); | ||
31 | |||
32 | void des_ecb_encrypt(const_des_cblock *input, des_cblock *output, | ||
33 | des_key_schedule ks, int enc); | ||
34 | void des_ecb2_encrypt(const_des_cblock *input, des_cblock *output, | ||
35 | des_key_schedule ks1, des_key_schedule ks2, int enc); | ||
36 | void des_ecb3_encrypt(const_des_cblock *input, des_cblock *output, | ||
37 | des_key_schedule ks1, des_key_schedule ks2, | ||
38 | des_key_schedule ks3, int enc); | ||
39 | |||
40 | void des_ncbc_encrypt(const unsigned char *input, unsigned char *output, | ||
41 | long length, des_key_schedule schedule, des_cblock *ivec, | ||
42 | int enc); | ||
43 | void des_cfb_encrypt(const unsigned char *in, unsigned char *out, | ||
44 | int numbits, long length, des_key_schedule schedule, | ||
45 | des_cblock *ivec, int enc); | ||
46 | void des_ofb_encrypt(const unsigned char *in, unsigned char *out, | ||
47 | int numbits, long length, des_key_schedule schedule, | ||
48 | des_cblock *ivec); | ||
49 | void des_pcbc_encrypt(const unsigned char *input, unsigned char *output, | ||
50 | long length, des_key_schedule schedule, des_cblock *ivec, | ||
51 | int enc); | ||
52 | void des_cfb64_encrypt(const unsigned char *in, unsigned char *out, | ||
53 | long length, des_key_schedule schedule, des_cblock *ivec, | ||
54 | int *num, int enc); | ||
55 | void des_ofb64_encrypt(const unsigned char *in, unsigned char *out, | ||
56 | long length, des_key_schedule schedule, des_cblock *ivec, | ||
57 | int *num); | ||
58 | |||
59 | void des_xcbc_encrypt(const unsigned char *input, unsigned char *output, | ||
60 | long length, des_key_schedule schedule, des_cblock *ivec, | ||
61 | const_des_cblock *inw, const_des_cblock *outw, int enc); | ||
62 | |||
63 | void des_ede2_cbc_encrypt(const unsigned char *input, | ||
64 | unsigned char *output, long length, des_key_schedule ks1, | ||
65 | des_key_schedule ks2, des_cblock *ivec, int enc); | ||
66 | void des_ede2_cfb64_encrypt(const unsigned char *in, | ||
67 | unsigned char *out, long length, des_key_schedule ks1, | ||
68 | des_key_schedule ks2, des_cblock *ivec, int *num, int enc); | ||
69 | void des_ede2_ofb64_encrypt(const unsigned char *in, | ||
70 | unsigned char *out, long length, des_key_schedule ks1, | ||
71 | des_key_schedule ks2, des_cblock *ivec, int *num); | ||
72 | |||
73 | void des_ede3_cbc_encrypt(const unsigned char *input, | ||
74 | unsigned char *output, long length, des_key_schedule ks1, | ||
75 | des_key_schedule ks2, des_key_schedule ks3, des_cblock *ivec, | ||
76 | int enc); | ||
77 | void des_ede3_cbcm_encrypt(const unsigned char *in, unsigned char *out, | ||
78 | long length, des_key_schedule ks1, des_key_schedule ks2, | ||
79 | des_key_schedule ks3, des_cblock *ivec1, des_cblock *ivec2, | ||
80 | int enc); | ||
81 | void des_ede3_cfb64_encrypt(const unsigned char *in, unsigned char *out, | ||
82 | long length, des_key_schedule ks1, des_key_schedule ks2, | ||
83 | des_key_schedule ks3, des_cblock *ivec, int *num, int enc); | ||
84 | void des_ede3_ofb64_encrypt(const unsigned char *in, unsigned char *out, | ||
85 | long length, des_key_schedule ks1, | ||
86 | des_key_schedule ks2, des_key_schedule ks3, | ||
87 | des_cblock *ivec, int *num); | ||
88 | |||
89 | int des_read_password(des_cblock *key, const char *prompt, int verify); | ||
90 | int des_read_2passwords(des_cblock *key1, des_cblock *key2, | ||
91 | const char *prompt, int verify); | ||
92 | int des_read_pw_string(char *buf, int length, const char *prompt, | ||
93 | int verify); | ||
94 | |||
95 | DES_LONG des_cbc_cksum(const unsigned char *input, des_cblock *output, | ||
96 | long length, des_key_schedule schedule, | ||
97 | const_des_cblock *ivec); | ||
98 | DES_LONG des_quad_cksum(const unsigned char *input, des_cblock output[], | ||
99 | long length, int out_count, des_cblock *seed); | ||
100 | void des_string_to_key(const char *str, des_cblock *key); | ||
101 | void des_string_to_2keys(const char *str, des_cblock *key1, | ||
102 | des_cblock *key2); | ||
103 | |||
104 | char *des_fcrypt(const char *buf, const char *salt, char *ret); | ||
105 | char *des_crypt(const char *buf, const char *salt); | ||
106 | char *crypt(const char *buf, const char *salt); | ||
107 | |||
108 | int des_enc_read(int fd, void *buf, int len, des_key_schedule sched, | ||
109 | des_cblock *iv); | ||
110 | int des_enc_write(int fd, const void *buf, int len, | ||
111 | des_key_schedule sched, des_cblock *iv); | ||
112 | |||
113 | =head1 DESCRIPTION | ||
114 | |||
115 | This library contains a fast implementation of the DES encryption | ||
116 | algorithm. | ||
117 | |||
118 | There are two phases to the use of DES encryption. The first is the | ||
119 | generation of a I<des_key_schedule> from a key, the second is the | ||
120 | actual encryption. A DES key is of type I<des_cblock>. This type is | ||
121 | consists of 8 bytes with odd parity. The least significant bit in | ||
122 | each byte is the parity bit. The key schedule is an expanded form of | ||
123 | the key; it is used to speed the encryption process. | ||
124 | |||
125 | des_random_key() generates a random key. The PRNG must be seeded | ||
126 | prior to using this function (see L<rand(3)|rand(3)>; for backward | ||
127 | compatibility the function des_random_seed() is available as well). | ||
128 | If the PRNG could not generate a secure key, 0 is returned. In | ||
129 | earlier versions of the library, des_random_key() did not generate | ||
130 | secure keys. | ||
131 | |||
132 | Before a DES key can be used, it must be converted into the | ||
133 | architecture dependant I<des_key_schedule> via the | ||
134 | des_set_key_checked() or des_set_key_unchecked() function. | ||
135 | |||
136 | des_set_key_checked() will check that the key passed is of odd parity | ||
137 | and is not a week or semi-weak key. If the parity is wrong, then -1 | ||
138 | is returned. If the key is a weak key, then -2 is returned. If an | ||
139 | error is returned, the key schedule is not generated. | ||
140 | |||
141 | des_set_key() (called des_key_sched() in the MIT library) works like | ||
142 | des_set_key_checked() if the I<des_check_key> flag is non-zero, | ||
143 | otherwise like des_set_key_unchecked(). These functions are available | ||
144 | for compatibility; it is recommended to use a function that does not | ||
145 | depend on a global variable. | ||
146 | |||
147 | des_set_odd_parity() (called des_fixup_key_parity() in the MIT | ||
148 | library) sets the parity of the passed I<key> to odd. | ||
149 | |||
150 | des_is_weak_key() returns 1 is the passed key is a weak key, 0 if it | ||
151 | is ok. The probability that a randomly generated key is weak is | ||
152 | 1/2^52, so it is not really worth checking for them. | ||
153 | |||
154 | The following routines mostly operate on an input and output stream of | ||
155 | I<des_cblock>s. | ||
156 | |||
157 | des_ecb_encrypt() is the basic DES encryption routine that encrypts or | ||
158 | decrypts a single 8-byte I<des_cblock> in I<electronic code book> | ||
159 | (ECB) mode. It always transforms the input data, pointed to by | ||
160 | I<input>, into the output data, pointed to by the I<output> argument. | ||
161 | If the I<encrypt> argument is non-zero (DES_ENCRYPT), the I<input> | ||
162 | (cleartext) is encrypted in to the I<output> (ciphertext) using the | ||
163 | key_schedule specified by the I<schedule> argument, previously set via | ||
164 | I<des_set_key>. If I<encrypt> is zero (DES_DECRYPT), the I<input> (now | ||
165 | ciphertext) is decrypted into the I<output> (now cleartext). Input | ||
166 | and output may overlap. des_ecb_encrypt() does not return a value. | ||
167 | |||
168 | des_ecb3_encrypt() encrypts/decrypts the I<input> block by using | ||
169 | three-key Triple-DES encryption in ECB mode. This involves encrypting | ||
170 | the input with I<ks1>, decrypting with the key schedule I<ks2>, and | ||
171 | then encrypting with I<ks3>. This routine greatly reduces the chances | ||
172 | of brute force breaking of DES and has the advantage of if I<ks1>, | ||
173 | I<ks2> and I<ks3> are the same, it is equivalent to just encryption | ||
174 | using ECB mode and I<ks1> as the key. | ||
175 | |||
176 | The macro des_ecb2_encrypt() is provided to perform two-key Triple-DES | ||
177 | encryption by using I<ks1> for the final encryption. | ||
178 | |||
179 | des_ncbc_encrypt() encrypts/decrypts using the I<cipher-block-chaining> | ||
180 | (CBC) mode of DES. If the I<encrypt> argument is non-zero, the | ||
181 | routine cipher-block-chain encrypts the cleartext data pointed to by | ||
182 | the I<input> argument into the ciphertext pointed to by the I<output> | ||
183 | argument, using the key schedule provided by the I<schedule> argument, | ||
184 | and initialization vector provided by the I<ivec> argument. If the | ||
185 | I<length> argument is not an integral multiple of eight bytes, the | ||
186 | last block is copied to a temporary area and zero filled. The output | ||
187 | is always an integral multiple of eight bytes. | ||
188 | |||
189 | des_xcbc_encrypt() is RSA's DESX mode of DES. It uses I<inw> and | ||
190 | I<outw> to 'whiten' the encryption. I<inw> and I<outw> are secret | ||
191 | (unlike the iv) and are as such, part of the key. So the key is sort | ||
192 | of 24 bytes. This is much better than CBC DES. | ||
193 | |||
194 | des_ede3_cbc_encrypt() implements outer triple CBC DES encryption with | ||
195 | three keys. This means that each DES operation inside the CBC mode is | ||
196 | really an C<C=E(ks3,D(ks2,E(ks1,M)))>. This mode is used by SSL. | ||
197 | |||
198 | The des_ede2_cbc_encrypt() macro implements two-key Triple-DES by | ||
199 | reusing I<ks1> for the final encryption. C<C=E(ks1,D(ks2,E(ks1,M)))>. | ||
200 | This form of Triple-DES is used by the RSAREF library. | ||
201 | |||
202 | des_pcbc_encrypt() encrypt/decrypts using the propagating cipher block | ||
203 | chaing mode used by Kerberos v4. Its parameters are the same as | ||
204 | des_ncbc_encrypt(). | ||
205 | |||
206 | des_cfb_encrypt() encrypt/decrypts using cipher feedback mode. This | ||
207 | method takes an array of characters as input and outputs and array of | ||
208 | characters. It does not require any padding to 8 character groups. | ||
209 | Note: the I<ivec> variable is changed and the new changed value needs to | ||
210 | be passed to the next call to this function. Since this function runs | ||
211 | a complete DES ECB encryption per I<numbits>, this function is only | ||
212 | suggested for use when sending small numbers of characters. | ||
213 | |||
214 | des_cfb64_encrypt() | ||
215 | implements CFB mode of DES with 64bit feedback. Why is this | ||
216 | useful you ask? Because this routine will allow you to encrypt an | ||
217 | arbitrary number of bytes, no 8 byte padding. Each call to this | ||
218 | routine will encrypt the input bytes to output and then update ivec | ||
219 | and num. num contains 'how far' we are though ivec. If this does | ||
220 | not make much sense, read more about cfb mode of DES :-). | ||
221 | |||
222 | des_ede3_cfb64_encrypt() and des_ede2_cfb64_encrypt() is the same as | ||
223 | des_cfb64_encrypt() except that Triple-DES is used. | ||
224 | |||
225 | des_ofb_encrypt() encrypts using output feedback mode. This method | ||
226 | takes an array of characters as input and outputs and array of | ||
227 | characters. It does not require any padding to 8 character groups. | ||
228 | Note: the I<ivec> variable is changed and the new changed value needs to | ||
229 | be passed to the next call to this function. Since this function runs | ||
230 | a complete DES ECB encryption per numbits, this function is only | ||
231 | suggested for use when sending small numbers of characters. | ||
232 | |||
233 | des_ofb64_encrypt() is the same as des_cfb64_encrypt() using Output | ||
234 | Feed Back mode. | ||
235 | |||
236 | des_ede3_ofb64_encrypt() and des_ede2_ofb64_encrypt() is the same as | ||
237 | des_ofb64_encrypt(), using Triple-DES. | ||
238 | |||
239 | The following functions are included in the DES library for | ||
240 | compatibility with the MIT Kerberos library. des_read_pw_string() | ||
241 | is also available under the name EVP_read_pw_string(). | ||
242 | |||
243 | des_read_pw_string() writes the string specified by I<prompt> to | ||
244 | standarf output, turns echo off and reads in input string from the | ||
245 | terminal. The string is returned in I<buf>, which must have space for | ||
246 | at least I<length> bytes. If I<verify> is set, the user is asked for | ||
247 | the password twice and unless the two copies match, an error is | ||
248 | returned. A return code of -1 indicates a system error, 1 failure due | ||
249 | to use interaction, and 0 is success. | ||
250 | |||
251 | des_read_password() does the same and converts the password to a DES | ||
252 | key by calling des_string_to_key(); des_read_2password() operates in | ||
253 | the same way as des_read_password() except that it generates two keys | ||
254 | by using the des_string_to_2key() function. des_string_to_key() is | ||
255 | available for backward compatibility with the MIT library. New | ||
256 | applications should use a cryptographic hash function. The same | ||
257 | applies for des_string_to_2key(). | ||
258 | |||
259 | des_cbc_cksum() produces an 8 byte checksum based on the input stream | ||
260 | (via CBC encryption). The last 4 bytes of the checksum are returned | ||
261 | and the complete 8 bytes are placed in I<output>. This function is | ||
262 | used by Kerberos v4. Other applications should use | ||
263 | L<EVP_DigestInit(3)|EVP_DigestInit(3)> etc. instead. | ||
264 | |||
265 | des_quad_cksum() is a Kerberos v4 function. It returns a 4 byte | ||
266 | checksum from the input bytes. The algorithm can be iterated over the | ||
267 | input, depending on I<out_count>, 1, 2, 3 or 4 times. If I<output> is | ||
268 | non-NULL, the 8 bytes generated by each pass are written into | ||
269 | I<output>. | ||
270 | |||
271 | The following are DES-based tranformations: | ||
272 | |||
273 | des_fcrypt() is a fast version of the unix crypt(3) function. This | ||
274 | version takes only a small amount of space relative to other fast | ||
275 | crypt() implementations. This is different to the normal crypt in | ||
276 | that the third parameter is the buffer that the return value is | ||
277 | written into. It needs to be at least 14 bytes long. This function | ||
278 | is thread safe, unlike the normal crypt. | ||
279 | |||
280 | des_crypt() is a faster replacement for the normal system crypt(). | ||
281 | This function calls des_fcrypt() with a static array passed as the | ||
282 | third parameter. This emulates the normal non-thread safe semantics | ||
283 | of crypt(3). | ||
284 | |||
285 | des_enc_write() writes I<len> bytes to file descriptor I<fd> from | ||
286 | buffer I<buf>. The data is encrypted via I<pcbc_encrypt> (default) | ||
287 | using I<sched> for the key and I<iv> as a starting vector. The actual | ||
288 | data send down I<fd> consists of 4 bytes (in network byte order) | ||
289 | containing the length of the following encrypted data. The encrypted | ||
290 | data then follows, padded with random data out to a multiple of 8 | ||
291 | bytes. | ||
292 | |||
293 | des_enc_read() is used to read I<len> bytes from file descriptor | ||
294 | I<fd> into buffer I<buf>. The data being read from I<fd> is assumed to | ||
295 | have come from des_enc_write() and is decrypted using I<sched> for | ||
296 | the key schedule and I<iv> for the initial vector. | ||
297 | |||
298 | B<Warning:> The data format used by des_enc_write() and des_enc_read() | ||
299 | has a cryptographic weakness: When asked to write more than MAXWRITE | ||
300 | bytes, des_enc_write() will split the data into several chunks that | ||
301 | are all encrypted using the same IV. So don't use these functions | ||
302 | unless you are sure you know what you do (in which case you might not | ||
303 | want to use them anyway). They cannot handle non-blocking sockets. | ||
304 | des_enc_read() uses an internal state and thus cannot be used on | ||
305 | multiple files. | ||
306 | |||
307 | I<des_rw_mode> is used to specify the encryption mode to use with | ||
308 | des_enc_read() and des_end_write(). If set to I<DES_PCBC_MODE> (the | ||
309 | default), des_pcbc_encrypt is used. If set to I<DES_CBC_MODE> | ||
310 | des_cbc_encrypt is used. | ||
311 | |||
312 | =head1 NOTES | ||
313 | |||
314 | Single-key DES is insecure due to its short key size. ECB mode is | ||
315 | not suitable for most applications; see L<des_modes(7)|des_modes(7)>. | ||
316 | |||
317 | The L<evp(3)|evp(3)> library provides higher-level encryption functions. | ||
318 | |||
319 | =head1 BUGS | ||
320 | |||
321 | des_3cbc_encrypt() is flawed and must not be used in applications. | ||
322 | |||
323 | des_cbc_encrypt() does not modify B<ivec>; use des_ncbc_encrypt() | ||
324 | instead. | ||
325 | |||
326 | des_cfb_encrypt() and des_ofb_encrypt() operates on input of 8 bits. | ||
327 | What this means is that if you set numbits to 12, and length to 2, the | ||
328 | first 12 bits will come from the 1st input byte and the low half of | ||
329 | the second input byte. The second 12 bits will have the low 8 bits | ||
330 | taken from the 3rd input byte and the top 4 bits taken from the 4th | ||
331 | input byte. The same holds for output. This function has been | ||
332 | implemented this way because most people will be using a multiple of 8 | ||
333 | and because once you get into pulling bytes input bytes apart things | ||
334 | get ugly! | ||
335 | |||
336 | des_read_pw_string() is the most machine/OS dependent function and | ||
337 | normally generates the most problems when porting this code. | ||
338 | |||
339 | =head1 CONFORMING TO | ||
340 | |||
341 | ANSI X3.106 | ||
342 | |||
343 | The B<des> library was written to be source code compatible with | ||
344 | the MIT Kerberos library. | ||
345 | |||
346 | =head1 SEE ALSO | ||
347 | |||
348 | crypt(3), L<des_modes(3)|des_modes(3)>, L<evp(3)|evp(3)>, L<rand(3)|rand(3)> | ||
349 | |||
350 | =head1 HISTORY | ||
351 | |||
352 | des_cbc_cksum(), des_cbc_encrypt(), des_ecb_encrypt(), | ||
353 | des_is_weak_key(), des_key_sched(), des_pcbc_encrypt(), | ||
354 | des_quad_cksum(), des_random_key(), des_read_password() and | ||
355 | des_string_to_key() are available in the MIT Kerberos library; | ||
356 | des_check_key_parity(), des_fixup_key_parity() and des_is_weak_key() | ||
357 | are available in newer versions of that library. | ||
358 | |||
359 | des_set_key_checked() and des_set_key_unchecked() were added in | ||
360 | OpenSSL 0.9.5. | ||
361 | |||
362 | des_generate_random_block(), des_init_random_number_generator(), | ||
363 | des_new_random_key(), des_set_random_generator_seed() and | ||
364 | des_set_sequence_number() and des_rand_data() are used in newer | ||
365 | versions of Kerberos but are not implemented here. | ||
366 | |||
367 | des_random_key() generated cryptographically weak random data in | ||
368 | SSLeay and in OpenSSL prior version 0.9.5, as well as in the original | ||
369 | MIT library. | ||
370 | |||
371 | =head1 AUTHOR | ||
372 | |||
373 | Eric Young (eay@cryptsoft.com). Modified for the OpenSSL project | ||
374 | (http://www.openssl.org). | ||
375 | |||
376 | =cut | ||
diff --git a/src/lib/libssl/src/doc/crypto/des_modes.pod b/src/lib/libssl/src/doc/crypto/des_modes.pod index d8148c86fc..1aa3ac763b 100644 --- a/src/lib/libssl/src/doc/crypto/des_modes.pod +++ b/src/lib/libssl/src/doc/crypto/des_modes.pod | |||
@@ -248,3 +248,6 @@ it to: | |||
248 | 248 | ||
249 | L<blowfish(3)|blowfish(3)>, L<des(3)|des(3)>, L<idea(3)|idea(3)>, | 249 | L<blowfish(3)|blowfish(3)>, L<des(3)|des(3)>, L<idea(3)|idea(3)>, |
250 | L<rc2(3)|rc2(3)> | 250 | L<rc2(3)|rc2(3)> |
251 | |||
252 | =cut | ||
253 | |||
diff --git a/src/lib/libssl/src/doc/crypto/rsa.pod b/src/lib/libssl/src/doc/crypto/rsa.pod index 0486c044a6..eb8ba612c4 100644 --- a/src/lib/libssl/src/doc/crypto/rsa.pod +++ b/src/lib/libssl/src/doc/crypto/rsa.pod | |||
@@ -86,8 +86,9 @@ contain public as well as private RSA keys: | |||
86 | In public keys, the private exponent and the related secret values are | 86 | In public keys, the private exponent and the related secret values are |
87 | B<NULL>. | 87 | B<NULL>. |
88 | 88 | ||
89 | B<dmp1>, B<dmq1> and B<iqmp> may be B<NULL> in private keys, but the | 89 | B<p>, B<q>, B<dmp1>, B<dmq1> and B<iqmp> may be B<NULL> in private |
90 | RSA operations are much faster when these values are available. | 90 | keys, but the RSA operations are much faster when these values are |
91 | available. | ||
91 | 92 | ||
92 | =head1 CONFORMING TO | 93 | =head1 CONFORMING TO |
93 | 94 | ||
diff --git a/src/lib/libssl/src/ms/mingw32.bat b/src/lib/libssl/src/ms/mingw32.bat new file mode 100644 index 0000000000..1726c55bcd --- /dev/null +++ b/src/lib/libssl/src/ms/mingw32.bat | |||
@@ -0,0 +1,92 @@ | |||
1 | @rem OpenSSL with Mingw32+GNU as | ||
2 | @rem --------------------------- | ||
3 | |||
4 | perl Configure Mingw32 %1 %2 %3 %4 %5 %6 %7 %8 | ||
5 | |||
6 | @echo off | ||
7 | |||
8 | perl -e "exit 1 if '%1' eq 'no-asm'" | ||
9 | if errorlevel 1 goto noasm | ||
10 | |||
11 | echo Generating x86 for GNU assember | ||
12 | |||
13 | echo Bignum | ||
14 | cd crypto\bn\asm | ||
15 | perl x86.pl gaswin > bn-win32.s | ||
16 | cd ..\..\.. | ||
17 | |||
18 | echo DES | ||
19 | cd crypto\des\asm | ||
20 | perl des-586.pl gaswin > d-win32.s | ||
21 | cd ..\..\.. | ||
22 | |||
23 | echo crypt | ||
24 | cd crypto\des\asm | ||
25 | perl crypt586.pl gaswin > y-win32.s | ||
26 | cd ..\..\.. | ||
27 | |||
28 | echo Blowfish | ||
29 | cd crypto\bf\asm | ||
30 | perl bf-586.pl gaswin > b-win32.s | ||
31 | cd ..\..\.. | ||
32 | |||
33 | echo CAST5 | ||
34 | cd crypto\cast\asm | ||
35 | perl cast-586.pl gaswin > c-win32.s | ||
36 | cd ..\..\.. | ||
37 | |||
38 | echo RC4 | ||
39 | cd crypto\rc4\asm | ||
40 | perl rc4-586.pl gaswin > r4-win32.s | ||
41 | cd ..\..\.. | ||
42 | |||
43 | echo MD5 | ||
44 | cd crypto\md5\asm | ||
45 | perl md5-586.pl gaswin > m5-win32.s | ||
46 | cd ..\..\.. | ||
47 | |||
48 | echo SHA1 | ||
49 | cd crypto\sha\asm | ||
50 | perl sha1-586.pl gaswin > s1-win32.s | ||
51 | cd ..\..\.. | ||
52 | |||
53 | echo RIPEMD160 | ||
54 | cd crypto\ripemd\asm | ||
55 | perl rmd-586.pl gaswin > rm-win32.s | ||
56 | cd ..\..\.. | ||
57 | |||
58 | echo RC5\32 | ||
59 | cd crypto\rc5\asm | ||
60 | perl rc5-586.pl gaswin > r5-win32.s | ||
61 | cd ..\..\.. | ||
62 | |||
63 | :noasm | ||
64 | |||
65 | echo Generating makefile | ||
66 | perl util\mkfiles.pl >MINFO | ||
67 | perl util\mk1mf.pl gaswin Mingw32 >ms\mingw32a.mak | ||
68 | perl util\mk1mf.pl gaswin Mingw32-files >ms\mingw32f.mak | ||
69 | echo Generating DLL definition files | ||
70 | perl util\mkdef.pl 32 libeay >ms\libeay32.def | ||
71 | if errorlevel 1 goto end | ||
72 | perl util\mkdef.pl 32 ssleay >ms\ssleay32.def | ||
73 | if errorlevel 1 goto end | ||
74 | |||
75 | rem Create files -- this can be skipped if using the GNU file utilities | ||
76 | make -f ms/mingw32f.mak | ||
77 | echo You can ignore the error messages above | ||
78 | |||
79 | echo Building the libraries | ||
80 | make -f ms/mingw32a.mak | ||
81 | if errorlevel 1 goto end | ||
82 | |||
83 | echo Generating the DLLs and input libraries | ||
84 | dllwrap --dllname libeay32.dll --output-lib out/libeay32.a --def ms/libeay32.def out/libcrypto.a -lwsock32 -lgdi32 | ||
85 | if errorlevel 1 goto end | ||
86 | dllwrap --dllname libssl32.dll --output-lib out/libssl32.a --def ms/ssleay32.def out/libssl.a out/libeay32.a | ||
87 | if errorlevel 1 goto end | ||
88 | |||
89 | echo Done compiling OpenSSL | ||
90 | |||
91 | :end | ||
92 | |||
diff --git a/src/lib/libssl/src/ms/test.bat b/src/lib/libssl/src/ms/test.bat index 3506a644f5..ef37beaa22 100644 --- a/src/lib/libssl/src/ms/test.bat +++ b/src/lib/libssl/src/ms/test.bat | |||
@@ -136,7 +136,7 @@ ssltest -bio_pair -ssl2 | |||
136 | if errorlevel 1 goto done | 136 | if errorlevel 1 goto done |
137 | 137 | ||
138 | echo test sslv2/sslv3 with 1024 bit DHE via BIO pair | 138 | echo test sslv2/sslv3 with 1024 bit DHE via BIO pair |
139 | ssltest -bio_pair -dhe1024 -v | 139 | ssltest -bio_pair -dhe1024dsa -v |
140 | if errorlevel 1 goto done | 140 | if errorlevel 1 goto done |
141 | 141 | ||
142 | echo test sslv2 with server authentication via BIO pair | 142 | echo test sslv2 with server authentication via BIO pair |
diff --git a/src/lib/libssl/src/rsaref/rsar_err.c b/src/lib/libssl/src/rsaref/rsar_err.c index d2eb3a2b01..5e7871f803 100644 --- a/src/lib/libssl/src/rsaref/rsar_err.c +++ b/src/lib/libssl/src/rsaref/rsar_err.c | |||
@@ -54,7 +54,8 @@ | |||
54 | */ | 54 | */ |
55 | 55 | ||
56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes |
57 | * made to it will be overwritten when the script next updates this file. | 57 | * made to it will be overwritten when the script next updates this file, |
58 | * only reason strings will be preserved. | ||
58 | */ | 59 | */ |
59 | 60 | ||
60 | #include <stdio.h> | 61 | #include <stdio.h> |
diff --git a/src/lib/libssl/src/shlib/Makefile.hpux10-cc b/src/lib/libssl/src/shlib/Makefile.hpux10-cc new file mode 100644 index 0000000000..4dc62ebd9e --- /dev/null +++ b/src/lib/libssl/src/shlib/Makefile.hpux10-cc | |||
@@ -0,0 +1,51 @@ | |||
1 | # Makefile.hpux-cc | ||
2 | |||
3 | major=1 | ||
4 | |||
5 | slib=libssl | ||
6 | sh_slib=$(slib).so.$(major) | ||
7 | |||
8 | clib=libcrypto | ||
9 | sh_clib=$(clib).so.$(major) | ||
10 | |||
11 | all : $(clib).sl $(slib).sl | ||
12 | |||
13 | |||
14 | $(clib)_pic.a : $(clib).a | ||
15 | echo "Copying $? to $@" | ||
16 | cp -p $? $@ | ||
17 | |||
18 | $(slib)_pic.a : $(slib).a | ||
19 | echo "Copying $? to $@" | ||
20 | cp -p $? $@ | ||
21 | |||
22 | $(sh_clib) : $(clib)_pic.a | ||
23 | echo "collecting all object files for $@" | ||
24 | find . -name \*.o -print > allobjs | ||
25 | for obj in `ar t $(clib)_pic.a`; \ | ||
26 | do \ | ||
27 | grep /$$obj allobjs; \ | ||
28 | done >objlist | ||
29 | echo "linking $@" | ||
30 | ld -b -s -z +h $@ -o $@ `cat objlist` -lc | ||
31 | rm allobjs objlist | ||
32 | |||
33 | $(clib).sl : $(sh_clib) | ||
34 | rm -f $@ | ||
35 | ln -s $? $@ | ||
36 | |||
37 | $(sh_slib) : $(slib)_pic.a $(clib).sl | ||
38 | echo "collecting all object files for $@" | ||
39 | find . -name \*.o -print > allobjs | ||
40 | for obj in `ar t $(slib)_pic.a`; \ | ||
41 | do \ | ||
42 | grep /$$obj allobjs; \ | ||
43 | done >objlist | ||
44 | echo "linking $@" | ||
45 | ld -b -s -z +h $@ +b /usr/local/ssl/lib:/usr/lib -o $@ `cat objlist` \ | ||
46 | -L. -lcrypto -lc | ||
47 | rm -f allobjs objlist | ||
48 | |||
49 | $(slib).sl : $(sh_slib) | ||
50 | rm -f $@ | ||
51 | ln -s $? $@ | ||
diff --git a/src/lib/libssl/src/shlib/hpux10-cc.sh b/src/lib/libssl/src/shlib/hpux10-cc.sh new file mode 100644 index 0000000000..903baaa4e7 --- /dev/null +++ b/src/lib/libssl/src/shlib/hpux10-cc.sh | |||
@@ -0,0 +1,90 @@ | |||
1 | #!/usr/bin/sh | ||
2 | # | ||
3 | # Run this script from the OpenSSL root directory: | ||
4 | # sh shlib/hpux10-cc.sh | ||
5 | # | ||
6 | # HP-UX (10.20) shared library installation: | ||
7 | # Compile and install OpenSSL with best possible optimization: | ||
8 | # - shared libraries are compiled and installed with +O4 optimization | ||
9 | # - executable(s) are compiled and installed with +O4 optimization | ||
10 | # - static libraries are compiled and installed with +O3 optimization, | ||
11 | # to avoid the time consuming +O4 link-time optimization when using | ||
12 | # these libraries. (The shared libs are already optimized during build | ||
13 | # at +O4.) | ||
14 | # | ||
15 | # This script must be run with appropriate privileges to install into | ||
16 | # /usr/local/ssl. HP-UX prevents used executables and shared libraries | ||
17 | # from being deleted or overwritten. Stop all processes using already | ||
18 | # installed items of OpenSSL. | ||
19 | # | ||
20 | # WARNING: At high optimization levels, HP's ANSI-C compiler can chew up | ||
21 | # large amounts of memory and CPU time. Make sure to have at least | ||
22 | # 128MB of RAM available and that your kernel is configured to allow | ||
23 | # at least 128MB data size (maxdsiz parameter). | ||
24 | # The installation process can take several hours, even on fast | ||
25 | # machines. +O4 optimization of the libcrypto.sl shared library may | ||
26 | # take 1 hour on a C200 (200MHz PA8200 CPU), +O3 compilation of | ||
27 | # fcrypt_b.c can take 20 minutes on this machine. Stay patient. | ||
28 | # | ||
29 | # SITEFLAGS: site specific flags. I do use +DAportable, since I have to | ||
30 | # support older PA1.1-type CPUs. Your mileage may vary. | ||
31 | # +w1 enables enhanced warnings, useful when working with snaphots. | ||
32 | # | ||
33 | SITEFLAGS="+DAportable +w1" | ||
34 | # | ||
35 | # Set the default additions to build with HP-UX. | ||
36 | # -D_REENTRANT must/should be defined on HP-UX manually, since we do call | ||
37 | # Configure directly. | ||
38 | # +Oall increases the optimization done. | ||
39 | # | ||
40 | MYFLAGS="-D_REENTRANT +Oall $SITEFLAGS" | ||
41 | |||
42 | # Configure for pic and build the static pic libraries | ||
43 | perl5 Configure hpux-parisc-cc-o4 +z ${MYFLAGS} | ||
44 | make clean | ||
45 | make DIRS="crypto ssl" | ||
46 | # Rename the static pic libs and build dynamic libraries from them | ||
47 | # Be prepared to see a lot of warnings about shared libraries being built | ||
48 | # with optimizations higher than +O2. When using these libraries, it is | ||
49 | # not possible to replace internal library functions with functions from | ||
50 | # the program to be linked. | ||
51 | # | ||
52 | make -f shlib/Makefile.hpux10-cc | ||
53 | |||
54 | # Copy the libraries to /usr/local/ssl/lib (they have to be in their | ||
55 | # final location when linking applications). | ||
56 | # If the directories are still there, no problem. | ||
57 | mkdir /usr/local | ||
58 | mkdir /usr/local/ssl | ||
59 | mkdir /usr/local/ssl/lib | ||
60 | chmod 444 lib*_pic.a | ||
61 | chmod 555 lib*.so.1 | ||
62 | cp -p lib*_pic.a lib*.so.1 /usr/local/ssl/lib | ||
63 | (cd /usr/local/ssl/lib ; ln -sf libcrypto.so.1 libcrypto.sl ; ln -sf libssl.so.1 libssl.sl) | ||
64 | |||
65 | # Reconfigure without pic to compile the executables. Unfortunately, while | ||
66 | # performing this task we have to recompile the library components, even | ||
67 | # though we use the already installed shared libs anyway. | ||
68 | # | ||
69 | perl5 Configure hpux-parisc-cc-o4 ${MYFLAGS} | ||
70 | |||
71 | make clean | ||
72 | |||
73 | # Hack the Makefiles to pick up the dynamic libraries during linking | ||
74 | # | ||
75 | sed 's/^PEX_LIBS=.*$/PEX_LIBS=-L\/usr\/local\/ssl\/lib -Wl,+b,\/usr\/local\/ssl\/lib:\/usr\/lib/' Makefile.ssl >xxx; mv xxx Makefile.ssl | ||
76 | sed 's/-L\.\.//' apps/Makefile.ssl >xxx; mv xxx apps/Makefile.ssl | ||
77 | sed 's/-L\.\.//' test/Makefile.ssl >xxx; mv xxx test/Makefile.ssl | ||
78 | # Build the static libs and the executables in one make. | ||
79 | make | ||
80 | # Install everything | ||
81 | make install | ||
82 | |||
83 | # Finally build the static libs with +O3. This time we only need the libraries, | ||
84 | # once created, they are simply copied into place. | ||
85 | # | ||
86 | perl5 Configure hpux-parisc-cc ${MYFLAGS} | ||
87 | make clean | ||
88 | make DIRS="crypto ssl" | ||
89 | chmod 644 libcrypto.a libssl.a | ||
90 | cp -p libcrypto.a libssl.a /usr/local/ssl/lib | ||
diff --git a/src/lib/libssl/src/ssl/s3_clnt.c b/src/lib/libssl/src/ssl/s3_clnt.c index 279d2c0198..0c8f551f73 100644 --- a/src/lib/libssl/src/ssl/s3_clnt.c +++ b/src/lib/libssl/src/ssl/s3_clnt.c | |||
@@ -772,6 +772,8 @@ static int ssl3_get_server_certificate(SSL *s) | |||
772 | s->session->sess_cert=sc; | 772 | s->session->sess_cert=sc; |
773 | 773 | ||
774 | sc->cert_chain=sk; | 774 | sc->cert_chain=sk; |
775 | /* Inconsistency alert: cert_chain does include the peer's | ||
776 | * certificate, which we don't include in s3_srvr.c */ | ||
775 | x=sk_X509_value(sk,0); | 777 | x=sk_X509_value(sk,0); |
776 | sk=NULL; | 778 | sk=NULL; |
777 | 779 | ||
diff --git a/src/lib/libssl/src/ssl/s3_lib.c b/src/lib/libssl/src/ssl/s3_lib.c index c4b49aaedf..7ada26cbb6 100644 --- a/src/lib/libssl/src/ssl/s3_lib.c +++ b/src/lib/libssl/src/ssl/s3_lib.c | |||
@@ -771,14 +771,16 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, char *parg) | |||
771 | case SSL_CTRL_SET_TMP_RSA: | 771 | case SSL_CTRL_SET_TMP_RSA: |
772 | { | 772 | { |
773 | RSA *rsa = (RSA *)parg; | 773 | RSA *rsa = (RSA *)parg; |
774 | if (rsa == NULL) { | 774 | if (rsa == NULL) |
775 | { | ||
775 | SSLerr(SSL_F_SSL3_CTRL, ERR_R_PASSED_NULL_PARAMETER); | 776 | SSLerr(SSL_F_SSL3_CTRL, ERR_R_PASSED_NULL_PARAMETER); |
776 | return(ret); | 777 | return(ret); |
777 | } | 778 | } |
778 | if ((rsa = RSAPrivateKey_dup(rsa)) == NULL) { | 779 | if ((rsa = RSAPrivateKey_dup(rsa)) == NULL) |
780 | { | ||
779 | SSLerr(SSL_F_SSL3_CTRL, ERR_R_RSA_LIB); | 781 | SSLerr(SSL_F_SSL3_CTRL, ERR_R_RSA_LIB); |
780 | return(ret); | 782 | return(ret); |
781 | } | 783 | } |
782 | if (s->cert->rsa_tmp != NULL) | 784 | if (s->cert->rsa_tmp != NULL) |
783 | RSA_free(s->cert->rsa_tmp); | 785 | RSA_free(s->cert->rsa_tmp); |
784 | s->cert->rsa_tmp = rsa; | 786 | s->cert->rsa_tmp = rsa; |
@@ -796,19 +798,25 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, char *parg) | |||
796 | case SSL_CTRL_SET_TMP_DH: | 798 | case SSL_CTRL_SET_TMP_DH: |
797 | { | 799 | { |
798 | DH *dh = (DH *)parg; | 800 | DH *dh = (DH *)parg; |
799 | if (dh == NULL) { | 801 | if (dh == NULL) |
802 | { | ||
800 | SSLerr(SSL_F_SSL3_CTRL, ERR_R_PASSED_NULL_PARAMETER); | 803 | SSLerr(SSL_F_SSL3_CTRL, ERR_R_PASSED_NULL_PARAMETER); |
801 | return(ret); | 804 | return(ret); |
802 | } | 805 | } |
803 | if ((dh = DHparams_dup(dh)) == NULL) { | 806 | if ((dh = DHparams_dup(dh)) == NULL) |
804 | SSLerr(SSL_F_SSL3_CTRL, ERR_R_DH_LIB); | 807 | { |
805 | return(ret); | ||
806 | } | ||
807 | if (!DH_generate_key(dh)) { | ||
808 | DH_free(dh); | ||
809 | SSLerr(SSL_F_SSL3_CTRL, ERR_R_DH_LIB); | 808 | SSLerr(SSL_F_SSL3_CTRL, ERR_R_DH_LIB); |
810 | return(ret); | 809 | return(ret); |
811 | } | 810 | } |
811 | if (!(s->options & SSL_OP_SINGLE_DH_USE)) | ||
812 | { | ||
813 | if (!DH_generate_key(dh)) | ||
814 | { | ||
815 | DH_free(dh); | ||
816 | SSLerr(SSL_F_SSL3_CTRL, ERR_R_DH_LIB); | ||
817 | return(ret); | ||
818 | } | ||
819 | } | ||
812 | if (s->cert->dh_tmp != NULL) | 820 | if (s->cert->dh_tmp != NULL) |
813 | DH_free(s->cert->dh_tmp); | 821 | DH_free(s->cert->dh_tmp); |
814 | s->cert->dh_tmp = dh; | 822 | s->cert->dh_tmp = dh; |
@@ -843,8 +851,8 @@ long ssl3_callback_ctrl(SSL *s, int cmd, void (*fp)()) | |||
843 | 0) | 851 | 0) |
844 | { | 852 | { |
845 | if (!ssl_cert_inst(&s->cert)) | 853 | if (!ssl_cert_inst(&s->cert)) |
846 | { | 854 | { |
847 | SSLerr(SSL_F_SSL3_CTRL, ERR_R_MALLOC_FAILURE); | 855 | SSLerr(SSL_F_SSL3_CALLBACK_CTRL, ERR_R_MALLOC_FAILURE); |
848 | return(0); | 856 | return(0); |
849 | } | 857 | } |
850 | } | 858 | } |
@@ -929,23 +937,26 @@ long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, char *parg) | |||
929 | case SSL_CTRL_SET_TMP_DH: | 937 | case SSL_CTRL_SET_TMP_DH: |
930 | { | 938 | { |
931 | DH *new=NULL,*dh; | 939 | DH *new=NULL,*dh; |
932 | int rret=0; | ||
933 | 940 | ||
934 | dh=(DH *)parg; | 941 | dh=(DH *)parg; |
935 | if ( ((new=DHparams_dup(dh)) == NULL) || | 942 | if ((new=DHparams_dup(dh)) == NULL) |
936 | (!DH_generate_key(new))) | ||
937 | { | 943 | { |
938 | SSLerr(SSL_F_SSL3_CTX_CTRL,ERR_R_DH_LIB); | 944 | SSLerr(SSL_F_SSL3_CTX_CTRL,ERR_R_DH_LIB); |
939 | if (new != NULL) DH_free(new); | 945 | return 0; |
940 | } | 946 | } |
941 | else | 947 | if (!(ctx->options & SSL_OP_SINGLE_DH_USE)) |
942 | { | 948 | { |
943 | if (cert->dh_tmp != NULL) | 949 | if (!DH_generate_key(new)) |
944 | DH_free(cert->dh_tmp); | 950 | { |
945 | cert->dh_tmp=new; | 951 | SSLerr(SSL_F_SSL3_CTX_CTRL,ERR_R_DH_LIB); |
946 | rret=1; | 952 | DH_free(new); |
953 | return 0; | ||
954 | } | ||
947 | } | 955 | } |
948 | return(rret); | 956 | if (cert->dh_tmp != NULL) |
957 | DH_free(cert->dh_tmp); | ||
958 | cert->dh_tmp=new; | ||
959 | return 1; | ||
949 | } | 960 | } |
950 | /*break; */ | 961 | /*break; */ |
951 | case SSL_CTRL_SET_TMP_DH_CB: | 962 | case SSL_CTRL_SET_TMP_DH_CB: |
diff --git a/src/lib/libssl/src/ssl/s3_srvr.c b/src/lib/libssl/src/ssl/s3_srvr.c index 90806e2d99..e23ca20bd3 100644 --- a/src/lib/libssl/src/ssl/s3_srvr.c +++ b/src/lib/libssl/src/ssl/s3_srvr.c | |||
@@ -1698,6 +1698,8 @@ static int ssl3_get_client_certificate(SSL *s) | |||
1698 | if (s->session->sess_cert->cert_chain != NULL) | 1698 | if (s->session->sess_cert->cert_chain != NULL) |
1699 | sk_X509_pop_free(s->session->sess_cert->cert_chain, X509_free); | 1699 | sk_X509_pop_free(s->session->sess_cert->cert_chain, X509_free); |
1700 | s->session->sess_cert->cert_chain=sk; | 1700 | s->session->sess_cert->cert_chain=sk; |
1701 | /* Inconsistency alert: cert_chain does *not* include the | ||
1702 | * peer's own certificate, while we do include it in s3_clnt.c */ | ||
1701 | 1703 | ||
1702 | sk=NULL; | 1704 | sk=NULL; |
1703 | 1705 | ||
diff --git a/src/lib/libssl/src/ssl/ssl.h b/src/lib/libssl/src/ssl/ssl.h index f29f775347..bb846f491c 100644 --- a/src/lib/libssl/src/ssl/ssl.h +++ b/src/lib/libssl/src/ssl/ssl.h | |||
@@ -391,9 +391,8 @@ struct ssl_ctx_st | |||
391 | * SSL_SESSION_free() when it has finished using it. Otherwise, | 391 | * SSL_SESSION_free() when it has finished using it. Otherwise, |
392 | * on 0, it means the callback has finished with it. | 392 | * on 0, it means the callback has finished with it. |
393 | * If remove_session_cb is not null, it will be called when | 393 | * If remove_session_cb is not null, it will be called when |
394 | * a session-id is removed from the cache. Again, a return | 394 | * a session-id is removed from the cache. After the call, |
395 | * of 0 mens that SSLeay should not SSL_SESSION_free() since | 395 | * OpenSSL will SSL_SESSION_free() it. */ |
396 | * the application is doing something with it. */ | ||
397 | int (*new_session_cb)(struct ssl_st *ssl,SSL_SESSION *sess); | 396 | int (*new_session_cb)(struct ssl_st *ssl,SSL_SESSION *sess); |
398 | void (*remove_session_cb)(struct ssl_ctx_st *ctx,SSL_SESSION *sess); | 397 | void (*remove_session_cb)(struct ssl_ctx_st *ctx,SSL_SESSION *sess); |
399 | SSL_SESSION *(*get_session_cb)(struct ssl_st *ssl, | 398 | SSL_SESSION *(*get_session_cb)(struct ssl_st *ssl, |
@@ -1215,6 +1214,7 @@ int SSL_COMP_add_compression_method(int id,char *cm); | |||
1215 | #define SSL_F_SSL2_SET_CERTIFICATE 126 | 1214 | #define SSL_F_SSL2_SET_CERTIFICATE 126 |
1216 | #define SSL_F_SSL2_WRITE 127 | 1215 | #define SSL_F_SSL2_WRITE 127 |
1217 | #define SSL_F_SSL3_ACCEPT 128 | 1216 | #define SSL_F_SSL3_ACCEPT 128 |
1217 | #define SSL_F_SSL3_CALLBACK_CTRL 233 | ||
1218 | #define SSL_F_SSL3_CHANGE_CIPHER_STATE 129 | 1218 | #define SSL_F_SSL3_CHANGE_CIPHER_STATE 129 |
1219 | #define SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM 130 | 1219 | #define SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM 130 |
1220 | #define SSL_F_SSL3_CLIENT_HELLO 131 | 1220 | #define SSL_F_SSL3_CLIENT_HELLO 131 |
diff --git a/src/lib/libssl/src/ssl/ssl_cert.c b/src/lib/libssl/src/ssl/ssl_cert.c index 48f247ceac..0596b7c5b8 100644 --- a/src/lib/libssl/src/ssl/ssl_cert.c +++ b/src/lib/libssl/src/ssl/ssl_cert.c | |||
@@ -191,16 +191,33 @@ CERT *ssl_cert_dup(CERT *cert) | |||
191 | #ifndef NO_DH | 191 | #ifndef NO_DH |
192 | if (cert->dh_tmp != NULL) | 192 | if (cert->dh_tmp != NULL) |
193 | { | 193 | { |
194 | /* DH parameters don't have a reference count (and cannot | 194 | /* DH parameters don't have a reference count */ |
195 | * reasonably be shared anyway, as the secret exponent may | ||
196 | * be created just when it is needed -- earlier library | ||
197 | * versions did not pay attention to this) */ | ||
198 | ret->dh_tmp = DHparams_dup(cert->dh_tmp); | 195 | ret->dh_tmp = DHparams_dup(cert->dh_tmp); |
199 | if (ret->dh_tmp == NULL) | 196 | if (ret->dh_tmp == NULL) |
200 | { | 197 | { |
201 | SSLerr(SSL_F_SSL_CERT_NEW, ERR_R_DH_LIB); | 198 | SSLerr(SSL_F_SSL_CERT_DUP, ERR_R_DH_LIB); |
202 | goto err; | 199 | goto err; |
203 | } | 200 | } |
201 | if (cert->dh_tmp->priv_key) | ||
202 | { | ||
203 | BIGNUM *b = BN_dup(cert->dh_tmp->priv_key); | ||
204 | if (!b) | ||
205 | { | ||
206 | SSLerr(SSL_F_SSL_CERT_DUP, ERR_R_BN_LIB); | ||
207 | goto err; | ||
208 | } | ||
209 | ret->dh_tmp->priv_key = b; | ||
210 | } | ||
211 | if (cert->dh_tmp->pub_key) | ||
212 | { | ||
213 | BIGNUM *b = BN_dup(cert->dh_tmp->pub_key); | ||
214 | if (!b) | ||
215 | { | ||
216 | SSLerr(SSL_F_SSL_CERT_DUP, ERR_R_BN_LIB); | ||
217 | goto err; | ||
218 | } | ||
219 | ret->dh_tmp->pub_key = b; | ||
220 | } | ||
204 | } | 221 | } |
205 | ret->dh_tmp_cb = cert->dh_tmp_cb; | 222 | ret->dh_tmp_cb = cert->dh_tmp_cb; |
206 | #endif | 223 | #endif |
diff --git a/src/lib/libssl/src/ssl/ssl_ciph.c b/src/lib/libssl/src/ssl/ssl_ciph.c index 1cbc2886e9..7436a50ad1 100644 --- a/src/lib/libssl/src/ssl/ssl_ciph.c +++ b/src/lib/libssl/src/ssl/ssl_ciph.c | |||
@@ -607,7 +607,7 @@ static int ssl_cipher_process_rulestr(const char *rule_str, | |||
607 | if (buflen == 0) | 607 | if (buflen == 0) |
608 | { | 608 | { |
609 | /* | 609 | /* |
610 | * We hit something, we cannot deal with, | 610 | * We hit something we cannot deal with, |
611 | * it is no command or separator nor | 611 | * it is no command or separator nor |
612 | * alphanumeric, so we call this an error. | 612 | * alphanumeric, so we call this an error. |
613 | */ | 613 | */ |
@@ -620,6 +620,7 @@ static int ssl_cipher_process_rulestr(const char *rule_str, | |||
620 | 620 | ||
621 | if (rule == CIPHER_SPECIAL) | 621 | if (rule == CIPHER_SPECIAL) |
622 | { | 622 | { |
623 | found = 0; /* unused -- avoid compiler warning */ | ||
623 | break; /* special treatment */ | 624 | break; /* special treatment */ |
624 | } | 625 | } |
625 | 626 | ||
@@ -633,12 +634,12 @@ static int ssl_cipher_process_rulestr(const char *rule_str, | |||
633 | multi=0; | 634 | multi=0; |
634 | 635 | ||
635 | /* | 636 | /* |
636 | * Now search for the name in the ca_list. Be careful | 637 | * Now search for the cipher alias in the ca_list. Be careful |
637 | * with the strncmp, because the "buflen" limitation | 638 | * with the strncmp, because the "buflen" limitation |
638 | * will make the rule "ADH:SOME" and the cipher | 639 | * will make the rule "ADH:SOME" and the cipher |
639 | * "ADH-MY-CIPHER" look like a match for buflen=3. | 640 | * "ADH-MY-CIPHER" look like a match for buflen=3. |
640 | * So additionally check, whether the cipher name found | 641 | * So additionally check whether the cipher name found |
641 | * has the correct length. We can save a strlen() call, | 642 | * has the correct length. We can save a strlen() call: |
642 | * just checking for the '\0' at the right place is | 643 | * just checking for the '\0' at the right place is |
643 | * sufficient, we have to strncmp() anyway. | 644 | * sufficient, we have to strncmp() anyway. |
644 | */ | 645 | */ |
@@ -665,42 +666,42 @@ static int ssl_cipher_process_rulestr(const char *rule_str, | |||
665 | if (!multi) break; | 666 | if (!multi) break; |
666 | } | 667 | } |
667 | 668 | ||
669 | /* | ||
670 | * Ok, we have the rule, now apply it | ||
671 | */ | ||
672 | if (rule == CIPHER_SPECIAL) | ||
673 | { /* special command */ | ||
674 | ok = 0; | ||
675 | if ((buflen == 8) && | ||
676 | !strncmp(buf, "STRENGTH", 8)) | ||
677 | ok = ssl_cipher_strength_sort(list, | ||
678 | head_p, tail_p); | ||
679 | else | ||
680 | SSLerr(SSL_F_SSL_CIPHER_PROCESS_RULESTR, | ||
681 | SSL_R_INVALID_COMMAND); | ||
682 | if (ok == 0) | ||
683 | retval = 0; | ||
668 | /* | 684 | /* |
669 | * Ok, we have the rule, now apply it | 685 | * We do not support any "multi" options |
686 | * together with "@", so throw away the | ||
687 | * rest of the command, if any left, until | ||
688 | * end or ':' is found. | ||
670 | */ | 689 | */ |
671 | if (rule == CIPHER_SPECIAL) | 690 | while ((*l != '\0') && ITEM_SEP(*l)) |
672 | { /* special command */ | 691 | l++; |
673 | ok = 0; | 692 | } |
674 | if ((buflen == 8) && | 693 | else if (found) |
675 | !strncmp(buf, "STRENGTH", 8)) | 694 | { |
676 | ok = ssl_cipher_strength_sort(list, | 695 | ssl_cipher_apply_rule(algorithms, mask, |
677 | head_p, tail_p); | 696 | algo_strength, mask_strength, rule, -1, |
678 | else | 697 | list, head_p, tail_p); |
679 | SSLerr(SSL_F_SSL_CIPHER_PROCESS_RULESTR, | 698 | } |
680 | SSL_R_INVALID_COMMAND); | 699 | else |
681 | if (ok == 0) | 700 | { |
682 | retval = 0; | 701 | while ((*l != '\0') && ITEM_SEP(*l)) |
683 | /* | 702 | l++; |
684 | * We do not support any "multi" options | 703 | } |
685 | * together with "@", so throw away the | 704 | if (*l == '\0') break; /* done */ |
686 | * rest of the command, if any left, until | ||
687 | * end or ':' is found. | ||
688 | */ | ||
689 | while ((*l != '\0') && ITEM_SEP(*l)) | ||
690 | l++; | ||
691 | } | ||
692 | else if (found) | ||
693 | { | ||
694 | ssl_cipher_apply_rule(algorithms, mask, | ||
695 | algo_strength, mask_strength, rule, -1, | ||
696 | list, head_p, tail_p); | ||
697 | } | ||
698 | else | ||
699 | { | ||
700 | while ((*l != '\0') && ITEM_SEP(*l)) | ||
701 | l++; | ||
702 | } | ||
703 | if (*l == '\0') break; /* done */ | ||
704 | } | 705 | } |
705 | 706 | ||
706 | return(retval); | 707 | return(retval); |
diff --git a/src/lib/libssl/src/ssl/ssl_err.c b/src/lib/libssl/src/ssl/ssl_err.c index 5618e34a30..642c3f93e7 100644 --- a/src/lib/libssl/src/ssl/ssl_err.c +++ b/src/lib/libssl/src/ssl/ssl_err.c | |||
@@ -54,7 +54,8 @@ | |||
54 | */ | 54 | */ |
55 | 55 | ||
56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes |
57 | * made to it will be overwritten when the script next updates this file. | 57 | * made to it will be overwritten when the script next updates this file, |
58 | * only reason strings will be preserved. | ||
58 | */ | 59 | */ |
59 | 60 | ||
60 | #include <stdio.h> | 61 | #include <stdio.h> |
@@ -94,6 +95,7 @@ static ERR_STRING_DATA SSL_str_functs[]= | |||
94 | {ERR_PACK(0,SSL_F_SSL2_SET_CERTIFICATE,0), "SSL2_SET_CERTIFICATE"}, | 95 | {ERR_PACK(0,SSL_F_SSL2_SET_CERTIFICATE,0), "SSL2_SET_CERTIFICATE"}, |
95 | {ERR_PACK(0,SSL_F_SSL2_WRITE,0), "SSL2_WRITE"}, | 96 | {ERR_PACK(0,SSL_F_SSL2_WRITE,0), "SSL2_WRITE"}, |
96 | {ERR_PACK(0,SSL_F_SSL3_ACCEPT,0), "SSL3_ACCEPT"}, | 97 | {ERR_PACK(0,SSL_F_SSL3_ACCEPT,0), "SSL3_ACCEPT"}, |
98 | {ERR_PACK(0,SSL_F_SSL3_CALLBACK_CTRL,0), "SSL3_CALLBACK_CTRL"}, | ||
97 | {ERR_PACK(0,SSL_F_SSL3_CHANGE_CIPHER_STATE,0), "SSL3_CHANGE_CIPHER_STATE"}, | 99 | {ERR_PACK(0,SSL_F_SSL3_CHANGE_CIPHER_STATE,0), "SSL3_CHANGE_CIPHER_STATE"}, |
98 | {ERR_PACK(0,SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,0), "SSL3_CHECK_CERT_AND_ALGORITHM"}, | 100 | {ERR_PACK(0,SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,0), "SSL3_CHECK_CERT_AND_ALGORITHM"}, |
99 | {ERR_PACK(0,SSL_F_SSL3_CLIENT_HELLO,0), "SSL3_CLIENT_HELLO"}, | 101 | {ERR_PACK(0,SSL_F_SSL3_CLIENT_HELLO,0), "SSL3_CLIENT_HELLO"}, |
diff --git a/src/lib/libssl/src/ssl/ssl_lib.c b/src/lib/libssl/src/ssl/ssl_lib.c index 3109708480..c515c41b4e 100644 --- a/src/lib/libssl/src/ssl/ssl_lib.c +++ b/src/lib/libssl/src/ssl/ssl_lib.c | |||
@@ -599,6 +599,9 @@ STACK_OF(X509) *SSL_get_peer_cert_chain(SSL *s) | |||
599 | else | 599 | else |
600 | r=s->session->sess_cert->cert_chain; | 600 | r=s->session->sess_cert->cert_chain; |
601 | 601 | ||
602 | /* If we are a client, cert_chain includes the peer's own | ||
603 | * certificate; if we are a server, it does not. */ | ||
604 | |||
602 | return(r); | 605 | return(r); |
603 | } | 606 | } |
604 | 607 | ||
diff --git a/src/lib/libssl/src/ssl/ssl_txt.c b/src/lib/libssl/src/ssl/ssl_txt.c index 7e27857bcf..c07d957576 100644 --- a/src/lib/libssl/src/ssl/ssl_txt.c +++ b/src/lib/libssl/src/ssl/ssl_txt.c | |||
@@ -164,7 +164,7 @@ int SSL_SESSION_print(BIO *bp, SSL_SESSION *x) | |||
164 | } | 164 | } |
165 | if (BIO_puts(bp,"\n") <= 0) goto err; | 165 | if (BIO_puts(bp,"\n") <= 0) goto err; |
166 | 166 | ||
167 | if (BIO_puts(bp, " Verify return code ") <= 0) goto err; | 167 | if (BIO_puts(bp, " Verify return code: ") <= 0) goto err; |
168 | sprintf(str, "%ld (%s)\n", x->verify_result, | 168 | sprintf(str, "%ld (%s)\n", x->verify_result, |
169 | X509_verify_cert_error_string(x->verify_result)); | 169 | X509_verify_cert_error_string(x->verify_result)); |
170 | if (BIO_puts(bp,str) <= 0) goto err; | 170 | if (BIO_puts(bp,str) <= 0) goto err; |
diff --git a/src/lib/libssl/src/ssl/ssltest.c b/src/lib/libssl/src/ssl/ssltest.c index d655bbbd84..dde35794f5 100644 --- a/src/lib/libssl/src/ssl/ssltest.c +++ b/src/lib/libssl/src/ssl/ssltest.c | |||
@@ -62,11 +62,13 @@ | |||
62 | #include <stdio.h> | 62 | #include <stdio.h> |
63 | #include <stdlib.h> | 63 | #include <stdlib.h> |
64 | #include <string.h> | 64 | #include <string.h> |
65 | #include <time.h> | ||
65 | 66 | ||
66 | #include "openssl/e_os.h" | 67 | #include "openssl/e_os.h" |
67 | 68 | ||
68 | #include <openssl/bio.h> | 69 | #include <openssl/bio.h> |
69 | #include <openssl/crypto.h> | 70 | #include <openssl/crypto.h> |
71 | #include <openssl/evp.h> | ||
70 | #include <openssl/x509.h> | 72 | #include <openssl/x509.h> |
71 | #include <openssl/ssl.h> | 73 | #include <openssl/ssl.h> |
72 | #include <openssl/err.h> | 74 | #include <openssl/err.h> |
@@ -89,9 +91,8 @@ static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int is_export,int keylength); | |||
89 | #endif | 91 | #endif |
90 | #ifndef NO_DH | 92 | #ifndef NO_DH |
91 | static DH *get_dh512(void); | 93 | static DH *get_dh512(void); |
92 | #endif | 94 | static DH *get_dh1024(void); |
93 | #ifndef NO_DSA | 95 | static DH *get_dh1024dsa(void); |
94 | static void MS_CALLBACK dsa_cb(int p, int n, void *arg); | ||
95 | #endif | 96 | #endif |
96 | 97 | ||
97 | static BIO *bio_err=NULL; | 98 | static BIO *bio_err=NULL; |
@@ -109,7 +110,7 @@ static int s_nbio=0; | |||
109 | 110 | ||
110 | static const char rnd_seed[] = "string to make the random number generator think it has entropy"; | 111 | static const char rnd_seed[] = "string to make the random number generator think it has entropy"; |
111 | 112 | ||
112 | int doit_biopair(SSL *s_ssl,SSL *c_ssl,long bytes); | 113 | int doit_biopair(SSL *s_ssl,SSL *c_ssl,long bytes,clock_t *s_time,clock_t *c_time); |
113 | int doit(SSL *s_ssl,SSL *c_ssl,long bytes); | 114 | int doit(SSL *s_ssl,SSL *c_ssl,long bytes); |
114 | static void sv_usage(void) | 115 | static void sv_usage(void) |
115 | { | 116 | { |
@@ -122,10 +123,9 @@ static void sv_usage(void) | |||
122 | fprintf(stderr," -reuse - use session-id reuse\n"); | 123 | fprintf(stderr," -reuse - use session-id reuse\n"); |
123 | fprintf(stderr," -num <val> - number of connections to perform\n"); | 124 | fprintf(stderr," -num <val> - number of connections to perform\n"); |
124 | fprintf(stderr," -bytes <val> - number of bytes to swap between client/server\n"); | 125 | fprintf(stderr," -bytes <val> - number of bytes to swap between client/server\n"); |
125 | #if !defined NO_DH && !defined NO_DSA | 126 | #ifndef NO_DH |
126 | fprintf(stderr," -dhe1024 - generate 1024 bit key for DHE\n"); | 127 | fprintf(stderr," -dhe1024 - use 1024 bit key (safe prime) for DHE\n"); |
127 | #endif | 128 | fprintf(stderr," -dhe1024dsa - use 1024 bit key (with 160-bit subprime) for DHE\n"); |
128 | #if !defined NO_DH | ||
129 | fprintf(stderr," -no_dhe - disable DHE\n"); | 129 | fprintf(stderr," -no_dhe - disable DHE\n"); |
130 | #endif | 130 | #endif |
131 | #ifndef NO_SSL2 | 131 | #ifndef NO_SSL2 |
@@ -139,12 +139,58 @@ static void sv_usage(void) | |||
139 | #endif | 139 | #endif |
140 | fprintf(stderr," -CApath arg - PEM format directory of CA's\n"); | 140 | fprintf(stderr," -CApath arg - PEM format directory of CA's\n"); |
141 | fprintf(stderr," -CAfile arg - PEM format file of CA's\n"); | 141 | fprintf(stderr," -CAfile arg - PEM format file of CA's\n"); |
142 | fprintf(stderr," -cert arg - Certificate file\n"); | 142 | fprintf(stderr," -cert arg - Server certificate file\n"); |
143 | fprintf(stderr," -s_cert arg - Just the server certificate file\n"); | 143 | fprintf(stderr," -key arg - Server key file (default: same as -cert)\n"); |
144 | fprintf(stderr," -c_cert arg - Just the client certificate file\n"); | 144 | fprintf(stderr," -c_cert arg - Client certificate file\n"); |
145 | fprintf(stderr," -c_key arg - Client key file (default: same as -c_cert)\n"); | ||
145 | fprintf(stderr," -cipher arg - The cipher list\n"); | 146 | fprintf(stderr," -cipher arg - The cipher list\n"); |
146 | fprintf(stderr," -bio_pair - Use BIO pairs\n"); | 147 | fprintf(stderr," -bio_pair - Use BIO pairs\n"); |
147 | fprintf(stderr," -f - Test even cases that can't work\n"); | 148 | fprintf(stderr," -f - Test even cases that can't work\n"); |
149 | fprintf(stderr," -time - measure processor time used by client and server\n"); | ||
150 | } | ||
151 | |||
152 | static void print_details(SSL *c_ssl, const char *prefix) | ||
153 | { | ||
154 | SSL_CIPHER *ciph; | ||
155 | X509 *cert; | ||
156 | |||
157 | ciph=SSL_get_current_cipher(c_ssl); | ||
158 | BIO_printf(bio_stdout,"%s%s, cipher %s %s", | ||
159 | prefix, | ||
160 | SSL_get_version(c_ssl), | ||
161 | SSL_CIPHER_get_version(ciph), | ||
162 | SSL_CIPHER_get_name(ciph)); | ||
163 | cert=SSL_get_peer_certificate(c_ssl); | ||
164 | if (cert != NULL) | ||
165 | { | ||
166 | EVP_PKEY *pkey = X509_get_pubkey(cert); | ||
167 | if (pkey != NULL) | ||
168 | { | ||
169 | if (0) | ||
170 | ; | ||
171 | #ifndef NO_RSA | ||
172 | else if (pkey->type == EVP_PKEY_RSA && pkey->pkey.rsa != NULL | ||
173 | && pkey->pkey.rsa->n != NULL) | ||
174 | { | ||
175 | BIO_printf(bio_stdout, ", %d bit RSA", | ||
176 | BN_num_bits(pkey->pkey.rsa->n)); | ||
177 | } | ||
178 | #endif | ||
179 | #ifndef NO_DSA | ||
180 | else if (pkey->type == EVP_PKEY_DSA && pkey->pkey.dsa != NULL | ||
181 | && pkey->pkey.dsa->p != NULL) | ||
182 | { | ||
183 | BIO_printf(bio_stdout, ", %d bit DSA", | ||
184 | BN_num_bits(pkey->pkey.dsa->p)); | ||
185 | } | ||
186 | #endif | ||
187 | EVP_PKEY_free(pkey); | ||
188 | } | ||
189 | X509_free(cert); | ||
190 | } | ||
191 | /* The SSL API does not allow us to look at temporary RSA/DH keys, | ||
192 | * otherwise we should print their lengths too */ | ||
193 | BIO_printf(bio_stdout,"\n"); | ||
148 | } | 194 | } |
149 | 195 | ||
150 | int main(int argc, char *argv[]) | 196 | int main(int argc, char *argv[]) |
@@ -157,18 +203,23 @@ int main(int argc, char *argv[]) | |||
157 | int client_auth=0; | 203 | int client_auth=0; |
158 | int server_auth=0,i; | 204 | int server_auth=0,i; |
159 | char *server_cert=TEST_SERVER_CERT; | 205 | char *server_cert=TEST_SERVER_CERT; |
206 | char *server_key=NULL; | ||
160 | char *client_cert=TEST_CLIENT_CERT; | 207 | char *client_cert=TEST_CLIENT_CERT; |
208 | char *client_key=NULL; | ||
161 | SSL_CTX *s_ctx=NULL; | 209 | SSL_CTX *s_ctx=NULL; |
162 | SSL_CTX *c_ctx=NULL; | 210 | SSL_CTX *c_ctx=NULL; |
163 | SSL_METHOD *meth=NULL; | 211 | SSL_METHOD *meth=NULL; |
164 | SSL *c_ssl,*s_ssl; | 212 | SSL *c_ssl,*s_ssl; |
165 | int number=1,reuse=0; | 213 | int number=1,reuse=0; |
166 | long bytes=1L; | 214 | long bytes=1L; |
167 | SSL_CIPHER *ciph; | ||
168 | int dhe1024 = 0, no_dhe = 0; | ||
169 | #ifndef NO_DH | 215 | #ifndef NO_DH |
170 | DH *dh; | 216 | DH *dh; |
217 | int dhe1024 = 0, dhe1024dsa = 0; | ||
171 | #endif | 218 | #endif |
219 | int no_dhe = 0; | ||
220 | int print_time = 0; | ||
221 | clock_t s_time = 0, c_time = 0; | ||
222 | |||
172 | verbose = 0; | 223 | verbose = 0; |
173 | debug = 0; | 224 | debug = 0; |
174 | cipher = 0; | 225 | cipher = 0; |
@@ -195,8 +246,12 @@ int main(int argc, char *argv[]) | |||
195 | debug=1; | 246 | debug=1; |
196 | else if (strcmp(*argv,"-reuse") == 0) | 247 | else if (strcmp(*argv,"-reuse") == 0) |
197 | reuse=1; | 248 | reuse=1; |
249 | #ifndef NO_DH | ||
198 | else if (strcmp(*argv,"-dhe1024") == 0) | 250 | else if (strcmp(*argv,"-dhe1024") == 0) |
199 | dhe1024=1; | 251 | dhe1024=1; |
252 | else if (strcmp(*argv,"-dhe1024dsa") == 0) | ||
253 | dhe1024dsa=1; | ||
254 | #endif | ||
200 | else if (strcmp(*argv,"-no_dhe") == 0) | 255 | else if (strcmp(*argv,"-no_dhe") == 0) |
201 | no_dhe=1; | 256 | no_dhe=1; |
202 | else if (strcmp(*argv,"-ssl2") == 0) | 257 | else if (strcmp(*argv,"-ssl2") == 0) |
@@ -230,11 +285,26 @@ int main(int argc, char *argv[]) | |||
230 | if (--argc < 1) goto bad; | 285 | if (--argc < 1) goto bad; |
231 | server_cert= *(++argv); | 286 | server_cert= *(++argv); |
232 | } | 287 | } |
288 | else if (strcmp(*argv,"-key") == 0) | ||
289 | { | ||
290 | if (--argc < 1) goto bad; | ||
291 | server_key= *(++argv); | ||
292 | } | ||
293 | else if (strcmp(*argv,"-s_key") == 0) | ||
294 | { | ||
295 | if (--argc < 1) goto bad; | ||
296 | server_key= *(++argv); | ||
297 | } | ||
233 | else if (strcmp(*argv,"-c_cert") == 0) | 298 | else if (strcmp(*argv,"-c_cert") == 0) |
234 | { | 299 | { |
235 | if (--argc < 1) goto bad; | 300 | if (--argc < 1) goto bad; |
236 | client_cert= *(++argv); | 301 | client_cert= *(++argv); |
237 | } | 302 | } |
303 | else if (strcmp(*argv,"-c_key") == 0) | ||
304 | { | ||
305 | if (--argc < 1) goto bad; | ||
306 | client_key= *(++argv); | ||
307 | } | ||
238 | else if (strcmp(*argv,"-cipher") == 0) | 308 | else if (strcmp(*argv,"-cipher") == 0) |
239 | { | 309 | { |
240 | if (--argc < 1) goto bad; | 310 | if (--argc < 1) goto bad; |
@@ -258,6 +328,10 @@ int main(int argc, char *argv[]) | |||
258 | { | 328 | { |
259 | force = 1; | 329 | force = 1; |
260 | } | 330 | } |
331 | else if (strcmp(*argv,"-time") == 0) | ||
332 | { | ||
333 | print_time = 1; | ||
334 | } | ||
261 | else | 335 | else |
262 | { | 336 | { |
263 | fprintf(stderr,"unknown option %s\n",*argv); | 337 | fprintf(stderr,"unknown option %s\n",*argv); |
@@ -276,15 +350,24 @@ bad: | |||
276 | 350 | ||
277 | if (!ssl2 && !ssl3 && !tls1 && number > 1 && !reuse && !force) | 351 | if (!ssl2 && !ssl3 && !tls1 && number > 1 && !reuse && !force) |
278 | { | 352 | { |
279 | fprintf(stderr, "This case cannot work. Use -f switch to perform " | 353 | fprintf(stderr, "This case cannot work. Use -f to perform " |
280 | "the test anyway\n" | 354 | "the test anyway (and\n-d to see what happens), " |
281 | "(and -d to see what happens, " | 355 | "or add one of -ssl2, -ssl3, -tls1, -reuse\n" |
282 | "and -bio_pair to really make it happen :-)\n" | 356 | "to avoid protocol mismatch.\n"); |
283 | "or add one of -ssl2, -ssl3, -tls1, -reuse to " | ||
284 | "avoid protocol mismatch.\n"); | ||
285 | exit(1); | 357 | exit(1); |
286 | } | 358 | } |
287 | 359 | ||
360 | if (print_time) | ||
361 | { | ||
362 | if (!bio_pair) | ||
363 | { | ||
364 | fprintf(stderr, "Using BIO pair (-bio_pair)\n"); | ||
365 | bio_pair = 1; | ||
366 | } | ||
367 | if (number < 50 && !force) | ||
368 | fprintf(stderr, "Warning: For accurate timings, use more connections (e.g. -num 1000)\n"); | ||
369 | } | ||
370 | |||
288 | /* if (cipher == NULL) cipher=getenv("SSL_CIPHER"); */ | 371 | /* if (cipher == NULL) cipher=getenv("SSL_CIPHER"); */ |
289 | 372 | ||
290 | SSL_library_init(); | 373 | SSL_library_init(); |
@@ -326,34 +409,21 @@ bad: | |||
326 | #ifndef NO_DH | 409 | #ifndef NO_DH |
327 | if (!no_dhe) | 410 | if (!no_dhe) |
328 | { | 411 | { |
329 | # ifndef NO_DSA | 412 | if (dhe1024dsa) |
330 | if (dhe1024) | ||
331 | { | 413 | { |
332 | DSA *dsa; | 414 | /* use SSL_OP_SINGLE_DH_USE to avoid small subgroup attacks */ |
333 | unsigned char seed[20]; | ||
334 | |||
335 | if (verbose) | ||
336 | { | ||
337 | BIO_printf(bio_err, "Creating 1024 bit DHE parameters\n"); | ||
338 | BIO_flush(bio_err); | ||
339 | } | ||
340 | |||
341 | memcpy(seed, "Random String no. 12", 20); | ||
342 | dsa = DSA_generate_parameters(1024, seed, 20, NULL, NULL, dsa_cb, bio_err); | ||
343 | dh = DSA_dup_DH(dsa); | ||
344 | DSA_free(dsa); | ||
345 | /* important: SSL_OP_SINGLE_DH_USE to avoid small subgroup attacks */ | ||
346 | SSL_CTX_set_options(s_ctx, SSL_OP_SINGLE_DH_USE); | 415 | SSL_CTX_set_options(s_ctx, SSL_OP_SINGLE_DH_USE); |
347 | 416 | dh=get_dh1024dsa(); | |
348 | if (verbose) | ||
349 | fprintf(stdout, " done\n"); | ||
350 | } | 417 | } |
418 | else if (dhe1024) | ||
419 | dh=get_dh1024(); | ||
351 | else | 420 | else |
352 | # endif | ||
353 | dh=get_dh512(); | 421 | dh=get_dh512(); |
354 | SSL_CTX_set_tmp_dh(s_ctx,dh); | 422 | SSL_CTX_set_tmp_dh(s_ctx,dh); |
355 | DH_free(dh); | 423 | DH_free(dh); |
356 | } | 424 | } |
425 | #else | ||
426 | (void)no_dhe; | ||
357 | #endif | 427 | #endif |
358 | 428 | ||
359 | #ifndef NO_RSA | 429 | #ifndef NO_RSA |
@@ -364,8 +434,8 @@ bad: | |||
364 | { | 434 | { |
365 | ERR_print_errors(bio_err); | 435 | ERR_print_errors(bio_err); |
366 | } | 436 | } |
367 | else if (!SSL_CTX_use_PrivateKey_file(s_ctx,server_cert, | 437 | else if (!SSL_CTX_use_PrivateKey_file(s_ctx, |
368 | SSL_FILETYPE_PEM)) | 438 | (server_key?server_key:server_cert), SSL_FILETYPE_PEM)) |
369 | { | 439 | { |
370 | ERR_print_errors(bio_err); | 440 | ERR_print_errors(bio_err); |
371 | goto end; | 441 | goto end; |
@@ -375,7 +445,8 @@ bad: | |||
375 | { | 445 | { |
376 | SSL_CTX_use_certificate_file(c_ctx,client_cert, | 446 | SSL_CTX_use_certificate_file(c_ctx,client_cert, |
377 | SSL_FILETYPE_PEM); | 447 | SSL_FILETYPE_PEM); |
378 | SSL_CTX_use_PrivateKey_file(c_ctx,client_cert, | 448 | SSL_CTX_use_PrivateKey_file(c_ctx, |
449 | (client_key?client_key:client_cert), | ||
379 | SSL_FILETYPE_PEM); | 450 | SSL_FILETYPE_PEM); |
380 | } | 451 | } |
381 | 452 | ||
@@ -415,21 +486,38 @@ bad: | |||
415 | { | 486 | { |
416 | if (!reuse) SSL_set_session(c_ssl,NULL); | 487 | if (!reuse) SSL_set_session(c_ssl,NULL); |
417 | if (bio_pair) | 488 | if (bio_pair) |
418 | ret=doit_biopair(s_ssl,c_ssl,bytes); | 489 | ret=doit_biopair(s_ssl,c_ssl,bytes,&s_time,&c_time); |
419 | else | 490 | else |
420 | ret=doit(s_ssl,c_ssl,bytes); | 491 | ret=doit(s_ssl,c_ssl,bytes); |
421 | } | 492 | } |
422 | 493 | ||
423 | if (!verbose) | 494 | if (!verbose) |
424 | { | 495 | { |
425 | ciph=SSL_get_current_cipher(c_ssl); | 496 | print_details(c_ssl, ""); |
426 | BIO_printf(bio_stdout,"Protocol %s, cipher %s, %s\n", | ||
427 | SSL_get_version(c_ssl), | ||
428 | SSL_CIPHER_get_version(ciph), | ||
429 | SSL_CIPHER_get_name(ciph)); | ||
430 | } | 497 | } |
431 | if ((number > 1) || (bytes > 1L)) | 498 | if ((number > 1) || (bytes > 1L)) |
432 | BIO_printf(bio_stdout, "%d handshakes of %ld bytes done\n",number,bytes); | 499 | BIO_printf(bio_stdout, "%d handshakes of %ld bytes done\n",number,bytes); |
500 | if (print_time) | ||
501 | { | ||
502 | #ifdef CLOCKS_PER_SEC | ||
503 | /* "To determine the time in seconds, the value returned | ||
504 | * by the clock function should be divided by the value | ||
505 | * of the macro CLOCKS_PER_SEC." | ||
506 | * -- ISO/IEC 9899 */ | ||
507 | BIO_printf(bio_stdout, "Approximate total server time: %6.2f s\n" | ||
508 | "Approximate total client time: %6.2f s\n", | ||
509 | (double)s_time/CLOCKS_PER_SEC, | ||
510 | (double)c_time/CLOCKS_PER_SEC); | ||
511 | #else | ||
512 | /* "`CLOCKS_PER_SEC' undeclared (first use this function)" | ||
513 | * -- cc on NeXTstep/OpenStep */ | ||
514 | BIO_printf(bio_stdout, | ||
515 | "Approximate total server time: %6.2f units\n" | ||
516 | "Approximate total client time: %6.2f units\n", | ||
517 | (double)s_time, | ||
518 | (double)c_time); | ||
519 | #endif | ||
520 | } | ||
433 | 521 | ||
434 | SSL_free(s_ssl); | 522 | SSL_free(s_ssl); |
435 | SSL_free(c_ssl); | 523 | SSL_free(c_ssl); |
@@ -448,12 +536,12 @@ end: | |||
448 | EXIT(ret); | 536 | EXIT(ret); |
449 | } | 537 | } |
450 | 538 | ||
451 | int doit_biopair(SSL *s_ssl, SSL *c_ssl, long count) | 539 | int doit_biopair(SSL *s_ssl, SSL *c_ssl, long count, |
540 | clock_t *s_time, clock_t *c_time) | ||
452 | { | 541 | { |
453 | long cw_num = count, cr_num = count, sw_num = count, sr_num = count; | 542 | long cw_num = count, cr_num = count, sw_num = count, sr_num = count; |
454 | BIO *s_ssl_bio = NULL, *c_ssl_bio = NULL; | 543 | BIO *s_ssl_bio = NULL, *c_ssl_bio = NULL; |
455 | BIO *server = NULL, *server_io = NULL, *client = NULL, *client_io = NULL; | 544 | BIO *server = NULL, *server_io = NULL, *client = NULL, *client_io = NULL; |
456 | SSL_CIPHER *ciph; | ||
457 | int ret = 1; | 545 | int ret = 1; |
458 | 546 | ||
459 | size_t bufsiz = 256; /* small buffer for testing */ | 547 | size_t bufsiz = 256; /* small buffer for testing */ |
@@ -526,6 +614,7 @@ int doit_biopair(SSL *s_ssl, SSL *c_ssl, long count) | |||
526 | 614 | ||
527 | MS_STATIC char cbuf[1024*8]; | 615 | MS_STATIC char cbuf[1024*8]; |
528 | int i, r; | 616 | int i, r; |
617 | clock_t c_clock = clock(); | ||
529 | 618 | ||
530 | if (debug) | 619 | if (debug) |
531 | if (SSL_in_init(c_ssl)) | 620 | if (SSL_in_init(c_ssl)) |
@@ -592,6 +681,16 @@ int doit_biopair(SSL *s_ssl, SSL *c_ssl, long count) | |||
592 | cr_num -= r; | 681 | cr_num -= r; |
593 | } | 682 | } |
594 | } | 683 | } |
684 | |||
685 | /* c_time and s_time increments will typically be very small | ||
686 | * (depending on machine speed and clock tick intervals), | ||
687 | * but sampling over a large number of connections should | ||
688 | * result in fairly accurate figures. We cannot guarantee | ||
689 | * a lot, however -- if each connection lasts for exactly | ||
690 | * one clock tick, it will be counted only for the client | ||
691 | * or only for the server or even not at all. | ||
692 | */ | ||
693 | *c_time += (clock() - c_clock); | ||
595 | } | 694 | } |
596 | 695 | ||
597 | { | 696 | { |
@@ -599,6 +698,7 @@ int doit_biopair(SSL *s_ssl, SSL *c_ssl, long count) | |||
599 | 698 | ||
600 | MS_STATIC char sbuf[1024*8]; | 699 | MS_STATIC char sbuf[1024*8]; |
601 | int i, r; | 700 | int i, r; |
701 | clock_t s_clock = clock(); | ||
602 | 702 | ||
603 | if (debug) | 703 | if (debug) |
604 | if (SSL_in_init(s_ssl)) | 704 | if (SSL_in_init(s_ssl)) |
@@ -662,6 +762,8 @@ int doit_biopair(SSL *s_ssl, SSL *c_ssl, long count) | |||
662 | sr_num -= r; | 762 | sr_num -= r; |
663 | } | 763 | } |
664 | } | 764 | } |
765 | |||
766 | *s_time += (clock() - s_clock); | ||
665 | } | 767 | } |
666 | 768 | ||
667 | { | 769 | { |
@@ -787,13 +889,9 @@ int doit_biopair(SSL *s_ssl, SSL *c_ssl, long count) | |||
787 | } | 889 | } |
788 | while (cw_num > 0 || cr_num > 0 || sw_num > 0 || sr_num > 0); | 890 | while (cw_num > 0 || cr_num > 0 || sw_num > 0 || sr_num > 0); |
789 | 891 | ||
790 | ciph = SSL_get_current_cipher(c_ssl); | ||
791 | if (verbose) | 892 | if (verbose) |
792 | fprintf(stdout,"DONE via BIO pair, protocol %s, cipher %s, %s\n", | 893 | print_details(c_ssl, "DONE via BIO pair: "); |
793 | SSL_get_version(c_ssl), | 894 | end: |
794 | SSL_CIPHER_get_version(ciph), | ||
795 | SSL_CIPHER_get_name(ciph)); | ||
796 | end: | ||
797 | ret = 0; | 895 | ret = 0; |
798 | 896 | ||
799 | err: | 897 | err: |
@@ -837,7 +935,6 @@ int doit(SSL *s_ssl, SSL *c_ssl, long count) | |||
837 | int done=0; | 935 | int done=0; |
838 | int c_write,s_write; | 936 | int c_write,s_write; |
839 | int do_server=0,do_client=0; | 937 | int do_server=0,do_client=0; |
840 | SSL_CIPHER *ciph; | ||
841 | 938 | ||
842 | c_to_s=BIO_new(BIO_s_mem()); | 939 | c_to_s=BIO_new(BIO_s_mem()); |
843 | s_to_c=BIO_new(BIO_s_mem()); | 940 | s_to_c=BIO_new(BIO_s_mem()); |
@@ -1087,12 +1184,8 @@ int doit(SSL *s_ssl, SSL *c_ssl, long count) | |||
1087 | if ((done & S_DONE) && (done & C_DONE)) break; | 1184 | if ((done & S_DONE) && (done & C_DONE)) break; |
1088 | } | 1185 | } |
1089 | 1186 | ||
1090 | ciph=SSL_get_current_cipher(c_ssl); | ||
1091 | if (verbose) | 1187 | if (verbose) |
1092 | fprintf(stdout,"DONE, protocol %s, cipher %s, %s\n", | 1188 | print_details(c_ssl, "DONE: "); |
1093 | SSL_get_version(c_ssl), | ||
1094 | SSL_CIPHER_get_version(ciph), | ||
1095 | SSL_CIPHER_get_name(ciph)); | ||
1096 | ret=0; | 1189 | ret=0; |
1097 | err: | 1190 | err: |
1098 | /* We have to set the BIO's to NULL otherwise they will be | 1191 | /* We have to set the BIO's to NULL otherwise they will be |
@@ -1148,32 +1241,6 @@ static int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx) | |||
1148 | return(ok); | 1241 | return(ok); |
1149 | } | 1242 | } |
1150 | 1243 | ||
1151 | #ifndef NO_DH | ||
1152 | static unsigned char dh512_p[]={ | ||
1153 | 0xDA,0x58,0x3C,0x16,0xD9,0x85,0x22,0x89,0xD0,0xE4,0xAF,0x75, | ||
1154 | 0x6F,0x4C,0xCA,0x92,0xDD,0x4B,0xE5,0x33,0xB8,0x04,0xFB,0x0F, | ||
1155 | 0xED,0x94,0xEF,0x9C,0x8A,0x44,0x03,0xED,0x57,0x46,0x50,0xD3, | ||
1156 | 0x69,0x99,0xDB,0x29,0xD7,0x76,0x27,0x6B,0xA2,0xD3,0xD4,0x12, | ||
1157 | 0xE2,0x18,0xF4,0xDD,0x1E,0x08,0x4C,0xF6,0xD8,0x00,0x3E,0x7C, | ||
1158 | 0x47,0x74,0xE8,0x33, | ||
1159 | }; | ||
1160 | static unsigned char dh512_g[]={ | ||
1161 | 0x02, | ||
1162 | }; | ||
1163 | |||
1164 | static DH *get_dh512(void) | ||
1165 | { | ||
1166 | DH *dh=NULL; | ||
1167 | |||
1168 | if ((dh=DH_new()) == NULL) return(NULL); | ||
1169 | dh->p=BN_bin2bn(dh512_p,sizeof(dh512_p),NULL); | ||
1170 | dh->g=BN_bin2bn(dh512_g,sizeof(dh512_g),NULL); | ||
1171 | if ((dh->p == NULL) || (dh->g == NULL)) | ||
1172 | return(NULL); | ||
1173 | return(dh); | ||
1174 | } | ||
1175 | #endif | ||
1176 | |||
1177 | #ifndef NO_RSA | 1244 | #ifndef NO_RSA |
1178 | static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int is_export, int keylength) | 1245 | static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int is_export, int keylength) |
1179 | { | 1246 | { |
@@ -1191,23 +1258,100 @@ static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int is_export, int keylength) | |||
1191 | } | 1258 | } |
1192 | #endif | 1259 | #endif |
1193 | 1260 | ||
1194 | #ifndef NO_DSA | 1261 | #ifndef NO_DH |
1195 | static void MS_CALLBACK dsa_cb(int p, int n, void *arg) | 1262 | /* These DH parameters have been generated as follows: |
1263 | * $ openssl dhparam -C -noout 512 | ||
1264 | * $ openssl dhparam -C -noout 1024 | ||
1265 | * $ openssl dhparam -C -noout -dsaparam 1024 | ||
1266 | * (The third function has been renamed to avoid name conflicts.) | ||
1267 | */ | ||
1268 | DH *get_dh512() | ||
1196 | { | 1269 | { |
1197 | char c='*'; | 1270 | static unsigned char dh512_p[]={ |
1198 | static int ok=0,num=0; | 1271 | 0xCB,0xC8,0xE1,0x86,0xD0,0x1F,0x94,0x17,0xA6,0x99,0xF0,0xC6, |
1272 | 0x1F,0x0D,0xAC,0xB6,0x25,0x3E,0x06,0x39,0xCA,0x72,0x04,0xB0, | ||
1273 | 0x6E,0xDA,0xC0,0x61,0xE6,0x7A,0x77,0x25,0xE8,0x3B,0xB9,0x5F, | ||
1274 | 0x9A,0xB6,0xB5,0xFE,0x99,0x0B,0xA1,0x93,0x4E,0x35,0x33,0xB8, | ||
1275 | 0xE1,0xF1,0x13,0x4F,0x59,0x1A,0xD2,0x57,0xC0,0x26,0x21,0x33, | ||
1276 | 0x02,0xC5,0xAE,0x23, | ||
1277 | }; | ||
1278 | static unsigned char dh512_g[]={ | ||
1279 | 0x02, | ||
1280 | }; | ||
1281 | DH *dh; | ||
1199 | 1282 | ||
1200 | if (p == 0) { c='.'; num++; }; | 1283 | if ((dh=DH_new()) == NULL) return(NULL); |
1201 | if (p == 1) c='+'; | 1284 | dh->p=BN_bin2bn(dh512_p,sizeof(dh512_p),NULL); |
1202 | if (p == 2) { c='*'; ok++; } | 1285 | dh->g=BN_bin2bn(dh512_g,sizeof(dh512_g),NULL); |
1203 | if (p == 3) c='\n'; | 1286 | if ((dh->p == NULL) || (dh->g == NULL)) |
1204 | BIO_write(arg,&c,1); | 1287 | { DH_free(dh); return(NULL); } |
1205 | (void)BIO_flush(arg); | 1288 | return(dh); |
1289 | } | ||
1206 | 1290 | ||
1207 | if (!ok && (p == 0) && (num > 1)) | 1291 | DH *get_dh1024() |
1208 | { | 1292 | { |
1209 | BIO_printf((BIO *)arg,"error in dsatest\n"); | 1293 | static unsigned char dh1024_p[]={ |
1210 | exit(1); | 1294 | 0xF8,0x81,0x89,0x7D,0x14,0x24,0xC5,0xD1,0xE6,0xF7,0xBF,0x3A, |
1211 | } | 1295 | 0xE4,0x90,0xF4,0xFC,0x73,0xFB,0x34,0xB5,0xFA,0x4C,0x56,0xA2, |
1296 | 0xEA,0xA7,0xE9,0xC0,0xC0,0xCE,0x89,0xE1,0xFA,0x63,0x3F,0xB0, | ||
1297 | 0x6B,0x32,0x66,0xF1,0xD1,0x7B,0xB0,0x00,0x8F,0xCA,0x87,0xC2, | ||
1298 | 0xAE,0x98,0x89,0x26,0x17,0xC2,0x05,0xD2,0xEC,0x08,0xD0,0x8C, | ||
1299 | 0xFF,0x17,0x52,0x8C,0xC5,0x07,0x93,0x03,0xB1,0xF6,0x2F,0xB8, | ||
1300 | 0x1C,0x52,0x47,0x27,0x1B,0xDB,0xD1,0x8D,0x9D,0x69,0x1D,0x52, | ||
1301 | 0x4B,0x32,0x81,0xAA,0x7F,0x00,0xC8,0xDC,0xE6,0xD9,0xCC,0xC1, | ||
1302 | 0x11,0x2D,0x37,0x34,0x6C,0xEA,0x02,0x97,0x4B,0x0E,0xBB,0xB1, | ||
1303 | 0x71,0x33,0x09,0x15,0xFD,0xDD,0x23,0x87,0x07,0x5E,0x89,0xAB, | ||
1304 | 0x6B,0x7C,0x5F,0xEC,0xA6,0x24,0xDC,0x53, | ||
1305 | }; | ||
1306 | static unsigned char dh1024_g[]={ | ||
1307 | 0x02, | ||
1308 | }; | ||
1309 | DH *dh; | ||
1310 | |||
1311 | if ((dh=DH_new()) == NULL) return(NULL); | ||
1312 | dh->p=BN_bin2bn(dh1024_p,sizeof(dh1024_p),NULL); | ||
1313 | dh->g=BN_bin2bn(dh1024_g,sizeof(dh1024_g),NULL); | ||
1314 | if ((dh->p == NULL) || (dh->g == NULL)) | ||
1315 | { DH_free(dh); return(NULL); } | ||
1316 | return(dh); | ||
1317 | } | ||
1318 | |||
1319 | DH *get_dh1024dsa() | ||
1320 | { | ||
1321 | static unsigned char dh1024_p[]={ | ||
1322 | 0xC8,0x00,0xF7,0x08,0x07,0x89,0x4D,0x90,0x53,0xF3,0xD5,0x00, | ||
1323 | 0x21,0x1B,0xF7,0x31,0xA6,0xA2,0xDA,0x23,0x9A,0xC7,0x87,0x19, | ||
1324 | 0x3B,0x47,0xB6,0x8C,0x04,0x6F,0xFF,0xC6,0x9B,0xB8,0x65,0xD2, | ||
1325 | 0xC2,0x5F,0x31,0x83,0x4A,0xA7,0x5F,0x2F,0x88,0x38,0xB6,0x55, | ||
1326 | 0xCF,0xD9,0x87,0x6D,0x6F,0x9F,0xDA,0xAC,0xA6,0x48,0xAF,0xFC, | ||
1327 | 0x33,0x84,0x37,0x5B,0x82,0x4A,0x31,0x5D,0xE7,0xBD,0x52,0x97, | ||
1328 | 0xA1,0x77,0xBF,0x10,0x9E,0x37,0xEA,0x64,0xFA,0xCA,0x28,0x8D, | ||
1329 | 0x9D,0x3B,0xD2,0x6E,0x09,0x5C,0x68,0xC7,0x45,0x90,0xFD,0xBB, | ||
1330 | 0x70,0xC9,0x3A,0xBB,0xDF,0xD4,0x21,0x0F,0xC4,0x6A,0x3C,0xF6, | ||
1331 | 0x61,0xCF,0x3F,0xD6,0x13,0xF1,0x5F,0xBC,0xCF,0xBC,0x26,0x9E, | ||
1332 | 0xBC,0x0B,0xBD,0xAB,0x5D,0xC9,0x54,0x39, | ||
1333 | }; | ||
1334 | static unsigned char dh1024_g[]={ | ||
1335 | 0x3B,0x40,0x86,0xE7,0xF3,0x6C,0xDE,0x67,0x1C,0xCC,0x80,0x05, | ||
1336 | 0x5A,0xDF,0xFE,0xBD,0x20,0x27,0x74,0x6C,0x24,0xC9,0x03,0xF3, | ||
1337 | 0xE1,0x8D,0xC3,0x7D,0x98,0x27,0x40,0x08,0xB8,0x8C,0x6A,0xE9, | ||
1338 | 0xBB,0x1A,0x3A,0xD6,0x86,0x83,0x5E,0x72,0x41,0xCE,0x85,0x3C, | ||
1339 | 0xD2,0xB3,0xFC,0x13,0xCE,0x37,0x81,0x9E,0x4C,0x1C,0x7B,0x65, | ||
1340 | 0xD3,0xE6,0xA6,0x00,0xF5,0x5A,0x95,0x43,0x5E,0x81,0xCF,0x60, | ||
1341 | 0xA2,0x23,0xFC,0x36,0xA7,0x5D,0x7A,0x4C,0x06,0x91,0x6E,0xF6, | ||
1342 | 0x57,0xEE,0x36,0xCB,0x06,0xEA,0xF5,0x3D,0x95,0x49,0xCB,0xA7, | ||
1343 | 0xDD,0x81,0xDF,0x80,0x09,0x4A,0x97,0x4D,0xA8,0x22,0x72,0xA1, | ||
1344 | 0x7F,0xC4,0x70,0x56,0x70,0xE8,0x20,0x10,0x18,0x8F,0x2E,0x60, | ||
1345 | 0x07,0xE7,0x68,0x1A,0x82,0x5D,0x32,0xA2, | ||
1346 | }; | ||
1347 | DH *dh; | ||
1348 | |||
1349 | if ((dh=DH_new()) == NULL) return(NULL); | ||
1350 | dh->p=BN_bin2bn(dh1024_p,sizeof(dh1024_p),NULL); | ||
1351 | dh->g=BN_bin2bn(dh1024_g,sizeof(dh1024_g),NULL); | ||
1352 | if ((dh->p == NULL) || (dh->g == NULL)) | ||
1353 | { DH_free(dh); return(NULL); } | ||
1354 | dh->length = 160; | ||
1355 | return(dh); | ||
1212 | } | 1356 | } |
1213 | #endif | 1357 | #endif |
diff --git a/src/lib/libssl/src/util/libeay.num b/src/lib/libssl/src/util/libeay.num index e3818ef6e4..f611d6b283 100644 --- a/src/lib/libssl/src/util/libeay.num +++ b/src/lib/libssl/src/util/libeay.num | |||
@@ -2227,3 +2227,6 @@ BIO_callback_ctrl 2252 | |||
2227 | RAND_egd 2253 | 2227 | RAND_egd 2253 |
2228 | RAND_status 2254 | 2228 | RAND_status 2254 |
2229 | bn_dump1 2255 | 2229 | bn_dump1 2255 |
2230 | des_check_key_parity 2256 | ||
2231 | lh_num_items 2257 | ||
2232 | RAND_event 2258 | ||
diff --git a/src/lib/libssl/src/util/mk1mf.pl b/src/lib/libssl/src/util/mk1mf.pl index 6fbf3ceca6..100d76f279 100644 --- a/src/lib/libssl/src/util/mk1mf.pl +++ b/src/lib/libssl/src/util/mk1mf.pl | |||
@@ -8,6 +8,7 @@ | |||
8 | $INSTALLTOP="/usr/local/ssl"; | 8 | $INSTALLTOP="/usr/local/ssl"; |
9 | $OPTIONS=""; | 9 | $OPTIONS=""; |
10 | $ssl_version=""; | 10 | $ssl_version=""; |
11 | $banner="\t\@echo Building OpenSSL"; | ||
11 | 12 | ||
12 | open(IN,"<Makefile.ssl") || die "unable to open Makefile.ssl!\n"; | 13 | open(IN,"<Makefile.ssl") || die "unable to open Makefile.ssl!\n"; |
13 | while(<IN>) { | 14 | while(<IN>) { |
@@ -59,6 +60,7 @@ and [options] can be one of | |||
59 | just-ssl - remove all non-ssl keys/digest | 60 | just-ssl - remove all non-ssl keys/digest |
60 | no-asm - No x86 asm | 61 | no-asm - No x86 asm |
61 | nasm - Use NASM for x86 asm | 62 | nasm - Use NASM for x86 asm |
63 | gaswin - Use GNU as with Mingw32 | ||
62 | no-socks - No socket code | 64 | no-socks - No socket code |
63 | no-err - No error strings | 65 | no-err - No error strings |
64 | dll/shlib - Build shared libraries (MS) | 66 | dll/shlib - Build shared libraries (MS) |
@@ -850,6 +852,7 @@ sub read_options | |||
850 | elsif (/^no-hmac$/) { $no_hmac=1; } | 852 | elsif (/^no-hmac$/) { $no_hmac=1; } |
851 | elsif (/^no-asm$/) { $no_asm=1; } | 853 | elsif (/^no-asm$/) { $no_asm=1; } |
852 | elsif (/^nasm$/) { $nasm=1; } | 854 | elsif (/^nasm$/) { $nasm=1; } |
855 | elsif (/^gaswin$/) { $gaswin=1; } | ||
853 | elsif (/^no-ssl2$/) { $no_ssl2=1; } | 856 | elsif (/^no-ssl2$/) { $no_ssl2=1; } |
854 | elsif (/^no-ssl3$/) { $no_ssl3=1; } | 857 | elsif (/^no-ssl3$/) { $no_ssl3=1; } |
855 | elsif (/^no-err$/) { $no_err=1; } | 858 | elsif (/^no-err$/) { $no_err=1; } |
diff --git a/src/lib/libssl/src/util/mkerr.pl b/src/lib/libssl/src/util/mkerr.pl index ebc059ef22..8e18f3c2df 100644 --- a/src/lib/libssl/src/util/mkerr.pl +++ b/src/lib/libssl/src/util/mkerr.pl | |||
@@ -284,6 +284,17 @@ EOF | |||
284 | 284 | ||
285 | # Rewrite the C source file containing the error details. | 285 | # Rewrite the C source file containing the error details. |
286 | 286 | ||
287 | # First, read any existing reason string definitions: | ||
288 | my %err_reason_strings; | ||
289 | if (open(IN,"<$cfile")) { | ||
290 | while (<IN>) { | ||
291 | if (/\b(${lib}_R_\w*)\b.*\"(.*)\"/) { | ||
292 | $err_reason_strings{$1} = $2; | ||
293 | } | ||
294 | } | ||
295 | close(IN); | ||
296 | } | ||
297 | |||
287 | my $hincf; | 298 | my $hincf; |
288 | if($static) { | 299 | if($static) { |
289 | $hfile =~ /([^\/]+)$/; | 300 | $hfile =~ /([^\/]+)$/; |
@@ -352,7 +363,8 @@ EOF | |||
352 | */ | 363 | */ |
353 | 364 | ||
354 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | 365 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes |
355 | * made to it will be overwritten when the script next updates this file. | 366 | * made to it will be overwritten when the script next updates this file, |
367 | * only reason strings will be preserved. | ||
356 | */ | 368 | */ |
357 | 369 | ||
358 | #include <stdio.h> | 370 | #include <stdio.h> |
@@ -385,9 +397,13 @@ EOF | |||
385 | foreach $i (@reasons) { | 397 | foreach $i (@reasons) { |
386 | my $rn; | 398 | my $rn; |
387 | my $nspc = 0; | 399 | my $nspc = 0; |
388 | $i =~ /^${lib}_R_(\S+)$/; | 400 | if (exists $err_reason_strings{$i}) { |
389 | $rn = $1; | 401 | $rn = $err_reason_strings{$i}; |
390 | $rn =~ tr/_[A-Z]/ [a-z]/; | 402 | } else { |
403 | $i =~ /^${lib}_R_(\S+)$/; | ||
404 | $rn = $1; | ||
405 | $rn =~ tr/_[A-Z]/ [a-z]/; | ||
406 | } | ||
391 | $nspc = 40 - length($i) unless length($i) > 40; | 407 | $nspc = 40 - length($i) unless length($i) > 40; |
392 | $nspc = " " x $nspc; | 408 | $nspc = " " x $nspc; |
393 | print OUT "{${i}${nspc},\"$rn\"},\n"; | 409 | print OUT "{${i}${nspc},\"$rn\"},\n"; |
@@ -465,7 +481,7 @@ EOF | |||
465 | } | 481 | } |
466 | 482 | ||
467 | close OUT; | 483 | close OUT; |
468 | 484 | undef %err_reason_strings; | |
469 | } | 485 | } |
470 | 486 | ||
471 | if($debug && defined(%notrans)) { | 487 | if($debug && defined(%notrans)) { |
diff --git a/src/lib/libssl/src/util/pl/BC-32.pl b/src/lib/libssl/src/util/pl/BC-32.pl index df6e2c742e..7f57809a16 100644 --- a/src/lib/libssl/src/util/pl/BC-32.pl +++ b/src/lib/libssl/src/util/pl/BC-32.pl | |||
@@ -109,7 +109,7 @@ sub do_lib_rule | |||
109 | { | 109 | { |
110 | # $ret.="\t\$(RM) \$(O_$Name)\n"; | 110 | # $ret.="\t\$(RM) \$(O_$Name)\n"; |
111 | $ret.="\techo LIB $<\n"; | 111 | $ret.="\techo LIB $<\n"; |
112 | $ret.="\t\$(MKLIB) $lfile$target \$(addprefix +, $objs)\n"; | 112 | $ret.="\t&\$(MKLIB) $lfile$target -+\$**\n"; |
113 | } | 113 | } |
114 | else | 114 | else |
115 | { | 115 | { |
diff --git a/src/lib/libssl/src/util/pl/Mingw32.pl b/src/lib/libssl/src/util/pl/Mingw32.pl index 585cacd820..c687d9b118 100644 --- a/src/lib/libssl/src/util/pl/Mingw32.pl +++ b/src/lib/libssl/src/util/pl/Mingw32.pl | |||
@@ -21,6 +21,30 @@ if ($debug) | |||
21 | else | 21 | else |
22 | { $cflags="-DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall"; } | 22 | { $cflags="-DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall"; } |
23 | 23 | ||
24 | if ($gaswin and !$no_asm) | ||
25 | { | ||
26 | $bn_asm_obj='$(OBJ_D)/bn-win32.o'; | ||
27 | $bn_asm_src='crypto/bn/asm/bn-win32.s'; | ||
28 | $des_enc_obj='$(OBJ_D)/d-win32.o $(OBJ_D)/y-win32.o'; | ||
29 | $des_enc_src='crypto/des/asm/d-win32.s crypto/des/asm/y-win32.s'; | ||
30 | $bf_enc_obj='$(OBJ_D)/b-win32.o'; | ||
31 | $bf_enc_src='crypto/bf/asm/b-win32.s'; | ||
32 | # $cast_enc_obj='$(OBJ_D)/c-win32.o'; | ||
33 | # $cast_enc_src='crypto/cast/asm/c-win32.s'; | ||
34 | $rc4_enc_obj='$(OBJ_D)/r4-win32.o'; | ||
35 | $rc4_enc_src='crypto/rc4/asm/r4-win32.s'; | ||
36 | $rc5_enc_obj='$(OBJ_D)/r5-win32.o'; | ||
37 | $rc5_enc_src='crypto/rc5/asm/r5-win32.s'; | ||
38 | $md5_asm_obj='$(OBJ_D)/m5-win32.o'; | ||
39 | $md5_asm_src='crypto/md5/asm/m5-win32.s'; | ||
40 | $rmd160_asm_obj='$(OBJ_D)/rm-win32.o'; | ||
41 | $rmd160_asm_src='crypto/ripemd/asm/rm-win32.s'; | ||
42 | $sha1_asm_obj='$(OBJ_D)/s1-win32.o'; | ||
43 | $sha1_asm_src='crypto/sha/asm/s1-win32.s'; | ||
44 | $cflags.=" -DBN_ASM -DMD5_ASM -DSHA1_ASM"; | ||
45 | } | ||
46 | |||
47 | |||
24 | $obj='.o'; | 48 | $obj='.o'; |
25 | $ofile='-o '; | 49 | $ofile='-o '; |
26 | 50 | ||
@@ -76,4 +100,3 @@ sub do_link_rule | |||
76 | return($ret); | 100 | return($ret); |
77 | } | 101 | } |
78 | 1; | 102 | 1; |
79 | |||
diff --git a/src/lib/libssl/src/util/selftest.pl b/src/lib/libssl/src/util/selftest.pl index 91e962a312..04b4425d7e 100644 --- a/src/lib/libssl/src/util/selftest.pl +++ b/src/lib/libssl/src/util/selftest.pl | |||
@@ -25,7 +25,7 @@ open(OUT,">$report") or die; | |||
25 | print OUT "OpenSSL self-test report:\n\n"; | 25 | print OUT "OpenSSL self-test report:\n\n"; |
26 | 26 | ||
27 | $uname=`uname -a`; | 27 | $uname=`uname -a`; |
28 | $uname="??" if $uname eq ""; | 28 | $uname="??\n" if $uname eq ""; |
29 | 29 | ||
30 | $c=`sh config -t`; | 30 | $c=`sh config -t`; |
31 | foreach $_ (split("\n",$c)) { | 31 | foreach $_ (split("\n",$c)) { |
@@ -83,6 +83,11 @@ if (open(TEST,">cctest.c")) { | |||
83 | print OUT "Compiler doesn't work.\n"; | 83 | print OUT "Compiler doesn't work.\n"; |
84 | goto err; | 84 | goto err; |
85 | } | 85 | } |
86 | system("ar r cctest.a /dev/null"); | ||
87 | if (not -f "cctest.a") { | ||
88 | print OUT "Check your archive tool (ar).\n"; | ||
89 | goto err; | ||
90 | } | ||
86 | } else { | 91 | } else { |
87 | print OUT "Can't create cctest.c\n"; | 92 | print OUT "Can't create cctest.c\n"; |
88 | } | 93 | } |
@@ -129,14 +134,14 @@ if (/no-/) | |||
129 | } | 134 | } |
130 | 135 | ||
131 | print "Running make test...\n"; | 136 | print "Running make test...\n"; |
132 | if (system("make test 2>&1 | tee make.log") > 255) | 137 | if (system("make test 2>&1 | tee maketest.log") > 255) |
133 | { | 138 | { |
134 | print OUT "make test failed!\n"; | 139 | print OUT "make test failed!\n"; |
135 | } else { | 140 | } else { |
136 | $ok=1; | 141 | $ok=1; |
137 | } | 142 | } |
138 | 143 | ||
139 | if ($ok and open(IN,"<make.log")) { | 144 | if ($ok and open(IN,"<maketest.log")) { |
140 | while (<IN>) { | 145 | while (<IN>) { |
141 | $ok=2 if /^platform: $platform/; | 146 | $ok=2 if /^platform: $platform/; |
142 | } | 147 | } |
@@ -155,6 +160,15 @@ if ($ok != 2) { | |||
155 | } else { | 160 | } else { |
156 | print OUT "make.log not found!\n"; | 161 | print OUT "make.log not found!\n"; |
157 | } | 162 | } |
163 | if (open(IN,"<maketest.log")) { | ||
164 | while (<IN>) { | ||
165 | print OUT; | ||
166 | } | ||
167 | close(IN); | ||
168 | print OUT $sep; | ||
169 | } else { | ||
170 | print OUT "maketest.log not found!\n"; | ||
171 | } | ||
158 | } else { | 172 | } else { |
159 | print OUT "Test passed.\n"; | 173 | print OUT "Test passed.\n"; |
160 | } | 174 | } |
diff --git a/src/lib/libssl/src/util/sep_lib.sh b/src/lib/libssl/src/util/sep_lib.sh index 34c2c9f8ba..e69de29bb2 100644 --- a/src/lib/libssl/src/util/sep_lib.sh +++ b/src/lib/libssl/src/util/sep_lib.sh | |||
@@ -1,34 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | cwd=`pwd` | ||
4 | /bin/rm -fr tmp/* | ||
5 | |||
6 | cd crypto/des | ||
7 | make -f Makefile.uni tar | ||
8 | make -f Makefile.uni tar_lit | ||
9 | /bin/mv libdes.tgz $cwd/tmp | ||
10 | /bin/mv libdes-l.tgz $cwd/tmp | ||
11 | cd $cwd | ||
12 | |||
13 | for name in md5 sha cast bf idea rc4 rc2 | ||
14 | do | ||
15 | echo doing $name | ||
16 | (cd crypto; tar cfh - $name)|(cd tmp; tar xf -) | ||
17 | cd tmp/$name | ||
18 | /bin/rm -f Makefile | ||
19 | /bin/rm -f Makefile.ssl | ||
20 | /bin/rm -f Makefile.ssl.orig | ||
21 | /bin/rm -f *.old | ||
22 | /bin/mv Makefile.uni Makefile | ||
23 | |||
24 | if [ -d asm ]; then | ||
25 | mkdir asm/perlasm | ||
26 | cp $cwd/crypto/perlasm/*.pl asm/perlasm | ||
27 | fi | ||
28 | cd .. | ||
29 | tar cf - $name|gzip >$name.tgz | ||
30 | # /bin/rm -fr $name | ||
31 | cd $cwd | ||
32 | done | ||
33 | |||
34 | |||
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h index f29f775347..bb846f491c 100644 --- a/src/lib/libssl/ssl.h +++ b/src/lib/libssl/ssl.h | |||
@@ -391,9 +391,8 @@ struct ssl_ctx_st | |||
391 | * SSL_SESSION_free() when it has finished using it. Otherwise, | 391 | * SSL_SESSION_free() when it has finished using it. Otherwise, |
392 | * on 0, it means the callback has finished with it. | 392 | * on 0, it means the callback has finished with it. |
393 | * If remove_session_cb is not null, it will be called when | 393 | * If remove_session_cb is not null, it will be called when |
394 | * a session-id is removed from the cache. Again, a return | 394 | * a session-id is removed from the cache. After the call, |
395 | * of 0 mens that SSLeay should not SSL_SESSION_free() since | 395 | * OpenSSL will SSL_SESSION_free() it. */ |
396 | * the application is doing something with it. */ | ||
397 | int (*new_session_cb)(struct ssl_st *ssl,SSL_SESSION *sess); | 396 | int (*new_session_cb)(struct ssl_st *ssl,SSL_SESSION *sess); |
398 | void (*remove_session_cb)(struct ssl_ctx_st *ctx,SSL_SESSION *sess); | 397 | void (*remove_session_cb)(struct ssl_ctx_st *ctx,SSL_SESSION *sess); |
399 | SSL_SESSION *(*get_session_cb)(struct ssl_st *ssl, | 398 | SSL_SESSION *(*get_session_cb)(struct ssl_st *ssl, |
@@ -1215,6 +1214,7 @@ int SSL_COMP_add_compression_method(int id,char *cm); | |||
1215 | #define SSL_F_SSL2_SET_CERTIFICATE 126 | 1214 | #define SSL_F_SSL2_SET_CERTIFICATE 126 |
1216 | #define SSL_F_SSL2_WRITE 127 | 1215 | #define SSL_F_SSL2_WRITE 127 |
1217 | #define SSL_F_SSL3_ACCEPT 128 | 1216 | #define SSL_F_SSL3_ACCEPT 128 |
1217 | #define SSL_F_SSL3_CALLBACK_CTRL 233 | ||
1218 | #define SSL_F_SSL3_CHANGE_CIPHER_STATE 129 | 1218 | #define SSL_F_SSL3_CHANGE_CIPHER_STATE 129 |
1219 | #define SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM 130 | 1219 | #define SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM 130 |
1220 | #define SSL_F_SSL3_CLIENT_HELLO 131 | 1220 | #define SSL_F_SSL3_CLIENT_HELLO 131 |
diff --git a/src/lib/libssl/ssl_cert.c b/src/lib/libssl/ssl_cert.c index 48f247ceac..0596b7c5b8 100644 --- a/src/lib/libssl/ssl_cert.c +++ b/src/lib/libssl/ssl_cert.c | |||
@@ -191,16 +191,33 @@ CERT *ssl_cert_dup(CERT *cert) | |||
191 | #ifndef NO_DH | 191 | #ifndef NO_DH |
192 | if (cert->dh_tmp != NULL) | 192 | if (cert->dh_tmp != NULL) |
193 | { | 193 | { |
194 | /* DH parameters don't have a reference count (and cannot | 194 | /* DH parameters don't have a reference count */ |
195 | * reasonably be shared anyway, as the secret exponent may | ||
196 | * be created just when it is needed -- earlier library | ||
197 | * versions did not pay attention to this) */ | ||
198 | ret->dh_tmp = DHparams_dup(cert->dh_tmp); | 195 | ret->dh_tmp = DHparams_dup(cert->dh_tmp); |
199 | if (ret->dh_tmp == NULL) | 196 | if (ret->dh_tmp == NULL) |
200 | { | 197 | { |
201 | SSLerr(SSL_F_SSL_CERT_NEW, ERR_R_DH_LIB); | 198 | SSLerr(SSL_F_SSL_CERT_DUP, ERR_R_DH_LIB); |
202 | goto err; | 199 | goto err; |
203 | } | 200 | } |
201 | if (cert->dh_tmp->priv_key) | ||
202 | { | ||
203 | BIGNUM *b = BN_dup(cert->dh_tmp->priv_key); | ||
204 | if (!b) | ||
205 | { | ||
206 | SSLerr(SSL_F_SSL_CERT_DUP, ERR_R_BN_LIB); | ||
207 | goto err; | ||
208 | } | ||
209 | ret->dh_tmp->priv_key = b; | ||
210 | } | ||
211 | if (cert->dh_tmp->pub_key) | ||
212 | { | ||
213 | BIGNUM *b = BN_dup(cert->dh_tmp->pub_key); | ||
214 | if (!b) | ||
215 | { | ||
216 | SSLerr(SSL_F_SSL_CERT_DUP, ERR_R_BN_LIB); | ||
217 | goto err; | ||
218 | } | ||
219 | ret->dh_tmp->pub_key = b; | ||
220 | } | ||
204 | } | 221 | } |
205 | ret->dh_tmp_cb = cert->dh_tmp_cb; | 222 | ret->dh_tmp_cb = cert->dh_tmp_cb; |
206 | #endif | 223 | #endif |
diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c index 1cbc2886e9..7436a50ad1 100644 --- a/src/lib/libssl/ssl_ciph.c +++ b/src/lib/libssl/ssl_ciph.c | |||
@@ -607,7 +607,7 @@ static int ssl_cipher_process_rulestr(const char *rule_str, | |||
607 | if (buflen == 0) | 607 | if (buflen == 0) |
608 | { | 608 | { |
609 | /* | 609 | /* |
610 | * We hit something, we cannot deal with, | 610 | * We hit something we cannot deal with, |
611 | * it is no command or separator nor | 611 | * it is no command or separator nor |
612 | * alphanumeric, so we call this an error. | 612 | * alphanumeric, so we call this an error. |
613 | */ | 613 | */ |
@@ -620,6 +620,7 @@ static int ssl_cipher_process_rulestr(const char *rule_str, | |||
620 | 620 | ||
621 | if (rule == CIPHER_SPECIAL) | 621 | if (rule == CIPHER_SPECIAL) |
622 | { | 622 | { |
623 | found = 0; /* unused -- avoid compiler warning */ | ||
623 | break; /* special treatment */ | 624 | break; /* special treatment */ |
624 | } | 625 | } |
625 | 626 | ||
@@ -633,12 +634,12 @@ static int ssl_cipher_process_rulestr(const char *rule_str, | |||
633 | multi=0; | 634 | multi=0; |
634 | 635 | ||
635 | /* | 636 | /* |
636 | * Now search for the name in the ca_list. Be careful | 637 | * Now search for the cipher alias in the ca_list. Be careful |
637 | * with the strncmp, because the "buflen" limitation | 638 | * with the strncmp, because the "buflen" limitation |
638 | * will make the rule "ADH:SOME" and the cipher | 639 | * will make the rule "ADH:SOME" and the cipher |
639 | * "ADH-MY-CIPHER" look like a match for buflen=3. | 640 | * "ADH-MY-CIPHER" look like a match for buflen=3. |
640 | * So additionally check, whether the cipher name found | 641 | * So additionally check whether the cipher name found |
641 | * has the correct length. We can save a strlen() call, | 642 | * has the correct length. We can save a strlen() call: |
642 | * just checking for the '\0' at the right place is | 643 | * just checking for the '\0' at the right place is |
643 | * sufficient, we have to strncmp() anyway. | 644 | * sufficient, we have to strncmp() anyway. |
644 | */ | 645 | */ |
@@ -665,42 +666,42 @@ static int ssl_cipher_process_rulestr(const char *rule_str, | |||
665 | if (!multi) break; | 666 | if (!multi) break; |
666 | } | 667 | } |
667 | 668 | ||
669 | /* | ||
670 | * Ok, we have the rule, now apply it | ||
671 | */ | ||
672 | if (rule == CIPHER_SPECIAL) | ||
673 | { /* special command */ | ||
674 | ok = 0; | ||
675 | if ((buflen == 8) && | ||
676 | !strncmp(buf, "STRENGTH", 8)) | ||
677 | ok = ssl_cipher_strength_sort(list, | ||
678 | head_p, tail_p); | ||
679 | else | ||
680 | SSLerr(SSL_F_SSL_CIPHER_PROCESS_RULESTR, | ||
681 | SSL_R_INVALID_COMMAND); | ||
682 | if (ok == 0) | ||
683 | retval = 0; | ||
668 | /* | 684 | /* |
669 | * Ok, we have the rule, now apply it | 685 | * We do not support any "multi" options |
686 | * together with "@", so throw away the | ||
687 | * rest of the command, if any left, until | ||
688 | * end or ':' is found. | ||
670 | */ | 689 | */ |
671 | if (rule == CIPHER_SPECIAL) | 690 | while ((*l != '\0') && ITEM_SEP(*l)) |
672 | { /* special command */ | 691 | l++; |
673 | ok = 0; | 692 | } |
674 | if ((buflen == 8) && | 693 | else if (found) |
675 | !strncmp(buf, "STRENGTH", 8)) | 694 | { |
676 | ok = ssl_cipher_strength_sort(list, | 695 | ssl_cipher_apply_rule(algorithms, mask, |
677 | head_p, tail_p); | 696 | algo_strength, mask_strength, rule, -1, |
678 | else | 697 | list, head_p, tail_p); |
679 | SSLerr(SSL_F_SSL_CIPHER_PROCESS_RULESTR, | 698 | } |
680 | SSL_R_INVALID_COMMAND); | 699 | else |
681 | if (ok == 0) | 700 | { |
682 | retval = 0; | 701 | while ((*l != '\0') && ITEM_SEP(*l)) |
683 | /* | 702 | l++; |
684 | * We do not support any "multi" options | 703 | } |
685 | * together with "@", so throw away the | 704 | if (*l == '\0') break; /* done */ |
686 | * rest of the command, if any left, until | ||
687 | * end or ':' is found. | ||
688 | */ | ||
689 | while ((*l != '\0') && ITEM_SEP(*l)) | ||
690 | l++; | ||
691 | } | ||
692 | else if (found) | ||
693 | { | ||
694 | ssl_cipher_apply_rule(algorithms, mask, | ||
695 | algo_strength, mask_strength, rule, -1, | ||
696 | list, head_p, tail_p); | ||
697 | } | ||
698 | else | ||
699 | { | ||
700 | while ((*l != '\0') && ITEM_SEP(*l)) | ||
701 | l++; | ||
702 | } | ||
703 | if (*l == '\0') break; /* done */ | ||
704 | } | 705 | } |
705 | 706 | ||
706 | return(retval); | 707 | return(retval); |
diff --git a/src/lib/libssl/ssl_err.c b/src/lib/libssl/ssl_err.c index 5618e34a30..642c3f93e7 100644 --- a/src/lib/libssl/ssl_err.c +++ b/src/lib/libssl/ssl_err.c | |||
@@ -54,7 +54,8 @@ | |||
54 | */ | 54 | */ |
55 | 55 | ||
56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes |
57 | * made to it will be overwritten when the script next updates this file. | 57 | * made to it will be overwritten when the script next updates this file, |
58 | * only reason strings will be preserved. | ||
58 | */ | 59 | */ |
59 | 60 | ||
60 | #include <stdio.h> | 61 | #include <stdio.h> |
@@ -94,6 +95,7 @@ static ERR_STRING_DATA SSL_str_functs[]= | |||
94 | {ERR_PACK(0,SSL_F_SSL2_SET_CERTIFICATE,0), "SSL2_SET_CERTIFICATE"}, | 95 | {ERR_PACK(0,SSL_F_SSL2_SET_CERTIFICATE,0), "SSL2_SET_CERTIFICATE"}, |
95 | {ERR_PACK(0,SSL_F_SSL2_WRITE,0), "SSL2_WRITE"}, | 96 | {ERR_PACK(0,SSL_F_SSL2_WRITE,0), "SSL2_WRITE"}, |
96 | {ERR_PACK(0,SSL_F_SSL3_ACCEPT,0), "SSL3_ACCEPT"}, | 97 | {ERR_PACK(0,SSL_F_SSL3_ACCEPT,0), "SSL3_ACCEPT"}, |
98 | {ERR_PACK(0,SSL_F_SSL3_CALLBACK_CTRL,0), "SSL3_CALLBACK_CTRL"}, | ||
97 | {ERR_PACK(0,SSL_F_SSL3_CHANGE_CIPHER_STATE,0), "SSL3_CHANGE_CIPHER_STATE"}, | 99 | {ERR_PACK(0,SSL_F_SSL3_CHANGE_CIPHER_STATE,0), "SSL3_CHANGE_CIPHER_STATE"}, |
98 | {ERR_PACK(0,SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,0), "SSL3_CHECK_CERT_AND_ALGORITHM"}, | 100 | {ERR_PACK(0,SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,0), "SSL3_CHECK_CERT_AND_ALGORITHM"}, |
99 | {ERR_PACK(0,SSL_F_SSL3_CLIENT_HELLO,0), "SSL3_CLIENT_HELLO"}, | 101 | {ERR_PACK(0,SSL_F_SSL3_CLIENT_HELLO,0), "SSL3_CLIENT_HELLO"}, |
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c index 3109708480..c515c41b4e 100644 --- a/src/lib/libssl/ssl_lib.c +++ b/src/lib/libssl/ssl_lib.c | |||
@@ -599,6 +599,9 @@ STACK_OF(X509) *SSL_get_peer_cert_chain(SSL *s) | |||
599 | else | 599 | else |
600 | r=s->session->sess_cert->cert_chain; | 600 | r=s->session->sess_cert->cert_chain; |
601 | 601 | ||
602 | /* If we are a client, cert_chain includes the peer's own | ||
603 | * certificate; if we are a server, it does not. */ | ||
604 | |||
602 | return(r); | 605 | return(r); |
603 | } | 606 | } |
604 | 607 | ||
diff --git a/src/lib/libssl/ssl_txt.c b/src/lib/libssl/ssl_txt.c index 7e27857bcf..c07d957576 100644 --- a/src/lib/libssl/ssl_txt.c +++ b/src/lib/libssl/ssl_txt.c | |||
@@ -164,7 +164,7 @@ int SSL_SESSION_print(BIO *bp, SSL_SESSION *x) | |||
164 | } | 164 | } |
165 | if (BIO_puts(bp,"\n") <= 0) goto err; | 165 | if (BIO_puts(bp,"\n") <= 0) goto err; |
166 | 166 | ||
167 | if (BIO_puts(bp, " Verify return code ") <= 0) goto err; | 167 | if (BIO_puts(bp, " Verify return code: ") <= 0) goto err; |
168 | sprintf(str, "%ld (%s)\n", x->verify_result, | 168 | sprintf(str, "%ld (%s)\n", x->verify_result, |
169 | X509_verify_cert_error_string(x->verify_result)); | 169 | X509_verify_cert_error_string(x->verify_result)); |
170 | if (BIO_puts(bp,str) <= 0) goto err; | 170 | if (BIO_puts(bp,str) <= 0) goto err; |