Commit b763981b authored by Andy Polyakov's avatar Andy Polyakov
Browse files

crypto/armcap.c: short-circuit processor capability probe in iOS builds. 



Capability probing by catching SIGILL appears to be problematic
on iOS. But since Apple universe is "monocultural", it's actually
possible to simply set pre-defined processor capability mask.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2617)

(cherry picked from commit 8653e78f)
parent c04b1434

crypto/armcap.c

+18 −0
Original line number Original line Diff line number Diff line
@@ -111,6 +111,24 @@ void OPENSSL_cpuid_setup(void) 
        return;

        return;

    }

    }





# if defined(__APPLE__) && !defined(__aarch64__)

    /*

     * Capability probing by catching SIGILL appears to be problematic

     * on iOS. But since Apple universe is "monocultural", it's actually

     * possible to simply set pre-defined processor capability mask.

     */

    if (1) {

        OPENSSL_armcap_P = ARMV7_NEON;

        return;

    }

    /*

     * One could do same even for __aarch64__ iOS builds. It's not done

     * exclusively for reasons of keeping code unified across platforms.

     * Unified code works because it never triggers SIGILL on Apple

     * devices...

     */

# endif



    sigfillset(&all_masked);

    sigfillset(&all_masked);

    sigdelset(&all_masked, SIGILL);

    sigdelset(&all_masked, SIGILL);

    sigdelset(&all_masked, SIGTRAP);

    sigdelset(&all_masked, SIGTRAP);