mirror of
https://github.com/QuasarApp/openssl.git
synced 2025-04-27 18:24:37 +00:00
Add a test for CVE-2017-3737
Test reading/writing to an SSL object after a fatal error has been detected. This CVE only affected 1.0.2, but we should add it to other branches for completeness. Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
This commit is contained in:
parent
77d7599365
commit
97652f0b3a
@ -46,7 +46,7 @@ INCLUDE_MAIN___test_libtestutil_OLB = /INCLUDE=MAIN
|
||||
x509_time_test x509_dup_cert_test x509_check_cert_pkey_test \
|
||||
recordlentest drbgtest sslbuffertest \
|
||||
time_offset_test pemtest ssl_cert_table_internal_test ciphername_test \
|
||||
servername_test ocspapitest rsa_mp_test
|
||||
servername_test ocspapitest rsa_mp_test fatalerrtest
|
||||
|
||||
SOURCE[aborttest]=aborttest.c
|
||||
INCLUDE[aborttest]=../include
|
||||
@ -156,6 +156,10 @@ INCLUDE_MAIN___test_libtestutil_OLB = /INCLUDE=MAIN
|
||||
INCLUDE[rsa_mp_test]=.. ../include
|
||||
DEPEND[rsa_mp_test]=../libcrypto libtestutil.a
|
||||
|
||||
SOURCE[fatalerrtest]=fatalerrtest.c ssltestlib.c
|
||||
INCLUDE[fatalerrtest]=../include ..
|
||||
DEPEND[fatalerrtest]=../libcrypto ../libssl libtestutil.a
|
||||
|
||||
SOURCE[evp_test]=evp_test.c
|
||||
INCLUDE[evp_test]=../include
|
||||
DEPEND[evp_test]=../libcrypto libtestutil.a
|
||||
|
89
test/fatalerrtest.c
Normal file
89
test/fatalerrtest.c
Normal file
@ -0,0 +1,89 @@
|
||||
/*
|
||||
* Copyright 2017 The OpenSSL Project Authors. All Rights Reserved.
|
||||
*
|
||||
* Licensed under the OpenSSL license (the "License"). You may not use
|
||||
* this file except in compliance with the License. You can obtain a copy
|
||||
* in the file LICENSE in the source distribution or at
|
||||
* https://www.openssl.org/source/license.html
|
||||
*/
|
||||
|
||||
#include <openssl/ssl.h>
|
||||
#include <openssl/err.h>
|
||||
#include "ssltestlib.h"
|
||||
#include "testutil.h"
|
||||
#include <string.h>
|
||||
|
||||
static char *cert = NULL;
|
||||
static char *privkey = NULL;
|
||||
|
||||
static int test_fatalerr(void)
|
||||
{
|
||||
SSL_CTX *sctx = NULL, *cctx = NULL;
|
||||
SSL *sssl = NULL, *cssl = NULL;
|
||||
const char *msg = "Dummy";
|
||||
BIO *wbio = NULL;
|
||||
int ret = 0, len;
|
||||
char buf[80];
|
||||
unsigned char dummyrec[] = {
|
||||
0x17, 0x03, 0x03, 0x00, 0x05, 'D', 'u', 'm', 'm', 'y'
|
||||
};
|
||||
|
||||
if (!TEST_true(create_ssl_ctx_pair(TLS_method(), TLS_method(), &sctx, &cctx,
|
||||
cert, privkey)))
|
||||
goto err;
|
||||
|
||||
/*
|
||||
* Deliberately set the cipher lists for client and server to be different
|
||||
* to force a handshake failure.
|
||||
*/
|
||||
if (!TEST_true(SSL_CTX_set_cipher_list(sctx, "AES128-SHA"))
|
||||
|| !TEST_true(SSL_CTX_set_cipher_list(cctx, "AES256-SHA"))
|
||||
|| !TEST_true(create_ssl_objects(sctx, cctx, &sssl, &cssl, NULL,
|
||||
NULL)))
|
||||
goto err;
|
||||
|
||||
wbio = SSL_get_wbio(cssl);
|
||||
if (!TEST_ptr(wbio)) {
|
||||
printf("Unexpected NULL bio received\n");
|
||||
goto err;
|
||||
}
|
||||
|
||||
/* Connection should fail */
|
||||
if (!TEST_false(create_ssl_connection(sssl, cssl, SSL_ERROR_NONE)))
|
||||
goto err;
|
||||
|
||||
ERR_clear_error();
|
||||
|
||||
/* Inject a plaintext record from client to server */
|
||||
if (!TEST_int_gt(BIO_write(wbio, dummyrec, sizeof(dummyrec)), 0))
|
||||
goto err;
|
||||
|
||||
/* SSL_read()/SSL_write should fail because of a previous fatal error */
|
||||
if (!TEST_int_le(len = SSL_read(sssl, buf, sizeof(buf - 1)), 0)) {
|
||||
buf[len] = '\0';
|
||||
TEST_error("Unexpected success reading data: %s\n", buf);
|
||||
goto err;
|
||||
}
|
||||
if (!TEST_int_le(SSL_write(sssl, msg, strlen(msg)), 0))
|
||||
goto err;
|
||||
|
||||
ret = 1;
|
||||
err:
|
||||
SSL_free(sssl);
|
||||
SSL_free(cssl);
|
||||
SSL_CTX_free(sctx);
|
||||
SSL_CTX_free(cctx);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
int setup_tests(void)
|
||||
{
|
||||
if (!TEST_ptr(cert = test_get_argument(0))
|
||||
|| !TEST_ptr(privkey = test_get_argument(1)))
|
||||
return 0;
|
||||
|
||||
ADD_TEST(test_fatalerr);
|
||||
|
||||
return 1;
|
||||
}
|
21
test/recipes/90-test_fatalerr.t
Normal file
21
test/recipes/90-test_fatalerr.t
Normal file
@ -0,0 +1,21 @@
|
||||
#! /usr/bin/env perl
|
||||
# Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the OpenSSL license (the "License"). You may not use
|
||||
# this file except in compliance with the License. You can obtain a copy
|
||||
# in the file LICENSE in the source distribution or at
|
||||
# https://www.openssl.org/source/license.html
|
||||
|
||||
|
||||
use OpenSSL::Test::Utils;
|
||||
use OpenSSL::Test qw/:DEFAULT srctop_file/;
|
||||
|
||||
setup("test_fatalerr");
|
||||
|
||||
plan skip_all => "No TLS/SSL protocols are supported by this OpenSSL build"
|
||||
if alldisabled(grep { $_ ne "ssl3" } available_protocols("tls"));
|
||||
|
||||
plan tests => 1;
|
||||
|
||||
ok(run(test(["fatalerrtest", srctop_file("apps", "server.pem"),
|
||||
srctop_file("apps", "server.pem")])), "running fatalerrtest");
|
Loading…
x
Reference in New Issue
Block a user