diff options
-rw-r--r-- | src/lib/libcrypto/Symbols.namespace | 2 | ||||
-rw-r--r-- | src/lib/libcrypto/cms/cms_asn1.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/hidden/openssl/cms.h | 6 |
3 files changed, 10 insertions, 2 deletions
diff --git a/src/lib/libcrypto/Symbols.namespace b/src/lib/libcrypto/Symbols.namespace index 32c1729904..ab6111e2aa 100644 --- a/src/lib/libcrypto/Symbols.namespace +++ b/src/lib/libcrypto/Symbols.namespace | |||
@@ -3334,6 +3334,8 @@ _libre_RSA_OAEP_PARAMS_it | |||
3334 | _libre_DSAPublicKey_it | 3334 | _libre_DSAPublicKey_it |
3335 | _libre_DSAPrivateKey_it | 3335 | _libre_DSAPrivateKey_it |
3336 | _libre_DSAparams_it | 3336 | _libre_DSAparams_it |
3337 | _libre_CMS_ContentInfo_it | ||
3338 | _libre_CMS_ReceiptRequest_it | ||
3337 | _libre_RSAPublicKey_it | 3339 | _libre_RSAPublicKey_it |
3338 | _libre_RSAPrivateKey_it | 3340 | _libre_RSAPrivateKey_it |
3339 | _libre_RSA_PSS_PARAMS_it | 3341 | _libre_RSA_PSS_PARAMS_it |
diff --git a/src/lib/libcrypto/cms/cms_asn1.c b/src/lib/libcrypto/cms/cms_asn1.c index 531b8c587d..8f2e122369 100644 --- a/src/lib/libcrypto/cms/cms_asn1.c +++ b/src/lib/libcrypto/cms/cms_asn1.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: cms_asn1.c,v 1.23 2023/07/08 08:26:26 beck Exp $ */ | 1 | /* $OpenBSD: cms_asn1.c,v 1.24 2024/07/09 06:12:45 beck Exp $ */ |
2 | /* | 2 | /* |
3 | * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 3 | * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
4 | * project. | 4 | * project. |
@@ -1390,6 +1390,7 @@ const ASN1_ITEM CMS_ContentInfo_it = { | |||
1390 | .size = sizeof(CMS_ContentInfo), | 1390 | .size = sizeof(CMS_ContentInfo), |
1391 | .sname = "CMS_ContentInfo", | 1391 | .sname = "CMS_ContentInfo", |
1392 | }; | 1392 | }; |
1393 | LCRYPTO_ALIAS(CMS_ContentInfo_it); | ||
1393 | 1394 | ||
1394 | /* Specials for signed attributes */ | 1395 | /* Specials for signed attributes */ |
1395 | 1396 | ||
@@ -1501,6 +1502,7 @@ const ASN1_ITEM CMS_ReceiptRequest_it = { | |||
1501 | .size = sizeof(CMS_ReceiptRequest), | 1502 | .size = sizeof(CMS_ReceiptRequest), |
1502 | .sname = "CMS_ReceiptRequest", | 1503 | .sname = "CMS_ReceiptRequest", |
1503 | }; | 1504 | }; |
1505 | LCRYPTO_ALIAS(CMS_ReceiptRequest_it); | ||
1504 | 1506 | ||
1505 | static const ASN1_TEMPLATE CMS_Receipt_seq_tt[] = { | 1507 | static const ASN1_TEMPLATE CMS_Receipt_seq_tt[] = { |
1506 | { | 1508 | { |
diff --git a/src/lib/libcrypto/hidden/openssl/cms.h b/src/lib/libcrypto/hidden/openssl/cms.h index 430b2c5355..a99c977755 100644 --- a/src/lib/libcrypto/hidden/openssl/cms.h +++ b/src/lib/libcrypto/hidden/openssl/cms.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: cms.h,v 1.3 2024/03/30 01:53:05 joshua Exp $ */ | 1 | /* $OpenBSD: cms.h,v 1.4 2024/07/09 06:12:45 beck Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2023 Bob Beck <beck@openbsd.org> | 3 | * Copyright (c) 2023 Bob Beck <beck@openbsd.org> |
4 | * | 4 | * |
@@ -153,5 +153,9 @@ LCRYPTO_USED(CMS_RecipientInfo_kari_get0_ctx); | |||
153 | LCRYPTO_USED(CMS_RecipientInfo_kari_decrypt); | 153 | LCRYPTO_USED(CMS_RecipientInfo_kari_decrypt); |
154 | LCRYPTO_USED(CMS_SharedInfo_encode); | 154 | LCRYPTO_USED(CMS_SharedInfo_encode); |
155 | LCRYPTO_USED(ERR_load_CMS_strings); | 155 | LCRYPTO_USED(ERR_load_CMS_strings); |
156 | #if defined(LIBRESSL_NAMESPACE) | ||
157 | extern LCRYPTO_USED(CMS_ContentInfo_it); | ||
158 | extern LCRYPTO_USED(CMS_ReceiptRequest_it); | ||
159 | #endif | ||
156 | 160 | ||
157 | #endif /* _LIBCRYPTO_CMS_H */ | 161 | #endif /* _LIBCRYPTO_CMS_H */ |