From fc8969d7bc7d91388fd8e32346fd7ed6e388140e Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Sun, 31 Aug 2025 14:42:12 +0800 Subject: [PATCH] drop argon related modification, as openssl 3.0 does not support it --- ...rt-params-provide-a-faster-TRIE-based-param-lookup.patch | 6 +----- openssl.spec | 5 ++++- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/backport-params-provide-a-faster-TRIE-based-param-lookup.patch b/backport-params-provide-a-faster-TRIE-based-param-lookup.patch index 4940c36..9bf62fa 100644 --- a/backport-params-provide-a-faster-TRIE-based-param-lookup.patch +++ b/backport-params-provide-a-faster-TRIE-based-param-lookup.patch @@ -1007,7 +1007,7 @@ new file mode 100644 index 0000000..66c6fdd --- /dev/null +++ b/util/perl/OpenSSL/paramnames.pm -@@ -0,0 +1,673 @@ +@@ -0,0 +1,669 @@ +#! /usr/bin/env perl +# Copyright 2023 The OpenSSL Project Authors. All Rights Reserved. +# @@ -1197,10 +1197,6 @@ index 0000000..66c6fdd + 'KDF_PARAM_HMACDRBG_NONCE' => "nonce", + 'KDF_PARAM_THREADS' => "threads", # uint32_t + 'KDF_PARAM_EARLY_CLEAN' => "early_clean", # uint32_t -+ 'KDF_PARAM_ARGON2_AD' => "ad", # octet string -+ 'KDF_PARAM_ARGON2_LANES' => "lanes", # uint32_t -+ 'KDF_PARAM_ARGON2_MEMCOST' => "memcost", # uint32_t -+ 'KDF_PARAM_ARGON2_VERSION' => "version", # uint32_t + +# Known RAND names + 'RAND_PARAM_STATE' => "state", diff --git a/openssl.spec b/openssl.spec index 7a671ca..3c0bb5a 100755 --- a/openssl.spec +++ b/openssl.spec @@ -2,7 +2,7 @@ Name: openssl Epoch: 1 Version: 3.0.12 -Release: 21 +Release: 22 Summary: Cryptography and SSL/TLS Toolkit License: Apache-2.0 URL: https://www.openssl.org/ @@ -288,6 +288,9 @@ make test || : %ldconfig_scriptlets libs %changelog +* Sat Sep 13 2025 Funda Wang - 1:3.0.12-22 +- drop argon related modification, as openssl 3.0 does not support it + * Fri Sep 12 2025 fuanan - 1:3.0.12-21 - fix openssl speed error about sm4-ccm -- Gitee