Simplify testing

Author: dgarske

stsafe/Makefile

@@ -68,9 +68,9 @@ TARGET = stsafe_test
 WOLFSSL_TARGET = wolfssl_stsafe_test
 WOLFSSL_FULL_TARGET = wolfssl_stsafe_full_test
 
-.PHONY: all clean test info basic wolfssl wolfssl-full
+.PHONY: all clean test test-all info basic wolfssl wolfssl-full
 
-all: $(TARGET)
+all: $(TARGET) wolfssl wolfssl-full
 
 # Full build with wolfSSL crypto support
 $(TARGET): $(TEST_SRC) $(PLATFORM_SRC) $(PLATFORM_CRYPTO_SRC)
@@ -144,6 +144,13 @@ wolfssl-full: $(WOLFSSL_FULL_TEST_SRC) $(PLATFORM_SRC) $(PLATFORM_CRYPTO_SRC)
 test-wolfssl-full: wolfssl-full
 	./$(WOLFSSL_FULL_TARGET)
 
+test-all: all
+	@echo "=== Running stsafe_test ===" && ./$(TARGET)
+	@echo ""
+	@echo "=== Running wolfssl_stsafe_test ===" && ./$(WOLFSSL_TARGET)
+	@echo ""
+	@echo "=== Running wolfssl_stsafe_full_test ===" && ./$(WOLFSSL_FULL_TARGET)
+
 clean:
 	rm -f $(TARGET) $(WOLFSSL_TARGET) $(WOLFSSL_FULL_TARGET) *.o stsafe.o stse_platform_linux.o stse_platform_crypto.o
 
@@ -156,7 +163,8 @@ info:
 	@echo "Linker flags: $(LDFLAGS)"
 	@echo ""
 	@echo "Build targets:"
-	@echo "  make        - Build with wolfSSL crypto support (full features)"
-	@echo "  make basic  - Build without wolfSSL (basic tests only)"
-	@echo "  make test   - Build and run tests"
-	@echo "  make clean  - Clean build artifacts"
+	@echo "  make          - Build all test executables"
+	@echo "  make test-all - Build and run all tests"
+	@echo "  make basic    - Build without wolfSSL (basic tests only)"
+	@echo "  make clean    - Clean build artifacts"
+	@echo "  make info     - Show this configuration"

stsafe/README.md

@@ -15,127 +15,101 @@ Test harness for wolfSSL integration with ST STSAFE-A120 secure element on Raspb
 - GCC compiler
 - Linux I2C development headers (`libi2c-dev`)
 
-## Directory Structure
-
-```
-stsafe/
-├── Makefile                          # Build configuration
-├── README.md                         # This file
-├── user_settings.h                   # wolfSSL configuration
-├── stsafe_test.c                     # STSELib basic tests
-├── wolfssl_stsafe_test.c             # wolfSSL crypto callback tests
-├── wolfssl_stsafe_full_test.c        # Full integration tests with benchmarks
-└── platform/
-    ├── stse_conf.h                   # STSELib configuration
-    ├── stse_platform_generic.h       # Platform type definitions
-    ├── stse_platform_linux.c         # Linux I2C platform implementation
-    └── stse_platform_crypto_wolfssl.c # wolfSSL crypto for STSELib
-```
-
-## Configuration
-
-### I2C Setup
+## Quick Start
 
-1. Enable I2C on Raspberry Pi:
-   ```bash
-   sudo raspi-config
-   # Navigate to: Interface Options -> I2C -> Enable
-   ```
+### 1. Enable I2C on Raspberry Pi
 
-2. Verify I2C device:
-   ```bash
-   sudo i2cdetect -y 1
-   # STSAFE should appear at address 0x20
-   ```
-
-3. Set I2C permissions (optional, for non-root access):
-   ```bash
-   sudo usermod -a -G i2c $USER
-   # Logout and login again
-   ```
-
-### Environment
-
-Set paths to dependencies:
 ```bash
-export WOLFSSL_DIR=$HOME/wolfssl
-export STSELIB_DIR=$HOME/STSELib
+sudo raspi-config
+# Navigate to: Interface Options -> I2C -> Enable
 ```
 
-## Building
+Reboot if prompted, then verify the STSAFE device is detected:
 
-### Prerequisites
-
-1. Build wolfSSL with required features:
-   ```bash
-   cd $WOLFSSL_DIR
-   ./configure --enable-cryptocb --enable-ecc --enable-cmac --enable-sha384 --enable-debug
-   make
-   ```
+```bash
+sudo i2cdetect -y 1
+# STSAFE should appear at address 0x20
+```
 
-2. Clone STSELib:
-   ```bash
-   git clone https://github.com/STMicroelectronics/STSELib.git $STSELIB_DIR
-   ```
+Optional: Allow non-root I2C access:
+```bash
+sudo usermod -a -G i2c $USER
+# Logout and login again
+```
 
-### Build Targets
+### 2. Build wolfSSL
 
 ```bash
-# Build basic STSELib tests (no wolfSSL crypto callbacks)
+cd ~/wolfssl
+./configure --enable-cryptocb --enable-ecc --enable-cmac --enable-sha384
 make
+```
 
-# Build wolfSSL crypto callback tests
-make wolfssl
+### 3. Clone STSELib
 
-# Build full integration tests with benchmarks
-make wolfssl-full
+```bash
+git clone https://github.com/STMicroelectronics/STSELib.git ~/STSELib
+```
 
-# Build without wolfSSL (basic I2C tests only)
-make basic
+### 4. Build and Run Tests
+
+```bash
+cd ~/wolfssl-examples/stsafe
 
-# Clean build artifacts
-make clean
+# Build all test executables
+make
 
-# Show configuration
-make info
+# Run all tests
+make test-all
 ```
 
-## Running Tests
+## Test Suites
 
-### Basic STSELib Tests
-```bash
-./stsafe_test
-```
+### Basic STSELib Tests (`stsafe_test`)
 
-Tests:
+Tests core STSAFE-A120 functionality:
 - Echo command (I2C communication)
 - Random number generation
 - ECC P-256 key generation
 - ECDSA P-256 signing
 - ECC P-384 key generation
 
-### wolfSSL Crypto Callback Tests
 ```bash
-./wolfssl_stsafe_test
+make && ./stsafe_test
 ```
 
-Tests:
+### wolfSSL Crypto Callback Tests (`wolfssl_stsafe_test`)
+
+Tests wolfSSL crypto callbacks with STSAFE:
 - RNG with STSAFE-A120
-- ECC P-256 key generation via crypto callback
-- ECC P-384 key generation via crypto callback
-- ECDSA P-256 sign/verify
-- ECDSA P-384 sign/verify
+- ECC P-256/P-384 key generation via crypto callback
+- ECDSA P-256/P-384 sign/verify
 
-### Full Integration Tests
 ```bash
-./wolfssl_stsafe_full_test
+make wolfssl && ./wolfssl_stsafe_test
 ```
 
-Tests:
+### Full Integration Tests (`wolfssl_stsafe_full_test`)
+
+Comprehensive tests with benchmarks:
 - RNG benchmark
 - ECDSA P-256 benchmark (keygen, sign, verify timing)
 - Multiple sequential operations
 
+```bash
+make wolfssl-full && ./wolfssl_stsafe_full_test
+```
+
+## Build Targets
+
+| Target | Description |
+|--------|-------------|
+| `make` | Build all test executables |
+| `make test-all` | Build and run all tests |
+| `make basic` | Build without wolfSSL (basic I2C tests only) |
+| `make clean` | Clean build artifacts |
+| `make info` | Show configuration |
+
 ## Expected Output
 
 ```
@@ -175,9 +149,51 @@ Test Summary: 5 passed, 0 failed
 | ECDSA P-256 Sign | ~51 ms | 19.5 ops/sec |
 | ECDSA P-256 Verify | ~79 ms | 12.7 ops/sec |
 
+## Directory Structure
+
+```
+stsafe/
+├── Makefile                          # Build configuration
+├── README.md                         # This file
+├── user_settings.h                   # wolfSSL configuration
+├── stsafe_test.c                     # STSELib basic tests
+├── wolfssl_stsafe_test.c             # wolfSSL crypto callback tests
+├── wolfssl_stsafe_full_test.c        # Full integration tests with benchmarks
+└── platform/
+    ├── stse_conf.h                   # STSELib configuration
+    ├── stse_platform_generic.h       # Platform type definitions
+    ├── stse_platform_linux.c         # Linux I2C platform implementation
+    └── stse_platform_crypto_wolfssl.c # wolfSSL crypto for STSELib
+```
+
+## Environment Variables
+
+Default paths assume `~/wolfssl` and `~/STSELib`. Override if needed:
+
+```bash
+export WOLFSSL_DIR=/path/to/wolfssl
+export STSELIB_DIR=/path/to/STSELib
+```
+
+## Troubleshooting
+
+### Error 0x0104 (STSE_PLATFORM_BUS_ERR)
+
+I2C communication error. Check:
+1. I2C is enabled: `ls /dev/i2c*`
+2. Device detected: `sudo i2cdetect -y 1` (should show `20`)
+3. Wiring connections are secure
+
+### Build errors
+
+Ensure wolfSSL is built with required features:
+```bash
+./configure --enable-cryptocb --enable-ecc --enable-cmac --enable-sha384
+```
+
 ## References
 
 - [wolfSSL Documentation](https://www.wolfssl.com/docs/)
 - [STSELib GitHub](https://github.com/STMicroelectronics/STSELib)
 - [STSAFE-A120 Datasheet](https://www.st.com/en/secure-mcus/stsafe-a120.html)
-- [Raspberry Pi I2C Documentation](https://www.raspberrypi.com/documentation/computers/raspberry-pi.html#gpio-and-the-40-pin-header)
+- [Raspberry Pi I2C Documentation](https://www.raspberrypi.com/documentation/computers/raspberry-pi.html)