Date: Mon, 16 May 2016 22:42:09 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r299983 - in stable/10: crypto/openssl/crypto crypto/openssl/crypto/perlasm secure/lib/libcrypto/i386 Message-ID: <201605162242.u4GMg9AO071928@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Mon May 16 22:42:09 2016 New Revision: 299983 URL: https://svnweb.freebsd.org/changeset/base/299983 Log: Hide OPENSSL_cpuid_setup and OPENSSL_ia32cap_P symbols from libcrypto.so. Note this is a direct commit because it is merged from OpenSSL upstream and head (OpenSSL 1.0.2 branch) already has the same change: https://github.com/openssl/openssl/commit/6206682 Modified: stable/10/crypto/openssl/crypto/perlasm/x86asm.pl stable/10/crypto/openssl/crypto/perlasm/x86gas.pl stable/10/crypto/openssl/crypto/x86cpuid.pl stable/10/secure/lib/libcrypto/i386/x86cpuid.S Modified: stable/10/crypto/openssl/crypto/perlasm/x86asm.pl ============================================================================== --- stable/10/crypto/openssl/crypto/perlasm/x86asm.pl Mon May 16 22:39:17 2016 (r299982) +++ stable/10/crypto/openssl/crypto/perlasm/x86asm.pl Mon May 16 22:42:09 2016 (r299983) @@ -257,4 +257,6 @@ EOF &file($filename); } +sub ::hidden {} + 1; Modified: stable/10/crypto/openssl/crypto/perlasm/x86gas.pl ============================================================================== --- stable/10/crypto/openssl/crypto/perlasm/x86gas.pl Mon May 16 22:39:17 2016 (r299982) +++ stable/10/crypto/openssl/crypto/perlasm/x86gas.pl Mon May 16 22:42:09 2016 (r299983) @@ -250,4 +250,6 @@ ___ sub ::dataseg { push(@out,".data\n"); } +*::hidden = sub { push(@out,".hidden\t$nmdecor$_[0]\n"); } if ($::elf); + 1; Modified: stable/10/crypto/openssl/crypto/x86cpuid.pl ============================================================================== --- stable/10/crypto/openssl/crypto/x86cpuid.pl Mon May 16 22:39:17 2016 (r299982) +++ stable/10/crypto/openssl/crypto/x86cpuid.pl Mon May 16 22:42:09 2016 (r299983) @@ -355,4 +355,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA3 &initseg("OPENSSL_cpuid_setup"); +&hidden("OPENSSL_cpuid_setup"); +&hidden("OPENSSL_ia32cap_P"); + &asm_finish(); Modified: stable/10/secure/lib/libcrypto/i386/x86cpuid.S ============================================================================== --- stable/10/secure/lib/libcrypto/i386/x86cpuid.S Mon May 16 22:39:17 2016 (r299982) +++ stable/10/secure/lib/libcrypto/i386/x86cpuid.S Mon May 16 22:42:09 2016 (r299983) @@ -344,6 +344,8 @@ OPENSSL_ia32_rdrand: cmovel %ecx,%eax ret .size OPENSSL_ia32_rdrand,.-.L_OPENSSL_ia32_rdrand_begin +.hidden OPENSSL_cpuid_setup +.hidden OPENSSL_ia32cap_P .comm OPENSSL_ia32cap_P,8,4 .section .init call OPENSSL_cpuid_setup @@ -679,6 +681,8 @@ OPENSSL_ia32_rdrand: cmovel %ecx,%eax ret .size OPENSSL_ia32_rdrand,.-.L_OPENSSL_ia32_rdrand_begin +.hidden OPENSSL_cpuid_setup +.hidden OPENSSL_ia32cap_P .comm OPENSSL_ia32cap_P,8,4 .section .init call OPENSSL_cpuid_setup
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605162242.u4GMg9AO071928>