tests: Added checks for false start operation

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1d4519a9c664030631e6adb706c0633dc1974000..d063ad9d288213c78c344a0ef2364237288b2a97 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -95,7 +95,8 @@ ctests = mini-record-2 simple gc set_pkcs12_cred certder certuniqueid \
         rehandshake-switch-cert rehandshake-switch-cert-allow rehandshake-switch-cert-client \
         rehandshake-switch-cert-client-allow handshake-versions dtls-handshake-versions \
         dtls-max-record tls-max-record alpn-server-prec ocsp-filename-memleak \
-        dh-params rehandshake-ext-secret pcert-list session-export-funcs
+        dh-params rehandshake-ext-secret pcert-list session-export-funcs \
+        handshake-false-start
 
 if HAVE_SECCOMP_TESTS
 ctests += dtls-with-seccomp tls-with-seccomp dtls-client-with-seccomp tls-client-with-seccomp

diff --git a/tests/cert-common.h b/tests/cert-common.h
index 91b301d6fd91646ea9a19b48ffd44a3df0de0815..51e864eede486f75896b6005cc36c51db59bfcc4 100644 (file)
--- a/tests/cert-common.h
+++ b/tests/cert-common.h
@@ -23,22 +23,30 @@
 #include <gnutls/gnutls.h>
 
 static char ecc_key[] =
-        "-----BEGIN EC PRIVATE KEY-----\n"
-       "MHgCAQEEIQDYIXKfQFhxL/5WqUL41NrzUw7Ky80985zhy5KPtwPX0qAKBggqhkjO\n"
-       "PQMBB6FEA0IABO4hyZG3JSK4evQm4wAKls6W5Z4FPvlJIZ7PRsmoy06Zz+c/KuR2\n"
-       "K1XaLclUxVwNnebzIPgPJcIz7XXZL9FMZMw=\n"
+       "-----BEGIN EC PRIVATE KEY-----\n"
+       "MHgCAQEEIQD9KwCA8zZfETJl440wMztH9c74E+VMws/96AVqyslBsaAKBggqhkjO\n"
+       "PQMBB6FEA0IABDwVbx1IPmRZEyxtBBo4DTBc5D9Vy9kXFUZycZLB+MYzPQQuyMEP\n"
+       "wFAEe5/JSLVA+m+TgllhXnJXy4MGvcyClME=\n"
        "-----END EC PRIVATE KEY-----\n";
 
 static char ecc_cert[] =
        "-----BEGIN CERTIFICATE-----\n"
-       "MIIBcDCCARWgAwIBAgIBADAKBggqhkjOPQQDAjATMREwDwYDVQQDEwhzZXJ2ZXIt\n"
-       "MDAgFw0xNTEyMzExMTA3MThaGA85OTk5MTIzMTIzNTk1OVowEzERMA8GA1UEAxMI\n"
-       "c2VydmVyLTAwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATuIcmRtyUiuHr0JuMA\n"
-       "CpbOluWeBT75SSGez0bJqMtOmc/nPyrkditV2i3JVMVcDZ3m8yD4DyXCM+112S/R\n"
-       "TGTMo1gwVjAPBgNVHRMBAf8EBTADAQH/MBMGA1UdJQQMMAoGCCsGAQUFBwMJMA8G\n"
-       "A1UdDwEB/wQFAwMHBgAwHQYDVR0OBBYEFILbRHEo1GHks5cgZIyDtnX1UaUaMAoG\n"
-       "CCqGSM49BAMCA0kAMEYCIQCpqHCeb/orMzgKh6rl897blTpnUMqBAG2z6FMV3WgH\n"
-       "GQIhANOo0dRst4aBNXPCw1hSGNj7ObIB8jc214mcdInt/Dns\n"
+       "MIIC4DCCAoagAwIBAgIBBzAKBggqhkjOPQQDAjB9MQswCQYDVQQGEwJCRTEPMA0G\n"
+       "A1UEChMGR251VExTMSUwIwYDVQQLExxHbnVUTFMgY2VydGlmaWNhdGUgYXV0aG9y\n"
+       "aXR5MQ8wDQYDVQQIEwZMZXV2ZW4xJTAjBgNVBAMTHEdudVRMUyBjZXJ0aWZpY2F0\n"
+       "ZSBhdXRob3JpdHkwIhgPMjAxMjA5MDEwOTIyMzZaGA8yMDE5MTAwNTA5MjIzNlow\n"
+       "gbgxCzAJBgNVBAYTAkdSMRIwEAYDVQQKEwlLb2tvIGluYy4xFzAVBgNVBAsTDnNs\n"
+       "ZWVwaW5nIGRlcHQuMQ8wDQYDVQQIEwZBdHRpa2kxFTATBgNVBAMTDENpbmR5IExh\n"
+       "dXBlcjEXMBUGCgmSJomT8ixkAQETB2NsYXVwZXIxDDAKBgNVBAwTA0RyLjEPMA0G\n"
+       "A1UEQRMGamFja2FsMRwwGgYJKoZIhvcNAQkBFg1ub25lQG5vbmUub3JnMFkwEwYH\n"
+       "KoZIzj0CAQYIKoZIzj0DAQcDQgAEPBVvHUg+ZFkTLG0EGjgNMFzkP1XL2RcVRnJx\n"
+       "ksH4xjM9BC7IwQ/AUAR7n8lItUD6b5OCWWFeclfLgwa9zIKUwaOBtjCBszAMBgNV\n"
+       "HRMBAf8EAjAAMD0GA1UdEQQ2MDSCDHd3dy5ub25lLm9yZ4ITd3d3Lm1vcmV0aGFu\n"
+       "b25lLm9yZ4IJbG9jYWxob3N0hwTAqAEBMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA8G\n"
+       "A1UdDwEB/wQFAwMHgAAwHQYDVR0OBBYEFKz6R2fGG0F5Elf3rAXBUOKO0A5bMB8G\n"
+       "A1UdIwQYMBaAFPC0gf6YEr+1KLlkQAPLzB9mTigDMAoGCCqGSM49BAMCA0gAMEUC\n"
+       "ICgq4CTInkRQ1DaFoI8wmu2KP8445NWRXKouag2WJSFzAiEAx4KxaoZJNVfBBSc4\n"
+       "bA9XTz/2OnpgAZutUohNNb/tmRE=\n"
        "-----END CERTIFICATE-----\n";
 
 const gnutls_datum_t server_ecc_cert =

diff --git a/tests/handshake-false-start.c b/tests/handshake-false-start.c
new file mode 100644 (file)
index 0000000..60bf3f4
--- /dev/null
+++ b/tests/handshake-false-start.c
@@ -0,0 +1,232 @@
+/*
+ * Copyright (C) 2016 Red Hat, Inc.
+ *
+ * Author: Nikos Mavrogiannopoulos
+ *
+ * This file is part of GnuTLS.
+ *
+ * GnuTLS is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuTLS is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GnuTLS; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <gnutls/gnutls.h>
+#include "utils.h"
+#include "eagain-common.h"
+#include "cert-common.h"
+
+const char *side;
+
+static void tls_log_func(int level, const char *str)
+{
+       fprintf(stderr, "%s|<%d>| %s", side, level, str);
+}
+
+#define TESTDATA "xxxtesttest1234"
+
+/* counts the number of calls of send_testdata() within a handshake */
+static int counter = 0;
+
+static int send_testdata(gnutls_session_t session)
+{
+
+       if (counter == 0) {
+               counter++;
+               return gnutls_record_send(session, TESTDATA, sizeof(TESTDATA)-1);
+       } else {
+               fail("send_testdata was called more than once!\n");
+               return GNUTLS_E_INVALID_REQUEST;
+       }
+}
+
+static void try(unsigned fs, const char *prio, unsigned dhsize)
+{
+       int ret;
+       /* Server stuff. */
+       gnutls_certificate_credentials_t serverx509cred;
+       gnutls_anon_client_credentials_t clientanoncred;
+       gnutls_anon_server_credentials_t serveranoncred;
+       gnutls_session_t server;
+       int sret = GNUTLS_E_AGAIN;
+       char buffer[512];
+       /* Client stuff. */
+       gnutls_certificate_credentials_t clientx509cred;
+       gnutls_session_t client;
+       int cret = GNUTLS_E_AGAIN;
+       const gnutls_datum_t p3_2048 = { (void *) pkcs3_2048, strlen(pkcs3_2048) };
+       const gnutls_datum_t p3_3072 = { (void *) pkcs3_3072, strlen(pkcs3_3072) };
+       gnutls_dh_params_t dh_params;
+
+       /* General init. */
+       gnutls_global_set_log_function(tls_log_func);
+       if (debug)
+               gnutls_global_set_log_level(6);
+
+
+       gnutls_dh_params_init(&dh_params);
+
+       if (dhsize < 3072) {
+               ret = gnutls_dh_params_import_pkcs3(dh_params, &p3_2048,
+                                                    GNUTLS_X509_FMT_PEM);
+       } else {
+               ret = gnutls_dh_params_import_pkcs3(dh_params, &p3_3072,
+                                                    GNUTLS_X509_FMT_PEM);
+       }
+
+       /* Init server */
+       gnutls_anon_allocate_server_credentials(&serveranoncred);
+       gnutls_anon_set_server_dh_params(serveranoncred, dh_params);
+
+
+       gnutls_certificate_allocate_credentials(&serverx509cred);
+       gnutls_certificate_set_x509_key_mem(serverx509cred,
+                                           &server_cert, &server_key,
+                                           GNUTLS_X509_FMT_PEM);
+       gnutls_certificate_set_x509_key_mem(serverx509cred,
+                                           &server_ecc_cert, &server_ecc_key,
+                                           GNUTLS_X509_FMT_PEM);
+       gnutls_certificate_set_dh_params(serverx509cred, dh_params);
+
+       gnutls_init(&server, GNUTLS_SERVER);
+       gnutls_credentials_set(server, GNUTLS_CRD_CERTIFICATE,
+                              serverx509cred);
+
+       gnutls_credentials_set(server, GNUTLS_CRD_ANON,
+                              serveranoncred);
+
+       gnutls_priority_set_direct(server,
+                                  prio,
+                                  NULL);
+       gnutls_transport_set_push_function(server, server_push);
+       gnutls_transport_set_pull_function(server, server_pull);
+       gnutls_transport_set_ptr(server, server);
+
+       /* Init client */
+
+       gnutls_anon_allocate_client_credentials(&clientanoncred);
+       ret = gnutls_certificate_allocate_credentials(&clientx509cred);
+       if (ret < 0)
+               exit(1);
+
+       ret = gnutls_certificate_set_x509_trust_mem(clientx509cred, &ca_cert, GNUTLS_X509_FMT_PEM);
+       if (ret < 0)
+               exit(1);
+
+       ret = gnutls_init(&client, GNUTLS_CLIENT);
+       if (ret < 0)
+               exit(1);
+
+       ret = gnutls_credentials_set(client, GNUTLS_CRD_CERTIFICATE,
+                              clientx509cred);
+       if (ret < 0)
+               exit(1);
+
+       ret = gnutls_credentials_set(client, GNUTLS_CRD_ANON,
+                              clientanoncred);
+       if (ret < 0)
+               exit(1);
+
+       ret = gnutls_priority_set_direct(client, prio, NULL);
+       if (ret < 0)
+               exit(1);
+
+       gnutls_transport_set_push_function(client, client_push);
+       gnutls_transport_set_pull_function(client, client_pull);
+       gnutls_transport_set_ptr(client, client);
+
+       ret = gnutls_handshake_set_false_start_function(server, send_testdata, 0);
+       if (ret != GNUTLS_E_INVALID_REQUEST) {
+               fail("gnutls_handshake_set_appdata: unexpected error code (%d) for server!\n", ret);
+       }
+
+       ret = gnutls_handshake_set_false_start_function(client, send_testdata, 0);
+       if (ret != 0) {
+               fail("gnutls_handshake_set_appdata: unexpected error code (%d) for client!\n", ret);
+       }
+
+       HANDSHAKE(client, server);
+
+       /* verify whether the server received the expected data */
+       ret = gnutls_record_recv(server, buffer, sizeof(buffer));
+       if (ret < 0) {
+               fail("error receiving data: %s\n", gnutls_strerror(ret));
+       }
+
+       if (ret != sizeof(TESTDATA)-1) {
+               fail("error in received data size\n");
+       }
+
+       if (memcmp(buffer, TESTDATA, ret) != 0) {
+               fail("error in received data\n");
+       }
+
+       if ((gnutls_session_get_flags(client) & GNUTLS_SFLAGS_FALSE_START) && !fs) {
+               fail("false start occurred but not expected\n");
+       }
+
+       if (!(gnutls_session_get_flags(client) & GNUTLS_SFLAGS_FALSE_START) && fs) {
+               fail("false start expected but not happened\n");
+       }
+
+       ret = gnutls_bye(server, GNUTLS_SHUT_WR);
+       if (ret < 0) {
+               fail("error in server bye: %s\n", gnutls_strerror(ret));
+       }
+
+       ret = gnutls_bye(client, GNUTLS_SHUT_RDWR);
+       if (ret < 0) {
+               fail("error in client bye: %s\n", gnutls_strerror(ret));
+       }
+
+       gnutls_deinit(client);
+       gnutls_deinit(server);
+
+       gnutls_dh_params_deinit(dh_params);
+       gnutls_anon_free_server_credentials(serveranoncred);
+       gnutls_anon_free_client_credentials(clientanoncred);
+       gnutls_certificate_free_credentials(serverx509cred);
+       gnutls_certificate_free_credentials(clientx509cred);
+}
+
+void doit(void)
+{
+       global_init();
+
+       try(0, "NORMAL:-KX-ALL:+ANON-DH", 3072);
+       reset_buffers();
+       counter = 0;
+       try(0, "NORMAL:-KX-ALL:+ANON-ECDH", 2048);
+       reset_buffers();
+       counter = 0;
+       try(1, "NORMAL:-KX-ALL:+ECDHE-RSA", 2048);
+       reset_buffers();
+       counter = 0;
+       try(1, "NORMAL:-KX-ALL:+ECDHE-ECDSA", 2048);
+       reset_buffers();
+       counter = 0;
+       try(0, "NORMAL:-KX-ALL:+DHE-RSA", 2048);
+       reset_buffers();
+       counter = 0;
+       try(1, "NORMAL:-KX-ALL:+DHE-RSA", 3072);
+       reset_buffers();
+       counter = 0;
+       gnutls_global_deinit();
+}

diff --git a/tests/utils.c b/tests/utils.c
index 1b0e211f0649b3a636b604c26f530382e40f65de..c562c0b048e2eeeb9f4e8fc4946e389cd3f8084f 100644 (file)
--- a/tests/utils.c
+++ b/tests/utils.c
@@ -53,6 +53,43 @@ const char *pkcs3 =
     "GeGOEywcw+oQT4SmFOD7H0smJe2CNyjYpexBXQ/A0mbTF9QKm1cCAQU=\n"
     "-----END DH PARAMETERS-----\n";
 
+const char *pkcs3_2048 =
+       "-----BEGIN DH PARAMETERS-----\n"
+       "MIICDgKCAQEAvVNCqM8M9ZoVYBKEkV2KN8ELHHJ75aTZiK9z6170iKSgbITkOxsd\n"
+       "aBCLzHZd7d6/2aNofUeuWdDGHm73d8v53ma2HRVCNESeC2LKsEDFG9FjjUeugvfl\n"
+       "zb85TLZwWT9Lb35Ddhdk7CtxoukjS0/JkCE+8RGzmk5+57N8tNffs4aSSHSe4+cw\n"
+       "i4wULDxiG2p052czAMP3YR5egWvMuiByhy0vKShiZmOy1/Os5r6E/GUF+298gDjG\n"
+       "OeaEUF9snrTcoBwB4yNjVSEbuAh5fMd5zFtz2+dzrk9TYZ44u4DQYkgToW05WcmC\n"
+       "+LG0bLAH6lrJR5OMgyheZEo6F20z/d2yyQKCAQEAtzcuTHW61SFQiDRouk6eD0Yx\n"
+       "0k1RJdaQdlRf6/Dcc6lEqnbezL90THzvxkBwfJ5jG1VZE7JlVCvLRkBtgb0/6SCf\n"
+       "MATfEKG2JMOnKsJxvidmKEp4uN32LketXRrrEBl7rS+HABEfKAzqx+J6trBaq25E\n"
+       "7FVJFsyoa8IL8N8YUWwhE2UuEfmiqQQaeoIUYC/xD2arMXn9N0W84Nyy2S9IL4ct\n"
+       "e3Azi1Wc8MMfpbxxDRxXCnM2uMkLYWs1lQmcUUX+Uygv3P8lgS+RJ1Pi3+BWMx0S\n"
+       "ocsZXqOr6dbEF1WOLObQRK7h/MZp80iVUyrBgX0MbVFN9M5i2u4KKTG95VKRtgIC\n"
+       "AQA=\n"
+       "-----END DH PARAMETERS-----\n";
+
+const char *pkcs3_3072 =
+       "-----BEGIN DH PARAMETERS-----\n"
+       "MIIDDgKCAYEAtRUay8nDgwE5dSVzW525wEu/d0vrFolvYJSevxg2myj5S+gr3Fgq\n"
+       "OGaZc4zrBxkxsELc7GuCqaXSOWL4yobT8N05yGbYWkWRPf4crRMx3P7/Gba9WsmH\n"
+       "BlL71uPf1IN9CanAlabkhV89RKiYaCpUI19+/sq+N2dO874ToBZCNhxZnTgRZ+po\n"
+       "Gdr6XWM0lQ8imIKSer0px3ZHI+/5gmyPry35tGpwlbyclJAg3wlTSdnqDcLxq7AF\n"
+       "OZ23PzC3ij7SFErOX9EFBdS2bjtU47O3OkPc9EIYMEv5nwnXICLHslwVifmURAjV\n"
+       "LfpObL8LYGN4Gac4tFxuDa0PMg0ES5ADugYBwdRFTAtCy5WOYXINzAAOrH9MommT\n"
+       "rMkELf7JOCaV2ktBsvTlrgMAXeyqbf2YSG6CGjj4QnUuqPybSgwPru7VlahsS2lo\n"
+       "qjutBPpgIxS53o97Wi3V5kQedKJiNuIDNnJMFNuTADAM+OYwClTH7ZSwTsxEgVpr\n"
+       "tMH+WnTI7KTJAoIBgQCrELwIUB4oNbf0x+fIpVndhDpl/WcFc/lDtmiRuym5gWbb\n"
+       "NPeI+1rdhnS2R3+nCJODFQTcPNMgIJuSu2EnDCSs5xJ2k08SAgSzyxEdjBpY7qJe\n"
+       "+lJPJ12zhcl0vgcvMhb/YgqVe2MKz0RvnYZPwHM/aJbjYjq/6OpK3fVw4M1ZccBK\n"
+       "QD4OHK8HOvGU7Wf6kRIcxUlfn15spMCIsrAZQBddWLmQgktsxJNUS+AnaPwTBoOv\n"
+       "nGCr1vzw8OS1DtS03VCmtqt3otXhJ3D2oCIG6ogxVAKfHR30KIfzZLBfmCjdzHmH\n"
+       "x4OwYTN1wy5juA438QtiDtcgK60ZqSzQO08ZklRncA/TkkyEH6kPn5KSh/hW9O3D\n"
+       "KZeAY/KF0/Bc1XNtqPEYFb7Vo3rbTsyjXkICN1Hk9S0OIKL42K7rWBepO9KuddSd\n"
+       "aXgH9staP0HXCyyW1VAyqo0TwcWDhE/R7IQQGGwGyd4rD0T+ySW/t09ox23O6X8J\n"
+       "FSp6mOVNcuvhB5U2gW8CAgEA\n"
+       "-----END DH PARAMETERS-----\n";
+
 void fail(const char *format, ...)
 {
        char str[1024];

diff --git a/tests/utils.h b/tests/utils.h
index ca21d57656ac09f07372f61e9dba05feb48d6f93..4bffa45d9f0c2291565f36f8ee2c67e481431a57 100644 (file)
--- a/tests/utils.h
+++ b/tests/utils.h
@@ -47,6 +47,8 @@ extern int error_count;
 extern int break_on_error;
 
 extern const char *pkcs3;
+extern const char *pkcs3_2048;
+extern const char *pkcs3_3072;
 
 extern void fail(const char *format, ...)
     __attribute__ ((format(printf, 1, 2)));