diff options
| author | Adam Langley <agl@google.com> | 2015-04-01 11:29:03 -0700 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2015-04-01 11:35:18 -0700 |
| commit | d6759e4ce635fabf01e7919ef070e114d54b455b (patch) | |
| tree | da47155e1904661be32da14828c5c659d120f691 /futility | |
| parent | 4e4c19602edf3834b50d66d3ba067e895aca6fa0 (diff) | |
| download | vboot_reference-d6759e4ce635fabf01e7919ef070e114d54b455b.tar.gz | |
vboot: fix name-collision with OpenSSL.
vboot currently uses the |SHA256_CTX| name, which is claimed by OpenSSL.
To work around this, it defines OPENSSL_NO_SHA, but that can't be done
at compile time:
The OPENSSL_NO_* defines are set by OpenSSL to reflect the configuration
that it was built with so that users of OpenSSL can disable features as
needed. They can affect the contents of structures any thus the ABI of
the library.
If these defines are set outside of OpenSSL, then the library and the
code that uses it will have incompatible ABIs. At that point it's only
functioning by blind luck.
This change renames the name-collisions so that this hack isn't needed.
This is the same change as was made internally in cl/85758149.
Change-Id: I709da2507f341896d89d50129ce30ffb111a20d1
Diffstat (limited to 'futility')
| -rw-r--r-- | futility/cmd_create.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/futility/cmd_create.c b/futility/cmd_create.c index f4eb3f2a..bd155d4f 100644 --- a/futility/cmd_create.c +++ b/futility/cmd_create.c @@ -7,7 +7,6 @@ #include <stdio.h> #include <unistd.h> -#define OPENSSL_NO_SHA #include <openssl/pem.h> #include "2sysincludes.h" |