diff options
| author | cvs2svn <admin@example.com> | 2012-07-13 17:49:56 +0000 |
|---|---|---|
| committer | cvs2svn <admin@example.com> | 2012-07-13 17:49:56 +0000 |
| commit | ee04221ea8063435416c7e6369e6eae76843aa71 (patch) | |
| tree | 821921a1dd0a5a3cece91121e121cc63c4b68128 /src/lib/libcrypto/bf/asm | |
| parent | adf6731f6e1d04718aee00cb93435143046aee9a (diff) | |
| download | openbsd-eric_g2k12.tar.gz openbsd-eric_g2k12.tar.bz2 openbsd-eric_g2k12.zip | |
This commit was manufactured by cvs2git to create tag 'eric_g2k12'.eric_g2k12
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libcrypto/bf/asm/bf-586.pl | 137 | ||||
| -rw-r--r-- | src/lib/libcrypto/bf/asm/bf-686.pl | 127 | ||||
| -rw-r--r-- | src/lib/libcrypto/bf/asm/readme | 10 |
3 files changed, 0 insertions, 274 deletions
diff --git a/src/lib/libcrypto/bf/asm/bf-586.pl b/src/lib/libcrypto/bf/asm/bf-586.pl deleted file mode 100644 index 1f9b345aee..0000000000 --- a/src/lib/libcrypto/bf/asm/bf-586.pl +++ /dev/null | |||
| @@ -1,137 +0,0 @@ | |||
| 1 | #!/usr/local/bin/perl | ||
| 2 | |||
| 3 | $0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1; | ||
| 4 | push(@INC,"${dir}","${dir}../../perlasm"); | ||
| 5 | require "x86asm.pl"; | ||
| 6 | require "cbc.pl"; | ||
| 7 | |||
| 8 | &asm_init($ARGV[0],"bf-586.pl",$ARGV[$#ARGV] eq "386"); | ||
| 9 | |||
| 10 | $BF_ROUNDS=16; | ||
| 11 | $BF_OFF=($BF_ROUNDS+2)*4; | ||
| 12 | $L="edi"; | ||
| 13 | $R="esi"; | ||
| 14 | $P="ebp"; | ||
| 15 | $tmp1="eax"; | ||
| 16 | $tmp2="ebx"; | ||
| 17 | $tmp3="ecx"; | ||
| 18 | $tmp4="edx"; | ||
| 19 | |||
| 20 | &BF_encrypt("BF_encrypt",1); | ||
| 21 | &BF_encrypt("BF_decrypt",0); | ||
| 22 | &cbc("BF_cbc_encrypt","BF_encrypt","BF_decrypt",1,4,5,3,-1,-1) unless $main'openbsd; | ||
| 23 | &asm_finish(); | ||
| 24 | |||
| 25 | sub BF_encrypt | ||
| 26 | { | ||
| 27 | local($name,$enc)=@_; | ||
| 28 | |||
| 29 | &function_begin_B($name,""); | ||
| 30 | |||
| 31 | &comment(""); | ||
| 32 | |||
| 33 | &push("ebp"); | ||
| 34 | &push("ebx"); | ||
| 35 | &mov($tmp2,&wparam(0)); | ||
| 36 | &mov($P,&wparam(1)); | ||
| 37 | &push("esi"); | ||
| 38 | &push("edi"); | ||
| 39 | |||
| 40 | &comment("Load the 2 words"); | ||
| 41 | &mov($L,&DWP(0,$tmp2,"",0)); | ||
| 42 | &mov($R,&DWP(4,$tmp2,"",0)); | ||
| 43 | |||
| 44 | &xor( $tmp1, $tmp1); | ||
| 45 | |||
| 46 | # encrypting part | ||
| 47 | |||
| 48 | if ($enc) | ||
| 49 | { | ||
| 50 | &mov($tmp2,&DWP(0,$P,"",0)); | ||
| 51 | &xor( $tmp3, $tmp3); | ||
| 52 | |||
| 53 | &xor($L,$tmp2); | ||
| 54 | for ($i=0; $i<$BF_ROUNDS; $i+=2) | ||
| 55 | { | ||
| 56 | &comment(""); | ||
| 57 | &comment("Round $i"); | ||
| 58 | &BF_ENCRYPT($i+1,$R,$L,$P,$tmp1,$tmp2,$tmp3,$tmp4,1); | ||
| 59 | |||
| 60 | &comment(""); | ||
| 61 | &comment("Round ".sprintf("%d",$i+1)); | ||
| 62 | &BF_ENCRYPT($i+2,$L,$R,$P,$tmp1,$tmp2,$tmp3,$tmp4,1); | ||
| 63 | } | ||
| 64 | # &mov($tmp1,&wparam(0)); In last loop | ||
| 65 | &mov($tmp4,&DWP(($BF_ROUNDS+1)*4,$P,"",0)); | ||
| 66 | } | ||
| 67 | else | ||
| 68 | { | ||
| 69 | &mov($tmp2,&DWP(($BF_ROUNDS+1)*4,$P,"",0)); | ||
| 70 | &xor( $tmp3, $tmp3); | ||
| 71 | |||
| 72 | &xor($L,$tmp2); | ||
| 73 | for ($i=$BF_ROUNDS; $i>0; $i-=2) | ||
| 74 | { | ||
| 75 | &comment(""); | ||
| 76 | &comment("Round $i"); | ||
| 77 | &BF_ENCRYPT($i,$R,$L,$P,$tmp1,$tmp2,$tmp3,$tmp4,0); | ||
| 78 | &comment(""); | ||
| 79 | &comment("Round ".sprintf("%d",$i-1)); | ||
| 80 | &BF_ENCRYPT($i-1,$L,$R,$P,$tmp1,$tmp2,$tmp3,$tmp4,0); | ||
| 81 | } | ||
| 82 | # &mov($tmp1,&wparam(0)); In last loop | ||
| 83 | &mov($tmp4,&DWP(0,$P,"",0)); | ||
| 84 | } | ||
| 85 | |||
| 86 | &xor($R,$tmp4); | ||
| 87 | &mov(&DWP(4,$tmp1,"",0),$L); | ||
| 88 | |||
| 89 | &mov(&DWP(0,$tmp1,"",0),$R); | ||
| 90 | &function_end($name); | ||
| 91 | } | ||
| 92 | |||
| 93 | sub BF_ENCRYPT | ||
| 94 | { | ||
| 95 | local($i,$L,$R,$P,$tmp1,$tmp2,$tmp3,$tmp4,$enc)=@_; | ||
| 96 | |||
| 97 | &mov( $tmp4, &DWP(&n2a($i*4),$P,"",0)); # for next round | ||
| 98 | |||
| 99 | &mov( $tmp2, $R); | ||
| 100 | &xor( $L, $tmp4); | ||
| 101 | |||
| 102 | &shr( $tmp2, 16); | ||
| 103 | &mov( $tmp4, $R); | ||
| 104 | |||
| 105 | &movb( &LB($tmp1), &HB($tmp2)); # A | ||
| 106 | &and( $tmp2, 0xff); # B | ||
| 107 | |||
| 108 | &movb( &LB($tmp3), &HB($tmp4)); # C | ||
| 109 | &and( $tmp4, 0xff); # D | ||
| 110 | |||
| 111 | &mov( $tmp1, &DWP(&n2a($BF_OFF+0x0000),$P,$tmp1,4)); | ||
| 112 | &mov( $tmp2, &DWP(&n2a($BF_OFF+0x0400),$P,$tmp2,4)); | ||
| 113 | |||
| 114 | &add( $tmp2, $tmp1); | ||
| 115 | &mov( $tmp1, &DWP(&n2a($BF_OFF+0x0800),$P,$tmp3,4)); | ||
| 116 | |||
| 117 | &xor( $tmp2, $tmp1); | ||
| 118 | &mov( $tmp4, &DWP(&n2a($BF_OFF+0x0C00),$P,$tmp4,4)); | ||
| 119 | |||
| 120 | &add( $tmp2, $tmp4); | ||
| 121 | if (($enc && ($i != 16)) || ((!$enc) && ($i != 1))) | ||
| 122 | { &xor( $tmp1, $tmp1); } | ||
| 123 | else | ||
| 124 | { | ||
| 125 | &comment("Load parameter 0 ($i) enc=$enc"); | ||
| 126 | &mov($tmp1,&wparam(0)); | ||
| 127 | } # In last loop | ||
| 128 | |||
| 129 | &xor( $L, $tmp2); | ||
| 130 | # delay | ||
| 131 | } | ||
| 132 | |||
| 133 | sub n2a | ||
| 134 | { | ||
| 135 | sprintf("%d",$_[0]); | ||
| 136 | } | ||
| 137 | |||
diff --git a/src/lib/libcrypto/bf/asm/bf-686.pl b/src/lib/libcrypto/bf/asm/bf-686.pl deleted file mode 100644 index 8e4c25f598..0000000000 --- a/src/lib/libcrypto/bf/asm/bf-686.pl +++ /dev/null | |||
| @@ -1,127 +0,0 @@ | |||
| 1 | #!/usr/local/bin/perl | ||
| 2 | |||
| 3 | push(@INC,"perlasm","../../perlasm"); | ||
| 4 | require "x86asm.pl"; | ||
| 5 | require "cbc.pl"; | ||
| 6 | |||
| 7 | &asm_init($ARGV[0],"bf-686.pl"); | ||
| 8 | |||
| 9 | $BF_ROUNDS=16; | ||
| 10 | $BF_OFF=($BF_ROUNDS+2)*4; | ||
| 11 | $L="ecx"; | ||
| 12 | $R="edx"; | ||
| 13 | $P="edi"; | ||
| 14 | $tot="esi"; | ||
| 15 | $tmp1="eax"; | ||
| 16 | $tmp2="ebx"; | ||
| 17 | $tmp3="ebp"; | ||
| 18 | |||
| 19 | &des_encrypt("BF_encrypt",1); | ||
| 20 | &des_encrypt("BF_decrypt",0); | ||
| 21 | &cbc("BF_cbc_encrypt","BF_encrypt","BF_decrypt",1,4,5,3,-1,-1); | ||
| 22 | |||
| 23 | &asm_finish(); | ||
| 24 | |||
| 25 | &file_end(); | ||
| 26 | |||
| 27 | sub des_encrypt | ||
| 28 | { | ||
| 29 | local($name,$enc)=@_; | ||
| 30 | |||
| 31 | &function_begin($name,""); | ||
| 32 | |||
| 33 | &comment(""); | ||
| 34 | &comment("Load the 2 words"); | ||
| 35 | &mov("eax",&wparam(0)); | ||
| 36 | &mov($L,&DWP(0,"eax","",0)); | ||
| 37 | &mov($R,&DWP(4,"eax","",0)); | ||
| 38 | |||
| 39 | &comment(""); | ||
| 40 | &comment("P pointer, s and enc flag"); | ||
| 41 | &mov($P,&wparam(1)); | ||
| 42 | |||
| 43 | &xor( $tmp1, $tmp1); | ||
| 44 | &xor( $tmp2, $tmp2); | ||
| 45 | |||
| 46 | # encrypting part | ||
| 47 | |||
| 48 | if ($enc) | ||
| 49 | { | ||
| 50 | &xor($L,&DWP(0,$P,"",0)); | ||
| 51 | for ($i=0; $i<$BF_ROUNDS; $i+=2) | ||
| 52 | { | ||
| 53 | &comment(""); | ||
| 54 | &comment("Round $i"); | ||
| 55 | &BF_ENCRYPT($i+1,$R,$L,$P,$tot,$tmp1,$tmp2,$tmp3); | ||
| 56 | |||
| 57 | &comment(""); | ||
| 58 | &comment("Round ".sprintf("%d",$i+1)); | ||
| 59 | &BF_ENCRYPT($i+2,$L,$R,$P,$tot,$tmp1,$tmp2,$tmp3); | ||
| 60 | } | ||
| 61 | &xor($R,&DWP(($BF_ROUNDS+1)*4,$P,"",0)); | ||
| 62 | |||
| 63 | &mov("eax",&wparam(0)); | ||
| 64 | &mov(&DWP(0,"eax","",0),$R); | ||
| 65 | &mov(&DWP(4,"eax","",0),$L); | ||
| 66 | &function_end_A($name); | ||
| 67 | } | ||
| 68 | else | ||
| 69 | { | ||
| 70 | &xor($L,&DWP(($BF_ROUNDS+1)*4,$P,"",0)); | ||
| 71 | for ($i=$BF_ROUNDS; $i>0; $i-=2) | ||
| 72 | { | ||
| 73 | &comment(""); | ||
| 74 | &comment("Round $i"); | ||
| 75 | &BF_ENCRYPT($i,$R,$L,$P,$tot,$tmp1,$tmp2,$tmp3); | ||
| 76 | &comment(""); | ||
| 77 | &comment("Round ".sprintf("%d",$i-1)); | ||
| 78 | &BF_ENCRYPT($i-1,$L,$R,$P,$tot,$tmp1,$tmp2,$tmp3); | ||
| 79 | } | ||
| 80 | &xor($R,&DWP(0,$P,"",0)); | ||
| 81 | |||
| 82 | &mov("eax",&wparam(0)); | ||
| 83 | &mov(&DWP(0,"eax","",0),$R); | ||
| 84 | &mov(&DWP(4,"eax","",0),$L); | ||
| 85 | &function_end_A($name); | ||
| 86 | } | ||
| 87 | |||
| 88 | &function_end_B($name); | ||
| 89 | } | ||
| 90 | |||
| 91 | sub BF_ENCRYPT | ||
| 92 | { | ||
| 93 | local($i,$L,$R,$P,$tot,$tmp1,$tmp2,$tmp3)=@_; | ||
| 94 | |||
| 95 | &rotr( $R, 16); | ||
| 96 | &mov( $tot, &DWP(&n2a($i*4),$P,"",0)); | ||
| 97 | |||
| 98 | &movb( &LB($tmp1), &HB($R)); | ||
| 99 | &movb( &LB($tmp2), &LB($R)); | ||
| 100 | |||
| 101 | &rotr( $R, 16); | ||
| 102 | &xor( $L, $tot); | ||
| 103 | |||
| 104 | &mov( $tot, &DWP(&n2a($BF_OFF+0x0000),$P,$tmp1,4)); | ||
| 105 | &mov( $tmp3, &DWP(&n2a($BF_OFF+0x0400),$P,$tmp2,4)); | ||
| 106 | |||
| 107 | &movb( &LB($tmp1), &HB($R)); | ||
| 108 | &movb( &LB($tmp2), &LB($R)); | ||
| 109 | |||
| 110 | &add( $tot, $tmp3); | ||
| 111 | &mov( $tmp1, &DWP(&n2a($BF_OFF+0x0800),$P,$tmp1,4)); # delay | ||
| 112 | |||
| 113 | &xor( $tot, $tmp1); | ||
| 114 | &mov( $tmp3, &DWP(&n2a($BF_OFF+0x0C00),$P,$tmp2,4)); | ||
| 115 | |||
| 116 | &add( $tot, $tmp3); | ||
| 117 | &xor( $tmp1, $tmp1); | ||
| 118 | |||
| 119 | &xor( $L, $tot); | ||
| 120 | # delay | ||
| 121 | } | ||
| 122 | |||
| 123 | sub n2a | ||
| 124 | { | ||
| 125 | sprintf("%d",$_[0]); | ||
| 126 | } | ||
| 127 | |||
diff --git a/src/lib/libcrypto/bf/asm/readme b/src/lib/libcrypto/bf/asm/readme deleted file mode 100644 index 2385fa3812..0000000000 --- a/src/lib/libcrypto/bf/asm/readme +++ /dev/null | |||
| @@ -1,10 +0,0 @@ | |||
| 1 | There are blowfish assembler generation scripts. | ||
| 2 | bf-586.pl version is for the pentium and | ||
| 3 | bf-686.pl is my original version, which is faster on the pentium pro. | ||
| 4 | |||
| 5 | When using a bf-586.pl, the pentium pro/II is %8 slower than using | ||
| 6 | bf-686.pl. When using a bf-686.pl, the pentium is %16 slower | ||
| 7 | than bf-586.pl | ||
| 8 | |||
| 9 | So the default is bf-586.pl | ||
| 10 | |||
