mirror of https://github.com/acidanthera/audk.git
CryptoPkg/OpensslLib: refresh OpensslLib.inf, opensslconf.h after 32387e00
Commit32387e0081
("CryptoPkg: Enable ssl build in OpensslLib directly", 2016-12-14) removed the "no-queue" configuration option in "process_files.sh", plus it enabled "process_files.sh" to place all libssl source files into "OpensslLib.inf". However, the patch apparently failed to capture two changes originating from the above actions: - the definitions of the OPENSSL_NO_PQUEUE and NO_PQUEUE macros were not removed from "opensslconf.h", - "ssl/ssl_conf.c" was not added to "OpensslLib.inf". Refresh these files, completing commit32387e0081
. I built OVMF with -D SECURE_BOOT_ENABLE -D TLS_ENABLE, and ArmVirtQemu with -D SECURE_BOOT_ENABLE, after this fix, and experienced no regression. Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> Cc: Gary Lin <glin@suse.com> Cc: Jiaxin Wu <jiaxin.wu@intel.com> Cc: Jordan Justen <jordan.l.justen@intel.com> Cc: Qin Long <qin.long@intel.com> Cc: Ruiyu Ni <ruiyu.ni@intel.com> Cc: Ting Ye <ting.ye@intel.com> Cc: Tomas Hoger <thoger@redhat.com> Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Qin Long <qin.long@intel.com>
This commit is contained in:
parent
7b30036b5e
commit
4e719ab5d1
|
@ -516,6 +516,7 @@
|
||||||
$(OPENSSL_PATH)/ssl/ssl_asn1.c
|
$(OPENSSL_PATH)/ssl/ssl_asn1.c
|
||||||
$(OPENSSL_PATH)/ssl/ssl_txt.c
|
$(OPENSSL_PATH)/ssl/ssl_txt.c
|
||||||
$(OPENSSL_PATH)/ssl/ssl_algs.c
|
$(OPENSSL_PATH)/ssl/ssl_algs.c
|
||||||
|
$(OPENSSL_PATH)/ssl/ssl_conf.c
|
||||||
$(OPENSSL_PATH)/ssl/bio_ssl.c
|
$(OPENSSL_PATH)/ssl/bio_ssl.c
|
||||||
$(OPENSSL_PATH)/ssl/ssl_err.c
|
$(OPENSSL_PATH)/ssl/ssl_err.c
|
||||||
$(OPENSSL_PATH)/ssl/kssl.c
|
$(OPENSSL_PATH)/ssl/kssl.c
|
||||||
|
|
|
@ -92,9 +92,6 @@ extern "C" {
|
||||||
#ifndef OPENSSL_NO_POSIX_IO
|
#ifndef OPENSSL_NO_POSIX_IO
|
||||||
# define OPENSSL_NO_POSIX_IO
|
# define OPENSSL_NO_POSIX_IO
|
||||||
#endif
|
#endif
|
||||||
#ifndef OPENSSL_NO_PQUEUE
|
|
||||||
# define OPENSSL_NO_PQUEUE
|
|
||||||
#endif
|
|
||||||
#ifndef OPENSSL_NO_RC2
|
#ifndef OPENSSL_NO_RC2
|
||||||
# define OPENSSL_NO_RC2
|
# define OPENSSL_NO_RC2
|
||||||
#endif
|
#endif
|
||||||
|
@ -263,9 +260,6 @@ extern "C" {
|
||||||
# if defined(OPENSSL_NO_POSIX_IO) && !defined(NO_POSIX_IO)
|
# if defined(OPENSSL_NO_POSIX_IO) && !defined(NO_POSIX_IO)
|
||||||
# define NO_POSIX_IO
|
# define NO_POSIX_IO
|
||||||
# endif
|
# endif
|
||||||
# if defined(OPENSSL_NO_PQUEUE) && !defined(NO_PQUEUE)
|
|
||||||
# define NO_PQUEUE
|
|
||||||
# endif
|
|
||||||
# if defined(OPENSSL_NO_RC2) && !defined(NO_RC2)
|
# if defined(OPENSSL_NO_RC2) && !defined(NO_RC2)
|
||||||
# define NO_RC2
|
# define NO_RC2
|
||||||
# endif
|
# endif
|
||||||
|
|
Loading…
Reference in New Issue