Posts by abu baniaz

The webif template generator filters template blocks based on
webif/is_defined.txt, which config.sh's write_enabled() builds. With
WITH_SSL no longer in the addons list, it was never written to that
file even when USE_SSL=1 is passed to make (or -DWITH_SSL=1 to cmake,
which propagates as USE_SSL via --use-flags).


Effect: the SSL Settings block on the WebIf config page disappeared.


Mirror the existing USE_PCSC -> CARDREADER_PCSC handling and emit
WITH_SSL when USE_SSL is in USE_FLAGS.

Including <openssl/des.h> from cscrypt/mdc2.h pulled OpenSSL's DES
backward-compatibility macros (e.g. des_ecb_encrypt -> DES_ecb_encrypt
with different argument counts) into every translation unit that uses
mdc2.h. tests.c includes both mdc2.h and cscrypt/des.h, which made the
test build fail with 'macro requires N arguments, but only M given'
errors on toolchains shipping OpenSSL 1.0.x.


The header only needed DES_cblock for two MDC2_CTX struct fields, both
of which are simply 8-byte buffers. Replace them with unsigned char[8]
and move the OpenSSL include (and the local DES typedef fallback) into
mdc2.c, where the DES API is actually used.

WITH_SSL was added to config.sh in 2010 (commit 6c2b2c49) when there was
no separation between make and cmake. Today the convention is:
- make uses USE_SSL=1
- cmake uses -DWITH_SSL=1


WITH_SSL in config.sh's addons list violated this and only acted as a
config-file fallback that translated to USE_SSL in the Makefile. Both
build systems work fine without it.


Removed:
- WITH_SSL from addons list and defconfig in config.sh
- WITH_SIGNING -> WITH_SSL auto-dependency (Makefile and CMakeLists
already handle this on their own)
- WITH_SSL menuconfig entry and help examples
- config.sh --enabled WITH_SSL fallback in Makefile
- CONFIG_WITH_SSL fallback logic in CMakeLists.txt


The GitLab CI pipeline previously passed the make-style flag -DUSE_SSL
to cmake, which cmake silently ignored — the dropped config.sh fallback
used to paper over this. Switch the cmake invocations to -DWITH_SSL=1
(the variable cmake actually reads) and drop the obsolete
DISABLE_OPT WITH_SSL entries since WITH_SSL is no longer a config.sh
option.

The AES key-list helpers it exercises — add_aes_entry,
aes_clear_entries, aes_decrypt_from_list, aes_present — are
defined in oscam-aes.c under #ifdef READER_VIACCESS, since
Viaccess is the only consumer. Calling them unconditionally
from run_crypto_tests() makes tests.bin fail to link on every
build without the Viaccess reader:


oscam-aes.c: undefined reference to add_aes_entry
aes_clear_entries
aes_decrypt_from_list
aes_present


Reproduces e.g. on the cmake test build for the VuZero4k target
with MODULE_CCCAM enabled (so WITH_LIB_AES is on) but no readers.


Wrap both the run_aes_key_list_tests() definition and its
caller in run_crypto_tests() in #ifdef READER_VIACCESS, matching
the gating of the helpers themselves.

* build: keep test binaries unsigned


Skip the link-stage signing step when BUILD_TESTS is enabled in the
Makefile. The tests target already avoids strip/sign/upx when copying
tests.bin from tests.bin.debug, but tests.bin.debug itself was still
passed through SIGN_COMMAND_OSCAM. With signing enabled this could still
reassemble stale UPX split files into the test binary before the copy
step, reintroducing the failure the tests build path was meant to avoid.


* build: add BUILD_TESTS support to CMake and skip strip/sign/upx


Makefile: SIGN_COMMAND_OSCAM reassembles any leftover UPX split parts
(upx.aa / upx.ab from a previous build) onto the current target — on
the second invocation this re-creates a UPX-compressed
tests.bin.debug, so the subsequent strip fails with 'input file has no
sections' and aborts the build. The test binary does not need to be
stripped, signed or compressed. Skip all three steps when
BUILD_TESTS=1 and just copy .debug → bin.


CMakeLists.txt previously had no tests target at all — 'make tests'
only worked via the Makefile. Add a BUILD_TESTS option (OFF by
default) that mirrors the Makefile path:
- pulls tests.c into the csoscam library
- adds -DBUILD_TESTS=1 to the global compile definitions
- renames the executable to tests.bin and links it without the
strip/sign/upx POST_BUILD commands
- exposes a 'run-tests' custom target that builds the binary and
executes it in the build tree


Standard usage:
mkdir build-tests && cd build-tests
cmake -DBUILD_TESTS=ON -DUSE_SSL=1 -DUSE_LIBCRYPTO=1 ..
make run-tests


* tests: add crypto test vectors


Extend run_all_tests() with known-answer tests against the crypto API
surface oscam uses:


- MD5        RFC 1321 Appendix A.5 + __md5_crypt ($1$ WebIf hashes)
- SHA1       FIPS 180-1 (short vectors, one-shot and streaming)
- SHA256     FIPS 180-2 + 1M 'a' long-stream via mbedtls_sha256
- MDC2       OpenSSL-1.0 mdc2test.c KAT + streaming split
- AES ECB    NIST SP 800-38A F.1.1/F.1.3/F.1.5 (AES-128/192/256)
- AES CBC    NIST SP 800-38A F.2.1/F.2.5, single + chunked (IV chain)
- AesCtx     cscrypt/fast_aes ECB + CBC
- AES void*  oscam-aes.c wrappers (aes_cbc_encrypt/decrypt,
aes_encrypt_idx, aes_decrypt)
- AES DB     aes_decrypt_from_list / aes_present round-trip
- IDEA       Ascom KAT + CBC reversal
- RC6        RC6 paper all-zero KAT
- DES        ECB (Stallings) + single-block via schedule
- DES-CBC    verified against openssl -des-cbc
- 3DES-EDE2-CBC KAT verified against openssl -des-ede-cbc
- 3DES-ECB3  reversal
- BN         mod_exp, bn2bin, num_bytes, mod_inverse, mul,
add_word, sub_word, cmp, copy
- DES parity helpers (des_set_odd_parity / _all)


Exit status reflects failure count so CI can gate on it.


* tests: return failure count and exit with correct status


The test binary previously always exited with status 0, regardless of
whether any tests failed. This made it useless in CI: a regression would
print errors to stdout but the process would still report success.


This commit fixes that end-to-end, and addresses several related issues
found while doing so.


Exit status
-----------
run_all_tests() now returns int (total failure count) instead of void.
run_tests() in oscam.c passes that value to exit():


exit(run_all_tests() ? EXIT_FAILURE : EXIT_SUCCESS);


A non-zero failure count now produces a non-zero exit code. A summary
line is printed at the end of the run:


Summary: N failure(s)


Type-safe adapter layer
-----------------------
The test_type struct previously stored function pointers cast to generic
types (CHK_FN *, MK_T_FN *, etc.) in order to accommodate different
concrete data types. Calling a function through a mismatched pointer
type is undefined behavior in C, even when the signatures are similar.


This is replaced with a DEFINE_TEST_ADAPTERS macro that generates a set
of correctly-typed wrapper functions for each data type:


DEFINE_TEST_ADAPTERS(ecm_whitelist, ECM_WHITELIST, ewnum);
DEFINE_TEST_ADAPTERS(ecm_hdr_whitelist, ECM_HDR_WHITELIST, ehnum);
...


Each expansion produces chk_*, mk_t_*, clear_*, clone_*, and has_data_*
adapters that cast the void * argument to the correct concrete type and
forward the call. The struct fields now hold pointers to these adapters
with no casts required.


Clone failure detection
-----------------------
A new HAS_DATA_FN callback is added to test_type. It reports whether a
parsed data structure contains any entries (by checking the count field
named in the macro, e.g. ewnum, ehnum). This enables a meaningful
distinction in the test loop:


- If parsing produced data and clone_fn returns false, that is a clone
error and is reported as such with a dedicated "=== CLONE ERROR ==="
message.
- If parsing produced no data and clone returns false, that is expected
behavior and is not counted as a failure.


Previously a failed clone would silently fall through, potentially
producing misleading output from stale data.


Co-authored-by: default avatarWXbet <4-WXbet@users.noreply.git.streamboard.tv>