From 6e3dac1995eb6e34ed2649aca78b5aa88b1cbfeb Mon Sep 17 00:00:00 2001 From: Benjamin Kaduk Date: Mon, 30 Jan 2017 12:59:59 -0600 Subject: [PATCH] Tests for SSL_bytes_to_cipher_list() Reviewed-by: Matt Caswell Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/2279) --- test/build.info | 6 +- test/cipherbytes_test.c | 130 +++++++++++++++++++++++++++++ test/recipes/80-test_cipherbytes.t | 26 ++++++ 3 files changed, 161 insertions(+), 1 deletion(-) create mode 100644 test/cipherbytes_test.c create mode 100644 test/recipes/80-test_cipherbytes.t diff --git a/test/build.info b/test/build.info index 4a43e5bff2..7c1a055cf7 100644 --- a/test/build.info +++ b/test/build.info @@ -28,7 +28,7 @@ IF[{- !$disabled{tests} -}] dtlsv1listentest ct_test threadstest afalgtest d2i_test \ ssl_test_ctx_test ssl_test x509aux cipherlist_test asynciotest \ bioprinttest sslapitest dtlstest sslcorrupttest bio_enc_test \ - pkey_meth_test uitest + pkey_meth_test uitest cipherbytes_test SOURCE[aborttest]=aborttest.c INCLUDE[aborttest]=../include @@ -320,6 +320,10 @@ IF[{- !$disabled{tests} -}] INCLUDE[uitest]=.. ../include DEPEND[uitest]=../libcrypto ../libssl + SOURCE[cipherbytes_test]=cipherbytes_test.c + INCLUDE[cipherbytes_test]=.. ../include + DEPEND[cipherbytes_test]=../libcrypto ../libssl + # Internal test programs. These are essentially a collection of internal # test routines. Some of them need to reach internal symbols that aren't # available through the shared library (at least on Linux, Solaris, Windows diff --git a/test/cipherbytes_test.c b/test/cipherbytes_test.c new file mode 100644 index 0000000000..9be42f71d6 --- /dev/null +++ b/test/cipherbytes_test.c @@ -0,0 +1,130 @@ +/* + * Copyright 2017 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL licenses, (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * https://www.openssl.org/source/license.html + * or in the file LICENSE in the source distribution. + */ + +#include +#include + +#include +#include +#include +#include +#include +#include + +#include "e_os.h" +#include "test_main.h" +#include "testutil.h" + +static int test_empty(SSL *s) +{ + STACK_OF(SSL_CIPHER) *sk = NULL, *scsv = NULL; + const unsigned char bytes[] = {0x00}; + + if (SSL_bytes_to_cipher_list(s, bytes, 0, 0, &sk, &scsv) || + sk != NULL || scsv != NULL) + return 0; + return 1; +} + +static int test_unsupported(SSL *s) +{ + STACK_OF(SSL_CIPHER) *sk, *scsv; + /* ECDH-RSA-AES256 (unsupported), ECDHE-ECDSA-AES128, */ + const unsigned char bytes[] = {0xc0, 0x0f, 0x00, 0x2f, 0x01, 0x00}; + + if (!SSL_bytes_to_cipher_list(s, bytes, sizeof(bytes), 0, &sk, &scsv) || + sk == NULL || sk_SSL_CIPHER_num(sk) != 1 || scsv == NULL || + sk_SSL_CIPHER_num(scsv) != 0) + return 0; + if (strcmp(SSL_CIPHER_get_name(sk_SSL_CIPHER_value(sk, 0)), + "AES128-SHA") != 0) + return 0; + + sk_SSL_CIPHER_free(sk); + sk_SSL_CIPHER_free(scsv); + return 1; +} + +static int test_v2(SSL *s) +{ + STACK_OF(SSL_CIPHER) *sk, *scsv; + /* ECDHE-ECDSA-AES256GCM, SSL2_RC4_1238_WITH_MD5, + * ECDHE-ECDSA-CHACHA20-POLY1305 */ + const unsigned char bytes[] = {0x00, 0x00, 0x35, 0x01, 0x00, 0x80, + 0x00, 0x00, 0x33}; + + if (!SSL_bytes_to_cipher_list(s, bytes, sizeof(bytes), 1, &sk, &scsv) || + sk == NULL || sk_SSL_CIPHER_num(sk) != 2 || scsv == NULL || + sk_SSL_CIPHER_num(scsv) != 0) + return 0; + if (strcmp(SSL_CIPHER_get_name(sk_SSL_CIPHER_value(sk, 0)), + "AES256-SHA") != 0 || + strcmp(SSL_CIPHER_get_name(sk_SSL_CIPHER_value(sk, 1)), + "DHE-RSA-AES128-SHA") != 0) + return 0; + sk_SSL_CIPHER_free(sk); + sk_SSL_CIPHER_free(scsv); + return 1; +} + +static int test_v3(SSL *s) +{ + STACK_OF(SSL_CIPHER) *sk, *scsv; + /* ECDHE-ECDSA-AES256GCM, ECDHE-ECDSA-CHACHAPOLY, DHE-RSA-AES256GCM, + * EMPTY-RENEGOTIATION-INFO-SCSV, FALLBACK-SCSV */ + const unsigned char bytes[] = {0x00, 0x2f, 0x00, 0x33, 0x00, 0x9f, 0x00, 0xff, + 0x56, 0x00}; + + if (!SSL_bytes_to_cipher_list(s, bytes, sizeof(bytes), 0, &sk, &scsv) || + sk == NULL || sk_SSL_CIPHER_num(sk) != 3 || scsv == NULL || + sk_SSL_CIPHER_num(scsv) != 2) + return 0; + if (strcmp(SSL_CIPHER_get_name(sk_SSL_CIPHER_value(sk, 0)), + "AES128-SHA") != 0 || + strcmp(SSL_CIPHER_get_name(sk_SSL_CIPHER_value(sk, 1)), + "DHE-RSA-AES128-SHA") != 0 || + strcmp(SSL_CIPHER_get_name(sk_SSL_CIPHER_value(sk, 2)), + "DHE-RSA-AES256-GCM-SHA384") != 0 || + strcmp(SSL_CIPHER_get_name(sk_SSL_CIPHER_value(scsv, 0)), + "TLS_EMPTY_RENEGOTIATION_INFO_SCSV") != 0 || + strcmp(SSL_CIPHER_get_name(sk_SSL_CIPHER_value(scsv, 1)), + "TLS_FALLBACK_SCSV") != 0) + return 0; + sk_SSL_CIPHER_free(sk); + sk_SSL_CIPHER_free(scsv); + return 1; +} + +int main(int argc, char **argv) +{ + SSL_CTX *ctx; + SSL *s; + + ctx = SSL_CTX_new(TLS_server_method()); + s = SSL_new(ctx); + OPENSSL_assert(s != NULL); + + if (!test_empty(s)) + return 1; + + if (!test_unsupported(s)) + return 1; + + if (!test_v2(s)) + return 1; + + if (!test_v3(s)) + return 1; + + printf("PASS\n"); + SSL_free(s); + SSL_CTX_free(ctx); + return 0; +} diff --git a/test/recipes/80-test_cipherbytes.t b/test/recipes/80-test_cipherbytes.t new file mode 100644 index 0000000000..27d627ea8f --- /dev/null +++ b/test/recipes/80-test_cipherbytes.t @@ -0,0 +1,26 @@ +#! /usr/bin/perl +# +# 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 + + +use strict; +use warnings; + +use OpenSSL::Test::Simple; +use OpenSSL::Test; +use OpenSSL::Test::Utils qw(alldisabled available_protocols); + +setup("test_cipherbytes"); + +my $no_anytls = alldisabled(available_protocols("tls")); + +# If we have no protocols, then we also have no supported ciphers. +plan skip_all => "No SSL/TLS protocol is supported by this OpenSSL build." + if $no_anytls; + +simple_test("test_cipherbytes", "cipherbytes_test", "bytes_to_cipherlist"); -- 2.25.1