Return an error if no recipient type matches.

[openssl.git] / crypto / armcap.c

diff --git a/crypto/armcap.c b/crypto/armcap.c
index 9abaf396e53e4f5f02a05639d66ccdd9cc023495..550414425d6bd9a8d1c56a5ac377abe03e57ac95 100644 (file)
--- a/crypto/armcap.c
+++ b/crypto/armcap.c
@@ -19,6 +19,10 @@ static void ill_handler (int sig) { siglongjmp(ill_jmp,sig); }
  * ARM compilers support inline assembler...
  */
 void _armv7_neon_probe(void);
+void _armv8_aes_probe(void);
+void _armv8_sha1_probe(void);
+void _armv8_sha256_probe(void);
+void _armv8_pmull_probe(void);
 unsigned int _armv7_tick(void);
 
 unsigned int OPENSSL_rdtsc(void)
@@ -68,6 +72,26 @@ void OPENSSL_cpuid_setup(void)
                {
                _armv7_neon_probe();
                OPENSSL_armcap_P |= ARMV7_NEON;
+               if (sigsetjmp(ill_jmp,1) == 0)
+                       {
+                       _armv8_aes_probe();
+                       OPENSSL_armcap_P |= ARMV8_AES;
+                       }
+               if (sigsetjmp(ill_jmp,1) == 0)
+                       {
+                       _armv8_sha1_probe();
+                       OPENSSL_armcap_P |= ARMV8_SHA1;
+                       }
+               if (sigsetjmp(ill_jmp,1) == 0)
+                       {
+                       _armv8_sha256_probe();
+                       OPENSSL_armcap_P |= ARMV8_SHA256;
+                       }
+               if (sigsetjmp(ill_jmp,1) == 0)
+                       {
+                       _armv8_pmull_probe();
+                       OPENSSL_armcap_P |= ARMV8_PMULL;
+                       }
                }
        if (sigsetjmp(ill_jmp,1) == 0)
                {