Commit aec23ece authored by Richard Levitte's avatar Richard Levitte
Browse files

Don't run OCSP tests when OCSP is disabled 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2173)
parent 8f8c11d8

test/recipes/70-test_sslmessages.t

+52 −42
Original line number Diff line number Diff line
@@ -168,6 +168,10 @@ checkhandshake($proxy, checkhandshake::RESUME_HANDSHAKE, 
               "Resumption handshake test");

unlink $session;



SKIP: {

    skip "No OCSP support in this OpenSSL build", 3

        if disabled("ocsp");



    #Test 3: A status_request handshake (client request only)

    $proxy->clear();

    $proxy->clientflags("-no_tls1_3 -status");
@@ -198,6 +202,7 @@ checkhandshake($proxy, checkhandshake::OCSP_HANDSHAKE, 
                   | checkhandshake::STATUS_REQUEST_CLI_EXTENSION

                   | checkhandshake::STATUS_REQUEST_SRV_EXTENSION,

                   "status_request handshake test");

}



#Test 6: A client auth handshake

$proxy->clear();
@@ -276,8 +281,8 @@ checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE, 
               "ALPN handshake test");



SKIP: {

    skip "No CT and/or EC support in this OpenSSL build", 1

        if disabled("ct") || disabled("ec");

    skip "No CT, EC or OCSP support in this OpenSSL build", 1

        if disabled("ct") || disabled("ec") || disabled("ocsp");



    #Test 14: SCT handshake (client request only)

    $proxy->clear();
@@ -294,6 +299,10 @@ SKIP: { 
                   "SCT handshake test (client)");

}



SKIP: {

    skip "No OCSP support in this OpenSSL build", 1

        if disabled("ocsp");



    #Test 15: SCT handshake (server support only)

    $proxy->clear();

    #Note: -ct also sends status_request
@@ -304,10 +313,11 @@ $proxy->start(); 
    checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,

                   checkhandshake::DEFAULT_EXTENSIONS,

                   "SCT handshake test (server)");

}



SKIP: {

    skip "No CT and/or EC support in this OpenSSL build", 1

        if disabled("ct") || disabled("ec");

    skip "No CT, EC or OCSP support in this OpenSSL build", 1

        if disabled("ct") || disabled("ec") || disabled("ocsp");



    #Test 16: SCT handshake (client and server)

    #There is no built-in server side support for this so we are actually also