diff options
Diffstat (limited to 'src/lib/libcrypto/rc4')
| -rw-r--r-- | src/lib/libcrypto/rc4/Makefile | 125 | ||||
| -rw-r--r-- | src/lib/libcrypto/rc4/Makefile.ssl | 110 | ||||
| -rwxr-xr-x | src/lib/libcrypto/rc4/asm/rc4-amd64.pl | 227 | ||||
| -rw-r--r-- | src/lib/libcrypto/rc4/asm/rc4-ia64.S | 159 | ||||
| -rwxr-xr-x | src/lib/libcrypto/rc4/asm/rc4-x86_64.pl | 7 | ||||
| -rw-r--r-- | src/lib/libcrypto/rc4/rc4.c | 193 | ||||
| -rw-r--r-- | src/lib/libcrypto/rc4/rc4.h | 3 | ||||
| -rw-r--r-- | src/lib/libcrypto/rc4/rc4_fblk.c | 75 | ||||
| -rw-r--r-- | src/lib/libcrypto/rc4/rc4_skey.c | 16 | ||||
| -rw-r--r-- | src/lib/libcrypto/rc4/rc4s.cpp | 73 | ||||
| -rw-r--r-- | src/lib/libcrypto/rc4/rc4speed.c | 253 | ||||
| -rw-r--r-- | src/lib/libcrypto/rc4/rc4test.c | 236 | ||||
| -rw-r--r-- | src/lib/libcrypto/rc4/rrc4.doc | 278 |
13 files changed, 1732 insertions, 23 deletions
diff --git a/src/lib/libcrypto/rc4/Makefile b/src/lib/libcrypto/rc4/Makefile new file mode 100644 index 0000000000..f0bd7678fc --- /dev/null +++ b/src/lib/libcrypto/rc4/Makefile | |||
| @@ -0,0 +1,125 @@ | |||
| 1 | # | ||
| 2 | # OpenSSL/crypto/rc4/Makefile | ||
| 3 | # | ||
| 4 | |||
| 5 | DIR= rc4 | ||
| 6 | TOP= ../.. | ||
| 7 | CC= cc | ||
| 8 | CPP= $(CC) -E | ||
| 9 | INCLUDES= | ||
| 10 | CFLAG=-g | ||
| 11 | AR= ar r | ||
| 12 | |||
| 13 | RC4_ENC=rc4_enc.o rc4_skey.o | ||
| 14 | |||
| 15 | CFLAGS= $(INCLUDES) $(CFLAG) | ||
| 16 | ASFLAGS= $(INCLUDES) $(ASFLAG) | ||
| 17 | AFLAGS= $(ASFLAGS) | ||
| 18 | |||
| 19 | GENERAL=Makefile | ||
| 20 | TEST=rc4test.c | ||
| 21 | APPS= | ||
| 22 | |||
| 23 | LIB=$(TOP)/libcrypto.a | ||
| 24 | LIBSRC=rc4_skey.c rc4_enc.c rc4_fblk.c | ||
| 25 | LIBOBJ=$(RC4_ENC) rc4_fblk.o | ||
| 26 | |||
| 27 | SRC= $(LIBSRC) | ||
| 28 | |||
| 29 | EXHEADER= rc4.h | ||
| 30 | HEADER= $(EXHEADER) rc4_locl.h | ||
| 31 | |||
| 32 | ALL= $(GENERAL) $(SRC) $(HEADER) | ||
| 33 | |||
| 34 | top: | ||
| 35 | (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) | ||
| 36 | |||
| 37 | all: lib | ||
| 38 | |||
| 39 | lib: $(LIBOBJ) | ||
| 40 | $(ARX) $(LIB) $(LIBOBJ) | ||
| 41 | $(RANLIB) $(LIB) || echo Never mind. | ||
| 42 | @touch lib | ||
| 43 | |||
| 44 | # ELF | ||
| 45 | rx86-elf.s: asm/rc4-586.pl ../perlasm/x86asm.pl | ||
| 46 | (cd asm; $(PERL) rc4-586.pl elf $(CFLAGS) > ../$@) | ||
| 47 | # COFF | ||
| 48 | rx86-cof.s: asm/rc4-586.pl ../perlasm/x86asm.pl | ||
| 49 | (cd asm; $(PERL) rc4-586.pl coff $(CFLAGS) > ../$@) | ||
| 50 | # a.out | ||
| 51 | rx86-out.s: asm/rc4-586.pl ../perlasm/x86asm.pl | ||
| 52 | (cd asm; $(PERL) rc4-586.pl a.out $(CFLAGS) > ../$@) | ||
| 53 | |||
| 54 | rc4-x86_64.s: asm/rc4-x86_64.pl; $(PERL) asm/rc4-x86_64.pl $@ | ||
| 55 | |||
| 56 | rc4-ia64.s: asm/rc4-ia64.S | ||
| 57 | @case `awk '/^#define RC4_INT/{print$$NF}' $(TOP)/include/openssl/opensslconf.h` in \ | ||
| 58 | int) set -x; $(CC) $(CFLAGS) -DSZ=4 -E asm/rc4-ia64.S > $@ ;; \ | ||
| 59 | char) set -x; $(CC) $(CFLAGS) -DSZ=1 -E asm/rc4-ia64.S > $@ ;; \ | ||
| 60 | *) exit 1 ;; \ | ||
| 61 | esac | ||
| 62 | |||
| 63 | files: | ||
| 64 | $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO | ||
| 65 | |||
| 66 | links: | ||
| 67 | @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) | ||
| 68 | @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) | ||
| 69 | @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) | ||
| 70 | |||
| 71 | install: | ||
| 72 | @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... | ||
| 73 | @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ | ||
| 74 | do \ | ||
| 75 | (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ | ||
| 76 | chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ | ||
| 77 | done; | ||
| 78 | |||
| 79 | tags: | ||
| 80 | ctags $(SRC) | ||
| 81 | |||
| 82 | tests: | ||
| 83 | |||
| 84 | lint: | ||
| 85 | lint -DLINT $(INCLUDES) $(SRC)>fluff | ||
| 86 | |||
| 87 | depend: | ||
| 88 | @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... | ||
| 89 | $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) | ||
| 90 | |||
| 91 | dclean: | ||
| 92 | $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new | ||
| 93 | mv -f Makefile.new $(MAKEFILE) | ||
| 94 | |||
| 95 | clean: | ||
| 96 | rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff | ||
| 97 | |||
| 98 | # DO NOT DELETE THIS LINE -- make depend depends on it. | ||
| 99 | |||
| 100 | rc4_enc.o: ../../e_os.h ../../include/openssl/bio.h | ||
| 101 | rc4_enc.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h | ||
| 102 | rc4_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h | ||
| 103 | rc4_enc.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h | ||
| 104 | rc4_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | ||
| 105 | rc4_enc.o: ../../include/openssl/rc4.h ../../include/openssl/safestack.h | ||
| 106 | rc4_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | ||
| 107 | rc4_enc.o: ../cryptlib.h rc4_enc.c rc4_locl.h | ||
| 108 | rc4_fblk.o: ../../e_os.h ../../include/openssl/bio.h | ||
| 109 | rc4_fblk.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h | ||
| 110 | rc4_fblk.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h | ||
| 111 | rc4_fblk.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h | ||
| 112 | rc4_fblk.o: ../../include/openssl/opensslconf.h | ||
| 113 | rc4_fblk.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | ||
| 114 | rc4_fblk.o: ../../include/openssl/rc4.h ../../include/openssl/safestack.h | ||
| 115 | rc4_fblk.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | ||
| 116 | rc4_fblk.o: ../cryptlib.h rc4_fblk.c rc4_locl.h | ||
| 117 | rc4_skey.o: ../../e_os.h ../../include/openssl/bio.h | ||
| 118 | rc4_skey.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h | ||
| 119 | rc4_skey.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h | ||
| 120 | rc4_skey.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h | ||
| 121 | rc4_skey.o: ../../include/openssl/opensslconf.h | ||
| 122 | rc4_skey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | ||
| 123 | rc4_skey.o: ../../include/openssl/rc4.h ../../include/openssl/safestack.h | ||
| 124 | rc4_skey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | ||
| 125 | rc4_skey.o: ../cryptlib.h rc4_locl.h rc4_skey.c | ||
diff --git a/src/lib/libcrypto/rc4/Makefile.ssl b/src/lib/libcrypto/rc4/Makefile.ssl new file mode 100644 index 0000000000..3e602662be --- /dev/null +++ b/src/lib/libcrypto/rc4/Makefile.ssl | |||
| @@ -0,0 +1,110 @@ | |||
| 1 | # | ||
| 2 | # SSLeay/crypto/rc4/Makefile | ||
| 3 | # | ||
| 4 | |||
| 5 | DIR= rc4 | ||
| 6 | TOP= ../.. | ||
| 7 | CC= cc | ||
| 8 | CPP= $(CC) -E | ||
| 9 | INCLUDES= | ||
| 10 | CFLAG=-g | ||
| 11 | INSTALL_PREFIX= | ||
| 12 | OPENSSLDIR= /usr/local/ssl | ||
| 13 | INSTALLTOP=/usr/local/ssl | ||
| 14 | MAKE= make -f Makefile.ssl | ||
| 15 | MAKEDEPPROG= makedepend | ||
| 16 | MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) | ||
| 17 | MAKEFILE= Makefile.ssl | ||
| 18 | AR= ar r | ||
| 19 | |||
| 20 | RC4_ENC=rc4_enc.o | ||
| 21 | # or use | ||
| 22 | #RC4_ENC=asm/rx86-elf.o | ||
| 23 | #RC4_ENC=asm/rx86-out.o | ||
| 24 | #RC4_ENC=asm/rx86-sol.o | ||
| 25 | #RC4_ENC=asm/rx86bdsi.o | ||
| 26 | |||
| 27 | CFLAGS= $(INCLUDES) $(CFLAG) | ||
| 28 | ASFLAGS= $(INCLUDES) $(ASFLAG) | ||
| 29 | |||
| 30 | GENERAL=Makefile | ||
| 31 | TEST=rc4test.c | ||
| 32 | APPS= | ||
| 33 | |||
| 34 | LIB=$(TOP)/libcrypto.a | ||
| 35 | LIBSRC=rc4_skey.c rc4_enc.c | ||
| 36 | LIBOBJ=rc4_skey.o $(RC4_ENC) | ||
| 37 | |||
| 38 | SRC= $(LIBSRC) | ||
| 39 | |||
| 40 | EXHEADER= rc4.h | ||
| 41 | HEADER= $(EXHEADER) rc4_locl.h | ||
| 42 | |||
| 43 | ALL= $(GENERAL) $(SRC) $(HEADER) | ||
| 44 | |||
| 45 | top: | ||
| 46 | (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) | ||
| 47 | |||
| 48 | all: lib | ||
| 49 | |||
| 50 | lib: $(LIBOBJ) | ||
| 51 | $(AR) $(LIB) $(LIBOBJ) | ||
| 52 | $(RANLIB) $(LIB) || echo Never mind. | ||
| 53 | @touch lib | ||
| 54 | |||
| 55 | # elf | ||
| 56 | asm/rx86-elf.s: asm/rc4-586.pl ../perlasm/x86asm.pl | ||
| 57 | (cd asm; $(PERL) rc4-586.pl elf $(CFLAGS) > rx86-elf.s) | ||
| 58 | |||
| 59 | # a.out | ||
| 60 | asm/rx86-out.o: asm/rx86unix.cpp | ||
| 61 | $(CPP) -DOUT asm/rx86unix.cpp | as -o asm/rx86-out.o | ||
| 62 | |||
| 63 | # bsdi | ||
| 64 | asm/rx86bsdi.o: asm/rx86unix.cpp | ||
| 65 | $(CPP) -DBSDI asm/rx86unix.cpp | sed 's/ :/:/' | as -o asm/rx86bsdi.o | ||
| 66 | |||
| 67 | asm/rx86unix.cpp: asm/rc4-586.pl ../perlasm/x86asm.pl | ||
| 68 | (cd asm; $(PERL) rc4-586.pl cpp >rx86unix.cpp) | ||
| 69 | |||
| 70 | files: | ||
| 71 | $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO | ||
| 72 | |||
| 73 | links: | ||
| 74 | @sh $(TOP)/util/point.sh Makefile.ssl Makefile | ||
| 75 | @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) | ||
| 76 | @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) | ||
| 77 | @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) | ||
| 78 | |||
| 79 | install: | ||
| 80 | @for i in $(EXHEADER) ; \ | ||
| 81 | do \ | ||
| 82 | (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ | ||
| 83 | chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ | ||
| 84 | done; | ||
| 85 | |||
| 86 | tags: | ||
| 87 | ctags $(SRC) | ||
| 88 | |||
| 89 | tests: | ||
| 90 | |||
| 91 | lint: | ||
| 92 | lint -DLINT $(INCLUDES) $(SRC)>fluff | ||
| 93 | |||
| 94 | depend: | ||
| 95 | $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) | ||
| 96 | |||
| 97 | dclean: | ||
| 98 | $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new | ||
| 99 | mv -f Makefile.new $(MAKEFILE) | ||
| 100 | |||
| 101 | clean: | ||
| 102 | rm -f asm/rx86unix.cpp asm/*-elf.* *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff asm/*.o | ||
| 103 | |||
| 104 | # DO NOT DELETE THIS LINE -- make depend depends on it. | ||
| 105 | |||
| 106 | rc4_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/rc4.h | ||
| 107 | rc4_enc.o: rc4_enc.c rc4_locl.h | ||
| 108 | rc4_skey.o: ../../include/openssl/opensslconf.h | ||
| 109 | rc4_skey.o: ../../include/openssl/opensslv.h ../../include/openssl/rc4.h | ||
| 110 | rc4_skey.o: rc4_locl.h rc4_skey.c | ||
diff --git a/src/lib/libcrypto/rc4/asm/rc4-amd64.pl b/src/lib/libcrypto/rc4/asm/rc4-amd64.pl new file mode 100755 index 0000000000..9e0da8af99 --- /dev/null +++ b/src/lib/libcrypto/rc4/asm/rc4-amd64.pl | |||
| @@ -0,0 +1,227 @@ | |||
| 1 | #!/usr/bin/env perl | ||
| 2 | # | ||
| 3 | # ==================================================================== | ||
| 4 | # Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL | ||
| 5 | # project. Rights for redistribution and usage in source and binary | ||
| 6 | # forms are granted according to the OpenSSL license. | ||
| 7 | # ==================================================================== | ||
| 8 | # | ||
| 9 | # 2.22x RC4 tune-up:-) It should be noted though that my hand [as in | ||
| 10 | # "hand-coded assembler"] doesn't stand for the whole improvement | ||
| 11 | # coefficient. It turned out that eliminating RC4_CHAR from config | ||
| 12 | # line results in ~40% improvement (yes, even for C implementation). | ||
| 13 | # Presumably it has everything to do with AMD cache architecture and | ||
| 14 | # RAW or whatever penalties. Once again! The module *requires* config | ||
| 15 | # line *without* RC4_CHAR! As for coding "secret," I bet on partial | ||
| 16 | # register arithmetics. For example instead of 'inc %r8; and $255,%r8' | ||
| 17 | # I simply 'inc %r8b'. Even though optimization manual discourages | ||
| 18 | # to operate on partial registers, it turned out to be the best bet. | ||
| 19 | # At least for AMD... How IA32E would perform remains to be seen... | ||
| 20 | |||
| 21 | # As was shown by Marc Bevand reordering of couple of load operations | ||
| 22 | # results in even higher performance gain of 3.3x:-) At least on | ||
| 23 | # Opteron... For reference, 1x in this case is RC4_CHAR C-code | ||
| 24 | # compiled with gcc 3.3.2, which performs at ~54MBps per 1GHz clock. | ||
| 25 | # Latter means that if you want to *estimate* what to expect from | ||
| 26 | # *your* CPU, then multiply 54 by 3.3 and clock frequency in GHz. | ||
| 27 | |||
| 28 | # Intel P4 EM64T core was found to run the AMD64 code really slow... | ||
| 29 | # The only way to achieve comparable performance on P4 is to keep | ||
| 30 | # RC4_CHAR. Kind of ironic, huh? As it's apparently impossible to | ||
| 31 | # compose blended code, which would perform even within 30% marginal | ||
| 32 | # on either AMD and Intel platforms, I implement both cases. See | ||
| 33 | # rc4_skey.c for further details... This applies to 0.9.8 and later. | ||
| 34 | # In 0.9.7 context RC4_CHAR codepath is never engaged and ~70 bytes | ||
| 35 | # of code remain redundant. | ||
| 36 | |||
| 37 | $output=shift; | ||
| 38 | |||
| 39 | $win64a=1 if ($output =~ /win64a.[s|asm]/); | ||
| 40 | |||
| 41 | open STDOUT,">$output" || die "can't open $output: $!"; | ||
| 42 | |||
| 43 | if (defined($win64a)) { | ||
| 44 | $dat="%rcx"; # arg1 | ||
| 45 | $len="%rdx"; # arg2 | ||
| 46 | $inp="%rsi"; # r8, arg3 moves here | ||
| 47 | $out="%rdi"; # r9, arg4 moves here | ||
| 48 | } else { | ||
| 49 | $dat="%rdi"; # arg1 | ||
| 50 | $len="%rsi"; # arg2 | ||
| 51 | $inp="%rdx"; # arg3 | ||
| 52 | $out="%rcx"; # arg4 | ||
| 53 | } | ||
| 54 | |||
| 55 | $XX="%r10"; | ||
| 56 | $TX="%r8"; | ||
| 57 | $YY="%r11"; | ||
| 58 | $TY="%r9"; | ||
| 59 | |||
| 60 | sub PTR() { | ||
| 61 | my $ret=shift; | ||
| 62 | if (defined($win64a)) { | ||
| 63 | $ret =~ s/\[([\S]+)\+([\S]+)\]/[$2+$1]/g; # [%rN+%rM*4]->[%rM*4+%rN] | ||
| 64 | $ret =~ s/:([^\[]+)\[([^\]]+)\]/:[$2+$1]/g; # :off[ea]->:[ea+off] | ||
| 65 | } else { | ||
| 66 | $ret =~ s/[\+\*]/,/g; # [%rN+%rM*4]->[%rN,%rM,4] | ||
| 67 | $ret =~ s/\[([^\]]+)\]/($1)/g; # [%rN]->(%rN) | ||
| 68 | } | ||
| 69 | $ret; | ||
| 70 | } | ||
| 71 | |||
| 72 | $code=<<___ if (!defined($win64a)); | ||
| 73 | .text | ||
| 74 | |||
| 75 | .globl RC4 | ||
| 76 | .type RC4,\@function | ||
| 77 | .align 16 | ||
| 78 | RC4: or $len,$len | ||
| 79 | jne .Lentry | ||
| 80 | repret | ||
| 81 | .Lentry: | ||
| 82 | ___ | ||
| 83 | $code=<<___ if (defined($win64a)); | ||
| 84 | _TEXT SEGMENT | ||
| 85 | PUBLIC RC4 | ||
| 86 | ALIGN 16 | ||
| 87 | RC4 PROC | ||
| 88 | or $len,$len | ||
| 89 | jne .Lentry | ||
| 90 | repret | ||
| 91 | .Lentry: | ||
| 92 | push %rdi | ||
| 93 | push %rsi | ||
| 94 | sub \$40,%rsp | ||
| 95 | mov %r8,$inp | ||
| 96 | mov %r9,$out | ||
| 97 | ___ | ||
| 98 | $code.=<<___; | ||
| 99 | add \$8,$dat | ||
| 100 | movl `&PTR("DWORD:-8[$dat]")`,$XX#d | ||
| 101 | movl `&PTR("DWORD:-4[$dat]")`,$YY#d | ||
| 102 | cmpl \$-1,`&PTR("DWORD:256[$dat]")` | ||
| 103 | je .LRC4_CHAR | ||
| 104 | test \$-8,$len | ||
| 105 | jz .Lloop1 | ||
| 106 | .align 16 | ||
| 107 | .Lloop8: | ||
| 108 | inc $XX#b | ||
| 109 | movl `&PTR("DWORD:[$dat+$XX*4]")`,$TX#d | ||
| 110 | add $TX#b,$YY#b | ||
| 111 | movl `&PTR("DWORD:[$dat+$YY*4]")`,$TY#d | ||
| 112 | movl $TX#d,`&PTR("DWORD:[$dat+$YY*4]")` | ||
| 113 | movl $TY#d,`&PTR("DWORD:[$dat+$XX*4]")` | ||
| 114 | add $TX#b,$TY#b | ||
| 115 | inc $XX#b | ||
| 116 | movl `&PTR("DWORD:[$dat+$XX*4]")`,$TX#d | ||
| 117 | movb `&PTR("BYTE:[$dat+$TY*4]")`,%al | ||
| 118 | ___ | ||
| 119 | for ($i=1;$i<=6;$i++) { | ||
| 120 | $code.=<<___; | ||
| 121 | add $TX#b,$YY#b | ||
| 122 | ror \$8,%rax | ||
| 123 | movl `&PTR("DWORD:[$dat+$YY*4]")`,$TY#d | ||
| 124 | movl $TX#d,`&PTR("DWORD:[$dat+$YY*4]")` | ||
| 125 | movl $TY#d,`&PTR("DWORD:[$dat+$XX*4]")` | ||
| 126 | add $TX#b,$TY#b | ||
| 127 | inc $XX#b | ||
| 128 | movl `&PTR("DWORD:[$dat+$XX*4]")`,$TX#d | ||
| 129 | movb `&PTR("BYTE:[$dat+$TY*4]")`,%al | ||
| 130 | ___ | ||
| 131 | } | ||
| 132 | $code.=<<___; | ||
| 133 | add $TX#b,$YY#b | ||
| 134 | ror \$8,%rax | ||
| 135 | movl `&PTR("DWORD:[$dat+$YY*4]")`,$TY#d | ||
| 136 | movl $TX#d,`&PTR("DWORD:[$dat+$YY*4]")` | ||
| 137 | movl $TY#d,`&PTR("DWORD:[$dat+$XX*4]")` | ||
| 138 | sub \$8,$len | ||
| 139 | add $TY#b,$TX#b | ||
| 140 | movb `&PTR("BYTE:[$dat+$TX*4]")`,%al | ||
| 141 | ror \$8,%rax | ||
| 142 | add \$8,$inp | ||
| 143 | add \$8,$out | ||
| 144 | |||
| 145 | xor `&PTR("QWORD:-8[$inp]")`,%rax | ||
| 146 | mov %rax,`&PTR("QWORD:-8[$out]")` | ||
| 147 | |||
| 148 | test \$-8,$len | ||
| 149 | jnz .Lloop8 | ||
| 150 | cmp \$0,$len | ||
| 151 | jne .Lloop1 | ||
| 152 | .Lexit: | ||
| 153 | movl $XX#d,`&PTR("DWORD:-8[$dat]")` | ||
| 154 | movl $YY#d,`&PTR("DWORD:-4[$dat]")` | ||
| 155 | ___ | ||
| 156 | $code.=<<___ if (defined($win64a)); | ||
| 157 | add \$40,%rsp | ||
| 158 | pop %rsi | ||
| 159 | pop %rdi | ||
| 160 | ___ | ||
| 161 | $code.=<<___; | ||
| 162 | repret | ||
| 163 | .align 16 | ||
| 164 | .Lloop1: | ||
| 165 | movzb `&PTR("BYTE:[$inp]")`,%eax | ||
| 166 | inc $XX#b | ||
| 167 | movl `&PTR("DWORD:[$dat+$XX*4]")`,$TX#d | ||
| 168 | add $TX#b,$YY#b | ||
| 169 | movl `&PTR("DWORD:[$dat+$YY*4]")`,$TY#d | ||
| 170 | movl $TX#d,`&PTR("DWORD:[$dat+$YY*4]")` | ||
| 171 | movl $TY#d,`&PTR("DWORD:[$dat+$XX*4]")` | ||
| 172 | add $TY#b,$TX#b | ||
| 173 | movl `&PTR("DWORD:[$dat+$TX*4]")`,$TY#d | ||
| 174 | xor $TY,%rax | ||
| 175 | inc $inp | ||
| 176 | movb %al,`&PTR("BYTE:[$out]")` | ||
| 177 | inc $out | ||
| 178 | dec $len | ||
| 179 | jnz .Lloop1 | ||
| 180 | jmp .Lexit | ||
| 181 | |||
| 182 | .align 16 | ||
| 183 | .LRC4_CHAR: | ||
| 184 | inc $XX#b | ||
| 185 | movzb `&PTR("BYTE:[$dat+$XX]")`,$TX#d | ||
| 186 | add $TX#b,$YY#b | ||
| 187 | movzb `&PTR("BYTE:[$dat+$YY]")`,$TY#d | ||
| 188 | movb $TX#b,`&PTR("BYTE:[$dat+$YY]")` | ||
| 189 | movb $TY#b,`&PTR("BYTE:[$dat+$XX]")` | ||
| 190 | add $TX#b,$TY#b | ||
| 191 | movzb `&PTR("BYTE:[$dat+$TY]")`,$TY#d | ||
| 192 | xorb `&PTR("BYTE:[$inp]")`,$TY#b | ||
| 193 | movb $TY#b,`&PTR("BYTE:[$out]")` | ||
| 194 | inc $inp | ||
| 195 | inc $out | ||
| 196 | dec $len | ||
| 197 | jnz .LRC4_CHAR | ||
| 198 | jmp .Lexit | ||
| 199 | ___ | ||
| 200 | $code.=<<___ if (defined($win64a)); | ||
| 201 | RC4 ENDP | ||
| 202 | _TEXT ENDS | ||
| 203 | END | ||
| 204 | ___ | ||
| 205 | $code.=<<___ if (!defined($win64a)); | ||
| 206 | .size RC4,.-RC4 | ||
| 207 | ___ | ||
| 208 | |||
| 209 | $code =~ s/#([bwd])/$1/gm; | ||
| 210 | $code =~ s/\`([^\`]*)\`/eval $1/gem; | ||
| 211 | |||
| 212 | if (defined($win64a)) { | ||
| 213 | $code =~ s/\.align/ALIGN/gm; | ||
| 214 | $code =~ s/[\$%]//gm; | ||
| 215 | $code =~ s/\.L/\$L/gm; | ||
| 216 | $code =~ s/([\w]+)([\s]+)([\S]+),([\S]+)/$1$2$4,$3/gm; | ||
| 217 | $code =~ s/([QD]*WORD|BYTE):/$1 PTR/gm; | ||
| 218 | $code =~ s/mov[bwlq]/mov/gm; | ||
| 219 | $code =~ s/movzb/movzx/gm; | ||
| 220 | $code =~ s/repret/DB\t0F3h,0C3h/gm; | ||
| 221 | $code =~ s/cmpl/cmp/gm; | ||
| 222 | $code =~ s/xorb/xor/gm; | ||
| 223 | } else { | ||
| 224 | $code =~ s/([QD]*WORD|BYTE)://gm; | ||
| 225 | $code =~ s/repret/.byte\t0xF3,0xC3/gm; | ||
| 226 | } | ||
| 227 | print $code; | ||
diff --git a/src/lib/libcrypto/rc4/asm/rc4-ia64.S b/src/lib/libcrypto/rc4/asm/rc4-ia64.S new file mode 100644 index 0000000000..8210c47d04 --- /dev/null +++ b/src/lib/libcrypto/rc4/asm/rc4-ia64.S | |||
| @@ -0,0 +1,159 @@ | |||
| 1 | // ==================================================================== | ||
| 2 | // Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL | ||
| 3 | // project. | ||
| 4 | // | ||
| 5 | // Rights for redistribution and usage in source and binary forms are | ||
| 6 | // granted according to the OpenSSL license. Warranty of any kind is | ||
| 7 | // disclaimed. | ||
| 8 | // ==================================================================== | ||
| 9 | |||
| 10 | .ident "rc4-ia64.S, Version 2.0" | ||
| 11 | .ident "IA-64 ISA artwork by Andy Polyakov <appro@fy.chalmers.se>" | ||
| 12 | |||
| 13 | // What's wrong with compiler generated code? Because of the nature of | ||
| 14 | // C language, compiler doesn't [dare to] reorder load and stores. But | ||
| 15 | // being memory-bound, RC4 should benefit from reorder [on in-order- | ||
| 16 | // execution core such as IA-64]. But what can we reorder? At the very | ||
| 17 | // least we can safely reorder references to key schedule in respect | ||
| 18 | // to input and output streams. Secondly, from the first [close] glance | ||
| 19 | // it appeared that it's possible to pull up some references to | ||
| 20 | // elements of the key schedule itself. Original rationale ["prior | ||
| 21 | // loads are not safe only for "degenerated" key schedule, when some | ||
| 22 | // elements equal to the same value"] was kind of sloppy. I should have | ||
| 23 | // formulated as it really was: if we assume that pulling up reference | ||
| 24 | // to key[x+1] is not safe, then it would mean that key schedule would | ||
| 25 | // "degenerate," which is never the case. The problem is that this | ||
| 26 | // holds true in respect to references to key[x], but not to key[y]. | ||
| 27 | // Legitimate "collisions" do occur within every 256^2 bytes window. | ||
| 28 | // Fortunately there're enough free instruction slots to keep prior | ||
| 29 | // reference to key[x+1], detect "collision" and compensate for it. | ||
| 30 | // All this without sacrificing a single clock cycle:-) Throughput is | ||
| 31 | // ~210MBps on 900MHz CPU, which is is >3x faster than gcc generated | ||
| 32 | // code and +30% - if compared to HP-UX C. Unrolling loop below should | ||
| 33 | // give >30% on top of that... | ||
| 34 | |||
| 35 | .text | ||
| 36 | .explicit | ||
| 37 | |||
| 38 | #if defined(_HPUX_SOURCE) && !defined(_LP64) | ||
| 39 | # define ADDP addp4 | ||
| 40 | #else | ||
| 41 | # define ADDP add | ||
| 42 | #endif | ||
| 43 | |||
| 44 | #ifndef SZ | ||
| 45 | #define SZ 4 // this is set to sizeof(RC4_INT) | ||
| 46 | #endif | ||
| 47 | // SZ==4 seems to be optimal. At least SZ==8 is not any faster, not for | ||
| 48 | // assembler implementation, while SZ==1 code is ~30% slower. | ||
| 49 | #if SZ==1 // RC4_INT is unsigned char | ||
| 50 | # define LDKEY ld1 | ||
| 51 | # define STKEY st1 | ||
| 52 | # define OFF 0 | ||
| 53 | #elif SZ==4 // RC4_INT is unsigned int | ||
| 54 | # define LDKEY ld4 | ||
| 55 | # define STKEY st4 | ||
| 56 | # define OFF 2 | ||
| 57 | #elif SZ==8 // RC4_INT is unsigned long | ||
| 58 | # define LDKEY ld8 | ||
| 59 | # define STKEY st8 | ||
| 60 | # define OFF 3 | ||
| 61 | #endif | ||
| 62 | |||
| 63 | out=r8; // [expanded] output pointer | ||
| 64 | inp=r9; // [expanded] output pointer | ||
| 65 | prsave=r10; | ||
| 66 | key=r28; // [expanded] pointer to RC4_KEY | ||
| 67 | ksch=r29; // (key->data+255)[&~(sizeof(key->data)-1)] | ||
| 68 | xx=r30; | ||
| 69 | yy=r31; | ||
| 70 | |||
| 71 | // void RC4(RC4_KEY *key,size_t len,const void *inp,void *out); | ||
| 72 | .global RC4# | ||
| 73 | .proc RC4# | ||
| 74 | .align 32 | ||
| 75 | .skip 16 | ||
| 76 | RC4: | ||
| 77 | .prologue | ||
| 78 | .save ar.pfs,r2 | ||
| 79 | { .mii; alloc r2=ar.pfs,4,12,0,16 | ||
| 80 | .save pr,prsave | ||
| 81 | mov prsave=pr | ||
| 82 | ADDP key=0,in0 };; | ||
| 83 | { .mib; cmp.eq p6,p0=0,in1 // len==0? | ||
| 84 | .save ar.lc,r3 | ||
| 85 | mov r3=ar.lc | ||
| 86 | (p6) br.ret.spnt.many b0 };; // emergency exit | ||
| 87 | |||
| 88 | .body | ||
| 89 | .rotr dat[4],key_x[4],tx[2],rnd[2],key_y[2],ty[1]; | ||
| 90 | |||
| 91 | { .mib; LDKEY xx=[key],SZ // load key->x | ||
| 92 | add in1=-1,in1 // adjust len for loop counter | ||
| 93 | nop.b 0 } | ||
| 94 | { .mib; ADDP inp=0,in2 | ||
| 95 | ADDP out=0,in3 | ||
| 96 | brp.loop.imp .Ltop,.Lexit-16 };; | ||
| 97 | { .mmi; LDKEY yy=[key] // load key->y | ||
| 98 | add ksch=SZ,key | ||
| 99 | mov ar.lc=in1 } | ||
| 100 | { .mmi; mov key_y[1]=r0 // guarantee inequality | ||
| 101 | // in first iteration | ||
| 102 | add xx=1,xx | ||
| 103 | mov pr.rot=1<<16 };; | ||
| 104 | { .mii; nop.m 0 | ||
| 105 | dep key_x[1]=xx,r0,OFF,8 | ||
| 106 | mov ar.ec=3 };; // note that epilogue counter | ||
| 107 | // is off by 1. I compensate | ||
| 108 | // for this at exit... | ||
| 109 | .Ltop: | ||
| 110 | // The loop is scheduled for 4*(n+2) spin-rate on Itanium 2, which | ||
| 111 | // theoretically gives asymptotic performance of clock frequency | ||
| 112 | // divided by 4 bytes per seconds, or 400MBps on 1.6GHz CPU. This is | ||
| 113 | // for sizeof(RC4_INT)==4. For smaller RC4_INT STKEY inadvertently | ||
| 114 | // splits the last bundle and you end up with 5*n spin-rate:-( | ||
| 115 | // Originally the loop was scheduled for 3*n and relied on key | ||
| 116 | // schedule to be aligned at 256*sizeof(RC4_INT) boundary. But | ||
| 117 | // *(out++)=dat, which maps to st1, had same effect [inadvertent | ||
| 118 | // bundle split] and holded the loop back. Rescheduling for 4*n | ||
| 119 | // made it possible to eliminate dependence on specific alignment | ||
| 120 | // and allow OpenSSH keep "abusing" our API. Reaching for 3*n would | ||
| 121 | // require unrolling, sticking to variable shift instruction for | ||
| 122 | // collecting output [to avoid starvation for integer shifter] and | ||
| 123 | // copying of key schedule to controlled place in stack [so that | ||
| 124 | // deposit instruction can serve as substitute for whole | ||
| 125 | // key->data+((x&255)<<log2(sizeof(key->data[0])))]... | ||
| 126 | { .mmi; (p19) st1 [out]=dat[3],1 // *(out++)=dat | ||
| 127 | (p16) add xx=1,xx // x++ | ||
| 128 | (p18) dep rnd[1]=rnd[1],r0,OFF,8 } // ((tx+ty)&255)<<OFF | ||
| 129 | { .mmi; (p16) add key_x[1]=ksch,key_x[1] // &key[xx&255] | ||
| 130 | (p17) add key_y[1]=ksch,key_y[1] };; // &key[yy&255] | ||
| 131 | { .mmi; (p16) LDKEY tx[0]=[key_x[1]] // tx=key[xx] | ||
| 132 | (p17) LDKEY ty[0]=[key_y[1]] // ty=key[yy] | ||
| 133 | (p16) dep key_x[0]=xx,r0,OFF,8 } // (xx&255)<<OFF | ||
| 134 | { .mmi; (p18) add rnd[1]=ksch,rnd[1] // &key[(tx+ty)&255] | ||
| 135 | (p16) cmp.ne.unc p20,p21=key_x[1],key_y[1] };; | ||
| 136 | { .mmi; (p18) LDKEY rnd[1]=[rnd[1]] // rnd=key[(tx+ty)&255] | ||
| 137 | (p16) ld1 dat[0]=[inp],1 } // dat=*(inp++) | ||
| 138 | .pred.rel "mutex",p20,p21 | ||
| 139 | { .mmi; (p21) add yy=yy,tx[1] // (p16) | ||
| 140 | (p20) add yy=yy,tx[0] // (p16) y+=tx | ||
| 141 | (p21) mov tx[0]=tx[1] };; // (p16) | ||
| 142 | { .mmi; (p17) STKEY [key_y[1]]=tx[1] // key[yy]=tx | ||
| 143 | (p17) STKEY [key_x[2]]=ty[0] // key[xx]=ty | ||
| 144 | (p16) dep key_y[0]=yy,r0,OFF,8 } // &key[yy&255] | ||
| 145 | { .mmb; (p17) add rnd[0]=tx[1],ty[0] // tx+=ty | ||
| 146 | (p18) xor dat[2]=dat[2],rnd[1] // dat^=rnd | ||
| 147 | br.ctop.sptk .Ltop };; | ||
| 148 | .Lexit: | ||
| 149 | { .mib; STKEY [key]=yy,-SZ // save key->y | ||
| 150 | mov pr=prsave,0x1ffff | ||
| 151 | nop.b 0 } | ||
| 152 | { .mib; st1 [out]=dat[3],1 // compensate for truncated | ||
| 153 | // epilogue counter | ||
| 154 | add xx=-1,xx | ||
| 155 | nop.b 0 };; | ||
| 156 | { .mib; STKEY [key]=xx // save key->x | ||
| 157 | mov ar.lc=r3 | ||
| 158 | br.ret.sptk.many b0 };; | ||
| 159 | .endp RC4# | ||
diff --git a/src/lib/libcrypto/rc4/asm/rc4-x86_64.pl b/src/lib/libcrypto/rc4/asm/rc4-x86_64.pl index 00c6fa28aa..92c52f3433 100755 --- a/src/lib/libcrypto/rc4/asm/rc4-x86_64.pl +++ b/src/lib/libcrypto/rc4/asm/rc4-x86_64.pl | |||
| @@ -269,8 +269,7 @@ RC4_set_key: | |||
| 269 | xor $ido,$ido | 269 | xor $ido,$ido |
| 270 | xor %r10,%r10 | 270 | xor %r10,%r10 |
| 271 | xor %r11,%r11 | 271 | xor %r11,%r11 |
| 272 | 272 | mov PIC_GOT(OPENSSL_ia32cap_P),$idx#d | |
| 273 | mov OPENSSL_ia32cap_P(%rip),$idx#d | ||
| 274 | bt \$20,$idx#d | 273 | bt \$20,$idx#d |
| 275 | jnc .Lw1stloop | 274 | jnc .Lw1stloop |
| 276 | bt \$30,$idx#d | 275 | bt \$30,$idx#d |
| @@ -338,7 +337,7 @@ RC4_set_key: | |||
| 338 | RC4_options: | 337 | RC4_options: |
| 339 | .picmeup %rax | 338 | .picmeup %rax |
| 340 | lea .Lopts-.(%rax),%rax | 339 | lea .Lopts-.(%rax),%rax |
| 341 | mov OPENSSL_ia32cap_P(%rip),%edx | 340 | mov PIC_GOT(OPENSSL_ia32cap_P),%edx |
| 342 | bt \$20,%edx | 341 | bt \$20,%edx |
| 343 | jnc .Ldone | 342 | jnc .Ldone |
| 344 | add \$12,%rax | 343 | add \$12,%rax |
| @@ -359,8 +358,6 @@ ___ | |||
| 359 | 358 | ||
| 360 | $code =~ s/#([bwd])/$1/gm; | 359 | $code =~ s/#([bwd])/$1/gm; |
| 361 | 360 | ||
| 362 | $code =~ s/RC4_set_key/private_RC4_set_key/g if ($ENV{FIPSCANLIB} ne ""); | ||
| 363 | |||
| 364 | print $code; | 361 | print $code; |
| 365 | 362 | ||
| 366 | close STDOUT; | 363 | close STDOUT; |
diff --git a/src/lib/libcrypto/rc4/rc4.c b/src/lib/libcrypto/rc4/rc4.c new file mode 100644 index 0000000000..c900b26055 --- /dev/null +++ b/src/lib/libcrypto/rc4/rc4.c | |||
| @@ -0,0 +1,193 @@ | |||
| 1 | /* crypto/rc4/rc4.c */ | ||
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
| 3 | * All rights reserved. | ||
| 4 | * | ||
| 5 | * This package is an SSL implementation written | ||
| 6 | * by Eric Young (eay@cryptsoft.com). | ||
| 7 | * The implementation was written so as to conform with Netscapes SSL. | ||
| 8 | * | ||
| 9 | * This library is free for commercial and non-commercial use as long as | ||
| 10 | * the following conditions are aheared to. The following conditions | ||
| 11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
| 12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
| 13 | * included with this distribution is covered by the same copyright terms | ||
| 14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
| 15 | * | ||
| 16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
| 17 | * the code are not to be removed. | ||
| 18 | * If this package is used in a product, Eric Young should be given attribution | ||
| 19 | * as the author of the parts of the library used. | ||
| 20 | * This can be in the form of a textual message at program startup or | ||
| 21 | * in documentation (online or textual) provided with the package. | ||
| 22 | * | ||
| 23 | * Redistribution and use in source and binary forms, with or without | ||
| 24 | * modification, are permitted provided that the following conditions | ||
| 25 | * are met: | ||
| 26 | * 1. Redistributions of source code must retain the copyright | ||
| 27 | * notice, this list of conditions and the following disclaimer. | ||
| 28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 29 | * notice, this list of conditions and the following disclaimer in the | ||
| 30 | * documentation and/or other materials provided with the distribution. | ||
| 31 | * 3. All advertising materials mentioning features or use of this software | ||
| 32 | * must display the following acknowledgement: | ||
| 33 | * "This product includes cryptographic software written by | ||
| 34 | * Eric Young (eay@cryptsoft.com)" | ||
| 35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
| 36 | * being used are not cryptographic related :-). | ||
| 37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
| 38 | * the apps directory (application code) you must include an acknowledgement: | ||
| 39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
| 40 | * | ||
| 41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
| 42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 51 | * SUCH DAMAGE. | ||
| 52 | * | ||
| 53 | * The licence and distribution terms for any publically available version or | ||
| 54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
| 55 | * copied and put under another distribution licence | ||
| 56 | * [including the GNU Public Licence.] | ||
| 57 | */ | ||
| 58 | |||
| 59 | #include <stdio.h> | ||
| 60 | #include <stdlib.h> | ||
| 61 | #include <string.h> | ||
| 62 | #include <openssl/rc4.h> | ||
| 63 | #include <openssl/evp.h> | ||
| 64 | |||
| 65 | char *usage[]={ | ||
| 66 | "usage: rc4 args\n", | ||
| 67 | "\n", | ||
| 68 | " -in arg - input file - default stdin\n", | ||
| 69 | " -out arg - output file - default stdout\n", | ||
| 70 | " -key key - password\n", | ||
| 71 | NULL | ||
| 72 | }; | ||
| 73 | |||
| 74 | int main(int argc, char *argv[]) | ||
| 75 | { | ||
| 76 | FILE *in=NULL,*out=NULL; | ||
| 77 | char *infile=NULL,*outfile=NULL,*keystr=NULL; | ||
| 78 | RC4_KEY key; | ||
| 79 | char buf[BUFSIZ]; | ||
| 80 | int badops=0,i; | ||
| 81 | char **pp; | ||
| 82 | unsigned char md[MD5_DIGEST_LENGTH]; | ||
| 83 | |||
| 84 | argc--; | ||
| 85 | argv++; | ||
| 86 | while (argc >= 1) | ||
| 87 | { | ||
| 88 | if (strcmp(*argv,"-in") == 0) | ||
| 89 | { | ||
| 90 | if (--argc < 1) goto bad; | ||
| 91 | infile= *(++argv); | ||
| 92 | } | ||
| 93 | else if (strcmp(*argv,"-out") == 0) | ||
| 94 | { | ||
| 95 | if (--argc < 1) goto bad; | ||
| 96 | outfile= *(++argv); | ||
| 97 | } | ||
| 98 | else if (strcmp(*argv,"-key") == 0) | ||
| 99 | { | ||
| 100 | if (--argc < 1) goto bad; | ||
| 101 | keystr= *(++argv); | ||
| 102 | } | ||
| 103 | else | ||
| 104 | { | ||
| 105 | fprintf(stderr,"unknown option %s\n",*argv); | ||
| 106 | badops=1; | ||
| 107 | break; | ||
| 108 | } | ||
| 109 | argc--; | ||
| 110 | argv++; | ||
| 111 | } | ||
| 112 | |||
| 113 | if (badops) | ||
| 114 | { | ||
| 115 | bad: | ||
| 116 | for (pp=usage; (*pp != NULL); pp++) | ||
| 117 | fprintf(stderr,"%s",*pp); | ||
| 118 | exit(1); | ||
| 119 | } | ||
| 120 | |||
| 121 | if (infile == NULL) | ||
| 122 | in=stdin; | ||
| 123 | else | ||
| 124 | { | ||
| 125 | in=fopen(infile,"r"); | ||
| 126 | if (in == NULL) | ||
| 127 | { | ||
| 128 | perror("open"); | ||
| 129 | exit(1); | ||
| 130 | } | ||
| 131 | |||
| 132 | } | ||
| 133 | if (outfile == NULL) | ||
| 134 | out=stdout; | ||
| 135 | else | ||
| 136 | { | ||
| 137 | out=fopen(outfile,"w"); | ||
| 138 | if (out == NULL) | ||
| 139 | { | ||
| 140 | perror("open"); | ||
| 141 | exit(1); | ||
| 142 | } | ||
| 143 | } | ||
| 144 | |||
| 145 | #ifdef OPENSSL_SYS_MSDOS | ||
| 146 | /* This should set the file to binary mode. */ | ||
| 147 | { | ||
| 148 | #include <fcntl.h> | ||
| 149 | setmode(fileno(in),O_BINARY); | ||
| 150 | setmode(fileno(out),O_BINARY); | ||
| 151 | } | ||
| 152 | #endif | ||
| 153 | |||
| 154 | if (keystr == NULL) | ||
| 155 | { /* get key */ | ||
| 156 | i=EVP_read_pw_string(buf,BUFSIZ,"Enter RC4 password:",0); | ||
| 157 | if (i != 0) | ||
| 158 | { | ||
| 159 | OPENSSL_cleanse(buf,BUFSIZ); | ||
| 160 | fprintf(stderr,"bad password read\n"); | ||
| 161 | exit(1); | ||
| 162 | } | ||
| 163 | keystr=buf; | ||
| 164 | } | ||
| 165 | |||
| 166 | EVP_Digest((unsigned char *)keystr,strlen(keystr),md,NULL,EVP_md5(),NULL); | ||
| 167 | OPENSSL_cleanse(keystr,strlen(keystr)); | ||
| 168 | RC4_set_key(&key,MD5_DIGEST_LENGTH,md); | ||
| 169 | |||
| 170 | for(;;) | ||
| 171 | { | ||
| 172 | i=fread(buf,1,BUFSIZ,in); | ||
| 173 | if (i == 0) break; | ||
| 174 | if (i < 0) | ||
| 175 | { | ||
| 176 | perror("read"); | ||
| 177 | exit(1); | ||
| 178 | } | ||
| 179 | RC4(&key,(unsigned int)i,(unsigned char *)buf, | ||
| 180 | (unsigned char *)buf); | ||
| 181 | i=fwrite(buf,(unsigned int)i,1,out); | ||
| 182 | if (i != 1) | ||
| 183 | { | ||
| 184 | perror("write"); | ||
| 185 | exit(1); | ||
| 186 | } | ||
| 187 | } | ||
| 188 | fclose(out); | ||
| 189 | fclose(in); | ||
| 190 | exit(0); | ||
| 191 | return(1); | ||
| 192 | } | ||
| 193 | |||
diff --git a/src/lib/libcrypto/rc4/rc4.h b/src/lib/libcrypto/rc4/rc4.h index 2d8620d33b..7aec04fe93 100644 --- a/src/lib/libcrypto/rc4/rc4.h +++ b/src/lib/libcrypto/rc4/rc4.h | |||
| @@ -76,9 +76,6 @@ typedef struct rc4_key_st | |||
| 76 | 76 | ||
| 77 | 77 | ||
| 78 | const char *RC4_options(void); | 78 | const char *RC4_options(void); |
| 79 | #ifdef OPENSSL_FIPS | ||
| 80 | void private_RC4_set_key(RC4_KEY *key, int len, const unsigned char *data); | ||
| 81 | #endif | ||
| 82 | void RC4_set_key(RC4_KEY *key, int len, const unsigned char *data); | 79 | void RC4_set_key(RC4_KEY *key, int len, const unsigned char *data); |
| 83 | void RC4(RC4_KEY *key, unsigned long len, const unsigned char *indata, | 80 | void RC4(RC4_KEY *key, unsigned long len, const unsigned char *indata, |
| 84 | unsigned char *outdata); | 81 | unsigned char *outdata); |
diff --git a/src/lib/libcrypto/rc4/rc4_fblk.c b/src/lib/libcrypto/rc4/rc4_fblk.c new file mode 100644 index 0000000000..1b2a42979b --- /dev/null +++ b/src/lib/libcrypto/rc4/rc4_fblk.c | |||
| @@ -0,0 +1,75 @@ | |||
| 1 | /* crypto/rc4/rc4_fblk.c */ | ||
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | ||
| 3 | * project. | ||
| 4 | */ | ||
| 5 | /* ==================================================================== | ||
| 6 | * Copyright (c) 2008 The OpenSSL Project. All rights reserved. | ||
| 7 | * | ||
| 8 | * Redistribution and use in source and binary forms, with or without | ||
| 9 | * modification, are permitted provided that the following conditions | ||
| 10 | * are met: | ||
| 11 | * | ||
| 12 | * 1. Redistributions of source code must retain the above copyright | ||
| 13 | * notice, this list of conditions and the following disclaimer. | ||
| 14 | * | ||
| 15 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 16 | * notice, this list of conditions and the following disclaimer in | ||
| 17 | * the documentation and/or other materials provided with the | ||
| 18 | * distribution. | ||
| 19 | * | ||
| 20 | * 3. All advertising materials mentioning features or use of this | ||
| 21 | * software must display the following acknowledgment: | ||
| 22 | * "This product includes software developed by the OpenSSL Project | ||
| 23 | * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" | ||
| 24 | * | ||
| 25 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
| 26 | * endorse or promote products derived from this software without | ||
| 27 | * prior written permission. For written permission, please contact | ||
| 28 | * licensing@OpenSSL.org. | ||
| 29 | * | ||
| 30 | * 5. Products derived from this software may not be called "OpenSSL" | ||
| 31 | * nor may "OpenSSL" appear in their names without prior written | ||
| 32 | * permission of the OpenSSL Project. | ||
| 33 | * | ||
| 34 | * 6. Redistributions of any form whatsoever must retain the following | ||
| 35 | * acknowledgment: | ||
| 36 | * "This product includes software developed by the OpenSSL Project | ||
| 37 | * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" | ||
| 38 | * | ||
| 39 | * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
| 40 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 41 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
| 42 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
| 43 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| 44 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
| 45 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
| 46 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 47 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
| 48 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| 49 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
| 50 | * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| 51 | * ==================================================================== | ||
| 52 | */ | ||
| 53 | |||
| 54 | |||
| 55 | #include <openssl/rc4.h> | ||
| 56 | #include "rc4_locl.h" | ||
| 57 | #include <openssl/opensslv.h> | ||
| 58 | #include <openssl/crypto.h> | ||
| 59 | #ifdef OPENSSL_FIPS | ||
| 60 | #include <openssl/fips.h> | ||
| 61 | #endif | ||
| 62 | |||
| 63 | /* FIPS mode blocking for RC4 has to be done separately since RC4_set_key | ||
| 64 | * may be implemented in an assembly language file. | ||
| 65 | */ | ||
| 66 | |||
| 67 | #ifdef OPENSSL_FIPS | ||
| 68 | void RC4_set_key(RC4_KEY *key, int len, const unsigned char *data) | ||
| 69 | { | ||
| 70 | if (FIPS_mode()) | ||
| 71 | FIPS_BAD_ABORT(RC4) | ||
| 72 | private_RC4_set_key(key, len, data); | ||
| 73 | } | ||
| 74 | #endif | ||
| 75 | |||
diff --git a/src/lib/libcrypto/rc4/rc4_skey.c b/src/lib/libcrypto/rc4/rc4_skey.c index 4478d1a4b3..46b77ec321 100644 --- a/src/lib/libcrypto/rc4/rc4_skey.c +++ b/src/lib/libcrypto/rc4/rc4_skey.c | |||
| @@ -59,11 +59,6 @@ | |||
| 59 | #include <openssl/rc4.h> | 59 | #include <openssl/rc4.h> |
| 60 | #include "rc4_locl.h" | 60 | #include "rc4_locl.h" |
| 61 | #include <openssl/opensslv.h> | 61 | #include <openssl/opensslv.h> |
| 62 | #include <openssl/crypto.h> | ||
| 63 | #ifdef OPENSSL_FIPS | ||
| 64 | #include <openssl/fips.h> | ||
| 65 | #endif | ||
| 66 | |||
| 67 | 62 | ||
| 68 | const char RC4_version[]="RC4" OPENSSL_VERSION_PTEXT; | 63 | const char RC4_version[]="RC4" OPENSSL_VERSION_PTEXT; |
| 69 | 64 | ||
| @@ -90,11 +85,7 @@ const char *RC4_options(void) | |||
| 90 | * Date: Wed, 14 Sep 1994 06:35:31 GMT | 85 | * Date: Wed, 14 Sep 1994 06:35:31 GMT |
| 91 | */ | 86 | */ |
| 92 | 87 | ||
| 93 | #ifdef OPENSSL_FIPS | ||
| 94 | void private_RC4_set_key(RC4_KEY *key, int len, const unsigned char *data) | ||
| 95 | #else | ||
| 96 | void RC4_set_key(RC4_KEY *key, int len, const unsigned char *data) | 88 | void RC4_set_key(RC4_KEY *key, int len, const unsigned char *data) |
| 97 | #endif | ||
| 98 | { | 89 | { |
| 99 | register RC4_INT tmp; | 90 | register RC4_INT tmp; |
| 100 | register int id1,id2; | 91 | register int id1,id2; |
| @@ -136,12 +127,7 @@ void RC4_set_key(RC4_KEY *key, int len, const unsigned char *data) | |||
| 136 | * | 127 | * |
| 137 | * <appro@fy.chalmers.se> | 128 | * <appro@fy.chalmers.se> |
| 138 | */ | 129 | */ |
| 139 | #ifdef OPENSSL_FIPS | 130 | if (OPENSSL_ia32cap_P & (1<<20)) { |
| 140 | unsigned long *ia32cap_ptr = OPENSSL_ia32cap_loc(); | ||
| 141 | if (ia32cap_ptr && (*ia32cap_ptr & (1<<28))) { | ||
| 142 | #else | ||
| 143 | if (OPENSSL_ia32cap_P & (1<<28)) { | ||
| 144 | #endif | ||
| 145 | unsigned char *cp=(unsigned char *)d; | 131 | unsigned char *cp=(unsigned char *)d; |
| 146 | 132 | ||
| 147 | for (i=0;i<256;i++) cp[i]=i; | 133 | for (i=0;i<256;i++) cp[i]=i; |
diff --git a/src/lib/libcrypto/rc4/rc4s.cpp b/src/lib/libcrypto/rc4/rc4s.cpp new file mode 100644 index 0000000000..3814fde997 --- /dev/null +++ b/src/lib/libcrypto/rc4/rc4s.cpp | |||
| @@ -0,0 +1,73 @@ | |||
| 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/rc4.h> | ||
| 36 | |||
| 37 | void main(int argc,char *argv[]) | ||
| 38 | { | ||
| 39 | unsigned char buffer[1024]; | ||
| 40 | RC4_KEY ctx; | ||
| 41 | unsigned long s1,s2,e1,e2; | ||
| 42 | unsigned char k[16]; | ||
| 43 | unsigned long data[2]; | ||
| 44 | unsigned char iv[8]; | ||
| 45 | int i,num=64,numm; | ||
| 46 | int j=0; | ||
| 47 | |||
| 48 | if (argc >= 2) | ||
| 49 | num=atoi(argv[1]); | ||
| 50 | |||
| 51 | if (num == 0) num=256; | ||
| 52 | if (num > 1024-16) num=1024-16; | ||
| 53 | numm=num+8; | ||
| 54 | |||
| 55 | for (j=0; j<6; j++) | ||
| 56 | { | ||
| 57 | for (i=0; i<10; i++) /**/ | ||
| 58 | { | ||
| 59 | RC4(&ctx,numm,buffer,buffer); | ||
| 60 | GetTSC(s1); | ||
| 61 | RC4(&ctx,numm,buffer,buffer); | ||
| 62 | GetTSC(e1); | ||
| 63 | GetTSC(s2); | ||
| 64 | RC4(&ctx,num,buffer,buffer); | ||
| 65 | GetTSC(e2); | ||
| 66 | RC4(&ctx,num,buffer,buffer); | ||
| 67 | } | ||
| 68 | |||
| 69 | printf("RC4 (%d bytes) %d %d (%d) - 8 bytes\n",num, | ||
| 70 | e1-s1,e2-s2,(e1-s1)-(e2-s2)); | ||
| 71 | } | ||
| 72 | } | ||
| 73 | |||
diff --git a/src/lib/libcrypto/rc4/rc4speed.c b/src/lib/libcrypto/rc4/rc4speed.c new file mode 100644 index 0000000000..0ebd38123d --- /dev/null +++ b/src/lib/libcrypto/rc4/rc4speed.c | |||
| @@ -0,0 +1,253 @@ | |||
| 1 | /* crypto/rc4/rc4speed.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/rc4.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 | RC4_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 | RC4_set_key(&sch,16,key); | ||
| 196 | count=10; | ||
| 197 | do { | ||
| 198 | long i; | ||
| 199 | unsigned long data[2]; | ||
| 200 | |||
| 201 | count*=2; | ||
| 202 | Time_F(START); | ||
| 203 | for (i=count; i; i--) | ||
| 204 | RC4(&sch,8,buf,buf); | ||
| 205 | d=Time_F(STOP); | ||
| 206 | } while (d < 3.0); | ||
| 207 | ca=count/512; | ||
| 208 | cc=count*8/BUFSIZE+1; | ||
| 209 | printf("Doing RC4_set_key %ld times\n",ca); | ||
| 210 | #define COND(d) (count != (d)) | ||
| 211 | #define COUNT(d) (d) | ||
| 212 | #else | ||
| 213 | #define COND(c) (run) | ||
| 214 | #define COUNT(d) (count) | ||
| 215 | signal(SIGALRM,sig_done); | ||
| 216 | printf("Doing RC4_set_key for 10 seconds\n"); | ||
| 217 | alarm(10); | ||
| 218 | #endif | ||
| 219 | |||
| 220 | Time_F(START); | ||
| 221 | for (count=0,run=1; COND(ca); count+=4) | ||
| 222 | { | ||
| 223 | RC4_set_key(&sch,16,key); | ||
| 224 | RC4_set_key(&sch,16,key); | ||
| 225 | RC4_set_key(&sch,16,key); | ||
| 226 | RC4_set_key(&sch,16,key); | ||
| 227 | } | ||
| 228 | d=Time_F(STOP); | ||
| 229 | printf("%ld RC4_set_key's in %.2f seconds\n",count,d); | ||
| 230 | a=((double)COUNT(ca))/d; | ||
| 231 | |||
| 232 | #ifdef SIGALRM | ||
| 233 | printf("Doing RC4 on %ld byte blocks for 10 seconds\n",BUFSIZE); | ||
| 234 | alarm(10); | ||
| 235 | #else | ||
| 236 | printf("Doing RC4 %ld times on %ld byte blocks\n",cc,BUFSIZE); | ||
| 237 | #endif | ||
| 238 | Time_F(START); | ||
| 239 | for (count=0,run=1; COND(cc); count++) | ||
| 240 | RC4(&sch,BUFSIZE,buf,buf); | ||
| 241 | d=Time_F(STOP); | ||
| 242 | printf("%ld RC4's of %ld byte blocks in %.2f second\n", | ||
| 243 | count,BUFSIZE,d); | ||
| 244 | c=((double)COUNT(cc)*BUFSIZE)/d; | ||
| 245 | |||
| 246 | printf("RC4 set_key per sec = %12.2f (%9.3fuS)\n",a,1.0e6/a); | ||
| 247 | printf("RC4 bytes per sec = %12.2f (%9.3fuS)\n",c,8.0e6/c); | ||
| 248 | exit(0); | ||
| 249 | #if defined(LINT) || defined(OPENSSL_SYS_MSDOS) | ||
| 250 | return(0); | ||
| 251 | #endif | ||
| 252 | } | ||
| 253 | |||
diff --git a/src/lib/libcrypto/rc4/rc4test.c b/src/lib/libcrypto/rc4/rc4test.c new file mode 100644 index 0000000000..54b597fa26 --- /dev/null +++ b/src/lib/libcrypto/rc4/rc4test.c | |||
| @@ -0,0 +1,236 @@ | |||
| 1 | /* crypto/rc4/rc4test.c */ | ||
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
| 3 | * All rights reserved. | ||
| 4 | * | ||
| 5 | * This package is an SSL implementation written | ||
| 6 | * by Eric Young (eay@cryptsoft.com). | ||
| 7 | * The implementation was written so as to conform with Netscapes SSL. | ||
| 8 | * | ||
| 9 | * This library is free for commercial and non-commercial use as long as | ||
| 10 | * the following conditions are aheared to. The following conditions | ||
| 11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
| 12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
| 13 | * included with this distribution is covered by the same copyright terms | ||
| 14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
| 15 | * | ||
| 16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
| 17 | * the code are not to be removed. | ||
| 18 | * If this package is used in a product, Eric Young should be given attribution | ||
| 19 | * as the author of the parts of the library used. | ||
| 20 | * This can be in the form of a textual message at program startup or | ||
| 21 | * in documentation (online or textual) provided with the package. | ||
| 22 | * | ||
| 23 | * Redistribution and use in source and binary forms, with or without | ||
| 24 | * modification, are permitted provided that the following conditions | ||
| 25 | * are met: | ||
| 26 | * 1. Redistributions of source code must retain the copyright | ||
| 27 | * notice, this list of conditions and the following disclaimer. | ||
| 28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 29 | * notice, this list of conditions and the following disclaimer in the | ||
| 30 | * documentation and/or other materials provided with the distribution. | ||
| 31 | * 3. All advertising materials mentioning features or use of this software | ||
| 32 | * must display the following acknowledgement: | ||
| 33 | * "This product includes cryptographic software written by | ||
| 34 | * Eric Young (eay@cryptsoft.com)" | ||
| 35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
| 36 | * being used are not cryptographic related :-). | ||
| 37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
| 38 | * the apps directory (application code) you must include an acknowledgement: | ||
| 39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
| 40 | * | ||
| 41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
| 42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 51 | * SUCH DAMAGE. | ||
| 52 | * | ||
| 53 | * The licence and distribution terms for any publically available version or | ||
| 54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
| 55 | * copied and put under another distribution licence | ||
| 56 | * [including the GNU Public Licence.] | ||
| 57 | */ | ||
| 58 | |||
| 59 | #include <stdio.h> | ||
| 60 | #include <stdlib.h> | ||
| 61 | #include <string.h> | ||
| 62 | |||
| 63 | #include "../e_os.h" | ||
| 64 | |||
| 65 | #ifdef OPENSSL_NO_RC4 | ||
| 66 | int main(int argc, char *argv[]) | ||
| 67 | { | ||
| 68 | printf("No RC4 support\n"); | ||
| 69 | return(0); | ||
| 70 | } | ||
| 71 | #else | ||
| 72 | #include <openssl/rc4.h> | ||
| 73 | #include <openssl/sha.h> | ||
| 74 | |||
| 75 | static unsigned char keys[7][30]={ | ||
| 76 | {8,0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef}, | ||
| 77 | {8,0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef}, | ||
| 78 | {8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, | ||
| 79 | {4,0xef,0x01,0x23,0x45}, | ||
| 80 | {8,0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef}, | ||
| 81 | {4,0xef,0x01,0x23,0x45}, | ||
| 82 | }; | ||
| 83 | |||
| 84 | static unsigned char data_len[7]={8,8,8,20,28,10}; | ||
| 85 | static unsigned char data[7][30]={ | ||
| 86 | {0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef,0xff}, | ||
| 87 | {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff}, | ||
| 88 | {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff}, | ||
| 89 | {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, | ||
| 90 | 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, | ||
| 91 | 0x00,0x00,0x00,0x00,0xff}, | ||
| 92 | {0x12,0x34,0x56,0x78,0x9A,0xBC,0xDE,0xF0, | ||
| 93 | 0x12,0x34,0x56,0x78,0x9A,0xBC,0xDE,0xF0, | ||
| 94 | 0x12,0x34,0x56,0x78,0x9A,0xBC,0xDE,0xF0, | ||
| 95 | 0x12,0x34,0x56,0x78,0xff}, | ||
| 96 | {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff}, | ||
| 97 | {0}, | ||
| 98 | }; | ||
| 99 | |||
| 100 | static unsigned char output[7][30]={ | ||
| 101 | {0x75,0xb7,0x87,0x80,0x99,0xe0,0xc5,0x96,0x00}, | ||
| 102 | {0x74,0x94,0xc2,0xe7,0x10,0x4b,0x08,0x79,0x00}, | ||
| 103 | {0xde,0x18,0x89,0x41,0xa3,0x37,0x5d,0x3a,0x00}, | ||
| 104 | {0xd6,0xa1,0x41,0xa7,0xec,0x3c,0x38,0xdf, | ||
| 105 | 0xbd,0x61,0x5a,0x11,0x62,0xe1,0xc7,0xba, | ||
| 106 | 0x36,0xb6,0x78,0x58,0x00}, | ||
| 107 | {0x66,0xa0,0x94,0x9f,0x8a,0xf7,0xd6,0x89, | ||
| 108 | 0x1f,0x7f,0x83,0x2b,0xa8,0x33,0xc0,0x0c, | ||
| 109 | 0x89,0x2e,0xbe,0x30,0x14,0x3c,0xe2,0x87, | ||
| 110 | 0x40,0x01,0x1e,0xcf,0x00}, | ||
| 111 | {0xd6,0xa1,0x41,0xa7,0xec,0x3c,0x38,0xdf,0xbd,0x61,0x00}, | ||
| 112 | {0}, | ||
| 113 | }; | ||
| 114 | |||
| 115 | int main(int argc, char *argv[]) | ||
| 116 | { | ||
| 117 | int err=0; | ||
| 118 | unsigned int i, j; | ||
| 119 | unsigned char *p; | ||
| 120 | RC4_KEY key; | ||
| 121 | unsigned char obuf[512]; | ||
| 122 | |||
| 123 | for (i=0; i<6; i++) | ||
| 124 | { | ||
| 125 | RC4_set_key(&key,keys[i][0],&(keys[i][1])); | ||
| 126 | memset(obuf,0x00,sizeof(obuf)); | ||
| 127 | RC4(&key,data_len[i],&(data[i][0]),obuf); | ||
| 128 | if (memcmp(obuf,output[i],data_len[i]+1) != 0) | ||
| 129 | { | ||
| 130 | printf("error calculating RC4\n"); | ||
| 131 | printf("output:"); | ||
| 132 | for (j=0; j<data_len[i]+1U; j++) | ||
| 133 | printf(" %02x",obuf[j]); | ||
| 134 | printf("\n"); | ||
| 135 | printf("expect:"); | ||
| 136 | p= &(output[i][0]); | ||
| 137 | for (j=0; j<data_len[i]+1U; j++) | ||
| 138 | printf(" %02x",*(p++)); | ||
| 139 | printf("\n"); | ||
| 140 | err++; | ||
| 141 | } | ||
| 142 | else | ||
| 143 | printf("test %d ok\n",i); | ||
| 144 | } | ||
| 145 | printf("test end processing "); | ||
| 146 | for (i=0; i<data_len[3]; i++) | ||
| 147 | { | ||
| 148 | RC4_set_key(&key,keys[3][0],&(keys[3][1])); | ||
| 149 | memset(obuf,0x00,sizeof(obuf)); | ||
| 150 | RC4(&key,i,&(data[3][0]),obuf); | ||
| 151 | if ((memcmp(obuf,output[3],i) != 0) || (obuf[i] != 0)) | ||
| 152 | { | ||
| 153 | printf("error in RC4 length processing\n"); | ||
| 154 | printf("output:"); | ||
| 155 | for (j=0; j<i+1; j++) | ||
| 156 | printf(" %02x",obuf[j]); | ||
| 157 | printf("\n"); | ||
| 158 | printf("expect:"); | ||
| 159 | p= &(output[3][0]); | ||
| 160 | for (j=0; j<i; j++) | ||
| 161 | printf(" %02x",*(p++)); | ||
| 162 | printf(" 00\n"); | ||
| 163 | err++; | ||
| 164 | } | ||
| 165 | else | ||
| 166 | { | ||
| 167 | printf("."); | ||
| 168 | fflush(stdout); | ||
| 169 | } | ||
| 170 | } | ||
| 171 | printf("done\n"); | ||
| 172 | printf("test multi-call "); | ||
| 173 | for (i=0; i<data_len[3]; i++) | ||
| 174 | { | ||
| 175 | RC4_set_key(&key,keys[3][0],&(keys[3][1])); | ||
| 176 | memset(obuf,0x00,sizeof(obuf)); | ||
| 177 | RC4(&key,i,&(data[3][0]),obuf); | ||
| 178 | RC4(&key,data_len[3]-i,&(data[3][i]),&(obuf[i])); | ||
| 179 | if (memcmp(obuf,output[3],data_len[3]+1) != 0) | ||
| 180 | { | ||
| 181 | printf("error in RC4 multi-call processing\n"); | ||
| 182 | printf("output:"); | ||
| 183 | for (j=0; j<data_len[3]+1U; j++) | ||
| 184 | printf(" %02x",obuf[j]); | ||
| 185 | printf("\n"); | ||
| 186 | printf("expect:"); | ||
| 187 | p= &(output[3][0]); | ||
| 188 | for (j=0; j<data_len[3]+1U; j++) | ||
| 189 | printf(" %02x",*(p++)); | ||
| 190 | err++; | ||
| 191 | } | ||
| 192 | else | ||
| 193 | { | ||
| 194 | printf("."); | ||
| 195 | fflush(stdout); | ||
| 196 | } | ||
| 197 | } | ||
| 198 | printf("done\n"); | ||
| 199 | printf("bulk test "); | ||
| 200 | { unsigned char buf[513]; | ||
| 201 | SHA_CTX c; | ||
| 202 | unsigned char md[SHA_DIGEST_LENGTH]; | ||
| 203 | static unsigned char expected[]={ | ||
| 204 | 0xa4,0x7b,0xcc,0x00,0x3d,0xd0,0xbd,0xe1,0xac,0x5f, | ||
| 205 | 0x12,0x1e,0x45,0xbc,0xfb,0x1a,0xa1,0xf2,0x7f,0xc5 }; | ||
| 206 | |||
| 207 | RC4_set_key(&key,keys[0][0],&(keys[3][1])); | ||
| 208 | memset(buf,'\0',sizeof(buf)); | ||
| 209 | SHA1_Init(&c); | ||
| 210 | for (i=0;i<2571;i++) { | ||
| 211 | RC4(&key,sizeof(buf),buf,buf); | ||
| 212 | SHA1_Update(&c,buf,sizeof(buf)); | ||
| 213 | } | ||
| 214 | SHA1_Final(md,&c); | ||
| 215 | |||
| 216 | if (memcmp(md,expected,sizeof(md))) { | ||
| 217 | printf("error in RC4 bulk test\n"); | ||
| 218 | printf("output:"); | ||
| 219 | for (j=0; j<sizeof(md); j++) | ||
| 220 | printf(" %02x",md[j]); | ||
| 221 | printf("\n"); | ||
| 222 | printf("expect:"); | ||
| 223 | for (j=0; j<sizeof(md); j++) | ||
| 224 | printf(" %02x",expected[j]); | ||
| 225 | printf("\n"); | ||
| 226 | err++; | ||
| 227 | } | ||
| 228 | else printf("ok\n"); | ||
| 229 | } | ||
| 230 | #ifdef OPENSSL_SYS_NETWARE | ||
| 231 | if (err) printf("ERROR: %d\n", err); | ||
| 232 | #endif | ||
| 233 | EXIT(err); | ||
| 234 | return(0); | ||
| 235 | } | ||
| 236 | #endif | ||
diff --git a/src/lib/libcrypto/rc4/rrc4.doc b/src/lib/libcrypto/rc4/rrc4.doc new file mode 100644 index 0000000000..2f9a953c12 --- /dev/null +++ b/src/lib/libcrypto/rc4/rrc4.doc | |||
| @@ -0,0 +1,278 @@ | |||
| 1 | Newsgroups: sci.crypt,alt.security,comp.security.misc,alt.privacy | ||
| 2 | Path: ghost.dsi.unimi.it!univ-lyon1.fr!jussieu.fr!zaphod.crihan.fr!warwick!clyde.open.ac.uk!strath-cs!bnr.co.uk!bt!pipex!howland.reston.ans.net!europa.eng.gtefsd.com!MathWorks.Com!yeshua.marcam.com!charnel.ecst.csuchico.edu!csusac!csus.edu!netcom.com!sterndark | ||
| 3 | From: sterndark@netcom.com (David Sterndark) | ||
| 4 | Subject: RC4 Algorithm revealed. | ||
| 5 | Message-ID: <sternCvKL4B.Hyy@netcom.com> | ||
| 6 | Sender: sterndark@netcom.com | ||
| 7 | Organization: NETCOM On-line Communication Services (408 261-4700 guest) | ||
| 8 | X-Newsreader: TIN [version 1.2 PL1] | ||
| 9 | Date: Wed, 14 Sep 1994 06:35:31 GMT | ||
| 10 | Lines: 263 | ||
| 11 | Xref: ghost.dsi.unimi.it sci.crypt:27332 alt.security:14732 comp.security.misc:11701 alt.privacy:16026 | ||
| 12 | |||
| 13 | I am shocked, shocked, I tell you, shocked, to discover | ||
| 14 | that the cypherpunks have illegaly and criminally revealed | ||
| 15 | a crucial RSA trade secret and harmed the security of | ||
| 16 | America by reverse engineering the RC4 algorithm and | ||
| 17 | publishing it to the world. | ||
| 18 | |||
| 19 | On Saturday morning an anonymous cypherpunk wrote: | ||
| 20 | |||
| 21 | |||
| 22 | SUBJECT: RC4 Source Code | ||
| 23 | |||
| 24 | |||
| 25 | I've tested this. It is compatible with the RC4 object module | ||
| 26 | that comes in the various RSA toolkits. | ||
| 27 | |||
| 28 | /* rc4.h */ | ||
| 29 | typedef struct rc4_key | ||
| 30 | { | ||
| 31 | unsigned char state[256]; | ||
| 32 | unsigned char x; | ||
| 33 | unsigned char y; | ||
| 34 | } rc4_key; | ||
| 35 | void prepare_key(unsigned char *key_data_ptr,int key_data_len, | ||
| 36 | rc4_key *key); | ||
| 37 | void rc4(unsigned char *buffer_ptr,int buffer_len,rc4_key * key); | ||
| 38 | |||
| 39 | |||
| 40 | /*rc4.c */ | ||
| 41 | #include "rc4.h" | ||
| 42 | static void swap_byte(unsigned char *a, unsigned char *b); | ||
| 43 | void prepare_key(unsigned char *key_data_ptr, int key_data_len, | ||
| 44 | rc4_key *key) | ||
| 45 | { | ||
| 46 | unsigned char swapByte; | ||
| 47 | unsigned char index1; | ||
| 48 | unsigned char index2; | ||
| 49 | unsigned char* state; | ||
| 50 | short counter; | ||
| 51 | |||
| 52 | state = &key->state[0]; | ||
| 53 | for(counter = 0; counter < 256; counter++) | ||
| 54 | state[counter] = counter; | ||
| 55 | key->x = 0; | ||
| 56 | key->y = 0; | ||
| 57 | index1 = 0; | ||
| 58 | index2 = 0; | ||
| 59 | for(counter = 0; counter < 256; counter++) | ||
| 60 | { | ||
| 61 | index2 = (key_data_ptr[index1] + state[counter] + | ||
| 62 | index2) % 256; | ||
| 63 | swap_byte(&state[counter], &state[index2]); | ||
| 64 | |||
| 65 | index1 = (index1 + 1) % key_data_len; | ||
| 66 | } | ||
| 67 | } | ||
| 68 | |||
| 69 | void rc4(unsigned char *buffer_ptr, int buffer_len, rc4_key *key) | ||
| 70 | { | ||
| 71 | unsigned char x; | ||
| 72 | unsigned char y; | ||
| 73 | unsigned char* state; | ||
| 74 | unsigned char xorIndex; | ||
| 75 | short counter; | ||
| 76 | |||
| 77 | x = key->x; | ||
| 78 | y = key->y; | ||
| 79 | |||
| 80 | state = &key->state[0]; | ||
| 81 | for(counter = 0; counter < buffer_len; counter ++) | ||
| 82 | { | ||
| 83 | x = (x + 1) % 256; | ||
| 84 | y = (state[x] + y) % 256; | ||
| 85 | swap_byte(&state[x], &state[y]); | ||
| 86 | |||
| 87 | xorIndex = (state[x] + state[y]) % 256; | ||
| 88 | |||
| 89 | buffer_ptr[counter] ^= state[xorIndex]; | ||
| 90 | } | ||
| 91 | key->x = x; | ||
| 92 | key->y = y; | ||
| 93 | } | ||
| 94 | |||
| 95 | static void swap_byte(unsigned char *a, unsigned char *b) | ||
| 96 | { | ||
| 97 | unsigned char swapByte; | ||
| 98 | |||
| 99 | swapByte = *a; | ||
| 100 | *a = *b; | ||
| 101 | *b = swapByte; | ||
| 102 | } | ||
| 103 | |||
| 104 | |||
| 105 | |||
| 106 | Another cypherpunk, this one not anonymous, tested the | ||
| 107 | output from this algorithm against the output from | ||
| 108 | official RC4 object code | ||
| 109 | |||
| 110 | |||
| 111 | Date: Tue, 13 Sep 94 18:37:56 PDT | ||
| 112 | From: ekr@eit.COM (Eric Rescorla) | ||
| 113 | Message-Id: <9409140137.AA17743@eitech.eit.com> | ||
| 114 | Subject: RC4 compatibility testing | ||
| 115 | Cc: cypherpunks@toad.com | ||
| 116 | |||
| 117 | One data point: | ||
| 118 | |||
| 119 | I can't say anything about the internals of RC4 versus the | ||
| 120 | algorithm that Bill Sommerfeld is rightly calling 'Alleged RC4', | ||
| 121 | since I don't know anything about RC4's internals. | ||
| 122 | |||
| 123 | However, I do have a (legitimately acquired) copy of BSAFE2 and | ||
| 124 | so I'm able to compare the output of this algorithm to the output | ||
| 125 | of genuine RC4 as found in BSAFE. I chose a set of test vectors | ||
| 126 | and ran them through both algorithms. The algorithms appear to | ||
| 127 | give identical results, at least with these key/plaintext pairs. | ||
| 128 | |||
| 129 | I note that this is the algorithm _without_ Hal Finney's | ||
| 130 | proposed modification | ||
| 131 | |||
| 132 | (see <199409130605.XAA24133@jobe.shell.portal.com>). | ||
| 133 | |||
| 134 | The vectors I used (together with the ciphertext they produce) | ||
| 135 | follow at the end of this message. | ||
| 136 | |||
| 137 | -Ekr | ||
| 138 | |||
| 139 | Disclaimer: This posting does not reflect the opinions of EIT. | ||
| 140 | |||
| 141 | --------------------results follow-------------- | ||
| 142 | Test vector 0 | ||
| 143 | Key: 0x01 0x23 0x45 0x67 0x89 0xab 0xcd 0xef | ||
| 144 | Input: 0x01 0x23 0x45 0x67 0x89 0xab 0xcd 0xef | ||
| 145 | 0 Output: 0x75 0xb7 0x87 0x80 0x99 0xe0 0xc5 0x96 | ||
| 146 | |||
| 147 | Test vector 1 | ||
| 148 | Key: 0x01 0x23 0x45 0x67 0x89 0xab 0xcd 0xef | ||
| 149 | Input: 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 | ||
| 150 | 0 Output: 0x74 0x94 0xc2 0xe7 0x10 0x4b 0x08 0x79 | ||
| 151 | |||
| 152 | Test vector 2 | ||
| 153 | Key: 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 | ||
| 154 | Input: 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 | ||
| 155 | 0 Output: 0xde 0x18 0x89 0x41 0xa3 0x37 0x5d 0x3a | ||
| 156 | |||
| 157 | Test vector 3 | ||
| 158 | Key: 0xef 0x01 0x23 0x45 | ||
| 159 | Input: 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 | ||
| 160 | 0 Output: 0xd6 0xa1 0x41 0xa7 0xec 0x3c 0x38 0xdf 0xbd 0x61 | ||
| 161 | |||
| 162 | Test vector 4 | ||
| 163 | Key: 0x01 0x23 0x45 0x67 0x89 0xab 0xcd 0xef | ||
| 164 | Input: 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 165 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 166 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 167 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 168 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 169 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 170 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 171 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 172 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 173 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 174 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 175 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 176 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 177 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 178 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 179 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 180 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 181 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 182 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 183 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 184 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 185 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 186 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 187 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 188 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 189 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 190 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 191 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 192 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 193 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 194 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 195 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 196 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 197 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 198 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 199 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 200 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 201 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 202 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 203 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 204 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 205 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 206 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 207 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 208 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 209 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 210 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 211 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 212 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 213 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 214 | 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 0x01 | ||
| 215 | 0x01 | ||
| 216 | 0 Output: 0x75 0x95 0xc3 0xe6 0x11 0x4a 0x09 0x78 0x0c 0x4a 0xd4 | ||
| 217 | 0x52 0x33 0x8e 0x1f 0xfd 0x9a 0x1b 0xe9 0x49 0x8f | ||
| 218 | 0x81 0x3d 0x76 0x53 0x34 0x49 0xb6 0x77 0x8d 0xca | ||
| 219 | 0xd8 0xc7 0x8a 0x8d 0x2b 0xa9 0xac 0x66 0x08 0x5d | ||
| 220 | 0x0e 0x53 0xd5 0x9c 0x26 0xc2 0xd1 0xc4 0x90 0xc1 | ||
| 221 | 0xeb 0xbe 0x0c 0xe6 0x6d 0x1b 0x6b 0x1b 0x13 0xb6 | ||
| 222 | 0xb9 0x19 0xb8 0x47 0xc2 0x5a 0x91 0x44 0x7a 0x95 | ||
| 223 | 0xe7 0x5e 0x4e 0xf1 0x67 0x79 0xcd 0xe8 0xbf 0x0a | ||
| 224 | 0x95 0x85 0x0e 0x32 0xaf 0x96 0x89 0x44 0x4f 0xd3 | ||
| 225 | 0x77 0x10 0x8f 0x98 0xfd 0xcb 0xd4 0xe7 0x26 0x56 | ||
| 226 | 0x75 0x00 0x99 0x0b 0xcc 0x7e 0x0c 0xa3 0xc4 0xaa | ||
| 227 | 0xa3 0x04 0xa3 0x87 0xd2 0x0f 0x3b 0x8f 0xbb 0xcd | ||
| 228 | 0x42 0xa1 0xbd 0x31 0x1d 0x7a 0x43 0x03 0xdd 0xa5 | ||
| 229 | 0xab 0x07 0x88 0x96 0xae 0x80 0xc1 0x8b 0x0a 0xf6 | ||
| 230 | 0x6d 0xff 0x31 0x96 0x16 0xeb 0x78 0x4e 0x49 0x5a | ||
| 231 | 0xd2 0xce 0x90 0xd7 0xf7 0x72 0xa8 0x17 0x47 0xb6 | ||
| 232 | 0x5f 0x62 0x09 0x3b 0x1e 0x0d 0xb9 0xe5 0xba 0x53 | ||
| 233 | 0x2f 0xaf 0xec 0x47 0x50 0x83 0x23 0xe6 0x71 0x32 | ||
| 234 | 0x7d 0xf9 0x44 0x44 0x32 0xcb 0x73 0x67 0xce 0xc8 | ||
| 235 | 0x2f 0x5d 0x44 0xc0 0xd0 0x0b 0x67 0xd6 0x50 0xa0 | ||
| 236 | 0x75 0xcd 0x4b 0x70 0xde 0xdd 0x77 0xeb 0x9b 0x10 | ||
| 237 | 0x23 0x1b 0x6b 0x5b 0x74 0x13 0x47 0x39 0x6d 0x62 | ||
| 238 | 0x89 0x74 0x21 0xd4 0x3d 0xf9 0xb4 0x2e 0x44 0x6e | ||
| 239 | 0x35 0x8e 0x9c 0x11 0xa9 0xb2 0x18 0x4e 0xcb 0xef | ||
| 240 | 0x0c 0xd8 0xe7 0xa8 0x77 0xef 0x96 0x8f 0x13 0x90 | ||
| 241 | 0xec 0x9b 0x3d 0x35 0xa5 0x58 0x5c 0xb0 0x09 0x29 | ||
| 242 | 0x0e 0x2f 0xcd 0xe7 0xb5 0xec 0x66 0xd9 0x08 0x4b | ||
| 243 | 0xe4 0x40 0x55 0xa6 0x19 0xd9 0xdd 0x7f 0xc3 0x16 | ||
| 244 | 0x6f 0x94 0x87 0xf7 0xcb 0x27 0x29 0x12 0x42 0x64 | ||
| 245 | 0x45 0x99 0x85 0x14 0xc1 0x5d 0x53 0xa1 0x8c 0x86 | ||
| 246 | 0x4c 0xe3 0xa2 0xb7 0x55 0x57 0x93 0x98 0x81 0x26 | ||
| 247 | 0x52 0x0e 0xac 0xf2 0xe3 0x06 0x6e 0x23 0x0c 0x91 | ||
| 248 | 0xbe 0xe4 0xdd 0x53 0x04 0xf5 0xfd 0x04 0x05 0xb3 | ||
| 249 | 0x5b 0xd9 0x9c 0x73 0x13 0x5d 0x3d 0x9b 0xc3 0x35 | ||
| 250 | 0xee 0x04 0x9e 0xf6 0x9b 0x38 0x67 0xbf 0x2d 0x7b | ||
| 251 | 0xd1 0xea 0xa5 0x95 0xd8 0xbf 0xc0 0x06 0x6f 0xf8 | ||
| 252 | 0xd3 0x15 0x09 0xeb 0x0c 0x6c 0xaa 0x00 0x6c 0x80 | ||
| 253 | 0x7a 0x62 0x3e 0xf8 0x4c 0x3d 0x33 0xc1 0x95 0xd2 | ||
| 254 | 0x3e 0xe3 0x20 0xc4 0x0d 0xe0 0x55 0x81 0x57 0xc8 | ||
| 255 | 0x22 0xd4 0xb8 0xc5 0x69 0xd8 0x49 0xae 0xd5 0x9d | ||
| 256 | 0x4e 0x0f 0xd7 0xf3 0x79 0x58 0x6b 0x4b 0x7f 0xf6 | ||
| 257 | 0x84 0xed 0x6a 0x18 0x9f 0x74 0x86 0xd4 0x9b 0x9c | ||
| 258 | 0x4b 0xad 0x9b 0xa2 0x4b 0x96 0xab 0xf9 0x24 0x37 | ||
| 259 | 0x2c 0x8a 0x8f 0xff 0xb1 0x0d 0x55 0x35 0x49 0x00 | ||
| 260 | 0xa7 0x7a 0x3d 0xb5 0xf2 0x05 0xe1 0xb9 0x9f 0xcd | ||
| 261 | 0x86 0x60 0x86 0x3a 0x15 0x9a 0xd4 0xab 0xe4 0x0f | ||
| 262 | 0xa4 0x89 0x34 0x16 0x3d 0xdd 0xe5 0x42 0xa6 0x58 | ||
| 263 | 0x55 0x40 0xfd 0x68 0x3c 0xbf 0xd8 0xc0 0x0f 0x12 | ||
| 264 | 0x12 0x9a 0x28 0x4d 0xea 0xcc 0x4c 0xde 0xfe 0x58 | ||
| 265 | 0xbe 0x71 0x37 0x54 0x1c 0x04 0x71 0x26 0xc8 0xd4 | ||
| 266 | 0x9e 0x27 0x55 0xab 0x18 0x1a 0xb7 0xe9 0x40 0xb0 | ||
| 267 | 0xc0 | ||
| 268 | |||
| 269 | |||
| 270 | |||
| 271 | -- | ||
| 272 | --------------------------------------------------------------------- | ||
| 273 | We have the right to defend ourselves and our | ||
| 274 | property, because of the kind of animals that we James A. Donald | ||
| 275 | are. True law derives from this right, not from | ||
| 276 | the arbitrary power of the omnipotent state. jamesd@netcom.com | ||
| 277 | |||
| 278 | |||
