diff options
| author | cvs2svn <admin@example.com> | 2010-10-01 22:54:20 +0000 |
|---|---|---|
| committer | cvs2svn <admin@example.com> | 2010-10-01 22:54:20 +0000 |
| commit | 4e3116ba582489ffb124277aa36dfb5a1570558c (patch) | |
| tree | 75985dcb1495258d2f93d846c0e2d85abd778661 /src/lib/libcrypto/des | |
| parent | 75291ae343a87368ad49c13ac02f85a88159417f (diff) | |
| download | openbsd-openssh_1_0_0_a.tar.gz openbsd-openssh_1_0_0_a.tar.bz2 openbsd-openssh_1_0_0_a.zip | |
This commit was manufactured by cvs2git to create tag 'openssh_1_0_0_a'.openssh_1_0_0_a
Diffstat (limited to 'src/lib/libcrypto/des')
| -rw-r--r-- | src/lib/libcrypto/des/asm/des686.pl | 230 | ||||
| -rw-r--r-- | src/lib/libcrypto/des/des_lib.c | 106 |
2 files changed, 0 insertions, 336 deletions
diff --git a/src/lib/libcrypto/des/asm/des686.pl b/src/lib/libcrypto/des/asm/des686.pl deleted file mode 100644 index d3ad5d5edd..0000000000 --- a/src/lib/libcrypto/des/asm/des686.pl +++ /dev/null | |||
| @@ -1,230 +0,0 @@ | |||
| 1 | #!/usr/local/bin/perl | ||
| 2 | |||
| 3 | $prog="des686.pl"; | ||
| 4 | |||
| 5 | # base code is in microsft | ||
| 6 | # op dest, source | ||
| 7 | # format. | ||
| 8 | # | ||
| 9 | |||
| 10 | # WILL NOT WORK ANYMORE WITH desboth.pl | ||
| 11 | require "desboth.pl"; | ||
| 12 | |||
| 13 | if ( ($ARGV[0] eq "elf")) | ||
| 14 | { require "x86unix.pl"; } | ||
| 15 | elsif ( ($ARGV[0] eq "a.out")) | ||
| 16 | { $aout=1; require "x86unix.pl"; } | ||
| 17 | elsif ( ($ARGV[0] eq "sol")) | ||
| 18 | { $sol=1; require "x86unix.pl"; } | ||
| 19 | elsif ( ($ARGV[0] eq "cpp")) | ||
| 20 | { $cpp=1; require "x86unix.pl"; } | ||
| 21 | elsif ( ($ARGV[0] eq "win32")) | ||
| 22 | { require "x86ms.pl"; } | ||
| 23 | else | ||
| 24 | { | ||
| 25 | print STDERR <<"EOF"; | ||
| 26 | Pick one target type from | ||
| 27 | elf - linux, FreeBSD etc | ||
| 28 | a.out - old linux | ||
| 29 | sol - x86 solaris | ||
| 30 | cpp - format so x86unix.cpp can be used | ||
| 31 | win32 - Windows 95/Windows NT | ||
| 32 | EOF | ||
| 33 | exit(1); | ||
| 34 | } | ||
| 35 | |||
| 36 | &comment("Don't even think of reading this code"); | ||
| 37 | &comment("It was automatically generated by $prog"); | ||
| 38 | &comment("Which is a perl program used to generate the x86 assember for"); | ||
| 39 | &comment("any of elf, a.out, Win32, or Solaris"); | ||
| 40 | &comment("It can be found in SSLeay 0.6.5+ or in libdes 3.26+"); | ||
| 41 | &comment("eric <eay\@cryptsoft.com>"); | ||
| 42 | &comment(""); | ||
| 43 | |||
| 44 | &file("dx86xxxx"); | ||
| 45 | |||
| 46 | $L="edi"; | ||
| 47 | $R="esi"; | ||
| 48 | |||
| 49 | &DES_encrypt("DES_encrypt1",1); | ||
| 50 | &DES_encrypt("DES_encrypt2",0); | ||
| 51 | |||
| 52 | &DES_encrypt3("DES_encrypt3",1); | ||
| 53 | &DES_encrypt3("DES_decrypt3",0); | ||
| 54 | |||
| 55 | &file_end(); | ||
| 56 | |||
| 57 | sub DES_encrypt | ||
| 58 | { | ||
| 59 | local($name,$do_ip)=@_; | ||
| 60 | |||
| 61 | &function_begin($name,"EXTRN _DES_SPtrans:DWORD"); | ||
| 62 | |||
| 63 | &comment(""); | ||
| 64 | &comment("Load the 2 words"); | ||
| 65 | &mov("eax",&wparam(0)); | ||
| 66 | &mov($L,&DWP(0,"eax","",0)); | ||
| 67 | &mov($R,&DWP(4,"eax","",0)); | ||
| 68 | |||
| 69 | $ksp=&wparam(1); | ||
| 70 | |||
| 71 | if ($do_ip) | ||
| 72 | { | ||
| 73 | &comment(""); | ||
| 74 | &comment("IP"); | ||
| 75 | &IP_new($L,$R,"eax"); | ||
| 76 | } | ||
| 77 | |||
| 78 | &comment(""); | ||
| 79 | &comment("fixup rotate"); | ||
| 80 | &rotl($R,3); | ||
| 81 | &rotl($L,3); | ||
| 82 | &exch($L,$R); | ||
| 83 | |||
| 84 | &comment(""); | ||
| 85 | &comment("load counter, key_schedule and enc flag"); | ||
| 86 | &mov("eax",&wparam(2)); # get encrypt flag | ||
| 87 | &mov("ebp",&wparam(1)); # get ks | ||
| 88 | &cmp("eax","0"); | ||
| 89 | &je(&label("start_decrypt")); | ||
| 90 | |||
| 91 | # encrypting part | ||
| 92 | |||
| 93 | for ($i=0; $i<16; $i+=2) | ||
| 94 | { | ||
| 95 | &comment(""); | ||
| 96 | &comment("Round $i"); | ||
| 97 | &D_ENCRYPT($L,$R,$i*2,"ebp","DES_SPtrans","ecx","edx","eax","ebx"); | ||
| 98 | |||
| 99 | &comment(""); | ||
| 100 | &comment("Round ".sprintf("%d",$i+1)); | ||
| 101 | &D_ENCRYPT($R,$L,($i+1)*2,"ebp","DES_SPtrans","ecx","edx","eax","ebx"); | ||
| 102 | } | ||
| 103 | &jmp(&label("end")); | ||
| 104 | |||
| 105 | &set_label("start_decrypt"); | ||
| 106 | |||
| 107 | for ($i=15; $i>0; $i-=2) | ||
| 108 | { | ||
| 109 | &comment(""); | ||
| 110 | &comment("Round $i"); | ||
| 111 | &D_ENCRYPT($L,$R,$i*2,"ebp","DES_SPtrans","ecx","edx","eax","ebx"); | ||
| 112 | &comment(""); | ||
| 113 | &comment("Round ".sprintf("%d",$i-1)); | ||
| 114 | &D_ENCRYPT($R,$L,($i-1)*2,"ebp","DES_SPtrans","ecx","edx","eax","ebx"); | ||
| 115 | } | ||
| 116 | |||
| 117 | &set_label("end"); | ||
| 118 | |||
| 119 | &comment(""); | ||
| 120 | &comment("Fixup"); | ||
| 121 | &rotr($L,3); # r | ||
| 122 | &rotr($R,3); # l | ||
| 123 | |||
| 124 | if ($do_ip) | ||
| 125 | { | ||
| 126 | &comment(""); | ||
| 127 | &comment("FP"); | ||
| 128 | &FP_new($R,$L,"eax"); | ||
| 129 | } | ||
| 130 | |||
| 131 | &mov("eax",&wparam(0)); | ||
| 132 | &mov(&DWP(0,"eax","",0),$L); | ||
| 133 | &mov(&DWP(4,"eax","",0),$R); | ||
| 134 | |||
| 135 | &function_end($name); | ||
| 136 | } | ||
| 137 | |||
| 138 | |||
| 139 | # The logic is to load R into 2 registers and operate on both at the same time. | ||
| 140 | # We also load the 2 R's into 2 more registers so we can do the 'move word down a byte' | ||
| 141 | # while also masking the other copy and doing a lookup. We then also accumulate the | ||
| 142 | # L value in 2 registers then combine them at the end. | ||
| 143 | sub D_ENCRYPT | ||
| 144 | { | ||
| 145 | local($L,$R,$S,$ks,$desSP,$u,$t,$tmp1,$tmp2,$tmp3)=@_; | ||
| 146 | |||
| 147 | &mov( $u, &DWP(&n2a($S*4),$ks,"",0)); | ||
| 148 | &mov( $t, &DWP(&n2a(($S+1)*4),$ks,"",0)); | ||
| 149 | &xor( $u, $R ); | ||
| 150 | &xor( $t, $R ); | ||
| 151 | &rotr( $t, 4 ); | ||
| 152 | |||
| 153 | # the numbers at the end of the line are origional instruction order | ||
| 154 | &mov( $tmp2, $u ); # 1 2 | ||
| 155 | &mov( $tmp1, $t ); # 1 1 | ||
| 156 | &and( $tmp2, "0xfc" ); # 1 4 | ||
| 157 | &and( $tmp1, "0xfc" ); # 1 3 | ||
| 158 | &shr( $t, 8 ); # 1 5 | ||
| 159 | &xor( $L, &DWP("0x100+$desSP",$tmp1,"",0)); # 1 7 | ||
| 160 | &shr( $u, 8 ); # 1 6 | ||
| 161 | &mov( $tmp1, &DWP(" $desSP",$tmp2,"",0)); # 1 8 | ||
| 162 | |||
| 163 | &mov( $tmp2, $u ); # 2 2 | ||
| 164 | &xor( $L, $tmp1 ); # 1 9 | ||
| 165 | &and( $tmp2, "0xfc" ); # 2 4 | ||
| 166 | &mov( $tmp1, $t ); # 2 1 | ||
| 167 | &and( $tmp1, "0xfc" ); # 2 3 | ||
| 168 | &shr( $t, 8 ); # 2 5 | ||
| 169 | &xor( $L, &DWP("0x300+$desSP",$tmp1,"",0)); # 2 7 | ||
| 170 | &shr( $u, 8 ); # 2 6 | ||
| 171 | &mov( $tmp1, &DWP("0x200+$desSP",$tmp2,"",0)); # 2 8 | ||
| 172 | &mov( $tmp2, $u ); # 3 2 | ||
| 173 | |||
| 174 | &xor( $L, $tmp1 ); # 2 9 | ||
| 175 | &and( $tmp2, "0xfc" ); # 3 4 | ||
| 176 | |||
| 177 | &mov( $tmp1, $t ); # 3 1 | ||
| 178 | &shr( $u, 8 ); # 3 6 | ||
| 179 | &and( $tmp1, "0xfc" ); # 3 3 | ||
| 180 | &shr( $t, 8 ); # 3 5 | ||
| 181 | &xor( $L, &DWP("0x500+$desSP",$tmp1,"",0)); # 3 7 | ||
| 182 | &mov( $tmp1, &DWP("0x400+$desSP",$tmp2,"",0)); # 3 8 | ||
| 183 | |||
| 184 | &and( $t, "0xfc" ); # 4 1 | ||
| 185 | &xor( $L, $tmp1 ); # 3 9 | ||
| 186 | |||
| 187 | &and( $u, "0xfc" ); # 4 2 | ||
| 188 | &xor( $L, &DWP("0x700+$desSP",$t,"",0)); # 4 3 | ||
| 189 | &xor( $L, &DWP("0x600+$desSP",$u,"",0)); # 4 4 | ||
| 190 | } | ||
| 191 | |||
| 192 | sub PERM_OP | ||
| 193 | { | ||
| 194 | local($a,$b,$tt,$shift,$mask)=@_; | ||
| 195 | |||
| 196 | &mov( $tt, $a ); | ||
| 197 | &shr( $tt, $shift ); | ||
| 198 | &xor( $tt, $b ); | ||
| 199 | &and( $tt, $mask ); | ||
| 200 | &xor( $b, $tt ); | ||
| 201 | &shl( $tt, $shift ); | ||
| 202 | &xor( $a, $tt ); | ||
| 203 | } | ||
| 204 | |||
| 205 | sub IP_new | ||
| 206 | { | ||
| 207 | local($l,$r,$tt)=@_; | ||
| 208 | |||
| 209 | &PERM_OP($r,$l,$tt, 4,"0x0f0f0f0f"); | ||
| 210 | &PERM_OP($l,$r,$tt,16,"0x0000ffff"); | ||
| 211 | &PERM_OP($r,$l,$tt, 2,"0x33333333"); | ||
| 212 | &PERM_OP($l,$r,$tt, 8,"0x00ff00ff"); | ||
| 213 | &PERM_OP($r,$l,$tt, 1,"0x55555555"); | ||
| 214 | } | ||
| 215 | |||
| 216 | sub FP_new | ||
| 217 | { | ||
| 218 | local($l,$r,$tt)=@_; | ||
| 219 | |||
| 220 | &PERM_OP($l,$r,$tt, 1,"0x55555555"); | ||
| 221 | &PERM_OP($r,$l,$tt, 8,"0x00ff00ff"); | ||
| 222 | &PERM_OP($l,$r,$tt, 2,"0x33333333"); | ||
| 223 | &PERM_OP($r,$l,$tt,16,"0x0000ffff"); | ||
| 224 | &PERM_OP($l,$r,$tt, 4,"0x0f0f0f0f"); | ||
| 225 | } | ||
| 226 | |||
| 227 | sub n2a | ||
| 228 | { | ||
| 229 | sprintf("%d",$_[0]); | ||
| 230 | } | ||
diff --git a/src/lib/libcrypto/des/des_lib.c b/src/lib/libcrypto/des/des_lib.c deleted file mode 100644 index d4b3047932..0000000000 --- a/src/lib/libcrypto/des/des_lib.c +++ /dev/null | |||
| @@ -1,106 +0,0 @@ | |||
| 1 | /* crypto/des/ecb_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 "des_locl.h" | ||
| 60 | #include "des_ver.h" | ||
| 61 | #include <openssl/opensslv.h> | ||
| 62 | #include <openssl/bio.h> | ||
| 63 | |||
| 64 | OPENSSL_GLOBAL const char libdes_version[]="libdes" OPENSSL_VERSION_PTEXT; | ||
| 65 | OPENSSL_GLOBAL const char DES_version[]="DES" OPENSSL_VERSION_PTEXT; | ||
| 66 | |||
| 67 | const char *DES_options(void) | ||
| 68 | { | ||
| 69 | static int init=1; | ||
| 70 | static char buf[32]; | ||
| 71 | |||
| 72 | if (init) | ||
| 73 | { | ||
| 74 | const char *ptr,*unroll,*risc,*size; | ||
| 75 | |||
| 76 | #ifdef DES_PTR | ||
| 77 | ptr="ptr"; | ||
| 78 | #else | ||
| 79 | ptr="idx"; | ||
| 80 | #endif | ||
| 81 | #if defined(DES_RISC1) || defined(DES_RISC2) | ||
| 82 | #ifdef DES_RISC1 | ||
| 83 | risc="risc1"; | ||
| 84 | #endif | ||
| 85 | #ifdef DES_RISC2 | ||
| 86 | risc="risc2"; | ||
| 87 | #endif | ||
| 88 | #else | ||
| 89 | risc="cisc"; | ||
| 90 | #endif | ||
| 91 | #ifdef DES_UNROLL | ||
| 92 | unroll="16"; | ||
| 93 | #else | ||
| 94 | unroll="4"; | ||
| 95 | #endif | ||
| 96 | if (sizeof(DES_LONG) != sizeof(long)) | ||
| 97 | size="int"; | ||
| 98 | else | ||
| 99 | size="long"; | ||
| 100 | BIO_snprintf(buf,sizeof buf,"des(%s,%s,%s,%s)",ptr,risc,unroll, | ||
| 101 | size); | ||
| 102 | init=0; | ||
| 103 | } | ||
| 104 | return(buf); | ||
| 105 | } | ||
| 106 | |||
