public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/kryoptic] rawhide: New upstream release 1.5.1 (#2484928)
@ 2026-06-05  8:32 Jakub Jelen
  0 siblings, 0 replies; only message in thread
From: Jakub Jelen @ 2026-06-05  8:32 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/kryoptic
Branch : rawhide
Commit : 157b5fa090e302f742b7d28d259cea6d3f48c604
Author : Jakub Jelen <jjelen@redhat.com>
Date   : 2026-06-05T10:32:08+02:00
Stats  : +5/-154 in 5 file(s)
URL    : https://src.fedoraproject.org/rpms/kryoptic/c/157b5fa090e302f742b7d28d259cea6d3f48c604?branch=rawhide

Log:
New upstream release 1.5.1 (#2484928)

---
diff --git a/.gitignore b/.gitignore
index 656dd15..b5534f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,5 @@
 /kryoptic-1.4.0.tar.gz.asc
 /kryoptic-1.5.0.tar.gz
 /kryoptic-1.5.0.tar.gz.asc
+/kryoptic-1.5.1.tar.gz
+/kryoptic-1.5.1.tar.gz.asc

diff --git a/kryoptic-1.5.0-asn1.patch b/kryoptic-1.5.0-asn1.patch
deleted file mode 100644
index bd44a52..0000000
--- a/kryoptic-1.5.0-asn1.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From 1e8c4164c81a5efc35afd46de3e2b40e27f77093 Mon Sep 17 00:00:00 2001
-From: Jakub Jelen <jjelen@redhat.com>
-Date: Thu, 9 Apr 2026 10:08:15 +0200
-Subject: [PATCH] Update to asn1 0.24.0
-
-Signed-off-by: Jakub Jelen <jjelen@redhat.com>
----
- Cargo.toml             |  2 +-
- src/kasn1/mod.rs       |  6 ++++++
- src/kasn1/pyca/pkcs.rs | 21 +++++++++++++++++----
- 3 files changed, 24 insertions(+), 5 deletions(-)
-
-diff --git a/Cargo.toml b/Cargo.toml
-index f911da6a..d80276e1 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -53,7 +53,7 @@ test = true
- bindgen = "0.72"
- 
- [dependencies]
--asn1 = "0.22"
-+asn1 = "0.24"
- bimap = "0.6.3"
- bitflags = "2.4.1"
- constant_time_eq = "0.4.2"
-diff --git a/src/kasn1/mod.rs b/src/kasn1/mod.rs
-index baf85381..356f71eb 100644
---- a/src/kasn1/mod.rs
-+++ b/src/kasn1/mod.rs
-@@ -106,7 +106,10 @@ impl<'a> asn1::SimpleAsn1Readable<'a> for DerEncBigUint<'a> {
-     }
- }
- impl<'a> asn1::SimpleAsn1Writable for DerEncBigUint<'a> {
-+    type Error = asn1::WriteError;
-+
-     const TAG: asn1::Tag = asn1::BigUint::TAG;
-+
-     /// Writes out a DerEncBigUint
-     fn write_data(&self, dest: &mut asn1::WriteBuf) -> asn1::WriteResult {
-         dest.push_slice(self.as_bytes())
-@@ -162,7 +165,10 @@ impl<'a> asn1::SimpleAsn1Readable<'a> for DerEncOctetString<'a> {
-     }
- }
- impl<'a> asn1::SimpleAsn1Writable for DerEncOctetString<'a> {
-+    type Error = asn1::WriteError;
-+
-     const TAG: asn1::Tag = asn1::Tag::primitive(0x04);
-+
-     /// Writes out a DerEncOctetString
-     fn write_data(&self, dest: &mut asn1::WriteBuf) -> asn1::WriteResult {
-         dest.push_slice(self.as_bytes())
-diff --git a/src/kasn1/pyca/pkcs.rs b/src/kasn1/pyca/pkcs.rs
-index e4f35096..2b34d6e5 100644
---- a/src/kasn1/pyca/pkcs.rs
-+++ b/src/kasn1/pyca/pkcs.rs
-@@ -7,7 +7,7 @@
- // 2.0, and the BSD License. See the LICENSE file in the root of this repository
- // for complete details.
- 
--use asn1::{Asn1DefinedByWritable, SimpleAsn1Writable};
-+use asn1::{Asn1DefinedByWritable, SimpleAsn1Writable, WriteError};
- 
- //use crate::oid;
- 
-@@ -305,6 +305,8 @@ impl<'a> asn1::Asn1Readable<'a> for RawTlv<'a> {
-     }
- }
- impl asn1::Asn1Writable for RawTlv<'_> {
-+    type Error = WriteError;
-+
-     fn write(&self, w: &mut asn1::Writer<'_>) -> asn1::WriteResult {
-         w.write_tlv(self.tag, Some(self.value.len()), move |dest| {
-             dest.push_slice(self.value)
-@@ -366,10 +368,15 @@ impl<'a, T: asn1::SimpleAsn1Readable<'a>, U> asn1::SimpleAsn1Readable<'a>
-     }
- }
- 
--impl<T: asn1::SimpleAsn1Writable, U: asn1::SimpleAsn1Writable>
--    asn1::SimpleAsn1Writable for Asn1ReadableOrWritable<T, U>
-+impl<
-+        T: asn1::SimpleAsn1Writable<Error = WriteError>,
-+        U: asn1::SimpleAsn1Writable<Error = WriteError>,
-+    > asn1::SimpleAsn1Writable for Asn1ReadableOrWritable<T, U>
- {
-+    type Error = asn1::WriteError;
-+
-     const TAG: asn1::Tag = U::TAG;
-+
-     fn write_data(&self, w: &mut asn1::WriteBuf) -> asn1::WriteResult {
-         match self {
-             Asn1ReadableOrWritable::Read(v) => T::write_data(v, w),
-@@ -680,6 +687,7 @@ impl<'a> asn1::SimpleAsn1Readable<'a> for UnvalidatedVisibleString<'a> {
- }
- 
- impl asn1::SimpleAsn1Writable for UnvalidatedVisibleString<'_> {
-+    type Error = WriteError;
-     const TAG: asn1::Tag = asn1::VisibleString::TAG;
-     fn write_data(&self, _: &mut asn1::WriteBuf) -> asn1::WriteResult {
-         unimplemented!();
-@@ -700,6 +708,7 @@ impl<'a> Utf8StoredBMPString<'a> {
- }
- 
- impl asn1::SimpleAsn1Writable for Utf8StoredBMPString<'_> {
-+    type Error = asn1::WriteError;
-     const TAG: asn1::Tag = asn1::BMPString::TAG;
-     fn write_data(&self, writer: &mut asn1::WriteBuf) -> asn1::WriteResult {
-         for ch in self.0.encode_utf16() {
-@@ -747,7 +756,11 @@ impl<'a, T: asn1::Asn1Readable<'a>> asn1::Asn1Readable<'a> for WithTlv<'a, T> {
-     }
- }
- 
--impl<T: asn1::Asn1Writable> asn1::Asn1Writable for WithTlv<'_, T> {
-+impl<T: asn1::Asn1Writable<Error = WriteError>> asn1::Asn1Writable
-+    for WithTlv<'_, T>
-+{
-+    type Error = WriteError;
-+
-     fn write(&self, w: &mut asn1::Writer<'_>) -> asn1::WriteResult<()> {
-         self.value.write(w)
-     }
-

diff --git a/kryoptic-i386.patch b/kryoptic-i386.patch
deleted file mode 100644
index 5d97f81..0000000
--- a/kryoptic-i386.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a5195f65fe72a41f0db1ea0a361de2076da2cd46 Mon Sep 17 00:00:00 2001
-From: Jakub Jelen <jjelen@redhat.com>
-Date: Thu, 7 May 2026 17:34:40 +0200
-Subject: [PATCH] tools: Fix build on i686
-
-Signed-off-by: Jakub Jelen <jjelen@redhat.com>
----
- tools/profiles/conformance_lib/token_init.rs | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/profiles/conformance_lib/token_init.rs b/tools/profiles/conformance_lib/token_init.rs
-index 117e790..0430850 100644
---- a/tools/profiles/conformance_lib/token_init.rs
-+++ b/tools/profiles/conformance_lib/token_init.rs
-@@ -300,7 +300,7 @@ pub fn init_token(args: &Arguments) -> Result<(), Box<dyn std::error::Error>> {
-         println!("PKCS#11 library initialized.");
- 
-         let slot_id = if let Some(sid) = args.pkcs11_slot {
--            sid
-+            sid as pkcs11::CK_ULONG
-         } else {
-             println!("No slot specified, finding first slot with a token...");
-             let num_slots = pkcs11.get_slot_list(pkcs11::CK_TRUE, None)?;
--- 
-2.54.0
-

diff --git a/kryoptic.spec b/kryoptic.spec
index 56fefc7..2280b35 100644
--- a/kryoptic.spec
+++ b/kryoptic.spec
@@ -9,7 +9,7 @@
 %global features kryoptic-lib/nssdb,kryoptic-lib/pqc,kryoptic-lib/standard,kryoptic-lib/dynamic,profiles
 
 Name:           kryoptic
-Version:        1.5.0
+Version:        1.5.1
 Release:        %autorelease
 Summary:        PKCS #11 software token written in Rust
 
@@ -33,10 +33,6 @@ Source0:        https://github.com/latchset/kryoptic/releases/download/v%{versio
 Source1:        https://github.com/latchset/kryoptic/releases/download/v%{version}/%{name}-%{version}.tar.gz.asc
 Source2:        https://people.redhat.com/~ssorce/simo_redhat.asc
 %endif
-# https://github.com/latchset/kryoptic/pull/439
-Patch:          kryoptic-1.5.0-asn1.patch
-# https://github.com/latchset/kryoptic/pull/452
-Patch:          kryoptic-i386.patch
 
 BuildRequires:  cargo-rpm-macros >= 26
 BuildRequires:  openssl-devel

diff --git a/sources b/sources
index 03b16f1..3bec875 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (kryoptic-1.5.0.tar.gz) = e7f868a87f92f283de6d3f534b0728aba93d585e434c4d98ef88610a2c33632ae25d8c9680fe4db258fa5b0270b7d546f548d4149970a176c468b6f0ab1c1b53
-SHA512 (kryoptic-1.5.0.tar.gz.asc) = 3384e1fd51d2eb8d210f4ff3fc2c3d0142d87251964c752292949bfc4ff76bcebb7618c54c7661d9a0d1f28ffab748a50acaf6ee285870a6d88035f83106c837
+SHA512 (kryoptic-1.5.1.tar.gz) = 150c0ca38a7b2dc3b96ed42c7acab217ca4a17c89ff9765fa0d2354d4b70f64ffe3341178e42d8bd3ec7bfc963700d1f2a0b13956e156b7e6db18e773e5e037a
+SHA512 (kryoptic-1.5.1.tar.gz.asc) = 4b6f47c7c76cb156dd3fa449f7b9f4171c728c1f41cf42902ae9b8ea3aa8e7f63201e0b88b539a8c5470a5b1da2ef8f1da5d3b82d0fe67b724273ee6a7c095e0

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-06-05  8:32 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-05  8:32 [rpms/kryoptic] rawhide: New upstream release 1.5.1 (#2484928) Jakub Jelen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox