Commit 5705e050 authored by Matt Caswell's avatar Matt Caswell
Browse files

Add ASYNC tests 

Add a suite of tests for the ASYNC_* functions

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 44a27ac2

test/Makefile

+7 −3
Changes for test/Makefile: 7 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ SSLVERTOLTEST= sslvertoltest 
SSLEXTENSIONTEST=	sslextensiontest

SSLSESSIONTICKTEST= 	sslsessionticktest

SSLSKEWITH0PTEST=	sslskewith0ptest

ASYNCTEST=	asynctest



TESTS=		alltests
@@ -97,7 +98,7 @@ EXE= $(NPTEST)$(EXE_EXT) $(BNTEST)$(EXE_EXT) $(ECTEST)$(EXE_EXT) \ 
	$(SRPTEST)$(EXE_EXT) $(V3NAMETEST)$(EXE_EXT) \

	$(HEARTBEATTEST)$(EXE_EXT) $(P5_CRPT2_TEST)$(EXE_EXT) \

	$(CONSTTIMETEST)$(EXE_EXT) $(VERIFYEXTRATEST)$(EXE_EXT) \

	$(CLIENTHELLOTEST)$(EXE_EXT) $(PACKETTEST)$(EXE_EXT)

	$(CLIENTHELLOTEST)$(EXE_EXT) $(PACKETTEST)$(EXE_EXT) $(ASYNCTEST)$(EXE_EXT)



# $(METHTEST)$(EXE_EXT)
@@ -113,7 +114,7 @@ OBJ= $(NPTEST).o $(BNTEST).o $(ECTEST).o \ 
	$(EVPTEST).o $(EVPEXTRATEST).o $(IGETEST).o $(JPAKETEST).o $(V3NAMETEST).o \

	$(GOST2814789TEST).o $(HEARTBEATTEST).o $(P5_CRPT2_TEST).o \

	$(CONSTTIMETEST).o $(VERIFYEXTRATEST).o $(CLIENTHELLOTEST).o \

	$(PACKETTEST).o testutil.o

	$(PACKETTEST).o $(ASYNCTEST).o testutil.o



SRC=	$(NPTEST).c $(BNTEST).c $(ECTEST).c \

	$(ECDSATEST).c $(ECDHTEST).c $(GMDIFFTEST).c $(PBELUTEST).c $(IDEATEST).c \
@@ -126,7 +127,7 @@ SRC= $(NPTEST).c $(BNTEST).c $(ECTEST).c \ 
	$(EVPTEST).c $(EVPEXTRATEST).c $(IGETEST).c $(JPAKETEST).c $(V3NAMETEST).c \

	$(GOST2814789TEST).c $(HEARTBEATTEST).c $(P5_CRPT2_TEST).c \

	$(CONSTTIMETEST).c $(VERIFYEXTRATEST).c $(CLIENTHELLOTEST).c \

	$(PACKETTEST).c testutil.c

	$(PACKETTEST).c $(ASYNCTEST).c testutil.c



HEADER=	testutil.h
@@ -364,6 +365,9 @@ $(CLIENTHELLOTEST)$(EXE_EXT): $(CLIENTHELLOTEST).o 
$(PACKETTEST)$(EXE_EXT): $(PACKETTEST).o

	@target=$(PACKETTEST) $(BUILD_CMD)



$(ASYNCTEST)$(EXE_EXT): $(ASYNCTEST).o

	@target=$(ASYNCTEST) $(BUILD_CMD)



#$(AESTEST).o: $(AESTEST).c

#	$(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c

test/asynctest.c

0 → 100644
+256 −0
Changes for test/asynctest.c: 256 added lines, 0 removed lines.
Original line number Diff line number Diff line 
/* test/asynctest.c */

/*

 * Written by Matt Caswell for the OpenSSL project.

 */

/* ====================================================================

 * Copyright (c) 2015 The OpenSSL Project.  All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

 * are met:

 *

 * 1. Redistributions of source code must retain the above copyright

 *    notice, this list of conditions and the following disclaimer.

 *

 * 2. Redistributions in binary form must reproduce the above copyright

 *    notice, this list of conditions and the following disclaimer in

 *    the documentation and/or other materials provided with the

 *    distribution.

 *

 * 3. All advertising materials mentioning features or use of this

 *    software must display the following acknowledgment:

 *    "This product includes software developed by the OpenSSL Project

 *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"

 *

 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to

 *    endorse or promote products derived from this software without

 *    prior written permission. For written permission, please contact

 *    openssl-core@openssl.org.

 *

 * 5. Products derived from this software may not be called "OpenSSL"

 *    nor may "OpenSSL" appear in their names without prior written

 *    permission of the OpenSSL Project.

 *

 * 6. Redistributions of any form whatsoever must retain the following

 *    acknowledgment:

 *    "This product includes software developed by the OpenSSL Project

 *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"

 *

 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY

 * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR

 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT

 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,

 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED

 * OF THE POSSIBILITY OF SUCH DAMAGE.

 * ====================================================================

 *

 * This product includes cryptographic software written by Eric Young

 * (eay@cryptsoft.com).  This product includes software written by Tim

 * Hudson (tjh@cryptsoft.com).

 *

 */



#include <stdio.h>

#include <string.h>

#include <openssl/async.h>

#include <openssl/crypto.h>

#include <../apps/apps.h>



#ifdef OPENSSL_SYS_UNIX

# include <unistd.h>

# if _POSIX_VERSION >= 200112L

#  define ASYNC_POSIX

# endif

#elif (defined(_WIN32) || defined(__CYGWIN__)) && defined(_WINDLL)

# define ASYNC_WIN

#endif



#if !defined(ASYNC_POSIX) && !defined(ASYNC_WIN)

# define ASYNC_NULL

#endif



static int ctr = 0;

static ASYNC_JOB *currjob = NULL;



static int only_pause(void *args)

{

    ASYNC_pause_job();



    return 1;

}



static int add_two(void *args)

{

    ctr++;

    ASYNC_pause_job();

    ctr++;



    return 2;

}



static int save_current(void *args)

{

    currjob = ASYNC_get_current_job();

    ASYNC_pause_job();



    return 1;

}



static int wake(void *args)

{

    ASYNC_pause_job();

    ASYNC_wake(ASYNC_get_current_job());

    ASYNC_pause_job();

    ASYNC_clear_wake(ASYNC_get_current_job());



    return 1;

}



static int test_ASYNC_init_pool()

{

    ASYNC_JOB *job1 = NULL, *job2 = NULL, *job3 = NULL;

    int funcret1, funcret2, funcret3;



    if (       !ASYNC_init_pool(2, 0)

            || ASYNC_start_job(&job1, &funcret1, only_pause, NULL, 0)

                != ASYNC_PAUSE

            || ASYNC_start_job(&job2, &funcret2, only_pause, NULL, 0)

                != ASYNC_PAUSE

            || ASYNC_start_job(&job3, &funcret3, only_pause, NULL, 0)

                != ASYNC_NO_JOBS

            || ASYNC_start_job(&job1, &funcret1, only_pause, NULL, 0)

                != ASYNC_FINISH

            || ASYNC_start_job(&job3, &funcret3, only_pause, NULL, 0)

                != ASYNC_PAUSE

            || ASYNC_start_job(&job2, &funcret2, only_pause, NULL, 0)

                != ASYNC_FINISH

            || ASYNC_start_job(&job3, &funcret3, only_pause, NULL, 0)

                != ASYNC_FINISH

            || funcret1 != 1

            || funcret2 != 1

            || funcret3 != 1) {

        fprintf(stderr, "test_ASYNC_init_pool() failed\n");

        ASYNC_free_pool();

        return 0;

    }



    ASYNC_free_pool();

    return 1;

}



static int test_ASYNC_start_job()

{

    ASYNC_JOB *job = NULL;

    int funcret;



    ctr = 0;



    if (       !ASYNC_init_pool(1, 0)

            || ASYNC_start_job(&job, &funcret, add_two, NULL, 0) != ASYNC_PAUSE

            || ctr != 1

            || ASYNC_start_job(&job, &funcret, add_two, NULL, 0) != ASYNC_FINISH

            || ctr != 2

            || funcret != 2) {

        fprintf(stderr, "test_ASYNC_start_job() failed\n");

        ASYNC_free_pool();

        return 0;

    }



    ASYNC_free_pool();

    return 1;

}



static int test_ASYNC_get_current_job()

{

    ASYNC_JOB *job = NULL;

    int funcret;



    currjob = NULL;



    if (       !ASYNC_init_pool(1, 0)

            || ASYNC_start_job(&job, &funcret, save_current, NULL, 0)

                != ASYNC_PAUSE

            || currjob != job

            || ASYNC_start_job(&job, &funcret, save_current, NULL, 0)

                != ASYNC_FINISH

            || funcret != 1) {

        fprintf(stderr, "test_ASYNC_get_current_job() failed\n");

        ASYNC_free_pool();

        return 0;

    }



    ASYNC_free_pool();

    return 1;

}



static int hasdata(int fd)

{

    fd_set checkfds;

    struct timeval tv;

    FD_ZERO(&checkfds);

    openssl_fdset(fd, &checkfds);

    memset(&tv, 0, sizeof tv);

    if (select(fd + 1, (void *)&checkfds, NULL, NULL, &tv) < 0)

        return -1;

    if (FD_ISSET(fd, &checkfds))

        return 1;

    return 0;

}



static int test_ASYNC_get_wait_fd()

{

    ASYNC_JOB *job = NULL;

    int funcret, fd;



    currjob = NULL;



    if (       !ASYNC_init_pool(1, 0)

            || ASYNC_start_job(&job, &funcret, wake, NULL, 0)

                != ASYNC_PAUSE

            || (fd = ASYNC_get_wait_fd(job)) < 0

            || hasdata(fd) != 0

            || ASYNC_start_job(&job, &funcret, save_current, NULL, 0)

                != ASYNC_PAUSE

            || hasdata(fd) != 1

            || (ASYNC_clear_wake(job), 0)

            || hasdata(fd) != 0

            || (ASYNC_wake(job), 0)

            || hasdata(fd) != 1

            || ASYNC_start_job(&job, &funcret, save_current, NULL, 0)

                != ASYNC_FINISH

            || funcret != 1) {

        fprintf(stderr, "test_ASYNC_get_wait_fd() failed\n");

        ASYNC_free_pool();

        return 0;

    }



    ASYNC_free_pool();

    return 1;

}



int main(int argc, char **argv)

{



#ifdef ASYNC_NULL

    fprintf(stderr, "NULL implementation - skipping async tests\n");

#else

    CRYPTO_malloc_debug_init();

    CRYPTO_set_mem_debug_options(V_CRYPTO_MDEBUG_ALL);

    CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);



    if (       !test_ASYNC_init_pool()

            || !test_ASYNC_start_job()

            || !test_ASYNC_get_current_job()

            || !test_ASYNC_get_wait_fd()) {

        return 1;

    }

#endif

    printf("PASS\n");

    return 0;

}

test/recipes/90-test_async.t

0 → 100644
+5 −0
Changes for test/recipes/90-test_async.t: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line 
#!/usr/bin/perl



use OpenSSL::Test::Simple;



simple_test("test_async", "asynctest", "async");