diff options
| author | djm <> | 2011-11-03 02:34:33 +0000 |
|---|---|---|
| committer | djm <> | 2011-11-03 02:34:33 +0000 |
| commit | fc7396568e61a510b9336d6c220aaa889c03060f (patch) | |
| tree | a8fc08e33aecdd21cb07aa47c8a3a9db715f2ef3 /src/lib/libcrypto/perlasm/cbc.pl | |
| parent | 1e8701dd2507fadf6d232d93eb4299a8b79c66d5 (diff) | |
| download | openbsd-fc7396568e61a510b9336d6c220aaa889c03060f.tar.gz openbsd-fc7396568e61a510b9336d6c220aaa889c03060f.tar.bz2 openbsd-fc7396568e61a510b9336d6c220aaa889c03060f.zip | |
openssl-1.0.0e: resolve conflicts
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libcrypto/perlasm/cbc.pl | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/lib/libcrypto/perlasm/cbc.pl b/src/lib/libcrypto/perlasm/cbc.pl index e43dc9ae15..6fc2510905 100644 --- a/src/lib/libcrypto/perlasm/cbc.pl +++ b/src/lib/libcrypto/perlasm/cbc.pl | |||
| @@ -158,7 +158,6 @@ sub cbc | |||
| 158 | &jmp_ptr($count); | 158 | &jmp_ptr($count); |
| 159 | 159 | ||
| 160 | &set_label("ej7"); | 160 | &set_label("ej7"); |
| 161 | &xor("edx", "edx") if $ppro; # ppro friendly | ||
| 162 | &movb(&HB("edx"), &BP(6,$in,"",0)); | 161 | &movb(&HB("edx"), &BP(6,$in,"",0)); |
| 163 | &shl("edx",8); | 162 | &shl("edx",8); |
| 164 | &set_label("ej6"); | 163 | &set_label("ej6"); |
| @@ -170,7 +169,6 @@ sub cbc | |||
| 170 | &jmp(&label("ejend")); | 169 | &jmp(&label("ejend")); |
| 171 | &set_label("ej3"); | 170 | &set_label("ej3"); |
| 172 | &movb(&HB("ecx"), &BP(2,$in,"",0)); | 171 | &movb(&HB("ecx"), &BP(2,$in,"",0)); |
| 173 | &xor("ecx", "ecx") if $ppro; # ppro friendly | ||
| 174 | &shl("ecx",8); | 172 | &shl("ecx",8); |
| 175 | &set_label("ej2"); | 173 | &set_label("ej2"); |
| 176 | &movb(&HB("ecx"), &BP(1,$in,"",0)); | 174 | &movb(&HB("ecx"), &BP(1,$in,"",0)); |