Commit 0d8da779 authored by Matt Caswell's avatar Matt Caswell
Browse files

Test an old style PSK callback with no cert will prefer SHA-256 



If using an old style PSK callback and no certificate is configured for
the server, we should prefer ciphersuites based on SHA-256, because that
is the default hash for those callbacks as specified in the TLSv1.3 spec.

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

test/sslapitest.c

+88 −68
Original line number Diff line number Diff line
@@ -2781,6 +2781,13 @@ static int test_ciphersuite_change(void) 
    return testresult;

}



/*

 * Test TLSv1.3 PSKs

 * Test 0 = Test new style callbacks

 * Test 1 = Test both new and old style callbacks

 * Test 2 = Test old style callbacks

 * Test 3 = Test old style callbacks with no certificate

 */

static int test_tls13_psk(int idx)

{

    SSL_CTX *sctx = NULL, *cctx = NULL;
@@ -2796,15 +2803,21 @@ static int test_tls13_psk(int idx) 


    if (!TEST_true(create_ssl_ctx_pair(TLS_server_method(), TLS_client_method(),

                                       TLS1_VERSION, TLS_MAX_VERSION,

                                       &sctx, &cctx, cert, privkey)))

                                       &sctx, &cctx, idx == 3 ? NULL : cert,

                                       idx == 3 ? NULL : privkey)))

        goto end;



    if (idx != 3) {

        /*

     * We use a ciphersuite with SHA256 to ease testing old style PSK callbacks

     * which will always default to SHA256

         * We use a ciphersuite with SHA256 to ease testing old style PSK

         * callbacks which will always default to SHA256. This should not be

         * necessary if we have no cert/priv key. In that case the server should

         * prefer SHA256 automatically.

         */

    if (!TEST_true(SSL_CTX_set_ciphersuites(cctx, "TLS_AES_128_GCM_SHA256")))

        if (!TEST_true(SSL_CTX_set_ciphersuites(cctx,

                                                "TLS_AES_128_GCM_SHA256")))

            goto end;

    }



    /*

     * Test 0: New style callbacks only
@@ -2816,7 +2829,7 @@ static int test_tls13_psk(int idx) 
        SSL_CTX_set_psk_find_session_callback(sctx, find_session_cb);

    }

#ifndef OPENSSL_NO_PSK

    if (idx == 1 || idx == 2) {

    if (idx >= 1) {

        SSL_CTX_set_psk_client_callback(cctx, psk_client_cb);

        SSL_CTX_set_psk_server_callback(sctx, psk_server_cb);

    }
@@ -2827,7 +2840,11 @@ static int test_tls13_psk(int idx) 
    psk_client_cb_cnt = 0;

    psk_server_cb_cnt = 0;



    /* Check we can create a connection if callback decides not to send a PSK */

    if (idx != 3) {

        /*

         * Check we can create a connection if callback decides not to send a

         * PSK

         */

        if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,

                                                 NULL, NULL))

                || !TEST_true(create_ssl_connection(serverssl, clientssl,
@@ -2857,6 +2874,7 @@ static int test_tls13_psk(int idx) 
        shutdown_ssl_connection(serverssl, clientssl);

        serverssl = clientssl = NULL;

        use_session_cb_cnt = psk_client_cb_cnt = 0;

    }



    if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,

                                             NULL, NULL)))
@@ -2937,6 +2955,7 @@ static int test_tls13_psk(int idx) 
    use_session_cb_cnt = find_session_cb_cnt = 0;

    psk_client_cb_cnt = psk_server_cb_cnt = 0;



    if (idx != 3) {

        /*

         * Check that if the server rejects the PSK we can still connect, but with

         * a full handshake
@@ -2970,6 +2989,7 @@ static int test_tls13_psk(int idx) 


        shutdown_ssl_connection(serverssl, clientssl);

        serverssl = clientssl = NULL;

    }

    testresult = 1;



 end:
@@ -4640,7 +4660,7 @@ int setup_tests(void) 
#ifdef OPENSSL_NO_PSK

    ADD_ALL_TESTS(test_tls13_psk, 1);

#else

    ADD_ALL_TESTS(test_tls13_psk, 3);

    ADD_ALL_TESTS(test_tls13_psk, 4);

#endif  /* OPENSSL_NO_PSK */

    ADD_ALL_TESTS(test_custom_exts, 5);

    ADD_TEST(test_stateless);

test/ssltestlib.c

+9 −6
Original line number Diff line number Diff line
@@ -594,12 +594,15 @@ int create_ssl_ctx_pair(const SSL_METHOD *sm, const SSL_METHOD *cm, 
                                                            max_proto_version)))))

        goto err;



    if (certfile != NULL && privkeyfile != NULL) {

        if (!TEST_int_eq(SSL_CTX_use_certificate_file(serverctx, certfile,

                                                      SSL_FILETYPE_PEM), 1)

            || !TEST_int_eq(SSL_CTX_use_PrivateKey_file(serverctx, privkeyfile,

                || !TEST_int_eq(SSL_CTX_use_PrivateKey_file(serverctx,

                                                            privkeyfile,

                                                            SSL_FILETYPE_PEM), 1)

                || !TEST_int_eq(SSL_CTX_check_private_key(serverctx), 1))

            goto err;

    }



#ifndef OPENSSL_NO_DH

    SSL_CTX_set_dh_auto(serverctx, 1);