diff options
| author | Rich Salz <rsalz@akamai.com> | 2019-07-01 20:54:53 +0200 |
|---|---|---|
| committer | Rich Salz <rsalz@akamai.com> | 2019-07-02 01:42:12 +0200 |
| commit | 66e2dbc01cb20b267bf132c945f49c303f63d7c4 (patch) | |
| tree | 571e3f69cf798486a7dc587370606c8d655d1d00 /util | |
| parent | Remove DES_check_key global (diff) | |
| download | openssl-66e2dbc01cb20b267bf132c945f49c303f63d7c4.tar.xz openssl-66e2dbc01cb20b267bf132c945f49c303f63d7c4.zip | |
Remove global-var/function macros
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/9284)
Diffstat (limited to 'util')
| -rw-r--r-- | util/libcrypto.num | 2 | ||||
| -rw-r--r-- | util/missingmacro.txt | 1 | ||||
| -rw-r--r-- | util/perl/OpenSSL/ParseC.pm | 13 |
3 files changed, 0 insertions, 16 deletions
diff --git a/util/libcrypto.num b/util/libcrypto.num index 9d95dabaaa..7d775134d9 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -2052,8 +2052,6 @@ ENGINE_unregister_RSA 2033 3_0_0 EXIST::FUNCTION:ENGINE EC_GROUP_order_bits 2034 3_0_0 EXIST::FUNCTION:EC d2i_CMS_bio 2035 3_0_0 EXIST::FUNCTION:CMS OPENSSL_sk_num 2036 3_0_0 EXIST::FUNCTION: -_shadow_DES_check_key 2037 3_0_0 NOEXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:DES -_shadow_DES_check_key 2037 3_0_0 NOEXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:DES CMS_RecipientInfo_set0_pkey 2038 3_0_0 EXIST::FUNCTION:CMS X509_STORE_CTX_set_default 2039 3_0_0 EXIST::FUNCTION: AES_wrap_key 2040 3_0_0 EXIST::FUNCTION: diff --git a/util/missingmacro.txt b/util/missingmacro.txt index ef429c6a28..db4ce86eb3 100644 --- a/util/missingmacro.txt +++ b/util/missingmacro.txt @@ -63,7 +63,6 @@ CRYPTO_get_dynlock_destroy_callback OpenSSLDie OPENSSL_assert DSA_is_prime -OPENSSL_GLOBAL_REF ECParameters_dup ENGINE_load_openssl ENGINE_load_dynamic diff --git a/util/perl/OpenSSL/ParseC.pm b/util/perl/OpenSSL/ParseC.pm index 59b08e8dca..8e5b8b2e0a 100644 --- a/util/perl/OpenSSL/ParseC.pm +++ b/util/perl/OpenSSL/ParseC.pm @@ -256,19 +256,6 @@ my @opensslchandlers = ( # an error. ##### - # Global variable stuff - { regexp => qr/OPENSSL_DECLARE_GLOBAL<<<\((.*),\s*(.*)\)>>>;/, - massager => sub { return (<<"EOF"); -#ifndef OPENSSL_EXPORT_VAR_AS_FUNCTION -OPENSSL_EXPORT $1 _shadow_$2; -#else -$1 *_shadow_$2(void); -#endif -EOF - }, - }, - - ##### # Deprecated stuff, by OpenSSL release. # We trick the parser by pretending that the declaration is wrapped in a |