aboutsummaryrefslogtreecommitdiff
path: root/crypto/bio
diff options
context:
space:
mode:
authorRich Salz <rsalz@openssl.org>2016-02-17 13:33:51 -0500
committerRich Salz <rsalz@openssl.org>2016-02-17 13:33:51 -0500
commit1288f26fb9c3cfe6c5919b706e30d3f0b2d55b0b (patch)
treecc6dbb9d0b81e76f68355b94ffe08f724e8e54f7 /crypto/bio
parentc7c4625693e653b7b3cff726cd7946326c720841 (diff)
downloadopenssl-1288f26fb9c3cfe6c5919b706e30d3f0b2d55b0b.zip
openssl-1288f26fb9c3cfe6c5919b706e30d3f0b2d55b0b.tar.gz
openssl-1288f26fb9c3cfe6c5919b706e30d3f0b2d55b0b.tar.bz2
RT4310: Fix varous no-XXX builds
When OPENSSL_NO_ASYNC is set, make ASYNC_{un,}block_pause() do nothing. This prevents md_rand.c from failing to build. Probably better to do it this way than to wrap every instance in an explicit #ifdef. A bunch of new socket code got added to a new file crypto/bio/b_addr.c. Make it all go away if OPENSSL_NO_SOCK is defined. Allow configuration with no-ripemd, no-ts, no-ui We use these for the UEFI build. Also remove the 'Really???' comment from no-err and no-locking. We use those too. We need to drop the crypto/engine directory from the build too, and also set OPENSSL_NO_ENGINE Signed-off-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto/bio')
-rw-r--r--crypto/bio/b_addr.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/bio/b_addr.c b/crypto/bio/b_addr.c
index e92876a..a46cf93 100644
--- a/crypto/bio/b_addr.c
+++ b/crypto/bio/b_addr.c
@@ -56,6 +56,7 @@
#include "bio_lcl.h"
+#ifndef OPENSSL_NO_SOCK
#include <openssl/err.h>
#include <openssl/buffer.h>
#include <ctype.h>
@@ -848,3 +849,4 @@ int BIO_lookup(const char *host, const char *service,
return ret;
}
+#endif /* OPENSSL_NO_SOCK */