Commit
32387e0081db ("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 commit
32387e0081db.
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>
$(OPENSSL_PATH)/ssl/ssl_asn1.c\r
$(OPENSSL_PATH)/ssl/ssl_txt.c\r
$(OPENSSL_PATH)/ssl/ssl_algs.c\r
$(OPENSSL_PATH)/ssl/ssl_asn1.c\r
$(OPENSSL_PATH)/ssl/ssl_txt.c\r
$(OPENSSL_PATH)/ssl/ssl_algs.c\r
+ $(OPENSSL_PATH)/ssl/ssl_conf.c\r
$(OPENSSL_PATH)/ssl/bio_ssl.c\r
$(OPENSSL_PATH)/ssl/ssl_err.c\r
$(OPENSSL_PATH)/ssl/kssl.c\r
$(OPENSSL_PATH)/ssl/bio_ssl.c\r
$(OPENSSL_PATH)/ssl/ssl_err.c\r
$(OPENSSL_PATH)/ssl/kssl.c\r
#ifndef OPENSSL_NO_POSIX_IO\r
# define OPENSSL_NO_POSIX_IO\r
#endif\r
#ifndef OPENSSL_NO_POSIX_IO\r
# define OPENSSL_NO_POSIX_IO\r
#endif\r
-#ifndef OPENSSL_NO_PQUEUE\r
-# define OPENSSL_NO_PQUEUE\r
-#endif\r
#ifndef OPENSSL_NO_RC2\r
# define OPENSSL_NO_RC2\r
#endif\r
#ifndef OPENSSL_NO_RC2\r
# define OPENSSL_NO_RC2\r
#endif\r
# if defined(OPENSSL_NO_POSIX_IO) && !defined(NO_POSIX_IO)\r
# define NO_POSIX_IO\r
# endif\r
# if defined(OPENSSL_NO_POSIX_IO) && !defined(NO_POSIX_IO)\r
# define NO_POSIX_IO\r
# endif\r
-# if defined(OPENSSL_NO_PQUEUE) && !defined(NO_PQUEUE)\r
-# define NO_PQUEUE\r
-# endif\r
# if defined(OPENSSL_NO_RC2) && !defined(NO_RC2)\r
# define NO_RC2\r
# endif\r
# if defined(OPENSSL_NO_RC2) && !defined(NO_RC2)\r
# define NO_RC2\r
# endif\r