dilim/openssh-portable
1
0
Fork 0
mirror of https://github.com/openssh/openssh-portable.git synced 2026-06-24 08:48:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

hook up new regress/unittests/crypto

Browse Source
This commit is contained in:
Damien Miller
2026-06-14 15:02:24 +10:00
parent 5a474d1bf3
commit 8e0cb47177
7 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Makefile.in
View File

@@ -316,6 +316,8 @@ clean: regressclean
rm -f regress/unittests/kex/test_kex$(EXEEXT) rm -f regress/unittests/kex/test_kex$(EXEEXT)
rm -f regress/unittests/match/*.o rm -f regress/unittests/match/*.o
rm -f regress/unittests/match/test_match$(EXEEXT) rm -f regress/unittests/match/test_match$(EXEEXT)
rm -f regress/unittests/crypto/*.o
rm -f regress/unittests/crypto/test_crypto$(EXEEXT)
rm -f regress/unittests/misc/*.o rm -f regress/unittests/misc/*.o
rm -f regress/unittests/misc/test_misc$(EXEEXT) rm -f regress/unittests/misc/test_misc$(EXEEXT)
rm -f regress/unittests/servconf/*.o rm -f regress/unittests/servconf/*.o
@@ -357,6 +359,8 @@ distclean: regressclean
rm -f regress/unittests/kex/test_kex rm -f regress/unittests/kex/test_kex
rm -f regress/unittests/match/*.o rm -f regress/unittests/match/*.o
rm -f regress/unittests/match/test_match rm -f regress/unittests/match/test_match
rm -f regress/unittests/crypto/*.o
rm -f regress/unittests/crypto/test_crypto
rm -f regress/unittests/misc/*.o rm -f regress/unittests/misc/*.o
rm -f regress/unittests/misc/test_misc rm -f regress/unittests/misc/test_misc
rm -f regress/unittests/servconf/*.o rm -f regress/unittests/servconf/*.o
@@ -543,6 +547,7 @@ regress-prep:
$(MKDIR_P) `pwd`/regress/unittests/hostkeys $(MKDIR_P) `pwd`/regress/unittests/hostkeys
$(MKDIR_P) `pwd`/regress/unittests/kex $(MKDIR_P) `pwd`/regress/unittests/kex
$(MKDIR_P) `pwd`/regress/unittests/match $(MKDIR_P) `pwd`/regress/unittests/match
$(MKDIR_P) `pwd`/regress/unittests/crypto
$(MKDIR_P) `pwd`/regress/unittests/misc $(MKDIR_P) `pwd`/regress/unittests/misc
$(MKDIR_P) `pwd`/regress/unittests/servconf $(MKDIR_P) `pwd`/regress/unittests/servconf
$(MKDIR_P) `pwd`/regress/unittests/sshbuf $(MKDIR_P) `pwd`/regress/unittests/sshbuf
@@ -695,6 +700,21 @@ regress/unittests/match/test_match$(EXEEXT): \
regress/unittests/test_helper/libtest_helper.a \ regress/unittests/test_helper/libtest_helper.a \
-lssh -lopenbsd-compat -lssh -lopenbsd-compat $(TESTLIBS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(TESTLIBS)
UNITTESTS_TEST_CRYPTO_OBJS=\
regress/unittests/crypto/test_ed25519.o \
regress/unittests/crypto/test_mldsa.o \
regress/unittests/crypto/test_mldsa_eddsa.o \
regress/unittests/crypto/test_mlkem.o \
regress/unittests/crypto/tests.o \
$(P11OBJS) $(SKOBJS)
regress/unittests/crypto/test_crypto$(EXEEXT): \
${UNITTESTS_TEST_CRYPTO_OBJS} \
regress/unittests/test_helper/libtest_helper.a libssh.a
$(LD) -o $@ $(LDFLAGS) $(UNITTESTS_TEST_CRYPTO_OBJS) \
regress/unittests/test_helper/libtest_helper.a \
-lssh -lopenbsd-compat -lssh -lopenbsd-compat $(TESTLIBS)
UNITTESTS_TEST_MISC_OBJS=\ UNITTESTS_TEST_MISC_OBJS=\
regress/unittests/misc/tests.o \ regress/unittests/misc/tests.o \
regress/unittests/misc/test_parse.o \ regress/unittests/misc/test_parse.o \
@@ -778,6 +798,7 @@ regress-unit-binaries: regress-prep $(REGRESSLIBS) \
regress/unittests/hostkeys/test_hostkeys$(EXEEXT) \ regress/unittests/hostkeys/test_hostkeys$(EXEEXT) \
regress/unittests/kex/test_kex$(EXEEXT) \ regress/unittests/kex/test_kex$(EXEEXT) \
regress/unittests/match/test_match$(EXEEXT) \ regress/unittests/match/test_match$(EXEEXT) \
regress/unittests/crypto/test_crypto$(EXEEXT) \
regress/unittests/misc/test_misc$(EXEEXT) \ regress/unittests/misc/test_misc$(EXEEXT) \
regress/unittests/servconf/test_servconf$(EXEEXT) \ regress/unittests/servconf/test_servconf$(EXEEXT) \
regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \ regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \

2
regress/Makefile
View File

@@ -309,6 +309,8 @@ unit unit-bench:
$$V ${.OBJDIR}/unittests/match/test_match $${ARGS}; \ $$V ${.OBJDIR}/unittests/match/test_match $${ARGS}; \
$$V ${.OBJDIR}/unittests/misc/test_misc $${ARGS}; \ $$V ${.OBJDIR}/unittests/misc/test_misc $${ARGS}; \
$$V ${.OBJDIR}/unittests/servconf/test_servconf $${ARGS}; \ $$V ${.OBJDIR}/unittests/servconf/test_servconf $${ARGS}; \
$$V ${.OBJDIR}/unittests/crypto/test_crypto \
-d ${.CURDIR}/unittests/crypto/testdata $${ARGS}; \
if test "x${TEST_SSH_UTF8}" = "xyes" ; then \ if test "x${TEST_SSH_UTF8}" = "xyes" ; then \
$$V ${.OBJDIR}/unittests/utf8/test_utf8 $${ARGS}; \ $$V ${.OBJDIR}/unittests/utf8/test_utf8 $${ARGS}; \
fi \ fi \

2
regress/unittests/crypto/test_ed25519.c
View File

@@ -5,6 +5,8 @@
* Placed in the public domain * Placed in the public domain
*/ */
#include "includes.h"
#include <sys/types.h> #include <sys/types.h>
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <stdint.h>

2
regress/unittests/crypto/test_mldsa.c
View File

@@ -5,6 +5,8 @@
* Placed in the public domain * Placed in the public domain
*/ */
#include "includes.h"
#include <sys/types.h> #include <sys/types.h>
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <stdint.h>

2
regress/unittests/crypto/test_mldsa_eddsa.c
View File

@@ -5,6 +5,8 @@
* Placed in the public domain * Placed in the public domain
*/ */
#include "includes.h"
#include <sys/types.h> #include <sys/types.h>
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <stdint.h>

2
regress/unittests/crypto/test_mlkem.c
View File

@@ -5,6 +5,8 @@
* Placed in the public domain * Placed in the public domain
*/ */
#include "includes.h"
#include <sys/types.h> #include <sys/types.h>
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <stdint.h>

2
regress/unittests/crypto/tests.c
View File

@@ -5,6 +5,8 @@
* Placed in the public domain * Placed in the public domain
*/ */
#include "includes.h"
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>