|
Removed
Link Here
|
| 1 |
diff --git a/CODE-OF-CONDUCT.md external/boringssl/CODE-OF-CONDUCT.md |
| 2 |
new file mode 100644 |
| 3 |
index 00000000..775f221c |
| 4 |
--- /dev/null |
| 5 |
+++ external/boringssl/CODE-OF-CONDUCT.md |
| 6 |
@@ -0,0 +1,6 @@ |
| 7 |
+# Code of Conduct |
| 8 |
+ |
| 9 |
+This project has adopted the code of conduct defined by the Contributor Covenant |
| 10 |
+to clarify expected behavior in our community. |
| 11 |
+ |
| 12 |
+For more information, see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct). |
| 13 |
diff --git a/THIRD-PARTY-NOTICES.TXT external/boringssl/THIRD-PARTY-NOTICES.TXT |
| 14 |
new file mode 100644 |
| 15 |
index 00000000..069ac8f2 |
| 16 |
--- /dev/null |
| 17 |
+++ external/boringssl/THIRD-PARTY-NOTICES.TXT |
| 18 |
@@ -0,0 +1,20 @@ |
| 19 |
+Mono uses third-party libraries or other resources that may be |
| 20 |
+distributed under licenses different than the .NET Core software. |
| 21 |
+ |
| 22 |
+ Attributions and license notices for test cases originally authored by |
| 23 |
+third parties can be found in the respective test directories. |
| 24 |
+ |
| 25 |
+ In the event that we accidentally failed to list a required notice, please |
| 26 |
+bring it to our attention. Post an issue or email us: |
| 27 |
+ |
| 28 |
+ dotnet@microsoft.com |
| 29 |
+ |
| 30 |
+ The attached notices are provided for information only. |
| 31 |
+ |
| 32 |
+ License notice for Code Project |
| 33 |
+-------------------------------- |
| 34 |
+ |
| 35 |
+Title: Thread Local Storage - The C++ Way |
| 36 |
+Content: https://www.codeproject.com/Articles/8113/Thread-Local-Storage-The-C-Way |
| 37 |
+Reference: https://github.com/mono/boringssl/bloexternal/boringssl/eec2ca7e76c04ca41ef5bfc875ee3b0374cb7a94/crypto/thread_win.c#L138-L148 |
| 38 |
+License: https://www.codeproject.com/info/EULA.aspx |
| 39 |
diff --git a/crypto/aes/asm/aesv8-armx.pl external/boringssl/crypto/aes/asm/aesv8-armx.pl |
| 40 |
index 89e6f874..c41175a6 100644 |
| 41 |
--- a/crypto/aes/asm/aesv8-armx.pl |
| 42 |
+++ external/boringssl/crypto/aes/asm/aesv8-armx.pl |
| 43 |
@@ -51,15 +51,7 @@ $code=<<___; |
| 44 |
.text |
| 45 |
___ |
| 46 |
$code.=<<___ if ($flavour =~ /64/); |
| 47 |
-#if !defined(__clang__) |
| 48 |
.arch armv8-a+crypto |
| 49 |
-#elif defined(ANDROID) && defined(__clang__) |
| 50 |
-#if __clang_major__ > 3 |
| 51 |
-.arch armv8-a+crypto |
| 52 |
-#else |
| 53 |
-.arch armv8-a+crypto,+neon |
| 54 |
-#endif |
| 55 |
-#endif |
| 56 |
___ |
| 57 |
$code.=".arch armv7-a\n.fpu neon\n.code 32\n" if ($flavour !~ /64/); |
| 58 |
#^^^^^^ this is done to simplify adoption by not depending |
| 59 |
diff --git a/crypto/cpu-aarch64-linux.c external/boringssl/crypto/cpu-aarch64-linux.c |
| 60 |
index 1b0f3955..93d12237 100644 |
| 61 |
--- a/crypto/cpu-aarch64-linux.c |
| 62 |
+++ external/boringssl/crypto/cpu-aarch64-linux.c |
| 63 |
@@ -25,6 +25,48 @@ |
| 64 |
|
| 65 |
extern uint32_t OPENSSL_armcap_P; |
| 66 |
|
| 67 |
+#if defined(__FreeBSD__) |
| 68 |
+ |
| 69 |
+#include <stdlib.h> |
| 70 |
+#include <sys/types.h> |
| 71 |
+#include <machine/armreg.h> |
| 72 |
+ |
| 73 |
+// Support for older version of armreg.h |
| 74 |
+#ifndef ID_AA64ISAR0_AES_VAL |
| 75 |
+#define ID_AA64ISAR0_AES_VAL ID_AA64ISAR0_AES |
| 76 |
+#endif |
| 77 |
+#ifndef ID_AA64ISAR0_SHA1_VAL |
| 78 |
+#define ID_AA64ISAR0_SHA1_VAL ID_AA64ISAR0_SHA1 |
| 79 |
+#endif |
| 80 |
+#ifndef ID_AA64ISAR0_SHA2_VAL |
| 81 |
+#define ID_AA64ISAR0_SHA2_VAL ID_AA64ISAR0_SHA2 |
| 82 |
+#endif |
| 83 |
+ |
| 84 |
+void OPENSSL_cpuid_setup(void) { |
| 85 |
+ if (getenv("QEMU_EMULATING") != NULL) { |
| 86 |
+ return; |
| 87 |
+ } |
| 88 |
+ |
| 89 |
+ uint64_t isar0_val = READ_SPECIALREG(id_aa64isar0_el1); |
| 90 |
+ |
| 91 |
+ OPENSSL_armcap_P |= ARMV7_NEON; |
| 92 |
+ |
| 93 |
+ if (ID_AA64ISAR0_AES_VAL(isar0_val) >= ID_AA64ISAR0_AES_BASE) { |
| 94 |
+ OPENSSL_armcap_P |= ARMV8_PMULL; |
| 95 |
+ } |
| 96 |
+ if (ID_AA64ISAR0_AES_VAL(isar0_val) >= ID_AA64ISAR0_AES_PMULL) { |
| 97 |
+ OPENSSL_armcap_P |= ARMV8_PMULL; |
| 98 |
+ } |
| 99 |
+ if (ID_AA64ISAR0_SHA1_VAL(isar0_val) >= ID_AA64ISAR0_SHA1_BASE) { |
| 100 |
+ OPENSSL_armcap_P |= ARMV8_SHA1; |
| 101 |
+ } |
| 102 |
+ if (ID_AA64ISAR0_SHA2_VAL(isar0_val) >= ID_AA64ISAR0_SHA2_BASE) { |
| 103 |
+ OPENSSL_armcap_P |= ARMV8_SHA256; |
| 104 |
+ } |
| 105 |
+} |
| 106 |
+ |
| 107 |
+#else // linux |
| 108 |
+ |
| 109 |
void OPENSSL_cpuid_setup(void) { |
| 110 |
unsigned long hwcap = getauxval(AT_HWCAP); |
| 111 |
|
| 112 |
@@ -58,4 +100,6 @@ void OPENSSL_cpuid_setup(void) { |
| 113 |
} |
| 114 |
} |
| 115 |
|
| 116 |
+#endif |
| 117 |
+ |
| 118 |
#endif /* OPENSSL_AARCH64 && !OPENSSL_STATIC_ARMCAP */ |
| 119 |
diff --git a/crypto/modes/asm/ghashv8-armx.pl external/boringssl/crypto/modes/asm/ghashv8-armx.pl |
| 120 |
index 73421405..eabef0cb 100644 |
| 121 |
--- a/crypto/modes/asm/ghashv8-armx.pl |
| 122 |
+++ external/boringssl/crypto/modes/asm/ghashv8-armx.pl |
| 123 |
@@ -59,15 +59,7 @@ $code=<<___; |
| 124 |
.text |
| 125 |
___ |
| 126 |
$code.=<<___ if ($flavour =~ /64/); |
| 127 |
-#if !defined(__clang__) |
| 128 |
.arch armv8-a+crypto |
| 129 |
-#elif defined(ANDROID) && defined(__clang__) |
| 130 |
-#if __clang_major__ > 3 |
| 131 |
-.arch armv8-a+crypto |
| 132 |
-#else |
| 133 |
-.arch armv8-a+crypto,+neon |
| 134 |
-#endif |
| 135 |
-#endif |
| 136 |
___ |
| 137 |
$code.=".fpu neon\n.code 32\n" if ($flavour !~ /64/); |
| 138 |
|