rpms
/
openssl3
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update patch dual-abi.patch to add the #define macros in implementation

Browse Source 
files instead of public header files

Related: rhbz#1903209
Signed-off-by: Sahana Prasad <sahana@redhat.com>
epel8
Sahana Prasad 3 years ago
parent a3158ae4f7
commit 529b968a17
2 changed files with 210 additions and 236 deletions
Show Stats Download Patch File Download Diff File

440
0019-dual-abi.patch
Unescape View File

@ -59,230 +59,6 @@ diff -up openssl-3.0.0-beta1/crypto/evp/kem.c.dual-abi openssl-3.0.0-beta1/crypt
void EVP_KEM_do_all_provided(OSSL_LIB_CTX *libctx, void EVP_KEM_do_all_provided(OSSL_LIB_CTX *libctx,
void (*fn)(EVP_KEM *kem, void *arg), void (*fn)(EVP_KEM *kem, void *arg),
diff -up openssl-3.0.0-beta1/include/openssl/decoder.h.dual-abi openssl-3.0.0-beta1/include/openssl/decoder.h
--- openssl-3.0.0-beta1/include/openssl/decoder.h.dual-abi 2021-07-02 12:39:19.758597953 +0200
+++ openssl-3.0.0-beta1/include/openssl/decoder.h 2021-07-02 13:21:55.717630285 +0200
@@ -32,9 +32,12 @@ int OSSL_DECODER_up_ref(OSSL_DECODER *en
void OSSL_DECODER_free(OSSL_DECODER *encoder);
const OSSL_PROVIDER *OSSL_DECODER_get0_provider(const OSSL_DECODER *encoder);
+# define OSSL_DECODER_provider OSSL_DECODER_get0_provider
const char *OSSL_DECODER_get0_properties(const OSSL_DECODER *encoder);
+# define OSSL_DECODER_properties OSSL_DECODER_get0_properties
const char *OSSL_DECODER_get0_name(const OSSL_DECODER *decoder);
const char *OSSL_DECODER_get0_description(const OSSL_DECODER *decoder);
+# define OSSL_DECODER_description OSSL_DECODER_get0_description
int OSSL_DECODER_is_a(const OSSL_DECODER *encoder, const char *name);
void OSSL_DECODER_do_all_provided(OSSL_LIB_CTX *libctx,
diff -up openssl-3.0.0-beta1/include/openssl/encoder.h.dual-abi openssl-3.0.0-beta1/include/openssl/encoder.h
--- openssl-3.0.0-beta1/include/openssl/encoder.h.dual-abi 2021-07-02 13:22:22.889885589 +0200
+++ openssl-3.0.0-beta1/include/openssl/encoder.h 2021-07-02 13:23:55.732757920 +0200
@@ -32,9 +32,12 @@ int OSSL_ENCODER_up_ref(OSSL_ENCODER *en
void OSSL_ENCODER_free(OSSL_ENCODER *encoder);
const OSSL_PROVIDER *OSSL_ENCODER_get0_provider(const OSSL_ENCODER *encoder);
+# define OSSL_ENCODER_provider OSSL_ENCODER_get0_provider
const char *OSSL_ENCODER_get0_properties(const OSSL_ENCODER *encoder);
+# define OSSL_ENCODER_properties OSSL_ENCODER_get0_properties
const char *OSSL_ENCODER_get0_name(const OSSL_ENCODER *kdf);
const char *OSSL_ENCODER_get0_description(const OSSL_ENCODER *kdf);
+# define OSSL_ENCODER_description OSSL_ENCODER_get0_description
int OSSL_ENCODER_is_a(const OSSL_ENCODER *encoder, const char *name);
void OSSL_ENCODER_do_all_provided(OSSL_LIB_CTX *libctx,
diff -up openssl-3.0.0-beta1/include/openssl/evp.h.dual-abi openssl-3.0.0-beta1/include/openssl/evp.h
--- openssl-3.0.0-beta1/include/openssl/evp.h.dual-abi 2021-07-02 11:06:34.316615418 +0200
+++ openssl-3.0.0-beta1/include/openssl/evp.h 2021-07-02 13:24:10.653898116 +0200
@@ -534,11 +534,13 @@ int EVP_MD_get_type(const EVP_MD *md);
const char *EVP_MD_get0_name(const EVP_MD *md);
# define EVP_MD_name EVP_MD_get0_name
const char *EVP_MD_get0_description(const EVP_MD *md);
+# define EVP_MD_description EVP_MD_get0_description
int EVP_MD_is_a(const EVP_MD *md, const char *name);
int EVP_MD_names_do_all(const EVP_MD *md,
void (*fn)(const char *name, void *data),
void *data);
const OSSL_PROVIDER *EVP_MD_get0_provider(const EVP_MD *md);
+#define EVP_MD_provider EVP_MD_get0_provider
int EVP_MD_get_pkey_type(const EVP_MD *md);
# define EVP_MD_pkey_type EVP_MD_get_pkey_type
int EVP_MD_get_size(const EVP_MD *md);
@@ -579,11 +581,13 @@ int EVP_CIPHER_get_nid(const EVP_CIPHER
const char *EVP_CIPHER_get0_name(const EVP_CIPHER *cipher);
# define EVP_CIPHER_name EVP_CIPHER_get0_name
const char *EVP_CIPHER_get0_description(const EVP_CIPHER *cipher);
+# define EVP_CIPHER_description EVP_CIPHER_get0_description
int EVP_CIPHER_is_a(const EVP_CIPHER *cipher, const char *name);
int EVP_CIPHER_names_do_all(const EVP_CIPHER *cipher,
void (*fn)(const char *name, void *data),
void *data);
const OSSL_PROVIDER *EVP_CIPHER_get0_provider(const EVP_CIPHER *cipher);
+# define EVP_CIPHER_provider EVP_CIPHER_get0_provider
int EVP_CIPHER_get_block_size(const EVP_CIPHER *cipher);
# define EVP_CIPHER_block_size EVP_CIPHER_get_block_size
# ifndef OPENSSL_NO_DEPRECATED_3_0
@@ -1198,15 +1202,19 @@ EVP_MAC *EVP_MAC_fetch(OSSL_LIB_CTX *lib
int EVP_MAC_up_ref(EVP_MAC *mac);
void EVP_MAC_free(EVP_MAC *mac);
const char *EVP_MAC_get0_name(const EVP_MAC *mac);
+# define EVP_MAC_name EVP_MAC_get0_name
const char *EVP_MAC_get0_description(const EVP_MAC *mac);
+# define EVP_MAC_description EVP_MAC_get0_description
int EVP_MAC_is_a(const EVP_MAC *mac, const char *name);
const OSSL_PROVIDER *EVP_MAC_get0_provider(const EVP_MAC *mac);
+# define EVP_MAC_provider EVP_MAC_get0_provider
int EVP_MAC_get_params(EVP_MAC *mac, OSSL_PARAM params[]);
EVP_MAC_CTX *EVP_MAC_CTX_new(EVP_MAC *mac);
void EVP_MAC_CTX_free(EVP_MAC_CTX *ctx);
EVP_MAC_CTX *EVP_MAC_CTX_dup(const EVP_MAC_CTX *src);
EVP_MAC *EVP_MAC_CTX_get0_mac(EVP_MAC_CTX *ctx);
+# define EVP_MAC_CTX_mac EVP_MAC_CTX_get0_mac
int EVP_MAC_CTX_get_params(EVP_MAC_CTX *ctx, OSSL_PARAM params[]);
int EVP_MAC_CTX_set_params(EVP_MAC_CTX *ctx, const OSSL_PARAM params[]);
@@ -1242,14 +1250,18 @@ EVP_RAND *EVP_RAND_fetch(OSSL_LIB_CTX *l
int EVP_RAND_up_ref(EVP_RAND *rand);
void EVP_RAND_free(EVP_RAND *rand);
const char *EVP_RAND_get0_name(const EVP_RAND *rand);
+# define EVP_RAND_name EVP_RAND_get0_name
const char *EVP_RAND_get0_description(const EVP_RAND *md);
+# define EVP_RAND_description EVP_RAND_get0_description
int EVP_RAND_is_a(const EVP_RAND *rand, const char *name);
const OSSL_PROVIDER *EVP_RAND_get0_provider(const EVP_RAND *rand);
+# define EVP_RAND_provider EVP_RAND_get0_provider
int EVP_RAND_get_params(EVP_RAND *rand, OSSL_PARAM params[]);
EVP_RAND_CTX *EVP_RAND_CTX_new(EVP_RAND *rand, EVP_RAND_CTX *parent);
void EVP_RAND_CTX_free(EVP_RAND_CTX *ctx);
EVP_RAND *EVP_RAND_CTX_get0_rand(EVP_RAND_CTX *ctx);
+# define EVP_RAND_CTX_rand EVP_RAND_CTX_get0_rand
int EVP_RAND_CTX_get_params(EVP_RAND_CTX *ctx, OSSL_PARAM params[]);
int EVP_RAND_CTX_set_params(EVP_RAND_CTX *ctx, const OSSL_PARAM params[]);
const OSSL_PARAM *EVP_RAND_gettable_params(const EVP_RAND *rand);
@@ -1282,7 +1294,9 @@ __owur int EVP_RAND_enable_locking(EVP_R
int EVP_RAND_verify_zeroization(EVP_RAND_CTX *ctx);
unsigned int EVP_RAND_get_strength(EVP_RAND_CTX *ctx);
+# define EVP_RAND_strength EVP_RAND_get_strength
int EVP_RAND_get_state(EVP_RAND_CTX *ctx);
+# define EVP_RAND_state EVP_RAND_get_state
# define EVP_RAND_STATE_UNINITIALISED 0
# define EVP_RAND_STATE_READY 1
@@ -1757,8 +1771,11 @@ EVP_KEYMGMT *EVP_KEYMGMT_fetch(OSSL_LIB_
int EVP_KEYMGMT_up_ref(EVP_KEYMGMT *keymgmt);
void EVP_KEYMGMT_free(EVP_KEYMGMT *keymgmt);
const OSSL_PROVIDER *EVP_KEYMGMT_get0_provider(const EVP_KEYMGMT *keymgmt);
+# define EVP_KEYMGMT_provider EVP_KEYMGMT_get0_provider
const char *EVP_KEYMGMT_get0_name(const EVP_KEYMGMT *keymgmt);
+# define EVP_KEYMGMT_name EVP_KEYMGMT_get0_name
const char *EVP_KEYMGMT_get0_description(const EVP_KEYMGMT *keymgmt);
+# define EVP_KEYMGMT_description EVP_KEYMGMT_get0_description
int EVP_KEYMGMT_is_a(const EVP_KEYMGMT *keymgmt, const char *name);
void EVP_KEYMGMT_do_all_provided(OSSL_LIB_CTX *libctx,
void (*fn)(EVP_KEYMGMT *keymgmt, void *arg),
@@ -1838,11 +1855,14 @@ void *EVP_PKEY_CTX_get_app_data(EVP_PKEY
void EVP_SIGNATURE_free(EVP_SIGNATURE *signature);
int EVP_SIGNATURE_up_ref(EVP_SIGNATURE *signature);
OSSL_PROVIDER *EVP_SIGNATURE_get0_provider(const EVP_SIGNATURE *signature);
+# define EVP_SIGNATURE_provider EVP_SIGNATURE_get0_provider
EVP_SIGNATURE *EVP_SIGNATURE_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
const char *properties);
int EVP_SIGNATURE_is_a(const EVP_SIGNATURE *signature, const char *name);
const char *EVP_SIGNATURE_get0_name(const EVP_SIGNATURE *signature);
+# define EVP_SIGNATURE_name EVP_SIGNATURE_get0_name
const char *EVP_SIGNATURE_get0_description(const EVP_SIGNATURE *signature);
+# define EVP_SIGNATURE_description EVP_SIGNATURE_get0_description
void EVP_SIGNATURE_do_all_provided(OSSL_LIB_CTX *libctx,
void (*fn)(EVP_SIGNATURE *signature,
void *data),
@@ -1856,11 +1876,14 @@ const OSSL_PARAM *EVP_SIGNATURE_settable
void EVP_ASYM_CIPHER_free(EVP_ASYM_CIPHER *cipher);
int EVP_ASYM_CIPHER_up_ref(EVP_ASYM_CIPHER *cipher);
OSSL_PROVIDER *EVP_ASYM_CIPHER_get0_provider(const EVP_ASYM_CIPHER *cipher);
+# define EVP_ASYM_CIPHER_provider EVP_ASYM_CIPHER_get0_provider
EVP_ASYM_CIPHER *EVP_ASYM_CIPHER_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
const char *properties);
int EVP_ASYM_CIPHER_is_a(const EVP_ASYM_CIPHER *cipher, const char *name);
const char *EVP_ASYM_CIPHER_get0_name(const EVP_ASYM_CIPHER *cipher);
+# define EVP_ASYM_CIPHER_name EVP_ASYM_CIPHER_get0_name
const char *EVP_ASYM_CIPHER_get0_description(const EVP_ASYM_CIPHER *cipher);
+# define EVP_ASYM_CIPHER_description EVP_ASYM_CIPHER_get0_description
void EVP_ASYM_CIPHER_do_all_provided(OSSL_LIB_CTX *libctx,
void (*fn)(EVP_ASYM_CIPHER *cipher,
void *arg),
@@ -1874,11 +1897,14 @@ const OSSL_PARAM *EVP_ASYM_CIPHER_settab
void EVP_KEM_free(EVP_KEM *wrap);
int EVP_KEM_up_ref(EVP_KEM *wrap);
OSSL_PROVIDER *EVP_KEM_get0_provider(const EVP_KEM *wrap);
+# define EVP_KEM_provider EVP_KEM_get0_provider
EVP_KEM *EVP_KEM_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
const char *properties);
int EVP_KEM_is_a(const EVP_KEM *wrap, const char *name);
const char *EVP_KEM_get0_name(const EVP_KEM *wrap);
+# define EVP_KEM_name EVP_KEM_get0_name
const char *EVP_KEM_get0_description(const EVP_KEM *wrap);
+# define EVP_KEM_description EVP_KEM_get0_description
void EVP_KEM_do_all_provided(OSSL_LIB_CTX *libctx,
void (*fn)(EVP_KEM *wrap, void *arg), void *arg);
int EVP_KEM_names_do_all(const EVP_KEM *wrap,
@@ -2140,9 +2166,12 @@ int EVP_KEYEXCH_up_ref(EVP_KEYEXCH *exch
EVP_KEYEXCH *EVP_KEYEXCH_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
const char *properties);
OSSL_PROVIDER *EVP_KEYEXCH_get0_provider(const EVP_KEYEXCH *exchange);
+# define EVP_KEYEXCH_provider EVP_KEYEXCH_get0_provider
int EVP_KEYEXCH_is_a(const EVP_KEYEXCH *keyexch, const char *name);
const char *EVP_KEYEXCH_get0_name(const EVP_KEYEXCH *keyexch);
+# define EVP_KEYEXCH_name EVP_KEYEXCH_get0_name
const char *EVP_KEYEXCH_get0_description(const EVP_KEYEXCH *keyexch);
+# define EVP_KEYEXCH_description EVP_KEYEXCH_get0_description
void EVP_KEYEXCH_do_all_provided(OSSL_LIB_CTX *libctx,
void (*fn)(EVP_KEYEXCH *keyexch, void *data),
void *data);
diff -up openssl-3.0.0-beta1/include/openssl/kdf.h.dual-abi openssl-3.0.0-beta1/include/openssl/kdf.h
--- openssl-3.0.0-beta1/include/openssl/kdf.h.dual-abi 2021-07-02 11:26:04.355711366 +0200
+++ openssl-3.0.0-beta1/include/openssl/kdf.h 2021-07-02 11:57:44.950361808 +0200
@@ -34,9 +34,12 @@ EVP_KDF_CTX *EVP_KDF_CTX_new(EVP_KDF *kd
void EVP_KDF_CTX_free(EVP_KDF_CTX *ctx);
EVP_KDF_CTX *EVP_KDF_CTX_dup(const EVP_KDF_CTX *src);
const char *EVP_KDF_get0_description(const EVP_KDF *kdf);
+# define EVP_KDF_description EVP_KDF_get0_description
int EVP_KDF_is_a(const EVP_KDF *kdf, const char *name);
const char *EVP_KDF_get0_name(const EVP_KDF *kdf);
+# define EVP_KDF_name EVP_KDF_get0_name
const OSSL_PROVIDER *EVP_KDF_get0_provider(const EVP_KDF *kdf);
+# define EVP_KDF_provider EVP_KDF_get0_provider
const EVP_KDF *EVP_KDF_CTX_kdf(EVP_KDF_CTX *ctx);
void EVP_KDF_CTX_reset(EVP_KDF_CTX *ctx);
diff -up openssl-3.0.0-beta1/include/openssl/provider.h.dual-abi openssl-3.0.0-beta1/include/openssl/provider.h
--- openssl-3.0.0-beta1/include/openssl/provider.h.dual-abi 2021-07-02 13:53:27.941487991 +0200
+++ openssl-3.0.0-beta1/include/openssl/provider.h 2021-07-02 13:54:12.265889498 +0200
@@ -52,6 +52,7 @@ int OSSL_PROVIDER_add_builtin(OSSL_LIB_C
/* Information */
const char *OSSL_PROVIDER_get0_name(const OSSL_PROVIDER *prov);
+# define OSSL_PROVIDER_name OSSL_PROVIDER_get0_name
# ifdef __cplusplus
}
diff -up openssl-3.0.0-beta1/include/openssl/store.h.dual-abi openssl-3.0.0-beta1/include/openssl/store.h
--- openssl-3.0.0-beta1/include/openssl/store.h.dual-abi 2021-07-02 13:54:41.990088355 +0200
+++ openssl-3.0.0-beta1/include/openssl/store.h 2021-07-02 13:56:05.817649168 +0200
@@ -260,8 +260,11 @@ int OSSL_STORE_LOADER_up_ref(OSSL_STORE_
void OSSL_STORE_LOADER_free(OSSL_STORE_LOADER *loader);
const OSSL_PROVIDER *OSSL_STORE_LOADER_get0_provider(const OSSL_STORE_LOADER *
loader);
+# define OSSL_STORE_LOADER_provider OSSL_STORE_LOADER_get0_provider
const char *OSSL_STORE_LOADER_get0_properties(const OSSL_STORE_LOADER *loader);
+# define OSSL_STORE_LOADER_properties OSSL_STORE_LOADER_get0_properties
const char *OSSL_STORE_LOADER_get0_description(const OSSL_STORE_LOADER *loader);
+# define OSSL_STORE_LOADER_description OSSL_STORE_LOADER_get0_description
int OSSL_STORE_LOADER_is_a(const OSSL_STORE_LOADER *loader,
const char *scheme);
void OSSL_STORE_LOADER_do_all_provided(OSSL_LIB_CTX *libctx,
diff -up openssl-3.0.0-beta1/crypto/encode_decode/decoder_meth.c.dual-abi openssl-3.0.0-beta1/crypto/encode_decode/decoder_meth.c diff -up openssl-3.0.0-beta1/crypto/encode_decode/decoder_meth.c.dual-abi openssl-3.0.0-beta1/crypto/encode_decode/decoder_meth.c
--- openssl-3.0.0-beta1/crypto/encode_decode/decoder_meth.c.dual-abi 2021-07-12 23:22:43.652838373 +0200 --- openssl-3.0.0-beta1/crypto/encode_decode/decoder_meth.c.dual-abi 2021-07-12 23:22:43.652838373 +0200
+++ openssl-3.0.0-beta1/crypto/encode_decode/decoder_meth.c 2021-07-12 23:40:46.085974883 +0200 +++ openssl-3.0.0-beta1/crypto/encode_decode/decoder_meth.c 2021-07-12 23:40:46.085974883 +0200
@ -1158,17 +934,6 @@ diff -up openssl-3.0.0-beta1/crypto/store/store_meth.c.dual-abi openssl-3.0.0-be
int OSSL_STORE_LOADER_up_ref(OSSL_STORE_LOADER *loader) int OSSL_STORE_LOADER_up_ref(OSSL_STORE_LOADER *loader)
{ {
int ref = 0; int ref = 0;
diff -up openssl-3.0.0-beta1/include/openssl/evp.h.dual-abi openssl-3.0.0-beta1/include/openssl/evp.h
--- openssl-3.0.0-beta1/include/openssl/evp.h.dual-abi 2021-07-13 10:36:25.622755098 +0200
+++ openssl-3.0.0-beta1/include/openssl/evp.h 2021-07-13 10:36:43.680926345 +0200
@@ -1394,6 +1394,7 @@ int EVP_PKEY_up_ref(EVP_PKEY *pkey);
EVP_PKEY *EVP_PKEY_dup(EVP_PKEY *pkey);
void EVP_PKEY_free(EVP_PKEY *pkey);
const char *EVP_PKEY_get0_description(const EVP_PKEY *pkey);
+#define EVP_PKEY_description EVP_PKEY_get0_description
EVP_PKEY *d2i_PublicKey(int type, EVP_PKEY **a, const unsigned char **pp,
long length);
diff -up openssl-3.0.0-beta1/crypto/http/http_client.c.dual-abi openssl-3.0.0-beta1/crypto/http/http_client.c diff -up openssl-3.0.0-beta1/crypto/http/http_client.c.dual-abi openssl-3.0.0-beta1/crypto/http/http_client.c
--- openssl-3.0.0-beta1/crypto/http/http_client.c.dual-abi 2021-07-13 22:47:01.463713204 +0200 --- openssl-3.0.0-beta1/crypto/http/http_client.c.dual-abi 2021-07-13 22:47:01.463713204 +0200
+++ openssl-3.0.0-beta1/crypto/http/http_client.c 2021-07-13 22:46:32.064435146 +0200 +++ openssl-3.0.0-beta1/crypto/http/http_client.c 2021-07-13 22:46:32.064435146 +0200
@ -1319,3 +1084,208 @@ diff -up openssl-3.0.0-beta1/util/libcrypto.num.dual-abi openssl-3.0.0-beta1/uti
OSSL_STORE_LOADER_properties ? 3_0_0 EXIST::FUNCTION: OSSL_STORE_LOADER_properties ? 3_0_0 EXIST::FUNCTION:
OSSL_STORE_LOADER_provider ? 3_0_0 EXIST::FUNCTION: OSSL_STORE_LOADER_provider ? 3_0_0 EXIST::FUNCTION:
-OCSP_sendreq_nbio ? 3_0_0 EXIST::FUNCTION: -OCSP_sendreq_nbio ? 3_0_0 EXIST::FUNCTION:
diff -up openssl-3.0.0-beta1/crypto/encode_decode/decoder_meth.c.dual-abi openssl-3.0.0-beta1/crypto/encode_decode/decoder_meth.c
--- openssl-3.0.0-beta1/crypto/encode_decode/decoder_meth.c.dual-abi 2021-07-17 22:00:59.773016162 +0200
+++ openssl-3.0.0-beta1/crypto/encode_decode/decoder_meth.c 2021-07-17 22:02:15.768898376 +0200
@@ -38,6 +38,9 @@
#define RHEL_ALIAS1(old_id) \
RHEL_ALIAS3(RHEL_ALIAS_##old_id, old_id, #old_id)
+#define OSSL_DECODER_provider OSSL_DECODER_get0_provider
+#define OSSL_DECODER_properties OSSL_DECODER_get0_properties
+#define OSSL_DECODER_description OSSL_DECODER_get0_description
/* Simple method structure constructor and destructor */
static OSSL_DECODER *ossl_decoder_new(void)
{
diff -up openssl-3.0.0-beta1/crypto/encode_decode/encoder_meth.c.dual-abi openssl-3.0.0-beta1/crypto/encode_decode/encoder_meth.c
--- openssl-3.0.0-beta1/crypto/encode_decode/encoder_meth.c.dual-abi 2021-07-17 22:11:45.414684273 +0200
+++ openssl-3.0.0-beta1/crypto/encode_decode/encoder_meth.c 2021-07-17 22:13:31.863953270 +0200
@@ -38,6 +38,10 @@
#define RHEL_ALIAS1(old_id) \
RHEL_ALIAS3(RHEL_ALIAS_##old_id, old_id, #old_id)
+#define OSSL_ENCODER_provider OSSL_ENCODER_get0_provider
+#define OSSL_ENCODER_properties OSSL_ENCODER_get0_properties
+#define OSSL_ENCODER_description OSSL_ENCODER_get0_description
+
/* Simple method structure constructor and destructor */
static OSSL_ENCODER *ossl_encoder_new(void)
{
diff -up openssl-3.0.0-beta1/crypto/evp/asymcipher.c.dual-abi openssl-3.0.0-beta1/crypto/evp/asymcipher.c
--- openssl-3.0.0-beta1/crypto/evp/asymcipher.c.dual-abi 2021-07-17 22:41:57.601106537 +0200
+++ openssl-3.0.0-beta1/crypto/evp/asymcipher.c 2021-07-17 22:43:21.232142660 +0200
@@ -32,6 +32,10 @@
#define RHEL_ALIAS1(old_id) \
RHEL_ALIAS3(RHEL_ALIAS_##old_id, old_id, #old_id)
+#define EVP_ASYM_CIPHER_provider EVP_ASYM_CIPHER_get0_provider
+#define EVP_ASYM_CIPHER_name EVP_ASYM_CIPHER_get0_name
+#define EVP_ASYM_CIPHER_description EVP_ASYM_CIPHER_get0_description
+
static int evp_pkey_asym_cipher_init(EVP_PKEY_CTX *ctx, int operation,
const OSSL_PARAM params[])
{
diff -up openssl-3.0.0-beta1/crypto/evp/evp_lib.c.dual-abi openssl-3.0.0-beta1/crypto/evp/evp_lib.c
--- openssl-3.0.0-beta1/crypto/evp/evp_lib.c.dual-abi 2021-07-17 22:24:40.140969959 +0200
+++ openssl-3.0.0-beta1/crypto/evp/evp_lib.c 2021-07-17 22:25:50.977834241 +0200
@@ -43,6 +43,10 @@
#define RHEL_ALIAS1(old_id) \
RHEL_ALIAS3(RHEL_ALIAS_##old_id, old_id, #old_id)
+#define EVP_MD_description EVP_MD_get0_description
+#define EVP_MD_provider EVP_MD_get0_provider
+#define EVP_CIPHER_description EVP_CIPHER_get0_description
+#define EVP_CIPHER_provider EVP_CIPHER_get0_provider
#if !defined(FIPS_MODULE)
diff -up openssl-3.0.0-beta1/crypto/evp/evp_rand.c.dual-abi openssl-3.0.0-beta1/crypto/evp/evp_rand.c
--- openssl-3.0.0-beta1/crypto/evp/evp_rand.c.dual-abi 2021-07-17 22:29:25.742454581 +0200
+++ openssl-3.0.0-beta1/crypto/evp/evp_rand.c 2021-07-17 22:33:36.158699400 +0200
@@ -41,6 +41,12 @@
#define RHEL_ALIAS1(old_id) \
RHEL_ALIAS3(RHEL_ALIAS_##old_id, old_id, #old_id)
+#define EVP_RAND_name EVP_RAND_get0_name
+#define EVP_RAND_description EVP_RAND_get0_description
+#define EVP_RAND_provider EVP_RAND_get0_provider
+#define EVP_RAND_CTX_rand EVP_RAND_CTX_get0_rand
+#define EVP_RAND_strength EVP_RAND_get_strength
+#define EVP_RAND_state EVP_RAND_get_state
struct evp_rand_st {
OSSL_PROVIDER *prov;
diff -up openssl-3.0.0-beta1/crypto/evp/kdf_lib.c.dual-abi openssl-3.0.0-beta1/crypto/evp/kdf_lib.c
--- openssl-3.0.0-beta1/crypto/evp/kdf_lib.c.dual-abi 2021-07-19 11:05:37.011176112 +0200
+++ openssl-3.0.0-beta1/crypto/evp/kdf_lib.c 2021-07-19 11:07:00.979312903 +0200
@@ -38,6 +38,10 @@
#define RHEL_ALIAS1(old_id) \
RHEL_ALIAS3(RHEL_ALIAS_##old_id, old_id, #old_id)
+#define EVP_KDF_description EVP_KDF_get0_description
+#define EVP_KDF_name EVP_KDF_get0_name
+#define EVP_KDF_provider EVP_KDF_get0_provider
+
EVP_KDF_CTX *EVP_KDF_CTX_new(EVP_KDF *kdf)
{
EVP_KDF_CTX *ctx = NULL;
diff -up openssl-3.0.0-beta1/crypto/evp/kem.c.dual-abi openssl-3.0.0-beta1/crypto/evp/kem.c
--- openssl-3.0.0-beta1/crypto/evp/kem.c.dual-abi 2021-07-17 22:43:48.398479226 +0200
+++ openssl-3.0.0-beta1/crypto/evp/kem.c 2021-07-17 22:57:43.456546917 +0200
@@ -32,6 +32,10 @@
#define RHEL_ALIAS1(old_id) \
RHEL_ALIAS3(RHEL_ALIAS_##old_id, old_id, #old_id)
+#define EVP_KEM_provider EVP_KEM_get0_provider
+#define EVP_KEM_name EVP_KEM_get0_name
+#define EVP_KEM_description EVP_KEM_get0_description
+
static int evp_kem_init(EVP_PKEY_CTX *ctx, int operation,
const OSSL_PARAM params[])
{
diff -up openssl-3.0.0-beta1/crypto/evp/keymgmt_meth.c.dual-abi openssl-3.0.0-beta1/crypto/evp/keymgmt_meth.c
--- openssl-3.0.0-beta1/crypto/evp/keymgmt_meth.c.dual-abi 2021-07-17 22:37:22.080738360 +0200
+++ openssl-3.0.0-beta1/crypto/evp/keymgmt_meth.c 2021-07-17 22:39:05.847978640 +0200
@@ -32,6 +32,10 @@
#define RHEL_ALIAS1(old_id) \
RHEL_ALIAS3(RHEL_ALIAS_##old_id, old_id, #old_id)
+#define EVP_KEYMGMT_provider EVP_KEYMGMT_get0_provider
+#define EVP_KEYMGMT_name EVP_KEYMGMT_get0_name
+#define EVP_KEYMGMT_description EVP_KEYMGMT_get0_description
+
static void *keymgmt_new(void)
{
EVP_KEYMGMT *keymgmt = NULL;
diff -up openssl-3.0.0-beta1/crypto/evp/mac_lib.c.dual-abi openssl-3.0.0-beta1/crypto/evp/mac_lib.c
--- openssl-3.0.0-beta1/crypto/evp/mac_lib.c.dual-abi 2021-07-17 22:26:15.364131776 +0200
+++ openssl-3.0.0-beta1/crypto/evp/mac_lib.c 2021-07-17 22:29:32.718539694 +0200
@@ -34,6 +34,10 @@
#define RHEL_ALIAS1(old_id) \
RHEL_ALIAS3(RHEL_ALIAS_##old_id, old_id, #old_id)
+#define EVP_MAC_name EVP_MAC_get0_name
+#define EVP_MAC_description EVP_MAC_get0_description
+# define EVP_MAC_CTX_mac EVP_MAC_CTX_get0_mac
+
EVP_MAC_CTX *EVP_MAC_CTX_new(EVP_MAC *mac)
{
EVP_MAC_CTX *ctx = OPENSSL_zalloc(sizeof(EVP_MAC_CTX));
diff -up openssl-3.0.0-beta1/crypto/evp/mac_meth.c.dual-abi openssl-3.0.0-beta1/crypto/evp/mac_meth.c
--- openssl-3.0.0-beta1/crypto/evp/mac_meth.c.dual-abi 2021-07-17 22:27:04.406730147 +0200
+++ openssl-3.0.0-beta1/crypto/evp/mac_meth.c 2021-07-17 22:30:30.482255830 +0200
@@ -22,6 +22,8 @@
#define RHEL_ALIAS1(old_id) \
RHEL_ALIAS3(RHEL_ALIAS_##old_id, old_id, #old_id)
+# define EVP_MAC_provider EVP_MAC_get0_provider
+
static int evp_mac_up_ref(void *vmac)
{
EVP_MAC *mac = vmac;
diff -up openssl-3.0.0-beta1/crypto/evp/signature.c.dual-abi openssl-3.0.0-beta1/crypto/evp/signature.c
--- openssl-3.0.0-beta1/crypto/evp/signature.c.dual-abi 2021-07-17 22:40:02.942686000 +0200
+++ openssl-3.0.0-beta1/crypto/evp/signature.c 2021-07-17 22:41:27.180729654 +0200
@@ -33,6 +33,10 @@
#define RHEL_ALIAS1(old_id) \
RHEL_ALIAS3(RHEL_ALIAS_##old_id, old_id, #old_id)
+#define EVP_SIGNATURE_provider EVP_SIGNATURE_get0_provider
+#define EVP_SIGNATURE_name EVP_SIGNATURE_get0_name
+#define EVP_SIGNATURE_description EVP_SIGNATURE_get0_description
+
static EVP_SIGNATURE *evp_signature_new(OSSL_PROVIDER *prov)
{
EVP_SIGNATURE *signature = OPENSSL_zalloc(sizeof(EVP_SIGNATURE));
diff -up openssl-3.0.0-beta1/crypto/provider.c.dual-abi openssl-3.0.0-beta1/crypto/provider.c
--- openssl-3.0.0-beta1/crypto/provider.c.dual-abi 2021-07-19 11:07:31.301723423 +0200
+++ openssl-3.0.0-beta1/crypto/provider.c 2021-07-19 11:08:09.354238585 +0200
@@ -28,6 +28,8 @@
#define RHEL_ALIAS1(old_id) \
RHEL_ALIAS3(RHEL_ALIAS_##old_id, old_id, #old_id)
+#define OSSL_PROVIDER_name OSSL_PROVIDER_get0_name
+
OSSL_PROVIDER *OSSL_PROVIDER_try_load(OSSL_LIB_CTX *libctx, const char *name,
int retain_fallbacks)
{
diff -up openssl-3.0.0-beta1/crypto/store/store_meth.c.dual-abi openssl-3.0.0-beta1/crypto/store/store_meth.c
--- openssl-3.0.0-beta1/crypto/store/store_meth.c.dual-abi 2021-07-19 11:09:38.398444097 +0200
+++ openssl-3.0.0-beta1/crypto/store/store_meth.c 2021-07-19 12:35:14.153417504 +0200
@@ -30,6 +30,10 @@
#define RHEL_ALIAS1(old_id) \
RHEL_ALIAS3(RHEL_ALIAS_##old_id, old_id, #old_id)
+#define OSSL_STORE_LOADER_provider OSSL_STORE_LOADER_get0_provider
+#define OSSL_STORE_LOADER_properties OSSL_STORE_LOADER_get0_properties
+#define OSSL_STORE_LOADER_description OSSL_STORE_LOADER_get0_description
+
int OSSL_STORE_LOADER_up_ref(OSSL_STORE_LOADER *loader)
{
int ref = 0;
diff -up openssl-3.0.0-beta1/crypto/evp/exchange.c.dual-abi openssl-3.0.0-beta1/crypto/evp/exchange.c
--- openssl-3.0.0-beta1/crypto/evp/exchange.c.dual-abi 2021-07-19 12:53:41.708859841 +0200
+++ openssl-3.0.0-beta1/crypto/evp/exchange.c 2021-07-19 12:54:27.782435636 +0200
@@ -32,6 +32,10 @@
#define RHEL_ALIAS1(old_id) \
RHEL_ALIAS3(RHEL_ALIAS_##old_id, old_id, #old_id)
+#define EVP_KEYEXCH_provider EVP_KEYEXCH_get0_provider
+#define EVP_KEYEXCH_name EVP_KEYEXCH_get0_name
+#define EVP_KEYEXCH_description EVP_KEYEXCH_get0_description
+
static EVP_KEYEXCH *evp_keyexch_new(OSSL_PROVIDER *prov)
{
EVP_KEYEXCH *exchange = OPENSSL_zalloc(sizeof(EVP_KEYEXCH));
diff -up openssl-3.0.0-beta1/crypto/evp/p_lib.c.dual-abi openssl-3.0.0-beta1/crypto/evp/p_lib.c
--- openssl-3.0.0-beta1/crypto/evp/p_lib.c.dual-abi 2021-07-19 13:07:31.799790073 +0200
+++ openssl-3.0.0-beta1/crypto/evp/p_lib.c 2021-07-19 13:08:23.334480304 +0200
@@ -64,6 +64,8 @@
#define RHEL_ALIAS1(old_id) \
RHEL_ALIAS3(RHEL_ALIAS_##old_id, old_id, #old_id)
+#define EVP_PKEY_description EVP_PKEY_get0_description
+
static int pkey_set_type(EVP_PKEY *pkey, ENGINE *e, int type, const char *str,
int len, EVP_KEYMGMT *keymgmt);
static void evp_pkey_free_it(EVP_PKEY *key);

6
openssl.spec
Unescape View File

@ -15,7 +15,7 @@
Summary: Utilities from the general purpose cryptography library with TLS implementation Summary: Utilities from the general purpose cryptography library with TLS implementation
Name: openssl Name: openssl
Version: 3.0.0 Version: 3.0.0
Release: 0.beta1.2%{?dist} Release: 0.beta1.3%{?dist}
Epoch: 1 Epoch: 1
# We have to remove certain patented algorithms from the openssl source # We have to remove certain patented algorithms from the openssl source
# tarball with the hobble-openssl script which is included below. # tarball with the hobble-openssl script which is included below.
@ -380,6 +380,10 @@ install -m644 %{SOURCE9} \
%ldconfig_scriptlets libs %ldconfig_scriptlets libs
%changelog %changelog
* Mon Jul 19 2021 Sahana Prasad <sahana@redhat.com> 3.0.0-0.beta1.3
- Update patch dual-abi.patch to add the #define macros in implementation
files instead of public header files
* Wed Jul 14 2021 Sahana Prasad <sahana@redhat.com> 3.0.0-0.beta1.2 * Wed Jul 14 2021 Sahana Prasad <sahana@redhat.com> 3.0.0-0.beta1.2
- Removes unused patch dual-abi.patch - Removes unused patch dual-abi.patch

Write Preview
Loading…
Cancel
Save