diff options
| author | Adam Langley <agl@google.com> | 2016-04-23 00:06:50 +0300 |
|---|---|---|
| committer | David Benjamin <davidben@google.com> | 2016-04-23 00:14:11 +0300 |
| commit | 3d907ed964c721a395c82c5733e7d6dd7fcdd1fb (patch) | |
| tree | 4239f16afabb8bd877e34a915655d014abe3402a /crypto/rc4 | |
| parent | 38d01c6b95df135875c2b2d50448c068e5b090e8 (diff) | |
Remove RC4_options from rc4-586.pl.
The x86-64 version of this assembly doesn't include this function. It's
in decrepit/rc4 as a compatibility backfill but that means that 32-bit
builds end up with two definitions of this symbol.
Change-Id: Ib6da6b91aded8efc679ebbae6d60c96a78f3dc4e
Reviewed-on: https://boringssl-review.googlesource.com/7734
Reviewed-by: David Benjamin <davidben@google.com>
Diffstat (limited to 'crypto/rc4')
| -rw-r--r-- | crypto/rc4/asm/rc4-586.pl | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/crypto/rc4/asm/rc4-586.pl b/crypto/rc4/asm/rc4-586.pl index fc860ae2..8d3ccb72 100644 --- a/crypto/rc4/asm/rc4-586.pl +++ b/crypto/rc4/asm/rc4-586.pl @@ -384,31 +384,5 @@ $idx="edx"; &mov (&DWP(-4,$out),"eax"); # key->y=0; &function_end("asm_RC4_set_key"); -# const char *RC4_options(void); -&function_begin_B("RC4_options"); - &call (&label("pic_point")); -&set_label("pic_point"); - &blindpop("eax"); - &lea ("eax",&DWP(&label("opts")."-".&label("pic_point"),"eax")); - &picmeup("edx","OPENSSL_ia32cap_P"); - &mov ("edx",&DWP(0,"edx")); - &bt ("edx",20); - &jc (&label("1xchar")); - &bt ("edx",26); - &jnc (&label("ret")); - &add ("eax",25); - &ret (); -&set_label("1xchar"); - &add ("eax",12); -&set_label("ret"); - &ret (); -&set_label("opts",64); -&asciz ("rc4(4x,int)"); -&asciz ("rc4(1x,char)"); -&asciz ("rc4(8x,mmx)"); -&asciz ("RC4 for x86, CRYPTOGAMS by <appro\@openssl.org>"); -&align (64); -&function_end_B("RC4_options"); - &asm_finish(); |