From 2e087e6e0f04179fa4f4d5f473ac73185dec612d Mon Sep 17 00:00:00 2001
From: fr4nk2 <guyvwang@163.com>
Date: Mon, 13 Feb 2023 22:31:32 +0800
Subject: [PATCH] Enable pkcs11 support

---
 0001-PATCH-pkcs11_test_fix.patch | 98 ++++++++++++++++++++++++++++++++
 libssh.spec                      | 15 ++++-
 2 files changed, 110 insertions(+), 3 deletions(-)
 create mode 100644 0001-PATCH-pkcs11_test_fix.patch

diff --git a/0001-PATCH-pkcs11_test_fix.patch b/0001-PATCH-pkcs11_test_fix.patch
new file mode 100644
index 0000000..915283b
--- /dev/null
+++ b/0001-PATCH-pkcs11_test_fix.patch
@@ -0,0 +1,98 @@
+diff --git a/tests/pkcs11/setup-softhsm-tokens.sh b/tests/pkcs11/setup-softhsm-tokens.sh
+index 532c86a7..9050cea6 100755
+--- a/tests/pkcs11/setup-softhsm-tokens.sh
++++ b/tests/pkcs11/setup-softhsm-tokens.sh
+@@ -17,10 +17,10 @@ echo "OBJNAME: $OBJNAME"
+ echo "LOADPUBLIC: $LOADPUBLIC"
+ 
+ # Create temporary directory for tokens
+-install -d -m 0755 $TESTDIR/db
++install -d -m 0755 "$TESTDIR/db"
+ 
+ # Create SoftHSM configuration file
+-cat >$TESTDIR/softhsm.conf <<EOF
++cat >"$TESTDIR/softhsm.conf" <<EOF
+ directories.tokendir = $TESTDIR/db
+ objectstore.backend = file
+ log.level = DEBUG
+@@ -28,12 +28,12 @@ EOF
+ 
+ export SOFTHSM2_CONF=$TESTDIR/softhsm.conf
+ 
+-cat $TESTDIR/softhsm.conf
++cat "$TESTDIR/softhsm.conf"
+ 
+ #init
+-cmd='softhsm2-util --init-token --label "$OBJNAME" --free --pin 1234 --so-pin 1234'
++cmd="softhsm2-util --init-token --label $OBJNAME --free --pin 1234 --so-pin 1234"
+ eval echo "$cmd"
+-out=$(eval $cmd)
++out=$(eval "$cmd")
+ ret=$?
+ if [ $ret -ne 0 ]; then
+     echo "Init token failed"
+@@ -41,10 +41,29 @@ if [ $ret -ne 0 ]; then
+     exit 1
+ fi
+ 
++find_library_path() {
++    echo "$@"
++    for _lib in "$@" ; do
++        if test -f "$_lib" ; then
++            LIBSOFTHSM_PATH="$_lib"
++            echo "Using libsofthsm path: $LIBSOFTHSM_PATH"
++            return
++        fi
++    done
++    echo "libsofthsm2.so not found"
++    exit 1
++}
++
++find_library_path \
++    /usr/lib64/libsofthsm2.so \
++    /usr/lib/libsofthsm2.so \
++    /usr/local/lib/softhsm/libsofthsm2.so \
++    /usr/lib/x86_64-linux-gnu/softhsm/libsofthsm2.so
++
+ #load private key
+-cmd='p11tool --provider /usr/lib64/pkcs11/libsofthsm2.so --write --load-privkey "$PRIVKEY" --label "$OBJNAME" --login --set-pin=1234 "pkcs11:token="$OBJNAME""'
++cmd="p11tool --provider $LIBSOFTHSM_PATH --write --load-privkey $PRIVKEY --label $OBJNAME --login --set-pin=1234 \"pkcs11:token=$OBJNAME\""
+ eval echo "$cmd"
+-out=$(eval $cmd)
++out=$(eval "$cmd")
+ ret=$?
+ if [ $ret -ne 0 ]; then
+    echo "Loading privkey failed"
+@@ -52,15 +71,15 @@ if [ $ret -ne 0 ]; then
+    exit 1
+ fi
+ 
+-cat $PUBKEY
++cat "$PUBKEY"
+ 
+-ls -l $TESTDIR
++ls -l "$TESTDIR"
+ 
+-if [ $LOADPUBLIC -ne 0 ]; then
++if [ "$LOADPUBLIC" -ne 0 ]; then
+ #load public key
+-    cmd='p11tool --provider /usr/lib64/pkcs11/libsofthsm2.so --write --load-pubkey "$PUBKEY" --label "$OBJNAME" --login --set-pin=1234 "pkcs11:token="$OBJNAME""'
++    cmd="p11tool --provider $LIBSOFTHSM_PATH --write --load-pubkey $PUBKEY --label $OBJNAME --login --set-pin=1234 \"pkcs11:token=$OBJNAME\""
+     eval echo "$cmd"
+-    out=$(eval $cmd)
++    out=$(eval "$cmd")
+     ret=$?
+     if [ $ret -ne 0 ]; then
+         echo "Loading pubkey failed"
+@@ -69,9 +88,9 @@ if [ $LOADPUBLIC -ne 0 ]; then
+     fi
+ fi
+ 
+-cmd='p11tool --list-all --login "pkcs11:token="$OBJNAME"" --set-pin=1234'
++cmd="p11tool --list-all --login \"pkcs11:token=$OBJNAME\" --set-pin=1234"
+ eval echo "$cmd"
+-out=$(eval $cmd)
++out=$(eval "$cmd")
+ ret=$?
+ if [ $ret -ne 0 ]; then
+     echo "Loging failed"
diff --git a/libssh.spec b/libssh.spec
index fe0c911..e83da11 100644
--- a/libssh.spec
+++ b/libssh.spec
@@ -1,4 +1,5 @@
-%define anolis_release 2
+%define anolis_release 3
+
 Name:           libssh
 Version:        0.10.4
 Release:        %{anolis_release}%{?dist}
@@ -12,6 +13,8 @@ Source2:        https://cryptomilk.org/gpgkey-8DFF53E18F2ABC8D8F3C92237EE0FC4DCC
 Source3:        libssh_client.config
 Source4:        libssh_server.config
 
+PATCH0001:      0001-PATCH-pkcs11_test_fix.patch
+
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  gnupg2
@@ -27,12 +30,15 @@ BuildRequires:  uid_wrapper
 BuildRequires:  openssh-clients
 BuildRequires:  openssh-server
 BuildRequires:  nmap-ncat
+BuildRequires:  openssl-pkcs11
+BuildRequires:  softhsm
+BuildRequires:  gnutls-utils
 
 Requires:       %{name}-config = %{version}-%{release}
 
 Recommends:     crypto-policies
 
-Provides: libssh_threads.so.4()(64bit)
+Provides:       libssh_threads.so.4()(64bit)
 
 %description
 The ssh library was designed to be used by programmers needing a working SSH
@@ -44,7 +50,7 @@ third-party programs others than libcrypto (from openssl).
 
 %package doc
 Summary:        Documentation files for %{name}
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = %{EVR}
 BuildArch:      noarch
 
 %description    doc
@@ -142,6 +148,9 @@ popd
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/libssh/libssh_server.config
 
 %changelog
+* Mon Feb 13 2023 Guyu Wang <guyu.wgy@linux.alibaba.com> - 0.10.4-3
+- Enable pkcs11 support
+
 * Thu Oct 20 2022 mgb01105731 <mgb01105731@alibaba-inc.com> - 0.10.4-2
 - optimise spec file
 
-- 
Gitee