diff options
| author | tcely <tcely@users.noreply.github.com> | 2019-03-06 07:40:37 -0500 |
|---|---|---|
| committer | Kevin Daudt <kdaudt@alpinelinux.org> | 2019-03-23 21:34:18 +0000 |
| commit | dca992785e1534c3bd8e0971aed453c42f954e53 (patch) | |
| tree | 9882bb1486119099c1bbd690008f18a4a2d156a7 /testing/softhsm | |
| parent | 21b6f939ac7e8da2c96fcfa9481aaa93a6b978fa (diff) | |
| download | aports-dca992785e1534c3bd8e0971aed453c42f954e53.tar.bz2 aports-dca992785e1534c3bd8e0971aed453c42f954e53.tar.xz | |
testing/softhsm: upgrade to 2.5.0
Diffstat (limited to 'testing/softhsm')
| -rw-r--r-- | testing/softhsm/APKBUILD | 14 | ||||
| -rw-r--r-- | testing/softhsm/fix-objstoretest.patch | 13 | ||||
| -rw-r--r-- | testing/softhsm/softhsm-2.5.0-botan_ecb-exception-fix.patch | 19 |
3 files changed, 26 insertions, 20 deletions
diff --git a/testing/softhsm/APKBUILD b/testing/softhsm/APKBUILD index e63e983416..d26426fad8 100644 --- a/testing/softhsm/APKBUILD +++ b/testing/softhsm/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Frank Felhoffer <silveraid@hackme.ca> # Maintainer: tcely <softhsm+aports@tcely.33mail.com> pkgname=softhsm -pkgver=2.4.0 -pkgrel=1 +pkgver=2.5.0 +pkgrel=0 pkgdesc="cryptographic store accessible through a PKCS #11" url="https://www.opendnssec.org/softhsm/" arch="all" @@ -13,7 +13,7 @@ makedepends="autoconf automake botan-dev libtool p11-kit-dev sqlite-dev" install="" subpackages="$pkgname-doc" source="https://dist.opendnssec.org/source/$pkgname-$pkgver.tar.gz - fix-objstoretest.patch" + softhsm-2.5.0-botan_ecb-exception-fix.patch" builddir="$srcdir/$pkgname-$pkgver" build() { @@ -43,7 +43,7 @@ package() { make -j1 DESTDIR="$pkgdir/" install } -sha256sums="26aac12bdeaacd15722dc0a24a5a1981a3b711e61d10ac687a23ff0b7075da07 softhsm-2.4.0.tar.gz -bc1744ee8d1b64538bc0e12cf8cd3d8d39fe2fc2b6dbdf7c7f0e07991047a0ef fix-objstoretest.patch" -sha512sums="f14f65de32206500f708523ee88d8d5e3d1fd40175f1a9cd24c7760c829e2de9dbcb05453022df8186836c49a57e4eae7f2e75ce6a5346a426114f4d610a8a84 softhsm-2.4.0.tar.gz -5c16c1c7cf6bd609d3355ac036e392abd243b710c90212247f48849f1ee87347725d7c835a5a286e0948248b43d031a15f0c21f962f1690dd8e6d3c0fa62632b fix-objstoretest.patch" +sha256sums="92aa56cf45e25892326e98b851c44de9cac8559e208720e579bf8e2cd1c132b2 softhsm-2.5.0.tar.gz +ea369cc09a63955a346967041fea7e79438cc6a4f064c7a93a9bdc1b263c6af2 softhsm-2.5.0-botan_ecb-exception-fix.patch" +sha512sums="a1e686729196dc25591eb3da57c2c8ea8494ed274ba711842b2dcae696f477a202acda13a975b8fb1eb68e8e44a79e839dbbc6ba500cab02ad13072c660752d9 softhsm-2.5.0.tar.gz +25dc68c404f89936df1d7fcdf5460b8f42fff66f4a76d0e50f139337cb515fac853aa76b0b276cdb9186f2cd78a4099fcfa469629c1531dfa4023fa19c23823b softhsm-2.5.0-botan_ecb-exception-fix.patch" diff --git a/testing/softhsm/fix-objstoretest.patch b/testing/softhsm/fix-objstoretest.patch deleted file mode 100644 index aa0ac6c305..0000000000 --- a/testing/softhsm/fix-objstoretest.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/lib/object_store/test/DBTests.cpp b/src/lib/object_store/test/DBTests.cpp -index d787a83..0e68358 100644 ---- a/src/lib/object_store/test/DBTests.cpp -+++ b/src/lib/object_store/test/DBTests.cpp -@@ -348,7 +348,7 @@ void test_a_db_with_a_connection_with_tables::can_update_integer_attribute_bound - - // insert integer attribute - statement = connection->prepare( -- "insert into attribute_integer (value,type,object_id) values (%lld,%d,%lld)", -+ "insert into attribute_integer (value,type,object_id) values (%d,%d,%lld)", - 1111, - 1235, - object_id); diff --git a/testing/softhsm/softhsm-2.5.0-botan_ecb-exception-fix.patch b/testing/softhsm/softhsm-2.5.0-botan_ecb-exception-fix.patch new file mode 100644 index 0000000000..a71081e0ee --- /dev/null +++ b/testing/softhsm/softhsm-2.5.0-botan_ecb-exception-fix.patch @@ -0,0 +1,19 @@ +commit a9a40fc64635cfb924279cae3c42e6946e89718c +Author: tcely <tcely@users.noreply.github.com> +Date: Wed Mar 6 07:14:32 2019 -0500 + + fix protected Exception usage + +diff --git a/src/lib/crypto/Botan_ecb.cpp b/src/lib/crypto/Botan_ecb.cpp +index f27276e..6947aab 100644 +--- a/src/lib/crypto/Botan_ecb.cpp ++++ b/src/lib/crypto/Botan_ecb.cpp +@@ -108,7 +108,7 @@ void ECB_Encryption::finish(secure_vector<byte>& buffer, size_t offset) + padding().add_padding(buffer, bytes_in_final_block, BS); + + if(buffer.size() % BS) +- throw Exception("Did not pad to full block size in " + name()); ++ throw Invalid_State("Did not pad to full block size in " + name()); + + update(buffer, offset); + } |