Complete mbedTLS cleanup - Removed all mbedTLS dependencies and updated documentation
- Moved mbedTLS directories to Trash/ (mbedtls/, mbedtls-install/, mbedtls-arm64-install/) - Removed obsolete nostr_websocket_mbedtls.c implementation - Updated nostr_websocket/Makefile to use OpenSSL instead of mbedTLS - Updated nostr_websocket/README.md with OpenSSL migration notes - Updated nostr_websocket/EXPORT_GUIDE.md with OpenSSL instructions - All tests pass: crypto tests, static linking verification - Build system fully functional with OpenSSL-only dependencies
This commit is contained in:
@@ -3,11 +3,11 @@
|
||||
|
||||
CC = gcc
|
||||
CFLAGS = -Wall -Wextra -std=c99 -O2
|
||||
INCLUDES = -I. -I.. -I../mbedtls/include -I../mbedtls/tf-psa-crypto/include -I../mbedtls/tf-psa-crypto/drivers/builtin/include
|
||||
LIBS = -lm -L../mbedtls/library -lmbedtls -lmbedx509 -lmbedcrypto
|
||||
INCLUDES = -I. -I.. -I../openssl-install/include
|
||||
LIBS = -lm -L../openssl-install/lib64 -lssl -lcrypto
|
||||
|
||||
# Source files
|
||||
WEBSOCKET_SOURCES = nostr_websocket_mbedtls.c ../cjson/cJSON.c
|
||||
WEBSOCKET_SOURCES = nostr_websocket_openssl.c ../cjson/cJSON.c
|
||||
WEBSOCKET_HEADERS = nostr_websocket_tls.h ../cjson/cJSON.h
|
||||
|
||||
# Test programs
|
||||
@@ -21,7 +21,7 @@ WEBSOCKET_OBJECTS = $(WEBSOCKET_SOURCES:.c=.o)
|
||||
|
||||
all: $(TEST_PROGRAMS)
|
||||
|
||||
# Test programs
|
||||
# Test programs (if test file exists)
|
||||
test_5_events_clean: test_5_events_clean.o $(WEBSOCKET_OBJECTS)
|
||||
$(CC) -o $@ $^ $(LIBS)
|
||||
|
||||
@@ -29,11 +29,16 @@ test_5_events_clean: test_5_events_clean.o $(WEBSOCKET_OBJECTS)
|
||||
%.o: %.c $(WEBSOCKET_HEADERS)
|
||||
$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
|
||||
|
||||
# Test target
|
||||
test: test_5_events_clean
|
||||
@echo "🧪 Running WebSocket test..."
|
||||
@echo "Press Ctrl-C to stop the test"
|
||||
./test_5_events_clean
|
||||
# Test target (if test exists, otherwise use wss_test from tests/)
|
||||
test:
|
||||
@if [ -f test_5_events_clean ]; then \
|
||||
echo "🧪 Running local WebSocket test..."; \
|
||||
echo "Press Ctrl-C to stop the test"; \
|
||||
./test_5_events_clean; \
|
||||
else \
|
||||
echo "🧪 Running WebSocket test from tests/ directory..."; \
|
||||
cd ../tests && make wss_test && ./wss_test; \
|
||||
fi
|
||||
|
||||
# Clean build artifacts
|
||||
clean:
|
||||
@@ -46,18 +51,21 @@ info:
|
||||
@echo "=========================="
|
||||
@echo "Core files:"
|
||||
@echo " - nostr_websocket_tls.h (header)"
|
||||
@echo " - nostr_websocket_mbedtls.c (implementation)"
|
||||
@echo " - nostr_websocket_openssl.c (OpenSSL implementation)"
|
||||
@echo " - ../cjson/cJSON.h/c (JSON support)"
|
||||
@echo ""
|
||||
@echo "Dependencies:"
|
||||
@echo " - mbedTLS (SSL/TLS support)"
|
||||
@echo " - OpenSSL (SSL/TLS support)"
|
||||
@echo " - Standard C libraries"
|
||||
@echo ""
|
||||
@echo "Usage:"
|
||||
@echo " make - Build test programs"
|
||||
@echo " make - Build test programs (if available)"
|
||||
@echo " make test - Run WebSocket test"
|
||||
@echo " make clean - Clean build artifacts"
|
||||
@echo " make info - Show this information"
|
||||
@echo ""
|
||||
@echo "Note: This library is integrated into the main libnostr_core.a"
|
||||
@echo "Use the tests in ../tests/ for comprehensive testing."
|
||||
|
||||
# Help target
|
||||
help: info
|
||||
|
||||
Reference in New Issue
Block a user