Merge pull request #1654 from briansmith/b/merge-boringssl-13

Merge BoringSSL through a43c76d
briansmith · Sep 28, 2023 · 0be8d58 · 0be8d58
2 parents 7bbc307 + a02e49b
commit 0be8d58
Show file tree

Hide file tree

Showing 8 changed files with 2,221 additions and 334 deletions.
diff --git a/crypto/curve25519/asm/x25519-asm-arm.S b/crypto/curve25519/asm/x25519-asm-arm.S
@@ -23,7 +23,7 @@
 #endif
 #endif
 
-#if !defined(OPENSSL_NO_ASM) && defined(__arm__) && !defined(__APPLE__)
+#if !defined(OPENSSL_NO_ASM) && defined(__ARMEL__) && defined(__ELF__)
 
 #include "ring_core_generated/prefix_symbols_asm.h"
 
@@ -2127,7 +2127,7 @@ mov sp,r12
 vpop {q4,q5,q6,q7}
 bx lr
 
-#endif  /* !OPENSSL_NO_ASM && __arm__ && !__APPLE__ */
+#endif  /* !OPENSSL_NO_ASM && __ARMEL__ && __ELF__ */
 
 #if defined(__ELF__)
 .section	.note.GNU-stack,"",%progbits