diff options
author | miod <> | 2014-04-22 20:31:38 +0000 |
---|---|---|
committer | miod <> | 2014-04-22 20:31:38 +0000 |
commit | 1c26126a31b9d310c9fb3e33570fcbbe14676b11 (patch) | |
tree | 4598ce10bcfadfefbee541f6f4d2d7f25b1762a7 /src/lib/libcrypto/des | |
parent | d9e10f75814922e77d3c507d0bed87de0e2095c6 (diff) | |
download | openbsd-1c26126a31b9d310c9fb3e33570fcbbe14676b11.tar.gz openbsd-1c26126a31b9d310c9fb3e33570fcbbe14676b11.tar.bz2 openbsd-1c26126a31b9d310c9fb3e33570fcbbe14676b11.zip |
Remove meat which either duplicates code found in apps/, or is only of value
for 20th century historians, and can be put in the Attic.
Diffstat (limited to 'src/lib/libcrypto/des')
-rw-r--r-- | src/lib/libcrypto/des/FILES0 | 44 | ||||
-rw-r--r-- | src/lib/libcrypto/des/README | 54 | ||||
-rw-r--r-- | src/lib/libcrypto/des/VERSION | 412 | ||||
-rw-r--r-- | src/lib/libcrypto/des/des_opts.c | 608 | ||||
-rw-r--r-- | src/lib/libcrypto/des/options.txt | 39 |
5 files changed, 0 insertions, 1157 deletions
diff --git a/src/lib/libcrypto/des/FILES0 b/src/lib/libcrypto/des/FILES0 deleted file mode 100644 index 2e8211ad2a..0000000000 --- a/src/lib/libcrypto/des/FILES0 +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | /* General stuff */ | ||
2 | COPYRIGHT - Copyright info. | ||
3 | FILES - This file. | ||
4 | README - What this package is. | ||
5 | VERSION - Which version this is and what was changed. | ||
6 | |||
7 | /* libdes.a source code */ | ||
8 | des.h - Public libdes.a header file. | ||
9 | ecb_enc.c - des_ecb_encrypt() source, this contains the basic DES code. | ||
10 | ecb3_enc.c - des_ecb3_encrypt() source. | ||
11 | cbc_ckm.c - des_cbc_cksum() source. | ||
12 | cbc_enc.c - des_cbc_encrypt() source. | ||
13 | ncbc_enc.c - des_cbc_encrypt() that is 'normal' in that it copies | ||
14 | the new iv values back in the passed iv vector. | ||
15 | ede_enc.c - des_ede3_cbc_encrypt() cbc mode des using triple DES. | ||
16 | cbc3_enc.c - des_3cbc_encrypt() source, don't use this function. | ||
17 | cfb_enc.c - des_cfb_encrypt() source. | ||
18 | cfb64enc.c - des_cfb64_encrypt() cfb in 64 bit mode but setup to be | ||
19 | used as a stream cipher. | ||
20 | cfb64ede.c - des_ede3_cfb64_encrypt() cfb in 64 bit mode but setup to be | ||
21 | used as a stream cipher and using triple DES. | ||
22 | ofb_enc.c - des_cfb_encrypt() source. | ||
23 | ofb64_enc.c - des_ofb_encrypt() ofb in 64 bit mode but setup to be | ||
24 | used as a stream cipher. | ||
25 | ofb64ede.c - des_ede3_ofb64_encrypt() ofb in 64 bit mode but setup to be | ||
26 | used as a stream cipher and using triple DES. | ||
27 | enc_read.c - des_enc_read() source. | ||
28 | enc_writ.c - des_enc_write() source. | ||
29 | pcbc_enc.c - des_pcbc_encrypt() source. | ||
30 | qud_cksm.c - quad_cksum() source. | ||
31 | rand_key.c - des_random_key() source. | ||
32 | read_pwd.c - Source for des_read_password() plus related functions. | ||
33 | set_key.c - Source for des_set_key(). | ||
34 | str2key.c - Covert a string of any length into a key. | ||
35 | fcrypt.c - A small, fast version of crypt(3). | ||
36 | des_locl.h - Internal libdes.a header file. | ||
37 | podd.h - Odd parity tables - used in des_set_key(). | ||
38 | sk.h - Lookup tables used in des_set_key(). | ||
39 | spr.h - What is left of the S tables - used in ecb_encrypt(). | ||
40 | des_ver.h - header file for the external definition of the | ||
41 | version string. | ||
42 | des.doc - SSLeay documentation for the library. | ||
43 | |||
44 | |||
diff --git a/src/lib/libcrypto/des/README b/src/lib/libcrypto/des/README deleted file mode 100644 index 621a5ab467..0000000000 --- a/src/lib/libcrypto/des/README +++ /dev/null | |||
@@ -1,54 +0,0 @@ | |||
1 | |||
2 | libdes, Version 4.01 10-Jan-97 | ||
3 | |||
4 | Copyright (c) 1997, Eric Young | ||
5 | All rights reserved. | ||
6 | |||
7 | This program is free software; you can redistribute it and/or modify | ||
8 | it under the terms specified in COPYRIGHT. | ||
9 | |||
10 | -- | ||
11 | The primary ftp site for this library is | ||
12 | ftp://ftp.psy.uq.oz.au/pub/Crypto/DES/libdes-x.xx.tar.gz | ||
13 | libdes is now also shipped with SSLeay. Primary ftp site of | ||
14 | ftp://ftp.psy.uq.oz.au/pub/Crypto/SSL/SSLeay-x.x.x.tar.gz | ||
15 | |||
16 | The best way to build this library is to build it as part of SSLeay. | ||
17 | |||
18 | This kit builds a DES encryption library and a DES encryption program. | ||
19 | It supports ecb, cbc, ofb, cfb, triple ecb, triple cbc, triple ofb, | ||
20 | triple cfb, desx, and MIT's pcbc encryption modes and also has a fast | ||
21 | implementation of crypt(3). | ||
22 | It contains support routines to read keys from a terminal, | ||
23 | generate a random key, generate a key from an arbitrary length string, | ||
24 | read/write encrypted data from/to a file descriptor. | ||
25 | |||
26 | The implementation was written so as to conform with the manual entry | ||
27 | for the des_crypt(3) library routines from MIT's project Athena. | ||
28 | |||
29 | destest should be run after compilation to test the des routines. | ||
30 | rpw should be run after compilation to test the read password routines. | ||
31 | The des program is a replacement for the sun des command. I believe it | ||
32 | conforms to the sun version. | ||
33 | |||
34 | The Imakefile is setup for use in the kerberos distribution. | ||
35 | |||
36 | These routines are best compiled with gcc or any other good | ||
37 | optimising compiler. | ||
38 | Just turn you optimiser up to the highest settings and run destest | ||
39 | after the build to make sure everything works. | ||
40 | |||
41 | I believe these routines are close to the fastest and most portable DES | ||
42 | routines that use small lookup tables (4.5k) that are publicly available. | ||
43 | The fcrypt routine is faster than ufc's fcrypt (when compiling with | ||
44 | gcc2 -O2) on the sparc 2 (1410 vs 1270) but is not so good on other machines | ||
45 | (on a sun3/260 168 vs 336). It is a function of CPU on chip cache size. | ||
46 | [ 10-Jan-97 and a function of an incorrect speed testing program in | ||
47 | ufc which gave much better test figures that reality ]. | ||
48 | |||
49 | It is worth noting that on sparc and Alpha CPUs, performance of the DES | ||
50 | library can vary by upto %10 due to the positioning of files after application | ||
51 | linkage. | ||
52 | |||
53 | Eric Young (eay@cryptsoft.com) | ||
54 | |||
diff --git a/src/lib/libcrypto/des/VERSION b/src/lib/libcrypto/des/VERSION deleted file mode 100644 index c7d01542bc..0000000000 --- a/src/lib/libcrypto/des/VERSION +++ /dev/null | |||
@@ -1,412 +0,0 @@ | |||
1 | Fixed the weak key values which were wrong :-( | ||
2 | Defining SIGACTION causes sigaction() to be used instead of signal(). | ||
3 | SIGUSR1/SIGUSR2 are no longer mapped in the read tty stuff because it | ||
4 | can cause problems. This should hopefully not affect normal | ||
5 | applications. | ||
6 | |||
7 | Version 4.04 | ||
8 | Fixed a few tests in destest. Also added x86 assember for | ||
9 | des_ncbc_encrypt() which is the standard cbc mode function. | ||
10 | This makes a very very large performace difference. | ||
11 | Ariel Glenn ariel@columbia.edu reports that the terminal | ||
12 | 'turn echo off' can return (errno == EINVAL) under solaris | ||
13 | when redirection is used. So I now catch that as well as ENOTTY. | ||
14 | |||
15 | |||
16 | Version 4.03 | ||
17 | Left a static out of enc_write.c, which caused to buffer to be | ||
18 | continiously malloc()ed. Does anyone use these functions? I keep | ||
19 | on feeling like removing them since I only had these in there | ||
20 | for a version of kerberised login. Anyway, this was pointed out | ||
21 | by Theo de Raadt <deraadt@cvs.openbsd.org> | ||
22 | The 'n' bit ofb code was wrong, it was not shifting the shift | ||
23 | register. It worked correctly for n == 64. Thanks to | ||
24 | Gigi Ankeny <Gigi.Ankeny@Eng.Sun.COM> for pointing this one out. | ||
25 | |||
26 | Version 4.02 | ||
27 | I was doing 'if (memcmp(weak_keys[i],key,sizeof(key)) == 0)' | ||
28 | when checking for weak keys which is wrong :-(, pointed out by | ||
29 | Markus F.X.J. Oberhumer <markus.oberhumer@jk.uni-linz.ac.at>. | ||
30 | |||
31 | Version 4.01 | ||
32 | Even faster inner loop in the DES assembler for x86 and a modification | ||
33 | for IP/FP which is faster on x86. Both of these changes are | ||
34 | from Svend Olaf Mikkelsen <svolaf@inet.uni-c.dk>. His | ||
35 | changes make the assembler run %40 faster on a pentium. This is just | ||
36 | a case of getting the instruction sequence 'just right'. | ||
37 | All credit to 'Svend' :-) | ||
38 | Quite a few special x86 'make' targets. | ||
39 | A libdes-l (lite) distribution. | ||
40 | |||
41 | Version 4.00 | ||
42 | After a bit of a pause, I'll up the major version number since this | ||
43 | is mostly a performace release. I've added x86 assembler and | ||
44 | added more options for performance. A %28 speedup for gcc | ||
45 | on a pentium and the assembler is a %50 speedup. | ||
46 | MIPS CPU's, sparc and Alpha are the main CPU's with speedups. | ||
47 | Run des_opts to work out which options should be used. | ||
48 | DES_RISC1/DES_RISC2 use alternative inner loops which use | ||
49 | more registers but should give speedups on any CPU that does | ||
50 | dual issue (pentium). DES_UNROLL unrolls the inner loop, | ||
51 | which costs in code size. | ||
52 | |||
53 | Version 3.26 | ||
54 | I've finally removed one of the shifts in D_ENCRYPT. This | ||
55 | meant I've changed the des_SPtrans table (spr.h), the set_key() | ||
56 | function and some things in des_enc.c. This has definitly | ||
57 | made things faster :-). I've known about this one for some | ||
58 | time but I've been too lazy to follow it up :-). | ||
59 | Noticed that in the D_ENCRYPT() macro, we can just do L^=(..)^(..)^.. | ||
60 | instead of L^=((..)|(..)|(..).. This should save a register at | ||
61 | least. | ||
62 | Assember for x86. The file to replace is des_enc.c, which is replaced | ||
63 | by one of the assembler files found in asm. Look at des/asm/readme | ||
64 | for more info. | ||
65 | |||
66 | /* Modification to fcrypt so it can be compiled to support | ||
67 | HPUX 10.x's long password format, define -DLONGCRYPT to use this. | ||
68 | Thanks to Jens Kupferschmidt <bt1cu@hpboot.rz.uni-leipzig.de>. */ | ||
69 | |||
70 | SIGWINCH case put in des_read_passwd() so the function does not | ||
71 | 'exit' if this function is recieved. | ||
72 | |||
73 | Version 3.25 17/07/96 | ||
74 | Modified read_pwd.c so that stdin can be read if not a tty. | ||
75 | Thanks to Jeff Barber <jeffb@issl.atl.hp.com> for the patches. | ||
76 | des_init_random_number_generator() shortened due to VMS linker | ||
77 | limits. | ||
78 | Added RSA's DESX cbc mode. It is a form of cbc encryption, with 2 | ||
79 | 8 byte quantites xored before and after encryption. | ||
80 | des_xcbc_encryption() - the name is funny to preserve the des_ | ||
81 | prefix on all functions. | ||
82 | |||
83 | Version 3.24 20/04/96 | ||
84 | The DES_PTR macro option checked and used by SSLeay configuration | ||
85 | |||
86 | Version 3.23 11/04/96 | ||
87 | Added DES_LONG. If defined to 'unsigned int' on the DEC Alpha, | ||
88 | it gives a %20 speedup :-) | ||
89 | Fixed the problem with des.pl under perl5. The patches were | ||
90 | sent by Ed Kubaitis (ejk@uiuc.edu). | ||
91 | if fcrypt.c, changed values to handle illegal salt values the way | ||
92 | normal crypt() implementations do. Some programs apparently use | ||
93 | them :-(. The patch was sent by Bjorn Gronvall <bg@sics.se> | ||
94 | |||
95 | Version 3.22 29/11/95 | ||
96 | Bug in des(1), an error with the uuencoding stuff when the | ||
97 | 'data' is small, thanks to Geoff Keating <keagchon@mehta.anu.edu.au> | ||
98 | for the patch. | ||
99 | |||
100 | Version 3.21 22/11/95 | ||
101 | After some emailing back and forth with | ||
102 | Colin Plumb <colin@nyx10.cs.du.edu>, I've tweaked a few things | ||
103 | and in a future version I will probably put in some of the | ||
104 | optimisation he suggested for use with the DES_USE_PTR option. | ||
105 | Extra routines from Mark Murray <mark@grondar.za> for use in | ||
106 | freeBSD. They mostly involve random number generation for use | ||
107 | with kerberos. They involve evil machine specific system calls | ||
108 | etc so I would normally suggest pushing this stuff into the | ||
109 | application and/or using RAND_seed()/RAND_bytes() if you are | ||
110 | using this DES library as part of SSLeay. | ||
111 | Redone the read_pw() function so that it is cleaner and | ||
112 | supports termios, thanks to Sameer Parekh <sameer@c2.org> | ||
113 | for the initial patches for this. | ||
114 | Renamed 3ecb_encrypt() to ecb3_encrypt(). This has been | ||
115 | done just to make things more consistent. | ||
116 | I have also now added triple DES versions of cfb and ofb. | ||
117 | |||
118 | Version 3.20 | ||
119 | Damn, Damn, Damn, as pointed out by Mike_Spreitzer.PARC@xerox.com, | ||
120 | my des_random_seed() function was only copying 4 bytes of the | ||
121 | passed seed into the init structure. It is now fixed to copy 8. | ||
122 | My own suggestion is to used something like MD5 :-) | ||
123 | |||
124 | Version 3.19 | ||
125 | While looking at my code one day, I though, why do I keep on | ||
126 | calling des_encrypt(in,out,ks,enc) when every function that | ||
127 | calls it has in and out the same. So I dropped the 'out' | ||
128 | parameter, people should not be using this function. | ||
129 | |||
130 | Version 3.18 30/08/95 | ||
131 | Fixed a few bit with the distribution and the filenames. | ||
132 | 3.17 had been munged via a move to DOS and back again. | ||
133 | NO CODE CHANGES | ||
134 | |||
135 | Version 3.17 14/07/95 | ||
136 | Fixed ede3 cbc which I had broken in 3.16. I have also | ||
137 | removed some unneeded variables in 7-8 of the routines. | ||
138 | |||
139 | Version 3.16 26/06/95 | ||
140 | Added des_encrypt2() which does not use IP/FP, used by triple | ||
141 | des routines. Tweaked things a bit elsewhere. %13 speedup on | ||
142 | sparc and %6 on a R4400 for ede3 cbc mode. | ||
143 | |||
144 | Version 3.15 06/06/95 | ||
145 | Added des_ncbc_encrypt(), it is des_cbc mode except that it is | ||
146 | 'normal' and copies the new iv value back over the top of the | ||
147 | passed parameter. | ||
148 | CHANGED des_ede3_cbc_encrypt() so that it too now overwrites | ||
149 | the iv. THIS WILL BREAK EXISTING CODE, but since this function | ||
150 | only new, I feel I can change it, not so with des_cbc_encrypt :-(. | ||
151 | I need to update the documentation. | ||
152 | |||
153 | Version 3.14 31/05/95 | ||
154 | New release upon the world, as part of my SSL implementation. | ||
155 | New copyright and usage stuff. Basically free for all to use | ||
156 | as long as you say it came from me :-) | ||
157 | |||
158 | Version 3.13 31/05/95 | ||
159 | A fix in speed.c, if HZ is not defined, I set it to 100.0 | ||
160 | which is reasonable for most unixes except SunOS 4.x. | ||
161 | I now have a #ifdef sun but timing for SunOS 4.x looked very | ||
162 | good :-(. At my last job where I used SunOS 4.x, it was | ||
163 | defined to be 60.0 (look at the old INSTALL documentation), at | ||
164 | the last release had it changed to 100.0 since I now work with | ||
165 | Solaris2 and SVR4 boxes. | ||
166 | Thanks to Rory Chisholm <rchishol@math.ethz.ch> for pointing this | ||
167 | one out. | ||
168 | |||
169 | Version 3.12 08/05/95 | ||
170 | As pointed out by The Crypt Keeper <tck@bend.UCSD.EDU>, | ||
171 | my D_ENCRYPT macro in crypt() had an un-necessary variable. | ||
172 | It has been removed. | ||
173 | |||
174 | Version 3.11 03/05/95 | ||
175 | Added des_ede3_cbc_encrypt() which is cbc mode des with 3 keys | ||
176 | and one iv. It is a standard and I needed it for my SSL code. | ||
177 | It makes more sense to use this for triple DES than | ||
178 | 3cbc_encrypt(). I have also added (or should I say tested :-) | ||
179 | cfb64_encrypt() which is cfb64 but it will encrypt a partial | ||
180 | number of bytes - 3 bytes in 3 bytes out. Again this is for | ||
181 | my SSL library, as a form of encryption to use with SSL | ||
182 | telnet. | ||
183 | |||
184 | Version 3.10 22/03/95 | ||
185 | Fixed a bug in 3cbc_encrypt() :-(. When making repeated calls | ||
186 | to cbc3_encrypt, the 2 iv values that were being returned to | ||
187 | be used in the next call were reversed :-(. | ||
188 | Many thanks to Bill Wade <wade@Stoner.COM> for pointing out | ||
189 | this error. | ||
190 | |||
191 | Version 3.09 01/02/95 | ||
192 | Fixed des_random_key to far more random, it was rather feeble | ||
193 | with regards to picking the initial seed. The problem was | ||
194 | pointed out by Olaf Kirch <okir@monad.swb.de>. | ||
195 | |||
196 | Version 3.08 14/12/94 | ||
197 | Added Makefile.PL so libdes can be built into perl5. | ||
198 | Changed des_locl.h so RAND is always defined. | ||
199 | |||
200 | Version 3.07 05/12/94 | ||
201 | Added GNUmake and stuff so the library can be build with | ||
202 | glibc. | ||
203 | |||
204 | Version 3.06 30/08/94 | ||
205 | Added rpc_enc.c which contains _des_crypt. This is for use in | ||
206 | secure_rpc v 4.0 | ||
207 | Finally fixed the cfb_enc problems. | ||
208 | Fixed a few parameter parsing bugs in des (-3 and -b), thanks | ||
209 | to Rob McMillan <R.McMillan@its.gu.edu.au> | ||
210 | |||
211 | Version 3.05 21/04/94 | ||
212 | for unsigned long l; gcc does not produce ((l>>34) == 0) | ||
213 | This causes bugs in cfb_enc. | ||
214 | Thanks to Hadmut Danisch <danisch@ira.uka.de> | ||
215 | |||
216 | Version 3.04 20/04/94 | ||
217 | Added a version number to des.c and libdes.a | ||
218 | |||
219 | Version 3.03 12/01/94 | ||
220 | Fixed a bug in non zero iv in 3cbc_enc. | ||
221 | |||
222 | Version 3.02 29/10/93 | ||
223 | I now work in a place where there are 6+ architectures and 14+ | ||
224 | OS versions :-). | ||
225 | Fixed TERMIO definition so the most sys V boxes will work :-) | ||
226 | |||
227 | Release upon comp.sources.misc | ||
228 | Version 3.01 08/10/93 | ||
229 | Added des_3cbc_encrypt() | ||
230 | |||
231 | Version 3.00 07/10/93 | ||
232 | Fixed up documentation. | ||
233 | quad_cksum definitely compatible with MIT's now. | ||
234 | |||
235 | Version 2.30 24/08/93 | ||
236 | Triple DES now defaults to triple cbc but can do triple ecb | ||
237 | with the -b flag. | ||
238 | Fixed some MSDOS uuen/uudecoding problems, thanks to | ||
239 | Added prototypes. | ||
240 | |||
241 | Version 2.22 29/06/93 | ||
242 | Fixed a bug in des_is_weak_key() which stopped it working :-( | ||
243 | thanks to engineering@MorningStar.Com. | ||
244 | |||
245 | Version 2.21 03/06/93 | ||
246 | des(1) with no arguments gives quite a bit of help. | ||
247 | Added -c (generate ckecksum) flag to des(1). | ||
248 | Added -3 (triple DES) flag to des(1). | ||
249 | Added cfb and ofb routines to the library. | ||
250 | |||
251 | Version 2.20 11/03/93 | ||
252 | Added -u (uuencode) flag to des(1). | ||
253 | I have been playing with byte order in quad_cksum to make it | ||
254 | compatible with MIT's version. All I can say is avid this | ||
255 | function if possible since MIT's output is endian dependent. | ||
256 | |||
257 | Version 2.12 14/10/92 | ||
258 | Added MSDOS specific macro in ecb_encrypt which gives a %70 | ||
259 | speed up when the code is compiled with turbo C. | ||
260 | |||
261 | Version 2.11 12/10/92 | ||
262 | Speedup in set_key (recoding of PC-1) | ||
263 | I now do it in 47 simple operations, down from 60. | ||
264 | Thanks to John Fletcher (john_fletcher@lccmail.ocf.llnl.gov) | ||
265 | for motivating me to look for a faster system :-) | ||
266 | The speedup is probably less that 1% but it is still 13 | ||
267 | instructions less :-). | ||
268 | |||
269 | Version 2.10 06/10/92 | ||
270 | The code now works on the 64bit ETA10 and CRAY without modifications or | ||
271 | #defines. I believe the code should work on any machine that | ||
272 | defines long, int or short to be 8 bytes long. | ||
273 | Thanks to Shabbir J. Safdar (shabby@mentor.cc.purdue.edu) | ||
274 | for helping me fix the code to run on 64bit machines (he had | ||
275 | access to an ETA10). | ||
276 | Thanks also to John Fletcher <john_fletcher@lccmail.ocf.llnl.gov> | ||
277 | for testing the routines on a CRAY. | ||
278 | read_password.c has been renamed to read_passwd.c | ||
279 | string_to_key.c has been renamed to string2key.c | ||
280 | |||
281 | Version 2.00 14/09/92 | ||
282 | Made mods so that the library should work on 64bit CPU's. | ||
283 | Removed all my uchar and ulong defs. To many different | ||
284 | versions of unix define them in their header files in too many | ||
285 | different combinations :-) | ||
286 | IRIX - Sillicon Graphics mods (mostly in read_password.c). | ||
287 | Thanks to Andrew Daviel (advax@erich.triumf.ca) | ||
288 | |||
289 | Version 1.99 26/08/92 | ||
290 | Fixed a bug or 2 in enc_read.c | ||
291 | Fixed a bug in enc_write.c | ||
292 | Fixed a pseudo bug in fcrypt.c (very obscure). | ||
293 | |||
294 | Version 1.98 31/07/92 | ||
295 | Support for the ETA10. This is a strange machine that defines | ||
296 | longs and ints as 8 bytes and shorts as 4 bytes. | ||
297 | Since I do evil things with long * that assume that they are 4 | ||
298 | bytes. Look in the Makefile for the option to compile for | ||
299 | this machine. quad_cksum appears to have problems but I | ||
300 | will don't have the time to fix it right now, and this is not | ||
301 | a function that uses DES and so will not effect the main uses | ||
302 | of the library. | ||
303 | |||
304 | Version 1.97 20/05/92 eay | ||
305 | Fixed the Imakefile and made some changes to des.h to fix some | ||
306 | problems when building this package with Kerberos v 4. | ||
307 | |||
308 | Version 1.96 18/05/92 eay | ||
309 | Fixed a small bug in string_to_key() where problems could | ||
310 | occur if des_check_key was set to true and the string | ||
311 | generated a weak key. | ||
312 | |||
313 | Patch2 posted to comp.sources.misc | ||
314 | Version 1.95 13/05/92 eay | ||
315 | Added an alternative version of the D_ENCRYPT macro in | ||
316 | ecb_encrypt and fcrypt. Depending on the compiler, one version or the | ||
317 | other will be faster. This was inspired by | ||
318 | Dana How <how@isl.stanford.edu>, and her pointers about doing the | ||
319 | *(ulong *)((uchar *)ptr+(value&0xfc)) | ||
320 | vs | ||
321 | ptr[value&0x3f] | ||
322 | to stop the C compiler doing a <<2 to convert the long array index. | ||
323 | |||
324 | Version 1.94 05/05/92 eay | ||
325 | Fixed an incompatibility between my string_to_key and the MIT | ||
326 | version. When the key is longer than 8 chars, I was wrapping | ||
327 | with a different method. To use the old version, define | ||
328 | OLD_STR_TO_KEY in the makefile. Thanks to | ||
329 | viktor@newsu.shearson.com (Viktor Dukhovni). | ||
330 | |||
331 | Version 1.93 28/04/92 eay | ||
332 | Fixed the VMS mods so that echo is now turned off in | ||
333 | read_password. Thanks again to brennan@coco.cchs.su.oz.AU. | ||
334 | MSDOS support added. The routines can be compiled with | ||
335 | Turbo C (v2.0) and MSC (v5.1). Make sure MSDOS is defined. | ||
336 | |||
337 | Patch1 posted to comp.sources.misc | ||
338 | Version 1.92 13/04/92 eay | ||
339 | Changed D_ENCRYPT so that the rotation of R occurs outside of | ||
340 | the loop. This required rotating all the longs in sp.h (now | ||
341 | called spr.h). Thanks to Richard Outerbridge <71755.204@CompuServe.COM> | ||
342 | speed.c has been changed so it will work without SIGALRM. If | ||
343 | times(3) is not present it will try to use ftime() instead. | ||
344 | |||
345 | Version 1.91 08/04/92 eay | ||
346 | Added -E/-D options to des(1) so it can use string_to_key. | ||
347 | Added SVR4 mods suggested by witr@rwwa.COM | ||
348 | Added VMS mods suggested by brennan@coco.cchs.su.oz.AU. If | ||
349 | anyone knows how to turn of tty echo in VMS please tell me or | ||
350 | implement it yourself :-). | ||
351 | Changed FILE *IN/*OUT to *DES_IN/*DES_OUT since it appears VMS | ||
352 | does not like IN/OUT being used. | ||
353 | |||
354 | Libdes posted to comp.sources.misc | ||
355 | Version 1.9 24/03/92 eay | ||
356 | Now contains a fast small crypt replacement. | ||
357 | Added des(1) command. | ||
358 | Added des_rw_mode so people can use cbc encryption with | ||
359 | enc_read and enc_write. | ||
360 | |||
361 | Version 1.8 15/10/91 eay | ||
362 | Bug in cbc_cksum. | ||
363 | Many thanks to Keith Reynolds (keithr@sco.COM) for pointing this | ||
364 | one out. | ||
365 | |||
366 | Version 1.7 24/09/91 eay | ||
367 | Fixed set_key :-) | ||
368 | set_key is 4 times faster and takes less space. | ||
369 | There are a few minor changes that could be made. | ||
370 | |||
371 | Version 1.6 19/09/1991 eay | ||
372 | Finally go IP and FP finished. | ||
373 | Now I need to fix set_key. | ||
374 | This version is quite a bit faster that 1.51 | ||
375 | |||
376 | Version 1.52 15/06/1991 eay | ||
377 | 20% speedup in ecb_encrypt by changing the E bit selection | ||
378 | to use 2 32bit words. This also required modification of the | ||
379 | sp table. There is still a way to speedup the IP and IP-1 | ||
380 | (hints from outer@sq.com) still working on this one :-(. | ||
381 | |||
382 | Version 1.51 07/06/1991 eay | ||
383 | Faster des_encrypt by loop unrolling | ||
384 | Fixed bug in quad_cksum.c (thanks to hughes@logos.ucs.indiana.edu) | ||
385 | |||
386 | Version 1.50 28/05/1991 eay | ||
387 | Optimised the code a bit more for the sparc. I have improved the | ||
388 | speed of the inner des_encrypt by speeding up the initial and | ||
389 | final permutations. | ||
390 | |||
391 | Version 1.40 23/10/1990 eay | ||
392 | Fixed des_random_key, it did not produce a random key :-( | ||
393 | |||
394 | Version 1.30 2/10/1990 eay | ||
395 | Have made des_quad_cksum the same as MIT's, the full package | ||
396 | should be compatible with MIT's | ||
397 | Have tested on a DECstation 3100 | ||
398 | Still need to fix des_set_key (make it faster). | ||
399 | Does des_cbc_encrypts at 70.5k/sec on a 3100. | ||
400 | |||
401 | Version 1.20 18/09/1990 eay | ||
402 | Fixed byte order dependencies. | ||
403 | Fixed (I hope) all the word alignment problems. | ||
404 | Speedup in des_ecb_encrypt. | ||
405 | |||
406 | Version 1.10 11/09/1990 eay | ||
407 | Added des_enc_read and des_enc_write. | ||
408 | Still need to fix des_quad_cksum. | ||
409 | Still need to document des_enc_read and des_enc_write. | ||
410 | |||
411 | Version 1.00 27/08/1990 eay | ||
412 | |||
diff --git a/src/lib/libcrypto/des/des_opts.c b/src/lib/libcrypto/des/des_opts.c deleted file mode 100644 index c713c5e319..0000000000 --- a/src/lib/libcrypto/des/des_opts.c +++ /dev/null | |||
@@ -1,608 +0,0 @@ | |||
1 | /* crypto/des/des_opts.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 | /* define PART1, PART2, PART3 or PART4 to build only with a few of the options. | ||
60 | * This is for machines with 64k code segment size restrictions. */ | ||
61 | |||
62 | #if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX) | ||
63 | #define TIMES | ||
64 | #endif | ||
65 | |||
66 | #include <stdio.h> | ||
67 | #ifndef OPENSSL_SYS_MSDOS | ||
68 | #include <openssl/e_os2.h> | ||
69 | #include <unistd.h> | ||
70 | #else | ||
71 | #include <io.h> | ||
72 | extern void exit(); | ||
73 | #endif | ||
74 | |||
75 | #ifndef OPENSSL_SYS_NETWARE | ||
76 | #include <signal.h> | ||
77 | #endif | ||
78 | |||
79 | #ifndef _IRIX | ||
80 | #include <time.h> | ||
81 | #endif | ||
82 | #ifdef TIMES | ||
83 | #include <sys/types.h> | ||
84 | #include <sys/times.h> | ||
85 | #endif | ||
86 | |||
87 | /* Depending on the VMS version, the tms structure is perhaps defined. | ||
88 | The __TMS macro will show if it was. If it wasn't defined, we should | ||
89 | undefine TIMES, since that tells the rest of the program how things | ||
90 | should be handled. -- Richard Levitte */ | ||
91 | #if defined(OPENSSL_SYS_VMS_DECC) && !defined(__TMS) | ||
92 | #undef TIMES | ||
93 | #endif | ||
94 | |||
95 | #ifndef TIMES | ||
96 | #include <sys/timeb.h> | ||
97 | #endif | ||
98 | |||
99 | |||
100 | #if defined(sun) || defined(__ultrix) | ||
101 | #define _POSIX_SOURCE | ||
102 | #include <limits.h> | ||
103 | #include <sys/param.h> | ||
104 | #endif | ||
105 | |||
106 | #include <openssl/des.h> | ||
107 | #include "spr.h" | ||
108 | |||
109 | #define DES_DEFAULT_OPTIONS | ||
110 | |||
111 | #if !defined(PART1) && !defined(PART2) && !defined(PART3) && !defined(PART4) | ||
112 | #define PART1 | ||
113 | #define PART2 | ||
114 | #define PART3 | ||
115 | #define PART4 | ||
116 | #endif | ||
117 | |||
118 | #ifdef PART1 | ||
119 | |||
120 | #undef DES_UNROLL | ||
121 | #undef DES_RISC1 | ||
122 | #undef DES_RISC2 | ||
123 | #undef DES_PTR | ||
124 | #undef D_ENCRYPT | ||
125 | #define DES_encrypt1 des_encrypt_u4_cisc_idx | ||
126 | #define DES_encrypt2 des_encrypt2_u4_cisc_idx | ||
127 | #define DES_encrypt3 des_encrypt3_u4_cisc_idx | ||
128 | #define DES_decrypt3 des_decrypt3_u4_cisc_idx | ||
129 | #undef HEADER_DES_LOCL_H | ||
130 | #include "des_enc.c" | ||
131 | |||
132 | #define DES_UNROLL | ||
133 | #undef DES_RISC1 | ||
134 | #undef DES_RISC2 | ||
135 | #undef DES_PTR | ||
136 | #undef D_ENCRYPT | ||
137 | #undef DES_encrypt1 | ||
138 | #undef DES_encrypt2 | ||
139 | #undef DES_encrypt3 | ||
140 | #undef DES_decrypt3 | ||
141 | #define DES_encrypt1 des_encrypt_u16_cisc_idx | ||
142 | #define DES_encrypt2 des_encrypt2_u16_cisc_idx | ||
143 | #define DES_encrypt3 des_encrypt3_u16_cisc_idx | ||
144 | #define DES_decrypt3 des_decrypt3_u16_cisc_idx | ||
145 | #undef HEADER_DES_LOCL_H | ||
146 | #include "des_enc.c" | ||
147 | |||
148 | #undef DES_UNROLL | ||
149 | #define DES_RISC1 | ||
150 | #undef DES_RISC2 | ||
151 | #undef DES_PTR | ||
152 | #undef D_ENCRYPT | ||
153 | #undef DES_encrypt1 | ||
154 | #undef DES_encrypt2 | ||
155 | #undef DES_encrypt3 | ||
156 | #undef DES_decrypt3 | ||
157 | #define DES_encrypt1 des_encrypt_u4_risc1_idx | ||
158 | #define DES_encrypt2 des_encrypt2_u4_risc1_idx | ||
159 | #define DES_encrypt3 des_encrypt3_u4_risc1_idx | ||
160 | #define DES_decrypt3 des_decrypt3_u4_risc1_idx | ||
161 | #undef HEADER_DES_LOCL_H | ||
162 | #include "des_enc.c" | ||
163 | |||
164 | #endif | ||
165 | |||
166 | #ifdef PART2 | ||
167 | |||
168 | #undef DES_UNROLL | ||
169 | #undef DES_RISC1 | ||
170 | #define DES_RISC2 | ||
171 | #undef DES_PTR | ||
172 | #undef D_ENCRYPT | ||
173 | #undef DES_encrypt1 | ||
174 | #undef DES_encrypt2 | ||
175 | #undef DES_encrypt3 | ||
176 | #undef DES_decrypt3 | ||
177 | #define DES_encrypt1 des_encrypt_u4_risc2_idx | ||
178 | #define DES_encrypt2 des_encrypt2_u4_risc2_idx | ||
179 | #define DES_encrypt3 des_encrypt3_u4_risc2_idx | ||
180 | #define DES_decrypt3 des_decrypt3_u4_risc2_idx | ||
181 | #undef HEADER_DES_LOCL_H | ||
182 | #include "des_enc.c" | ||
183 | |||
184 | #define DES_UNROLL | ||
185 | #define DES_RISC1 | ||
186 | #undef DES_RISC2 | ||
187 | #undef DES_PTR | ||
188 | #undef D_ENCRYPT | ||
189 | #undef DES_encrypt1 | ||
190 | #undef DES_encrypt2 | ||
191 | #undef DES_encrypt3 | ||
192 | #undef DES_decrypt3 | ||
193 | #define DES_encrypt1 des_encrypt_u16_risc1_idx | ||
194 | #define DES_encrypt2 des_encrypt2_u16_risc1_idx | ||
195 | #define DES_encrypt3 des_encrypt3_u16_risc1_idx | ||
196 | #define DES_decrypt3 des_decrypt3_u16_risc1_idx | ||
197 | #undef HEADER_DES_LOCL_H | ||
198 | #include "des_enc.c" | ||
199 | |||
200 | #define DES_UNROLL | ||
201 | #undef DES_RISC1 | ||
202 | #define DES_RISC2 | ||
203 | #undef DES_PTR | ||
204 | #undef D_ENCRYPT | ||
205 | #undef DES_encrypt1 | ||
206 | #undef DES_encrypt2 | ||
207 | #undef DES_encrypt3 | ||
208 | #undef DES_decrypt3 | ||
209 | #define DES_encrypt1 des_encrypt_u16_risc2_idx | ||
210 | #define DES_encrypt2 des_encrypt2_u16_risc2_idx | ||
211 | #define DES_encrypt3 des_encrypt3_u16_risc2_idx | ||
212 | #define DES_decrypt3 des_decrypt3_u16_risc2_idx | ||
213 | #undef HEADER_DES_LOCL_H | ||
214 | #include "des_enc.c" | ||
215 | |||
216 | #endif | ||
217 | |||
218 | #ifdef PART3 | ||
219 | |||
220 | #undef DES_UNROLL | ||
221 | #undef DES_RISC1 | ||
222 | #undef DES_RISC2 | ||
223 | #define DES_PTR | ||
224 | #undef D_ENCRYPT | ||
225 | #undef DES_encrypt1 | ||
226 | #undef DES_encrypt2 | ||
227 | #undef DES_encrypt3 | ||
228 | #undef DES_decrypt3 | ||
229 | #define DES_encrypt1 des_encrypt_u4_cisc_ptr | ||
230 | #define DES_encrypt2 des_encrypt2_u4_cisc_ptr | ||
231 | #define DES_encrypt3 des_encrypt3_u4_cisc_ptr | ||
232 | #define DES_decrypt3 des_decrypt3_u4_cisc_ptr | ||
233 | #undef HEADER_DES_LOCL_H | ||
234 | #include "des_enc.c" | ||
235 | |||
236 | #define DES_UNROLL | ||
237 | #undef DES_RISC1 | ||
238 | #undef DES_RISC2 | ||
239 | #define DES_PTR | ||
240 | #undef D_ENCRYPT | ||
241 | #undef DES_encrypt1 | ||
242 | #undef DES_encrypt2 | ||
243 | #undef DES_encrypt3 | ||
244 | #undef DES_decrypt3 | ||
245 | #define DES_encrypt1 des_encrypt_u16_cisc_ptr | ||
246 | #define DES_encrypt2 des_encrypt2_u16_cisc_ptr | ||
247 | #define DES_encrypt3 des_encrypt3_u16_cisc_ptr | ||
248 | #define DES_decrypt3 des_decrypt3_u16_cisc_ptr | ||
249 | #undef HEADER_DES_LOCL_H | ||
250 | #include "des_enc.c" | ||
251 | |||
252 | #undef DES_UNROLL | ||
253 | #define DES_RISC1 | ||
254 | #undef DES_RISC2 | ||
255 | #define DES_PTR | ||
256 | #undef D_ENCRYPT | ||
257 | #undef DES_encrypt1 | ||
258 | #undef DES_encrypt2 | ||
259 | #undef DES_encrypt3 | ||
260 | #undef DES_decrypt3 | ||
261 | #define DES_encrypt1 des_encrypt_u4_risc1_ptr | ||
262 | #define DES_encrypt2 des_encrypt2_u4_risc1_ptr | ||
263 | #define DES_encrypt3 des_encrypt3_u4_risc1_ptr | ||
264 | #define DES_decrypt3 des_decrypt3_u4_risc1_ptr | ||
265 | #undef HEADER_DES_LOCL_H | ||
266 | #include "des_enc.c" | ||
267 | |||
268 | #endif | ||
269 | |||
270 | #ifdef PART4 | ||
271 | |||
272 | #undef DES_UNROLL | ||
273 | #undef DES_RISC1 | ||
274 | #define DES_RISC2 | ||
275 | #define DES_PTR | ||
276 | #undef D_ENCRYPT | ||
277 | #undef DES_encrypt1 | ||
278 | #undef DES_encrypt2 | ||
279 | #undef DES_encrypt3 | ||
280 | #undef DES_decrypt3 | ||
281 | #define DES_encrypt1 des_encrypt_u4_risc2_ptr | ||
282 | #define DES_encrypt2 des_encrypt2_u4_risc2_ptr | ||
283 | #define DES_encrypt3 des_encrypt3_u4_risc2_ptr | ||
284 | #define DES_decrypt3 des_decrypt3_u4_risc2_ptr | ||
285 | #undef HEADER_DES_LOCL_H | ||
286 | #include "des_enc.c" | ||
287 | |||
288 | #define DES_UNROLL | ||
289 | #define DES_RISC1 | ||
290 | #undef DES_RISC2 | ||
291 | #define DES_PTR | ||
292 | #undef D_ENCRYPT | ||
293 | #undef DES_encrypt1 | ||
294 | #undef DES_encrypt2 | ||
295 | #undef DES_encrypt3 | ||
296 | #undef DES_decrypt3 | ||
297 | #define DES_encrypt1 des_encrypt_u16_risc1_ptr | ||
298 | #define DES_encrypt2 des_encrypt2_u16_risc1_ptr | ||
299 | #define DES_encrypt3 des_encrypt3_u16_risc1_ptr | ||
300 | #define DES_decrypt3 des_decrypt3_u16_risc1_ptr | ||
301 | #undef HEADER_DES_LOCL_H | ||
302 | #include "des_enc.c" | ||
303 | |||
304 | #define DES_UNROLL | ||
305 | #undef DES_RISC1 | ||
306 | #define DES_RISC2 | ||
307 | #define DES_PTR | ||
308 | #undef D_ENCRYPT | ||
309 | #undef DES_encrypt1 | ||
310 | #undef DES_encrypt2 | ||
311 | #undef DES_encrypt3 | ||
312 | #undef DES_decrypt3 | ||
313 | #define DES_encrypt1 des_encrypt_u16_risc2_ptr | ||
314 | #define DES_encrypt2 des_encrypt2_u16_risc2_ptr | ||
315 | #define DES_encrypt3 des_encrypt3_u16_risc2_ptr | ||
316 | #define DES_decrypt3 des_decrypt3_u16_risc2_ptr | ||
317 | #undef HEADER_DES_LOCL_H | ||
318 | #include "des_enc.c" | ||
319 | |||
320 | #endif | ||
321 | |||
322 | /* The following if from times(3) man page. It may need to be changed */ | ||
323 | #ifndef HZ | ||
324 | # ifndef CLK_TCK | ||
325 | # ifndef _BSD_CLK_TCK_ /* FreeBSD fix */ | ||
326 | # define HZ 100.0 | ||
327 | # else /* _BSD_CLK_TCK_ */ | ||
328 | # define HZ ((double)_BSD_CLK_TCK_) | ||
329 | # endif | ||
330 | # else /* CLK_TCK */ | ||
331 | # define HZ ((double)CLK_TCK) | ||
332 | # endif | ||
333 | #endif | ||
334 | |||
335 | #define BUFSIZE ((long)1024) | ||
336 | long run=0; | ||
337 | |||
338 | double Time_F(int s); | ||
339 | #ifdef SIGALRM | ||
340 | #if defined(__STDC__) || defined(sgi) | ||
341 | #define SIGRETTYPE void | ||
342 | #else | ||
343 | #define SIGRETTYPE int | ||
344 | #endif | ||
345 | |||
346 | SIGRETTYPE sig_done(int sig); | ||
347 | SIGRETTYPE sig_done(int sig) | ||
348 | { | ||
349 | signal(SIGALRM,sig_done); | ||
350 | run=0; | ||
351 | #ifdef LINT | ||
352 | sig=sig; | ||
353 | #endif | ||
354 | } | ||
355 | #endif | ||
356 | |||
357 | #define START 0 | ||
358 | #define STOP 1 | ||
359 | |||
360 | double Time_F(int s) | ||
361 | { | ||
362 | double ret; | ||
363 | #ifdef TIMES | ||
364 | static struct tms tstart,tend; | ||
365 | |||
366 | if (s == START) | ||
367 | { | ||
368 | times(&tstart); | ||
369 | return(0); | ||
370 | } | ||
371 | else | ||
372 | { | ||
373 | times(&tend); | ||
374 | ret=((double)(tend.tms_utime-tstart.tms_utime))/HZ; | ||
375 | return((ret == 0.0)?1e-6:ret); | ||
376 | } | ||
377 | #else /* !times() */ | ||
378 | static struct timeb tstart,tend; | ||
379 | long i; | ||
380 | |||
381 | if (s == START) | ||
382 | { | ||
383 | ftime(&tstart); | ||
384 | return(0); | ||
385 | } | ||
386 | else | ||
387 | { | ||
388 | ftime(&tend); | ||
389 | i=(long)tend.millitm-(long)tstart.millitm; | ||
390 | ret=((double)(tend.time-tstart.time))+((double)i)/1000.0; | ||
391 | return((ret == 0.0)?1e-6:ret); | ||
392 | } | ||
393 | #endif | ||
394 | } | ||
395 | |||
396 | #ifdef SIGALRM | ||
397 | #define print_name(name) fprintf(stderr,"Doing %s's for 10 seconds\n",name); alarm(10); | ||
398 | #else | ||
399 | #define print_name(name) fprintf(stderr,"Doing %s %ld times\n",name,cb); | ||
400 | #endif | ||
401 | |||
402 | #define time_it(func,name,index) \ | ||
403 | print_name(name); \ | ||
404 | Time_F(START); \ | ||
405 | for (count=0,run=1; COND(cb); count++) \ | ||
406 | { \ | ||
407 | unsigned long d[2]; \ | ||
408 | func(d,&sch,DES_ENCRYPT); \ | ||
409 | } \ | ||
410 | tm[index]=Time_F(STOP); \ | ||
411 | fprintf(stderr,"%ld %s's in %.2f second\n",count,name,tm[index]); \ | ||
412 | tm[index]=((double)COUNT(cb))/tm[index]; | ||
413 | |||
414 | #define print_it(name,index) \ | ||
415 | fprintf(stderr,"%s bytes per sec = %12.2f (%5.1fuS)\n",name, \ | ||
416 | tm[index]*8,1.0e6/tm[index]); | ||
417 | |||
418 | int main(int argc, char **argv) | ||
419 | { | ||
420 | long count; | ||
421 | static unsigned char buf[BUFSIZE]; | ||
422 | static DES_cblock key ={0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0}; | ||
423 | static DES_cblock key2={0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12}; | ||
424 | static DES_cblock key3={0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12,0x34}; | ||
425 | DES_key_schedule sch,sch2,sch3; | ||
426 | double d,tm[16],max=0; | ||
427 | int rank[16]; | ||
428 | char *str[16]; | ||
429 | int max_idx=0,i,num=0,j; | ||
430 | #ifndef SIGALARM | ||
431 | long ca,cb,cc,cd,ce; | ||
432 | #endif | ||
433 | |||
434 | for (i=0; i<12; i++) | ||
435 | { | ||
436 | tm[i]=0.0; | ||
437 | rank[i]=0; | ||
438 | } | ||
439 | |||
440 | #ifndef TIMES | ||
441 | fprintf(stderr,"To get the most accurate results, try to run this\n"); | ||
442 | fprintf(stderr,"program when this computer is idle.\n"); | ||
443 | #endif | ||
444 | |||
445 | DES_set_key_unchecked(&key,&sch); | ||
446 | DES_set_key_unchecked(&key2,&sch2); | ||
447 | DES_set_key_unchecked(&key3,&sch3); | ||
448 | |||
449 | #ifndef SIGALRM | ||
450 | fprintf(stderr,"First we calculate the approximate speed ...\n"); | ||
451 | DES_set_key_unchecked(&key,sch); | ||
452 | count=10; | ||
453 | do { | ||
454 | long i; | ||
455 | unsigned long data[2]; | ||
456 | |||
457 | count*=2; | ||
458 | Time_F(START); | ||
459 | for (i=count; i; i--) | ||
460 | DES_encrypt1(data,&(sch[0]),DES_ENCRYPT); | ||
461 | d=Time_F(STOP); | ||
462 | } while (d < 3.0); | ||
463 | ca=count; | ||
464 | cb=count*3; | ||
465 | cc=count*3*8/BUFSIZE+1; | ||
466 | cd=count*8/BUFSIZE+1; | ||
467 | |||
468 | ce=count/20+1; | ||
469 | #define COND(d) (count != (d)) | ||
470 | #define COUNT(d) (d) | ||
471 | #else | ||
472 | #define COND(c) (run) | ||
473 | #define COUNT(d) (count) | ||
474 | signal(SIGALRM,sig_done); | ||
475 | alarm(10); | ||
476 | #endif | ||
477 | |||
478 | #ifdef PART1 | ||
479 | time_it(des_encrypt_u4_cisc_idx, "des_encrypt_u4_cisc_idx ", 0); | ||
480 | time_it(des_encrypt_u16_cisc_idx, "des_encrypt_u16_cisc_idx ", 1); | ||
481 | time_it(des_encrypt_u4_risc1_idx, "des_encrypt_u4_risc1_idx ", 2); | ||
482 | num+=3; | ||
483 | #endif | ||
484 | #ifdef PART2 | ||
485 | time_it(des_encrypt_u16_risc1_idx,"des_encrypt_u16_risc1_idx", 3); | ||
486 | time_it(des_encrypt_u4_risc2_idx, "des_encrypt_u4_risc2_idx ", 4); | ||
487 | time_it(des_encrypt_u16_risc2_idx,"des_encrypt_u16_risc2_idx", 5); | ||
488 | num+=3; | ||
489 | #endif | ||
490 | #ifdef PART3 | ||
491 | time_it(des_encrypt_u4_cisc_ptr, "des_encrypt_u4_cisc_ptr ", 6); | ||
492 | time_it(des_encrypt_u16_cisc_ptr, "des_encrypt_u16_cisc_ptr ", 7); | ||
493 | time_it(des_encrypt_u4_risc1_ptr, "des_encrypt_u4_risc1_ptr ", 8); | ||
494 | num+=3; | ||
495 | #endif | ||
496 | #ifdef PART4 | ||
497 | time_it(des_encrypt_u16_risc1_ptr,"des_encrypt_u16_risc1_ptr", 9); | ||
498 | time_it(des_encrypt_u4_risc2_ptr, "des_encrypt_u4_risc2_ptr ",10); | ||
499 | time_it(des_encrypt_u16_risc2_ptr,"des_encrypt_u16_risc2_ptr",11); | ||
500 | num+=3; | ||
501 | #endif | ||
502 | |||
503 | #ifdef PART1 | ||
504 | str[0]=" 4 c i"; | ||
505 | print_it("des_encrypt_u4_cisc_idx ",0); | ||
506 | max=tm[0]; | ||
507 | max_idx=0; | ||
508 | str[1]="16 c i"; | ||
509 | print_it("des_encrypt_u16_cisc_idx ",1); | ||
510 | if (max < tm[1]) { max=tm[1]; max_idx=1; } | ||
511 | str[2]=" 4 r1 i"; | ||
512 | print_it("des_encrypt_u4_risc1_idx ",2); | ||
513 | if (max < tm[2]) { max=tm[2]; max_idx=2; } | ||
514 | #endif | ||
515 | #ifdef PART2 | ||
516 | str[3]="16 r1 i"; | ||
517 | print_it("des_encrypt_u16_risc1_idx",3); | ||
518 | if (max < tm[3]) { max=tm[3]; max_idx=3; } | ||
519 | str[4]=" 4 r2 i"; | ||
520 | print_it("des_encrypt_u4_risc2_idx ",4); | ||
521 | if (max < tm[4]) { max=tm[4]; max_idx=4; } | ||
522 | str[5]="16 r2 i"; | ||
523 | print_it("des_encrypt_u16_risc2_idx",5); | ||
524 | if (max < tm[5]) { max=tm[5]; max_idx=5; } | ||
525 | #endif | ||
526 | #ifdef PART3 | ||
527 | str[6]=" 4 c p"; | ||
528 | print_it("des_encrypt_u4_cisc_ptr ",6); | ||
529 | if (max < tm[6]) { max=tm[6]; max_idx=6; } | ||
530 | str[7]="16 c p"; | ||
531 | print_it("des_encrypt_u16_cisc_ptr ",7); | ||
532 | if (max < tm[7]) { max=tm[7]; max_idx=7; } | ||
533 | str[8]=" 4 r1 p"; | ||
534 | print_it("des_encrypt_u4_risc1_ptr ",8); | ||
535 | if (max < tm[8]) { max=tm[8]; max_idx=8; } | ||
536 | #endif | ||
537 | #ifdef PART4 | ||
538 | str[9]="16 r1 p"; | ||
539 | print_it("des_encrypt_u16_risc1_ptr",9); | ||
540 | if (max < tm[9]) { max=tm[9]; max_idx=9; } | ||
541 | str[10]=" 4 r2 p"; | ||
542 | print_it("des_encrypt_u4_risc2_ptr ",10); | ||
543 | if (max < tm[10]) { max=tm[10]; max_idx=10; } | ||
544 | str[11]="16 r2 p"; | ||
545 | print_it("des_encrypt_u16_risc2_ptr",11); | ||
546 | if (max < tm[11]) { max=tm[11]; max_idx=11; } | ||
547 | #endif | ||
548 | printf("options des ecb/s\n"); | ||
549 | printf("%s %12.2f 100.0%%\n",str[max_idx],tm[max_idx]); | ||
550 | d=tm[max_idx]; | ||
551 | tm[max_idx]= -2.0; | ||
552 | max= -1.0; | ||
553 | for (;;) | ||
554 | { | ||
555 | for (i=0; i<12; i++) | ||
556 | { | ||
557 | if (max < tm[i]) { max=tm[i]; j=i; } | ||
558 | } | ||
559 | if (max < 0.0) break; | ||
560 | printf("%s %12.2f %4.1f%%\n",str[j],tm[j],tm[j]/d*100.0); | ||
561 | tm[j]= -2.0; | ||
562 | max= -1.0; | ||
563 | } | ||
564 | |||
565 | switch (max_idx) | ||
566 | { | ||
567 | case 0: | ||
568 | printf("-DDES_DEFAULT_OPTIONS\n"); | ||
569 | break; | ||
570 | case 1: | ||
571 | printf("-DDES_UNROLL\n"); | ||
572 | break; | ||
573 | case 2: | ||
574 | printf("-DDES_RISC1\n"); | ||
575 | break; | ||
576 | case 3: | ||
577 | printf("-DDES_UNROLL -DDES_RISC1\n"); | ||
578 | break; | ||
579 | case 4: | ||
580 | printf("-DDES_RISC2\n"); | ||
581 | break; | ||
582 | case 5: | ||
583 | printf("-DDES_UNROLL -DDES_RISC2\n"); | ||
584 | break; | ||
585 | case 6: | ||
586 | printf("-DDES_PTR\n"); | ||
587 | break; | ||
588 | case 7: | ||
589 | printf("-DDES_UNROLL -DDES_PTR\n"); | ||
590 | break; | ||
591 | case 8: | ||
592 | printf("-DDES_RISC1 -DDES_PTR\n"); | ||
593 | break; | ||
594 | case 9: | ||
595 | printf("-DDES_UNROLL -DDES_RISC1 -DDES_PTR\n"); | ||
596 | break; | ||
597 | case 10: | ||
598 | printf("-DDES_RISC2 -DDES_PTR\n"); | ||
599 | break; | ||
600 | case 11: | ||
601 | printf("-DDES_UNROLL -DDES_RISC2 -DDES_PTR\n"); | ||
602 | break; | ||
603 | } | ||
604 | exit(0); | ||
605 | #if defined(LINT) || defined(OPENSSL_SYS_MSDOS) | ||
606 | return(0); | ||
607 | #endif | ||
608 | } | ||
diff --git a/src/lib/libcrypto/des/options.txt b/src/lib/libcrypto/des/options.txt deleted file mode 100644 index 6e2b50f765..0000000000 --- a/src/lib/libcrypto/des/options.txt +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | Note that the UNROLL option makes the 'inner' des loop unroll all 16 rounds | ||
2 | instead of the default 4. | ||
3 | RISC1 and RISC2 are 2 alternatives for the inner loop and | ||
4 | PTR means to use pointers arithmatic instead of arrays. | ||
5 | |||
6 | FreeBSD - Pentium Pro 200mhz - gcc 2.7.2.2 - assembler 577,000 4620k/s | ||
7 | IRIX 6.2 - R10000 195mhz - cc (-O3 -n32) - UNROLL RISC2 PTR 496,000 3968k/s | ||
8 | solaris 2.5.1 usparc 167mhz?? - SC4.0 - UNROLL RISC1 PTR [1] 459,400 3672k/s | ||
9 | FreeBSD - Pentium Pro 200mhz - gcc 2.7.2.2 - UNROLL RISC1 433,000 3468k/s | ||
10 | solaris 2.5.1 usparc 167mhz?? - gcc 2.7.2 - UNROLL 380,000 3041k/s | ||
11 | linux - pentium 100mhz - gcc 2.7.0 - assembler 281,000 2250k/s | ||
12 | NT 4.0 - pentium 100mhz - VC 4.2 - assembler 281,000 2250k/s | ||
13 | AIX 4.1? - PPC604 100mhz - cc - UNROLL 275,000 2200k/s | ||
14 | IRIX 5.3 - R4400 200mhz - gcc 2.6.3 - UNROLL RISC2 PTR 235,300 1882k/s | ||
15 | IRIX 5.3 - R4400 200mhz - cc - UNROLL RISC2 PTR 233,700 1869k/s | ||
16 | NT 4.0 - pentium 100mhz - VC 4.2 - UNROLL RISC1 PTR 191,000 1528k/s | ||
17 | DEC Alpha 165mhz?? - cc - RISC2 PTR [2] 181,000 1448k/s | ||
18 | linux - pentium 100mhz - gcc 2.7.0 - UNROLL RISC1 PTR 158,500 1268k/s | ||
19 | HPUX 10 - 9000/887 - cc - UNROLL [3] 148,000 1190k/s | ||
20 | solaris 2.5.1 - sparc 10 50mhz - gcc 2.7.2 - UNROLL 123,600 989k/s | ||
21 | IRIX 5.3 - R4000 100mhz - cc - UNROLL RISC2 PTR 101,000 808k/s | ||
22 | DGUX - 88100 50mhz(?) - gcc 2.6.3 - UNROLL 81,000 648k/s | ||
23 | solaris 2.4 486 50mhz - gcc 2.6.3 - assembler 65,000 522k/s | ||
24 | HPUX 10 - 9000/887 - k&r cc (default compiler) - UNROLL PTR 76,000 608k/s | ||
25 | solaris 2.4 486 50mhz - gcc 2.6.3 - UNROLL RISC2 43,500 344k/s | ||
26 | AIX - old slow one :-) - cc - 39,000 312k/s | ||
27 | |||
28 | Notes. | ||
29 | [1] For the ultra sparc, SunC 4.0 | ||
30 | cc -xtarget=ultra -xarch=v8plus -Xa -xO5, running 'des_opts' | ||
31 | gives a speed of 344,000 des/s while 'speed' gives 459,000 des/s. | ||
32 | I'll record the higher since it is coming from the library but it | ||
33 | is all rather weird. | ||
34 | [2] Similar to the ultra sparc ([1]), 181,000 for 'des_opts' vs 175,000. | ||
35 | [3] I was unable to get access to this machine when it was not heavily loaded. | ||
36 | As such, my timing program was never able to get more that %30 of the CPU. | ||
37 | This would cause the program to give much lower speed numbers because | ||
38 | it would be 'fighting' to stay in the cache with the other CPU burning | ||
39 | processes. | ||