diff options
| author | Matt Caswell <matt@openssl.org> | 2015-10-05 22:58:01 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-11-20 23:34:35 +0000 |
| commit | 7240557b7d6a06cd7e4cd50e52fb1e62d0a750e0 (patch) | |
| tree | 9c5508026833bec2f49e0f9aa87e0a7f6b34467c /test | |
| parent | 5705e05037938623f701092ec84dae90d191091c (diff) | |
Fix ASYNC null implementation
The ASYNC null implementation has not kept pace with the rest of the async
development and so was failing to compile.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile | 16 | ||||
| -rw-r--r-- | test/asynctest.c | 3 |
2 files changed, 19 insertions, 0 deletions
diff --git a/test/Makefile b/test/Makefile index c93586fe5b..efab36667b 100644 --- a/test/Makefile +++ b/test/Makefile @@ -383,6 +383,22 @@ dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO) # DO NOT DELETE THIS LINE -- make depend depends on it. +asynctest.o: ../e_os.h ../include/../apps/apps.h ../include/../apps/progs.h +asynctest.o: ../include/openssl/asn1.h ../include/openssl/async.h +asynctest.o: ../include/openssl/bio.h ../include/openssl/buffer.h +asynctest.o: ../include/openssl/conf.h ../include/openssl/crypto.h +asynctest.o: ../include/openssl/e_os2.h ../include/openssl/ec.h +asynctest.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h +asynctest.o: ../include/openssl/engine.h ../include/openssl/evp.h +asynctest.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h +asynctest.o: ../include/openssl/objects.h ../include/openssl/ocsp.h +asynctest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h +asynctest.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h +asynctest.o: ../include/openssl/safestack.h ../include/openssl/sha.h +asynctest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h +asynctest.o: ../include/openssl/txt_db.h ../include/openssl/x509.h +asynctest.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h +asynctest.o: asynctest.c bftest.o: ../e_os.h ../include/openssl/blowfish.h ../include/openssl/e_os2.h bftest.o: ../include/openssl/opensslconf.h bftest.c bntest.o: ../crypto/bn/bn_lcl.h ../crypto/include/internal/bn_int.h ../e_os.h diff --git a/test/asynctest.c b/test/asynctest.c index a0e2e1d11e..9ce23fbec2 100644 --- a/test/asynctest.c +++ b/test/asynctest.c @@ -75,6 +75,8 @@ # define ASYNC_NULL #endif +#ifndef ASYNC_NULL + static int ctr = 0; static ASYNC_JOB *currjob = NULL; @@ -233,6 +235,7 @@ static int test_ASYNC_get_wait_fd() ASYNC_free_pool(); return 1; } +#endif int main(int argc, char **argv) { |