Make the PACKET/WPACKET code available to both libcrypto and libssl

[openssl.git] / test / tls13ccstest.c

diff --git a/test/tls13ccstest.c b/test/tls13ccstest.c
index 25dc8192c5b3ba08956a468c69c6a6adfc77c048..999ca5700a25d3a18232ae2a08b55a07fa4d2d9c 100644 (file)
--- a/test/tls13ccstest.c
+++ b/test/tls13ccstest.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2017-2018 The OpenSSL Project Authors. All Rights Reserved.
  *
 /*
  * Copyright 2017-2018 The OpenSSL Project Authors. All Rights Reserved.
  *

- * Licensed under the OpenSSL license (the "License").  You may not use
+ * Licensed under the Apache License 2.0 (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
  * 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


@@ -11,7 +11,7 @@
 #include <string.h>
 #include "ssltestlib.h"
 #include "testutil.h"
 #include <string.h>
 #include "ssltestlib.h"
 #include "testutil.h"

-#include "../ssl/packet_locl.h"
+#include "internal/packet.h"

 
 static char *cert = NULL;
 static char *privkey = NULL;
 
 static char *cert = NULL;
 static char *privkey = NULL;


@@ -37,7 +37,7 @@ static int watchccs_puts(BIO *bp, const char *str);
 
 static BIO_METHOD *method_watchccs = NULL;
 
 
 static BIO_METHOD *method_watchccs = NULL;
 

-static const BIO_METHOD *bio_f_watchccs_filter()
+static const BIO_METHOD *bio_f_watchccs_filter(void)

 {
     if (method_watchccs == NULL) {
         method_watchccs = BIO_meth_new(BIO_TYPE_WATCHCCS_FILTER,
 {
     if (method_watchccs == NULL) {
         method_watchccs = BIO_meth_new(BIO_TYPE_WATCHCCS_FILTER,


@@ -255,7 +255,7 @@ static int test_tls13ccs(int tst)
     chsessidlen = 0;
 
     if (!TEST_true(create_ssl_ctx_pair(TLS_server_method(), TLS_client_method(),
     chsessidlen = 0;
 
     if (!TEST_true(create_ssl_ctx_pair(TLS_server_method(), TLS_client_method(),

-                                       TLS1_VERSION, TLS_MAX_VERSION,
+                                       TLS1_VERSION, 0,

                                        &sctx, &cctx, cert, privkey))
         || !TEST_true(SSL_CTX_set_max_early_data(sctx,
                                                  SSL3_RT_MAX_PLAIN_LENGTH)))
                                        &sctx, &cctx, cert, privkey))
         || !TEST_true(SSL_CTX_set_max_early_data(sctx,
                                                  SSL3_RT_MAX_PLAIN_LENGTH)))


@@ -315,8 +315,15 @@ static int test_tls13ccs(int tst)
 
     if ((tst >= 3 && tst <= 5) || tst >= 9) {
         /* HRR handshake */
 
     if ((tst >= 3 && tst <= 5) || tst >= 9) {
         /* HRR handshake */

+#if defined(OPENSSL_NO_EC)
+# if !defined(OPENSSL_NO_DH)
+        if (!TEST_true(SSL_CTX_set1_groups_list(sctx, "ffdhe3072")))
+            goto err;
+# endif
+#else

         if (!TEST_true(SSL_CTX_set1_groups_list(sctx, "P-256")))
             goto err;
         if (!TEST_true(SSL_CTX_set1_groups_list(sctx, "P-256")))
             goto err;

+#endif

     }
 
     s_to_c_fbio = BIO_new(bio_f_watchccs_filter());
     }
 
     s_to_c_fbio = BIO_new(bio_f_watchccs_filter());


@@ -481,6 +488,8 @@ static int test_tls13ccs(int tst)
     return ret;
 }
 
     return ret;
 }
 

+OPT_TEST_DECLARE_USAGE("certfile privkeyfile\n")
+

 int setup_tests(void)
 {
     if (!TEST_ptr(cert = test_get_argument(0))
 int setup_tests(void)
 {
     if (!TEST_ptr(cert = test_get_argument(0))