summaryrefslogtreecommitdiff
path: root/Cryptlib/OpenSSL/crypto/err
diff options
context:
space:
mode:
authorMathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>2015-05-06 09:49:41 -0400
committerMathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>2015-05-06 09:49:41 -0400
commita14921c5944c340056312f2f5b1728d698f628b1 (patch)
tree110242b91b3ade02e586bd65b9aedb05511bd34a /Cryptlib/OpenSSL/crypto/err
parent72bb39c0237f8bcc3afa8b623e8b097eec6d69cd (diff)
parent7361f67dbd7f7fe98a807d3d12f90a87262124d6 (diff)
downloadefi-boot-shim-a14921c5944c340056312f2f5b1728d698f628b1.tar.gz
efi-boot-shim-a14921c5944c340056312f2f5b1728d698f628b1.zip
Import upstream version 0.8
Diffstat (limited to 'Cryptlib/OpenSSL/crypto/err')
-rw-r--r--[-rwxr-xr-x]Cryptlib/OpenSSL/crypto/err/err.c0
-rw-r--r--[-rwxr-xr-x]Cryptlib/OpenSSL/crypto/err/err_all.c2
-rw-r--r--[-rwxr-xr-x]Cryptlib/OpenSSL/crypto/err/err_bio.c0
-rw-r--r--[-rwxr-xr-x]Cryptlib/OpenSSL/crypto/err/err_def.c0
-rw-r--r--[-rwxr-xr-x]Cryptlib/OpenSSL/crypto/err/err_prn.c0
-rw-r--r--[-rwxr-xr-x]Cryptlib/OpenSSL/crypto/err/err_str.c0
6 files changed, 2 insertions, 0 deletions
diff --git a/Cryptlib/OpenSSL/crypto/err/err.c b/Cryptlib/OpenSSL/crypto/err/err.c
index a25e5b30..a25e5b30 100755..100644
--- a/Cryptlib/OpenSSL/crypto/err/err.c
+++ b/Cryptlib/OpenSSL/crypto/err/err.c
diff --git a/Cryptlib/OpenSSL/crypto/err/err_all.c b/Cryptlib/OpenSSL/crypto/err/err_all.c
index 39796f7c..0429389f 100755..100644
--- a/Cryptlib/OpenSSL/crypto/err/err_all.c
+++ b/Cryptlib/OpenSSL/crypto/err/err_all.c
@@ -104,7 +104,9 @@
#ifndef OPENSSL_NO_JPAKE
#include <openssl/jpake.h>
#endif
+#ifndef OPENSSL_NO_COMP
#include <openssl/comp.h>
+#endif
void ERR_load_crypto_strings(void)
{
diff --git a/Cryptlib/OpenSSL/crypto/err/err_bio.c b/Cryptlib/OpenSSL/crypto/err/err_bio.c
index a42f8048..a42f8048 100755..100644
--- a/Cryptlib/OpenSSL/crypto/err/err_bio.c
+++ b/Cryptlib/OpenSSL/crypto/err/err_bio.c
diff --git a/Cryptlib/OpenSSL/crypto/err/err_def.c b/Cryptlib/OpenSSL/crypto/err/err_def.c
index 7ed3d849..7ed3d849 100755..100644
--- a/Cryptlib/OpenSSL/crypto/err/err_def.c
+++ b/Cryptlib/OpenSSL/crypto/err/err_def.c
diff --git a/Cryptlib/OpenSSL/crypto/err/err_prn.c b/Cryptlib/OpenSSL/crypto/err/err_prn.c
index 1e46f93e..1e46f93e 100755..100644
--- a/Cryptlib/OpenSSL/crypto/err/err_prn.c
+++ b/Cryptlib/OpenSSL/crypto/err/err_prn.c
diff --git a/Cryptlib/OpenSSL/crypto/err/err_str.c b/Cryptlib/OpenSSL/crypto/err/err_str.c
index d3904088..d3904088 100755..100644
--- a/Cryptlib/OpenSSL/crypto/err/err_str.c
+++ b/Cryptlib/OpenSSL/crypto/err/err_str.c