Skip to content

Commit 832d771

Browse files
author
jenkins[bot]
committed
1.20.0-3 (component version v-2.18.16)
1 parent 5f5b09b commit 832d771

7 files changed

Lines changed: 70 additions & 72 deletions

File tree

‎Dependencies.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@
1414
| libunwind | 1.8.1 | MIT | https://github.com/libunwind/libunwind/releases/tag/v1.8.1 |
1515
| libxml2 | 2.14.5 | MIT | https://github.com/GNOME/libxml2/tree/v2.14.5 |
1616
| magic_enum | 0.9.7 | MIT | https://github.com/Neargye/magic_enum/releases/tag/v0.9.7 |
17-
| openssl* | 3.0.18 | OpenSSL | https://github.com/openssl/openssl/tree/openssl-3.0.18 |
17+
| openssl* | 3.0.19 | OpenSSL | https://github.com/openssl/openssl/tree/openssl-3.0.19 |
1818
| prometheus-cpp | 1.3.0 | MIT | https://github.com/jupp0r/prometheus-cpp/releases/tag/v1.3.0 |
1919
| rapidjson | cci.20230929 | MIT | https://github.com/Tencent/rapidjson |
2020
| redis-plus-plus | 1.3.15 | Apache-2.0 | https://github.com/sewenew/redis-plus-plus/releases/tag/1.3.15 |
2121
| zlib | 1.3.1 | Zlib License | https://github.com/madler/zlib/tree/v1.3.1 |
2222
| zstd | 1.5.7 | BSD-3-Clause | https://github.com/facebook/zstd/tree/v1.5.7 |
2323

24-
\* openssl 3.0.18: The openssl 3.0.18 is based on the version provided by conan-center (https://conan.io/center/)
24+
\* openssl 3.0.19: The openssl 3.0.19 is based on the version provided by conan-center (https://conan.io/center/)
2525
additionally a patch has been applied to access the embedded OCSP response.
2626
The changed package recipes and the patch are located in the subfolder `conan-recipes/openssl`
2727

28-
\* openssl 3.0.18: Die verwendete openssl 3.0.18 basiert auf der auf conan-center (https://conan.io/center/) verfügbaren.
28+
\* openssl 3.0.19: Die verwendete openssl 3.0.19 basiert auf der auf conan-center (https://conan.io/center/) verfügbaren.
2929
zusätzlich wird ein weiterer Patch angewandt, der den Zugriff auf die eingebettete OCSP-Response ermöglicht.
3030
Das geänderte Conan-Rezept und der Patch befinden sich im Unterordner `conan-recipes/openssl`

‎conan-recipes/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ export each recipe, locally with:
1616
`conan export . erp/stable`
1717

1818
openssl:
19-
`conan create conanfile.py --version 3.0.18+erp --build=missing`
20-
`conan upload -r erp-conan-2 openssl/3.0.18+erp`
19+
`conan create conanfile.py --version 3.0.19+erp --build=missing`
20+
`conan upload -r erp-conan-2 openssl/3.0.19+erp`
2121

2222
xmlsec:
2323
```sh

‎conan-recipes/openssl/conandata.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
sources:
2-
3.0.18+erp:
3-
sha256: d80c34f5cf902dccf1f1b5df5ebb86d0392e37049e5d73df1b3abae72e4ffe8b
2+
3.0.19+erp:
3+
sha256: fa5a4143b8aae18be53ef2f3caf29a2e0747430b8bc74d32d88335b94ab63072
44
url:
5-
- "https://www.openssl.org/source/openssl-3.0.18.tar.gz"
6-
- "https://www.openssl.org/source/old/3.0.18/openssl-3.0.18.tar.gz"
5+
- "https://www.openssl.org/source/openssl-3.0.19.tar.gz"
6+
- "https://www.openssl.org/source/old/3.0.19/openssl-3.0.19.tar.gz"
77

88
patches:
9-
3.0.18+erp:
10-
- patch_file: patches/0001-3.0.18-erp-cms.patch
9+
3.0.19+erp:
10+
- patch_file: patches/0001-3.0.19-erp-cms.patch
1111
patch_description: "erp-cms"
12-
- patch_file: patches/0002-3.0.18-erp-cms-counter-signature.patch
12+
- patch_file: patches/0002-3.0.19-erp-cms-counter-signature.patch
1313
patch_description: "erp-cms-counter-signature"

conan-recipes/openssl/patches/0001-3.0.18-erp-cms.patch renamed to conan-recipes/openssl/patches/0001-3.0.19-erp-cms.patch

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,33 @@
1-
From a95317169da5b00b00727b2cf48c0f40baec8cf8 Mon Sep 17 00:00:00 2001
1+
From 01266fb2404157c9f690007dc796c6ea298ee537 Mon Sep 17 00:00:00 2001
22
From: redacted <redacted>
3-
Date: Wed, 1 Oct 2025 12:22:35 +0200
4-
Subject: [PATCH 1/2] 3.0.18-erp-cms.patch
3+
Date: Wed, 28 Jan 2026 15:55:28 +0100
4+
Subject: [PATCH 1/2] 3.0.19-erp-cms.patch
55

66
---
7-
crypto/cms/cms_asn1.c | 3 +-
7+
crypto/cms/cms_asn1.c | 2 +-
88
crypto/cms/cms_lib.c | 71 ++++++++++++++++++++++++++++++++++++++++
99
crypto/cms/cms_local.h | 1 +
1010
include/openssl/cms.h.in | 8 +++++
11-
4 files changed, 82 insertions(+), 1 deletion(-)
11+
4 files changed, 81 insertions(+), 1 deletion(-)
1212

1313
diff --git a/crypto/cms/cms_asn1.c b/crypto/cms/cms_asn1.c
14-
index 9509520..2177835 100644
14+
index a920f22..ddafc59 100644
1515
--- a/crypto/cms/cms_asn1.c
1616
+++ b/crypto/cms/cms_asn1.c
17-
@@ -69,7 +69,8 @@ ASN1_SEQUENCE_cb(CMS_SignerInfo, cms_si_cb) = {
17+
@@ -60,7 +60,7 @@ ASN1_SEQUENCE_cb(CMS_SignerInfo, cms_si_cb) = {
1818
ASN1_SEQUENCE(CMS_OtherRevocationInfoFormat) = {
19-
ASN1_SIMPLE(CMS_OtherRevocationInfoFormat, otherRevInfoFormat, ASN1_OBJECT),
20-
ASN1_OPT(CMS_OtherRevocationInfoFormat, otherRevInfo, ASN1_ANY)
19+
ASN1_SIMPLE(CMS_OtherRevocationInfoFormat, otherRevInfoFormat, ASN1_OBJECT),
20+
ASN1_OPT(CMS_OtherRevocationInfoFormat, otherRevInfo, ASN1_ANY)
2121
-} static_ASN1_SEQUENCE_END(CMS_OtherRevocationInfoFormat)
2222
+} ASN1_SEQUENCE_END(CMS_OtherRevocationInfoFormat)
23-
+
2423

25-
ASN1_CHOICE(CMS_RevocationInfoChoice) = {
26-
ASN1_SIMPLE(CMS_RevocationInfoChoice, d.crl, X509_CRL),
24+
ASN1_CHOICE(CMS_RevocationInfoChoice)
25+
= { ASN1_SIMPLE(CMS_RevocationInfoChoice, d.crl, X509_CRL), ASN1_IMP(CMS_RevocationInfoChoice, d.other, CMS_OtherRevocationInfoFormat, 1) } ASN1_CHOICE_END(CMS_RevocationInfoChoice)
2726
diff --git a/crypto/cms/cms_lib.c b/crypto/cms/cms_lib.c
28-
index 67b3562..b063149 100644
27+
index 0f3d2b4..c3cf633 100644
2928
--- a/crypto/cms/cms_lib.c
3029
+++ b/crypto/cms/cms_lib.c
31-
@@ -611,6 +611,26 @@ int CMS_add1_crl(CMS_ContentInfo *cms, X509_CRL *crl)
30+
@@ -609,6 +609,26 @@ int CMS_add1_crl(CMS_ContentInfo *cms, X509_CRL *crl)
3231
return 0;
3332
}
3433

@@ -55,7 +54,7 @@ index 67b3562..b063149 100644
5554
STACK_OF(X509) *CMS_get1_certs(CMS_ContentInfo *cms)
5655
{
5756
STACK_OF(X509) *certs = NULL;
58-
@@ -663,6 +683,57 @@ STACK_OF(X509_CRL) *CMS_get1_crls(CMS_ContentInfo *cms)
57+
@@ -660,6 +680,57 @@ STACK_OF(X509_CRL) *CMS_get1_crls(CMS_ContentInfo *cms)
5958
return crls;
6059
}
6160

@@ -114,10 +113,10 @@ index 67b3562..b063149 100644
114113
{
115114
int ret;
116115
diff --git a/crypto/cms/cms_local.h b/crypto/cms/cms_local.h
117-
index 1e0e091..0ec4ea4 100644
116+
index dbf71c5..28a77a9 100644
118117
--- a/crypto/cms/cms_local.h
119118
+++ b/crypto/cms/cms_local.h
120-
@@ -493,6 +493,7 @@ DECLARE_ASN1_ITEM(CMS_KeyAgreeRecipientInfo)
119+
@@ -492,6 +492,7 @@ DECLARE_ASN1_ITEM(CMS_KeyAgreeRecipientInfo)
121120
DECLARE_ASN1_ITEM(CMS_KeyTransRecipientInfo)
122121
DECLARE_ASN1_ITEM(CMS_OriginatorPublicKey)
123122
DECLARE_ASN1_ITEM(CMS_OtherKeyAttribute)
@@ -126,10 +125,10 @@ index 1e0e091..0ec4ea4 100644
126125
DECLARE_ASN1_ITEM(CMS_ReceiptRequest)
127126
DECLARE_ASN1_ITEM(CMS_RecipientEncryptedKey)
128127
diff --git a/include/openssl/cms.h.in b/include/openssl/cms.h.in
129-
index da20ddf..cb24d82 100644
128+
index 5e71329..c3c2cca 100644
130129
--- a/include/openssl/cms.h.in
131130
+++ b/include/openssl/cms.h.in
132-
@@ -265,6 +265,14 @@ int CMS_add0_crl(CMS_ContentInfo *cms, X509_CRL *crl);
131+
@@ -269,6 +269,14 @@ int CMS_add0_crl(CMS_ContentInfo *cms, X509_CRL *crl);
133132
int CMS_add1_crl(CMS_ContentInfo *cms, X509_CRL *crl);
134133
STACK_OF(X509_CRL) *CMS_get1_crls(CMS_ContentInfo *cms);
135134

@@ -143,6 +142,6 @@ index da20ddf..cb24d82 100644
143142
+
144143
int CMS_SignedData_init(CMS_ContentInfo *cms);
145144
CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms,
146-
X509 *signer, EVP_PKEY *pk, const EVP_MD *md,
145+
X509 *signer, EVP_PKEY *pk, const EVP_MD *md,
147146
--
148-
2.43.0
147+
2.51.0

conan-recipes/openssl/patches/0002-3.0.18-erp-cms-counter-signature.patch renamed to conan-recipes/openssl/patches/0002-3.0.19-erp-cms-counter-signature.patch

Lines changed: 36 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,38 @@
1-
From 7b76c3c5427708f06d1be3d20de60679f7cc2097 Mon Sep 17 00:00:00 2001
1+
From 0500e2f930ea4505ab22a625af4949d23e7e78b1 Mon Sep 17 00:00:00 2001
22
From: redacted <redacted>
3-
Date: Wed, 1 Oct 2025 12:45:25 +0200
4-
Subject: [PATCH 2/2] 3.0.18-erp-cms-counter-signature.patch
3+
Date: Wed, 28 Jan 2026 16:01:13 +0100
4+
Subject: [PATCH 2/2] 3.0.19-erp-cms-counter-signature.patch
55

66
---
7-
crypto/cms/cms_att.c | 3 +-
8-
crypto/cms/cms_sd.c | 237 ++++++++++++++++++++++++++++++++++-----
7+
crypto/cms/cms_att.c | 2 +-
8+
crypto/cms/cms_sd.c | 233 +++++++++++++++++++++++++++++++++++----
99
include/openssl/cms.h.in | 5 +
10-
3 files changed, 217 insertions(+), 28 deletions(-)
10+
3 files changed, 217 insertions(+), 23 deletions(-)
1111

1212
diff --git a/crypto/cms/cms_att.c b/crypto/cms/cms_att.c
13-
index 64acda7..18ae55c 100644
13+
index 86852af..cbe760c 100644
1414
--- a/crypto/cms/cms_att.c
1515
+++ b/crypto/cms/cms_att.c
16-
@@ -43,8 +43,7 @@ static const struct {
16+
@@ -41,7 +41,7 @@ static const struct {
17+
int flags;
18+
} cms_attribute_properties[] = {
1719
/* See RFC Section 11 */
18-
{ NID_pkcs9_contentType, CMS_ATTR_F_SIGNED
19-
| CMS_ATTR_F_ONLY_ONE
20-
- | CMS_ATTR_F_ONE_ATTR_VALUE
21-
- | CMS_ATTR_F_REQUIRED_COND },
22-
+ | CMS_ATTR_F_ONE_ATTR_VALUE },
23-
{ NID_pkcs9_messageDigest, CMS_ATTR_F_SIGNED
24-
| CMS_ATTR_F_ONLY_ONE
25-
| CMS_ATTR_F_ONE_ATTR_VALUE
20+
- { NID_pkcs9_contentType, CMS_ATTR_F_SIGNED | CMS_ATTR_F_ONLY_ONE | CMS_ATTR_F_ONE_ATTR_VALUE | CMS_ATTR_F_REQUIRED_COND },
21+
+ { NID_pkcs9_contentType, CMS_ATTR_F_SIGNED | CMS_ATTR_F_ONLY_ONE | CMS_ATTR_F_ONE_ATTR_VALUE },
22+
{ NID_pkcs9_messageDigest, CMS_ATTR_F_SIGNED | CMS_ATTR_F_ONLY_ONE | CMS_ATTR_F_ONE_ATTR_VALUE | CMS_ATTR_F_REQUIRED_COND },
23+
{ NID_pkcs9_signingTime, CMS_ATTR_F_SIGNED | CMS_ATTR_F_ONLY_ONE | CMS_ATTR_F_ONE_ATTR_VALUE },
24+
{ NID_pkcs9_countersignature, CMS_ATTR_F_UNSIGNED },
2625
diff --git a/crypto/cms/cms_sd.c b/crypto/cms/cms_sd.c
27-
index 4758d04..7016ea2 100644
26+
index e6ba17c..c562976 100644
2827
--- a/crypto/cms/cms_sd.c
2928
+++ b/crypto/cms/cms_sd.c
30-
@@ -302,23 +302,15 @@ static int ossl_cms_add1_signing_cert_v2(CMS_SignerInfo *si,
29+
@@ -299,23 +299,15 @@ static int ossl_cms_add1_signing_cert_v2(CMS_SignerInfo *si,
3130
return ret;
3231
}
3332

3433
-CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms,
35-
- X509 *signer, EVP_PKEY *pk, const EVP_MD *md,
36-
- unsigned int flags)
34+
- X509 *signer, EVP_PKEY *pk, const EVP_MD *md,
35+
- unsigned int flags)
3736
+/* Creates and partially initializes a new signer info and adjusts signed data in CMS,
3837
+ * but still do not add it to CMS directly */
3938
+CMS_SignerInfo *cms_SignerInfo_init(CMS_SignedData *sd,
@@ -57,7 +56,7 @@ index 4758d04..7016ea2 100644
5756
si = M_ASN1_new_of(CMS_SignerInfo);
5857
if (!si)
5958
goto merr;
60-
@@ -352,7 +344,7 @@ CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms,
59+
@@ -349,7 +341,7 @@ CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms,
6160
if (!ossl_cms_set1_SignerIdentifier(si->sid, signer, type, ctx))
6261
goto err;
6362

@@ -66,16 +65,16 @@ index 4758d04..7016ea2 100644
6665
int def_nid;
6766

6867
if (EVP_PKEY_get_default_digest_nid(pk, &def_nid) <= 0) {
69-
@@ -360,25 +352,42 @@ CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms,
70-
"pkey nid=%d", EVP_PKEY_get_id(pk));
68+
@@ -357,25 +349,46 @@ CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms,
69+
"pkey nid=%d", EVP_PKEY_get_id(pk));
7170
goto err;
7271
}
7372
- md = EVP_get_digestbynid(def_nid);
7473
- if (md == NULL) {
7574
+ *md = EVP_get_digestbynid(def_nid);
7675
+ if (*md == NULL) {
7776
ERR_raise_data(ERR_LIB_CMS, CMS_R_NO_DEFAULT_DIGEST,
78-
"default md nid=%d", def_nid);
77+
"default md nid=%d", def_nid);
7978
goto err;
8079
}
8180
}
@@ -87,10 +86,10 @@ index 4758d04..7016ea2 100644
8786
+ X509_ALGOR_set_md(si->digestAlgorithm, *md);
8887
+ return si;
8988

90-
- if (md == NULL) {
91-
- ERR_raise(ERR_LIB_CMS, CMS_R_NO_DIGEST_SET);
92-
- goto err;
93-
- }
89+
if (md == NULL) {
90+
ERR_raise(ERR_LIB_CMS, CMS_R_NO_DIGEST_SET);
91+
goto err;
92+
}
9493
+ merr:
9594
+ ERR_raise(ERR_LIB_CMS, ERR_R_MALLOC_FAILURE);
9695
+ err:
@@ -120,7 +119,7 @@ index 4758d04..7016ea2 100644
120119

121120
/* See if digest is present in digestAlgorithms */
122121
for (i = 0; i < sk_X509_ALGOR_num(sd->digestAlgorithms); i++) {
123-
@@ -1114,3 +1123,179 @@ int CMS_add_standard_smimecap(STACK_OF(X509_ALGOR) **smcap)
122+
@@ -1112,3 +1125,179 @@ int CMS_add_standard_smimecap(STACK_OF(X509_ALGOR) **smcap)
124123
return 0;
125124
return 1;
126125
}
@@ -301,27 +300,27 @@ index 4758d04..7016ea2 100644
301300
+
302301
+}
303302
diff --git a/include/openssl/cms.h.in b/include/openssl/cms.h.in
304-
index cb24d82..18c3e14 100644
303+
index c3c2cca..60a425a 100644
305304
--- a/include/openssl/cms.h.in
306305
+++ b/include/openssl/cms.h.in
307-
@@ -50,6 +50,7 @@ typedef struct CMS_OtherKeyAttribute_st CMS_OtherKeyAttribute;
308-
-}
306+
@@ -54,6 +54,7 @@ typedef struct CMS_OtherKeyAttribute_st CMS_OtherKeyAttribute;
307+
/* clang-format on */
309308

310309
DECLARE_ASN1_FUNCTIONS(CMS_ContentInfo)
311310
+DECLARE_ASN1_FUNCTIONS(CMS_SignerInfo)
312311
DECLARE_ASN1_FUNCTIONS(CMS_ReceiptRequest)
313312
DECLARE_ASN1_PRINT_FUNCTION(CMS_ContentInfo)
314313

315-
@@ -391,6 +392,10 @@ int CMS_RecipientInfo_kari_decrypt(CMS_ContentInfo *cms,
314+
@@ -395,6 +396,10 @@ int CMS_RecipientInfo_kari_decrypt(CMS_ContentInfo *cms,
316315
int CMS_SharedInfo_encode(unsigned char **pder, X509_ALGOR *kekalg,
317-
ASN1_OCTET_STRING *ukm, int keylen);
316+
ASN1_OCTET_STRING *ukm, int keylen);
318317

319318
+int CMS_add1_counter_signature(CMS_SignerInfo *si, CMS_ContentInfo* cms,
320319
+ X509 *signer, EVP_PKEY *pk, const EVP_MD *md,
321320
+ unsigned int flags);
322321
+
323322
/* Backward compatibility for spelling errors. */
324-
# define CMS_R_UNKNOWN_DIGEST_ALGORITM CMS_R_UNKNOWN_DIGEST_ALGORITHM
325-
# define CMS_R_UNSUPPORTED_RECPIENTINFO_TYPE \
323+
#define CMS_R_UNKNOWN_DIGEST_ALGORITM CMS_R_UNKNOWN_DIGEST_ALGORITHM
324+
#define CMS_R_UNSUPPORTED_RECPIENTINFO_TYPE \
326325
--
327-
2.43.0
326+
2.51.0

‎conanfile.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class ErpProcessingContext(ConanFile):
7272
'libpqxx/7.10.1',
7373
'libxml2/2.14.5',
7474
'magic_enum/0.9.7',
75-
'openssl/3.0.18+erp',
75+
'openssl/3.0.19+erp',
7676
'prometheus-cpp/1.3.0',
7777
'rapidjson/cci.20230929',
7878
'redis-plus-plus/1.3.15',

‎version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v-2.18.15
1+
v-2.18.16

0 commit comments

Comments
 (0)