Commit 5869303daa for openssl.org
commit 5869303daaecf037f0d00dc33a00f9bdc1e71f2f
Author: giorgiopapini <giorgio.papini04@gmail.com>
Date: Thu Feb 12 22:34:51 2026 +0100
Move typedef 'RSA_OEAP_PARAMS' to openssl/types.h
This avoids redefinition of the type.
CLA: trivial
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Frederik Wedel-Heinen <fwh.openssl@gmail.com>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
MergeDate: Wed Feb 18 13:09:26 2026
(Merged from https://github.com/openssl/openssl/pull/29994)
diff --git a/include/openssl/rsa.h b/include/openssl/rsa.h
index ef1e7d06c8..b789d4bf59 100644
--- a/include/openssl/rsa.h
+++ b/include/openssl/rsa.h
@@ -333,13 +333,13 @@ struct rsa_pss_params_st {
DECLARE_ASN1_FUNCTIONS(RSA_PSS_PARAMS)
DECLARE_ASN1_DUP_FUNCTION(RSA_PSS_PARAMS)
-typedef struct rsa_oaep_params_st {
+struct rsa_oaep_params_st {
X509_ALGOR *hashFunc;
X509_ALGOR *maskGenFunc;
X509_ALGOR *pSourceFunc;
/* Decoded hash algorithm from maskGenFunc */
X509_ALGOR *maskHash;
-} RSA_OAEP_PARAMS;
+};
DECLARE_ASN1_FUNCTIONS(RSA_OAEP_PARAMS)
diff --git a/include/openssl/types.h b/include/openssl/types.h
index 592201a189..ef7d2c1f3c 100644
--- a/include/openssl/types.h
+++ b/include/openssl/types.h
@@ -149,7 +149,9 @@ typedef struct dsa_method DSA_METHOD;
typedef struct rsa_st RSA;
typedef struct rsa_meth_st RSA_METHOD;
#endif
+
typedef struct rsa_pss_params_st RSA_PSS_PARAMS;
+typedef struct rsa_oaep_params_st RSA_OAEP_PARAMS;
#ifndef OPENSSL_NO_DEPRECATED_3_0
typedef struct ec_key_st EC_KEY;