summaryrefslogtreecommitdiffstats
path: root/crypto/sha
diff options
context:
space:
mode:
authorPauli <paul.dale@oracle.com>2018-06-27 03:34:54 +0200
committerPauli <paul.dale@oracle.com>2018-07-01 23:21:26 +0200
commit8794be2ed8d2e044d8b0135ddb7e903e81335c94 (patch)
tree19db2a4e65016ffe6d356f43849599398c600556 /crypto/sha
parentrand/rand_unix.c: address macro redifinition warning. (diff)
downloadopenssl-8794be2ed8d2e044d8b0135ddb7e903e81335c94.tar.xz
openssl-8794be2ed8d2e044d8b0135ddb7e903e81335c94.zip
Remove development artifacts.
The issue was discovered on the x86/64 when attempting to include libcrypto inside another shared library. A relocation of type R_X86_64_PC32 was generated which causes a linker error. Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Andy Polyakov <appro@openssl.org> (Merged from https://github.com/openssl/openssl/pull/6595)
Diffstat (limited to 'crypto/sha')
-rwxr-xr-xcrypto/sha/asm/keccak1600-s390x.pl1
-rwxr-xr-xcrypto/sha/asm/keccak1600-x86_64.pl1
2 files changed, 0 insertions, 2 deletions
diff --git a/crypto/sha/asm/keccak1600-s390x.pl b/crypto/sha/asm/keccak1600-s390x.pl
index 4bd3619f5f..58c44d8ac8 100755
--- a/crypto/sha/asm/keccak1600-s390x.pl
+++ b/crypto/sha/asm/keccak1600-s390x.pl
@@ -335,7 +335,6 @@ ___
}
{
$code.=<<___;
-.globl KeccakF1600
.type KeccakF1600,\@function
.align 32
KeccakF1600:
diff --git a/crypto/sha/asm/keccak1600-x86_64.pl b/crypto/sha/asm/keccak1600-x86_64.pl
index d3f4c10af1..42de5bf123 100755
--- a/crypto/sha/asm/keccak1600-x86_64.pl
+++ b/crypto/sha/asm/keccak1600-x86_64.pl
@@ -344,7 +344,6 @@ $code.=<<___;
ret
.size __KeccakF1600,.-__KeccakF1600
-.globl KeccakF1600
.type KeccakF1600,\@abi-omnipotent
.align 32
KeccakF1600: