update cryptopro to version 5.0.12330, update browser plugin to version 2.0.14458

4 files changed, 81 insertions, 60 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d37ba0de3da0..4b48dbb92e09 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = cryptopro-csp-k1
 	pkgdesc = CryptoPro CSP 5.0
-	pkgver = 5.0.12222
+	pkgver = 5.0.12330
 	pkgrel = 2
 	url = https://cryptopro.ru/products/cryptopro-csp
 	install = cryptopro-csp-k1.install
@@ -21,8 +21,8 @@ pkgbase = cryptopro-csp-k1
 	depends = acsccid
 	options = !strip
 	source = linux-amd64.tgz
-	source = https://www.cryptopro.ru/sites/default/files/products/cades/current_release_2_0/cades_linux_amd64.tar.gz
-	sha256sums = b7229c7884ea5340b10ecc3e11c378a69c4ef9d8266e0a96a1f087082481026e
-	sha256sums = 5eef8664765a08c2354248289a3c232adf1a4596fedb520460877fe7e2c295ec
+	source = cades_linux_amd64.tar.gz
+	sha256sums = 51ccdbb330d8c5f8ec4566bb72bd85fc0daecf7b47bed6c6c1af84879a20b1e1
+	sha256sums = f0c9e288620f85b7ee175d31cefacd73434632d5a07fab1e5cc25847de78bcaa
 
 pkgname = cryptopro-csp-k1
diff --git a/PKGBUILD b/PKGBUILD
index e17ff5a5a0da..ebca498416f3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Platon Pronko < platon7pronko at gmail dot com >
 
 pkgname="cryptopro-csp-k1"
-pkgver=5.0.12222
+pkgver=5.0.12330
 # pkgver is not allowed to contain forward slashes
 _pkgver_patch="6"
 _pkgver="$pkgver-$_pkgver_patch"
@@ -28,11 +28,11 @@ makedepends=(
     'libarchive'
 )
 source=(
-    'linux-amd64.tgz' # download from https://cryptopro.ru/sites/default/files/private/csp/50/12222/linux-amd64.tgz
-    'https://www.cryptopro.ru/sites/default/files/products/cades/current_release_2_0/cades_linux_amd64.tar.gz'
+    'linux-amd64.tgz' # download from https://cryptopro.ru/sites/default/files/private/csp/50/12330/linux-amd64.tgz
+    'cades_linux_amd64.tar.gz' # download from https://www.cryptopro.ru/products/cades/plugin
 )
-sha256sums=('b7229c7884ea5340b10ecc3e11c378a69c4ef9d8266e0a96a1f087082481026e'
-            '5eef8664765a08c2354248289a3c232adf1a4596fedb520460877fe7e2c295ec')
+sha256sums=('51ccdbb330d8c5f8ec4566bb72bd85fc0daecf7b47bed6c6c1af84879a20b1e1'
+            'f0c9e288620f85b7ee175d31cefacd73434632d5a07fab1e5cc25847de78bcaa')
 install=cryptopro-csp-k1.install
 options=(!strip)
 
@@ -46,16 +46,15 @@ package() {
     bsdtar -xf "lsb-cprocsp-pkcs11-64-${_pkgver}.x86_64.rpm" -C "$pkgdir"
     bsdtar -xf "cprocsp-rdr-gui-gtk-64-${_pkgver}.x86_64.rpm" -C "$pkgdir"
     bsdtar -xf "cprocsp-rdr-pcsc-64-${_pkgver}.x86_64.rpm" -C "$pkgdir"
-    bsdtar -xf "cprocsp-rdr-jacarta-64-5.0.0.1237-4.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-cptools-gtk-64-${_pkgver}.x86_64.rpm" -C "$pkgdir"
 
-    cd "$srcdir/cades_linux_amd64"
-    bsdtar -xf "cprocsp-pki-cades-64-2.0.14368-1.amd64.rpm" -C "$pkgdir"
-    bsdtar -xf "cprocsp-pki-plugin-64-2.0.14368-1.amd64.rpm" -C "$pkgdir"
+    cd "$srcdir"
+    bsdtar -xf "cprocsp-pki-cades-64-2.0.14458-1.amd64.rpm" -C "$pkgdir"
+    bsdtar -xf "cprocsp-pki-plugin-64-2.0.14458-1.amd64.rpm" -C "$pkgdir"
 
     rm -r "$pkgdir/etc/init.d/"
-    mv "$pkgdir/tmp/" "$pkgdir/opt/cprocsp/tmp/"
     rm -r "$pkgdir/usr/lib64/"
 
     mkdir -p "$pkgdir/etc/ld.so.conf.d/"
diff --git a/cades_linux_amd64.tar.gz b/cades_linux_amd64.tar.gz
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/cades_linux_amd64.tar.gz
diff --git a/cryptopro-csp-k1.install b/cryptopro-csp-k1.install
index bb87340be954..b1bb6d3935b8 100644
--- a/cryptopro-csp-k1.install
+++ b/cryptopro-csp-k1.install
@@ -275,7 +275,7 @@ post_install() {
                         ccid_reg.sh -add $pList 0x2fb0 0x0004 "Infocrypt Token++ - CP"
                         ccid_reg.sh -add $pList 0x2fb0 0x0006 "Infocrypt Token++ lite - CP"
                         ccid_reg.sh -add $pList 0x2fb0 0x0008 "Infocrypt Token++ lite - CP"
-                        ccid_reg.sh -add $pList 0x2fb0 0x003a "Infocrypt Token++ lite - CP"
+                        ccid_reg.sh -add $pList 0x2fb0 0x003a "Infocrypt Token++ - CP"
                         ccid_reg.sh -add $pList 0x2022 0x078a "Infocrypt HWDSSL DEVICE - CP"
                         ccid_reg.sh -add $pList 0x2022 0x016c "Infocrypt HWDSSL DEVICE - CP"
                         ccid_reg.sh -add $pList 0x2022 0x0172 "Infocrypt HWDSSL DEVICE - CP"
@@ -289,6 +289,14 @@ post_install() {
                         ccid_reg.sh -add $pList 0x23a0 0x0008 "BIFIT ANGARA - CP"
                         ccid_reg.sh -add $pList 0x1fc9 0x7479 "ISBC ESMART reader - CP"
                         ccid_reg.sh -add $pList 0x2ce4 0x7479 "ESMART Token - CP"
+                        ccid_reg.sh -add $pList 0x24DC 0x0101 "Aladdin R.D. JaCarta"
+                        ccid_reg.sh -add $pList 0x24DC 0x0402 "Aladdin R.D. JaCarta"
+                        ccid_reg.sh -add $pList 0x24DC 0x0406 "Aladdin JaCarta SF GOST"
+                        ccid_reg.sh -add $pList 0x24DC 0x0409 "Aladdin JaCarta-2 SF"
+                        ccid_reg.sh -add $pList 0x24DC 0x040D "Aladdin JaCarta SF"
+                        ccid_reg.sh -add $pList 0x24DC 0x04FF "Aladdin JaCarta SF GOST"
+                        ccid_reg.sh -add $pList 0x24DC 0x100F "Aladdin R.D. JaCarta Flash"
+                        ccid_reg.sh -add $pList 0x0529 0x0620 "eToken PRO Java 72K OS755"
                     done
                 fi
             fi
@@ -296,51 +304,65 @@ post_install() {
     fi
 
     # cprocsp-rdr-jacarta-64
-    cpconfig -ini '\config\apppath' -add string librdrjacarta.so.5.0.0 /opt/cprocsp/lib/amd64/librdrjacarta.so.5.0.0
-
-    cpconfig -ini '\config\KeyCarriers\eToken_PRO16' -add string DLL librdrjacarta.so.5.0.0
-    cpconfig -ini '\config\KeyCarriers\eToken_PRO32' -add string DLL librdrjacarta.so.5.0.0
-    cpconfig -ini '\config\KeyCarriers\eToken_PRO_M420' -add string DLL librdrjacarta.so.5.0.0
-    cpconfig -ini '\config\KeyCarriers\eToken_PRO_M420B' -add string DLL librdrjacarta.so.5.0.0
-    cpconfig -ini '\config\KeyCarriers\eToken_JAVA_10' -add string DLL librdrjacarta.so.5.0.0
-    cpconfig -ini '\config\KeyCarriers\eToken_JAVA_10B' -add string DLL librdrjacarta.so.5.0.0
-    cpconfig -ini '\config\KeyCarriers\JaCarta' -add string DLL librdrjacarta.so.5.0.0
-    cpconfig -ini '\config\KeyCarriers\JaCarta_LT' -add string DLL librdrjacarta.so.5.0.0
-
-    cpconfig -hardware media -add eToken_PRO16 -name 'Aladdin R.D. eToken Pro 16K' > /dev/null
-    cpconfig -hardware media -configure eToken_PRO16 -add hex atr 3be200ffc11031fe55c8029c
-    cpconfig -hardware media -configure eToken_PRO16 -add hex mask ffffffffffffffffffffffff
-    cpconfig -hardware media -configure eToken_PRO16 -add string folders "CC00\\CC01\\CC02\\CC03\\CC04\\CC05\\CC06\\CC07\\CC08\\CC09"
-    cpconfig -hardware media -add eToken_PRO32 -name 'Aladdin R.D. eToken Pro 32K' > /dev/null
-    cpconfig -hardware media -configure eToken_PRO32 -add hex atr 3bf29800ffc11031fe55c80315
-    cpconfig -hardware media -configure eToken_PRO32 -add hex mask ffffffffffffffffffffffffff
-    cpconfig -hardware media -configure eToken_PRO32 -add string folders "CC00\\CC01\\CC02\\CC03\\CC04\\CC05\\CC06\\CC07\\CC08\\CC09"
-    cpconfig -hardware media -add eToken_PRO_M420 -name 'Aladdin R.D. eToken Pro M420' > /dev/null
-    cpconfig -hardware media -configure eToken_PRO_M420 -add hex atr 3bf2180000c10a31fe55c80600
-    cpconfig -hardware media -configure eToken_PRO_M420 -add hex mask ffffffff00ffffffffffffff00
-    cpconfig -hardware media -configure eToken_PRO_M420 -add string folders "CC00\\CC01\\CC02\\CC03\\CC04\\CC05\\CC06\\CC07\\CC08\\CC09"
-    cpconfig -hardware media -add eToken_PRO_M420B -name 'Aladdin R.D. eToken Pro M420b' > /dev/null
-    cpconfig -hardware media -configure eToken_PRO_M420B -add hex atr 3bf2180002c10a31fe58c80975
-    cpconfig -hardware media -configure eToken_PRO_M420B -add hex mask ffffffffffffffffffffffffff
-    cpconfig -hardware media -configure eToken_PRO_M420B -add string folders "CC00\\CC01\\CC02\\CC03\\CC04\\CC05\\CC06\\CC07\\CC08\\CC09"
-    cpconfig -hardware media -add eToken_JAVA_10 -name 'Aladdin R.D. eToken Java v1.0' > /dev/null
-    cpconfig -hardware media -configure eToken_JAVA_10 -add hex atr 3bd518008131fe7d8073c82110f4
-    cpconfig -hardware media -configure eToken_JAVA_10 -add hex mask ffffffffffffffffffffffffffff
-    cpconfig -hardware media -configure eToken_JAVA_10 -add string folders "CC00\\CC01\\CC02\\CC03\\CC04\\CC05\\CC06\\CC07\\CC08\\CC09"
-    cpconfig -hardware media -add eToken_JAVA_10B -name 'Aladdin R.D. eToken Java v1.0b' > /dev/null
-    cpconfig -hardware media -configure eToken_JAVA_10B -add hex atr 3bd5180081313a7d8073c8211030
-    cpconfig -hardware media -configure eToken_JAVA_10B -add hex mask ffffffffffffffffffffffffffff
-    cpconfig -hardware media -configure eToken_JAVA_10B -add string folders "CC00\\CC01\\CC02\\CC03\\CC04\\CC05\\CC06\\CC07\\CC08\\CC09"
-    cpconfig -hardware media -add JaCarta -name 'Aladdin R.D. JaCarta' > /dev/null
-    cpconfig -hardware media -configure JaCarta -add hex atr 3bdc18ff8191fe1fc38073c821136601061159000128
-    cpconfig -hardware media -configure JaCarta -add hex mask ffffffffffffffffffffffffffffffffffffffffffff
-    cpconfig -hardware media -configure JaCarta -add string folders "CC00\\CC01\\CC02\\CC03\\CC04\\CC05\\CC06\\CC07\\CC08\\CC09"
-    cpconfig -hardware media -add JaCarta_LT -name 'Aladdin R.D. JaCarta LT' > /dev/null
-    cpconfig -hardware media -configure JaCarta_LT -add hex atr 3bdc18ff8111fe8073c82113660106013080018d
-    cpconfig -hardware media -configure JaCarta_LT -add hex mask ffffffffffffffffffffffffffffffffffffffff
-    cpconfig -hardware media -configure JaCarta_LT -add string folders "CC00\\CC01\\CC02\\CC03\\CC04\\CC05\\CC06\\CC07\\CC08\\CC09"
-
-    bash /opt/cprocsp/tmp/PLIST-csp/Linux/update_all_plists.sh >/dev/null 2>&1
+    LIBNAME=librdrjacarta
+
+    cpconfig -ini '\config\apppath' -add string $LIBNAME.so /opt/cprocsp/lib/amd64/$LIBNAME.so
+
+    NAME="jacarta"
+    cpconfig -ini "\config\KeyCarriers\\$NAME" -add string DLL $LIBNAME.so
+    cpconfig -hardware media -add $NAME -name 'Aladdin R.D. JaCarta' > /dev/null
+    cpconfig -hardware media -configure $NAME -add hex atr 3bdc18ff8191fe1fc38073c821136601061159000128
+    cpconfig -hardware media -configure $NAME -add hex mask ffffffffffffffffffffffffffffffffffffffffffff
+    cpconfig -hardware media -configure $NAME -add string folders 'CC00\CC01\CC02\CC03\CC04\CC05\CC06\CC07\CC08\CC09'
+
+    NAME="jacarta_lt"
+    cpconfig -ini "\config\KeyCarriers\\$NAME" -add string DLL $LIBNAME.so
+    cpconfig -hardware media -add $NAME -name 'Aladdin R.D. JaCarta LT' > /dev/null
+    cpconfig -hardware media -configure $NAME -add hex atr 3bdc18ff8111fe8073c82113660106013080018d
+    cpconfig -hardware media -configure $NAME -add hex mask ffffffffffffffffffffffffffffffffffffffff
+    cpconfig -hardware media -configure $NAME -add string folders 'CC00\CC01\CC02\CC03\CC04\CC05\CC06\CC07\CC08\CC09'
+
+    NAME="eToken_JAVA_10"
+    cpconfig -ini "\config\KeyCarriers\\$NAME" -add string DLL $LIBNAME.so
+    cpconfig -hardware media -add $NAME -name 'Aladdin R.D. eToken Java' > /dev/null
+    cpconfig -hardware media -configure $NAME -add hex atr 3bd518008131fe7d8073c82110f4
+    cpconfig -hardware media -configure $NAME -add hex mask ffffffffffffffffffffffffffff
+    cpconfig -hardware media -configure $NAME -add string folders 'CC00\CC01\CC02\CC03\CC04\CC05\CC06\CC07\CC08\CC09'
+
+    NAME="eToken_JAVA_10b"
+    cpconfig -ini "\config\KeyCarriers\\$NAME" -add string DLL $LIBNAME.so
+    cpconfig -hardware media -add $NAME -name 'Aladdin R.D. eToken Java' > /dev/null
+    cpconfig -hardware media -configure $NAME -add hex atr 3bd5180081313a7d8073c8211030
+    cpconfig -hardware media -configure $NAME -add hex mask ffffffffffffffffffffffffffff
+    cpconfig -hardware media -configure $NAME -add string folders 'CC00\CC01\CC02\CC03\CC04\CC05\CC06\CC07\CC08\CC09'
+
+    NAME="eToken_PRO16"
+    cpconfig -ini "\config\KeyCarriers\\$NAME" -add string DLL $LIBNAME.so
+    cpconfig -hardware media -add $NAME -name 'Aladdin R.D. eToken Pro 16K' > /dev/null
+    cpconfig -hardware media -configure $NAME -add hex atr 3be200ffc11031fe55c8029c                                               
+    cpconfig -hardware media -configure $NAME -add hex mask ffffffffffffffffffffffff                                              
+    cpconfig -hardware media -configure $NAME -add string folders 'CC00\CC01\CC02\CC03\CC04\CC05\CC06\CC07\CC08\CC09'
+
+    NAME="eToken_PRO32"
+    cpconfig -ini "\config\KeyCarriers\\$NAME" -add string DLL $LIBNAME.so
+    cpconfig -hardware media -add $NAME -name 'Aladdin R.D. eToken Pro 32K' > /dev/null
+    cpconfig -hardware media -configure NAME -add hex atr 3bf29800ffc11031fe55c80315                                             
+    cpconfig -hardware media -configure $NAME -add hex mask ffffffffffffffffffffffffff                                            
+    cpconfig -hardware media -configure $NAME -add string folders 'CC00\CC01\CC02\CC03\CC04\CC05\CC06\CC07\CC08\CC09'
+
+    NAME="eToken_PRO_M420"
+    cpconfig -ini "\config\KeyCarriers\\$NAME" -add string DLL $LIBNAME.so
+    cpconfig -hardware media -add $NAME -name 'Aladdin R.D. eToken Pro M420' > /dev/null
+    cpconfig -hardware media -configure $NAME -add hex atr 3bf2180000c10a31fe55c80600                                          
+    cpconfig -hardware media -configure $NAME -add hex mask ffffffff00ffffffffffffff00                                         
+    cpconfig -hardware media -configure $NAME -add string folders 'CC00\CC01\CC02\CC03\CC04\CC05\CC06\CC07\CC08\CC09'
+
+    NAME="eToken_PRO_M420B"
+    cpconfig -ini "\config\KeyCarriers\\$NAME" -add string DLL $LIBNAME.so
+    cpconfig -hardware media -add $NAME -name 'Aladdin R.D. eToken Pro M420b' > /dev/null
+    cpconfig -hardware media -configure $NAME -add hex atr 3bf2180002c10a31fe58c80975                                         
+    cpconfig -hardware media -configure $NAME -add hex mask ffffffffffffffffffffffffff                                        
+    cpconfig -hardware media -configure $NAME -add string folders 'CC00\CC01\CC02\CC03\CC04\CC05\CC06\CC07\CC08\CC09'
 
     # cprocsp-rdr-rutoken-64
     cpconfig -ini '\config\apppath' -add string librdrrutoken.so /opt/cprocsp/lib/amd64/librdrrutoken.so