View | Details | Raw Unified | Return to bug 242388
Collapse All | Expand All

(-)security/boringssl/files/patch-crypto_cpu-aarch64-linux.c (+74 lines)
Line 0 Link Here
1 
--- crypto/cpu-aarch64-linux.c.orig	2018-10-29 19:26:27.000000000 +0100
2 
+++ crypto/cpu-aarch64-linux.c	2019-12-02 19:52:18.060143000 +0100
3 
@@ -14,49 +14,46 @@
4
5 
 #include <openssl/cpu.h>
6
7 
-#if defined(OPENSSL_AARCH64) && defined(OPENSSL_LINUX) && \
8 
-    !defined(OPENSSL_STATIC_ARMCAP)
9 
+#if defined(OPENSSL_AARCH64)
10
11 
-#include <sys/auxv.h>
12 
-
13 
 #include <openssl/arm_arch.h>
14
15 
 #include "internal.h"
16
17 
-
18 
 extern uint32_t OPENSSL_armcap_P;
19
20 
-void OPENSSL_cpuid_setup(void) {
21 
-  unsigned long hwcap = getauxval(AT_HWCAP);
22 
+#include <sys/types.h>
23 
+#include <machine/_stdint.h>
24 
+#include <machine/armreg.h>
25
26 
-  // See /usr/include/asm/hwcap.h on an aarch64 installation for the source of
27 
-  // these values.
28 
-  static const unsigned long kNEON = 1 << 1;
29 
-  static const unsigned long kAES = 1 << 3;
30 
-  static const unsigned long kPMULL = 1 << 4;
31 
-  static const unsigned long kSHA1 = 1 << 5;
32 
-  static const unsigned long kSHA256 = 1 << 6;
33 
+#ifndef ID_AA64ISAR0_AES_VAL
34 
+#define ID_AA64ISAR0_AES_VAL ID_AA64ISAR0_AES
35 
+#endif
36 
+#ifndef ID_AA64ISAR0_SHA1_VAL
37 
+#define ID_AA64ISAR0_SHA1_VAL ID_AA64ISAR0_SHA1
38 
+#endif
39 
+#ifndef ID_AA64ISAR0_SHA2_VAL
40 
+#define ID_AA64ISAR0_SHA2_VAL ID_AA64ISAR0_SHA2
41 
+#endif
42
43 
-  if ((hwcap & kNEON) == 0) {
44 
-    // Matching OpenSSL, if NEON is missing, don't report other features
45 
-    // either.
46 
-    return;
47 
-  }
48 
+void OPENSSL_cpuid_setup(void) {
49 
+  uint64_t id_aa64isar0;
50
51 
+  id_aa64isar0 = READ_SPECIALREG(id_aa64isar0_el1);
52 
+
53 
   OPENSSL_armcap_P |= ARMV7_NEON;
54
55 
-  if (hwcap & kAES) {
56 
+  if (ID_AA64ISAR0_AES_VAL(id_aa64isar0) >= ID_AA64ISAR0_AES_BASE) {
57 
     OPENSSL_armcap_P |= ARMV8_AES;
58 
   }
59 
-  if (hwcap & kPMULL) {
60 
+  if (ID_AA64ISAR0_AES_VAL(id_aa64isar0) == ID_AA64ISAR0_AES_PMULL) {
61 
     OPENSSL_armcap_P |= ARMV8_PMULL;
62 
   }
63 
-  if (hwcap & kSHA1) {
64 
+  if (ID_AA64ISAR0_SHA1_VAL(id_aa64isar0) == ID_AA64ISAR0_SHA1_BASE) {
65 
     OPENSSL_armcap_P |= ARMV8_SHA1;
66 
   }
67 
-  if (hwcap & kSHA256) {
68 
+  if(ID_AA64ISAR0_SHA2_VAL(id_aa64isar0) >= ID_AA64ISAR0_SHA2_BASE) {
69 
     OPENSSL_armcap_P |= ARMV8_SHA256;
70 
   }
71 
 }
72 
-
73 
-#endif  // OPENSSL_AARCH64 && !OPENSSL_STATIC_ARMCAP
74 
+#endif  // OPENSSL_AARCH64

Return to bug 242388