summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/bf
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/bf')
-rw-r--r--src/lib/libcrypto/bf/Makefile98
-rw-r--r--src/lib/libcrypto/bf/asm/bf-586.pl2
-rw-r--r--src/lib/libcrypto/bf/asm/bf-686.pl127
-rw-r--r--src/lib/libcrypto/bf/asm/readme10
-rw-r--r--src/lib/libcrypto/bf/bf_opts.c331
-rw-r--r--src/lib/libcrypto/bf/bf_skey.c8
-rw-r--r--src/lib/libcrypto/bf/bfs.cpp67
-rw-r--r--src/lib/libcrypto/bf/bfspeed.c277
-rw-r--r--src/lib/libcrypto/bf/bftest.c540
-rw-r--r--src/lib/libcrypto/bf/blowfish.h4
10 files changed, 1452 insertions, 12 deletions
diff --git a/src/lib/libcrypto/bf/Makefile b/src/lib/libcrypto/bf/Makefile
new file mode 100644
index 0000000000..dd2c2c708e
--- /dev/null
+++ b/src/lib/libcrypto/bf/Makefile
@@ -0,0 +1,98 @@
1#
2# OpenSSL/crypto/blowfish/Makefile
3#
4
5DIR= bf
6TOP= ../..
7CC= cc
8CPP= $(CC) -E
9INCLUDES=
10CFLAG=-g
11MAKEFILE= Makefile
12AR= ar r
13
14BF_ENC= bf_enc.o
15
16CFLAGS= $(INCLUDES) $(CFLAG)
17ASFLAGS= $(INCLUDES) $(ASFLAG)
18AFLAGS= $(ASFLAGS)
19
20GENERAL=Makefile
21TEST=bftest.c
22APPS=
23
24LIB=$(TOP)/libcrypto.a
25LIBSRC=bf_skey.c bf_ecb.c bf_enc.c bf_cfb64.c bf_ofb64.c
26LIBOBJ=bf_skey.o bf_ecb.o $(BF_ENC) bf_cfb64.o bf_ofb64.o
27
28SRC= $(LIBSRC)
29
30EXHEADER= blowfish.h
31HEADER= bf_pi.h bf_locl.h $(EXHEADER)
32
33ALL= $(GENERAL) $(SRC) $(HEADER)
34
35top:
36 (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
37
38all: lib
39
40lib: $(LIBOBJ)
41 $(AR) $(LIB) $(LIBOBJ)
42 $(RANLIB) $(LIB) || echo Never mind.
43 @touch lib
44
45bf-586.s: asm/bf-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
46 $(PERL) asm/bf-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
47
48files:
49 $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
50
51links:
52 @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
53 @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
54 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
55
56# We need to use force because 'install' matches 'INSTALL' on case
57# insensitive systems
58FRC.install:
59install: FRC.install
60 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
61 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
62 do \
63 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
64 chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
65 done;
66
67tags:
68 ctags $(SRC)
69
70tests:
71
72lint:
73 lint -DLINT $(INCLUDES) $(SRC)>fluff
74
75depend:
76 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
77 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
78
79dclean:
80 $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
81 mv -f Makefile.new $(MAKEFILE)
82
83clean:
84 rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
85
86# DO NOT DELETE THIS LINE -- make depend depends on it.
87
88bf_cfb64.o: ../../include/openssl/blowfish.h ../../include/openssl/e_os2.h
89bf_cfb64.o: ../../include/openssl/opensslconf.h bf_cfb64.c bf_locl.h
90bf_ecb.o: ../../include/openssl/blowfish.h ../../include/openssl/e_os2.h
91bf_ecb.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
92bf_ecb.o: bf_ecb.c bf_locl.h
93bf_enc.o: ../../include/openssl/blowfish.h ../../include/openssl/e_os2.h
94bf_enc.o: ../../include/openssl/opensslconf.h bf_enc.c bf_locl.h
95bf_ofb64.o: ../../include/openssl/blowfish.h ../../include/openssl/e_os2.h
96bf_ofb64.o: ../../include/openssl/opensslconf.h bf_locl.h bf_ofb64.c
97bf_skey.o: ../../include/openssl/blowfish.h ../../include/openssl/e_os2.h
98bf_skey.o: ../../include/openssl/opensslconf.h bf_locl.h bf_pi.h bf_skey.c
diff --git a/src/lib/libcrypto/bf/asm/bf-586.pl b/src/lib/libcrypto/bf/asm/bf-586.pl
index b74cfbafd4..1f9b345aee 100644
--- a/src/lib/libcrypto/bf/asm/bf-586.pl
+++ b/src/lib/libcrypto/bf/asm/bf-586.pl
@@ -19,7 +19,7 @@ $tmp4="edx";
19 19
20&BF_encrypt("BF_encrypt",1); 20&BF_encrypt("BF_encrypt",1);
21&BF_encrypt("BF_decrypt",0); 21&BF_encrypt("BF_decrypt",0);
22&cbc("BF_cbc_encrypt","BF_encrypt","BF_decrypt",1,4,5,3,-1,-1); 22&cbc("BF_cbc_encrypt","BF_encrypt","BF_decrypt",1,4,5,3,-1,-1) unless $main'openbsd;
23&asm_finish(); 23&asm_finish();
24 24
25sub BF_encrypt 25sub BF_encrypt
diff --git a/src/lib/libcrypto/bf/asm/bf-686.pl b/src/lib/libcrypto/bf/asm/bf-686.pl
new file mode 100644
index 0000000000..8e4c25f598
--- /dev/null
+++ b/src/lib/libcrypto/bf/asm/bf-686.pl
@@ -0,0 +1,127 @@
1#!/usr/local/bin/perl
2
3push(@INC,"perlasm","../../perlasm");
4require "x86asm.pl";
5require "cbc.pl";
6
7&asm_init($ARGV[0],"bf-686.pl");
8
9$BF_ROUNDS=16;
10$BF_OFF=($BF_ROUNDS+2)*4;
11$L="ecx";
12$R="edx";
13$P="edi";
14$tot="esi";
15$tmp1="eax";
16$tmp2="ebx";
17$tmp3="ebp";
18
19&des_encrypt("BF_encrypt",1);
20&des_encrypt("BF_decrypt",0);
21&cbc("BF_cbc_encrypt","BF_encrypt","BF_decrypt",1,4,5,3,-1,-1);
22
23&asm_finish();
24
25&file_end();
26
27sub des_encrypt
28 {
29 local($name,$enc)=@_;
30
31 &function_begin($name,"");
32
33 &comment("");
34 &comment("Load the 2 words");
35 &mov("eax",&wparam(0));
36 &mov($L,&DWP(0,"eax","",0));
37 &mov($R,&DWP(4,"eax","",0));
38
39 &comment("");
40 &comment("P pointer, s and enc flag");
41 &mov($P,&wparam(1));
42
43 &xor( $tmp1, $tmp1);
44 &xor( $tmp2, $tmp2);
45
46 # encrypting part
47
48 if ($enc)
49 {
50 &xor($L,&DWP(0,$P,"",0));
51 for ($i=0; $i<$BF_ROUNDS; $i+=2)
52 {
53 &comment("");
54 &comment("Round $i");
55 &BF_ENCRYPT($i+1,$R,$L,$P,$tot,$tmp1,$tmp2,$tmp3);
56
57 &comment("");
58 &comment("Round ".sprintf("%d",$i+1));
59 &BF_ENCRYPT($i+2,$L,$R,$P,$tot,$tmp1,$tmp2,$tmp3);
60 }
61 &xor($R,&DWP(($BF_ROUNDS+1)*4,$P,"",0));
62
63 &mov("eax",&wparam(0));
64 &mov(&DWP(0,"eax","",0),$R);
65 &mov(&DWP(4,"eax","",0),$L);
66 &function_end_A($name);
67 }
68 else
69 {
70 &xor($L,&DWP(($BF_ROUNDS+1)*4,$P,"",0));
71 for ($i=$BF_ROUNDS; $i>0; $i-=2)
72 {
73 &comment("");
74 &comment("Round $i");
75 &BF_ENCRYPT($i,$R,$L,$P,$tot,$tmp1,$tmp2,$tmp3);
76 &comment("");
77 &comment("Round ".sprintf("%d",$i-1));
78 &BF_ENCRYPT($i-1,$L,$R,$P,$tot,$tmp1,$tmp2,$tmp3);
79 }
80 &xor($R,&DWP(0,$P,"",0));
81
82 &mov("eax",&wparam(0));
83 &mov(&DWP(0,"eax","",0),$R);
84 &mov(&DWP(4,"eax","",0),$L);
85 &function_end_A($name);
86 }
87
88 &function_end_B($name);
89 }
90
91sub BF_ENCRYPT
92 {
93 local($i,$L,$R,$P,$tot,$tmp1,$tmp2,$tmp3)=@_;
94
95 &rotr( $R, 16);
96 &mov( $tot, &DWP(&n2a($i*4),$P,"",0));
97
98 &movb( &LB($tmp1), &HB($R));
99 &movb( &LB($tmp2), &LB($R));
100
101 &rotr( $R, 16);
102 &xor( $L, $tot);
103
104 &mov( $tot, &DWP(&n2a($BF_OFF+0x0000),$P,$tmp1,4));
105 &mov( $tmp3, &DWP(&n2a($BF_OFF+0x0400),$P,$tmp2,4));
106
107 &movb( &LB($tmp1), &HB($R));
108 &movb( &LB($tmp2), &LB($R));
109
110 &add( $tot, $tmp3);
111 &mov( $tmp1, &DWP(&n2a($BF_OFF+0x0800),$P,$tmp1,4)); # delay
112
113 &xor( $tot, $tmp1);
114 &mov( $tmp3, &DWP(&n2a($BF_OFF+0x0C00),$P,$tmp2,4));
115
116 &add( $tot, $tmp3);
117 &xor( $tmp1, $tmp1);
118
119 &xor( $L, $tot);
120 # delay
121 }
122
123sub n2a
124 {
125 sprintf("%d",$_[0]);
126 }
127
diff --git a/src/lib/libcrypto/bf/asm/readme b/src/lib/libcrypto/bf/asm/readme
new file mode 100644
index 0000000000..2385fa3812
--- /dev/null
+++ b/src/lib/libcrypto/bf/asm/readme
@@ -0,0 +1,10 @@
1There are blowfish assembler generation scripts.
2bf-586.pl version is for the pentium and
3bf-686.pl is my original version, which is faster on the pentium pro.
4
5When using a bf-586.pl, the pentium pro/II is %8 slower than using
6bf-686.pl. When using a bf-686.pl, the pentium is %16 slower
7than bf-586.pl
8
9So the default is bf-586.pl
10
diff --git a/src/lib/libcrypto/bf/bf_opts.c b/src/lib/libcrypto/bf/bf_opts.c
new file mode 100644
index 0000000000..1721bb99b4
--- /dev/null
+++ b/src/lib/libcrypto/bf/bf_opts.c
@@ -0,0 +1,331 @@
1/* crypto/bf/bf_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
68#include <openssl/e_os2.h>
69#include OPENSSL_UNISTD_IO
70OPENSSL_DECLARE_EXIT
71
72#ifndef OPENSSL_SYS_NETWARE
73#include <signal.h>
74#endif
75
76#ifndef _IRIX
77#include <time.h>
78#endif
79#ifdef TIMES
80#include <sys/types.h>
81#include <sys/times.h>
82#endif
83
84/* Depending on the VMS version, the tms structure is perhaps defined.
85 The __TMS macro will show if it was. If it wasn't defined, we should
86 undefine TIMES, since that tells the rest of the program how things
87 should be handled. -- Richard Levitte */
88#if defined(OPENSSL_SYS_VMS_DECC) && !defined(__TMS)
89#undef TIMES
90#endif
91
92#ifndef TIMES
93#include <sys/timeb.h>
94#endif
95
96#if defined(sun) || defined(__ultrix)
97#define _POSIX_SOURCE
98#include <limits.h>
99#include <sys/param.h>
100#endif
101
102#include <openssl/blowfish.h>
103
104#define BF_DEFAULT_OPTIONS
105
106#undef BF_ENC
107#define BF_encrypt BF_encrypt_normal
108#undef HEADER_BF_LOCL_H
109#include "bf_enc.c"
110
111#define BF_PTR
112#undef BF_PTR2
113#undef BF_ENC
114#undef BF_encrypt
115#define BF_encrypt BF_encrypt_ptr
116#undef HEADER_BF_LOCL_H
117#include "bf_enc.c"
118
119#undef BF_PTR
120#define BF_PTR2
121#undef BF_ENC
122#undef BF_encrypt
123#define BF_encrypt BF_encrypt_ptr2
124#undef HEADER_BF_LOCL_H
125#include "bf_enc.c"
126
127/* The following if from times(3) man page. It may need to be changed */
128#ifndef HZ
129# ifndef CLK_TCK
130# ifndef _BSD_CLK_TCK_ /* FreeBSD fix */
131# define HZ 100.0
132# else /* _BSD_CLK_TCK_ */
133# define HZ ((double)_BSD_CLK_TCK_)
134# endif
135# else /* CLK_TCK */
136# define HZ ((double)CLK_TCK)
137# endif
138#endif
139
140#define BUFSIZE ((long)1024)
141long run=0;
142
143double Time_F(int s);
144#ifdef SIGALRM
145#if defined(__STDC__) || defined(sgi)
146#define SIGRETTYPE void
147#else
148#define SIGRETTYPE int
149#endif
150
151SIGRETTYPE sig_done(int sig);
152SIGRETTYPE sig_done(int sig)
153 {
154 signal(SIGALRM,sig_done);
155 run=0;
156#ifdef LINT
157 sig=sig;
158#endif
159 }
160#endif
161
162#define START 0
163#define STOP 1
164
165double Time_F(int s)
166 {
167 double ret;
168#ifdef TIMES
169 static struct tms tstart,tend;
170
171 if (s == START)
172 {
173 times(&tstart);
174 return(0);
175 }
176 else
177 {
178 times(&tend);
179 ret=((double)(tend.tms_utime-tstart.tms_utime))/HZ;
180 return((ret == 0.0)?1e-6:ret);
181 }
182#else /* !times() */
183 static struct timeb tstart,tend;
184 long i;
185
186 if (s == START)
187 {
188 ftime(&tstart);
189 return(0);
190 }
191 else
192 {
193 ftime(&tend);
194 i=(long)tend.millitm-(long)tstart.millitm;
195 ret=((double)(tend.time-tstart.time))+((double)i)/1000.0;
196 return((ret == 0.0)?1e-6:ret);
197 }
198#endif
199 }
200
201#ifdef SIGALRM
202#define print_name(name) fprintf(stderr,"Doing %s's for 10 seconds\n",name); alarm(10);
203#else
204#define print_name(name) fprintf(stderr,"Doing %s %ld times\n",name,cb);
205#endif
206
207#define time_it(func,name,index) \
208 print_name(name); \
209 Time_F(START); \
210 for (count=0,run=1; COND(cb); count+=4) \
211 { \
212 unsigned long d[2]; \
213 func(d,&sch); \
214 func(d,&sch); \
215 func(d,&sch); \
216 func(d,&sch); \
217 } \
218 tm[index]=Time_F(STOP); \
219 fprintf(stderr,"%ld %s's in %.2f second\n",count,name,tm[index]); \
220 tm[index]=((double)COUNT(cb))/tm[index];
221
222#define print_it(name,index) \
223 fprintf(stderr,"%s bytes per sec = %12.2f (%5.1fuS)\n",name, \
224 tm[index]*8,1.0e6/tm[index]);
225
226int main(int argc, char **argv)
227 {
228 long count;
229 static unsigned char buf[BUFSIZE];
230 static char key[16]={ 0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,
231 0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0};
232 BF_KEY sch;
233 double d,tm[16],max=0;
234 int rank[16];
235 char *str[16];
236 int max_idx=0,i,num=0,j;
237#ifndef SIGALARM
238 long ca,cb,cc,cd,ce;
239#endif
240
241 for (i=0; i<12; i++)
242 {
243 tm[i]=0.0;
244 rank[i]=0;
245 }
246
247#ifndef TIMES
248 fprintf(stderr,"To get the most accurate results, try to run this\n");
249 fprintf(stderr,"program when this computer is idle.\n");
250#endif
251
252 BF_set_key(&sch,16,key);
253
254#ifndef SIGALRM
255 fprintf(stderr,"First we calculate the approximate speed ...\n");
256 count=10;
257 do {
258 long i;
259 unsigned long data[2];
260
261 count*=2;
262 Time_F(START);
263 for (i=count; i; i--)
264 BF_encrypt(data,&sch);
265 d=Time_F(STOP);
266 } while (d < 3.0);
267 ca=count;
268 cb=count*3;
269 cc=count*3*8/BUFSIZE+1;
270 cd=count*8/BUFSIZE+1;
271
272 ce=count/20+1;
273#define COND(d) (count != (d))
274#define COUNT(d) (d)
275#else
276#define COND(c) (run)
277#define COUNT(d) (count)
278 signal(SIGALRM,sig_done);
279 alarm(10);
280#endif
281
282 time_it(BF_encrypt_normal, "BF_encrypt_normal ", 0);
283 time_it(BF_encrypt_ptr, "BF_encrypt_ptr ", 1);
284 time_it(BF_encrypt_ptr2, "BF_encrypt_ptr2 ", 2);
285 num+=3;
286
287 str[0]="<nothing>";
288 print_it("BF_encrypt_normal ",0);
289 max=tm[0];
290 max_idx=0;
291 str[1]="ptr ";
292 print_it("BF_encrypt_ptr ",1);
293 if (max < tm[1]) { max=tm[1]; max_idx=1; }
294 str[2]="ptr2 ";
295 print_it("BF_encrypt_ptr2 ",2);
296 if (max < tm[2]) { max=tm[2]; max_idx=2; }
297
298 printf("options BF ecb/s\n");
299 printf("%s %12.2f 100.0%%\n",str[max_idx],tm[max_idx]);
300 d=tm[max_idx];
301 tm[max_idx]= -2.0;
302 max= -1.0;
303 for (;;)
304 {
305 for (i=0; i<3; i++)
306 {
307 if (max < tm[i]) { max=tm[i]; j=i; }
308 }
309 if (max < 0.0) break;
310 printf("%s %12.2f %4.1f%%\n",str[j],tm[j],tm[j]/d*100.0);
311 tm[j]= -2.0;
312 max= -1.0;
313 }
314
315 switch (max_idx)
316 {
317 case 0:
318 printf("-DBF_DEFAULT_OPTIONS\n");
319 break;
320 case 1:
321 printf("-DBF_PTR\n");
322 break;
323 case 2:
324 printf("-DBF_PTR2\n");
325 break;
326 }
327 exit(0);
328#if defined(LINT) || defined(OPENSSL_SYS_MSDOS)
329 return(0);
330#endif
331 }
diff --git a/src/lib/libcrypto/bf/bf_skey.c b/src/lib/libcrypto/bf/bf_skey.c
index 3b0bca41ae..3673cdee6e 100644
--- a/src/lib/libcrypto/bf/bf_skey.c
+++ b/src/lib/libcrypto/bf/bf_skey.c
@@ -58,19 +58,11 @@
58 58
59#include <stdio.h> 59#include <stdio.h>
60#include <string.h> 60#include <string.h>
61#include <openssl/crypto.h>
62#include <openssl/blowfish.h> 61#include <openssl/blowfish.h>
63#include "bf_locl.h" 62#include "bf_locl.h"
64#include "bf_pi.h" 63#include "bf_pi.h"
65 64
66void BF_set_key(BF_KEY *key, int len, const unsigned char *data) 65void BF_set_key(BF_KEY *key, int len, const unsigned char *data)
67#ifdef OPENSSL_FIPS
68 {
69 fips_cipher_abort(BLOWFISH);
70 private_BF_set_key(key, len, data);
71 }
72void private_BF_set_key(BF_KEY *key, int len, const unsigned char *data)
73#endif
74 { 66 {
75 int i; 67 int i;
76 BF_LONG *p,ri,in[2]; 68 BF_LONG *p,ri,in[2];
diff --git a/src/lib/libcrypto/bf/bfs.cpp b/src/lib/libcrypto/bf/bfs.cpp
new file mode 100644
index 0000000000..d74c457760
--- /dev/null
+++ b/src/lib/libcrypto/bf/bfs.cpp
@@ -0,0 +1,67 @@
1//
2// gettsc.inl
3//
4// gives access to the Pentium's (secret) cycle counter
5//
6// This software was written by Leonard Janke (janke@unixg.ubc.ca)
7// in 1996-7 and is entered, by him, into the public domain.
8
9#if defined(__WATCOMC__)
10void GetTSC(unsigned long&);
11#pragma aux GetTSC = 0x0f 0x31 "mov [edi], eax" parm [edi] modify [edx eax];
12#elif defined(__GNUC__)
13inline
14void GetTSC(unsigned long& tsc)
15{
16 asm volatile(".byte 15, 49\n\t"
17 : "=eax" (tsc)
18 :
19 : "%edx", "%eax");
20}
21#elif defined(_MSC_VER)
22inline
23void GetTSC(unsigned long& tsc)
24{
25 unsigned long a;
26 __asm _emit 0fh
27 __asm _emit 31h
28 __asm mov a, eax;
29 tsc=a;
30}
31#endif
32
33#include <stdio.h>
34#include <stdlib.h>
35#include <openssl/blowfish.h>
36
37void main(int argc,char *argv[])
38 {
39 BF_KEY key;
40 unsigned long s1,s2,e1,e2;
41 unsigned long data[2];
42 int i,j;
43
44 for (j=0; j<6; j++)
45 {
46 for (i=0; i<1000; i++) /**/
47 {
48 BF_encrypt(&data[0],&key);
49 GetTSC(s1);
50 BF_encrypt(&data[0],&key);
51 BF_encrypt(&data[0],&key);
52 BF_encrypt(&data[0],&key);
53 GetTSC(e1);
54 GetTSC(s2);
55 BF_encrypt(&data[0],&key);
56 BF_encrypt(&data[0],&key);
57 BF_encrypt(&data[0],&key);
58 BF_encrypt(&data[0],&key);
59 GetTSC(e2);
60 BF_encrypt(&data[0],&key);
61 }
62
63 printf("blowfish %d %d (%d)\n",
64 e1-s1,e2-s2,((e2-s2)-(e1-s1)));
65 }
66 }
67
diff --git a/src/lib/libcrypto/bf/bfspeed.c b/src/lib/libcrypto/bf/bfspeed.c
new file mode 100644
index 0000000000..c41ef3b403
--- /dev/null
+++ b/src/lib/libcrypto/bf/bfspeed.c
@@ -0,0 +1,277 @@
1/* crypto/bf/bfspeed.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/* 11-Sep-92 Andrew Daviel Support for Silicon Graphics IRIX added */
60/* 06-Apr-92 Luke Brennan Support for VMS and add extra signal calls */
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
68#include <openssl/e_os2.h>
69#include OPENSSL_UNISTD_IO
70OPENSSL_DECLARE_EXIT
71
72#ifndef OPENSSL_SYS_NETWARE
73#include <signal.h>
74#endif
75
76#ifndef _IRIX
77#include <time.h>
78#endif
79#ifdef TIMES
80#include <sys/types.h>
81#include <sys/times.h>
82#endif
83
84/* Depending on the VMS version, the tms structure is perhaps defined.
85 The __TMS macro will show if it was. If it wasn't defined, we should
86 undefine TIMES, since that tells the rest of the program how things
87 should be handled. -- Richard Levitte */
88#if defined(OPENSSL_SYS_VMS_DECC) && !defined(__TMS)
89#undef TIMES
90#endif
91
92#ifndef TIMES
93#include <sys/timeb.h>
94#endif
95
96#if defined(sun) || defined(__ultrix)
97#define _POSIX_SOURCE
98#include <limits.h>
99#include <sys/param.h>
100#endif
101
102#include <openssl/blowfish.h>
103
104/* The following if from times(3) man page. It may need to be changed */
105#ifndef HZ
106#ifndef CLK_TCK
107#define HZ 100.0
108#else /* CLK_TCK */
109#define HZ ((double)CLK_TCK)
110#endif
111#endif
112
113#define BUFSIZE ((long)1024)
114long run=0;
115
116double Time_F(int s);
117#ifdef SIGALRM
118#if defined(__STDC__) || defined(sgi) || defined(_AIX)
119#define SIGRETTYPE void
120#else
121#define SIGRETTYPE int
122#endif
123
124SIGRETTYPE sig_done(int sig);
125SIGRETTYPE sig_done(int sig)
126 {
127 signal(SIGALRM,sig_done);
128 run=0;
129#ifdef LINT
130 sig=sig;
131#endif
132 }
133#endif
134
135#define START 0
136#define STOP 1
137
138double Time_F(int s)
139 {
140 double ret;
141#ifdef TIMES
142 static struct tms tstart,tend;
143
144 if (s == START)
145 {
146 times(&tstart);
147 return(0);
148 }
149 else
150 {
151 times(&tend);
152 ret=((double)(tend.tms_utime-tstart.tms_utime))/HZ;
153 return((ret == 0.0)?1e-6:ret);
154 }
155#else /* !times() */
156 static struct timeb tstart,tend;
157 long i;
158
159 if (s == START)
160 {
161 ftime(&tstart);
162 return(0);
163 }
164 else
165 {
166 ftime(&tend);
167 i=(long)tend.millitm-(long)tstart.millitm;
168 ret=((double)(tend.time-tstart.time))+((double)i)/1e3;
169 return((ret == 0.0)?1e-6:ret);
170 }
171#endif
172 }
173
174int main(int argc, char **argv)
175 {
176 long count;
177 static unsigned char buf[BUFSIZE];
178 static unsigned char key[] ={
179 0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,
180 0xfe,0xdc,0xba,0x98,0x76,0x54,0x32,0x10,
181 };
182 BF_KEY sch;
183 double a,b,c,d;
184#ifndef SIGALRM
185 long ca,cb,cc;
186#endif
187
188#ifndef TIMES
189 printf("To get the most accurate results, try to run this\n");
190 printf("program when this computer is idle.\n");
191#endif
192
193#ifndef SIGALRM
194 printf("First we calculate the approximate speed ...\n");
195 BF_set_key(&sch,16,key);
196 count=10;
197 do {
198 long i;
199 BF_LONG data[2];
200
201 count*=2;
202 Time_F(START);
203 for (i=count; i; i--)
204 BF_encrypt(data,&sch);
205 d=Time_F(STOP);
206 } while (d < 3.0);
207 ca=count/512;
208 cb=count;
209 cc=count*8/BUFSIZE+1;
210 printf("Doing BF_set_key %ld times\n",ca);
211#define COND(d) (count != (d))
212#define COUNT(d) (d)
213#else
214#define COND(c) (run)
215#define COUNT(d) (count)
216 signal(SIGALRM,sig_done);
217 printf("Doing BF_set_key for 10 seconds\n");
218 alarm(10);
219#endif
220
221 Time_F(START);
222 for (count=0,run=1; COND(ca); count+=4)
223 {
224 BF_set_key(&sch,16,key);
225 BF_set_key(&sch,16,key);
226 BF_set_key(&sch,16,key);
227 BF_set_key(&sch,16,key);
228 }
229 d=Time_F(STOP);
230 printf("%ld BF_set_key's in %.2f seconds\n",count,d);
231 a=((double)COUNT(ca))/d;
232
233#ifdef SIGALRM
234 printf("Doing BF_encrypt's for 10 seconds\n");
235 alarm(10);
236#else
237 printf("Doing BF_encrypt %ld times\n",cb);
238#endif
239 Time_F(START);
240 for (count=0,run=1; COND(cb); count+=4)
241 {
242 BF_LONG data[2];
243
244 BF_encrypt(data,&sch);
245 BF_encrypt(data,&sch);
246 BF_encrypt(data,&sch);
247 BF_encrypt(data,&sch);
248 }
249 d=Time_F(STOP);
250 printf("%ld BF_encrypt's in %.2f second\n",count,d);
251 b=((double)COUNT(cb)*8)/d;
252
253#ifdef SIGALRM
254 printf("Doing BF_cbc_encrypt on %ld byte blocks for 10 seconds\n",
255 BUFSIZE);
256 alarm(10);
257#else
258 printf("Doing BF_cbc_encrypt %ld times on %ld byte blocks\n",cc,
259 BUFSIZE);
260#endif
261 Time_F(START);
262 for (count=0,run=1; COND(cc); count++)
263 BF_cbc_encrypt(buf,buf,BUFSIZE,&sch,
264 &(key[0]),BF_ENCRYPT);
265 d=Time_F(STOP);
266 printf("%ld BF_cbc_encrypt's of %ld byte blocks in %.2f second\n",
267 count,BUFSIZE,d);
268 c=((double)COUNT(cc)*BUFSIZE)/d;
269
270 printf("Blowfish set_key per sec = %12.3f (%9.3fuS)\n",a,1.0e6/a);
271 printf("Blowfish raw ecb bytes per sec = %12.3f (%9.3fuS)\n",b,8.0e6/b);
272 printf("Blowfish cbc bytes per sec = %12.3f (%9.3fuS)\n",c,8.0e6/c);
273 exit(0);
274#if defined(LINT) || defined(OPENSSL_SYS_MSDOS)
275 return(0);
276#endif
277 }
diff --git a/src/lib/libcrypto/bf/bftest.c b/src/lib/libcrypto/bf/bftest.c
new file mode 100644
index 0000000000..97e6634d37
--- /dev/null
+++ b/src/lib/libcrypto/bf/bftest.c
@@ -0,0 +1,540 @@
1/* crypto/bf/bftest.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/* This has been a quickly hacked 'ideatest.c'. When I add tests for other
60 * RC2 modes, more of the code will be uncommented. */
61
62#include <stdio.h>
63#include <string.h>
64#include <stdlib.h>
65#include <openssl/opensslconf.h> /* To see if OPENSSL_NO_BF is defined */
66
67#include "../e_os.h"
68
69#ifdef OPENSSL_NO_BF
70int main(int argc, char *argv[])
71{
72 printf("No BF support\n");
73 return(0);
74}
75#else
76#include <openssl/blowfish.h>
77
78#ifdef CHARSET_EBCDIC
79#include <openssl/ebcdic.h>
80#endif
81
82static char *bf_key[2]={
83 "abcdefghijklmnopqrstuvwxyz",
84 "Who is John Galt?"
85 };
86
87/* big endian */
88static BF_LONG bf_plain[2][2]={
89 {0x424c4f57L,0x46495348L},
90 {0xfedcba98L,0x76543210L}
91 };
92
93static BF_LONG bf_cipher[2][2]={
94 {0x324ed0feL,0xf413a203L},
95 {0xcc91732bL,0x8022f684L}
96 };
97/************/
98
99/* Lets use the DES test vectors :-) */
100#define NUM_TESTS 34
101static unsigned char ecb_data[NUM_TESTS][8]={
102 {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
103 {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF},
104 {0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
105 {0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11},
106 {0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF},
107 {0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11},
108 {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
109 {0xFE,0xDC,0xBA,0x98,0x76,0x54,0x32,0x10},
110 {0x7C,0xA1,0x10,0x45,0x4A,0x1A,0x6E,0x57},
111 {0x01,0x31,0xD9,0x61,0x9D,0xC1,0x37,0x6E},
112 {0x07,0xA1,0x13,0x3E,0x4A,0x0B,0x26,0x86},
113 {0x38,0x49,0x67,0x4C,0x26,0x02,0x31,0x9E},
114 {0x04,0xB9,0x15,0xBA,0x43,0xFE,0xB5,0xB6},
115 {0x01,0x13,0xB9,0x70,0xFD,0x34,0xF2,0xCE},
116 {0x01,0x70,0xF1,0x75,0x46,0x8F,0xB5,0xE6},
117 {0x43,0x29,0x7F,0xAD,0x38,0xE3,0x73,0xFE},
118 {0x07,0xA7,0x13,0x70,0x45,0xDA,0x2A,0x16},
119 {0x04,0x68,0x91,0x04,0xC2,0xFD,0x3B,0x2F},
120 {0x37,0xD0,0x6B,0xB5,0x16,0xCB,0x75,0x46},
121 {0x1F,0x08,0x26,0x0D,0x1A,0xC2,0x46,0x5E},
122 {0x58,0x40,0x23,0x64,0x1A,0xBA,0x61,0x76},
123 {0x02,0x58,0x16,0x16,0x46,0x29,0xB0,0x07},
124 {0x49,0x79,0x3E,0xBC,0x79,0xB3,0x25,0x8F},
125 {0x4F,0xB0,0x5E,0x15,0x15,0xAB,0x73,0xA7},
126 {0x49,0xE9,0x5D,0x6D,0x4C,0xA2,0x29,0xBF},
127 {0x01,0x83,0x10,0xDC,0x40,0x9B,0x26,0xD6},
128 {0x1C,0x58,0x7F,0x1C,0x13,0x92,0x4F,0xEF},
129 {0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01},
130 {0x1F,0x1F,0x1F,0x1F,0x0E,0x0E,0x0E,0x0E},
131 {0xE0,0xFE,0xE0,0xFE,0xF1,0xFE,0xF1,0xFE},
132 {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
133 {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF},
134 {0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF},
135 {0xFE,0xDC,0xBA,0x98,0x76,0x54,0x32,0x10}};
136
137static unsigned char plain_data[NUM_TESTS][8]={
138 {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
139 {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF},
140 {0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x01},
141 {0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11},
142 {0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11},
143 {0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF},
144 {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
145 {0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF},
146 {0x01,0xA1,0xD6,0xD0,0x39,0x77,0x67,0x42},
147 {0x5C,0xD5,0x4C,0xA8,0x3D,0xEF,0x57,0xDA},
148 {0x02,0x48,0xD4,0x38,0x06,0xF6,0x71,0x72},
149 {0x51,0x45,0x4B,0x58,0x2D,0xDF,0x44,0x0A},
150 {0x42,0xFD,0x44,0x30,0x59,0x57,0x7F,0xA2},
151 {0x05,0x9B,0x5E,0x08,0x51,0xCF,0x14,0x3A},
152 {0x07,0x56,0xD8,0xE0,0x77,0x47,0x61,0xD2},
153 {0x76,0x25,0x14,0xB8,0x29,0xBF,0x48,0x6A},
154 {0x3B,0xDD,0x11,0x90,0x49,0x37,0x28,0x02},
155 {0x26,0x95,0x5F,0x68,0x35,0xAF,0x60,0x9A},
156 {0x16,0x4D,0x5E,0x40,0x4F,0x27,0x52,0x32},
157 {0x6B,0x05,0x6E,0x18,0x75,0x9F,0x5C,0xCA},
158 {0x00,0x4B,0xD6,0xEF,0x09,0x17,0x60,0x62},
159 {0x48,0x0D,0x39,0x00,0x6E,0xE7,0x62,0xF2},
160 {0x43,0x75,0x40,0xC8,0x69,0x8F,0x3C,0xFA},
161 {0x07,0x2D,0x43,0xA0,0x77,0x07,0x52,0x92},
162 {0x02,0xFE,0x55,0x77,0x81,0x17,0xF1,0x2A},
163 {0x1D,0x9D,0x5C,0x50,0x18,0xF7,0x28,0xC2},
164 {0x30,0x55,0x32,0x28,0x6D,0x6F,0x29,0x5A},
165 {0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF},
166 {0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF},
167 {0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF},
168 {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF},
169 {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
170 {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
171 {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF}};
172
173static unsigned char cipher_data[NUM_TESTS][8]={
174 {0x4E,0xF9,0x97,0x45,0x61,0x98,0xDD,0x78},
175 {0x51,0x86,0x6F,0xD5,0xB8,0x5E,0xCB,0x8A},
176 {0x7D,0x85,0x6F,0x9A,0x61,0x30,0x63,0xF2},
177 {0x24,0x66,0xDD,0x87,0x8B,0x96,0x3C,0x9D},
178 {0x61,0xF9,0xC3,0x80,0x22,0x81,0xB0,0x96},
179 {0x7D,0x0C,0xC6,0x30,0xAF,0xDA,0x1E,0xC7},
180 {0x4E,0xF9,0x97,0x45,0x61,0x98,0xDD,0x78},
181 {0x0A,0xCE,0xAB,0x0F,0xC6,0xA0,0xA2,0x8D},
182 {0x59,0xC6,0x82,0x45,0xEB,0x05,0x28,0x2B},
183 {0xB1,0xB8,0xCC,0x0B,0x25,0x0F,0x09,0xA0},
184 {0x17,0x30,0xE5,0x77,0x8B,0xEA,0x1D,0xA4},
185 {0xA2,0x5E,0x78,0x56,0xCF,0x26,0x51,0xEB},
186 {0x35,0x38,0x82,0xB1,0x09,0xCE,0x8F,0x1A},
187 {0x48,0xF4,0xD0,0x88,0x4C,0x37,0x99,0x18},
188 {0x43,0x21,0x93,0xB7,0x89,0x51,0xFC,0x98},
189 {0x13,0xF0,0x41,0x54,0xD6,0x9D,0x1A,0xE5},
190 {0x2E,0xED,0xDA,0x93,0xFF,0xD3,0x9C,0x79},
191 {0xD8,0x87,0xE0,0x39,0x3C,0x2D,0xA6,0xE3},
192 {0x5F,0x99,0xD0,0x4F,0x5B,0x16,0x39,0x69},
193 {0x4A,0x05,0x7A,0x3B,0x24,0xD3,0x97,0x7B},
194 {0x45,0x20,0x31,0xC1,0xE4,0xFA,0xDA,0x8E},
195 {0x75,0x55,0xAE,0x39,0xF5,0x9B,0x87,0xBD},
196 {0x53,0xC5,0x5F,0x9C,0xB4,0x9F,0xC0,0x19},
197 {0x7A,0x8E,0x7B,0xFA,0x93,0x7E,0x89,0xA3},
198 {0xCF,0x9C,0x5D,0x7A,0x49,0x86,0xAD,0xB5},
199 {0xD1,0xAB,0xB2,0x90,0x65,0x8B,0xC7,0x78},
200 {0x55,0xCB,0x37,0x74,0xD1,0x3E,0xF2,0x01},
201 {0xFA,0x34,0xEC,0x48,0x47,0xB2,0x68,0xB2},
202 {0xA7,0x90,0x79,0x51,0x08,0xEA,0x3C,0xAE},
203 {0xC3,0x9E,0x07,0x2D,0x9F,0xAC,0x63,0x1D},
204 {0x01,0x49,0x33,0xE0,0xCD,0xAF,0xF6,0xE4},
205 {0xF2,0x1E,0x9A,0x77,0xB7,0x1C,0x49,0xBC},
206 {0x24,0x59,0x46,0x88,0x57,0x54,0x36,0x9A},
207 {0x6B,0x5C,0x5A,0x9C,0x5D,0x9E,0x0A,0x5A},
208 };
209
210static unsigned char cbc_key [16]={
211 0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef,
212 0xf0,0xe1,0xd2,0xc3,0xb4,0xa5,0x96,0x87};
213static unsigned char cbc_iv [8]={0xfe,0xdc,0xba,0x98,0x76,0x54,0x32,0x10};
214static char cbc_data[40]="7654321 Now is the time for ";
215static unsigned char cbc_ok[32]={
216 0x6B,0x77,0xB4,0xD6,0x30,0x06,0xDE,0xE6,
217 0x05,0xB1,0x56,0xE2,0x74,0x03,0x97,0x93,
218 0x58,0xDE,0xB9,0xE7,0x15,0x46,0x16,0xD9,
219 0x59,0xF1,0x65,0x2B,0xD5,0xFF,0x92,0xCC};
220
221static unsigned char cfb64_ok[]={
222 0xE7,0x32,0x14,0xA2,0x82,0x21,0x39,0xCA,
223 0xF2,0x6E,0xCF,0x6D,0x2E,0xB9,0xE7,0x6E,
224 0x3D,0xA3,0xDE,0x04,0xD1,0x51,0x72,0x00,
225 0x51,0x9D,0x57,0xA6,0xC3};
226
227static unsigned char ofb64_ok[]={
228 0xE7,0x32,0x14,0xA2,0x82,0x21,0x39,0xCA,
229 0x62,0xB3,0x43,0xCC,0x5B,0x65,0x58,0x73,
230 0x10,0xDD,0x90,0x8D,0x0C,0x24,0x1B,0x22,
231 0x63,0xC2,0xCF,0x80,0xDA};
232
233#define KEY_TEST_NUM 25
234static unsigned char key_test[KEY_TEST_NUM]={
235 0xf0,0xe1,0xd2,0xc3,0xb4,0xa5,0x96,0x87,
236 0x78,0x69,0x5a,0x4b,0x3c,0x2d,0x1e,0x0f,
237 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,
238 0x88};
239
240static unsigned char key_data[8]=
241 {0xFE,0xDC,0xBA,0x98,0x76,0x54,0x32,0x10};
242
243static unsigned char key_out[KEY_TEST_NUM][8]={
244 {0xF9,0xAD,0x59,0x7C,0x49,0xDB,0x00,0x5E},
245 {0xE9,0x1D,0x21,0xC1,0xD9,0x61,0xA6,0xD6},
246 {0xE9,0xC2,0xB7,0x0A,0x1B,0xC6,0x5C,0xF3},
247 {0xBE,0x1E,0x63,0x94,0x08,0x64,0x0F,0x05},
248 {0xB3,0x9E,0x44,0x48,0x1B,0xDB,0x1E,0x6E},
249 {0x94,0x57,0xAA,0x83,0xB1,0x92,0x8C,0x0D},
250 {0x8B,0xB7,0x70,0x32,0xF9,0x60,0x62,0x9D},
251 {0xE8,0x7A,0x24,0x4E,0x2C,0xC8,0x5E,0x82},
252 {0x15,0x75,0x0E,0x7A,0x4F,0x4E,0xC5,0x77},
253 {0x12,0x2B,0xA7,0x0B,0x3A,0xB6,0x4A,0xE0},
254 {0x3A,0x83,0x3C,0x9A,0xFF,0xC5,0x37,0xF6},
255 {0x94,0x09,0xDA,0x87,0xA9,0x0F,0x6B,0xF2},
256 {0x88,0x4F,0x80,0x62,0x50,0x60,0xB8,0xB4},
257 {0x1F,0x85,0x03,0x1C,0x19,0xE1,0x19,0x68},
258 {0x79,0xD9,0x37,0x3A,0x71,0x4C,0xA3,0x4F},
259 {0x93,0x14,0x28,0x87,0xEE,0x3B,0xE1,0x5C},
260 {0x03,0x42,0x9E,0x83,0x8C,0xE2,0xD1,0x4B},
261 {0xA4,0x29,0x9E,0x27,0x46,0x9F,0xF6,0x7B},
262 {0xAF,0xD5,0xAE,0xD1,0xC1,0xBC,0x96,0xA8},
263 {0x10,0x85,0x1C,0x0E,0x38,0x58,0xDA,0x9F},
264 {0xE6,0xF5,0x1E,0xD7,0x9B,0x9D,0xB2,0x1F},
265 {0x64,0xA6,0xE1,0x4A,0xFD,0x36,0xB4,0x6F},
266 {0x80,0xC7,0xD7,0xD4,0x5A,0x54,0x79,0xAD},
267 {0x05,0x04,0x4B,0x62,0xFA,0x52,0xD0,0x80},
268 };
269
270static int test(void );
271static int print_test_data(void );
272int main(int argc, char *argv[])
273 {
274 int ret;
275
276 if (argc > 1)
277 ret=print_test_data();
278 else
279 ret=test();
280
281#ifdef OPENSSL_SYS_NETWARE
282 if (ret) printf("ERROR: %d\n", ret);
283#endif
284 EXIT(ret);
285 return(0);
286 }
287
288static int print_test_data(void)
289 {
290 unsigned int i,j;
291
292 printf("ecb test data\n");
293 printf("key bytes\t\tclear bytes\t\tcipher bytes\n");
294 for (i=0; i<NUM_TESTS; i++)
295 {
296 for (j=0; j<8; j++)
297 printf("%02X",ecb_data[i][j]);
298 printf("\t");
299 for (j=0; j<8; j++)
300 printf("%02X",plain_data[i][j]);
301 printf("\t");
302 for (j=0; j<8; j++)
303 printf("%02X",cipher_data[i][j]);
304 printf("\n");
305 }
306
307 printf("set_key test data\n");
308 printf("data[8]= ");
309 for (j=0; j<8; j++)
310 printf("%02X",key_data[j]);
311 printf("\n");
312 for (i=0; i<KEY_TEST_NUM-1; i++)
313 {
314 printf("c=");
315 for (j=0; j<8; j++)
316 printf("%02X",key_out[i][j]);
317 printf(" k[%2u]=",i+1);
318 for (j=0; j<i+1; j++)
319 printf("%02X",key_test[j]);
320 printf("\n");
321 }
322
323 printf("\nchaining mode test data\n");
324 printf("key[16] = ");
325 for (j=0; j<16; j++)
326 printf("%02X",cbc_key[j]);
327 printf("\niv[8] = ");
328 for (j=0; j<8; j++)
329 printf("%02X",cbc_iv[j]);
330 printf("\ndata[%d] = '%s'",(int)strlen(cbc_data)+1,cbc_data);
331 printf("\ndata[%d] = ",(int)strlen(cbc_data)+1);
332 for (j=0; j<strlen(cbc_data)+1; j++)
333 printf("%02X",cbc_data[j]);
334 printf("\n");
335 printf("cbc cipher text\n");
336 printf("cipher[%d]= ",32);
337 for (j=0; j<32; j++)
338 printf("%02X",cbc_ok[j]);
339 printf("\n");
340
341 printf("cfb64 cipher text\n");
342 printf("cipher[%d]= ",(int)strlen(cbc_data)+1);
343 for (j=0; j<strlen(cbc_data)+1; j++)
344 printf("%02X",cfb64_ok[j]);
345 printf("\n");
346
347 printf("ofb64 cipher text\n");
348 printf("cipher[%d]= ",(int)strlen(cbc_data)+1);
349 for (j=0; j<strlen(cbc_data)+1; j++)
350 printf("%02X",ofb64_ok[j]);
351 printf("\n");
352 return(0);
353 }
354
355static int test(void)
356 {
357 unsigned char cbc_in[40],cbc_out[40],iv[8];
358 int i,n,err=0;
359 BF_KEY key;
360 BF_LONG data[2];
361 unsigned char out[8];
362 BF_LONG len;
363
364#ifdef CHARSET_EBCDIC
365 ebcdic2ascii(cbc_data, cbc_data, strlen(cbc_data));
366#endif
367
368 printf("testing blowfish in raw ecb mode\n");
369 for (n=0; n<2; n++)
370 {
371#ifdef CHARSET_EBCDIC
372 ebcdic2ascii(bf_key[n], bf_key[n], strlen(bf_key[n]));
373#endif
374 BF_set_key(&key,strlen(bf_key[n]),(unsigned char *)bf_key[n]);
375
376 data[0]=bf_plain[n][0];
377 data[1]=bf_plain[n][1];
378 BF_encrypt(data,&key);
379 if (memcmp(&(bf_cipher[n][0]),&(data[0]),8) != 0)
380 {
381 printf("BF_encrypt error encrypting\n");
382 printf("got :");
383 for (i=0; i<2; i++)
384 printf("%08lX ",(unsigned long)data[i]);
385 printf("\n");
386 printf("expected:");
387 for (i=0; i<2; i++)
388 printf("%08lX ",(unsigned long)bf_cipher[n][i]);
389 err=1;
390 printf("\n");
391 }
392
393 BF_decrypt(&(data[0]),&key);
394 if (memcmp(&(bf_plain[n][0]),&(data[0]),8) != 0)
395 {
396 printf("BF_encrypt error decrypting\n");
397 printf("got :");
398 for (i=0; i<2; i++)
399 printf("%08lX ",(unsigned long)data[i]);
400 printf("\n");
401 printf("expected:");
402 for (i=0; i<2; i++)
403 printf("%08lX ",(unsigned long)bf_plain[n][i]);
404 printf("\n");
405 err=1;
406 }
407 }
408
409 printf("testing blowfish in ecb mode\n");
410
411 for (n=0; n<NUM_TESTS; n++)
412 {
413 BF_set_key(&key,8,ecb_data[n]);
414
415 BF_ecb_encrypt(&(plain_data[n][0]),out,&key,BF_ENCRYPT);
416 if (memcmp(&(cipher_data[n][0]),out,8) != 0)
417 {
418 printf("BF_ecb_encrypt blowfish error encrypting\n");
419 printf("got :");
420 for (i=0; i<8; i++)
421 printf("%02X ",out[i]);
422 printf("\n");
423 printf("expected:");
424 for (i=0; i<8; i++)
425 printf("%02X ",cipher_data[n][i]);
426 err=1;
427 printf("\n");
428 }
429
430 BF_ecb_encrypt(out,out,&key,BF_DECRYPT);
431 if (memcmp(&(plain_data[n][0]),out,8) != 0)
432 {
433 printf("BF_ecb_encrypt error decrypting\n");
434 printf("got :");
435 for (i=0; i<8; i++)
436 printf("%02X ",out[i]);
437 printf("\n");
438 printf("expected:");
439 for (i=0; i<8; i++)
440 printf("%02X ",plain_data[n][i]);
441 printf("\n");
442 err=1;
443 }
444 }
445
446 printf("testing blowfish set_key\n");
447 for (n=1; n<KEY_TEST_NUM; n++)
448 {
449 BF_set_key(&key,n,key_test);
450 BF_ecb_encrypt(key_data,out,&key,BF_ENCRYPT);
451 /* mips-sgi-irix6.5-gcc vv -mabi=64 bug workaround */
452 if (memcmp(out,&(key_out[i=n-1][0]),8) != 0)
453 {
454 printf("blowfish setkey error\n");
455 err=1;
456 }
457 }
458
459 printf("testing blowfish in cbc mode\n");
460 len=strlen(cbc_data)+1;
461
462 BF_set_key(&key,16,cbc_key);
463 memset(cbc_in,0,sizeof cbc_in);
464 memset(cbc_out,0,sizeof cbc_out);
465 memcpy(iv,cbc_iv,sizeof iv);
466 BF_cbc_encrypt((unsigned char *)cbc_data,cbc_out,len,
467 &key,iv,BF_ENCRYPT);
468 if (memcmp(cbc_out,cbc_ok,32) != 0)
469 {
470 err=1;
471 printf("BF_cbc_encrypt encrypt error\n");
472 for (i=0; i<32; i++) printf("0x%02X,",cbc_out[i]);
473 }
474 memcpy(iv,cbc_iv,8);
475 BF_cbc_encrypt(cbc_out,cbc_in,len,
476 &key,iv,BF_DECRYPT);
477 if (memcmp(cbc_in,cbc_data,strlen(cbc_data)+1) != 0)
478 {
479 printf("BF_cbc_encrypt decrypt error\n");
480 err=1;
481 }
482
483 printf("testing blowfish in cfb64 mode\n");
484
485 BF_set_key(&key,16,cbc_key);
486 memset(cbc_in,0,40);
487 memset(cbc_out,0,40);
488 memcpy(iv,cbc_iv,8);
489 n=0;
490 BF_cfb64_encrypt((unsigned char *)cbc_data,cbc_out,(long)13,
491 &key,iv,&n,BF_ENCRYPT);
492 BF_cfb64_encrypt((unsigned char *)&(cbc_data[13]),&(cbc_out[13]),len-13,
493 &key,iv,&n,BF_ENCRYPT);
494 if (memcmp(cbc_out,cfb64_ok,(int)len) != 0)
495 {
496 err=1;
497 printf("BF_cfb64_encrypt encrypt error\n");
498 for (i=0; i<(int)len; i++) printf("0x%02X,",cbc_out[i]);
499 }
500 n=0;
501 memcpy(iv,cbc_iv,8);
502 BF_cfb64_encrypt(cbc_out,cbc_in,17,
503 &key,iv,&n,BF_DECRYPT);
504 BF_cfb64_encrypt(&(cbc_out[17]),&(cbc_in[17]),len-17,
505 &key,iv,&n,BF_DECRYPT);
506 if (memcmp(cbc_in,cbc_data,(int)len) != 0)
507 {
508 printf("BF_cfb64_encrypt decrypt error\n");
509 err=1;
510 }
511
512 printf("testing blowfish in ofb64\n");
513
514 BF_set_key(&key,16,cbc_key);
515 memset(cbc_in,0,40);
516 memset(cbc_out,0,40);
517 memcpy(iv,cbc_iv,8);
518 n=0;
519 BF_ofb64_encrypt((unsigned char *)cbc_data,cbc_out,(long)13,&key,iv,&n);
520 BF_ofb64_encrypt((unsigned char *)&(cbc_data[13]),
521 &(cbc_out[13]),len-13,&key,iv,&n);
522 if (memcmp(cbc_out,ofb64_ok,(int)len) != 0)
523 {
524 err=1;
525 printf("BF_ofb64_encrypt encrypt error\n");
526 for (i=0; i<(int)len; i++) printf("0x%02X,",cbc_out[i]);
527 }
528 n=0;
529 memcpy(iv,cbc_iv,8);
530 BF_ofb64_encrypt(cbc_out,cbc_in,17,&key,iv,&n);
531 BF_ofb64_encrypt(&(cbc_out[17]),&(cbc_in[17]),len-17,&key,iv,&n);
532 if (memcmp(cbc_in,cbc_data,(int)len) != 0)
533 {
534 printf("BF_ofb64_encrypt decrypt error\n");
535 err=1;
536 }
537
538 return(err);
539 }
540#endif
diff --git a/src/lib/libcrypto/bf/blowfish.h b/src/lib/libcrypto/bf/blowfish.h
index 4b6c8920a4..b97e76f9a3 100644
--- a/src/lib/libcrypto/bf/blowfish.h
+++ b/src/lib/libcrypto/bf/blowfish.h
@@ -104,9 +104,7 @@ typedef struct bf_key_st
104 BF_LONG S[4*256]; 104 BF_LONG S[4*256];
105 } BF_KEY; 105 } BF_KEY;
106 106
107#ifdef OPENSSL_FIPS 107
108void private_BF_set_key(BF_KEY *key, int len, const unsigned char *data);
109#endif
110void BF_set_key(BF_KEY *key, int len, const unsigned char *data); 108void BF_set_key(BF_KEY *key, int len, const unsigned char *data);
111 109
112void BF_encrypt(BF_LONG *data,const BF_KEY *key); 110void BF_encrypt(BF_LONG *data,const BF_KEY *key);