diff options
author | cvs2svn <admin@example.com> | 2007-03-01 16:29:10 +0000 |
---|---|---|
committer | cvs2svn <admin@example.com> | 2007-03-01 16:29:10 +0000 |
commit | d92cde8050488a0c87c357c4756a89026b6659ee (patch) | |
tree | 737670254ff24eff6f6dddb0b97cae8c0ba8c571 /src/lib/libcrypto/rc4 | |
parent | 9c4b4ca341957016adebec4e1eb2446cf0261241 (diff) | |
download | openbsd-OPENBSD_4_1_BASE.tar.gz openbsd-OPENBSD_4_1_BASE.tar.bz2 openbsd-OPENBSD_4_1_BASE.zip |
This commit was manufactured by cvs2git to create tag 'OPENBSD_4_1_BASE'.OPENBSD_4_1_BASE
Diffstat (limited to 'src/lib/libcrypto/rc4')
-rw-r--r-- | src/lib/libcrypto/rc4/asm/rc4-586.pl | 229 | ||||
-rwxr-xr-x | src/lib/libcrypto/rc4/asm/rc4-x86_64.pl | 150 | ||||
-rw-r--r-- | src/lib/libcrypto/rc4/rc4.h | 91 | ||||
-rw-r--r-- | src/lib/libcrypto/rc4/rc4_enc.c | 315 | ||||
-rw-r--r-- | src/lib/libcrypto/rc4/rc4_locl.h | 5 | ||||
-rw-r--r-- | src/lib/libcrypto/rc4/rc4_skey.c | 120 |
6 files changed, 0 insertions, 910 deletions
diff --git a/src/lib/libcrypto/rc4/asm/rc4-586.pl b/src/lib/libcrypto/rc4/asm/rc4-586.pl deleted file mode 100644 index d6e98f0811..0000000000 --- a/src/lib/libcrypto/rc4/asm/rc4-586.pl +++ /dev/null | |||
@@ -1,229 +0,0 @@ | |||
1 | #!/usr/local/bin/perl | ||
2 | |||
3 | # At some point it became apparent that the original SSLeay RC4 | ||
4 | # assembler implementation performs suboptimaly on latest IA-32 | ||
5 | # microarchitectures. After re-tuning performance has changed as | ||
6 | # following: | ||
7 | # | ||
8 | # Pentium +0% | ||
9 | # Pentium III +17% | ||
10 | # AMD +52%(*) | ||
11 | # P4 +180%(**) | ||
12 | # | ||
13 | # (*) This number is actually a trade-off:-) It's possible to | ||
14 | # achieve +72%, but at the cost of -48% off PIII performance. | ||
15 | # In other words code performing further 13% faster on AMD | ||
16 | # would perform almost 2 times slower on Intel PIII... | ||
17 | # For reference! This code delivers ~80% of rc4-amd64.pl | ||
18 | # performance on the same Opteron machine. | ||
19 | # (**) This number requires compressed key schedule set up by | ||
20 | # RC4_set_key and therefore doesn't apply to 0.9.7 [option for | ||
21 | # compressed key schedule is implemented in 0.9.8 and later, | ||
22 | # see commentary section in rc4_skey.c for further details]. | ||
23 | # | ||
24 | # <appro@fy.chalmers.se> | ||
25 | |||
26 | push(@INC,"perlasm","../../perlasm"); | ||
27 | require "x86asm.pl"; | ||
28 | |||
29 | &asm_init($ARGV[0],"rc4-586.pl"); | ||
30 | |||
31 | $x="eax"; | ||
32 | $y="ebx"; | ||
33 | $tx="ecx"; | ||
34 | $ty="edx"; | ||
35 | $in="esi"; | ||
36 | $out="edi"; | ||
37 | $d="ebp"; | ||
38 | |||
39 | &RC4("RC4"); | ||
40 | |||
41 | &asm_finish(); | ||
42 | |||
43 | sub RC4_loop | ||
44 | { | ||
45 | local($n,$p,$char)=@_; | ||
46 | |||
47 | &comment("Round $n"); | ||
48 | |||
49 | if ($char) | ||
50 | { | ||
51 | if ($p >= 0) | ||
52 | { | ||
53 | &mov($ty, &swtmp(2)); | ||
54 | &cmp($ty, $in); | ||
55 | &jbe(&label("finished")); | ||
56 | &inc($in); | ||
57 | } | ||
58 | else | ||
59 | { | ||
60 | &add($ty, 8); | ||
61 | &inc($in); | ||
62 | &cmp($ty, $in); | ||
63 | &jb(&label("finished")); | ||
64 | &mov(&swtmp(2), $ty); | ||
65 | } | ||
66 | } | ||
67 | # Moved out | ||
68 | # &mov( $tx, &DWP(0,$d,$x,4)) if $p < 0; | ||
69 | |||
70 | &add( &LB($y), &LB($tx)); | ||
71 | &mov( $ty, &DWP(0,$d,$y,4)); | ||
72 | # XXX | ||
73 | &mov( &DWP(0,$d,$x,4),$ty); | ||
74 | &add( $ty, $tx); | ||
75 | &mov( &DWP(0,$d,$y,4),$tx); | ||
76 | &and( $ty, 0xff); | ||
77 | &inc( &LB($x)); # NEXT ROUND | ||
78 | &mov( $tx, &DWP(0,$d,$x,4)) if $p < 1; # NEXT ROUND | ||
79 | &mov( $ty, &DWP(0,$d,$ty,4)); | ||
80 | |||
81 | if (!$char) | ||
82 | { | ||
83 | #moved up into last round | ||
84 | if ($p >= 1) | ||
85 | { | ||
86 | &add( $out, 8) | ||
87 | } | ||
88 | &movb( &BP($n,"esp","",0), &LB($ty)); | ||
89 | } | ||
90 | else | ||
91 | { | ||
92 | # Note in+=8 has occured | ||
93 | &movb( &HB($ty), &BP(-1,$in,"",0)); | ||
94 | # XXX | ||
95 | &xorb(&LB($ty), &HB($ty)); | ||
96 | # XXX | ||
97 | &movb(&BP($n,$out,"",0),&LB($ty)); | ||
98 | } | ||
99 | } | ||
100 | |||
101 | |||
102 | sub RC4 | ||
103 | { | ||
104 | local($name)=@_; | ||
105 | |||
106 | &function_begin_B($name,""); | ||
107 | |||
108 | &mov($ty,&wparam(1)); # len | ||
109 | &cmp($ty,0); | ||
110 | &jne(&label("proceed")); | ||
111 | &ret(); | ||
112 | &set_label("proceed"); | ||
113 | |||
114 | &comment(""); | ||
115 | |||
116 | &push("ebp"); | ||
117 | &push("ebx"); | ||
118 | &push("esi"); | ||
119 | &xor( $x, $x); # avoid partial register stalls | ||
120 | &push("edi"); | ||
121 | &xor( $y, $y); # avoid partial register stalls | ||
122 | &mov( $d, &wparam(0)); # key | ||
123 | &mov( $in, &wparam(2)); | ||
124 | |||
125 | &movb( &LB($x), &BP(0,$d,"",1)); | ||
126 | &movb( &LB($y), &BP(4,$d,"",1)); | ||
127 | |||
128 | &mov( $out, &wparam(3)); | ||
129 | &inc( &LB($x)); | ||
130 | |||
131 | &stack_push(3); # 3 temp variables | ||
132 | &add( $d, 8); | ||
133 | |||
134 | # detect compressed schedule, see commentary section in rc4_skey.c... | ||
135 | # in 0.9.7 context ~50 bytes below RC4_CHAR label remain redundant, | ||
136 | # as compressed key schedule is set up in 0.9.8 and later. | ||
137 | &cmp(&DWP(256,$d),-1); | ||
138 | &je(&label("RC4_CHAR")); | ||
139 | |||
140 | &lea( $ty, &DWP(-8,$ty,$in)); | ||
141 | |||
142 | # check for 0 length input | ||
143 | |||
144 | &mov( &swtmp(2), $ty); # this is now address to exit at | ||
145 | &mov( $tx, &DWP(0,$d,$x,4)); | ||
146 | |||
147 | &cmp( $ty, $in); | ||
148 | &jb( &label("end")); # less than 8 bytes | ||
149 | |||
150 | &set_label("start"); | ||
151 | |||
152 | # filling DELAY SLOT | ||
153 | &add( $in, 8); | ||
154 | |||
155 | &RC4_loop(0,-1,0); | ||
156 | &RC4_loop(1,0,0); | ||
157 | &RC4_loop(2,0,0); | ||
158 | &RC4_loop(3,0,0); | ||
159 | &RC4_loop(4,0,0); | ||
160 | &RC4_loop(5,0,0); | ||
161 | &RC4_loop(6,0,0); | ||
162 | &RC4_loop(7,1,0); | ||
163 | |||
164 | &comment("apply the cipher text"); | ||
165 | # xor the cipher data with input | ||
166 | |||
167 | #&add( $out, 8); #moved up into last round | ||
168 | |||
169 | &mov( $tx, &swtmp(0)); | ||
170 | &mov( $ty, &DWP(-8,$in,"",0)); | ||
171 | &xor( $tx, $ty); | ||
172 | &mov( $ty, &DWP(-4,$in,"",0)); | ||
173 | &mov( &DWP(-8,$out,"",0), $tx); | ||
174 | &mov( $tx, &swtmp(1)); | ||
175 | &xor( $tx, $ty); | ||
176 | &mov( $ty, &swtmp(2)); # load end ptr; | ||
177 | &mov( &DWP(-4,$out,"",0), $tx); | ||
178 | &mov( $tx, &DWP(0,$d,$x,4)); | ||
179 | &cmp($in, $ty); | ||
180 | &jbe(&label("start")); | ||
181 | |||
182 | &set_label("end"); | ||
183 | |||
184 | # There is quite a bit of extra crap in RC4_loop() for this | ||
185 | # first round | ||
186 | &RC4_loop(0,-1,1); | ||
187 | &RC4_loop(1,0,1); | ||
188 | &RC4_loop(2,0,1); | ||
189 | &RC4_loop(3,0,1); | ||
190 | &RC4_loop(4,0,1); | ||
191 | &RC4_loop(5,0,1); | ||
192 | &RC4_loop(6,1,1); | ||
193 | |||
194 | &jmp(&label("finished")); | ||
195 | |||
196 | &align(16); | ||
197 | # this is essentially Intel P4 specific codepath, see rc4_skey.c, | ||
198 | # and is engaged in 0.9.8 and later context... | ||
199 | &set_label("RC4_CHAR"); | ||
200 | |||
201 | &lea ($ty,&DWP(0,$in,$ty)); | ||
202 | &mov (&swtmp(2),$ty); | ||
203 | |||
204 | # strangely enough unrolled loop performs over 20% slower... | ||
205 | &set_label("RC4_CHAR_loop"); | ||
206 | &movz ($tx,&BP(0,$d,$x)); | ||
207 | &add (&LB($y),&LB($tx)); | ||
208 | &movz ($ty,&BP(0,$d,$y)); | ||
209 | &movb (&BP(0,$d,$y),&LB($tx)); | ||
210 | &movb (&BP(0,$d,$x),&LB($ty)); | ||
211 | &add (&LB($ty),&LB($tx)); | ||
212 | &movz ($ty,&BP(0,$d,$ty)); | ||
213 | &xorb (&LB($ty),&BP(0,$in)); | ||
214 | &movb (&BP(0,$out),&LB($ty)); | ||
215 | &inc (&LB($x)); | ||
216 | &inc ($in); | ||
217 | &inc ($out); | ||
218 | &cmp ($in,&swtmp(2)); | ||
219 | &jb (&label("RC4_CHAR_loop")); | ||
220 | |||
221 | &set_label("finished"); | ||
222 | &dec( $x); | ||
223 | &stack_pop(3); | ||
224 | &movb( &BP(-4,$d,"",0),&LB($y)); | ||
225 | &movb( &BP(-8,$d,"",0),&LB($x)); | ||
226 | |||
227 | &function_end($name); | ||
228 | } | ||
229 | |||
diff --git a/src/lib/libcrypto/rc4/asm/rc4-x86_64.pl b/src/lib/libcrypto/rc4/asm/rc4-x86_64.pl deleted file mode 100755 index b628daca70..0000000000 --- a/src/lib/libcrypto/rc4/asm/rc4-x86_64.pl +++ /dev/null | |||
@@ -1,150 +0,0 @@ | |||
1 | #!/usr/bin/env perl | ||
2 | # | ||
3 | # ==================================================================== | ||
4 | # Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL | ||
5 | # project. Rights for redistribution and usage in source and binary | ||
6 | # forms are granted according to the OpenSSL license. | ||
7 | # ==================================================================== | ||
8 | # | ||
9 | # Unlike 0.9.7f this code expects RC4_CHAR back in config line! See | ||
10 | # commentary section in corresponding script in development branch | ||
11 | # for background information about this option carousel. For those | ||
12 | # who don't have energy to figure out these gory details, here is | ||
13 | # basis in form of performance matrix relative to the original | ||
14 | # 0.9.7e C code-base: | ||
15 | # | ||
16 | # 0.9.7e 0.9.7f this | ||
17 | # AMD64 1x 3.3x 2.4x | ||
18 | # EM64T 1x 0.8x 1.5x | ||
19 | # | ||
20 | # In other words idea is to trade -25% AMD64 performance to compensate | ||
21 | # for deterioration and gain +90% on EM64T core. Development branch | ||
22 | # maintains best performance for either target, i.e. 3.3x for AMD64 | ||
23 | # and 1.5x for EM64T. | ||
24 | |||
25 | $output=shift; | ||
26 | |||
27 | open STDOUT,">$output" || die "can't open $output: $!"; | ||
28 | |||
29 | $dat="%rdi"; # arg1 | ||
30 | $len="%rsi"; # arg2 | ||
31 | $inp="%rdx"; # arg3 | ||
32 | $out="%rcx"; # arg4 | ||
33 | |||
34 | @XX=("%r8","%r10"); | ||
35 | @TX=("%r9","%r11"); | ||
36 | $YY="%r12"; | ||
37 | $TY="%r13"; | ||
38 | |||
39 | $code=<<___;; | ||
40 | .text | ||
41 | |||
42 | .globl RC4 | ||
43 | .type RC4,\@function | ||
44 | .align 16 | ||
45 | RC4: or $len,$len | ||
46 | jne .Lentry | ||
47 | repret | ||
48 | .Lentry: | ||
49 | push %r12 | ||
50 | push %r13 | ||
51 | |||
52 | add \$2,$dat | ||
53 | movzb -2($dat),$XX[0]#d | ||
54 | movzb -1($dat),$YY#d | ||
55 | |||
56 | add \$1,$XX[0]#b | ||
57 | movzb ($dat,$XX[0]),$TX[0]#d | ||
58 | test \$-8,$len | ||
59 | jz .Lcloop1 | ||
60 | push %rbx | ||
61 | .align 16 # incidentally aligned already | ||
62 | .Lcloop8: | ||
63 | mov ($inp),%eax | ||
64 | mov 4($inp),%ebx | ||
65 | ___ | ||
66 | # unroll 2x4-wise, because 64-bit rotates kill Intel P4... | ||
67 | for ($i=0;$i<4;$i++) { | ||
68 | $code.=<<___; | ||
69 | add $TX[0]#b,$YY#b | ||
70 | lea 1($XX[0]),$XX[1] | ||
71 | movzb ($dat,$YY),$TY#d | ||
72 | movzb $XX[1]#b,$XX[1]#d | ||
73 | movzb ($dat,$XX[1]),$TX[1]#d | ||
74 | movb $TX[0]#b,($dat,$YY) | ||
75 | cmp $XX[1],$YY | ||
76 | movb $TY#b,($dat,$XX[0]) | ||
77 | jne .Lcmov$i # Intel cmov is sloooow... | ||
78 | mov $TX[0],$TX[1] | ||
79 | .Lcmov$i: | ||
80 | add $TX[0]#b,$TY#b | ||
81 | xor ($dat,$TY),%al | ||
82 | ror \$8,%eax | ||
83 | ___ | ||
84 | push(@TX,shift(@TX)); push(@XX,shift(@XX)); # "rotate" registers | ||
85 | } | ||
86 | for ($i=4;$i<8;$i++) { | ||
87 | $code.=<<___; | ||
88 | add $TX[0]#b,$YY#b | ||
89 | lea 1($XX[0]),$XX[1] | ||
90 | movzb ($dat,$YY),$TY#d | ||
91 | movzb $XX[1]#b,$XX[1]#d | ||
92 | movzb ($dat,$XX[1]),$TX[1]#d | ||
93 | movb $TX[0]#b,($dat,$YY) | ||
94 | cmp $XX[1],$YY | ||
95 | movb $TY#b,($dat,$XX[0]) | ||
96 | jne .Lcmov$i # Intel cmov is sloooow... | ||
97 | mov $TX[0],$TX[1] | ||
98 | .Lcmov$i: | ||
99 | add $TX[0]#b,$TY#b | ||
100 | xor ($dat,$TY),%bl | ||
101 | ror \$8,%ebx | ||
102 | ___ | ||
103 | push(@TX,shift(@TX)); push(@XX,shift(@XX)); # "rotate" registers | ||
104 | } | ||
105 | $code.=<<___; | ||
106 | lea -8($len),$len | ||
107 | mov %eax,($out) | ||
108 | lea 8($inp),$inp | ||
109 | mov %ebx,4($out) | ||
110 | lea 8($out),$out | ||
111 | |||
112 | test \$-8,$len | ||
113 | jnz .Lcloop8 | ||
114 | pop %rbx | ||
115 | cmp \$0,$len | ||
116 | jne .Lcloop1 | ||
117 | .Lexit: | ||
118 | sub \$1,$XX[0]#b | ||
119 | movb $XX[0]#b,-2($dat) | ||
120 | movb $YY#b,-1($dat) | ||
121 | |||
122 | pop %r13 | ||
123 | pop %r12 | ||
124 | repret | ||
125 | |||
126 | .align 16 | ||
127 | .Lcloop1: | ||
128 | add $TX[0]#b,$YY#b | ||
129 | movzb ($dat,$YY),$TY#d | ||
130 | movb $TX[0]#b,($dat,$YY) | ||
131 | movb $TY#b,($dat,$XX[0]) | ||
132 | add $TX[0]#b,$TY#b | ||
133 | add \$1,$XX[0]#b | ||
134 | movzb ($dat,$TY),$TY#d | ||
135 | movzb ($dat,$XX[0]),$TX[0]#d | ||
136 | xorb ($inp),$TY#b | ||
137 | lea 1($inp),$inp | ||
138 | movb $TY#b,($out) | ||
139 | lea 1($out),$out | ||
140 | sub \$1,$len | ||
141 | jnz .Lcloop1 | ||
142 | jmp .Lexit | ||
143 | .size RC4,.-RC4 | ||
144 | ___ | ||
145 | |||
146 | $code =~ s/#([bwd])/$1/gm; | ||
147 | |||
148 | $code =~ s/repret/.byte\t0xF3,0xC3/gm; | ||
149 | |||
150 | print $code; | ||
diff --git a/src/lib/libcrypto/rc4/rc4.h b/src/lib/libcrypto/rc4/rc4.h deleted file mode 100644 index ae0cea75b8..0000000000 --- a/src/lib/libcrypto/rc4/rc4.h +++ /dev/null | |||
@@ -1,91 +0,0 @@ | |||
1 | /* crypto/rc4/rc4.h */ | ||
2 | /* Copyright (C) 1995-1997 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 | #ifndef HEADER_RC4_H | ||
60 | #define HEADER_RC4_H | ||
61 | |||
62 | #ifdef OPENSSL_NO_RC4 | ||
63 | #error RC4 is disabled. | ||
64 | #endif | ||
65 | |||
66 | #include <openssl/opensslconf.h> /* RC4_INT */ | ||
67 | |||
68 | #ifdef __cplusplus | ||
69 | extern "C" { | ||
70 | #endif | ||
71 | |||
72 | typedef struct rc4_key_st | ||
73 | { | ||
74 | RC4_INT x,y; | ||
75 | RC4_INT data[256]; | ||
76 | } RC4_KEY; | ||
77 | |||
78 | |||
79 | const char *RC4_options(void); | ||
80 | #ifdef OPENSSL_FIPS | ||
81 | void private_RC4_set_key(RC4_KEY *key, int len, const unsigned char *data); | ||
82 | #endif | ||
83 | void RC4_set_key(RC4_KEY *key, int len, const unsigned char *data); | ||
84 | void RC4(RC4_KEY *key, unsigned long len, const unsigned char *indata, | ||
85 | unsigned char *outdata); | ||
86 | |||
87 | #ifdef __cplusplus | ||
88 | } | ||
89 | #endif | ||
90 | |||
91 | #endif | ||
diff --git a/src/lib/libcrypto/rc4/rc4_enc.c b/src/lib/libcrypto/rc4/rc4_enc.c deleted file mode 100644 index d5f18a3a70..0000000000 --- a/src/lib/libcrypto/rc4/rc4_enc.c +++ /dev/null | |||
@@ -1,315 +0,0 @@ | |||
1 | /* crypto/rc4/rc4_enc.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 <openssl/rc4.h> | ||
60 | #include "rc4_locl.h" | ||
61 | |||
62 | /* RC4 as implemented from a posting from | ||
63 | * Newsgroups: sci.crypt | ||
64 | * From: sterndark@netcom.com (David Sterndark) | ||
65 | * Subject: RC4 Algorithm revealed. | ||
66 | * Message-ID: <sternCvKL4B.Hyy@netcom.com> | ||
67 | * Date: Wed, 14 Sep 1994 06:35:31 GMT | ||
68 | */ | ||
69 | |||
70 | void RC4(RC4_KEY *key, unsigned long len, const unsigned char *indata, | ||
71 | unsigned char *outdata) | ||
72 | { | ||
73 | register RC4_INT *d; | ||
74 | register RC4_INT x,y,tx,ty; | ||
75 | int i; | ||
76 | |||
77 | x=key->x; | ||
78 | y=key->y; | ||
79 | d=key->data; | ||
80 | |||
81 | #if defined(RC4_CHUNK) | ||
82 | /* | ||
83 | * The original reason for implementing this(*) was the fact that | ||
84 | * pre-21164a Alpha CPUs don't have byte load/store instructions | ||
85 | * and e.g. a byte store has to be done with 64-bit load, shift, | ||
86 | * and, or and finally 64-bit store. Peaking data and operating | ||
87 | * at natural word size made it possible to reduce amount of | ||
88 | * instructions as well as to perform early read-ahead without | ||
89 | * suffering from RAW (read-after-write) hazard. This resulted | ||
90 | * in ~40%(**) performance improvement on 21064 box with gcc. | ||
91 | * But it's not only Alpha users who win here:-) Thanks to the | ||
92 | * early-n-wide read-ahead this implementation also exhibits | ||
93 | * >40% speed-up on SPARC and 20-30% on 64-bit MIPS (depending | ||
94 | * on sizeof(RC4_INT)). | ||
95 | * | ||
96 | * (*) "this" means code which recognizes the case when input | ||
97 | * and output pointers appear to be aligned at natural CPU | ||
98 | * word boundary | ||
99 | * (**) i.e. according to 'apps/openssl speed rc4' benchmark, | ||
100 | * crypto/rc4/rc4speed.c exhibits almost 70% speed-up... | ||
101 | * | ||
102 | * Cavets. | ||
103 | * | ||
104 | * - RC4_CHUNK="unsigned long long" should be a #1 choice for | ||
105 | * UltraSPARC. Unfortunately gcc generates very slow code | ||
106 | * (2.5-3 times slower than one generated by Sun's WorkShop | ||
107 | * C) and therefore gcc (at least 2.95 and earlier) should | ||
108 | * always be told that RC4_CHUNK="unsigned long". | ||
109 | * | ||
110 | * <appro@fy.chalmers.se> | ||
111 | */ | ||
112 | |||
113 | # define RC4_STEP ( \ | ||
114 | x=(x+1) &0xff, \ | ||
115 | tx=d[x], \ | ||
116 | y=(tx+y)&0xff, \ | ||
117 | ty=d[y], \ | ||
118 | d[y]=tx, \ | ||
119 | d[x]=ty, \ | ||
120 | (RC4_CHUNK)d[(tx+ty)&0xff]\ | ||
121 | ) | ||
122 | |||
123 | if ( ( ((unsigned long)indata & (sizeof(RC4_CHUNK)-1)) | | ||
124 | ((unsigned long)outdata & (sizeof(RC4_CHUNK)-1)) ) == 0 ) | ||
125 | { | ||
126 | RC4_CHUNK ichunk,otp; | ||
127 | const union { long one; char little; } is_endian = {1}; | ||
128 | |||
129 | /* | ||
130 | * I reckon we can afford to implement both endian | ||
131 | * cases and to decide which way to take at run-time | ||
132 | * because the machine code appears to be very compact | ||
133 | * and redundant 1-2KB is perfectly tolerable (i.e. | ||
134 | * in case the compiler fails to eliminate it:-). By | ||
135 | * suggestion from Terrel Larson <terr@terralogic.net> | ||
136 | * who also stands for the is_endian union:-) | ||
137 | * | ||
138 | * Special notes. | ||
139 | * | ||
140 | * - is_endian is declared automatic as doing otherwise | ||
141 | * (declaring static) prevents gcc from eliminating | ||
142 | * the redundant code; | ||
143 | * - compilers (those I've tried) don't seem to have | ||
144 | * problems eliminating either the operators guarded | ||
145 | * by "if (sizeof(RC4_CHUNK)==8)" or the condition | ||
146 | * expressions themselves so I've got 'em to replace | ||
147 | * corresponding #ifdefs from the previous version; | ||
148 | * - I chose to let the redundant switch cases when | ||
149 | * sizeof(RC4_CHUNK)!=8 be (were also #ifdefed | ||
150 | * before); | ||
151 | * - in case you wonder "&(sizeof(RC4_CHUNK)*8-1)" in | ||
152 | * [LB]ESHFT guards against "shift is out of range" | ||
153 | * warnings when sizeof(RC4_CHUNK)!=8 | ||
154 | * | ||
155 | * <appro@fy.chalmers.se> | ||
156 | */ | ||
157 | if (!is_endian.little) | ||
158 | { /* BIG-ENDIAN CASE */ | ||
159 | # define BESHFT(c) (((sizeof(RC4_CHUNK)-(c)-1)*8)&(sizeof(RC4_CHUNK)*8-1)) | ||
160 | for (;len&-sizeof(RC4_CHUNK);len-=sizeof(RC4_CHUNK)) | ||
161 | { | ||
162 | ichunk = *(RC4_CHUNK *)indata; | ||
163 | otp = RC4_STEP<<BESHFT(0); | ||
164 | otp |= RC4_STEP<<BESHFT(1); | ||
165 | otp |= RC4_STEP<<BESHFT(2); | ||
166 | otp |= RC4_STEP<<BESHFT(3); | ||
167 | if (sizeof(RC4_CHUNK)==8) | ||
168 | { | ||
169 | otp |= RC4_STEP<<BESHFT(4); | ||
170 | otp |= RC4_STEP<<BESHFT(5); | ||
171 | otp |= RC4_STEP<<BESHFT(6); | ||
172 | otp |= RC4_STEP<<BESHFT(7); | ||
173 | } | ||
174 | *(RC4_CHUNK *)outdata = otp^ichunk; | ||
175 | indata += sizeof(RC4_CHUNK); | ||
176 | outdata += sizeof(RC4_CHUNK); | ||
177 | } | ||
178 | if (len) | ||
179 | { | ||
180 | RC4_CHUNK mask=(RC4_CHUNK)-1, ochunk; | ||
181 | |||
182 | ichunk = *(RC4_CHUNK *)indata; | ||
183 | ochunk = *(RC4_CHUNK *)outdata; | ||
184 | otp = 0; | ||
185 | i = BESHFT(0); | ||
186 | mask <<= (sizeof(RC4_CHUNK)-len)<<3; | ||
187 | switch (len&(sizeof(RC4_CHUNK)-1)) | ||
188 | { | ||
189 | case 7: otp = RC4_STEP<<i, i-=8; | ||
190 | case 6: otp |= RC4_STEP<<i, i-=8; | ||
191 | case 5: otp |= RC4_STEP<<i, i-=8; | ||
192 | case 4: otp |= RC4_STEP<<i, i-=8; | ||
193 | case 3: otp |= RC4_STEP<<i, i-=8; | ||
194 | case 2: otp |= RC4_STEP<<i, i-=8; | ||
195 | case 1: otp |= RC4_STEP<<i, i-=8; | ||
196 | case 0: ; /* | ||
197 | * it's never the case, | ||
198 | * but it has to be here | ||
199 | * for ultrix? | ||
200 | */ | ||
201 | } | ||
202 | ochunk &= ~mask; | ||
203 | ochunk |= (otp^ichunk) & mask; | ||
204 | *(RC4_CHUNK *)outdata = ochunk; | ||
205 | } | ||
206 | key->x=x; | ||
207 | key->y=y; | ||
208 | return; | ||
209 | } | ||
210 | else | ||
211 | { /* LITTLE-ENDIAN CASE */ | ||
212 | # define LESHFT(c) (((c)*8)&(sizeof(RC4_CHUNK)*8-1)) | ||
213 | for (;len&-sizeof(RC4_CHUNK);len-=sizeof(RC4_CHUNK)) | ||
214 | { | ||
215 | ichunk = *(RC4_CHUNK *)indata; | ||
216 | otp = RC4_STEP; | ||
217 | otp |= RC4_STEP<<8; | ||
218 | otp |= RC4_STEP<<16; | ||
219 | otp |= RC4_STEP<<24; | ||
220 | if (sizeof(RC4_CHUNK)==8) | ||
221 | { | ||
222 | otp |= RC4_STEP<<LESHFT(4); | ||
223 | otp |= RC4_STEP<<LESHFT(5); | ||
224 | otp |= RC4_STEP<<LESHFT(6); | ||
225 | otp |= RC4_STEP<<LESHFT(7); | ||
226 | } | ||
227 | *(RC4_CHUNK *)outdata = otp^ichunk; | ||
228 | indata += sizeof(RC4_CHUNK); | ||
229 | outdata += sizeof(RC4_CHUNK); | ||
230 | } | ||
231 | if (len) | ||
232 | { | ||
233 | RC4_CHUNK mask=(RC4_CHUNK)-1, ochunk; | ||
234 | |||
235 | ichunk = *(RC4_CHUNK *)indata; | ||
236 | ochunk = *(RC4_CHUNK *)outdata; | ||
237 | otp = 0; | ||
238 | i = 0; | ||
239 | mask >>= (sizeof(RC4_CHUNK)-len)<<3; | ||
240 | switch (len&(sizeof(RC4_CHUNK)-1)) | ||
241 | { | ||
242 | case 7: otp = RC4_STEP, i+=8; | ||
243 | case 6: otp |= RC4_STEP<<i, i+=8; | ||
244 | case 5: otp |= RC4_STEP<<i, i+=8; | ||
245 | case 4: otp |= RC4_STEP<<i, i+=8; | ||
246 | case 3: otp |= RC4_STEP<<i, i+=8; | ||
247 | case 2: otp |= RC4_STEP<<i, i+=8; | ||
248 | case 1: otp |= RC4_STEP<<i, i+=8; | ||
249 | case 0: ; /* | ||
250 | * it's never the case, | ||
251 | * but it has to be here | ||
252 | * for ultrix? | ||
253 | */ | ||
254 | } | ||
255 | ochunk &= ~mask; | ||
256 | ochunk |= (otp^ichunk) & mask; | ||
257 | *(RC4_CHUNK *)outdata = ochunk; | ||
258 | } | ||
259 | key->x=x; | ||
260 | key->y=y; | ||
261 | return; | ||
262 | } | ||
263 | } | ||
264 | #endif | ||
265 | #define LOOP(in,out) \ | ||
266 | x=((x+1)&0xff); \ | ||
267 | tx=d[x]; \ | ||
268 | y=(tx+y)&0xff; \ | ||
269 | d[x]=ty=d[y]; \ | ||
270 | d[y]=tx; \ | ||
271 | (out) = d[(tx+ty)&0xff]^ (in); | ||
272 | |||
273 | #ifndef RC4_INDEX | ||
274 | #define RC4_LOOP(a,b,i) LOOP(*((a)++),*((b)++)) | ||
275 | #else | ||
276 | #define RC4_LOOP(a,b,i) LOOP(a[i],b[i]) | ||
277 | #endif | ||
278 | |||
279 | i=(int)(len>>3L); | ||
280 | if (i) | ||
281 | { | ||
282 | for (;;) | ||
283 | { | ||
284 | RC4_LOOP(indata,outdata,0); | ||
285 | RC4_LOOP(indata,outdata,1); | ||
286 | RC4_LOOP(indata,outdata,2); | ||
287 | RC4_LOOP(indata,outdata,3); | ||
288 | RC4_LOOP(indata,outdata,4); | ||
289 | RC4_LOOP(indata,outdata,5); | ||
290 | RC4_LOOP(indata,outdata,6); | ||
291 | RC4_LOOP(indata,outdata,7); | ||
292 | #ifdef RC4_INDEX | ||
293 | indata+=8; | ||
294 | outdata+=8; | ||
295 | #endif | ||
296 | if (--i == 0) break; | ||
297 | } | ||
298 | } | ||
299 | i=(int)len&0x07; | ||
300 | if (i) | ||
301 | { | ||
302 | for (;;) | ||
303 | { | ||
304 | RC4_LOOP(indata,outdata,0); if (--i == 0) break; | ||
305 | RC4_LOOP(indata,outdata,1); if (--i == 0) break; | ||
306 | RC4_LOOP(indata,outdata,2); if (--i == 0) break; | ||
307 | RC4_LOOP(indata,outdata,3); if (--i == 0) break; | ||
308 | RC4_LOOP(indata,outdata,4); if (--i == 0) break; | ||
309 | RC4_LOOP(indata,outdata,5); if (--i == 0) break; | ||
310 | RC4_LOOP(indata,outdata,6); if (--i == 0) break; | ||
311 | } | ||
312 | } | ||
313 | key->x=x; | ||
314 | key->y=y; | ||
315 | } | ||
diff --git a/src/lib/libcrypto/rc4/rc4_locl.h b/src/lib/libcrypto/rc4/rc4_locl.h deleted file mode 100644 index c712e1632e..0000000000 --- a/src/lib/libcrypto/rc4/rc4_locl.h +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | #ifndef HEADER_RC4_LOCL_H | ||
2 | #define HEADER_RC4_LOCL_H | ||
3 | #include <openssl/opensslconf.h> | ||
4 | #include <cryptlib.h> | ||
5 | #endif | ||
diff --git a/src/lib/libcrypto/rc4/rc4_skey.c b/src/lib/libcrypto/rc4/rc4_skey.c deleted file mode 100644 index 60510624fd..0000000000 --- a/src/lib/libcrypto/rc4/rc4_skey.c +++ /dev/null | |||
@@ -1,120 +0,0 @@ | |||
1 | /* crypto/rc4/rc4_skey.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 <openssl/rc4.h> | ||
60 | #include <openssl/crypto.h> | ||
61 | #include <openssl/fips.h> | ||
62 | #include "rc4_locl.h" | ||
63 | #include <openssl/opensslv.h> | ||
64 | |||
65 | const char *RC4_version="RC4" OPENSSL_VERSION_PTEXT; | ||
66 | |||
67 | const char *RC4_options(void) | ||
68 | { | ||
69 | #ifdef RC4_INDEX | ||
70 | if (sizeof(RC4_INT) == 1) | ||
71 | return("rc4(idx,char)"); | ||
72 | else | ||
73 | return("rc4(idx,int)"); | ||
74 | #else | ||
75 | if (sizeof(RC4_INT) == 1) | ||
76 | return("rc4(ptr,char)"); | ||
77 | else | ||
78 | return("rc4(ptr,int)"); | ||
79 | #endif | ||
80 | } | ||
81 | |||
82 | /* RC4 as implemented from a posting from | ||
83 | * Newsgroups: sci.crypt | ||
84 | * From: sterndark@netcom.com (David Sterndark) | ||
85 | * Subject: RC4 Algorithm revealed. | ||
86 | * Message-ID: <sternCvKL4B.Hyy@netcom.com> | ||
87 | * Date: Wed, 14 Sep 1994 06:35:31 GMT | ||
88 | */ | ||
89 | |||
90 | FIPS_NON_FIPS_VCIPHER_Init(RC4) | ||
91 | { | ||
92 | register RC4_INT tmp; | ||
93 | register int id1,id2; | ||
94 | register RC4_INT *d; | ||
95 | unsigned int i; | ||
96 | |||
97 | d= &(key->data[0]); | ||
98 | |||
99 | for (i=0; i<256; i++) | ||
100 | d[i]=i; | ||
101 | key->x = 0; | ||
102 | key->y = 0; | ||
103 | id1=id2=0; | ||
104 | |||
105 | #define SK_LOOP(n) { \ | ||
106 | tmp=d[(n)]; \ | ||
107 | id2 = (data[id1] + tmp + id2) & 0xff; \ | ||
108 | if (++id1 == len) id1=0; \ | ||
109 | d[(n)]=d[id2]; \ | ||
110 | d[id2]=tmp; } | ||
111 | |||
112 | for (i=0; i < 256; i+=4) | ||
113 | { | ||
114 | SK_LOOP(i+0); | ||
115 | SK_LOOP(i+1); | ||
116 | SK_LOOP(i+2); | ||
117 | SK_LOOP(i+3); | ||
118 | } | ||
119 | } | ||
120 | |||