diff options
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libcrypto/bf/COPYRIGHT | 46 | ||||
| -rw-r--r-- | src/lib/libcrypto/bf/INSTALL | 14 | ||||
| -rw-r--r-- | src/lib/libcrypto/bf/Makefile | 98 | ||||
| -rw-r--r-- | src/lib/libcrypto/bf/README | 8 | ||||
| -rw-r--r-- | src/lib/libcrypto/bf/VERSION | 6 | ||||
| -rw-r--r-- | src/lib/libcrypto/bf/asm/bf-586.pl | 137 | ||||
| -rw-r--r-- | src/lib/libcrypto/bf/asm/bf-686.pl | 127 | ||||
| -rw-r--r-- | src/lib/libcrypto/bf/asm/readme | 10 | ||||
| -rw-r--r-- | src/lib/libcrypto/bf/bf_cbc.c | 143 | ||||
| -rw-r--r-- | src/lib/libcrypto/bf/bf_cfb64.c | 121 | ||||
| -rw-r--r-- | src/lib/libcrypto/bf/bf_ecb.c | 96 | ||||
| -rw-r--r-- | src/lib/libcrypto/bf/bf_enc.c | 306 | ||||
| -rw-r--r-- | src/lib/libcrypto/bf/bf_locl.h | 219 | ||||
| -rw-r--r-- | src/lib/libcrypto/bf/bf_ofb64.c | 110 | ||||
| -rw-r--r-- | src/lib/libcrypto/bf/bf_opts.c | 331 | ||||
| -rw-r--r-- | src/lib/libcrypto/bf/bf_pi.h | 325 | ||||
| -rw-r--r-- | src/lib/libcrypto/bf/bf_skey.c | 116 | ||||
| -rw-r--r-- | src/lib/libcrypto/bf/bfs.cpp | 67 | ||||
| -rw-r--r-- | src/lib/libcrypto/bf/bfspeed.c | 277 | ||||
| -rw-r--r-- | src/lib/libcrypto/bf/bftest.c | 540 | ||||
| -rw-r--r-- | src/lib/libcrypto/bf/blowfish.h | 127 |
21 files changed, 0 insertions, 3224 deletions
diff --git a/src/lib/libcrypto/bf/COPYRIGHT b/src/lib/libcrypto/bf/COPYRIGHT deleted file mode 100644 index 6857223506..0000000000 --- a/src/lib/libcrypto/bf/COPYRIGHT +++ /dev/null | |||
| @@ -1,46 +0,0 @@ | |||
| 1 | Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com) | ||
| 2 | All rights reserved. | ||
| 3 | |||
| 4 | This package is an Blowfish implementation written | ||
| 5 | by Eric Young (eay@cryptsoft.com). | ||
| 6 | |||
| 7 | This library is free for commercial and non-commercial use as long as | ||
| 8 | the following conditions are aheared to. The following conditions | ||
| 9 | apply to all code found in this distribution. | ||
| 10 | |||
| 11 | Copyright remains Eric Young's, and as such any Copyright notices in | ||
| 12 | the code are not to be removed. | ||
| 13 | |||
| 14 | Redistribution and use in source and binary forms, with or without | ||
| 15 | modification, are permitted provided that the following conditions | ||
| 16 | are met: | ||
| 17 | 1. Redistributions of source code must retain the copyright | ||
| 18 | notice, this list of conditions and the following disclaimer. | ||
| 19 | 2. Redistributions in binary form must reproduce the above copyright | ||
| 20 | notice, this list of conditions and the following disclaimer in the | ||
| 21 | documentation and/or other materials provided with the distribution. | ||
| 22 | 3. All advertising materials mentioning features or use of this software | ||
| 23 | must display the following acknowledgement: | ||
| 24 | This product includes software developed by Eric Young (eay@cryptsoft.com) | ||
| 25 | |||
| 26 | THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
| 27 | ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 28 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 29 | ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 30 | FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 31 | DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 32 | OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 33 | HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 34 | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 35 | OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 36 | SUCH DAMAGE. | ||
| 37 | |||
| 38 | The license and distribution terms for any publically available version or | ||
| 39 | derivative of this code cannot be changed. i.e. this code cannot simply be | ||
| 40 | copied and put under another distrubution license | ||
| 41 | [including the GNU Public License.] | ||
| 42 | |||
| 43 | The reason behind this being stated in this direct manner is past | ||
| 44 | experience in code simply being copied and the attribution removed | ||
| 45 | from it and then being distributed as part of other packages. This | ||
| 46 | implementation was a non-trivial and unpaid effort. | ||
diff --git a/src/lib/libcrypto/bf/INSTALL b/src/lib/libcrypto/bf/INSTALL deleted file mode 100644 index 3b25923532..0000000000 --- a/src/lib/libcrypto/bf/INSTALL +++ /dev/null | |||
| @@ -1,14 +0,0 @@ | |||
| 1 | This Eric Young's blowfish implementation, taken from his SSLeay library | ||
| 2 | and made available as a separate library. | ||
| 3 | |||
| 4 | The version number (0.7.2m) is the SSLeay version that this library was | ||
| 5 | taken from. | ||
| 6 | |||
| 7 | To build, just unpack and type make. | ||
| 8 | If you are not using gcc, edit the Makefile. | ||
| 9 | If you are compiling for an x86 box, try the assembler (it needs improving). | ||
| 10 | There are also some compile time options that can improve performance, | ||
| 11 | these are documented in the Makefile. | ||
| 12 | |||
| 13 | eric 15-Apr-1997 | ||
| 14 | |||
diff --git a/src/lib/libcrypto/bf/Makefile b/src/lib/libcrypto/bf/Makefile deleted file mode 100644 index dd2c2c708e..0000000000 --- a/src/lib/libcrypto/bf/Makefile +++ /dev/null | |||
| @@ -1,98 +0,0 @@ | |||
| 1 | # | ||
| 2 | # OpenSSL/crypto/blowfish/Makefile | ||
| 3 | # | ||
| 4 | |||
| 5 | DIR= bf | ||
| 6 | TOP= ../.. | ||
| 7 | CC= cc | ||
| 8 | CPP= $(CC) -E | ||
| 9 | INCLUDES= | ||
| 10 | CFLAG=-g | ||
| 11 | MAKEFILE= Makefile | ||
| 12 | AR= ar r | ||
| 13 | |||
| 14 | BF_ENC= bf_enc.o | ||
| 15 | |||
| 16 | CFLAGS= $(INCLUDES) $(CFLAG) | ||
| 17 | ASFLAGS= $(INCLUDES) $(ASFLAG) | ||
| 18 | AFLAGS= $(ASFLAGS) | ||
| 19 | |||
| 20 | GENERAL=Makefile | ||
| 21 | TEST=bftest.c | ||
| 22 | APPS= | ||
| 23 | |||
| 24 | LIB=$(TOP)/libcrypto.a | ||
| 25 | LIBSRC=bf_skey.c bf_ecb.c bf_enc.c bf_cfb64.c bf_ofb64.c | ||
| 26 | LIBOBJ=bf_skey.o bf_ecb.o $(BF_ENC) bf_cfb64.o bf_ofb64.o | ||
| 27 | |||
| 28 | SRC= $(LIBSRC) | ||
| 29 | |||
| 30 | EXHEADER= blowfish.h | ||
| 31 | HEADER= bf_pi.h bf_locl.h $(EXHEADER) | ||
| 32 | |||
| 33 | ALL= $(GENERAL) $(SRC) $(HEADER) | ||
| 34 | |||
| 35 | top: | ||
| 36 | (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) | ||
| 37 | |||
| 38 | all: lib | ||
| 39 | |||
| 40 | lib: $(LIBOBJ) | ||
| 41 | $(AR) $(LIB) $(LIBOBJ) | ||
| 42 | $(RANLIB) $(LIB) || echo Never mind. | ||
| 43 | @touch lib | ||
| 44 | |||
| 45 | bf-586.s: asm/bf-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl | ||
| 46 | $(PERL) asm/bf-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@ | ||
| 47 | |||
| 48 | files: | ||
| 49 | $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO | ||
| 50 | |||
| 51 | links: | ||
| 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 | ||
| 58 | FRC.install: | ||
| 59 | install: 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 | |||
| 67 | tags: | ||
| 68 | ctags $(SRC) | ||
| 69 | |||
| 70 | tests: | ||
| 71 | |||
| 72 | lint: | ||
| 73 | lint -DLINT $(INCLUDES) $(SRC)>fluff | ||
| 74 | |||
| 75 | depend: | ||
| 76 | @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... | ||
| 77 | $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) | ||
| 78 | |||
| 79 | dclean: | ||
| 80 | $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new | ||
| 81 | mv -f Makefile.new $(MAKEFILE) | ||
| 82 | |||
| 83 | clean: | ||
| 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 | |||
| 88 | bf_cfb64.o: ../../include/openssl/blowfish.h ../../include/openssl/e_os2.h | ||
| 89 | bf_cfb64.o: ../../include/openssl/opensslconf.h bf_cfb64.c bf_locl.h | ||
| 90 | bf_ecb.o: ../../include/openssl/blowfish.h ../../include/openssl/e_os2.h | ||
| 91 | bf_ecb.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h | ||
| 92 | bf_ecb.o: bf_ecb.c bf_locl.h | ||
| 93 | bf_enc.o: ../../include/openssl/blowfish.h ../../include/openssl/e_os2.h | ||
| 94 | bf_enc.o: ../../include/openssl/opensslconf.h bf_enc.c bf_locl.h | ||
| 95 | bf_ofb64.o: ../../include/openssl/blowfish.h ../../include/openssl/e_os2.h | ||
| 96 | bf_ofb64.o: ../../include/openssl/opensslconf.h bf_locl.h bf_ofb64.c | ||
| 97 | bf_skey.o: ../../include/openssl/blowfish.h ../../include/openssl/e_os2.h | ||
| 98 | bf_skey.o: ../../include/openssl/opensslconf.h bf_locl.h bf_pi.h bf_skey.c | ||
diff --git a/src/lib/libcrypto/bf/README b/src/lib/libcrypto/bf/README deleted file mode 100644 index f2712fd0e7..0000000000 --- a/src/lib/libcrypto/bf/README +++ /dev/null | |||
| @@ -1,8 +0,0 @@ | |||
| 1 | This is a quick packaging up of my blowfish code into a library. | ||
| 2 | It has been lifted from SSLeay. | ||
| 3 | The copyright notices seem a little harsh because I have not spent the | ||
| 4 | time to rewrite the conditions from the normal SSLeay ones. | ||
| 5 | |||
| 6 | Basically if you just want to play with the library, not a problem. | ||
| 7 | |||
| 8 | eric 15-Apr-1997 | ||
diff --git a/src/lib/libcrypto/bf/VERSION b/src/lib/libcrypto/bf/VERSION deleted file mode 100644 index be995855e4..0000000000 --- a/src/lib/libcrypto/bf/VERSION +++ /dev/null | |||
| @@ -1,6 +0,0 @@ | |||
| 1 | The version numbers will follow my SSL implementation | ||
| 2 | |||
| 3 | 0.7.2r - Some reasonable default compiler options from | ||
| 4 | Peter Gutman <pgut001@cs.auckland.ac.nz> | ||
| 5 | |||
| 6 | 0.7.2m - the first release | ||
diff --git a/src/lib/libcrypto/bf/asm/bf-586.pl b/src/lib/libcrypto/bf/asm/bf-586.pl deleted file mode 100644 index 1f9b345aee..0000000000 --- a/src/lib/libcrypto/bf/asm/bf-586.pl +++ /dev/null | |||
| @@ -1,137 +0,0 @@ | |||
| 1 | #!/usr/local/bin/perl | ||
| 2 | |||
| 3 | $0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1; | ||
| 4 | push(@INC,"${dir}","${dir}../../perlasm"); | ||
| 5 | require "x86asm.pl"; | ||
| 6 | require "cbc.pl"; | ||
| 7 | |||
| 8 | &asm_init($ARGV[0],"bf-586.pl",$ARGV[$#ARGV] eq "386"); | ||
| 9 | |||
| 10 | $BF_ROUNDS=16; | ||
| 11 | $BF_OFF=($BF_ROUNDS+2)*4; | ||
| 12 | $L="edi"; | ||
| 13 | $R="esi"; | ||
| 14 | $P="ebp"; | ||
| 15 | $tmp1="eax"; | ||
| 16 | $tmp2="ebx"; | ||
| 17 | $tmp3="ecx"; | ||
| 18 | $tmp4="edx"; | ||
| 19 | |||
| 20 | &BF_encrypt("BF_encrypt",1); | ||
| 21 | &BF_encrypt("BF_decrypt",0); | ||
| 22 | &cbc("BF_cbc_encrypt","BF_encrypt","BF_decrypt",1,4,5,3,-1,-1) unless $main'openbsd; | ||
| 23 | &asm_finish(); | ||
| 24 | |||
| 25 | sub BF_encrypt | ||
| 26 | { | ||
| 27 | local($name,$enc)=@_; | ||
| 28 | |||
| 29 | &function_begin_B($name,""); | ||
| 30 | |||
| 31 | &comment(""); | ||
| 32 | |||
| 33 | &push("ebp"); | ||
| 34 | &push("ebx"); | ||
| 35 | &mov($tmp2,&wparam(0)); | ||
| 36 | &mov($P,&wparam(1)); | ||
| 37 | &push("esi"); | ||
| 38 | &push("edi"); | ||
| 39 | |||
| 40 | &comment("Load the 2 words"); | ||
| 41 | &mov($L,&DWP(0,$tmp2,"",0)); | ||
| 42 | &mov($R,&DWP(4,$tmp2,"",0)); | ||
| 43 | |||
| 44 | &xor( $tmp1, $tmp1); | ||
| 45 | |||
| 46 | # encrypting part | ||
| 47 | |||
| 48 | if ($enc) | ||
| 49 | { | ||
| 50 | &mov($tmp2,&DWP(0,$P,"",0)); | ||
| 51 | &xor( $tmp3, $tmp3); | ||
| 52 | |||
| 53 | &xor($L,$tmp2); | ||
| 54 | for ($i=0; $i<$BF_ROUNDS; $i+=2) | ||
| 55 | { | ||
| 56 | &comment(""); | ||
| 57 | &comment("Round $i"); | ||
| 58 | &BF_ENCRYPT($i+1,$R,$L,$P,$tmp1,$tmp2,$tmp3,$tmp4,1); | ||
| 59 | |||
| 60 | &comment(""); | ||
| 61 | &comment("Round ".sprintf("%d",$i+1)); | ||
| 62 | &BF_ENCRYPT($i+2,$L,$R,$P,$tmp1,$tmp2,$tmp3,$tmp4,1); | ||
| 63 | } | ||
| 64 | # &mov($tmp1,&wparam(0)); In last loop | ||
| 65 | &mov($tmp4,&DWP(($BF_ROUNDS+1)*4,$P,"",0)); | ||
| 66 | } | ||
| 67 | else | ||
| 68 | { | ||
| 69 | &mov($tmp2,&DWP(($BF_ROUNDS+1)*4,$P,"",0)); | ||
| 70 | &xor( $tmp3, $tmp3); | ||
| 71 | |||
| 72 | &xor($L,$tmp2); | ||
| 73 | for ($i=$BF_ROUNDS; $i>0; $i-=2) | ||
| 74 | { | ||
| 75 | &comment(""); | ||
| 76 | &comment("Round $i"); | ||
| 77 | &BF_ENCRYPT($i,$R,$L,$P,$tmp1,$tmp2,$tmp3,$tmp4,0); | ||
| 78 | &comment(""); | ||
| 79 | &comment("Round ".sprintf("%d",$i-1)); | ||
| 80 | &BF_ENCRYPT($i-1,$L,$R,$P,$tmp1,$tmp2,$tmp3,$tmp4,0); | ||
| 81 | } | ||
| 82 | # &mov($tmp1,&wparam(0)); In last loop | ||
| 83 | &mov($tmp4,&DWP(0,$P,"",0)); | ||
| 84 | } | ||
| 85 | |||
| 86 | &xor($R,$tmp4); | ||
| 87 | &mov(&DWP(4,$tmp1,"",0),$L); | ||
| 88 | |||
| 89 | &mov(&DWP(0,$tmp1,"",0),$R); | ||
| 90 | &function_end($name); | ||
| 91 | } | ||
| 92 | |||
| 93 | sub BF_ENCRYPT | ||
| 94 | { | ||
| 95 | local($i,$L,$R,$P,$tmp1,$tmp2,$tmp3,$tmp4,$enc)=@_; | ||
| 96 | |||
| 97 | &mov( $tmp4, &DWP(&n2a($i*4),$P,"",0)); # for next round | ||
| 98 | |||
| 99 | &mov( $tmp2, $R); | ||
| 100 | &xor( $L, $tmp4); | ||
| 101 | |||
| 102 | &shr( $tmp2, 16); | ||
| 103 | &mov( $tmp4, $R); | ||
| 104 | |||
| 105 | &movb( &LB($tmp1), &HB($tmp2)); # A | ||
| 106 | &and( $tmp2, 0xff); # B | ||
| 107 | |||
| 108 | &movb( &LB($tmp3), &HB($tmp4)); # C | ||
| 109 | &and( $tmp4, 0xff); # D | ||
| 110 | |||
| 111 | &mov( $tmp1, &DWP(&n2a($BF_OFF+0x0000),$P,$tmp1,4)); | ||
| 112 | &mov( $tmp2, &DWP(&n2a($BF_OFF+0x0400),$P,$tmp2,4)); | ||
| 113 | |||
| 114 | &add( $tmp2, $tmp1); | ||
| 115 | &mov( $tmp1, &DWP(&n2a($BF_OFF+0x0800),$P,$tmp3,4)); | ||
| 116 | |||
| 117 | &xor( $tmp2, $tmp1); | ||
| 118 | &mov( $tmp4, &DWP(&n2a($BF_OFF+0x0C00),$P,$tmp4,4)); | ||
| 119 | |||
| 120 | &add( $tmp2, $tmp4); | ||
| 121 | if (($enc && ($i != 16)) || ((!$enc) && ($i != 1))) | ||
| 122 | { &xor( $tmp1, $tmp1); } | ||
| 123 | else | ||
| 124 | { | ||
| 125 | &comment("Load parameter 0 ($i) enc=$enc"); | ||
| 126 | &mov($tmp1,&wparam(0)); | ||
| 127 | } # In last loop | ||
| 128 | |||
| 129 | &xor( $L, $tmp2); | ||
| 130 | # delay | ||
| 131 | } | ||
| 132 | |||
| 133 | sub n2a | ||
| 134 | { | ||
| 135 | sprintf("%d",$_[0]); | ||
| 136 | } | ||
| 137 | |||
diff --git a/src/lib/libcrypto/bf/asm/bf-686.pl b/src/lib/libcrypto/bf/asm/bf-686.pl deleted file mode 100644 index 8e4c25f598..0000000000 --- a/src/lib/libcrypto/bf/asm/bf-686.pl +++ /dev/null | |||
| @@ -1,127 +0,0 @@ | |||
| 1 | #!/usr/local/bin/perl | ||
| 2 | |||
| 3 | push(@INC,"perlasm","../../perlasm"); | ||
| 4 | require "x86asm.pl"; | ||
| 5 | require "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 | |||
| 27 | sub 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 | |||
| 91 | sub 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 | |||
| 123 | sub n2a | ||
| 124 | { | ||
| 125 | sprintf("%d",$_[0]); | ||
| 126 | } | ||
| 127 | |||
diff --git a/src/lib/libcrypto/bf/asm/readme b/src/lib/libcrypto/bf/asm/readme deleted file mode 100644 index 2385fa3812..0000000000 --- a/src/lib/libcrypto/bf/asm/readme +++ /dev/null | |||
| @@ -1,10 +0,0 @@ | |||
| 1 | There are blowfish assembler generation scripts. | ||
| 2 | bf-586.pl version is for the pentium and | ||
| 3 | bf-686.pl is my original version, which is faster on the pentium pro. | ||
| 4 | |||
| 5 | When using a bf-586.pl, the pentium pro/II is %8 slower than using | ||
| 6 | bf-686.pl. When using a bf-686.pl, the pentium is %16 slower | ||
| 7 | than bf-586.pl | ||
| 8 | |||
| 9 | So the default is bf-586.pl | ||
| 10 | |||
diff --git a/src/lib/libcrypto/bf/bf_cbc.c b/src/lib/libcrypto/bf/bf_cbc.c deleted file mode 100644 index f949629dc6..0000000000 --- a/src/lib/libcrypto/bf/bf_cbc.c +++ /dev/null | |||
| @@ -1,143 +0,0 @@ | |||
| 1 | /* crypto/bf/bf_cbc.c */ | ||
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
| 3 | * All rights reserved. | ||
| 4 | * | ||
| 5 | * This package is an SSL implementation written | ||
| 6 | * by Eric Young (eay@cryptsoft.com). | ||
| 7 | * The implementation was written so as to conform with Netscapes SSL. | ||
| 8 | * | ||
| 9 | * This library is free for commercial and non-commercial use as long as | ||
| 10 | * the following conditions are aheared to. The following conditions | ||
| 11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
| 12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
| 13 | * included with this distribution is covered by the same copyright terms | ||
| 14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
| 15 | * | ||
| 16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
| 17 | * the code are not to be removed. | ||
| 18 | * If this package is used in a product, Eric Young should be given attribution | ||
| 19 | * as the author of the parts of the library used. | ||
| 20 | * This can be in the form of a textual message at program startup or | ||
| 21 | * in documentation (online or textual) provided with the package. | ||
| 22 | * | ||
| 23 | * Redistribution and use in source and binary forms, with or without | ||
| 24 | * modification, are permitted provided that the following conditions | ||
| 25 | * are met: | ||
| 26 | * 1. Redistributions of source code must retain the copyright | ||
| 27 | * notice, this list of conditions and the following disclaimer. | ||
| 28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 29 | * notice, this list of conditions and the following disclaimer in the | ||
| 30 | * documentation and/or other materials provided with the distribution. | ||
| 31 | * 3. All advertising materials mentioning features or use of this software | ||
| 32 | * must display the following acknowledgement: | ||
| 33 | * "This product includes cryptographic software written by | ||
| 34 | * Eric Young (eay@cryptsoft.com)" | ||
| 35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
| 36 | * being used are not cryptographic related :-). | ||
| 37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
| 38 | * the apps directory (application code) you must include an acknowledgement: | ||
| 39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
| 40 | * | ||
| 41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
| 42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 51 | * SUCH DAMAGE. | ||
| 52 | * | ||
| 53 | * The licence and distribution terms for any publically available version or | ||
| 54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
| 55 | * copied and put under another distribution licence | ||
| 56 | * [including the GNU Public Licence.] | ||
| 57 | */ | ||
| 58 | |||
| 59 | #include <openssl/blowfish.h> | ||
| 60 | #include "bf_locl.h" | ||
| 61 | |||
| 62 | void BF_cbc_encrypt(const unsigned char *in, unsigned char *out, long length, | ||
| 63 | const BF_KEY *schedule, unsigned char *ivec, int encrypt) | ||
| 64 | { | ||
| 65 | register BF_LONG tin0,tin1; | ||
| 66 | register BF_LONG tout0,tout1,xor0,xor1; | ||
| 67 | register long l=length; | ||
| 68 | BF_LONG tin[2]; | ||
| 69 | |||
| 70 | if (encrypt) | ||
| 71 | { | ||
| 72 | n2l(ivec,tout0); | ||
| 73 | n2l(ivec,tout1); | ||
| 74 | ivec-=8; | ||
| 75 | for (l-=8; l>=0; l-=8) | ||
| 76 | { | ||
| 77 | n2l(in,tin0); | ||
| 78 | n2l(in,tin1); | ||
| 79 | tin0^=tout0; | ||
| 80 | tin1^=tout1; | ||
| 81 | tin[0]=tin0; | ||
| 82 | tin[1]=tin1; | ||
| 83 | BF_encrypt(tin,schedule); | ||
| 84 | tout0=tin[0]; | ||
| 85 | tout1=tin[1]; | ||
| 86 | l2n(tout0,out); | ||
| 87 | l2n(tout1,out); | ||
| 88 | } | ||
| 89 | if (l != -8) | ||
| 90 | { | ||
| 91 | n2ln(in,tin0,tin1,l+8); | ||
| 92 | tin0^=tout0; | ||
| 93 | tin1^=tout1; | ||
| 94 | tin[0]=tin0; | ||
| 95 | tin[1]=tin1; | ||
| 96 | BF_encrypt(tin,schedule); | ||
| 97 | tout0=tin[0]; | ||
| 98 | tout1=tin[1]; | ||
| 99 | l2n(tout0,out); | ||
| 100 | l2n(tout1,out); | ||
| 101 | } | ||
| 102 | l2n(tout0,ivec); | ||
| 103 | l2n(tout1,ivec); | ||
| 104 | } | ||
| 105 | else | ||
| 106 | { | ||
| 107 | n2l(ivec,xor0); | ||
| 108 | n2l(ivec,xor1); | ||
| 109 | ivec-=8; | ||
| 110 | for (l-=8; l>=0; l-=8) | ||
| 111 | { | ||
| 112 | n2l(in,tin0); | ||
| 113 | n2l(in,tin1); | ||
| 114 | tin[0]=tin0; | ||
| 115 | tin[1]=tin1; | ||
| 116 | BF_decrypt(tin,schedule); | ||
| 117 | tout0=tin[0]^xor0; | ||
| 118 | tout1=tin[1]^xor1; | ||
| 119 | l2n(tout0,out); | ||
| 120 | l2n(tout1,out); | ||
| 121 | xor0=tin0; | ||
| 122 | xor1=tin1; | ||
| 123 | } | ||
| 124 | if (l != -8) | ||
| 125 | { | ||
| 126 | n2l(in,tin0); | ||
| 127 | n2l(in,tin1); | ||
| 128 | tin[0]=tin0; | ||
| 129 | tin[1]=tin1; | ||
| 130 | BF_decrypt(tin,schedule); | ||
| 131 | tout0=tin[0]^xor0; | ||
| 132 | tout1=tin[1]^xor1; | ||
| 133 | l2nn(tout0,tout1,out,l+8); | ||
| 134 | xor0=tin0; | ||
| 135 | xor1=tin1; | ||
| 136 | } | ||
| 137 | l2n(xor0,ivec); | ||
| 138 | l2n(xor1,ivec); | ||
| 139 | } | ||
| 140 | tin0=tin1=tout0=tout1=xor0=xor1=0; | ||
| 141 | tin[0]=tin[1]=0; | ||
| 142 | } | ||
| 143 | |||
diff --git a/src/lib/libcrypto/bf/bf_cfb64.c b/src/lib/libcrypto/bf/bf_cfb64.c deleted file mode 100644 index 6451c8d407..0000000000 --- a/src/lib/libcrypto/bf/bf_cfb64.c +++ /dev/null | |||
| @@ -1,121 +0,0 @@ | |||
| 1 | /* crypto/bf/bf_cfb64.c */ | ||
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
| 3 | * All rights reserved. | ||
| 4 | * | ||
| 5 | * This package is an SSL implementation written | ||
| 6 | * by Eric Young (eay@cryptsoft.com). | ||
| 7 | * The implementation was written so as to conform with Netscapes SSL. | ||
| 8 | * | ||
| 9 | * This library is free for commercial and non-commercial use as long as | ||
| 10 | * the following conditions are aheared to. The following conditions | ||
| 11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
| 12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
| 13 | * included with this distribution is covered by the same copyright terms | ||
| 14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
| 15 | * | ||
| 16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
| 17 | * the code are not to be removed. | ||
| 18 | * If this package is used in a product, Eric Young should be given attribution | ||
| 19 | * as the author of the parts of the library used. | ||
| 20 | * This can be in the form of a textual message at program startup or | ||
| 21 | * in documentation (online or textual) provided with the package. | ||
| 22 | * | ||
| 23 | * Redistribution and use in source and binary forms, with or without | ||
| 24 | * modification, are permitted provided that the following conditions | ||
| 25 | * are met: | ||
| 26 | * 1. Redistributions of source code must retain the copyright | ||
| 27 | * notice, this list of conditions and the following disclaimer. | ||
| 28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 29 | * notice, this list of conditions and the following disclaimer in the | ||
| 30 | * documentation and/or other materials provided with the distribution. | ||
| 31 | * 3. All advertising materials mentioning features or use of this software | ||
| 32 | * must display the following acknowledgement: | ||
| 33 | * "This product includes cryptographic software written by | ||
| 34 | * Eric Young (eay@cryptsoft.com)" | ||
| 35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
| 36 | * being used are not cryptographic related :-). | ||
| 37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
| 38 | * the apps directory (application code) you must include an acknowledgement: | ||
| 39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
| 40 | * | ||
| 41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
| 42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 51 | * SUCH DAMAGE. | ||
| 52 | * | ||
| 53 | * The licence and distribution terms for any publically available version or | ||
| 54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
| 55 | * copied and put under another distribution licence | ||
| 56 | * [including the GNU Public Licence.] | ||
| 57 | */ | ||
| 58 | |||
| 59 | #include <openssl/blowfish.h> | ||
| 60 | #include "bf_locl.h" | ||
| 61 | |||
| 62 | /* The input and output encrypted as though 64bit cfb mode is being | ||
| 63 | * used. The extra state information to record how much of the | ||
| 64 | * 64bit block we have used is contained in *num; | ||
| 65 | */ | ||
| 66 | |||
| 67 | void BF_cfb64_encrypt(const unsigned char *in, unsigned char *out, long length, | ||
| 68 | const BF_KEY *schedule, unsigned char *ivec, int *num, int encrypt) | ||
| 69 | { | ||
| 70 | register BF_LONG v0,v1,t; | ||
| 71 | register int n= *num; | ||
| 72 | register long l=length; | ||
| 73 | BF_LONG ti[2]; | ||
| 74 | unsigned char *iv,c,cc; | ||
| 75 | |||
| 76 | iv=(unsigned char *)ivec; | ||
| 77 | if (encrypt) | ||
| 78 | { | ||
| 79 | while (l--) | ||
| 80 | { | ||
| 81 | if (n == 0) | ||
| 82 | { | ||
| 83 | n2l(iv,v0); ti[0]=v0; | ||
| 84 | n2l(iv,v1); ti[1]=v1; | ||
| 85 | BF_encrypt((BF_LONG *)ti,schedule); | ||
| 86 | iv=(unsigned char *)ivec; | ||
| 87 | t=ti[0]; l2n(t,iv); | ||
| 88 | t=ti[1]; l2n(t,iv); | ||
| 89 | iv=(unsigned char *)ivec; | ||
| 90 | } | ||
| 91 | c= *(in++)^iv[n]; | ||
| 92 | *(out++)=c; | ||
| 93 | iv[n]=c; | ||
| 94 | n=(n+1)&0x07; | ||
| 95 | } | ||
| 96 | } | ||
| 97 | else | ||
| 98 | { | ||
| 99 | while (l--) | ||
| 100 | { | ||
| 101 | if (n == 0) | ||
| 102 | { | ||
| 103 | n2l(iv,v0); ti[0]=v0; | ||
| 104 | n2l(iv,v1); ti[1]=v1; | ||
| 105 | BF_encrypt((BF_LONG *)ti,schedule); | ||
| 106 | iv=(unsigned char *)ivec; | ||
| 107 | t=ti[0]; l2n(t,iv); | ||
| 108 | t=ti[1]; l2n(t,iv); | ||
| 109 | iv=(unsigned char *)ivec; | ||
| 110 | } | ||
| 111 | cc= *(in++); | ||
| 112 | c=iv[n]; | ||
| 113 | iv[n]=cc; | ||
| 114 | *(out++)=c^cc; | ||
| 115 | n=(n+1)&0x07; | ||
| 116 | } | ||
| 117 | } | ||
| 118 | v0=v1=ti[0]=ti[1]=t=c=cc=0; | ||
| 119 | *num=n; | ||
| 120 | } | ||
| 121 | |||
diff --git a/src/lib/libcrypto/bf/bf_ecb.c b/src/lib/libcrypto/bf/bf_ecb.c deleted file mode 100644 index 1607cefa32..0000000000 --- a/src/lib/libcrypto/bf/bf_ecb.c +++ /dev/null | |||
| @@ -1,96 +0,0 @@ | |||
| 1 | /* crypto/bf/bf_ecb.c */ | ||
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
| 3 | * All rights reserved. | ||
| 4 | * | ||
| 5 | * This package is an SSL implementation written | ||
| 6 | * by Eric Young (eay@cryptsoft.com). | ||
| 7 | * The implementation was written so as to conform with Netscapes SSL. | ||
| 8 | * | ||
| 9 | * This library is free for commercial and non-commercial use as long as | ||
| 10 | * the following conditions are aheared to. The following conditions | ||
| 11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
| 12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
| 13 | * included with this distribution is covered by the same copyright terms | ||
| 14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
| 15 | * | ||
| 16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
| 17 | * the code are not to be removed. | ||
| 18 | * If this package is used in a product, Eric Young should be given attribution | ||
| 19 | * as the author of the parts of the library used. | ||
| 20 | * This can be in the form of a textual message at program startup or | ||
| 21 | * in documentation (online or textual) provided with the package. | ||
| 22 | * | ||
| 23 | * Redistribution and use in source and binary forms, with or without | ||
| 24 | * modification, are permitted provided that the following conditions | ||
| 25 | * are met: | ||
| 26 | * 1. Redistributions of source code must retain the copyright | ||
| 27 | * notice, this list of conditions and the following disclaimer. | ||
| 28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 29 | * notice, this list of conditions and the following disclaimer in the | ||
| 30 | * documentation and/or other materials provided with the distribution. | ||
| 31 | * 3. All advertising materials mentioning features or use of this software | ||
| 32 | * must display the following acknowledgement: | ||
| 33 | * "This product includes cryptographic software written by | ||
| 34 | * Eric Young (eay@cryptsoft.com)" | ||
| 35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
| 36 | * being used are not cryptographic related :-). | ||
| 37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
| 38 | * the apps directory (application code) you must include an acknowledgement: | ||
| 39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
| 40 | * | ||
| 41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
| 42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 51 | * SUCH DAMAGE. | ||
| 52 | * | ||
| 53 | * The licence and distribution terms for any publically available version or | ||
| 54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
| 55 | * copied and put under another distribution licence | ||
| 56 | * [including the GNU Public Licence.] | ||
| 57 | */ | ||
| 58 | |||
| 59 | #include <openssl/blowfish.h> | ||
| 60 | #include "bf_locl.h" | ||
| 61 | #include <openssl/opensslv.h> | ||
| 62 | |||
| 63 | /* Blowfish as implemented from 'Blowfish: Springer-Verlag paper' | ||
| 64 | * (From LECTURE NOTES IN COMPUTER SCIENCE 809, FAST SOFTWARE ENCRYPTION, | ||
| 65 | * CAMBRIDGE SECURITY WORKSHOP, CAMBRIDGE, U.K., DECEMBER 9-11, 1993) | ||
| 66 | */ | ||
| 67 | |||
| 68 | const char BF_version[]="Blowfish" OPENSSL_VERSION_PTEXT; | ||
| 69 | |||
| 70 | const char *BF_options(void) | ||
| 71 | { | ||
| 72 | #ifdef BF_PTR | ||
| 73 | return("blowfish(ptr)"); | ||
| 74 | #elif defined(BF_PTR2) | ||
| 75 | return("blowfish(ptr2)"); | ||
| 76 | #else | ||
| 77 | return("blowfish(idx)"); | ||
| 78 | #endif | ||
| 79 | } | ||
| 80 | |||
| 81 | void BF_ecb_encrypt(const unsigned char *in, unsigned char *out, | ||
| 82 | const BF_KEY *key, int encrypt) | ||
| 83 | { | ||
| 84 | BF_LONG l,d[2]; | ||
| 85 | |||
| 86 | n2l(in,l); d[0]=l; | ||
| 87 | n2l(in,l); d[1]=l; | ||
| 88 | if (encrypt) | ||
| 89 | BF_encrypt(d,key); | ||
| 90 | else | ||
| 91 | BF_decrypt(d,key); | ||
| 92 | l=d[0]; l2n(l,out); | ||
| 93 | l=d[1]; l2n(l,out); | ||
| 94 | l=d[0]=d[1]=0; | ||
| 95 | } | ||
| 96 | |||
diff --git a/src/lib/libcrypto/bf/bf_enc.c b/src/lib/libcrypto/bf/bf_enc.c deleted file mode 100644 index 2d21d09f42..0000000000 --- a/src/lib/libcrypto/bf/bf_enc.c +++ /dev/null | |||
| @@ -1,306 +0,0 @@ | |||
| 1 | /* crypto/bf/bf_enc.c */ | ||
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
| 3 | * All rights reserved. | ||
| 4 | * | ||
| 5 | * This package is an SSL implementation written | ||
| 6 | * by Eric Young (eay@cryptsoft.com). | ||
| 7 | * The implementation was written so as to conform with Netscapes SSL. | ||
| 8 | * | ||
| 9 | * This library is free for commercial and non-commercial use as long as | ||
| 10 | * the following conditions are aheared to. The following conditions | ||
| 11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
| 12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
| 13 | * included with this distribution is covered by the same copyright terms | ||
| 14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
| 15 | * | ||
| 16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
| 17 | * the code are not to be removed. | ||
| 18 | * If this package is used in a product, Eric Young should be given attribution | ||
| 19 | * as the author of the parts of the library used. | ||
| 20 | * This can be in the form of a textual message at program startup or | ||
| 21 | * in documentation (online or textual) provided with the package. | ||
| 22 | * | ||
| 23 | * Redistribution and use in source and binary forms, with or without | ||
| 24 | * modification, are permitted provided that the following conditions | ||
| 25 | * are met: | ||
| 26 | * 1. Redistributions of source code must retain the copyright | ||
| 27 | * notice, this list of conditions and the following disclaimer. | ||
| 28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 29 | * notice, this list of conditions and the following disclaimer in the | ||
| 30 | * documentation and/or other materials provided with the distribution. | ||
| 31 | * 3. All advertising materials mentioning features or use of this software | ||
| 32 | * must display the following acknowledgement: | ||
| 33 | * "This product includes cryptographic software written by | ||
| 34 | * Eric Young (eay@cryptsoft.com)" | ||
| 35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
| 36 | * being used are not cryptographic related :-). | ||
| 37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
| 38 | * the apps directory (application code) you must include an acknowledgement: | ||
| 39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
| 40 | * | ||
| 41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
| 42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 51 | * SUCH DAMAGE. | ||
| 52 | * | ||
| 53 | * The licence and distribution terms for any publically available version or | ||
| 54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
| 55 | * copied and put under another distribution licence | ||
| 56 | * [including the GNU Public Licence.] | ||
| 57 | */ | ||
| 58 | |||
| 59 | #include <openssl/blowfish.h> | ||
| 60 | #include "bf_locl.h" | ||
| 61 | |||
| 62 | /* Blowfish as implemented from 'Blowfish: Springer-Verlag paper' | ||
| 63 | * (From LECTURE NOTES IN COMPUTER SCIENCE 809, FAST SOFTWARE ENCRYPTION, | ||
| 64 | * CAMBRIDGE SECURITY WORKSHOP, CAMBRIDGE, U.K., DECEMBER 9-11, 1993) | ||
| 65 | */ | ||
| 66 | |||
| 67 | #if (BF_ROUNDS != 16) && (BF_ROUNDS != 20) | ||
| 68 | #error If you set BF_ROUNDS to some value other than 16 or 20, you will have \ | ||
| 69 | to modify the code. | ||
| 70 | #endif | ||
| 71 | |||
| 72 | void BF_encrypt(BF_LONG *data, const BF_KEY *key) | ||
| 73 | { | ||
| 74 | #ifndef BF_PTR2 | ||
| 75 | register BF_LONG l,r; | ||
| 76 | register const BF_LONG *p,*s; | ||
| 77 | |||
| 78 | p=key->P; | ||
| 79 | s= &(key->S[0]); | ||
| 80 | l=data[0]; | ||
| 81 | r=data[1]; | ||
| 82 | |||
| 83 | l^=p[0]; | ||
| 84 | BF_ENC(r,l,s,p[ 1]); | ||
| 85 | BF_ENC(l,r,s,p[ 2]); | ||
| 86 | BF_ENC(r,l,s,p[ 3]); | ||
| 87 | BF_ENC(l,r,s,p[ 4]); | ||
| 88 | BF_ENC(r,l,s,p[ 5]); | ||
| 89 | BF_ENC(l,r,s,p[ 6]); | ||
| 90 | BF_ENC(r,l,s,p[ 7]); | ||
| 91 | BF_ENC(l,r,s,p[ 8]); | ||
| 92 | BF_ENC(r,l,s,p[ 9]); | ||
| 93 | BF_ENC(l,r,s,p[10]); | ||
| 94 | BF_ENC(r,l,s,p[11]); | ||
| 95 | BF_ENC(l,r,s,p[12]); | ||
| 96 | BF_ENC(r,l,s,p[13]); | ||
| 97 | BF_ENC(l,r,s,p[14]); | ||
| 98 | BF_ENC(r,l,s,p[15]); | ||
| 99 | BF_ENC(l,r,s,p[16]); | ||
| 100 | #if BF_ROUNDS == 20 | ||
| 101 | BF_ENC(r,l,s,p[17]); | ||
| 102 | BF_ENC(l,r,s,p[18]); | ||
| 103 | BF_ENC(r,l,s,p[19]); | ||
| 104 | BF_ENC(l,r,s,p[20]); | ||
| 105 | #endif | ||
| 106 | r^=p[BF_ROUNDS+1]; | ||
| 107 | |||
| 108 | data[1]=l&0xffffffffL; | ||
| 109 | data[0]=r&0xffffffffL; | ||
| 110 | #else | ||
| 111 | register BF_LONG l,r,t,*k; | ||
| 112 | |||
| 113 | l=data[0]; | ||
| 114 | r=data[1]; | ||
| 115 | k=(BF_LONG*)key; | ||
| 116 | |||
| 117 | l^=k[0]; | ||
| 118 | BF_ENC(r,l,k, 1); | ||
| 119 | BF_ENC(l,r,k, 2); | ||
| 120 | BF_ENC(r,l,k, 3); | ||
| 121 | BF_ENC(l,r,k, 4); | ||
| 122 | BF_ENC(r,l,k, 5); | ||
| 123 | BF_ENC(l,r,k, 6); | ||
| 124 | BF_ENC(r,l,k, 7); | ||
| 125 | BF_ENC(l,r,k, 8); | ||
| 126 | BF_ENC(r,l,k, 9); | ||
| 127 | BF_ENC(l,r,k,10); | ||
| 128 | BF_ENC(r,l,k,11); | ||
| 129 | BF_ENC(l,r,k,12); | ||
| 130 | BF_ENC(r,l,k,13); | ||
| 131 | BF_ENC(l,r,k,14); | ||
| 132 | BF_ENC(r,l,k,15); | ||
| 133 | BF_ENC(l,r,k,16); | ||
| 134 | #if BF_ROUNDS == 20 | ||
| 135 | BF_ENC(r,l,k,17); | ||
| 136 | BF_ENC(l,r,k,18); | ||
| 137 | BF_ENC(r,l,k,19); | ||
| 138 | BF_ENC(l,r,k,20); | ||
| 139 | #endif | ||
| 140 | r^=k[BF_ROUNDS+1]; | ||
| 141 | |||
| 142 | data[1]=l&0xffffffffL; | ||
| 143 | data[0]=r&0xffffffffL; | ||
| 144 | #endif | ||
| 145 | } | ||
| 146 | |||
| 147 | #ifndef BF_DEFAULT_OPTIONS | ||
| 148 | |||
| 149 | void BF_decrypt(BF_LONG *data, const BF_KEY *key) | ||
| 150 | { | ||
| 151 | #ifndef BF_PTR2 | ||
| 152 | register BF_LONG l,r; | ||
| 153 | register const BF_LONG *p,*s; | ||
| 154 | |||
| 155 | p=key->P; | ||
| 156 | s= &(key->S[0]); | ||
| 157 | l=data[0]; | ||
| 158 | r=data[1]; | ||
| 159 | |||
| 160 | l^=p[BF_ROUNDS+1]; | ||
| 161 | #if BF_ROUNDS == 20 | ||
| 162 | BF_ENC(r,l,s,p[20]); | ||
| 163 | BF_ENC(l,r,s,p[19]); | ||
| 164 | BF_ENC(r,l,s,p[18]); | ||
| 165 | BF_ENC(l,r,s,p[17]); | ||
| 166 | #endif | ||
| 167 | BF_ENC(r,l,s,p[16]); | ||
| 168 | BF_ENC(l,r,s,p[15]); | ||
| 169 | BF_ENC(r,l,s,p[14]); | ||
| 170 | BF_ENC(l,r,s,p[13]); | ||
| 171 | BF_ENC(r,l,s,p[12]); | ||
| 172 | BF_ENC(l,r,s,p[11]); | ||
| 173 | BF_ENC(r,l,s,p[10]); | ||
| 174 | BF_ENC(l,r,s,p[ 9]); | ||
| 175 | BF_ENC(r,l,s,p[ 8]); | ||
| 176 | BF_ENC(l,r,s,p[ 7]); | ||
| 177 | BF_ENC(r,l,s,p[ 6]); | ||
| 178 | BF_ENC(l,r,s,p[ 5]); | ||
| 179 | BF_ENC(r,l,s,p[ 4]); | ||
| 180 | BF_ENC(l,r,s,p[ 3]); | ||
| 181 | BF_ENC(r,l,s,p[ 2]); | ||
| 182 | BF_ENC(l,r,s,p[ 1]); | ||
| 183 | r^=p[0]; | ||
| 184 | |||
| 185 | data[1]=l&0xffffffffL; | ||
| 186 | data[0]=r&0xffffffffL; | ||
| 187 | #else | ||
| 188 | register BF_LONG l,r,t,*k; | ||
| 189 | |||
| 190 | l=data[0]; | ||
| 191 | r=data[1]; | ||
| 192 | k=(BF_LONG *)key; | ||
| 193 | |||
| 194 | l^=k[BF_ROUNDS+1]; | ||
| 195 | #if BF_ROUNDS == 20 | ||
| 196 | BF_ENC(r,l,k,20); | ||
| 197 | BF_ENC(l,r,k,19); | ||
| 198 | BF_ENC(r,l,k,18); | ||
| 199 | BF_ENC(l,r,k,17); | ||
| 200 | #endif | ||
| 201 | BF_ENC(r,l,k,16); | ||
| 202 | BF_ENC(l,r,k,15); | ||
| 203 | BF_ENC(r,l,k,14); | ||
| 204 | BF_ENC(l,r,k,13); | ||
| 205 | BF_ENC(r,l,k,12); | ||
| 206 | BF_ENC(l,r,k,11); | ||
| 207 | BF_ENC(r,l,k,10); | ||
| 208 | BF_ENC(l,r,k, 9); | ||
| 209 | BF_ENC(r,l,k, 8); | ||
| 210 | BF_ENC(l,r,k, 7); | ||
| 211 | BF_ENC(r,l,k, 6); | ||
| 212 | BF_ENC(l,r,k, 5); | ||
| 213 | BF_ENC(r,l,k, 4); | ||
| 214 | BF_ENC(l,r,k, 3); | ||
| 215 | BF_ENC(r,l,k, 2); | ||
| 216 | BF_ENC(l,r,k, 1); | ||
| 217 | r^=k[0]; | ||
| 218 | |||
| 219 | data[1]=l&0xffffffffL; | ||
| 220 | data[0]=r&0xffffffffL; | ||
| 221 | #endif | ||
| 222 | } | ||
| 223 | |||
| 224 | void BF_cbc_encrypt(const unsigned char *in, unsigned char *out, long length, | ||
| 225 | const BF_KEY *schedule, unsigned char *ivec, int encrypt) | ||
| 226 | { | ||
| 227 | register BF_LONG tin0,tin1; | ||
| 228 | register BF_LONG tout0,tout1,xor0,xor1; | ||
| 229 | register long l=length; | ||
| 230 | BF_LONG tin[2]; | ||
| 231 | |||
| 232 | if (encrypt) | ||
| 233 | { | ||
| 234 | n2l(ivec,tout0); | ||
| 235 | n2l(ivec,tout1); | ||
| 236 | ivec-=8; | ||
| 237 | for (l-=8; l>=0; l-=8) | ||
| 238 | { | ||
| 239 | n2l(in,tin0); | ||
| 240 | n2l(in,tin1); | ||
| 241 | tin0^=tout0; | ||
| 242 | tin1^=tout1; | ||
| 243 | tin[0]=tin0; | ||
| 244 | tin[1]=tin1; | ||
| 245 | BF_encrypt(tin,schedule); | ||
| 246 | tout0=tin[0]; | ||
| 247 | tout1=tin[1]; | ||
| 248 | l2n(tout0,out); | ||
| 249 | l2n(tout1,out); | ||
| 250 | } | ||
| 251 | if (l != -8) | ||
| 252 | { | ||
| 253 | n2ln(in,tin0,tin1,l+8); | ||
| 254 | tin0^=tout0; | ||
| 255 | tin1^=tout1; | ||
| 256 | tin[0]=tin0; | ||
| 257 | tin[1]=tin1; | ||
| 258 | BF_encrypt(tin,schedule); | ||
| 259 | tout0=tin[0]; | ||
| 260 | tout1=tin[1]; | ||
| 261 | l2n(tout0,out); | ||
| 262 | l2n(tout1,out); | ||
| 263 | } | ||
| 264 | l2n(tout0,ivec); | ||
| 265 | l2n(tout1,ivec); | ||
| 266 | } | ||
| 267 | else | ||
| 268 | { | ||
| 269 | n2l(ivec,xor0); | ||
| 270 | n2l(ivec,xor1); | ||
| 271 | ivec-=8; | ||
| 272 | for (l-=8; l>=0; l-=8) | ||
| 273 | { | ||
| 274 | n2l(in,tin0); | ||
| 275 | n2l(in,tin1); | ||
| 276 | tin[0]=tin0; | ||
| 277 | tin[1]=tin1; | ||
| 278 | BF_decrypt(tin,schedule); | ||
| 279 | tout0=tin[0]^xor0; | ||
| 280 | tout1=tin[1]^xor1; | ||
| 281 | l2n(tout0,out); | ||
| 282 | l2n(tout1,out); | ||
| 283 | xor0=tin0; | ||
| 284 | xor1=tin1; | ||
| 285 | } | ||
| 286 | if (l != -8) | ||
| 287 | { | ||
| 288 | n2l(in,tin0); | ||
| 289 | n2l(in,tin1); | ||
| 290 | tin[0]=tin0; | ||
| 291 | tin[1]=tin1; | ||
| 292 | BF_decrypt(tin,schedule); | ||
| 293 | tout0=tin[0]^xor0; | ||
| 294 | tout1=tin[1]^xor1; | ||
| 295 | l2nn(tout0,tout1,out,l+8); | ||
| 296 | xor0=tin0; | ||
| 297 | xor1=tin1; | ||
| 298 | } | ||
| 299 | l2n(xor0,ivec); | ||
| 300 | l2n(xor1,ivec); | ||
| 301 | } | ||
| 302 | tin0=tin1=tout0=tout1=xor0=xor1=0; | ||
| 303 | tin[0]=tin[1]=0; | ||
| 304 | } | ||
| 305 | |||
| 306 | #endif | ||
diff --git a/src/lib/libcrypto/bf/bf_locl.h b/src/lib/libcrypto/bf/bf_locl.h deleted file mode 100644 index cc7c3ec992..0000000000 --- a/src/lib/libcrypto/bf/bf_locl.h +++ /dev/null | |||
| @@ -1,219 +0,0 @@ | |||
| 1 | /* crypto/bf/bf_locl.h */ | ||
| 2 | /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com) | ||
| 3 | * All rights reserved. | ||
| 4 | * | ||
| 5 | * This package is an SSL implementation written | ||
| 6 | * by Eric Young (eay@cryptsoft.com). | ||
| 7 | * The implementation was written so as to conform with Netscapes SSL. | ||
| 8 | * | ||
| 9 | * This library is free for commercial and non-commercial use as long as | ||
| 10 | * the following conditions are aheared to. The following conditions | ||
| 11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
| 12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
| 13 | * included with this distribution is covered by the same copyright terms | ||
| 14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
| 15 | * | ||
| 16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
| 17 | * the code are not to be removed. | ||
| 18 | * If this package is used in a product, Eric Young should be given attribution | ||
| 19 | * as the author of the parts of the library used. | ||
| 20 | * This can be in the form of a textual message at program startup or | ||
| 21 | * in documentation (online or textual) provided with the package. | ||
| 22 | * | ||
| 23 | * Redistribution and use in source and binary forms, with or without | ||
| 24 | * modification, are permitted provided that the following conditions | ||
| 25 | * are met: | ||
| 26 | * 1. Redistributions of source code must retain the copyright | ||
| 27 | * notice, this list of conditions and the following disclaimer. | ||
| 28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 29 | * notice, this list of conditions and the following disclaimer in the | ||
| 30 | * documentation and/or other materials provided with the distribution. | ||
| 31 | * 3. All advertising materials mentioning features or use of this software | ||
| 32 | * must display the following acknowledgement: | ||
| 33 | * "This product includes cryptographic software written by | ||
| 34 | * Eric Young (eay@cryptsoft.com)" | ||
| 35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
| 36 | * being used are not cryptographic related :-). | ||
| 37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
| 38 | * the apps directory (application code) you must include an acknowledgement: | ||
| 39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
| 40 | * | ||
| 41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
| 42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 51 | * SUCH DAMAGE. | ||
| 52 | * | ||
| 53 | * The licence and distribution terms for any publically available version or | ||
| 54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
| 55 | * copied and put under another distribution licence | ||
| 56 | * [including the GNU Public Licence.] | ||
| 57 | */ | ||
| 58 | |||
| 59 | #ifndef HEADER_BF_LOCL_H | ||
| 60 | #define HEADER_BF_LOCL_H | ||
| 61 | #include <openssl/opensslconf.h> /* BF_PTR, BF_PTR2 */ | ||
| 62 | |||
| 63 | #undef c2l | ||
| 64 | #define c2l(c,l) (l =((unsigned long)(*((c)++))) , \ | ||
| 65 | l|=((unsigned long)(*((c)++)))<< 8L, \ | ||
| 66 | l|=((unsigned long)(*((c)++)))<<16L, \ | ||
| 67 | l|=((unsigned long)(*((c)++)))<<24L) | ||
| 68 | |||
| 69 | /* NOTE - c is not incremented as per c2l */ | ||
| 70 | #undef c2ln | ||
| 71 | #define c2ln(c,l1,l2,n) { \ | ||
| 72 | c+=n; \ | ||
| 73 | l1=l2=0; \ | ||
| 74 | switch (n) { \ | ||
| 75 | case 8: l2 =((unsigned long)(*(--(c))))<<24L; \ | ||
| 76 | case 7: l2|=((unsigned long)(*(--(c))))<<16L; \ | ||
| 77 | case 6: l2|=((unsigned long)(*(--(c))))<< 8L; \ | ||
| 78 | case 5: l2|=((unsigned long)(*(--(c)))); \ | ||
| 79 | case 4: l1 =((unsigned long)(*(--(c))))<<24L; \ | ||
| 80 | case 3: l1|=((unsigned long)(*(--(c))))<<16L; \ | ||
| 81 | case 2: l1|=((unsigned long)(*(--(c))))<< 8L; \ | ||
| 82 | case 1: l1|=((unsigned long)(*(--(c)))); \ | ||
| 83 | } \ | ||
| 84 | } | ||
| 85 | |||
| 86 | #undef l2c | ||
| 87 | #define l2c(l,c) (*((c)++)=(unsigned char)(((l) )&0xff), \ | ||
| 88 | *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \ | ||
| 89 | *((c)++)=(unsigned char)(((l)>>16L)&0xff), \ | ||
| 90 | *((c)++)=(unsigned char)(((l)>>24L)&0xff)) | ||
| 91 | |||
| 92 | /* NOTE - c is not incremented as per l2c */ | ||
| 93 | #undef l2cn | ||
| 94 | #define l2cn(l1,l2,c,n) { \ | ||
| 95 | c+=n; \ | ||
| 96 | switch (n) { \ | ||
| 97 | case 8: *(--(c))=(unsigned char)(((l2)>>24L)&0xff); \ | ||
| 98 | case 7: *(--(c))=(unsigned char)(((l2)>>16L)&0xff); \ | ||
| 99 | case 6: *(--(c))=(unsigned char)(((l2)>> 8L)&0xff); \ | ||
| 100 | case 5: *(--(c))=(unsigned char)(((l2) )&0xff); \ | ||
| 101 | case 4: *(--(c))=(unsigned char)(((l1)>>24L)&0xff); \ | ||
| 102 | case 3: *(--(c))=(unsigned char)(((l1)>>16L)&0xff); \ | ||
| 103 | case 2: *(--(c))=(unsigned char)(((l1)>> 8L)&0xff); \ | ||
| 104 | case 1: *(--(c))=(unsigned char)(((l1) )&0xff); \ | ||
| 105 | } \ | ||
| 106 | } | ||
| 107 | |||
| 108 | /* NOTE - c is not incremented as per n2l */ | ||
| 109 | #define n2ln(c,l1,l2,n) { \ | ||
| 110 | c+=n; \ | ||
| 111 | l1=l2=0; \ | ||
| 112 | switch (n) { \ | ||
| 113 | case 8: l2 =((unsigned long)(*(--(c)))) ; \ | ||
| 114 | case 7: l2|=((unsigned long)(*(--(c))))<< 8; \ | ||
| 115 | case 6: l2|=((unsigned long)(*(--(c))))<<16; \ | ||
| 116 | case 5: l2|=((unsigned long)(*(--(c))))<<24; \ | ||
| 117 | case 4: l1 =((unsigned long)(*(--(c)))) ; \ | ||
| 118 | case 3: l1|=((unsigned long)(*(--(c))))<< 8; \ | ||
| 119 | case 2: l1|=((unsigned long)(*(--(c))))<<16; \ | ||
| 120 | case 1: l1|=((unsigned long)(*(--(c))))<<24; \ | ||
| 121 | } \ | ||
| 122 | } | ||
| 123 | |||
| 124 | /* NOTE - c is not incremented as per l2n */ | ||
| 125 | #define l2nn(l1,l2,c,n) { \ | ||
| 126 | c+=n; \ | ||
| 127 | switch (n) { \ | ||
| 128 | case 8: *(--(c))=(unsigned char)(((l2) )&0xff); \ | ||
| 129 | case 7: *(--(c))=(unsigned char)(((l2)>> 8)&0xff); \ | ||
| 130 | case 6: *(--(c))=(unsigned char)(((l2)>>16)&0xff); \ | ||
| 131 | case 5: *(--(c))=(unsigned char)(((l2)>>24)&0xff); \ | ||
| 132 | case 4: *(--(c))=(unsigned char)(((l1) )&0xff); \ | ||
| 133 | case 3: *(--(c))=(unsigned char)(((l1)>> 8)&0xff); \ | ||
| 134 | case 2: *(--(c))=(unsigned char)(((l1)>>16)&0xff); \ | ||
| 135 | case 1: *(--(c))=(unsigned char)(((l1)>>24)&0xff); \ | ||
| 136 | } \ | ||
| 137 | } | ||
| 138 | |||
| 139 | #undef n2l | ||
| 140 | #define n2l(c,l) (l =((unsigned long)(*((c)++)))<<24L, \ | ||
| 141 | l|=((unsigned long)(*((c)++)))<<16L, \ | ||
| 142 | l|=((unsigned long)(*((c)++)))<< 8L, \ | ||
| 143 | l|=((unsigned long)(*((c)++)))) | ||
| 144 | |||
| 145 | #undef l2n | ||
| 146 | #define l2n(l,c) (*((c)++)=(unsigned char)(((l)>>24L)&0xff), \ | ||
| 147 | *((c)++)=(unsigned char)(((l)>>16L)&0xff), \ | ||
| 148 | *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \ | ||
| 149 | *((c)++)=(unsigned char)(((l) )&0xff)) | ||
| 150 | |||
| 151 | /* This is actually a big endian algorithm, the most significant byte | ||
| 152 | * is used to lookup array 0 */ | ||
| 153 | |||
| 154 | #if defined(BF_PTR2) | ||
| 155 | |||
| 156 | /* | ||
| 157 | * This is basically a special Intel version. Point is that Intel | ||
| 158 | * doesn't have many registers, but offers a reach choice of addressing | ||
| 159 | * modes. So we spare some registers by directly traversing BF_KEY | ||
| 160 | * structure and hiring the most decorated addressing mode. The code | ||
| 161 | * generated by EGCS is *perfectly* competitive with assembler | ||
| 162 | * implementation! | ||
| 163 | */ | ||
| 164 | #define BF_ENC(LL,R,KEY,Pi) (\ | ||
| 165 | LL^=KEY[Pi], \ | ||
| 166 | t= KEY[BF_ROUNDS+2 + 0 + ((R>>24)&0xFF)], \ | ||
| 167 | t+= KEY[BF_ROUNDS+2 + 256 + ((R>>16)&0xFF)], \ | ||
| 168 | t^= KEY[BF_ROUNDS+2 + 512 + ((R>>8 )&0xFF)], \ | ||
| 169 | t+= KEY[BF_ROUNDS+2 + 768 + ((R )&0xFF)], \ | ||
| 170 | LL^=t \ | ||
| 171 | ) | ||
| 172 | |||
| 173 | #elif defined(BF_PTR) | ||
| 174 | |||
| 175 | #ifndef BF_LONG_LOG2 | ||
| 176 | #define BF_LONG_LOG2 2 /* default to BF_LONG being 32 bits */ | ||
| 177 | #endif | ||
| 178 | #define BF_M (0xFF<<BF_LONG_LOG2) | ||
| 179 | #define BF_0 (24-BF_LONG_LOG2) | ||
| 180 | #define BF_1 (16-BF_LONG_LOG2) | ||
| 181 | #define BF_2 ( 8-BF_LONG_LOG2) | ||
| 182 | #define BF_3 BF_LONG_LOG2 /* left shift */ | ||
| 183 | |||
| 184 | /* | ||
| 185 | * This is normally very good on RISC platforms where normally you | ||
| 186 | * have to explicitly "multiply" array index by sizeof(BF_LONG) | ||
| 187 | * in order to calculate the effective address. This implementation | ||
| 188 | * excuses CPU from this extra work. Power[PC] uses should have most | ||
| 189 | * fun as (R>>BF_i)&BF_M gets folded into a single instruction, namely | ||
| 190 | * rlwinm. So let'em double-check if their compiler does it. | ||
| 191 | */ | ||
| 192 | |||
| 193 | #define BF_ENC(LL,R,S,P) ( \ | ||
| 194 | LL^=P, \ | ||
| 195 | LL^= (((*(BF_LONG *)((unsigned char *)&(S[ 0])+((R>>BF_0)&BF_M))+ \ | ||
| 196 | *(BF_LONG *)((unsigned char *)&(S[256])+((R>>BF_1)&BF_M)))^ \ | ||
| 197 | *(BF_LONG *)((unsigned char *)&(S[512])+((R>>BF_2)&BF_M)))+ \ | ||
| 198 | *(BF_LONG *)((unsigned char *)&(S[768])+((R<<BF_3)&BF_M))) \ | ||
| 199 | ) | ||
| 200 | #else | ||
| 201 | |||
| 202 | /* | ||
| 203 | * This is a *generic* version. Seem to perform best on platforms that | ||
| 204 | * offer explicit support for extraction of 8-bit nibbles preferably | ||
| 205 | * complemented with "multiplying" of array index by sizeof(BF_LONG). | ||
| 206 | * For the moment of this writing the list comprises Alpha CPU featuring | ||
| 207 | * extbl and s[48]addq instructions. | ||
| 208 | */ | ||
| 209 | |||
| 210 | #define BF_ENC(LL,R,S,P) ( \ | ||
| 211 | LL^=P, \ | ||
| 212 | LL^=((( S[ ((int)(R>>24)&0xff)] + \ | ||
| 213 | S[0x0100+((int)(R>>16)&0xff)])^ \ | ||
| 214 | S[0x0200+((int)(R>> 8)&0xff)])+ \ | ||
| 215 | S[0x0300+((int)(R )&0xff)])&0xffffffffL \ | ||
| 216 | ) | ||
| 217 | #endif | ||
| 218 | |||
| 219 | #endif | ||
diff --git a/src/lib/libcrypto/bf/bf_ofb64.c b/src/lib/libcrypto/bf/bf_ofb64.c deleted file mode 100644 index f2a9ff6e41..0000000000 --- a/src/lib/libcrypto/bf/bf_ofb64.c +++ /dev/null | |||
| @@ -1,110 +0,0 @@ | |||
| 1 | /* crypto/bf/bf_ofb64.c */ | ||
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
| 3 | * All rights reserved. | ||
| 4 | * | ||
| 5 | * This package is an SSL implementation written | ||
| 6 | * by Eric Young (eay@cryptsoft.com). | ||
| 7 | * The implementation was written so as to conform with Netscapes SSL. | ||
| 8 | * | ||
| 9 | * This library is free for commercial and non-commercial use as long as | ||
| 10 | * the following conditions are aheared to. The following conditions | ||
| 11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
| 12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
| 13 | * included with this distribution is covered by the same copyright terms | ||
| 14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
| 15 | * | ||
| 16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
| 17 | * the code are not to be removed. | ||
| 18 | * If this package is used in a product, Eric Young should be given attribution | ||
| 19 | * as the author of the parts of the library used. | ||
| 20 | * This can be in the form of a textual message at program startup or | ||
| 21 | * in documentation (online or textual) provided with the package. | ||
| 22 | * | ||
| 23 | * Redistribution and use in source and binary forms, with or without | ||
| 24 | * modification, are permitted provided that the following conditions | ||
| 25 | * are met: | ||
| 26 | * 1. Redistributions of source code must retain the copyright | ||
| 27 | * notice, this list of conditions and the following disclaimer. | ||
| 28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 29 | * notice, this list of conditions and the following disclaimer in the | ||
| 30 | * documentation and/or other materials provided with the distribution. | ||
| 31 | * 3. All advertising materials mentioning features or use of this software | ||
| 32 | * must display the following acknowledgement: | ||
| 33 | * "This product includes cryptographic software written by | ||
| 34 | * Eric Young (eay@cryptsoft.com)" | ||
| 35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
| 36 | * being used are not cryptographic related :-). | ||
| 37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
| 38 | * the apps directory (application code) you must include an acknowledgement: | ||
| 39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
| 40 | * | ||
| 41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
| 42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 51 | * SUCH DAMAGE. | ||
| 52 | * | ||
| 53 | * The licence and distribution terms for any publically available version or | ||
| 54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
| 55 | * copied and put under another distribution licence | ||
| 56 | * [including the GNU Public Licence.] | ||
| 57 | */ | ||
| 58 | |||
| 59 | #include <openssl/blowfish.h> | ||
| 60 | #include "bf_locl.h" | ||
| 61 | |||
| 62 | /* The input and output encrypted as though 64bit ofb mode is being | ||
| 63 | * used. The extra state information to record how much of the | ||
| 64 | * 64bit block we have used is contained in *num; | ||
| 65 | */ | ||
| 66 | void BF_ofb64_encrypt(const unsigned char *in, unsigned char *out, long length, | ||
| 67 | const BF_KEY *schedule, unsigned char *ivec, int *num) | ||
| 68 | { | ||
| 69 | register BF_LONG v0,v1,t; | ||
| 70 | register int n= *num; | ||
| 71 | register long l=length; | ||
| 72 | unsigned char d[8]; | ||
| 73 | register char *dp; | ||
| 74 | BF_LONG ti[2]; | ||
| 75 | unsigned char *iv; | ||
| 76 | int save=0; | ||
| 77 | |||
| 78 | iv=(unsigned char *)ivec; | ||
| 79 | n2l(iv,v0); | ||
| 80 | n2l(iv,v1); | ||
| 81 | ti[0]=v0; | ||
| 82 | ti[1]=v1; | ||
| 83 | dp=(char *)d; | ||
| 84 | l2n(v0,dp); | ||
| 85 | l2n(v1,dp); | ||
| 86 | while (l--) | ||
| 87 | { | ||
| 88 | if (n == 0) | ||
| 89 | { | ||
| 90 | BF_encrypt((BF_LONG *)ti,schedule); | ||
| 91 | dp=(char *)d; | ||
| 92 | t=ti[0]; l2n(t,dp); | ||
| 93 | t=ti[1]; l2n(t,dp); | ||
| 94 | save++; | ||
| 95 | } | ||
| 96 | *(out++)= *(in++)^d[n]; | ||
| 97 | n=(n+1)&0x07; | ||
| 98 | } | ||
| 99 | if (save) | ||
| 100 | { | ||
| 101 | v0=ti[0]; | ||
| 102 | v1=ti[1]; | ||
| 103 | iv=(unsigned char *)ivec; | ||
| 104 | l2n(v0,iv); | ||
| 105 | l2n(v1,iv); | ||
| 106 | } | ||
| 107 | t=v0=v1=ti[0]=ti[1]=0; | ||
| 108 | *num=n; | ||
| 109 | } | ||
| 110 | |||
diff --git a/src/lib/libcrypto/bf/bf_opts.c b/src/lib/libcrypto/bf/bf_opts.c deleted file mode 100644 index 1721bb99b4..0000000000 --- a/src/lib/libcrypto/bf/bf_opts.c +++ /dev/null | |||
| @@ -1,331 +0,0 @@ | |||
| 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 | ||
| 70 | OPENSSL_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) | ||
| 141 | long run=0; | ||
| 142 | |||
| 143 | double 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 | |||
| 151 | SIGRETTYPE sig_done(int sig); | ||
| 152 | SIGRETTYPE 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 | |||
| 165 | double 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 | |||
| 226 | int 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_pi.h b/src/lib/libcrypto/bf/bf_pi.h deleted file mode 100644 index 9949513c68..0000000000 --- a/src/lib/libcrypto/bf/bf_pi.h +++ /dev/null | |||
| @@ -1,325 +0,0 @@ | |||
| 1 | /* crypto/bf/bf_pi.h */ | ||
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
| 3 | * All rights reserved. | ||
| 4 | * | ||
| 5 | * This package is an SSL implementation written | ||
| 6 | * by Eric Young (eay@cryptsoft.com). | ||
| 7 | * The implementation was written so as to conform with Netscapes SSL. | ||
| 8 | * | ||
| 9 | * This library is free for commercial and non-commercial use as long as | ||
| 10 | * the following conditions are aheared to. The following conditions | ||
| 11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
| 12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
| 13 | * included with this distribution is covered by the same copyright terms | ||
| 14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
| 15 | * | ||
| 16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
| 17 | * the code are not to be removed. | ||
| 18 | * If this package is used in a product, Eric Young should be given attribution | ||
| 19 | * as the author of the parts of the library used. | ||
| 20 | * This can be in the form of a textual message at program startup or | ||
| 21 | * in documentation (online or textual) provided with the package. | ||
| 22 | * | ||
| 23 | * Redistribution and use in source and binary forms, with or without | ||
| 24 | * modification, are permitted provided that the following conditions | ||
| 25 | * are met: | ||
| 26 | * 1. Redistributions of source code must retain the copyright | ||
| 27 | * notice, this list of conditions and the following disclaimer. | ||
| 28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 29 | * notice, this list of conditions and the following disclaimer in the | ||
| 30 | * documentation and/or other materials provided with the distribution. | ||
| 31 | * 3. All advertising materials mentioning features or use of this software | ||
| 32 | * must display the following acknowledgement: | ||
| 33 | * "This product includes cryptographic software written by | ||
| 34 | * Eric Young (eay@cryptsoft.com)" | ||
| 35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
| 36 | * being used are not cryptographic related :-). | ||
| 37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
| 38 | * the apps directory (application code) you must include an acknowledgement: | ||
| 39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
| 40 | * | ||
| 41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
| 42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 51 | * SUCH DAMAGE. | ||
| 52 | * | ||
| 53 | * The licence and distribution terms for any publically available version or | ||
| 54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
| 55 | * copied and put under another distribution licence | ||
| 56 | * [including the GNU Public Licence.] | ||
| 57 | */ | ||
| 58 | |||
| 59 | static const BF_KEY bf_init= { | ||
| 60 | { | ||
| 61 | 0x243f6a88L, 0x85a308d3L, 0x13198a2eL, 0x03707344L, | ||
| 62 | 0xa4093822L, 0x299f31d0L, 0x082efa98L, 0xec4e6c89L, | ||
| 63 | 0x452821e6L, 0x38d01377L, 0xbe5466cfL, 0x34e90c6cL, | ||
| 64 | 0xc0ac29b7L, 0xc97c50ddL, 0x3f84d5b5L, 0xb5470917L, | ||
| 65 | 0x9216d5d9L, 0x8979fb1b | ||
| 66 | },{ | ||
| 67 | 0xd1310ba6L, 0x98dfb5acL, 0x2ffd72dbL, 0xd01adfb7L, | ||
| 68 | 0xb8e1afedL, 0x6a267e96L, 0xba7c9045L, 0xf12c7f99L, | ||
| 69 | 0x24a19947L, 0xb3916cf7L, 0x0801f2e2L, 0x858efc16L, | ||
| 70 | 0x636920d8L, 0x71574e69L, 0xa458fea3L, 0xf4933d7eL, | ||
| 71 | 0x0d95748fL, 0x728eb658L, 0x718bcd58L, 0x82154aeeL, | ||
| 72 | 0x7b54a41dL, 0xc25a59b5L, 0x9c30d539L, 0x2af26013L, | ||
| 73 | 0xc5d1b023L, 0x286085f0L, 0xca417918L, 0xb8db38efL, | ||
| 74 | 0x8e79dcb0L, 0x603a180eL, 0x6c9e0e8bL, 0xb01e8a3eL, | ||
| 75 | 0xd71577c1L, 0xbd314b27L, 0x78af2fdaL, 0x55605c60L, | ||
| 76 | 0xe65525f3L, 0xaa55ab94L, 0x57489862L, 0x63e81440L, | ||
| 77 | 0x55ca396aL, 0x2aab10b6L, 0xb4cc5c34L, 0x1141e8ceL, | ||
| 78 | 0xa15486afL, 0x7c72e993L, 0xb3ee1411L, 0x636fbc2aL, | ||
| 79 | 0x2ba9c55dL, 0x741831f6L, 0xce5c3e16L, 0x9b87931eL, | ||
| 80 | 0xafd6ba33L, 0x6c24cf5cL, 0x7a325381L, 0x28958677L, | ||
| 81 | 0x3b8f4898L, 0x6b4bb9afL, 0xc4bfe81bL, 0x66282193L, | ||
| 82 | 0x61d809ccL, 0xfb21a991L, 0x487cac60L, 0x5dec8032L, | ||
| 83 | 0xef845d5dL, 0xe98575b1L, 0xdc262302L, 0xeb651b88L, | ||
| 84 | 0x23893e81L, 0xd396acc5L, 0x0f6d6ff3L, 0x83f44239L, | ||
| 85 | 0x2e0b4482L, 0xa4842004L, 0x69c8f04aL, 0x9e1f9b5eL, | ||
| 86 | 0x21c66842L, 0xf6e96c9aL, 0x670c9c61L, 0xabd388f0L, | ||
| 87 | 0x6a51a0d2L, 0xd8542f68L, 0x960fa728L, 0xab5133a3L, | ||
| 88 | 0x6eef0b6cL, 0x137a3be4L, 0xba3bf050L, 0x7efb2a98L, | ||
| 89 | 0xa1f1651dL, 0x39af0176L, 0x66ca593eL, 0x82430e88L, | ||
| 90 | 0x8cee8619L, 0x456f9fb4L, 0x7d84a5c3L, 0x3b8b5ebeL, | ||
| 91 | 0xe06f75d8L, 0x85c12073L, 0x401a449fL, 0x56c16aa6L, | ||
| 92 | 0x4ed3aa62L, 0x363f7706L, 0x1bfedf72L, 0x429b023dL, | ||
| 93 | 0x37d0d724L, 0xd00a1248L, 0xdb0fead3L, 0x49f1c09bL, | ||
| 94 | 0x075372c9L, 0x80991b7bL, 0x25d479d8L, 0xf6e8def7L, | ||
| 95 | 0xe3fe501aL, 0xb6794c3bL, 0x976ce0bdL, 0x04c006baL, | ||
| 96 | 0xc1a94fb6L, 0x409f60c4L, 0x5e5c9ec2L, 0x196a2463L, | ||
| 97 | 0x68fb6fafL, 0x3e6c53b5L, 0x1339b2ebL, 0x3b52ec6fL, | ||
| 98 | 0x6dfc511fL, 0x9b30952cL, 0xcc814544L, 0xaf5ebd09L, | ||
| 99 | 0xbee3d004L, 0xde334afdL, 0x660f2807L, 0x192e4bb3L, | ||
| 100 | 0xc0cba857L, 0x45c8740fL, 0xd20b5f39L, 0xb9d3fbdbL, | ||
| 101 | 0x5579c0bdL, 0x1a60320aL, 0xd6a100c6L, 0x402c7279L, | ||
| 102 | 0x679f25feL, 0xfb1fa3ccL, 0x8ea5e9f8L, 0xdb3222f8L, | ||
| 103 | 0x3c7516dfL, 0xfd616b15L, 0x2f501ec8L, 0xad0552abL, | ||
| 104 | 0x323db5faL, 0xfd238760L, 0x53317b48L, 0x3e00df82L, | ||
| 105 | 0x9e5c57bbL, 0xca6f8ca0L, 0x1a87562eL, 0xdf1769dbL, | ||
| 106 | 0xd542a8f6L, 0x287effc3L, 0xac6732c6L, 0x8c4f5573L, | ||
| 107 | 0x695b27b0L, 0xbbca58c8L, 0xe1ffa35dL, 0xb8f011a0L, | ||
| 108 | 0x10fa3d98L, 0xfd2183b8L, 0x4afcb56cL, 0x2dd1d35bL, | ||
| 109 | 0x9a53e479L, 0xb6f84565L, 0xd28e49bcL, 0x4bfb9790L, | ||
| 110 | 0xe1ddf2daL, 0xa4cb7e33L, 0x62fb1341L, 0xcee4c6e8L, | ||
| 111 | 0xef20cadaL, 0x36774c01L, 0xd07e9efeL, 0x2bf11fb4L, | ||
| 112 | 0x95dbda4dL, 0xae909198L, 0xeaad8e71L, 0x6b93d5a0L, | ||
| 113 | 0xd08ed1d0L, 0xafc725e0L, 0x8e3c5b2fL, 0x8e7594b7L, | ||
| 114 | 0x8ff6e2fbL, 0xf2122b64L, 0x8888b812L, 0x900df01cL, | ||
| 115 | 0x4fad5ea0L, 0x688fc31cL, 0xd1cff191L, 0xb3a8c1adL, | ||
| 116 | 0x2f2f2218L, 0xbe0e1777L, 0xea752dfeL, 0x8b021fa1L, | ||
| 117 | 0xe5a0cc0fL, 0xb56f74e8L, 0x18acf3d6L, 0xce89e299L, | ||
| 118 | 0xb4a84fe0L, 0xfd13e0b7L, 0x7cc43b81L, 0xd2ada8d9L, | ||
| 119 | 0x165fa266L, 0x80957705L, 0x93cc7314L, 0x211a1477L, | ||
| 120 | 0xe6ad2065L, 0x77b5fa86L, 0xc75442f5L, 0xfb9d35cfL, | ||
| 121 | 0xebcdaf0cL, 0x7b3e89a0L, 0xd6411bd3L, 0xae1e7e49L, | ||
| 122 | 0x00250e2dL, 0x2071b35eL, 0x226800bbL, 0x57b8e0afL, | ||
| 123 | 0x2464369bL, 0xf009b91eL, 0x5563911dL, 0x59dfa6aaL, | ||
| 124 | 0x78c14389L, 0xd95a537fL, 0x207d5ba2L, 0x02e5b9c5L, | ||
| 125 | 0x83260376L, 0x6295cfa9L, 0x11c81968L, 0x4e734a41L, | ||
| 126 | 0xb3472dcaL, 0x7b14a94aL, 0x1b510052L, 0x9a532915L, | ||
| 127 | 0xd60f573fL, 0xbc9bc6e4L, 0x2b60a476L, 0x81e67400L, | ||
| 128 | 0x08ba6fb5L, 0x571be91fL, 0xf296ec6bL, 0x2a0dd915L, | ||
| 129 | 0xb6636521L, 0xe7b9f9b6L, 0xff34052eL, 0xc5855664L, | ||
| 130 | 0x53b02d5dL, 0xa99f8fa1L, 0x08ba4799L, 0x6e85076aL, | ||
| 131 | 0x4b7a70e9L, 0xb5b32944L, 0xdb75092eL, 0xc4192623L, | ||
| 132 | 0xad6ea6b0L, 0x49a7df7dL, 0x9cee60b8L, 0x8fedb266L, | ||
| 133 | 0xecaa8c71L, 0x699a17ffL, 0x5664526cL, 0xc2b19ee1L, | ||
| 134 | 0x193602a5L, 0x75094c29L, 0xa0591340L, 0xe4183a3eL, | ||
| 135 | 0x3f54989aL, 0x5b429d65L, 0x6b8fe4d6L, 0x99f73fd6L, | ||
| 136 | 0xa1d29c07L, 0xefe830f5L, 0x4d2d38e6L, 0xf0255dc1L, | ||
| 137 | 0x4cdd2086L, 0x8470eb26L, 0x6382e9c6L, 0x021ecc5eL, | ||
| 138 | 0x09686b3fL, 0x3ebaefc9L, 0x3c971814L, 0x6b6a70a1L, | ||
| 139 | 0x687f3584L, 0x52a0e286L, 0xb79c5305L, 0xaa500737L, | ||
| 140 | 0x3e07841cL, 0x7fdeae5cL, 0x8e7d44ecL, 0x5716f2b8L, | ||
| 141 | 0xb03ada37L, 0xf0500c0dL, 0xf01c1f04L, 0x0200b3ffL, | ||
| 142 | 0xae0cf51aL, 0x3cb574b2L, 0x25837a58L, 0xdc0921bdL, | ||
| 143 | 0xd19113f9L, 0x7ca92ff6L, 0x94324773L, 0x22f54701L, | ||
| 144 | 0x3ae5e581L, 0x37c2dadcL, 0xc8b57634L, 0x9af3dda7L, | ||
| 145 | 0xa9446146L, 0x0fd0030eL, 0xecc8c73eL, 0xa4751e41L, | ||
| 146 | 0xe238cd99L, 0x3bea0e2fL, 0x3280bba1L, 0x183eb331L, | ||
| 147 | 0x4e548b38L, 0x4f6db908L, 0x6f420d03L, 0xf60a04bfL, | ||
| 148 | 0x2cb81290L, 0x24977c79L, 0x5679b072L, 0xbcaf89afL, | ||
| 149 | 0xde9a771fL, 0xd9930810L, 0xb38bae12L, 0xdccf3f2eL, | ||
| 150 | 0x5512721fL, 0x2e6b7124L, 0x501adde6L, 0x9f84cd87L, | ||
| 151 | 0x7a584718L, 0x7408da17L, 0xbc9f9abcL, 0xe94b7d8cL, | ||
| 152 | 0xec7aec3aL, 0xdb851dfaL, 0x63094366L, 0xc464c3d2L, | ||
| 153 | 0xef1c1847L, 0x3215d908L, 0xdd433b37L, 0x24c2ba16L, | ||
| 154 | 0x12a14d43L, 0x2a65c451L, 0x50940002L, 0x133ae4ddL, | ||
| 155 | 0x71dff89eL, 0x10314e55L, 0x81ac77d6L, 0x5f11199bL, | ||
| 156 | 0x043556f1L, 0xd7a3c76bL, 0x3c11183bL, 0x5924a509L, | ||
| 157 | 0xf28fe6edL, 0x97f1fbfaL, 0x9ebabf2cL, 0x1e153c6eL, | ||
| 158 | 0x86e34570L, 0xeae96fb1L, 0x860e5e0aL, 0x5a3e2ab3L, | ||
| 159 | 0x771fe71cL, 0x4e3d06faL, 0x2965dcb9L, 0x99e71d0fL, | ||
| 160 | 0x803e89d6L, 0x5266c825L, 0x2e4cc978L, 0x9c10b36aL, | ||
| 161 | 0xc6150ebaL, 0x94e2ea78L, 0xa5fc3c53L, 0x1e0a2df4L, | ||
| 162 | 0xf2f74ea7L, 0x361d2b3dL, 0x1939260fL, 0x19c27960L, | ||
| 163 | 0x5223a708L, 0xf71312b6L, 0xebadfe6eL, 0xeac31f66L, | ||
| 164 | 0xe3bc4595L, 0xa67bc883L, 0xb17f37d1L, 0x018cff28L, | ||
| 165 | 0xc332ddefL, 0xbe6c5aa5L, 0x65582185L, 0x68ab9802L, | ||
| 166 | 0xeecea50fL, 0xdb2f953bL, 0x2aef7dadL, 0x5b6e2f84L, | ||
| 167 | 0x1521b628L, 0x29076170L, 0xecdd4775L, 0x619f1510L, | ||
| 168 | 0x13cca830L, 0xeb61bd96L, 0x0334fe1eL, 0xaa0363cfL, | ||
| 169 | 0xb5735c90L, 0x4c70a239L, 0xd59e9e0bL, 0xcbaade14L, | ||
| 170 | 0xeecc86bcL, 0x60622ca7L, 0x9cab5cabL, 0xb2f3846eL, | ||
| 171 | 0x648b1eafL, 0x19bdf0caL, 0xa02369b9L, 0x655abb50L, | ||
| 172 | 0x40685a32L, 0x3c2ab4b3L, 0x319ee9d5L, 0xc021b8f7L, | ||
| 173 | 0x9b540b19L, 0x875fa099L, 0x95f7997eL, 0x623d7da8L, | ||
| 174 | 0xf837889aL, 0x97e32d77L, 0x11ed935fL, 0x16681281L, | ||
| 175 | 0x0e358829L, 0xc7e61fd6L, 0x96dedfa1L, 0x7858ba99L, | ||
| 176 | 0x57f584a5L, 0x1b227263L, 0x9b83c3ffL, 0x1ac24696L, | ||
| 177 | 0xcdb30aebL, 0x532e3054L, 0x8fd948e4L, 0x6dbc3128L, | ||
| 178 | 0x58ebf2efL, 0x34c6ffeaL, 0xfe28ed61L, 0xee7c3c73L, | ||
| 179 | 0x5d4a14d9L, 0xe864b7e3L, 0x42105d14L, 0x203e13e0L, | ||
| 180 | 0x45eee2b6L, 0xa3aaabeaL, 0xdb6c4f15L, 0xfacb4fd0L, | ||
| 181 | 0xc742f442L, 0xef6abbb5L, 0x654f3b1dL, 0x41cd2105L, | ||
| 182 | 0xd81e799eL, 0x86854dc7L, 0xe44b476aL, 0x3d816250L, | ||
| 183 | 0xcf62a1f2L, 0x5b8d2646L, 0xfc8883a0L, 0xc1c7b6a3L, | ||
| 184 | 0x7f1524c3L, 0x69cb7492L, 0x47848a0bL, 0x5692b285L, | ||
| 185 | 0x095bbf00L, 0xad19489dL, 0x1462b174L, 0x23820e00L, | ||
| 186 | 0x58428d2aL, 0x0c55f5eaL, 0x1dadf43eL, 0x233f7061L, | ||
| 187 | 0x3372f092L, 0x8d937e41L, 0xd65fecf1L, 0x6c223bdbL, | ||
| 188 | 0x7cde3759L, 0xcbee7460L, 0x4085f2a7L, 0xce77326eL, | ||
| 189 | 0xa6078084L, 0x19f8509eL, 0xe8efd855L, 0x61d99735L, | ||
| 190 | 0xa969a7aaL, 0xc50c06c2L, 0x5a04abfcL, 0x800bcadcL, | ||
| 191 | 0x9e447a2eL, 0xc3453484L, 0xfdd56705L, 0x0e1e9ec9L, | ||
| 192 | 0xdb73dbd3L, 0x105588cdL, 0x675fda79L, 0xe3674340L, | ||
| 193 | 0xc5c43465L, 0x713e38d8L, 0x3d28f89eL, 0xf16dff20L, | ||
| 194 | 0x153e21e7L, 0x8fb03d4aL, 0xe6e39f2bL, 0xdb83adf7L, | ||
| 195 | 0xe93d5a68L, 0x948140f7L, 0xf64c261cL, 0x94692934L, | ||
| 196 | 0x411520f7L, 0x7602d4f7L, 0xbcf46b2eL, 0xd4a20068L, | ||
| 197 | 0xd4082471L, 0x3320f46aL, 0x43b7d4b7L, 0x500061afL, | ||
| 198 | 0x1e39f62eL, 0x97244546L, 0x14214f74L, 0xbf8b8840L, | ||
| 199 | 0x4d95fc1dL, 0x96b591afL, 0x70f4ddd3L, 0x66a02f45L, | ||
| 200 | 0xbfbc09ecL, 0x03bd9785L, 0x7fac6dd0L, 0x31cb8504L, | ||
| 201 | 0x96eb27b3L, 0x55fd3941L, 0xda2547e6L, 0xabca0a9aL, | ||
| 202 | 0x28507825L, 0x530429f4L, 0x0a2c86daL, 0xe9b66dfbL, | ||
| 203 | 0x68dc1462L, 0xd7486900L, 0x680ec0a4L, 0x27a18deeL, | ||
| 204 | 0x4f3ffea2L, 0xe887ad8cL, 0xb58ce006L, 0x7af4d6b6L, | ||
| 205 | 0xaace1e7cL, 0xd3375fecL, 0xce78a399L, 0x406b2a42L, | ||
| 206 | 0x20fe9e35L, 0xd9f385b9L, 0xee39d7abL, 0x3b124e8bL, | ||
| 207 | 0x1dc9faf7L, 0x4b6d1856L, 0x26a36631L, 0xeae397b2L, | ||
| 208 | 0x3a6efa74L, 0xdd5b4332L, 0x6841e7f7L, 0xca7820fbL, | ||
| 209 | 0xfb0af54eL, 0xd8feb397L, 0x454056acL, 0xba489527L, | ||
| 210 | 0x55533a3aL, 0x20838d87L, 0xfe6ba9b7L, 0xd096954bL, | ||
| 211 | 0x55a867bcL, 0xa1159a58L, 0xcca92963L, 0x99e1db33L, | ||
| 212 | 0xa62a4a56L, 0x3f3125f9L, 0x5ef47e1cL, 0x9029317cL, | ||
| 213 | 0xfdf8e802L, 0x04272f70L, 0x80bb155cL, 0x05282ce3L, | ||
| 214 | 0x95c11548L, 0xe4c66d22L, 0x48c1133fL, 0xc70f86dcL, | ||
| 215 | 0x07f9c9eeL, 0x41041f0fL, 0x404779a4L, 0x5d886e17L, | ||
| 216 | 0x325f51ebL, 0xd59bc0d1L, 0xf2bcc18fL, 0x41113564L, | ||
| 217 | 0x257b7834L, 0x602a9c60L, 0xdff8e8a3L, 0x1f636c1bL, | ||
| 218 | 0x0e12b4c2L, 0x02e1329eL, 0xaf664fd1L, 0xcad18115L, | ||
| 219 | 0x6b2395e0L, 0x333e92e1L, 0x3b240b62L, 0xeebeb922L, | ||
| 220 | 0x85b2a20eL, 0xe6ba0d99L, 0xde720c8cL, 0x2da2f728L, | ||
| 221 | 0xd0127845L, 0x95b794fdL, 0x647d0862L, 0xe7ccf5f0L, | ||
| 222 | 0x5449a36fL, 0x877d48faL, 0xc39dfd27L, 0xf33e8d1eL, | ||
| 223 | 0x0a476341L, 0x992eff74L, 0x3a6f6eabL, 0xf4f8fd37L, | ||
| 224 | 0xa812dc60L, 0xa1ebddf8L, 0x991be14cL, 0xdb6e6b0dL, | ||
| 225 | 0xc67b5510L, 0x6d672c37L, 0x2765d43bL, 0xdcd0e804L, | ||
| 226 | 0xf1290dc7L, 0xcc00ffa3L, 0xb5390f92L, 0x690fed0bL, | ||
| 227 | 0x667b9ffbL, 0xcedb7d9cL, 0xa091cf0bL, 0xd9155ea3L, | ||
| 228 | 0xbb132f88L, 0x515bad24L, 0x7b9479bfL, 0x763bd6ebL, | ||
| 229 | 0x37392eb3L, 0xcc115979L, 0x8026e297L, 0xf42e312dL, | ||
| 230 | 0x6842ada7L, 0xc66a2b3bL, 0x12754cccL, 0x782ef11cL, | ||
| 231 | 0x6a124237L, 0xb79251e7L, 0x06a1bbe6L, 0x4bfb6350L, | ||
| 232 | 0x1a6b1018L, 0x11caedfaL, 0x3d25bdd8L, 0xe2e1c3c9L, | ||
| 233 | 0x44421659L, 0x0a121386L, 0xd90cec6eL, 0xd5abea2aL, | ||
| 234 | 0x64af674eL, 0xda86a85fL, 0xbebfe988L, 0x64e4c3feL, | ||
| 235 | 0x9dbc8057L, 0xf0f7c086L, 0x60787bf8L, 0x6003604dL, | ||
| 236 | 0xd1fd8346L, 0xf6381fb0L, 0x7745ae04L, 0xd736fcccL, | ||
| 237 | 0x83426b33L, 0xf01eab71L, 0xb0804187L, 0x3c005e5fL, | ||
| 238 | 0x77a057beL, 0xbde8ae24L, 0x55464299L, 0xbf582e61L, | ||
| 239 | 0x4e58f48fL, 0xf2ddfda2L, 0xf474ef38L, 0x8789bdc2L, | ||
| 240 | 0x5366f9c3L, 0xc8b38e74L, 0xb475f255L, 0x46fcd9b9L, | ||
| 241 | 0x7aeb2661L, 0x8b1ddf84L, 0x846a0e79L, 0x915f95e2L, | ||
| 242 | 0x466e598eL, 0x20b45770L, 0x8cd55591L, 0xc902de4cL, | ||
| 243 | 0xb90bace1L, 0xbb8205d0L, 0x11a86248L, 0x7574a99eL, | ||
| 244 | 0xb77f19b6L, 0xe0a9dc09L, 0x662d09a1L, 0xc4324633L, | ||
| 245 | 0xe85a1f02L, 0x09f0be8cL, 0x4a99a025L, 0x1d6efe10L, | ||
| 246 | 0x1ab93d1dL, 0x0ba5a4dfL, 0xa186f20fL, 0x2868f169L, | ||
| 247 | 0xdcb7da83L, 0x573906feL, 0xa1e2ce9bL, 0x4fcd7f52L, | ||
| 248 | 0x50115e01L, 0xa70683faL, 0xa002b5c4L, 0x0de6d027L, | ||
| 249 | 0x9af88c27L, 0x773f8641L, 0xc3604c06L, 0x61a806b5L, | ||
| 250 | 0xf0177a28L, 0xc0f586e0L, 0x006058aaL, 0x30dc7d62L, | ||
| 251 | 0x11e69ed7L, 0x2338ea63L, 0x53c2dd94L, 0xc2c21634L, | ||
| 252 | 0xbbcbee56L, 0x90bcb6deL, 0xebfc7da1L, 0xce591d76L, | ||
| 253 | 0x6f05e409L, 0x4b7c0188L, 0x39720a3dL, 0x7c927c24L, | ||
| 254 | 0x86e3725fL, 0x724d9db9L, 0x1ac15bb4L, 0xd39eb8fcL, | ||
| 255 | 0xed545578L, 0x08fca5b5L, 0xd83d7cd3L, 0x4dad0fc4L, | ||
| 256 | 0x1e50ef5eL, 0xb161e6f8L, 0xa28514d9L, 0x6c51133cL, | ||
| 257 | 0x6fd5c7e7L, 0x56e14ec4L, 0x362abfceL, 0xddc6c837L, | ||
| 258 | 0xd79a3234L, 0x92638212L, 0x670efa8eL, 0x406000e0L, | ||
| 259 | 0x3a39ce37L, 0xd3faf5cfL, 0xabc27737L, 0x5ac52d1bL, | ||
| 260 | 0x5cb0679eL, 0x4fa33742L, 0xd3822740L, 0x99bc9bbeL, | ||
| 261 | 0xd5118e9dL, 0xbf0f7315L, 0xd62d1c7eL, 0xc700c47bL, | ||
| 262 | 0xb78c1b6bL, 0x21a19045L, 0xb26eb1beL, 0x6a366eb4L, | ||
| 263 | 0x5748ab2fL, 0xbc946e79L, 0xc6a376d2L, 0x6549c2c8L, | ||
| 264 | 0x530ff8eeL, 0x468dde7dL, 0xd5730a1dL, 0x4cd04dc6L, | ||
| 265 | 0x2939bbdbL, 0xa9ba4650L, 0xac9526e8L, 0xbe5ee304L, | ||
| 266 | 0xa1fad5f0L, 0x6a2d519aL, 0x63ef8ce2L, 0x9a86ee22L, | ||
| 267 | 0xc089c2b8L, 0x43242ef6L, 0xa51e03aaL, 0x9cf2d0a4L, | ||
| 268 | 0x83c061baL, 0x9be96a4dL, 0x8fe51550L, 0xba645bd6L, | ||
| 269 | 0x2826a2f9L, 0xa73a3ae1L, 0x4ba99586L, 0xef5562e9L, | ||
| 270 | 0xc72fefd3L, 0xf752f7daL, 0x3f046f69L, 0x77fa0a59L, | ||
| 271 | 0x80e4a915L, 0x87b08601L, 0x9b09e6adL, 0x3b3ee593L, | ||
| 272 | 0xe990fd5aL, 0x9e34d797L, 0x2cf0b7d9L, 0x022b8b51L, | ||
| 273 | 0x96d5ac3aL, 0x017da67dL, 0xd1cf3ed6L, 0x7c7d2d28L, | ||
| 274 | 0x1f9f25cfL, 0xadf2b89bL, 0x5ad6b472L, 0x5a88f54cL, | ||
| 275 | 0xe029ac71L, 0xe019a5e6L, 0x47b0acfdL, 0xed93fa9bL, | ||
| 276 | 0xe8d3c48dL, 0x283b57ccL, 0xf8d56629L, 0x79132e28L, | ||
| 277 | 0x785f0191L, 0xed756055L, 0xf7960e44L, 0xe3d35e8cL, | ||
| 278 | 0x15056dd4L, 0x88f46dbaL, 0x03a16125L, 0x0564f0bdL, | ||
| 279 | 0xc3eb9e15L, 0x3c9057a2L, 0x97271aecL, 0xa93a072aL, | ||
| 280 | 0x1b3f6d9bL, 0x1e6321f5L, 0xf59c66fbL, 0x26dcf319L, | ||
| 281 | 0x7533d928L, 0xb155fdf5L, 0x03563482L, 0x8aba3cbbL, | ||
| 282 | 0x28517711L, 0xc20ad9f8L, 0xabcc5167L, 0xccad925fL, | ||
| 283 | 0x4de81751L, 0x3830dc8eL, 0x379d5862L, 0x9320f991L, | ||
| 284 | 0xea7a90c2L, 0xfb3e7bceL, 0x5121ce64L, 0x774fbe32L, | ||
| 285 | 0xa8b6e37eL, 0xc3293d46L, 0x48de5369L, 0x6413e680L, | ||
| 286 | 0xa2ae0810L, 0xdd6db224L, 0x69852dfdL, 0x09072166L, | ||
| 287 | 0xb39a460aL, 0x6445c0ddL, 0x586cdecfL, 0x1c20c8aeL, | ||
| 288 | 0x5bbef7ddL, 0x1b588d40L, 0xccd2017fL, 0x6bb4e3bbL, | ||
| 289 | 0xdda26a7eL, 0x3a59ff45L, 0x3e350a44L, 0xbcb4cdd5L, | ||
| 290 | 0x72eacea8L, 0xfa6484bbL, 0x8d6612aeL, 0xbf3c6f47L, | ||
| 291 | 0xd29be463L, 0x542f5d9eL, 0xaec2771bL, 0xf64e6370L, | ||
| 292 | 0x740e0d8dL, 0xe75b1357L, 0xf8721671L, 0xaf537d5dL, | ||
| 293 | 0x4040cb08L, 0x4eb4e2ccL, 0x34d2466aL, 0x0115af84L, | ||
| 294 | 0xe1b00428L, 0x95983a1dL, 0x06b89fb4L, 0xce6ea048L, | ||
| 295 | 0x6f3f3b82L, 0x3520ab82L, 0x011a1d4bL, 0x277227f8L, | ||
| 296 | 0x611560b1L, 0xe7933fdcL, 0xbb3a792bL, 0x344525bdL, | ||
| 297 | 0xa08839e1L, 0x51ce794bL, 0x2f32c9b7L, 0xa01fbac9L, | ||
| 298 | 0xe01cc87eL, 0xbcc7d1f6L, 0xcf0111c3L, 0xa1e8aac7L, | ||
| 299 | 0x1a908749L, 0xd44fbd9aL, 0xd0dadecbL, 0xd50ada38L, | ||
| 300 | 0x0339c32aL, 0xc6913667L, 0x8df9317cL, 0xe0b12b4fL, | ||
| 301 | 0xf79e59b7L, 0x43f5bb3aL, 0xf2d519ffL, 0x27d9459cL, | ||
| 302 | 0xbf97222cL, 0x15e6fc2aL, 0x0f91fc71L, 0x9b941525L, | ||
| 303 | 0xfae59361L, 0xceb69cebL, 0xc2a86459L, 0x12baa8d1L, | ||
| 304 | 0xb6c1075eL, 0xe3056a0cL, 0x10d25065L, 0xcb03a442L, | ||
| 305 | 0xe0ec6e0eL, 0x1698db3bL, 0x4c98a0beL, 0x3278e964L, | ||
| 306 | 0x9f1f9532L, 0xe0d392dfL, 0xd3a0342bL, 0x8971f21eL, | ||
| 307 | 0x1b0a7441L, 0x4ba3348cL, 0xc5be7120L, 0xc37632d8L, | ||
| 308 | 0xdf359f8dL, 0x9b992f2eL, 0xe60b6f47L, 0x0fe3f11dL, | ||
| 309 | 0xe54cda54L, 0x1edad891L, 0xce6279cfL, 0xcd3e7e6fL, | ||
| 310 | 0x1618b166L, 0xfd2c1d05L, 0x848fd2c5L, 0xf6fb2299L, | ||
| 311 | 0xf523f357L, 0xa6327623L, 0x93a83531L, 0x56cccd02L, | ||
| 312 | 0xacf08162L, 0x5a75ebb5L, 0x6e163697L, 0x88d273ccL, | ||
| 313 | 0xde966292L, 0x81b949d0L, 0x4c50901bL, 0x71c65614L, | ||
| 314 | 0xe6c6c7bdL, 0x327a140aL, 0x45e1d006L, 0xc3f27b9aL, | ||
| 315 | 0xc9aa53fdL, 0x62a80f00L, 0xbb25bfe2L, 0x35bdd2f6L, | ||
| 316 | 0x71126905L, 0xb2040222L, 0xb6cbcf7cL, 0xcd769c2bL, | ||
| 317 | 0x53113ec0L, 0x1640e3d3L, 0x38abbd60L, 0x2547adf0L, | ||
| 318 | 0xba38209cL, 0xf746ce76L, 0x77afa1c5L, 0x20756060L, | ||
| 319 | 0x85cbfe4eL, 0x8ae88dd8L, 0x7aaaf9b0L, 0x4cf9aa7eL, | ||
| 320 | 0x1948c25cL, 0x02fb8a8cL, 0x01c36ae4L, 0xd6ebe1f9L, | ||
| 321 | 0x90d4f869L, 0xa65cdea0L, 0x3f09252dL, 0xc208e69fL, | ||
| 322 | 0xb74e6132L, 0xce77e25bL, 0x578fdfe3L, 0x3ac372e6L, | ||
| 323 | } | ||
| 324 | }; | ||
| 325 | |||
diff --git a/src/lib/libcrypto/bf/bf_skey.c b/src/lib/libcrypto/bf/bf_skey.c deleted file mode 100644 index 3673cdee6e..0000000000 --- a/src/lib/libcrypto/bf/bf_skey.c +++ /dev/null | |||
| @@ -1,116 +0,0 @@ | |||
| 1 | /* crypto/bf/bf_skey.c */ | ||
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
| 3 | * All rights reserved. | ||
| 4 | * | ||
| 5 | * This package is an SSL implementation written | ||
| 6 | * by Eric Young (eay@cryptsoft.com). | ||
| 7 | * The implementation was written so as to conform with Netscapes SSL. | ||
| 8 | * | ||
| 9 | * This library is free for commercial and non-commercial use as long as | ||
| 10 | * the following conditions are aheared to. The following conditions | ||
| 11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
| 12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
| 13 | * included with this distribution is covered by the same copyright terms | ||
| 14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
| 15 | * | ||
| 16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
| 17 | * the code are not to be removed. | ||
| 18 | * If this package is used in a product, Eric Young should be given attribution | ||
| 19 | * as the author of the parts of the library used. | ||
| 20 | * This can be in the form of a textual message at program startup or | ||
| 21 | * in documentation (online or textual) provided with the package. | ||
| 22 | * | ||
| 23 | * Redistribution and use in source and binary forms, with or without | ||
| 24 | * modification, are permitted provided that the following conditions | ||
| 25 | * are met: | ||
| 26 | * 1. Redistributions of source code must retain the copyright | ||
| 27 | * notice, this list of conditions and the following disclaimer. | ||
| 28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 29 | * notice, this list of conditions and the following disclaimer in the | ||
| 30 | * documentation and/or other materials provided with the distribution. | ||
| 31 | * 3. All advertising materials mentioning features or use of this software | ||
| 32 | * must display the following acknowledgement: | ||
| 33 | * "This product includes cryptographic software written by | ||
| 34 | * Eric Young (eay@cryptsoft.com)" | ||
| 35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
| 36 | * being used are not cryptographic related :-). | ||
| 37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
| 38 | * the apps directory (application code) you must include an acknowledgement: | ||
| 39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
| 40 | * | ||
| 41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
| 42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 51 | * SUCH DAMAGE. | ||
| 52 | * | ||
| 53 | * The licence and distribution terms for any publically available version or | ||
| 54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
| 55 | * copied and put under another distribution licence | ||
| 56 | * [including the GNU Public Licence.] | ||
| 57 | */ | ||
| 58 | |||
| 59 | #include <stdio.h> | ||
| 60 | #include <string.h> | ||
| 61 | #include <openssl/blowfish.h> | ||
| 62 | #include "bf_locl.h" | ||
| 63 | #include "bf_pi.h" | ||
| 64 | |||
| 65 | void BF_set_key(BF_KEY *key, int len, const unsigned char *data) | ||
| 66 | { | ||
| 67 | int i; | ||
| 68 | BF_LONG *p,ri,in[2]; | ||
| 69 | const unsigned char *d,*end; | ||
| 70 | |||
| 71 | |||
| 72 | memcpy(key,&bf_init,sizeof(BF_KEY)); | ||
| 73 | p=key->P; | ||
| 74 | |||
| 75 | if (len > ((BF_ROUNDS+2)*4)) len=(BF_ROUNDS+2)*4; | ||
| 76 | |||
| 77 | d=data; | ||
| 78 | end= &(data[len]); | ||
| 79 | for (i=0; i<(BF_ROUNDS+2); i++) | ||
| 80 | { | ||
| 81 | ri= *(d++); | ||
| 82 | if (d >= end) d=data; | ||
| 83 | |||
| 84 | ri<<=8; | ||
| 85 | ri|= *(d++); | ||
| 86 | if (d >= end) d=data; | ||
| 87 | |||
| 88 | ri<<=8; | ||
| 89 | ri|= *(d++); | ||
| 90 | if (d >= end) d=data; | ||
| 91 | |||
| 92 | ri<<=8; | ||
| 93 | ri|= *(d++); | ||
| 94 | if (d >= end) d=data; | ||
| 95 | |||
| 96 | p[i]^=ri; | ||
| 97 | } | ||
| 98 | |||
| 99 | in[0]=0L; | ||
| 100 | in[1]=0L; | ||
| 101 | for (i=0; i<(BF_ROUNDS+2); i+=2) | ||
| 102 | { | ||
| 103 | BF_encrypt(in,key); | ||
| 104 | p[i ]=in[0]; | ||
| 105 | p[i+1]=in[1]; | ||
| 106 | } | ||
| 107 | |||
| 108 | p=key->S; | ||
| 109 | for (i=0; i<4*256; i+=2) | ||
| 110 | { | ||
| 111 | BF_encrypt(in,key); | ||
| 112 | p[i ]=in[0]; | ||
| 113 | p[i+1]=in[1]; | ||
| 114 | } | ||
| 115 | } | ||
| 116 | |||
diff --git a/src/lib/libcrypto/bf/bfs.cpp b/src/lib/libcrypto/bf/bfs.cpp deleted file mode 100644 index d74c457760..0000000000 --- a/src/lib/libcrypto/bf/bfs.cpp +++ /dev/null | |||
| @@ -1,67 +0,0 @@ | |||
| 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__) | ||
| 10 | void GetTSC(unsigned long&); | ||
| 11 | #pragma aux GetTSC = 0x0f 0x31 "mov [edi], eax" parm [edi] modify [edx eax]; | ||
| 12 | #elif defined(__GNUC__) | ||
| 13 | inline | ||
| 14 | void 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) | ||
| 22 | inline | ||
| 23 | void 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 | |||
| 37 | void 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 deleted file mode 100644 index c41ef3b403..0000000000 --- a/src/lib/libcrypto/bf/bfspeed.c +++ /dev/null | |||
| @@ -1,277 +0,0 @@ | |||
| 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 | ||
| 70 | OPENSSL_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) | ||
| 114 | long run=0; | ||
| 115 | |||
| 116 | double 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 | |||
| 124 | SIGRETTYPE sig_done(int sig); | ||
| 125 | SIGRETTYPE 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 | |||
| 138 | double 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 | |||
| 174 | int 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 deleted file mode 100644 index 97e6634d37..0000000000 --- a/src/lib/libcrypto/bf/bftest.c +++ /dev/null | |||
| @@ -1,540 +0,0 @@ | |||
| 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 | ||
| 70 | int 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 | |||
| 82 | static char *bf_key[2]={ | ||
| 83 | "abcdefghijklmnopqrstuvwxyz", | ||
| 84 | "Who is John Galt?" | ||
| 85 | }; | ||
| 86 | |||
| 87 | /* big endian */ | ||
| 88 | static BF_LONG bf_plain[2][2]={ | ||
| 89 | {0x424c4f57L,0x46495348L}, | ||
| 90 | {0xfedcba98L,0x76543210L} | ||
| 91 | }; | ||
| 92 | |||
| 93 | static 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 | ||
| 101 | static 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 | |||
| 137 | static 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 | |||
| 173 | static 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 | |||
| 210 | static unsigned char cbc_key [16]={ | ||
| 211 | 0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef, | ||
| 212 | 0xf0,0xe1,0xd2,0xc3,0xb4,0xa5,0x96,0x87}; | ||
| 213 | static unsigned char cbc_iv [8]={0xfe,0xdc,0xba,0x98,0x76,0x54,0x32,0x10}; | ||
| 214 | static char cbc_data[40]="7654321 Now is the time for "; | ||
| 215 | static 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 | |||
| 221 | static 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 | |||
| 227 | static 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 | ||
| 234 | static 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 | |||
| 240 | static unsigned char key_data[8]= | ||
| 241 | {0xFE,0xDC,0xBA,0x98,0x76,0x54,0x32,0x10}; | ||
| 242 | |||
| 243 | static 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 | |||
| 270 | static int test(void ); | ||
| 271 | static int print_test_data(void ); | ||
| 272 | int 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 | |||
| 288 | static 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 | |||
| 355 | static 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 deleted file mode 100644 index b97e76f9a3..0000000000 --- a/src/lib/libcrypto/bf/blowfish.h +++ /dev/null | |||
| @@ -1,127 +0,0 @@ | |||
| 1 | /* crypto/bf/blowfish.h */ | ||
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
| 3 | * All rights reserved. | ||
| 4 | * | ||
| 5 | * This package is an SSL implementation written | ||
| 6 | * by Eric Young (eay@cryptsoft.com). | ||
| 7 | * The implementation was written so as to conform with Netscapes SSL. | ||
| 8 | * | ||
| 9 | * This library is free for commercial and non-commercial use as long as | ||
| 10 | * the following conditions are aheared to. The following conditions | ||
| 11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
| 12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
| 13 | * included with this distribution is covered by the same copyright terms | ||
| 14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
| 15 | * | ||
| 16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
| 17 | * the code are not to be removed. | ||
| 18 | * If this package is used in a product, Eric Young should be given attribution | ||
| 19 | * as the author of the parts of the library used. | ||
| 20 | * This can be in the form of a textual message at program startup or | ||
| 21 | * in documentation (online or textual) provided with the package. | ||
| 22 | * | ||
| 23 | * Redistribution and use in source and binary forms, with or without | ||
| 24 | * modification, are permitted provided that the following conditions | ||
| 25 | * are met: | ||
| 26 | * 1. Redistributions of source code must retain the copyright | ||
| 27 | * notice, this list of conditions and the following disclaimer. | ||
| 28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 29 | * notice, this list of conditions and the following disclaimer in the | ||
| 30 | * documentation and/or other materials provided with the distribution. | ||
| 31 | * 3. All advertising materials mentioning features or use of this software | ||
| 32 | * must display the following acknowledgement: | ||
| 33 | * "This product includes cryptographic software written by | ||
| 34 | * Eric Young (eay@cryptsoft.com)" | ||
| 35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
| 36 | * being used are not cryptographic related :-). | ||
| 37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
| 38 | * the apps directory (application code) you must include an acknowledgement: | ||
| 39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
| 40 | * | ||
| 41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
| 42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 51 | * SUCH DAMAGE. | ||
| 52 | * | ||
| 53 | * The licence and distribution terms for any publically available version or | ||
| 54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
| 55 | * copied and put under another distribution licence | ||
| 56 | * [including the GNU Public Licence.] | ||
| 57 | */ | ||
| 58 | |||
| 59 | #ifndef HEADER_BLOWFISH_H | ||
| 60 | #define HEADER_BLOWFISH_H | ||
| 61 | |||
| 62 | #include <openssl/e_os2.h> | ||
| 63 | |||
| 64 | #ifdef __cplusplus | ||
| 65 | extern "C" { | ||
| 66 | #endif | ||
| 67 | |||
| 68 | #ifdef OPENSSL_NO_BF | ||
| 69 | #error BF is disabled. | ||
| 70 | #endif | ||
| 71 | |||
| 72 | #define BF_ENCRYPT 1 | ||
| 73 | #define BF_DECRYPT 0 | ||
| 74 | |||
| 75 | /* | ||
| 76 | * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
| 77 | * ! BF_LONG has to be at least 32 bits wide. If it's wider, then ! | ||
| 78 | * ! BF_LONG_LOG2 has to be defined along. ! | ||
| 79 | * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
| 80 | */ | ||
| 81 | |||
| 82 | #if defined(__LP32__) | ||
| 83 | #define BF_LONG unsigned long | ||
| 84 | #elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__) | ||
| 85 | #define BF_LONG unsigned long | ||
| 86 | #define BF_LONG_LOG2 3 | ||
| 87 | /* | ||
| 88 | * _CRAY note. I could declare short, but I have no idea what impact | ||
| 89 | * does it have on performance on none-T3E machines. I could declare | ||
| 90 | * int, but at least on C90 sizeof(int) can be chosen at compile time. | ||
| 91 | * So I've chosen long... | ||
| 92 | * <appro@fy.chalmers.se> | ||
| 93 | */ | ||
| 94 | #else | ||
| 95 | #define BF_LONG unsigned int | ||
| 96 | #endif | ||
| 97 | |||
| 98 | #define BF_ROUNDS 16 | ||
| 99 | #define BF_BLOCK 8 | ||
| 100 | |||
| 101 | typedef struct bf_key_st | ||
| 102 | { | ||
| 103 | BF_LONG P[BF_ROUNDS+2]; | ||
| 104 | BF_LONG S[4*256]; | ||
| 105 | } BF_KEY; | ||
| 106 | |||
| 107 | |||
| 108 | void BF_set_key(BF_KEY *key, int len, const unsigned char *data); | ||
| 109 | |||
| 110 | void BF_encrypt(BF_LONG *data,const BF_KEY *key); | ||
| 111 | void BF_decrypt(BF_LONG *data,const BF_KEY *key); | ||
| 112 | |||
| 113 | void BF_ecb_encrypt(const unsigned char *in, unsigned char *out, | ||
| 114 | const BF_KEY *key, int enc); | ||
| 115 | void BF_cbc_encrypt(const unsigned char *in, unsigned char *out, long length, | ||
| 116 | const BF_KEY *schedule, unsigned char *ivec, int enc); | ||
| 117 | void BF_cfb64_encrypt(const unsigned char *in, unsigned char *out, long length, | ||
| 118 | const BF_KEY *schedule, unsigned char *ivec, int *num, int enc); | ||
| 119 | void BF_ofb64_encrypt(const unsigned char *in, unsigned char *out, long length, | ||
| 120 | const BF_KEY *schedule, unsigned char *ivec, int *num); | ||
| 121 | const char *BF_options(void); | ||
| 122 | |||
| 123 | #ifdef __cplusplus | ||
| 124 | } | ||
| 125 | #endif | ||
| 126 | |||
| 127 | #endif | ||
