OS-8379 Bump OpenSSL to 3.0.3

Reviewed by: Brian Bennett <[email protected]>
TritonDataCenter · May 12, 2022 · bb57106 · bb57106
1 parent b3538f2
commit bb57106
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/openssl3/Makefile b/openssl3/Makefile
@@ -20,9 +20,10 @@
 #
 # Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2022 Joyent, Inc.
+# Copyright 2022 MNX Cloud, Inc.
 #
 
-VER = openssl-3.0.2
+VER = openssl-3.0.3
 LIBVER =	3
 
 include ../Makefile.defs

diff --git a/openssl3/openssl-3.0.2.tar.gz → openssl3/openssl-3.0.3.tar.gz b/openssl3/openssl-3.0.2.tar.gz → openssl3/openssl-3.0.3.tar.gz
diff --git a/openssl3/sunw_prefix.h b/openssl3/sunw_prefix.h
@@ -2818,8 +2818,10 @@
 #pragma redefine_extname	OPENSSL_sk_unshift sunw_OPENSSL_sk_unshift
 #pragma redefine_extname	OPENSSL_sk_value sunw_OPENSSL_sk_value
 #pragma redefine_extname	OPENSSL_sk_zero sunw_OPENSSL_sk_zero
+#pragma redefine_extname	OPENSSL_strcasecmp sunw_OPENSSL_strcasecmp
 #pragma redefine_extname	OPENSSL_strlcat sunw_OPENSSL_strlcat
 #pragma redefine_extname	OPENSSL_strlcpy sunw_OPENSSL_strlcpy
+#pragma redefine_extname	OPENSSL_strncasecmp sunw_OPENSSL_strncasecmp
 #pragma redefine_extname	OPENSSL_strnlen sunw_OPENSSL_strnlen
 #pragma redefine_extname	OPENSSL_thread_stop sunw_OPENSSL_thread_stop
 #pragma redefine_extname	OPENSSL_thread_stop_ex sunw_OPENSSL_thread_stop_ex

diff --git a/openssl3/tools/checksyms.bash b/openssl3/tools/checksyms.bash
@@ -26,8 +26,8 @@ ALLOWED_FUNCS="_init _fini"
 ALLOWED_SYMS="_DYNAMIC _edata _end _etext _fini _GLOBAL_OFFSET_TABLE_"
 ALLOWED_SYMS="$ALLOWED_SYMS _init _lib_version _PROCEDURE_LINKAGE_TABLE_"
 # Because we let OpenSSL 3 do the library renaming, it includes this in the
-# symbol list.
-ALLOWED_SYMS="$ALLOWED_SYMS OPENSSL_SMARTOS_3.0.0"
+# symbol list. OpenSSL 3 will be adding to this as it adds new symbols.
+ALLOWED_SYMS="$ALLOWED_SYMS OPENSSL_SMARTOS_3.0.0 OPENSSL_SMARTOS_3.0.3"
 
 NM=/usr/bin/nm
 PREFIX="^sunw_"