mirror of
https://github.com/openssl/openssl.git
synced 2024-12-03 05:41:46 +08:00
46994f7163
OPENSSL_SUPPRESS_DEPRECATED only does half the job, in telling the
deprecation macros not to add the warning attribute. However, with
'no-deprecated', the symbols are still removed entirely, while we
might still want to use them internally.
The solution is to permit <openssl/opensslconf.h> macros to be
modified internally, such as undefining OPENSSL_NO_DEPRECATED in this
case.
However, with the way <openssl/opensslconf.h> includes
<openssl/macros.h>, that's easier said than done. That's solved by
generating <openssl/configuration.h> instead, and add a new
<openssl/opensslconf.h> that includes <openssl/configuration.h> as
well as <openssl/macros.h>, thus allowing to replace an inclusion of
<openssl/opensslconf.h> with this:
#include <openssl/configuration.h>
#undef OPENSSL_NO_DEPRECATED
#define OPENSSL_SUPPRESS_DEPRECATED
#include <openssl/macros.h>
Or simply add the following prior to any other openssl inclusion:
#include <openssl/configuration.h>
#undef OPENSSL_NO_DEPRECATED
#define OPENSSL_SUPPRESS_DEPRECATED
Note that undefining OPENSSL_NO_DEPRECATED must never be done by
applications, since the symbols must still be exported by the
library. Internal test programs are excempt of this rule, though.
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/10608)
37 lines
1.3 KiB
Plaintext
37 lines
1.3 KiB
Plaintext
# Note that some of these directories are filtered in Configure. Look for
|
|
# %skipdir there for further explanations.
|
|
SUBDIRS=crypto ssl apps test util tools fuzz engines providers doc
|
|
|
|
LIBS=libcrypto libssl
|
|
INCLUDE[libcrypto]=. include
|
|
INCLUDE[libssl]=. include
|
|
DEPEND[libssl]=libcrypto
|
|
|
|
# Empty DEPEND "indices" means the dependencies are expected to be built
|
|
# unconditionally before anything else.
|
|
DEPEND[]=include/openssl/configuration.h include/openssl/opensslv.h \
|
|
include/crypto/bn_conf.h include/crypto/dso_conf.h \
|
|
doc/man7/openssl_user_macros.pod
|
|
|
|
GENERATE[include/openssl/configuration.h]=include/openssl/configuration.h.in
|
|
GENERATE[include/openssl/opensslv.h]=include/openssl/opensslv.h.in
|
|
GENERATE[include/crypto/bn_conf.h]=include/crypto/bn_conf.h.in
|
|
GENERATE[include/crypto/dso_conf.h]=include/crypto/dso_conf.h.in
|
|
GENERATE[doc/man7/openssl_user_macros.pod]=doc/man7/openssl_user_macros.pod.in
|
|
|
|
IF[{- defined $target{shared_defflag} -}]
|
|
SHARED_SOURCE[libcrypto]=libcrypto.ld
|
|
SHARED_SOURCE[libssl]=libssl.ld
|
|
|
|
GENERATE[libcrypto.ld]=util/libcrypto.num libcrypto
|
|
GENERATE[libssl.ld]=util/libssl.num libssl
|
|
ENDIF
|
|
|
|
IF[{- $config{target} =~ /^(?:Cygwin|mingw|VC-)/ -}]
|
|
GENERATE[libcrypto.rc]=util/mkrc.pl libcrypto
|
|
GENERATE[libssl.rc]=util/mkrc.pl libssl
|
|
|
|
SHARED_SOURCE[libcrypto]=libcrypto.rc
|
|
SHARED_SOURCE[libssl]=libssl.rc
|
|
ENDIF
|