summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libcrypto/Symbols.namespace8
-rw-r--r--src/lib/libcrypto/hidden/openssl/rsa.h8
-rw-r--r--src/lib/libcrypto/rsa/rsa_asn1.c6
3 files changed, 20 insertions, 2 deletions
diff --git a/src/lib/libcrypto/Symbols.namespace b/src/lib/libcrypto/Symbols.namespace
index 0b8e1f91f2..d704fd7cf8 100644
--- a/src/lib/libcrypto/Symbols.namespace
+++ b/src/lib/libcrypto/Symbols.namespace
@@ -3327,3 +3327,11 @@ _libre_CBIGNUM_it
3327_libre_BIGNUM_it 3327_libre_BIGNUM_it
3328_libre_LONG_it 3328_libre_LONG_it
3329_libre_ZLONG_it 3329_libre_ZLONG_it
3330_libre_RSAPublicKey_it
3331_libre_RSAPrivateKey_it
3332_libre_RSA_PSS_PARAMS_it
3333_libre_RSA_OAEP_PARAMS_it
3334_libre_RSAPublicKey_it
3335_libre_RSAPrivateKey_it
3336_libre_RSA_PSS_PARAMS_it
3337_libre_RSA_OAEP_PARAMS_it
diff --git a/src/lib/libcrypto/hidden/openssl/rsa.h b/src/lib/libcrypto/hidden/openssl/rsa.h
index ff47101a07..a115684c90 100644
--- a/src/lib/libcrypto/hidden/openssl/rsa.h
+++ b/src/lib/libcrypto/hidden/openssl/rsa.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: rsa.h,v 1.2 2023/07/28 10:05:16 tb Exp $ */ 1/* $OpenBSD: rsa.h,v 1.3 2024/07/08 17:10:18 beck Exp $ */
2/* 2/*
3 * Copyright (c) 2023 Bob Beck <beck@openbsd.org> 3 * Copyright (c) 2023 Bob Beck <beck@openbsd.org>
4 * 4 *
@@ -137,5 +137,11 @@ LCRYPTO_USED(RSA_meth_set_sign);
137LCRYPTO_USED(RSA_meth_get_verify); 137LCRYPTO_USED(RSA_meth_get_verify);
138LCRYPTO_USED(RSA_meth_set_verify); 138LCRYPTO_USED(RSA_meth_set_verify);
139LCRYPTO_USED(ERR_load_RSA_strings); 139LCRYPTO_USED(ERR_load_RSA_strings);
140#if defined(LIBRESSL_NAMESPACE)
141extern LCRYPTO_USED(RSAPublicKey_it);
142extern LCRYPTO_USED(RSAPrivateKey_it);
143extern LCRYPTO_USED(RSA_PSS_PARAMS_it);
144extern LCRYPTO_USED(RSA_OAEP_PARAMS_it);
145#endif
140 146
141#endif /* _LIBCRYPTO_RSA_H */ 147#endif /* _LIBCRYPTO_RSA_H */
diff --git a/src/lib/libcrypto/rsa/rsa_asn1.c b/src/lib/libcrypto/rsa/rsa_asn1.c
index 0f6d8c49fe..1526e07931 100644
--- a/src/lib/libcrypto/rsa/rsa_asn1.c
+++ b/src/lib/libcrypto/rsa/rsa_asn1.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: rsa_asn1.c,v 1.17 2023/07/08 12:26:45 beck Exp $ */ 1/* $OpenBSD: rsa_asn1.c,v 1.18 2024/07/08 17:10:18 beck Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2000. 3 * project 2000.
4 */ 4 */
@@ -165,6 +165,7 @@ const ASN1_ITEM RSAPrivateKey_it = {
165 .size = sizeof(RSA), 165 .size = sizeof(RSA),
166 .sname = "RSA", 166 .sname = "RSA",
167}; 167};
168LCRYPTO_ALIAS(RSAPrivateKey_it);
168 169
169 170
170static const ASN1_AUX RSAPublicKey_aux = { 171static const ASN1_AUX RSAPublicKey_aux = {
@@ -201,6 +202,7 @@ const ASN1_ITEM RSAPublicKey_it = {
201 .size = sizeof(RSA), 202 .size = sizeof(RSA),
202 .sname = "RSA", 203 .sname = "RSA",
203}; 204};
205LCRYPTO_ALIAS(RSAPublicKey_it);
204 206
205static int 207static int
206rsa_pss_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, void *exarg) 208rsa_pss_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, void *exarg)
@@ -262,6 +264,7 @@ const ASN1_ITEM RSA_PSS_PARAMS_it = {
262 .size = sizeof(RSA_PSS_PARAMS), 264 .size = sizeof(RSA_PSS_PARAMS),
263 .sname = "RSA_PSS_PARAMS", 265 .sname = "RSA_PSS_PARAMS",
264}; 266};
267LCRYPTO_ALIAS(RSA_PSS_PARAMS_it);
265 268
266RSA_PSS_PARAMS * 269RSA_PSS_PARAMS *
267d2i_RSA_PSS_PARAMS(RSA_PSS_PARAMS **a, const unsigned char **in, long len) 270d2i_RSA_PSS_PARAMS(RSA_PSS_PARAMS **a, const unsigned char **in, long len)
@@ -345,6 +348,7 @@ const ASN1_ITEM RSA_OAEP_PARAMS_it = {
345 .size = sizeof(RSA_OAEP_PARAMS), 348 .size = sizeof(RSA_OAEP_PARAMS),
346 .sname = "RSA_OAEP_PARAMS", 349 .sname = "RSA_OAEP_PARAMS",
347}; 350};
351LCRYPTO_ALIAS(RSA_OAEP_PARAMS_it);
348 352
349 353
350RSA_OAEP_PARAMS * 354RSA_OAEP_PARAMS *