openssl
/
openssl
mirror of https://github.com/openssl/openssl
1
0
Fork 0
Code Issues Releases Wiki Activity

Adapt all test programs 

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3243)
This commit is contained in:
Richard Levitte 2017-04-18 16:47:11 +02:00
parent b3e5db40ec
commit a9c6d22105
70 changed files with 151 additions and 244 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/asn1_encode_test.c
View File

@ -13,7 +13,6 @@
#include <openssl/rand.h>
#include <openssl/asn1t.h>
#include "internal/numbers.h"
#include "test_main.h"
#include "testutil.h"
#ifdef __GNUC__

1
test/asn1_internal_test.c
View File

@ -15,7 +15,6 @@
#include <openssl/asn1.h>
#include <openssl/evp.h>
#include <openssl/objects.h>
#include "test_main.h"
#include "testutil.h"
#include "e_os.h"

1
test/asynciotest.c
View File

@ -17,7 +17,6 @@
#include "ssltestlib.h"
#include "testutil.h"
#include "test_main_custom.h"
/* Should we fragment records or not? 0 = no, !0 = yes*/
static int fragment = 0;

1
test/bad_dtls_test.c
View File

@ -41,7 +41,6 @@
#include "../ssl/packet_locl.h"
#include "../e_os.h" /* for OSSL_NELEM() */
#include "test_main.h"
#include "testutil.h"
/* For DTLS1_BAD_VER packets the MAC doesn't include the handshake header */

1
test/bftest.c
View File

@ -17,7 +17,6 @@
#include <stdlib.h>
#include <openssl/opensslconf.h> /* To see if OPENSSL_NO_BF is defined */
#include "test_main_custom.h"
#include "testutil.h"
#include "../e_os.h"

1
test/bio_enc_test.c
View File

@ -12,7 +12,6 @@
#include <openssl/bio.h>
#include <openssl/rand.h>
#include "test_main.h"
#include "testutil.h"
#define ENCRYPT 1

2
test/bioprinttest.c
View File

@ -12,8 +12,6 @@
#include <openssl/bio.h>
#include "internal/numbers.h"
#include "testutil.h"
#include "test_main.h"
#include "test_main_custom.h"
#define nelem(x) (int)(sizeof(x) / sizeof((x)[0]))

1
test/bntest.c
View File

@ -19,7 +19,6 @@
#include <openssl/err.h>
#include <openssl/rand.h>
#include "testutil.h"
#include "test_main_custom.h"
/*
* In bn_lcl.h, bn_expand() is defined as a static ossl_inline function.

285
test/build.info
View File

@ -47,270 +47,270 @@ INCLUDE_MAIN___test_libtestutil_OLB = /INCLUDE=MAIN
INCLUDE[aborttest]=../include
DEPEND[aborttest]=../libcrypto
SOURCE[sanitytest]=sanitytest.c testutil.c test_main.c
SOURCE[sanitytest]=sanitytest.c
INCLUDE[sanitytest]=../include
DEPEND[sanitytest]=../libcrypto
DEPEND[sanitytest]=../libcrypto libtestutil.a
SOURCE[test_test]=test_test.c testutil.c test_main.c
SOURCE[test_test]=test_test.c
INCLUDE[test_test]=.. ../include
DEPEND[test_test]=../libcrypto
DEPEND[test_test]=../libcrypto libtestutil.a
SOURCE[exdatatest]=exdatatest.c testutil.c test_main.c
SOURCE[exdatatest]=exdatatest.c
INCLUDE[exdatatest]=../include
DEPEND[exdatatest]=../libcrypto
DEPEND[exdatatest]=../libcrypto libtestutil.a
SOURCE[bntest]=bntest.c testutil.c test_main_custom.c
SOURCE[bntest]=bntest.c
INCLUDE[bntest]=.. ../crypto/include ../include
DEPEND[bntest]=../libcrypto
DEPEND[bntest]=../libcrypto libtestutil.a
SOURCE[ectest]=ectest.c
INCLUDE[ectest]=.. ../include
DEPEND[ectest]=../libcrypto
SOURCE[ecdsatest]=ecdsatest.c testutil.c test_main.c
SOURCE[ecdsatest]=ecdsatest.c
INCLUDE[ecdsatest]=../include
DEPEND[ecdsatest]=../libcrypto
DEPEND[ecdsatest]=../libcrypto libtestutil.a
SOURCE[gmdifftest]=gmdifftest.c testutil.c test_main.c
SOURCE[gmdifftest]=gmdifftest.c
INCLUDE[gmdifftest]=../include
DEPEND[gmdifftest]=../libcrypto
DEPEND[gmdifftest]=../libcrypto libtestutil.a
SOURCE[pbelutest]=pbelutest.c testutil.c test_main.c
SOURCE[pbelutest]=pbelutest.c
INCLUDE[pbelutest]=../include
DEPEND[pbelutest]=../libcrypto
DEPEND[pbelutest]=../libcrypto libtestutil.a
SOURCE[ideatest]=ideatest.c testutil.c test_main.c
SOURCE[ideatest]=ideatest.c
INCLUDE[ideatest]=../include
DEPEND[ideatest]=../libcrypto
DEPEND[ideatest]=../libcrypto libtestutil.a
SOURCE[md2test]=md2test.c testutil.c test_main.c
SOURCE[md2test]=md2test.c
INCLUDE[md2test]=../include
DEPEND[md2test]=../libcrypto
DEPEND[md2test]=../libcrypto libtestutil.a
SOURCE[hmactest]=hmactest.c testutil.c test_main.c
SOURCE[hmactest]=hmactest.c
INCLUDE[hmactest]=../include
DEPEND[hmactest]=../libcrypto
DEPEND[hmactest]=../libcrypto libtestutil.a
SOURCE[rc2test]=rc2test.c testutil.c test_main.c
SOURCE[rc2test]=rc2test.c
INCLUDE[rc2test]=../include
DEPEND[rc2test]=../libcrypto
DEPEND[rc2test]=../libcrypto libtestutil.a
SOURCE[rc4test]=rc4test.c testutil.c test_main.c
SOURCE[rc4test]=rc4test.c
INCLUDE[rc4test]=../include
DEPEND[rc4test]=../libcrypto
DEPEND[rc4test]=../libcrypto libtestutil.a
SOURCE[rc5test]=rc5test.c testutil.c test_main.c
SOURCE[rc5test]=rc5test.c
INCLUDE[rc5test]=../include
DEPEND[rc5test]=../libcrypto
DEPEND[rc5test]=../libcrypto libtestutil.a
SOURCE[destest]=destest.c testutil.c test_main.c
SOURCE[destest]=destest.c
INCLUDE[destest]=../include
DEPEND[destest]=../libcrypto
DEPEND[destest]=../libcrypto libtestutil.a
SOURCE[sha1test]=sha1test.c testutil.c test_main.c
SOURCE[sha1test]=sha1test.c
INCLUDE[sha1test]=../include
DEPEND[sha1test]=../libcrypto
DEPEND[sha1test]=../libcrypto libtestutil.a
SOURCE[sha256t]=sha256t.c testutil.c test_main.c
SOURCE[sha256t]=sha256t.c
INCLUDE[sha256t]=../include
DEPEND[sha256t]=../libcrypto
DEPEND[sha256t]=../libcrypto libtestutil.a
SOURCE[sha512t]=sha512t.c testutil.c test_main.c
SOURCE[sha512t]=sha512t.c
INCLUDE[sha512t]=../include
DEPEND[sha512t]=../libcrypto
DEPEND[sha512t]=../libcrypto libtestutil.a
SOURCE[mdc2test]=mdc2test.c testutil.c test_main.c
SOURCE[mdc2test]=mdc2test.c
INCLUDE[mdc2test]=../include
DEPEND[mdc2test]=../libcrypto
DEPEND[mdc2test]=../libcrypto libtestutil.a
SOURCE[randtest]=randtest.c testutil.c test_main.c
SOURCE[randtest]=randtest.c
INCLUDE[randtest]=../include
DEPEND[randtest]=../libcrypto
DEPEND[randtest]=../libcrypto libtestutil.a
SOURCE[dhtest]=dhtest.c testutil.c test_main.c
SOURCE[dhtest]=dhtest.c
INCLUDE[dhtest]=.. ../include
DEPEND[dhtest]=../libcrypto
DEPEND[dhtest]=../libcrypto libtestutil.a
SOURCE[enginetest]=enginetest.c testutil.c test_main.c
SOURCE[enginetest]=enginetest.c
INCLUDE[enginetest]=../include
DEPEND[enginetest]=../libcrypto
DEPEND[enginetest]=../libcrypto libtestutil.a
SOURCE[casttest]=casttest.c testutil.c test_main.c
SOURCE[casttest]=casttest.c
INCLUDE[casttest]=.. ../include
DEPEND[casttest]=../libcrypto
DEPEND[casttest]=../libcrypto libtestutil.a
SOURCE[bftest]=bftest.c testutil.c test_main_custom.c
SOURCE[bftest]=bftest.c
INCLUDE[bftest]=../include
DEPEND[bftest]=../libcrypto
DEPEND[bftest]=../libcrypto libtestutil.a
SOURCE[ssltest_old]=ssltest_old.c
INCLUDE[ssltest_old]=.. ../include
DEPEND[ssltest_old]=../libcrypto ../libssl
SOURCE[dsatest]=dsatest.c testutil.c test_main.c
SOURCE[dsatest]=dsatest.c
INCLUDE[dsatest]=.. ../include
DEPEND[dsatest]=../libcrypto
DEPEND[dsatest]=../libcrypto libtestutil.a
SOURCE[exptest]=exptest.c
INCLUDE[exptest]=../include
DEPEND[exptest]=../libcrypto
SOURCE[rsa_test]=rsa_test.c testutil.c test_main.c
SOURCE[rsa_test]=rsa_test.c
INCLUDE[rsa_test]=.. ../include
DEPEND[rsa_test]=../libcrypto
DEPEND[rsa_test]=../libcrypto libtestutil.a
SOURCE[evp_test]=evp_test.c
INCLUDE[evp_test]=../include
DEPEND[evp_test]=../libcrypto
SOURCE[evp_extra_test]=evp_extra_test.c testutil.c test_main.c
SOURCE[evp_extra_test]=evp_extra_test.c
INCLUDE[evp_extra_test]=../include
DEPEND[evp_extra_test]=../libcrypto
DEPEND[evp_extra_test]=../libcrypto libtestutil.a
SOURCE[igetest]=igetest.c
INCLUDE[igetest]=.. ../include
DEPEND[igetest]=../libcrypto
SOURCE[v3nametest]=v3nametest.c testutil.c test_main.c
SOURCE[v3nametest]=v3nametest.c
INCLUDE[v3nametest]=.. ../include
DEPEND[v3nametest]=../libcrypto
DEPEND[v3nametest]=../libcrypto libtestutil.a
SOURCE[crltest]=crltest.c testutil.c test_main.c
SOURCE[crltest]=crltest.c
INCLUDE[crltest]=../include
DEPEND[crltest]=../libcrypto
DEPEND[crltest]=../libcrypto libtestutil.a
SOURCE[v3ext]=v3ext.c testutil.c test_main_custom.c
SOURCE[v3ext]=v3ext.c
INCLUDE[v3ext]=../include
DEPEND[v3ext]=../libcrypto
DEPEND[v3ext]=../libcrypto libtestutil.a
SOURCE[danetest]=danetest.c
INCLUDE[danetest]=../include
DEPEND[danetest]=../libcrypto ../libssl
SOURCE[constant_time_test]=constant_time_test.c testutil.c test_main.c
SOURCE[constant_time_test]=constant_time_test.c
INCLUDE[constant_time_test]=.. ../include
DEPEND[constant_time_test]=../libcrypto
DEPEND[constant_time_test]=../libcrypto libtestutil.a
SOURCE[verify_extra_test]=verify_extra_test.c testutil.c test_main_custom.c
SOURCE[verify_extra_test]=verify_extra_test.c
INCLUDE[verify_extra_test]=../include
DEPEND[verify_extra_test]=../libcrypto
DEPEND[verify_extra_test]=../libcrypto libtestutil.a
SOURCE[clienthellotest]=clienthellotest.c testutil.c test_main_custom.c
SOURCE[clienthellotest]=clienthellotest.c
INCLUDE[clienthellotest]=../include
DEPEND[clienthellotest]=../libcrypto ../libssl
DEPEND[clienthellotest]=../libcrypto ../libssl libtestutil.a
SOURCE[bad_dtls_test]=bad_dtls_test.c testutil.c test_main.c
SOURCE[bad_dtls_test]=bad_dtls_test.c
INCLUDE[bad_dtls_test]=../include
DEPEND[bad_dtls_test]=../libcrypto ../libssl
DEPEND[bad_dtls_test]=../libcrypto ../libssl libtestutil.a
SOURCE[packettest]=packettest.c testutil.c test_main.c
SOURCE[packettest]=packettest.c
INCLUDE[packettest]=../include
DEPEND[packettest]=../libcrypto
DEPEND[packettest]=../libcrypto libtestutil.a
SOURCE[asynctest]=asynctest.c
INCLUDE[asynctest]=.. ../include
DEPEND[asynctest]=../libcrypto
SOURCE[secmemtest]=secmemtest.c testutil.c test_main.c
SOURCE[secmemtest]=secmemtest.c
INCLUDE[secmemtest]=../include
DEPEND[secmemtest]=../libcrypto
DEPEND[secmemtest]=../libcrypto libtestutil.a
SOURCE[srptest]=srptest.c testutil.c test_main.c
SOURCE[srptest]=srptest.c
INCLUDE[srptest]=../include
DEPEND[srptest]=../libcrypto
DEPEND[srptest]=../libcrypto libtestutil.a
SOURCE[memleaktest]=memleaktest.c testutil.c
SOURCE[memleaktest]=memleaktest.c
INCLUDE[memleaktest]=../include
DEPEND[memleaktest]=../libcrypto
DEPEND[memleaktest]=../libcrypto libtestutil.a
SOURCE[stack_test]=stack_test.c testutil.c test_main.c
SOURCE[stack_test]=stack_test.c
INCLUDE[stack_test]=.. ../include
DEPEND[stack_test]=../libcrypto
DEPEND[stack_test]=../libcrypto libtestutil.a
SOURCE[lhash_test]=lhash_test.c testutil.c test_main.c
SOURCE[lhash_test]=lhash_test.c
INCLUDE[lhash_test]=.. ../include
DEPEND[lhash_test]=../libcrypto
DEPEND[lhash_test]=../libcrypto libtestutil.a
SOURCE[dtlsv1listentest]=dtlsv1listentest.c
INCLUDE[dtlsv1listentest]=.. ../include
DEPEND[dtlsv1listentest]=../libssl
SOURCE[ct_test]=ct_test.c testutil.c test_main_custom.c
SOURCE[ct_test]=ct_test.c
INCLUDE[ct_test]=../crypto/include ../include
DEPEND[ct_test]=../libcrypto
DEPEND[ct_test]=../libcrypto libtestutil.a
SOURCE[threadstest]=threadstest.c testutil.c test_main.c
SOURCE[threadstest]=threadstest.c
INCLUDE[threadstest]=.. ../include
DEPEND[threadstest]=../libcrypto
DEPEND[threadstest]=../libcrypto libtestutil.a
SOURCE[afalgtest]=afalgtest.c testutil.c
SOURCE[afalgtest]=afalgtest.c
INCLUDE[afalgtest]=.. ../include
DEPEND[afalgtest]=../libcrypto
DEPEND[afalgtest]=../libcrypto libtestutil.a
SOURCE[d2i_test]=d2i_test.c testutil.c test_main_custom.c
SOURCE[d2i_test]=d2i_test.c
INCLUDE[d2i_test]=.. ../include
DEPEND[d2i_test]=../libcrypto
DEPEND[d2i_test]=../libcrypto libtestutil.a
SOURCE[ssl_test_ctx_test]=ssl_test_ctx_test.c ssl_test_ctx.c testutil.c test_main_custom.c
SOURCE[ssl_test_ctx_test]=ssl_test_ctx_test.c ssl_test_ctx.c
INCLUDE[ssl_test_ctx_test]=.. ../include
DEPEND[ssl_test_ctx_test]=../libcrypto ../libssl
DEPEND[ssl_test_ctx_test]=../libcrypto ../libssl libtestutil.a
SOURCE[ssl_test]=ssl_test.c ssl_test_ctx.c testutil.c handshake_helper.c test_main_custom.c
SOURCE[ssl_test]=ssl_test.c ssl_test_ctx.c handshake_helper.c
INCLUDE[ssl_test]=.. ../include
DEPEND[ssl_test]=../libcrypto ../libssl
DEPEND[ssl_test]=../libcrypto ../libssl libtestutil.a
SOURCE[cipherlist_test]=cipherlist_test.c testutil.c test_main.c
SOURCE[cipherlist_test]=cipherlist_test.c
INCLUDE[cipherlist_test]=.. ../include
DEPEND[cipherlist_test]=../libcrypto ../libssl
DEPEND[cipherlist_test]=../libcrypto ../libssl libtestutil.a
INCLUDE[testutil.o]=..
INCLUDE[ssl_test_ctx.o]=../include
INCLUDE[handshake_helper.o]=../include
INCLUDE[ssltestlib.o]=.. ../include
SOURCE[x509aux]=x509aux.c testutil.c test_main_custom.c
SOURCE[x509aux]=x509aux.c
INCLUDE[x509aux]=.. ../include
DEPEND[x509aux]=../libcrypto
DEPEND[x509aux]=../libcrypto libtestutil.a
SOURCE[asynciotest]=asynciotest.c ssltestlib.c testutil.c test_main_custom.c
SOURCE[asynciotest]=asynciotest.c ssltestlib.c
INCLUDE[asynciotest]=../include
DEPEND[asynciotest]=../libcrypto ../libssl
DEPEND[asynciotest]=../libcrypto ../libssl libtestutil.a
SOURCE[bioprinttest]=bioprinttest.c testutil.c test_main_custom.c
SOURCE[bioprinttest]=bioprinttest.c
INCLUDE[bioprinttest]=../ ../include
DEPEND[bioprinttest]=../libcrypto
DEPEND[bioprinttest]=../libcrypto libtestutil.a
SOURCE[sslapitest]=sslapitest.c ssltestlib.c testutil.c test_main_custom.c
SOURCE[sslapitest]=sslapitest.c ssltestlib.c
INCLUDE[sslapitest]=../include ..
DEPEND[sslapitest]=../libcrypto ../libssl
DEPEND[sslapitest]=../libcrypto ../libssl libtestutil.a
SOURCE[dtlstest]=dtlstest.c ssltestlib.c testutil.c test_main_custom.c
SOURCE[dtlstest]=dtlstest.c ssltestlib.c
INCLUDE[dtlstest]=../include .
DEPEND[dtlstest]=../libcrypto ../libssl
DEPEND[dtlstest]=../libcrypto ../libssl libtestutil.a
SOURCE[sslcorrupttest]=sslcorrupttest.c ssltestlib.c testutil.c test_main_custom.c
SOURCE[sslcorrupttest]=sslcorrupttest.c ssltestlib.c
INCLUDE[sslcorrupttest]=../include .
DEPEND[sslcorrupttest]=../libcrypto ../libssl
DEPEND[sslcorrupttest]=../libcrypto ../libssl libtestutil.a
SOURCE[bio_enc_test]=bio_enc_test.c testutil.c test_main.c
SOURCE[bio_enc_test]=bio_enc_test.c
INCLUDE[bio_enc_test]=../include
DEPEND[bio_enc_test]=../libcrypto
DEPEND[bio_enc_test]=../libcrypto libtestutil.a
SOURCE[pkey_meth_test]=pkey_meth_test.c testutil.c test_main.c
SOURCE[pkey_meth_test]=pkey_meth_test.c
INCLUDE[pkey_meth_test]=../include
DEPEND[pkey_meth_test]=../libcrypto
DEPEND[pkey_meth_test]=../libcrypto libtestutil.a
SOURCE[x509_time_test]=x509_time_test.c testutil.c test_main.c
SOURCE[x509_time_test]=x509_time_test.c
INCLUDE[x509_time_test]=.. ../include
DEPEND[x509_time_test]=../libcrypto
DEPEND[x509_time_test]=../libcrypto libtestutil.a
SOURCE[recordlentest]=recordlentest.c ssltestlib.c testutil.c test_main_custom.c
SOURCE[recordlentest]=recordlentest.c ssltestlib.c
INCLUDE[recordlentest]=../include .
DEPEND[recordlentest]=../libcrypto ../libssl
DEPEND[recordlentest]=../libcrypto ../libssl libtestutil.a
SOURCE[x509_dup_cert_test]=x509_dup_cert_test.c testutil.c test_main_custom.c
SOURCE[x509_dup_cert_test]=x509_dup_cert_test.c
INCLUDE[x509_dup_cert_test]=../include
DEPEND[x509_dup_cert_test]=../libcrypto
DEPEND[x509_dup_cert_test]=../libcrypto libtestutil.a
IF[{- !$disabled{psk} -}]
PROGRAMS_NO_INST=dtls_mtu_test
@ -327,23 +327,22 @@ INCLUDE_MAIN___test_libtestutil_OLB = /INCLUDE=MAIN
IF[{- $disabled{shared} -}]
PROGRAMS_NO_INST=cipher_overhead_test
SOURCE[cipher_overhead_test]=cipher_overhead_test.c testutil.c test_main.c
SOURCE[cipher_overhead_test]=cipher_overhead_test.c
INCLUDE[cipher_overhead_test]=.. ../include
DEPEND[cipher_overhead_test]=../libcrypto ../libssl
DEPEND[cipher_overhead_test]=../libcrypto ../libssl libtestutil.a
ENDIF
SOURCE[uitest]=uitest.c testutil.c test_main_custom.c \
../apps/apps.c ../apps/opt.c {- $apps_extra -}
SOURCE[uitest]=uitest.c ../apps/apps.c ../apps/opt.c
INCLUDE[uitest]=.. ../include
DEPEND[uitest]=../libcrypto ../libssl
DEPEND[uitest]=../libcrypto ../libssl libtestutil.a
SOURCE[cipherbytes_test]=cipherbytes_test.c testutil.c test_main_custom.c
SOURCE[cipherbytes_test]=cipherbytes_test.c
INCLUDE[cipherbytes_test]=.. ../include
DEPEND[cipherbytes_test]=../libcrypto ../libssl
DEPEND[cipherbytes_test]=../libcrypto ../libssl libtestutil.a
SOURCE[asn1_encode_test]=asn1_encode_test.c testutil.c test_main.c
SOURCE[asn1_encode_test]=asn1_encode_test.c
INCLUDE[asn1_encode_test]=../include
DEPEND[asn1_encode_test]=../libcrypto
DEPEND[asn1_encode_test]=../libcrypto libtestutil.a
# Internal test programs. These are essentially a collection of internal
# test routines. Some of them need to reach internal symbols that aren't
@ -366,56 +365,56 @@ INCLUDE_MAIN___test_libtestutil_OLB = /INCLUDE=MAIN
PROGRAMS_NO_INST=siphash_internal_test
ENDIF
SOURCE[poly1305_internal_test]=poly1305_internal_test.c testutil.c test_main_custom.c
SOURCE[poly1305_internal_test]=poly1305_internal_test.c
INCLUDE[poly1305_internal_test]=.. ../include ../crypto/include
DEPEND[poly1305_internal_test]=../libcrypto.a
DEPEND[poly1305_internal_test]=../libcrypto.a libtestutil.a
SOURCE[chacha_internal_test]=chacha_internal_test.c testutil.c test_main.c
SOURCE[chacha_internal_test]=chacha_internal_test.c
INCLUDE[chacha_internal_test]=.. ../include ../crypto/include
DEPEND[chacha_internal_test]=../libcrypto.a
DEPEND[chacha_internal_test]=../libcrypto.a libtestutil.a
SOURCE[asn1_internal_test]=asn1_internal_test.c testutil.c test_main.c
SOURCE[asn1_internal_test]=asn1_internal_test.c
INCLUDE[asn1_internal_test]=.. ../include ../crypto/include
DEPEND[asn1_internal_test]=../libcrypto.a
DEPEND[asn1_internal_test]=../libcrypto.a libtestutil.a
SOURCE[modes_internal_test]=modes_internal_test.c testutil.c test_main_custom.c
SOURCE[modes_internal_test]=modes_internal_test.c
INCLUDE[modes_internal_test]=.. ../include
DEPEND[modes_internal_test]=../libcrypto.a
DEPEND[modes_internal_test]=../libcrypto.a libtestutil.a
SOURCE[x509_internal_test]=x509_internal_test.c testutil.c test_main.c
SOURCE[x509_internal_test]=x509_internal_test.c
INCLUDE[x509_internal_test]=.. ../include
DEPEND[x509_internal_test]=../libcrypto.a
DEPEND[x509_internal_test]=../libcrypto.a libtestutil.a
SOURCE[tls13encryptiontest]=tls13encryptiontest.c testutil.c test_main.c
SOURCE[tls13encryptiontest]=tls13encryptiontest.c
INCLUDE[tls13encryptiontest]=.. ../include
DEPEND[tls13encryptiontest]=../libcrypto ../libssl.a
DEPEND[tls13encryptiontest]=../libcrypto ../libssl.a libtestutil.a
SOURCE[wpackettest]=wpackettest.c testutil.c test_main_custom.c
SOURCE[wpackettest]=wpackettest.c
INCLUDE[wpackettest]=../include
DEPEND[wpackettest]=../libcrypto ../libssl.a
DEPEND[wpackettest]=../libcrypto ../libssl.a libtestutil.a
SOURCE[siphash_internal_test]=siphash_internal_test.c testutil.c test_main_custom.c
SOURCE[siphash_internal_test]=siphash_internal_test.c
INCLUDE[siphash_internal_test]=.. ../include ../crypto/include
DEPEND[siphash_internal_test]=../libcrypto.a
DEPEND[siphash_internal_test]=../libcrypto.a libtestutil.a
ENDIF
IF[{- !$disabled{mdc2} -}]
PROGRAMS_NO_INST=mdc2_internal_test
ENDIF
SOURCE[mdc2_internal_test]=mdc2_internal_test.c testutil.c test_main.c
SOURCE[mdc2_internal_test]=mdc2_internal_test.c
INCLUDE[mdc2_internal_test]=.. ../include
DEPEND[mdc2_internal_test]=../libcrypto
DEPEND[mdc2_internal_test]=../libcrypto libtestutil.a
# We disable this test completely in a shared build because it deliberately
# redefines some internal libssl symbols. This doesn't work in a non-shared
# build
IF[{- !$disabled{shared} -}]
PROGRAMS_NO_INST=tls13secretstest
SOURCE[tls13secretstest]=tls13secretstest.c testutil.c test_main.c
SOURCE[tls13secretstest]=tls13secretstest.c
SOURCE[tls13secretstest]= ../ssl/tls13_enc.c ../ssl/packet.c
INCLUDE[tls13secretstest]=.. ../include
DEPEND[tls13secretstest]=../libcrypto ../libssl
DEPEND[tls13secretstest]=../libcrypto ../libssl libtestutil.a
ENDIF
ENDIF

1
test/casttest.c
View File

@ -13,7 +13,6 @@
#include <openssl/opensslconf.h> /* To see if OPENSSL_NO_CAST is defined */
#include "e_os.h"
#include "test_main.h"
#include "testutil.h"
#ifndef OPENSSL_NO_CAST

1
test/chacha_internal_test.c
View File

@ -14,7 +14,6 @@
#include <string.h>
#include <openssl/opensslconf.h>
#include "test_main.h"
#include "testutil.h"
#include "internal/chacha.h"

3
test/cipher_overhead_test.c
View File

@ -9,7 +9,6 @@
#include "e_os.h"
#include "testutil.h"
#include "test_main.h"
#ifdef __VMS
# pragma names save
@ -36,7 +35,7 @@ static int cipher_overhead(void)
TEST_info("Failed getting %s", ciph->name);
ret = 0;
} else {
TEST_info("Cipher %s: %"OSSLzu" %"OSSLzu" %"OSSLzu" %"OSSLzu,
TEST_info("Cipher %s: %zu %zu %zu %zu",
ciph->name, mac, in, blk, ex);
}
}

1
test/cipherbytes_test.c
View File

@ -20,7 +20,6 @@
#include "e_os.h"
#include "testutil.h"
#include "test_main_custom.h"
static SSL_CTX *ctx;
static SSL *s;

1
test/cipherlist_test.c
View File

@ -18,7 +18,6 @@
#include <openssl/tls1.h>
#include "e_os.h"
#include "test_main.h"
#include "testutil.h"
typedef struct cipherlist_test_fixture {

1
test/clienthellotest.c
View File

@ -20,7 +20,6 @@
#include "../ssl/packet_locl.h"
#include "testutil.h"
#include "test_main_custom.h"
#define CLIENT_VERSION_LEN 2

1
test/constant_time_test.c
View File

@ -13,7 +13,6 @@
#include "e_os.h"
#include "internal/constant_time_locl.h"
#include "testutil.h"
#include "test_main.h"
#include "internal/numbers.h"
static const unsigned int CONSTTIME_TRUE = (unsigned)(~0);

1
test/crltest.c
View File

@ -17,7 +17,6 @@
#include <openssl/x509.h>
#include "testutil.h"
#include "test_main.h"
#define PARAM_TIME 1474934400 /* Sep 27th, 2016 */

1
test/ct_test.c
View File

@ -19,7 +19,6 @@
#include <openssl/x509.h>
#include <openssl/x509v3.h>
#include "testutil.h"
#include "test_main_custom.h"
#ifndef OPENSSL_NO_CT
/* Used when declaring buffers to read text files into */

1
test/d2i_test.c
View File

@ -13,7 +13,6 @@
#include <string.h>
#include "testutil.h"
#include "test_main_custom.h"
#include <openssl/asn1.h>
#include <openssl/asn1t.h>

1
test/destest.c
View File

@ -10,7 +10,6 @@
#include <openssl/e_os2.h>
#include <string.h>
#include "test_main.h"
#include "testutil.h"
#ifndef OPENSSL_NO_DES

1
test/dhtest.c
View File

@ -17,7 +17,6 @@
#include <openssl/bn.h>
#include <openssl/rand.h>
#include <openssl/err.h>
#include "test_main.h"
#include "testutil.h"
#ifdef OPENSSL_NO_DH

1
test/dsatest.c
View File

@ -18,7 +18,6 @@
#include <openssl/bn.h>
#include <openssl/dsa.h>
#include "test_main.h"
#include "testutil.h"
#include "e_os.h"

1
test/dtlstest.c
View File

@ -14,7 +14,6 @@
#include "ssltestlib.h"
#include "testutil.h"
#include "test_main_custom.h"
static char *cert = NULL;
static char *privkey = NULL;

1
test/ecdsatest.c
View File

@ -46,7 +46,6 @@ int main(int argc, char *argv[])
# include <openssl/err.h>
# include <openssl/rand.h>
# include "testutil.h"
# include "test_main.h"
static const char rnd_seed[] = "string to make the random number generator "
"think it has entropy";

1
test/enginetest.c
View File

@ -23,7 +23,6 @@ int main(int argc, char *argv[])
# include <openssl/engine.h>
# include <openssl/err.h>
# include "testutil.h"
# include "test_main.h"
static void display_engine_list(void)
{

1
test/evp_extra_test.c
View File

@ -16,7 +16,6 @@
#include <openssl/rsa.h>
#include <openssl/x509.h>
#include "testutil.h"
#include "test_main.h"
/*
* kExampleRSAKeyDER is an RSA private key in ASN.1, DER format. Of course, you

1
test/exdatatest.c
View File

@ -12,7 +12,6 @@
#include <stdlib.h>
#include <openssl/crypto.h>
#include "test_main.h"
#include "testutil.h"
static long saved_argl;

1
test/gmdifftest.c
View File

@ -9,7 +9,6 @@
#include <openssl/crypto.h>
#include "test_main.h"
#include "testutil.h"
#define SECS_PER_DAY (24 * 60 * 60)

1
test/hmactest.c
View File

@ -23,7 +23,6 @@
# include <openssl/ebcdic.h>
# endif
#include "test_main.h"
#include "testutil.h"
# ifndef OPENSSL_NO_MD5

1
test/ideatest.c
View File

@ -10,7 +10,6 @@
#include <string.h>
#include "../e_os.h"
#include "test_main.h"
#include "testutil.h"
#ifndef OPENSSL_NO_IDEA

1
test/lhash_test.c
View File

@ -20,7 +20,6 @@
#include <openssl/crypto.h>
#include "e_os.h"
#include "test_main.h"
#include "testutil.h"
/*

1
test/md2test.c
View File

@ -10,7 +10,6 @@
#include <string.h>
#include "../e_os.h"
#include "test_main.h"
#include "testutil.h"
#ifndef OPENSSL_NO_MD2

1
test/mdc2_internal_test.c
View File

@ -14,7 +14,6 @@
#include <openssl/mdc2.h>
#include "testutil.h"
#include "test_main.h"
#include "e_os.h"
typedef struct {

1
test/mdc2test.c
View File

@ -10,7 +10,6 @@
#include <string.h>
#include "../e_os.h"
#include "test_main.h"
#include "testutil.h"
#if defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_MDC2)

1
test/modes_internal_test.c
View File

@ -16,7 +16,6 @@
#include <openssl/modes.h>
#include "../crypto/modes/modes_lcl.h"
#include "testutil.h"
#include "test_main_custom.h"
#include "e_os.h"
typedef struct {

1
test/packettest.c
View File

@ -9,7 +9,6 @@
#include "../ssl/packet_locl.h"
#include "testutil.h"
#include "test_main.h"
#define BUF_LEN 255

1
test/pbelutest.c
View File

@ -9,7 +9,6 @@
#include <openssl/evp.h>
#include "testutil.h"
#include "test_main.h"
/*
* Password based encryption (PBE) table ordering test.

1
test/pkey_meth_test.c
View File

@ -14,7 +14,6 @@
#include <openssl/evp.h>
#include "testutil.h"
#include "test_main.h"
/**********************************************************************
*

3
test/poly1305_internal_test.c
View File

@ -13,7 +13,6 @@
#include <string.h>
#include "testutil.h"
#include "test_main_custom.h"
#include "internal/poly1305.h"
#include "../crypto/poly1305/poly1305_local.h"
#include "e_os.h"
@ -1600,7 +1599,7 @@ static int test_poly1305(int idx)
Poly1305_Final(&poly1305, out);
if (!TEST_mem_eq(out, expectedlen, expected, expectedlen)) {
TEST_info("Poly1305 test #%d/%" OSSLzu "+%" OSSLzu " failed.",
TEST_info("Poly1305 test #%d/%zu+%zu failed.",
idx, half, inlen-half);
return 0;
}

1
test/randtest.c
View File

@ -9,7 +9,6 @@
#include <openssl/rand.h>
#include "testutil.h"
#include "test_main.h"
/* some FIPS 140-1 random number test */
/* some simple tests */

1
test/rc2test.c
View File

@ -8,7 +8,6 @@
*/
#include "../e_os.h"
#include "test_main.h"
#include "testutil.h"
#ifndef OPENSSL_NO_RC2

1
test/rc4test.c
View File

@ -10,7 +10,6 @@
#include <string.h>
#include "../e_os.h"
#include "test_main.h"
#include "testutil.h"
#ifndef OPENSSL_NO_RC4

1
test/rc5test.c
View File

@ -10,7 +10,6 @@
#include <string.h>
#include "../e_os.h"
#include "test_main.h"
#include "testutil.h"
#ifndef OPENSSL_NO_RC5

1
test/recordlentest.c
View File

@ -11,7 +11,6 @@
#include "ssltestlib.h"
#include "testutil.h"
#include "test_main_custom.h"
static char *cert = NULL;
static char *privkey = NULL;

1
test/rsa_test.c
View File

@ -19,7 +19,6 @@
#include <openssl/rand.h>
#include <openssl/bn.h>
#include "test_main.h"
#include "testutil.h"
#ifdef OPENSSL_NO_RSA

1
test/sanitytest.c
View File

@ -10,7 +10,6 @@
#include <string.h>
#include <internal/numbers.h>
#include "test_main.h"
#include "testutil.h"
static int test_sanity_null_zero(void)

1
test/secmemtest.c
View File

@ -9,7 +9,6 @@
#include <openssl/crypto.h>
#include "test_main.h"
#include "testutil.h"
static int test_sec_mem(void)

1
test/sha1test.c
View File

@ -11,7 +11,6 @@
#include <string.h>
#include "../e_os.h"
#include "test_main.h"
#include "testutil.h"
#include <openssl/evp.h>

1
test/sha256t.c
View File

@ -10,7 +10,6 @@
#include <openssl/sha.h>
#include <openssl/evp.h>
#include "test_main.h"
#include "testutil.h"
static const unsigned char app_b1[SHA256_DIGEST_LENGTH] = {

1
test/sha512t.c
View File

@ -10,7 +10,6 @@
#include <openssl/sha.h>
#include <openssl/evp.h>
#include "test_main.h"
#include "testutil.h"
static const unsigned char app_c1[SHA512_DIGEST_LENGTH] = {

5
test/siphash_internal_test.c
View File

@ -14,7 +14,6 @@
#include <openssl/bio.h>
#include "testutil.h"
#include "test_main_custom.h"
#include "internal/siphash.h"
#include "../crypto/siphash/siphash_local.h"
#include "e_os.h"
@ -226,7 +225,7 @@ static int test_siphash(int idx)
if (expectedlen != SIPHASH_MIN_DIGEST_SIZE &&
expectedlen != SIPHASH_MAX_DIGEST_SIZE) {
TEST_info("size %" OSSLzu " vs %d and %d", expectedlen,
TEST_info("size %zu vs %d and %d", expectedlen,
SIPHASH_MIN_DIGEST_SIZE, SIPHASH_MAX_DIGEST_SIZE);
return 0;
}
@ -286,7 +285,7 @@ static int test_siphash(int idx)
return 0;
if (!TEST_mem_eq(out, expectedlen, expected, expectedlen)) {
TEST_info("SipHash test #%d/%" OSSLzu "+%" OSSLzu " failed.",
TEST_info("SipHash test #%d/%zu+%zu failed.",
idx, half, inlen-half);
return 0;
}

1
test/srptest.c
View File

@ -24,7 +24,6 @@ int main(int argc, char *argv[])
# include <openssl/rand.h>
# include <openssl/err.h>
# include "testutil.h"
# include "test_main.h"
static void showbn(const char *name, const BIGNUM *bn)
{

1
test/ssl_test.c
View File

@ -17,7 +17,6 @@
#include "handshake_helper.h"
#include "ssl_test_ctx.h"
#include "testutil.h"
#include "test_main_custom.h"
static CONF *conf = NULL;

1
test/ssl_test_ctx_test.c
View File

@ -18,7 +18,6 @@
#include "e_os.h"
#include "ssl_test_ctx.h"
#include "testutil.h"
#include "test_main_custom.h"
#include <openssl/e_os2.h>
#include <openssl/err.h>
#include <openssl/conf.h>

1
test/sslapitest.c
View File

@ -17,7 +17,6 @@
#include "ssltestlib.h"
#include "testutil.h"
#include "test_main_custom.h"
#include "e_os.h"
static char *cert = NULL;

1
test/sslcorrupttest.c
View File

@ -10,7 +10,6 @@
#include <string.h>
#include "ssltestlib.h"
#include "testutil.h"
#include "test_main_custom.h"
static int docorrupt = 0;

1
test/stack_test.c
View File

@ -20,7 +20,6 @@
#include <openssl/crypto.h>
#include "e_os.h"
#include "test_main.h"
#include "testutil.h"
/* The macros below generate unused functions which error out one of the clang

1
test/test_test.c
View File

@ -19,7 +19,6 @@
#include <openssl/crypto.h>
#include "e_os.h"
#include "test_main.h"
#include "testutil.h"
#define C(l, b, t) \

1
test/threadstest.c
View File

@ -12,7 +12,6 @@
#endif
#include <openssl/crypto.h>
#include "test_main.h"
#include "testutil.h"
#if !defined(OPENSSL_THREADS) || defined(CRYPTO_TDEBUG)

9
test/tls13encryptiontest.c
View File

@ -23,7 +23,6 @@
#endif
#include "testutil.h"
#include "test_main.h"
/*
* Based on the test vectors provided in:
@ -358,21 +357,21 @@ static int test_tls13_encryption(void)
/* Encrypt it */
if (!TEST_size_t_eq(tls13_enc(s, &rec, 1, 1), 1)) {
TEST_info("Failed to encrypt record %"OSSLzu"", ctr);
TEST_info("Failed to encrypt record %zu", ctr);
goto err;
}
if (!TEST_true(test_record(&rec, &refdata[ctr], 1))) {
TEST_info("Record %"OSSLzu" encryption test failed", ctr);
TEST_info("Record %zu encryption test failed", ctr);
goto err;
}
/* Decrypt it */
if (!TEST_int_eq(tls13_enc(s, &rec, 1, 0), 1)) {
TEST_info("Failed to decrypt record %"OSSLzu"", ctr);
TEST_info("Failed to decrypt record %zu", ctr);
goto err;
}
if (!TEST_true(test_record(&rec, &refdata[ctr], 0))) {
TEST_info("Record %"OSSLzu" decryption test failed", ctr);
TEST_info("Record %zu decryption test failed", ctr);
goto err;
}

1
test/tls13secretstest.c
View File

@ -22,7 +22,6 @@
#endif
#include "testutil.h"
#include "test_main.h"
#define IVLEN 12
#define KEYLEN 16

24
test/uitest.c
View File

@ -11,22 +11,11 @@
#include <string.h>
#include <openssl/opensslconf.h>
#include <openssl/err.h>
/*
* The VMS build does stdio via a socketpair.
*/
#ifdef __VMS
# include "../apps/vms_term_sock.h"
#endif
#include "../apps/apps.h"
#include "testutil.h"
#include "test_main_custom.h"
/* apps/apps.c depend on these */
char *default_config_file = NULL;
BIO *bio_err = NULL;
#ifndef OPENSSL_NO_UI
# include <openssl/ui.h>
@ -102,21 +91,10 @@ static int test_new_ui()
#endif
int test_main(int argc, char *argv[])
void register_tests(void)
{
int ret;
bio_err = dup_bio_err(FORMAT_TEXT);
#ifndef OPENSSL_NO_UI
ADD_TEST(test_old);
ADD_TEST(test_new_ui);
#endif
ret = run_tests(argv[0]);
(void)BIO_flush(bio_err);
BIO_free(bio_err);
return ret;
}

1
test/v3ext.c
View File

@ -13,7 +13,6 @@
#include <openssl/pem.h>
#include <openssl/err.h>
#include "test_main_custom.h"
#include "testutil.h"
static const char *infile;

1
test/v3nametest.c
View File

@ -12,7 +12,6 @@
#include <openssl/x509.h>
#include <openssl/x509v3.h>
#include "testutil.h"
#include "test_main.h"
static const char *const names[] = {
"a", "b", ".", "*", "@",

1
test/verify_extra_test.c
View File

@ -14,7 +14,6 @@
#include <openssl/pem.h>
#include <openssl/err.h>
#include "testutil.h"
#include "test_main_custom.h"
static STACK_OF(X509) *load_certs_from_file(const char *filename)
{

1
test/wpackettest.c
View File

@ -22,7 +22,6 @@
#endif
#include "testutil.h"
#include "test_main_custom.h"
const static unsigned char simple1[] = { 0xff };
const static unsigned char simple2[] = { 0x01, 0xff };

1
test/x509_dup_cert_test.c
View File

@ -15,7 +15,6 @@
#include <openssl/err.h>
#include <openssl/x509_vfy.h>
#include "test_main_custom.h"
#include "testutil.h"
static int test_509_dup_cert(const char *cert_f)

1
test/x509_internal_test.c
View File

@ -15,7 +15,6 @@
#include <openssl/x509.h>
#include <openssl/x509v3.h>
#include "testutil.h"
#include "test_main.h"
#include "e_os.h"
/**********************************************************************

1
test/x509_time_test.c
View File

@ -15,7 +15,6 @@
#include <openssl/asn1.h>
#include <openssl/x509.h>
#include "testutil.h"
#include "test_main.h"
#include "e_os.h"
typedef struct {

2
test/x509aux.c
View File

@ -17,8 +17,6 @@
#include <openssl/conf.h>
#include <openssl/err.h>
#include "e_os.h"
#include "test_main.h"
#include "test_main_custom.h"
#include "testutil.h"