Compare commits

...

4 Commits

Author SHA1 Message Date
Neil Horman 2d69df0f56 fixup! add a handshake memory failure test 2025-07-31 12:29:31 -04:00
Neil Horman 5228c372ef fixup! add a handshake memory failure test 2025-07-31 12:20:34 -04:00
Neil Horman ad16a46772 fixup! Disable memfail test for general ci runs 2025-07-31 12:18:05 -04:00
Neil Horman c9e18bcdc2 fixup! add a handshake memory failure test 2025-07-31 12:11:55 -04:00
2 changed files with 5 additions and 36 deletions

View File

@ -18,7 +18,7 @@ mkdir -p "$OSSL_CI_ARTIFACTS_PATH"
export OSSL_CI_ARTIFACTS_PATH="$(cd "$OSSL_CI_ARTIFACTS_PATH"; pwd)"
# Run the tests. This might fail, but we need to capture artifacts anyway.
# NOTE: Disabline the handshake-memfail test here as its expected to fail
# NOTE: Disabling the handshake-memfail test here as its expected to fail
set +e
make test TESTS="-test_handshake-memfail" HARNESS_JOBS=${HARNESS_JOBS:-4} "$@"
RESULT=$?

View File

@ -1,5 +1,5 @@
/*
* Copyright 2016-2025 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 2025 The OpenSSL Project Authors. All Rights Reserved.
*
* 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
@ -7,45 +7,14 @@
* https://www.openssl.org/source/license.html
*/
/*
* We need access to the deprecated low level HMAC APIs for legacy purposes
* when the deprecated calls are not hidden
*/
#ifndef OPENSSL_NO_DEPRECATED_3_0
# define OPENSSL_SUPPRESS_DEPRECATED
#endif
#include <stdio.h>
#include <string.h>
#include <openssl/crypto.h>
#include <openssl/opensslconf.h>
#include <openssl/bio.h>
#include <openssl/crypto.h>
#include <openssl/ssl.h>
#include <openssl/ocsp.h>
#include <openssl/srp.h>
#include <openssl/txt_db.h>
#include <openssl/aes.h>
#include <openssl/rand.h>
#include <openssl/core_names.h>
#include <openssl/core_dispatch.h>
#include <openssl/provider.h>
#include <openssl/param_build.h>
#include <openssl/x509v3.h>
#include <openssl/dh.h>
#include <openssl/engine.h>
#include "helpers/ssltestlib.h"
#include "testutil.h"
#include "testutil/output.h"
#include "internal/nelem.h"
#include "internal/tlsgroups.h"
#include "internal/ktls.h"
#include "internal/ssl_unwrap.h"
#include "../ssl/ssl_local.h"
#include "../ssl/record/methods/recmethod_local.h"
#include "filterprov.h"
/**
* @brief Global static variables for certificate and key handling.
@ -180,8 +149,8 @@ static int test_report_alloc_counts(void)
int setup_tests(void)
{
static char *opmode = NULL;
static char *certsdir = NULL;
char *opmode = NULL;
char *certsdir = NULL;
if (!TEST_ptr(opmode = test_get_argument(0)))
goto err;
@ -197,7 +166,7 @@ int setup_tests(void)
if (privkey == NULL)
goto err;
if (!strcmp(opmode, "count")) {
if (strcmp(opmode, "count") == 0) {
CRYPTO_get_alloc_counts(&scount, &rcount, &fcount);
ADD_TEST(test_record_alloc_counts);
ADD_TEST(test_report_alloc_counts);