From 62f18837e161d982ece761650e31494cb100129f Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Sat, 2 Nov 2019 13:44:19 +0000
Subject: Make RSA_OAEP_PARAMs public.

---
 src/lib/libcrypto/Symbols.list   |  5 +++++
 src/lib/libcrypto/rsa/rsa.h      | 17 ++++++++++++++++-
 src/lib/libcrypto/rsa/rsa_locl.h | 17 +----------------
 3 files changed, 22 insertions(+), 17 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libcrypto/Symbols.list b/src/lib/libcrypto/Symbols.list
index ac7f603482..ea6913d8f6 100644
--- a/src/lib/libcrypto/Symbols.list
+++ b/src/lib/libcrypto/Symbols.list
@@ -2409,6 +2409,9 @@ RSAPrivateKey_dup
 RSAPrivateKey_it
 RSAPublicKey_dup
 RSAPublicKey_it
+RSA_OAEP_PARAMS_free
+RSA_OAEP_PARAMS_it
+RSA_OAEP_PARAMS_new
 RSA_PKCS1_SSLeay
 RSA_PSS_PARAMS_free
 RSA_PSS_PARAMS_it
@@ -3477,6 +3480,7 @@ d2i_RSAPublicKey
 d2i_RSAPublicKey_bio
 d2i_RSAPublicKey_fp
 d2i_RSA_NET
+d2i_RSA_OAEP_PARAMS
 d2i_RSA_PSS_PARAMS
 d2i_RSA_PUBKEY
 d2i_RSA_PUBKEY_bio
@@ -3693,6 +3697,7 @@ i2d_RSAPublicKey
 i2d_RSAPublicKey_bio
 i2d_RSAPublicKey_fp
 i2d_RSA_NET
+i2d_RSA_OAEP_PARAMS
 i2d_RSA_PSS_PARAMS
 i2d_RSA_PUBKEY
 i2d_RSA_PUBKEY_bio
diff --git a/src/lib/libcrypto/rsa/rsa.h b/src/lib/libcrypto/rsa/rsa.h
index 638bad7cc6..0c6f5b920d 100644
--- a/src/lib/libcrypto/rsa/rsa.h
+++ b/src/lib/libcrypto/rsa/rsa.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa.h,v 1.47 2019/11/01 15:13:05 jsing Exp $ */
+/* $OpenBSD: rsa.h,v 1.48 2019/11/02 13:44:19 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -361,6 +361,21 @@ RSA_PSS_PARAMS *d2i_RSA_PSS_PARAMS(RSA_PSS_PARAMS **a, const unsigned char **in,
 int i2d_RSA_PSS_PARAMS(RSA_PSS_PARAMS *a, unsigned char **out);
 extern const ASN1_ITEM RSA_PSS_PARAMS_it;
 
+typedef struct rsa_oaep_params_st {
+	X509_ALGOR *hashFunc;
+	X509_ALGOR *maskGenFunc;
+	X509_ALGOR *pSourceFunc;
+
+	/* Hash algorithm decoded from maskGenFunc. */
+	X509_ALGOR *maskHash;
+} RSA_OAEP_PARAMS;
+
+RSA_OAEP_PARAMS *RSA_OAEP_PARAMS_new(void);
+void RSA_OAEP_PARAMS_free(RSA_OAEP_PARAMS *a);
+RSA_OAEP_PARAMS *d2i_RSA_OAEP_PARAMS(RSA_OAEP_PARAMS **a, const unsigned char **in, long len);
+int i2d_RSA_OAEP_PARAMS(RSA_OAEP_PARAMS *a, unsigned char **out);
+extern const ASN1_ITEM RSA_OAEP_PARAMS_it;
+
 int RSA_print_fp(FILE *fp, const RSA *r, int offset);
 
 #ifndef OPENSSL_NO_BIO
diff --git a/src/lib/libcrypto/rsa/rsa_locl.h b/src/lib/libcrypto/rsa/rsa_locl.h
index 621c89dc76..ef4dddd16b 100644
--- a/src/lib/libcrypto/rsa/rsa_locl.h
+++ b/src/lib/libcrypto/rsa/rsa_locl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa_locl.h,v 1.9 2019/11/01 03:45:13 jsing Exp $ */
+/* $OpenBSD: rsa_locl.h,v 1.10 2019/11/02 13:44:19 jsing Exp $ */
 
 __BEGIN_HIDDEN_DECLS
 
@@ -13,21 +13,6 @@ RSA_PSS_PARAMS *rsa_pss_params_create(const EVP_MD *sigmd, const EVP_MD *mgf1md,
 int rsa_pss_get_param(const RSA_PSS_PARAMS *pss, const EVP_MD **pmd,
     const EVP_MD **pmgf1md, int *psaltlen);
 
-typedef struct rsa_oaep_params_st {
-	X509_ALGOR *hashFunc;
-	X509_ALGOR *maskGenFunc;
-	X509_ALGOR *pSourceFunc;
-
-	/* Hash algorithm decoded from maskGenFunc. */
-	X509_ALGOR *maskHash;
-} RSA_OAEP_PARAMS;
-
-RSA_OAEP_PARAMS *RSA_OAEP_PARAMS_new(void);
-void RSA_OAEP_PARAMS_free(RSA_OAEP_PARAMS *a);
-RSA_OAEP_PARAMS *d2i_RSA_OAEP_PARAMS(RSA_OAEP_PARAMS **a, const unsigned char **in, long len);
-int i2d_RSA_OAEP_PARAMS(RSA_OAEP_PARAMS *a, unsigned char **out);
-extern const ASN1_ITEM RSA_OAEP_PARAMS_it;
-
 extern int int_rsa_verify(int dtype, const unsigned char *m,
     unsigned int m_len, unsigned char *rm, size_t *prm_len,
     const unsigned char *sigbuf, size_t siglen, RSA *rsa);
-- 
cgit v1.2.3-55-g6feb