Skip to content

Commit

Permalink
CryptoPkg/OpensslLib: refresh OpensslLib.inf, opensslconf.h after 323…
Browse files Browse the repository at this point in the history
…87e0

Commit 32387e0 ("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 32387e0.

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 <[email protected]>
Cc: Gary Lin <[email protected]>
Cc: Jiaxin Wu <[email protected]>
Cc: Jordan Justen <[email protected]>
Cc: Qin Long <[email protected]>
Cc: Ruiyu Ni <[email protected]>
Cc: Ting Ye <[email protected]>
Cc: Tomas Hoger <[email protected]>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <[email protected]>
Reviewed-by: Qin Long <[email protected]>
  • Loading branch information
lersek committed Feb 25, 2017
1 parent 7b30036 commit 4e719ab
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
1 change: 1 addition & 0 deletions CryptoPkg/Library/OpensslLib/OpensslLib.inf
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,7 @@
$(OPENSSL_PATH)/ssl/ssl_asn1.c
$(OPENSSL_PATH)/ssl/ssl_txt.c
$(OPENSSL_PATH)/ssl/ssl_algs.c
$(OPENSSL_PATH)/ssl/ssl_conf.c
$(OPENSSL_PATH)/ssl/bio_ssl.c
$(OPENSSL_PATH)/ssl/ssl_err.c
$(OPENSSL_PATH)/ssl/kssl.c
Expand Down
6 changes: 0 additions & 6 deletions CryptoPkg/Library/OpensslLib/opensslconf.h
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,6 @@ extern "C" {
#ifndef OPENSSL_NO_POSIX_IO
# define OPENSSL_NO_POSIX_IO
#endif
#ifndef OPENSSL_NO_PQUEUE
# define OPENSSL_NO_PQUEUE
#endif
#ifndef OPENSSL_NO_RC2
# define OPENSSL_NO_RC2
#endif
Expand Down Expand Up @@ -263,9 +260,6 @@ extern "C" {
# if defined(OPENSSL_NO_POSIX_IO) && !defined(NO_POSIX_IO)
# define NO_POSIX_IO
# endif
# if defined(OPENSSL_NO_PQUEUE) && !defined(NO_PQUEUE)
# define NO_PQUEUE
# endif
# if defined(OPENSSL_NO_RC2) && !defined(NO_RC2)
# define NO_RC2
# endif
Expand Down

0 comments on commit 4e719ab

Please sign in to comment.