Add a debian package symcrypt-openssl-dbg

rules/symcrypt-openssl.mk

@@ -3,6 +3,6 @@
 SYMCRYPT_OPENSSL_VERSION = 0.1
 SYMCRYPT_OPENSSL = symcrypt-openssl_$(SYMCRYPT_OPENSSL_VERSION)_$(ARCH).deb
 $(SYMCRYPT_OPENSSL)_SRC_PATH = $(SRC_PATH)/SymCrypt-OpenSSL-Debian
-$(SYMCRYPT_OPENSSL)_MAKEFILE = Makefile
 
 MAIN_TARGETS += $(SYMCRYPT_OPENSSL)
+$(SYMCRYPT_OPENSSL)_DERIVED_DEBS += symcrypt-openssl-dbg_$(SYMCRYPT_OPENSSL_VERSION)_$(ARCH).deb

src/SymCrypt-OpenSSL-Debian/.gitignore

@@ -1 +1,2 @@
 tmp
+bin_*

src/SymCrypt-OpenSSL-Debian/debian/.gitignore

@@ -0,0 +1,8 @@
+/*.debhelper*
+/*substvars
+/build-deb
+/build-udeb
+/files
+/tmp
+/symcrypt-openssl
+/symcrypt-openssl-dbg

src/SymCrypt-OpenSSL-Debian/debian/changelog

@@ -0,0 +1,5 @@
+symcrypt-openssl (0.1) bullseye; urgency=medium
+
+  * Init the SymCrypt-OpenSSL package
+
+ -- Xuhui Miao <[email protected]>  Mon, 27 Dec 2021 17:43:39 +0100

src/SymCrypt-OpenSSL-Debian/debian/compat

@@ -0,0 +1 @@
+11

src/SymCrypt-OpenSSL-Debian/debian/control

@@ -1,9 +1,24 @@
+Source: symcrypt-openssl
+Section: libdevel
+Priority: optional
+Maintainer: SONiC <[email protected]>
+Build-Depends: debhelper (>= 9)
+
 Package: symcrypt-openssl
-Version: 0.1
-Section: devel
+Section: libdevel
 Priority: optional
-Architecture: all
+Architecture: any
 Depends: 
 Maintainer: SONiC <[email protected]>
 Description: symcrypt openssl
  Symcrypt Openssl Engine.
+
+Package: symcrypt-openssl-dbg
+Section: libdevel
+Architecture: any
+Priority: extra
+Depends:
+Maintainer: SONiC <[email protected]>
+Build-Depends: debhelper (>= 9)
+Description: symcrypt openssl
+ Symcrypt Openssl Engine.

src/SymCrypt-OpenSSL-Debian/debian/rules

@@ -0,0 +1,64 @@
+#!/usr/bin/make -f
+
+.ONESHELL:
+SHELL = /bin/bash
+.SHELLFLAGS += -e
+
+ARCH ?= amd64
+CMAKE_ARCH = AMD64
+LIB_INSTALL_NAME = x86_64-linux-gnu
+ifeq ($(ARCH), arm64)
+CMAKE_ARCH = ARM64
+LIB_INSTALL_NAME = aarch64-linux-gnu
+else ifeq ($(ARCH), armhf)
+CMAKE_ARCH = ARMHF
+LIB_INSTALL_NAME = arm-linux-gnueabihf 
+endif
+
+pn = symcrypt-openssl
+pn_dbg = $(pn)-dbg
+
+
+DEST ?= ../../target
+#LIBSYMCRYPT = $(DEST)/libsymcrypt.so
+#LIBSYMCRYPTENGINE = $(DEST)/libsymcryptengine.so
+
+LIBSYMCRYPT = bin_sym/module/$(CMAKE_ARCH)/LinuxUserMode/generic_linux/libsymcrypt.so
+LIBSYMCRYPTENGINE = bin_eng/SymCryptEngine/dynamic/libsymcryptengine.so
+
+clean:
+	rm bin_* -rf
+	rm debian/symcrypt-openssl -rf
+	rm debian/symcrypt-openssl-dbg -rf
+
+$(LIBSYMCRYPT):
+	mkdir -p bin_sym
+	cd bin_sym
+	cmake -DCMAKE_BUILD_TYPE=Release ../../SymCrypt -DCMAKE_TOOLCHAIN_FILE=../../SymCrypt/cmake-toolchain/LinuxUserMode-$(CMAKE_ARCH).cmake
+	cmake --build .
+
+$(LIBSYMCRYPTENGINE): $(LIBSYMCRYPT)
+	cp $(LIBSYMCRYPT) ../SymCrypt-OpenSSL/
+	ln -sf $(shell pwd)/../SymCrypt ~/SymCrypt
+	mkdir -p bin_eng
+	cd bin_eng
+	cmake ../../SymCrypt-OpenSSL -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../../SymCrypt-OpenSSL/cmake-toolchain/LinuxUserMode-$(CMAKE_ARCH).cmake
+	cmake --build .
+
+build: $(LIBSYMCRYPTENGINE)
+	mkdir -p debian/symcrypt-openssl/usr/lib/$(LIB_INSTALL_NAME)
+	mkdir -p debian/symcrypt-openssl/usr/lib/ssl
+	cp $(LIBSYMCRYPT) $(LIBSYMCRYPTENGINE) debian/symcrypt-openssl/usr/lib/$(LIB_INSTALL_NAME)/
+	chmod 644 debian/symcrypt-openssl/usr/lib/$(LIB_INSTALL_NAME)/*
+	cp openssl.cnf debian/symcrypt-openssl/usr/lib/ssl/symcrypt-openssl.cnf
+
+install: build
+	dh_installdeb
+
+binary-arch: build install
+	# Exclude to strip the libsymcrypt.so, core dump error if stripped
+	dh_strip -a -N$(pn_dbg) -Xlibsymcrypt.so -Xdebug -Xdbg --dbg-package=$(pn_dbg)
+
+binary: binary-arch
+	dh_gencontrol
+	dh_builddeb

src/SymCrypt-OpenSSL-Debian/debian/postinst → src/SymCrypt-OpenSSL-Debian/debian/symcrypt-openssl.postinst

@@ -16,9 +16,9 @@ case "$1" in
     ;;
 esac
 
-if [ -f "/usr/lib/ssl/openssl.cnf" ]; then
+if [ -f "/usr/lib/ssl/openssl.cnf" ] && ! grep -q symcryptengine /usr/lib/ssl/openssl.cnf; then
     echo "Move to the old /usr/lib/ssl/openssl.cnf to /usr/lib/ssl/openssl.cnf.bk"
     mv -f /usr/lib/ssl/openssl.cnf /usr/lib/ssl/openssl.cnf.bk
 fi
 
-mv -f /usr/lib/ssl/openssl-fips.cnf /usr/lib/ssl/openssl.cnf
+mv -f /usr/lib/ssl/symcrypt-openssl.cnf /usr/lib/ssl/openssl.cnf