Updated S2N to add support for sharing openssl/libcrypto

aws-crt-sys/src/lib.rs

@@ -1,11 +1,16 @@
-/* automatically generated by rust-bindgen 0.59.0 */
+/* automatically generated by rust-bindgen 0.59.1 */
 
 #![allow(dead_code)]
 #![allow(non_upper_case_globals)]
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
 #![allow(deref_nullptr)]
 
+pub type __uint8_t = ::std::os::raw::c_uchar;
+pub type __uint16_t = ::std::os::raw::c_ushort;
+pub type __uint32_t = ::std::os::raw::c_uint;
+pub type __int64_t = ::std::os::raw::c_long;
+pub type __uint64_t = ::std::os::raw::c_ulong;
 extern "C" {
     pub fn aws_crt_init();
 }
@@ -15,6 +20,9 @@ extern "C" {
 extern "C" {
     pub fn aws_crt_test_error(arg1: ::std::os::raw::c_int) -> ::std::os::raw::c_int;
 }
+extern "C" {
+    pub fn aws_crt_crypto_share();
+}
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct aws_allocator {

src/api.h

@@ -36,6 +36,7 @@
 AWS_CRT_API void aws_crt_init(void);
 AWS_CRT_API void aws_crt_clean_up(void);
 AWS_CRT_API int aws_crt_test_error(int);
+AWS_CRT_API void aws_crt_crypto_share(void);
 
 typedef struct aws_allocator aws_crt_allocator;
 

src/crypto.c

@@ -0,0 +1,22 @@
+
+#include "crt.h"
+
+#if defined(AWS_OS_POSIX) && !defined(AWS_OS_APPLE)
+#    include <openssl/crypto.h>
+#    include <s2n.h>
+
+void aws_crt_crypto_share(void) {
+    /* Prevent s2n from initializing or de-initializing crypto */
+    s2n_crypto_disable_init();
+
+#    if !S2N_OPENSSL_VERSION_AT_LEAST(1, 1, 0)
+    OPENSSL_add_all_algorithms();
+#    else
+    OPENSSL_init_crypto(
+        OPENSSL_INIT_LOAD_CRYPTO_STRINGS | OPENSSL_INIT_ADD_ALL_CIPHERS | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL);
+#    endif
+}
+
+#else
+void aws_crt_crypto_share(void) {}
+#endif