Upgrade ring to 0.17.0-alpha.11
This project was upgraded with external_updater.
Usage: tools/external_updater/updater.sh update rust/crates/ring
For more info, check https://cs.android.com/android/platform/superproject/+/master:tools/external_updater/README.md
Test: TreeHugger
Change-Id: I5220a10b2a1f7fc6077d1d75daab2cd18b83008b
diff --git a/crypto/cpu-intel.c b/crypto/cpu-intel.c
index adaff7a..b563ea1 100644
--- a/crypto/cpu-intel.c
+++ b/crypto/cpu-intel.c
@@ -54,7 +54,7 @@
* copied and put under another distribution licence
* [including the GNU Public Licence.] */
-#include <GFp/cpu.h>
+#include <ring-core/cpu.h>
#if !defined(OPENSSL_NO_ASM) && (defined(OPENSSL_X86) || defined(OPENSSL_X86_64))
@@ -107,7 +107,7 @@
//
// See https://software.intel.com/en-us/articles/how-to-detect-new-instruction-support-in-the-4th-generation-intel-core-processor-family
static uint64_t OPENSSL_xgetbv(uint32_t xcr) {
-#if defined(_MSC_VER) && !defined(__clang__)
+#if defined(_MSC_VER)
return (uint64_t)_xgetbv(xcr);
#else
uint32_t eax, edx;
@@ -116,7 +116,7 @@
#endif
}
-void GFp_cpuid_setup(void) {
+void OPENSSL_cpuid_setup(void) {
// Determine the vendor and maximum input value.
uint32_t eax, ebx, ecx, edx;
OPENSSL_cpuid(&eax, &ebx, &ecx, &edx, 0);
@@ -194,10 +194,10 @@
extended_features[0] &= ~(1u << 19);
}
- GFp_ia32cap_P[0] = edx;
- GFp_ia32cap_P[1] = ecx;
- GFp_ia32cap_P[2] = extended_features[0];
- GFp_ia32cap_P[3] = extended_features[1];
+ OPENSSL_ia32cap_P[0] = edx;
+ OPENSSL_ia32cap_P[1] = ecx;
+ OPENSSL_ia32cap_P[2] = extended_features[0];
+ OPENSSL_ia32cap_P[3] = extended_features[1];
}
#endif // !OPENSSL_NO_ASM && (OPENSSL_X86 || OPENSSL_X86_64)
