Revert "bazel: bump openssl"

This reverts commit e5fa962.
urbit · Sep 16, 2024 · 62e4cc2 · 62e4cc2
1 parent d8fba62
commit 62e4cc2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 18 deletions.
diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel
@@ -280,10 +280,10 @@ versioned_http_archive(
 versioned_http_archive(
     name = "openssl",
     build_file = "//bazel/third_party/openssl:openssl.BUILD",
-    sha256 = "777cd596284c883375a2a7a11bf5d2786fc5413255efab20c50d6ffe6d020b7e",
+    sha256 = "cf3098950cb4d853ad95c0841f1f9c6d3dc102dccfcacd521d93925208b76ac8",
     strip_prefix = "openssl-{version}",
-    url = "https://github.com/openssl/openssl/releases/download/openssl-{version}/openssl-{version}.tar.gz",
-    version = "3.3.1",
+    url = "https://github.com/openssl/openssl/releases/download/OpenSSL_1_1_1w/openssl-{version}.tar.gz",
+    version = "1.1.1w",
 )
 
 versioned_http_archive(

diff --git a/bazel/third_party/openssl/openssl.BUILD b/bazel/third_party/openssl/openssl.BUILD
@@ -17,8 +17,6 @@ configure_make(
     }),
     configure_options = [
         "no-shared",
-        "no-threads",
-        "-static",
     ] + select({
         "@//:linux_aarch64": [
             "linux-aarch64",
@@ -31,7 +29,7 @@ configure_make(
         ],
         "//conditions:default": [],
     }),
-    copts = ["-O0", "-g"],
+    copts = ["-O3"],
     lib_source = ":all",
     out_static_libs = [
         "libssl.a",

diff --git a/pkg/noun/manage.c b/pkg/noun/manage.c
@@ -2129,23 +2129,21 @@ _cm_signals(void)
 */
 static void*
 _cm_malloc_ssl(size_t len_i
-/* #if OPENSSL_VERSION_NUMBER >= 0x10100000L */
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
                , const char* file, int line
-/* #endif */
+#endif
                )
 {
-  void* ret = u3a_malloc(len_i);
-  u3l_log("alloc %p", ret);
-  return ret;
+  return u3a_malloc(len_i);
 }
 
 /* _cm_realloc_ssl(): openssl-shaped realloc.
 */
 static void*
 _cm_realloc_ssl(void* lag_v, size_t len_i
-/* #if OPENSSL_VERSION_NUMBER >= 0x10100000L */
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
                 , const char* file, int line
-/* #endif */
+#endif
                 )
 {
   return u3a_realloc(lag_v, len_i);
@@ -2155,14 +2153,12 @@ _cm_realloc_ssl(void* lag_v, size_t len_i
 */
 static void
 _cm_free_ssl(void* tox_v
-/* #if OPENSSL_VERSION_NUMBER >= 0x10100000L */
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
              , const char* file, int line
-/* #endif */
+#endif
              )
 {
-  u3l_log("free %p", tox_v);
-  u3a_free(tox_v);
-  return;
+  return u3a_free(tox_v);
 }
 
 extern void u3je_secp_init(void);