add Rutoken PKCS11 keys support

Thanks to:
https://aur.archlinux.org/packages/cryptopro-csp-k1#comment-936263

3 files changed, 46 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 61445e646f78..6d9d269d50a7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = cryptopro-csp-k1
 	pkgdesc = CryptoPro CSP 5.0
 	pkgver = 5.0.12900
-	pkgrel = 2
+	pkgrel = 3
 	url = https://cryptopro.ru/products/cryptopro-csp
 	install = cryptopro-csp-k1.install
 	arch = x86_64
@@ -19,6 +19,7 @@ pkgbase = cryptopro-csp-k1
 	depends = libxml2
 	depends = ccid
 	depends = acsccid
+	optdepends = rutoken-plugin: Rutoken PKCS11 keys support
 	options = !strip
 	source = linux-amd64.tgz::local://linux-amd64.tgz
 	sha256sums = 075c0198eb6e5bcdcec0758f1c6e4d1203fdd789ae71fadb80c478fcbe3f2c01
diff --git a/PKGBUILD b/PKGBUILD
index 087284f4b72e..760e5747f614 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -26,7 +26,7 @@
 
 pkgname="cryptopro-csp-k1"
 pkgver=5.0.12900
-pkgrel=2
+pkgrel=3
 _pkgver_patch="7"
 _cades_version="2.0.14892"
 _pkgver="$pkgver-$_pkgver_patch"
@@ -48,6 +48,9 @@ depends=(
     'ccid'
     'acsccid'
 )
+optdepends=(
+    'rutoken-plugin: Rutoken PKCS11 keys support'
+)
 makedepends=(
     'libarchive'
 )
@@ -70,6 +73,8 @@ package() {
     bsdtar -xf "cprocsp-rdr-pcsc-64-${_pkgver}.x86_64.rpm" -C "$pkgdir"
     bsdtar -xf "cprocsp-rdr-jacarta-64-${_pkgver}.x86_64.rpm" -C "$pkgdir"
     bsdtar -xf "cprocsp-rdr-rutoken-64-${_pkgver}.x86_64.rpm" -C "$pkgdir"
+    bsdtar -xf "cprocsp-rdr-cpfkc-64-${_pkgver}.x86_64.rpm" -C "$pkgdir"
+    bsdtar -xf "cprocsp-rdr-cryptoki-64-${_pkgver}.x86_64.rpm" -C "$pkgdir"
     bsdtar -xf "cprocsp-cptools-gtk-64-${_pkgver}.x86_64.rpm" -C "$pkgdir"
     bsdtar -xf "cprocsp-rdr-cloud-64-${_pkgver}.x86_64.rpm" -C "$pkgdir"
     bsdtar -xf "lsb-cprocsp-devel-${_pkgver}.noarch.rpm" -C "$pkgdir"
@@ -84,4 +89,5 @@ package() {
 
     mkdir -p "$pkgdir/etc/ld.so.conf.d/"
     echo "/opt/cprocsp/lib/amd64" > "$pkgdir/etc/ld.so.conf.d/cryptopro-csp-k1.conf"
+    echo "/usr/lib/mozilla/plugins" >> "$pkgdir/etc/ld.so.conf.d/cryptopro-csp-k1.conf"
 }
diff --git a/cryptopro-csp-k1.install b/cryptopro-csp-k1.install
index 32cbccb3d385..aaea98a37a0d 100644
--- a/cryptopro-csp-k1.install
+++ b/cryptopro-csp-k1.install
@@ -508,6 +508,43 @@ post_install() {
     cpconfig -hardware media -configure RutokenNFC -connect Default -add long size_6 300
     cpconfig -hardware media -configure RutokenNFC -connect Default -add long size_7 8
 
+    # cprocsp-rdr-cpfkc
+    cpconfig -ini '\config\apppath' -add string librdrcpfkc.so /opt/cprocsp/lib/amd64/librdrcpfkc.so
+    cpconfig -ini '\config\KeyCarriers\rutokenfkc' -add string DLL librdrcpfkc.so
+    cpconfig -ini '\config\KeyCarriers\rutokenfkc_nfc' -add string DLL librdrcpfkc.so
+    cpconfig -ini '\config\KeyCarriers\smartparkfkc' -add string DLL librdrcpfkc.so
+    cpconfig -hardware media -add rutokenfkc -name 'rutokenfkc' > /dev/null
+    cpconfig -hardware media -configure rutokenfkc -connect Default -add hex atr 3b8b015275746f6b656e20445320c1
+    cpconfig -hardware media -configure rutokenfkc -connect Default -add hex mask ffffffffffffffffffffffffffffff
+    cpconfig -hardware media -configure rutokenfkc -connect Default -add string Name 'Rutoken FKC'
+    cpconfig -hardware media -add rutokenfkc_nfc -name 'rutokenfkc_nfc' > /dev/null
+    cpconfig -hardware media -configure rutokenfkc_nfc -connect Default -add hex atr 3B88800152745343778183206A
+    cpconfig -hardware media -configure rutokenfkc_nfc -connect Default -add hex mask ffffffffffffffffffffffffff
+    cpconfig -hardware media -configure rutokenfkc_nfc -connect Default -add string Name 'Rutoken FKC NFC'
+    cpconfig -hardware media -configure rutokenfkc_nfc -connect Contact -add hex atr 3B9C968011405275746F6B656E4543507363C0
+    cpconfig -hardware media -configure rutokenfkc_nfc -connect Contact -add hex mask fffffefffffffffffffffffffffffffffffffe
+    cpconfig -hardware media -configure rutokenfkc_nfc -connect Contact -add string Name 'Rutoken FKC NFC'
+    cpconfig -hardware media -add smartparkfkc -name 'smartparkfkc' > /dev/null
+    cpconfig -hardware media -configure smartparkfkc -connect Default -add hex atr 00000000534D4152545041524B20464B43
+    cpconfig -hardware media -configure smartparkfkc -connect Default -add hex mask 00000000ffffffffffffffffffffffffff
+    cpconfig -hardware media -configure smartparkfkc -connect Default -add string Name 'SmartPark FKC'
+    cpconfig -hardware media -configure smartparkfkc -connect Combi -add hex atr 3B9E00008031C0654D4700000272F7418107
+    cpconfig -hardware media -configure smartparkfkc -connect Combi -add hex mask FFFF0000FFFFFFFFFFFF300002FFFFFFFFFF
+    cpconfig -hardware media -configure smartparkfkc -connect Combi -add string Name 'SmartPark FKC Combi'
+
+    # cprocsp-rdr-cryptoki
+    cpconfig -ini '\config\apppath' -add string librdrcryptoki.so /opt/cprocsp/lib/amd64/librdrcryptoki.so
+    cpconfig -ini '\config\KeyDevices\cryptoki_rutoken' -add long Group 1
+    cpconfig -ini '\config\KeyDevices\cryptoki_rutoken' -add string DLL librdrcryptoki.so
+    cpconfig -ini '\config\KeyDevices\cryptoki_rutoken\PNP cryptoki\Default' -add string pkcs11_dll librtpkcs11ecp.so
+    cpconfig -ini '\config\KeyDevices\cryptoki_esmart' -add long Group 1
+    cpconfig -ini '\config\KeyDevices\cryptoki_esmart' -add string DLL librdrcryptoki.so
+    cpconfig -ini '\config\KeyDevices\cryptoki_esmart\PNP cryptoki\Default' -add string pkcs11_dll libisbc_pkcs11_main.so
+    cpconfig -ini '\config\KeyDevices\cryptoki_jacarta' -add long Group 1
+    cpconfig -ini '\config\KeyDevices\cryptoki_jacarta' -add string DLL librdrcryptoki.so
+    cpconfig -ini '\config\KeyDevices\cryptoki_jacarta\PNP cryptoki\Default' -add string pkcs11_dll libjcPKCS11-2.so
+    cpconfig -ini '\config\debug' -add long cryptoki 1
+
     # cprocsp-rdr-cloud-64
     cpconfig -ini '\config\apppath' -add string librdrcloud.so /opt/cprocsp/lib/amd64/librdrcloud.so
     cpconfig -ini '\config\KeyDevices\Cloud' -add string DLL librdrcloud.so