Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b058911fb8 | |||
| a0ce6f3253 | |||
| 5e1de92454 | |||
| 55cf7b1937 | |||
| 3d990091eb | |||
| 232846e7ce | |||
| 860ec08d4f | |||
| 60276f5c97 | |||
| 8616e78547 | |||
| 8327ee125b | |||
| 5dadd948e6 | |||
| 02044f1054 |
3
.gitignore
vendored
3
.gitignore
vendored
@@ -1,6 +1,9 @@
|
|||||||
otp
|
otp
|
||||||
pads/
|
pads/
|
||||||
|
files/
|
||||||
Gemini.md
|
Gemini.md
|
||||||
TropicOfCancer-HenryMiller.txt
|
TropicOfCancer-HenryMiller.txt
|
||||||
|
.gitea_token
|
||||||
|
true_rng/
|
||||||
|
|
||||||
# Auto-generated files (none currently)
|
# Auto-generated files (none currently)
|
||||||
|
|||||||
161
build.sh
161
build.sh
@@ -150,38 +150,151 @@ update_source_version() {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# Build functions
|
# Cross-platform build functions
|
||||||
build_project() {
|
check_cross_compiler() {
|
||||||
print_status "Cleaning previous build..."
|
if ! command -v aarch64-linux-gnu-gcc > /dev/null 2>&1; then
|
||||||
make clean
|
print_error "ARM64/AArch64 cross-compiler not found!"
|
||||||
increment_version
|
print_error "Install with: sudo apt install gcc-aarch64-linux-gnu"
|
||||||
print_status "Building OTP project..."
|
print_error "Or on other distros: gcc-cross-aarch64"
|
||||||
make
|
return 1
|
||||||
|
fi
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
upload_release_asset() {
|
||||||
|
local api_url="$1"
|
||||||
|
local token="$2"
|
||||||
|
local version="$3"
|
||||||
|
local filename="$4"
|
||||||
|
local display_name="$5"
|
||||||
|
|
||||||
|
if [ ! -f "$filename" ]; then
|
||||||
|
print_warning "Binary $filename not found, skipping upload"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
print_status "Uploading $filename as '$display_name' to release..."
|
||||||
|
|
||||||
|
# Get release ID first
|
||||||
|
local release_id=$(curl -s -H "Authorization: token $token" \
|
||||||
|
"$api_url/releases/tags/$version" | \
|
||||||
|
grep -o '"id":[0-9]*' | head -n1 | cut -d: -f2)
|
||||||
|
|
||||||
|
if [ -z "$release_id" ]; then
|
||||||
|
print_error "Could not get release ID for $version"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Upload the asset using multipart/form-data
|
||||||
|
curl -X POST "$api_url/releases/$release_id/assets" \
|
||||||
|
-H "Authorization: token $token" \
|
||||||
|
-F "attachment=@$filename;filename=$display_name"
|
||||||
|
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
print_success "Build completed successfully"
|
print_success "Uploaded $filename as '$display_name' successfully"
|
||||||
else
|
else
|
||||||
print_error "Build failed"
|
print_warning "Failed to upload $filename"
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
build_static() {
|
create_gitea_release() {
|
||||||
|
local version="$1"
|
||||||
|
|
||||||
|
# Read token from ~/.gitea_token
|
||||||
|
if [ ! -f "$HOME/.gitea_token" ]; then
|
||||||
|
print_error "No ~/.gitea_token found. Cannot create release."
|
||||||
|
print_error "Create ~/.gitea_token with your Gitea access token"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
local token=$(cat "$HOME/.gitea_token" | tr -d '\n\r')
|
||||||
|
local api_url="https://git.laantungir.net/api/v1/repos/laantungir/otp"
|
||||||
|
|
||||||
|
print_status "Creating Gitea release for $version..."
|
||||||
|
|
||||||
|
# Create release
|
||||||
|
local response=$(curl -s -X POST "$api_url/releases" \
|
||||||
|
-H "Authorization: token $token" \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-d "{\"tag_name\": \"$version\", \"name\": \"$version\", \"body\": \"Automated release for $version\"}")
|
||||||
|
|
||||||
|
if echo "$response" | grep -q '"id"'; then
|
||||||
|
print_success "Created release $version"
|
||||||
|
|
||||||
|
# Upload binaries with descriptive names
|
||||||
|
upload_release_asset "$api_url" "$token" "$version" "otp-x86_64" "otp-${version}-linux-x86_64"
|
||||||
|
upload_release_asset "$api_url" "$token" "$version" "otp-arm64" "otp-${version}-linux-arm64"
|
||||||
|
else
|
||||||
|
print_warning "Release may already exist or creation failed"
|
||||||
|
print_status "Response: $response"
|
||||||
|
|
||||||
|
# Try to upload to existing release anyway
|
||||||
|
upload_release_asset "$api_url" "$token" "$version" "otp-x86_64" "otp-${version}-linux-x86_64"
|
||||||
|
upload_release_asset "$api_url" "$token" "$version" "otp-arm64" "otp-${version}-linux-arm64"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
build_project() {
|
||||||
print_status "Cleaning previous build..."
|
print_status "Cleaning previous build..."
|
||||||
make clean
|
make clean
|
||||||
increment_version
|
increment_version
|
||||||
print_status "Building OTP project with static linking..."
|
|
||||||
make static
|
# Check for cross-compiler
|
||||||
|
if ! check_cross_compiler; then
|
||||||
|
print_warning "ARM64/AArch64 cross-compiler not available, building x86_64 only"
|
||||||
|
|
||||||
|
# Build x86_64 only
|
||||||
|
print_status "Building OTP project for x86_64..."
|
||||||
|
make CC=gcc
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
print_success "Static build completed successfully"
|
mv otp otp-x86_64
|
||||||
|
print_success "x86_64 build completed successfully"
|
||||||
else
|
else
|
||||||
print_error "Static build failed"
|
print_error "x86_64 build failed"
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
else
|
||||||
|
# Build both architectures
|
||||||
|
print_status "Building OTP project for x86_64..."
|
||||||
|
make clean
|
||||||
|
make CC=gcc
|
||||||
|
if [ $? -eq 0 ]; then
|
||||||
|
mv otp otp-x86_64
|
||||||
|
print_success "x86_64 build completed successfully"
|
||||||
|
else
|
||||||
|
print_error "x86_64 build failed"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
print_status "Building OTP project for ARM64/AArch64..."
|
||||||
|
make clean
|
||||||
|
make CC=aarch64-linux-gnu-gcc
|
||||||
|
if [ $? -eq 0 ]; then
|
||||||
|
mv otp otp-arm64
|
||||||
|
print_success "ARM64/AArch64 build completed successfully"
|
||||||
|
else
|
||||||
|
print_error "ARM64/AArch64 build failed"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Create Gitea release with binaries
|
||||||
|
if [ -f "$HOME/.gitea_token" ]; then
|
||||||
|
create_gitea_release "$NEW_VERSION"
|
||||||
|
else
|
||||||
|
print_warning "No ~/.gitea_token found. Skipping release creation."
|
||||||
|
print_warning "Create ~/.gitea_token with your Gitea access token to enable releases."
|
||||||
|
fi
|
||||||
|
|
||||||
|
print_success "Build completed successfully"
|
||||||
}
|
}
|
||||||
|
|
||||||
clean_project() {
|
clean_project() {
|
||||||
print_status "Cleaning build artifacts..."
|
print_status "Cleaning build artifacts..."
|
||||||
make clean
|
make clean
|
||||||
|
# Remove cross-compiled binaries
|
||||||
|
rm -f otp-x86_64 otp-arm64
|
||||||
print_success "Clean completed"
|
print_success "Clean completed"
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -212,9 +325,6 @@ case "${1:-build}" in
|
|||||||
build)
|
build)
|
||||||
build_project
|
build_project
|
||||||
;;
|
;;
|
||||||
static)
|
|
||||||
build_static
|
|
||||||
;;
|
|
||||||
clean)
|
clean)
|
||||||
clean_project
|
clean_project
|
||||||
;;
|
;;
|
||||||
@@ -226,22 +336,29 @@ case "${1:-build}" in
|
|||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
echo "OTP Cipher Build Script"
|
echo "OTP Cipher Build Script"
|
||||||
echo "Usage: $0 [-m \"commit message\"] {build|static|clean|install|uninstall}"
|
echo "Usage: $0 [-m \"commit message\"] {build|clean|install|uninstall}"
|
||||||
echo ""
|
echo ""
|
||||||
echo "Options:"
|
echo "Options:"
|
||||||
echo " -m, --message \"text\" - Specify commit message (skips interactive prompt)"
|
echo " -m, --message \"text\" - Specify commit message (skips interactive prompt)"
|
||||||
echo ""
|
echo ""
|
||||||
echo "Commands:"
|
echo "Commands:"
|
||||||
echo " build - Build project with automatic version increment (default)"
|
echo " build - Cross-compile for x86_64 and ARM64/AArch64 with automatic version increment (default)"
|
||||||
echo " static - Build with static linking and version increment"
|
echo " clean - Clean build artifacts and cross-compiled binaries"
|
||||||
echo " clean - Clean build artifacts"
|
|
||||||
echo " install - Install to system (requires build first)"
|
echo " install - Install to system (requires build first)"
|
||||||
echo " uninstall - Remove from system"
|
echo " uninstall - Remove from system"
|
||||||
echo ""
|
echo ""
|
||||||
|
echo "Build Output:"
|
||||||
|
echo " otp-x86_64 - Native x86_64 binary"
|
||||||
|
echo " otp-arm64 - ARM64/AArch64 binary for Raspberry Pi (if cross-compiler available)"
|
||||||
|
echo ""
|
||||||
|
echo "Gitea Integration:"
|
||||||
|
echo " - Automatically creates releases with binaries if ~/.gitea_token exists"
|
||||||
|
echo " - Requires: ARM64 cross-compiler (gcc-aarch64-linux-gnu)"
|
||||||
|
echo ""
|
||||||
echo "Examples:"
|
echo "Examples:"
|
||||||
echo " $0"
|
echo " $0"
|
||||||
echo " $0 -m \"Fixed checksum parsing bug\""
|
echo " $0 -m \"Fixed checksum parsing bug\""
|
||||||
echo " $0 --message \"Added new feature\" static"
|
echo " $0 --message \"Added new feature\" build"
|
||||||
exit 1
|
exit 1
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|||||||
BIN
otp-x86_64
Executable file
BIN
otp-x86_64
Executable file
Binary file not shown.
46
otp.h
46
otp.h
@@ -14,7 +14,13 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <termios.h>
|
#include <termios.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
|
#include <sys/ioctl.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
#include <dirent.h>
|
||||||
|
#include <fcntl.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <ctype.h>
|
||||||
|
|
||||||
// Constants
|
// Constants
|
||||||
#define MAX_INPUT_SIZE 4096
|
#define MAX_INPUT_SIZE 4096
|
||||||
@@ -92,6 +98,11 @@ int set_default_pad_path(const char* pad_path);
|
|||||||
// OTP thumb drive detection function
|
// OTP thumb drive detection function
|
||||||
int detect_otp_thumb_drive(char* otp_drive_path, size_t path_size);
|
int detect_otp_thumb_drive(char* otp_drive_path, size_t path_size);
|
||||||
|
|
||||||
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
|
// USB DRIVE MANAGEMENT FUNCTIONS
|
||||||
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
// EXTERNAL TOOL INTEGRATION FUNCTIONS
|
// EXTERNAL TOOL INTEGRATION FUNCTIONS
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
@@ -119,6 +130,13 @@ int decrypt_ascii_file(const char* input_file, const char* output_file);
|
|||||||
// ENHANCED ENTROPY SYSTEM FUNCTIONS
|
// ENHANCED ENTROPY SYSTEM FUNCTIONS
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
// Entropy source types
|
||||||
|
typedef enum {
|
||||||
|
ENTROPY_SOURCE_KEYBOARD = 1,
|
||||||
|
ENTROPY_SOURCE_DICE = 2,
|
||||||
|
ENTROPY_SOURCE_TRUERNG = 3
|
||||||
|
} entropy_source_t;
|
||||||
|
|
||||||
// Terminal control for entropy collection
|
// Terminal control for entropy collection
|
||||||
int setup_raw_terminal(struct termios* original_termios);
|
int setup_raw_terminal(struct termios* original_termios);
|
||||||
void restore_terminal(struct termios* original_termios);
|
void restore_terminal(struct termios* original_termios);
|
||||||
@@ -130,6 +148,34 @@ void display_entropy_progress(const entropy_collection_state_t* state);
|
|||||||
void draw_progress_bar(double percentage, int width);
|
void draw_progress_bar(double percentage, int width);
|
||||||
void draw_quality_bar(double quality, int width, const char* label);
|
void draw_quality_bar(double quality, int width, const char* label);
|
||||||
|
|
||||||
|
// TrueRNG Device Constants (updated to match otp.c implementation)
|
||||||
|
#define TRUERNG_VID "04D8"
|
||||||
|
#define TRUERNG_PID "F5FE"
|
||||||
|
#define TRUERNGPRO_VID "16D0"
|
||||||
|
#define TRUERNGPRO_PID "0AA0"
|
||||||
|
#define TRUERNGPROV2_VID "04D8"
|
||||||
|
#define TRUERNGPROV2_PID "EBB5"
|
||||||
|
|
||||||
|
// TrueRNG Device Type enumeration
|
||||||
|
typedef enum {
|
||||||
|
TRUERNG_ORIGINAL = 1,
|
||||||
|
TRUERNG_PRO = 2,
|
||||||
|
TRUERNG_PRO_V2 = 3
|
||||||
|
} truerng_device_type_t;
|
||||||
|
|
||||||
|
// TrueRNG entropy collection functions (updated to match implementation)
|
||||||
|
int find_truerng_port(char* port_path, size_t port_path_size, truerng_device_type_t* device_type);
|
||||||
|
int setup_truerng_serial_port(const char* port_path);
|
||||||
|
int collect_truerng_entropy(unsigned char* entropy_buffer, size_t target_bytes, size_t* collected_bytes, int display_progress);
|
||||||
|
const char* get_truerng_device_name(truerng_device_type_t device_type);
|
||||||
|
int read_usb_device_info(const char* port_name, char* vid, char* pid);
|
||||||
|
|
||||||
|
// Dice entropy collection functions (updated to match implementation)
|
||||||
|
int collect_dice_entropy(unsigned char* entropy_buffer, size_t target_bytes, size_t* collected_bytes, int display_progress);
|
||||||
|
|
||||||
|
// Unified entropy collection interface (updated to match implementation)
|
||||||
|
int collect_entropy_by_source(entropy_source_t source, unsigned char* entropy_buffer, size_t target_bytes, size_t* collected_bytes, int display_progress);
|
||||||
|
|
||||||
// Entropy quality calculation
|
// Entropy quality calculation
|
||||||
double calculate_timing_quality(const entropy_collection_state_t* state);
|
double calculate_timing_quality(const entropy_collection_state_t* state);
|
||||||
double calculate_variety_quality(const entropy_collection_state_t* state);
|
double calculate_variety_quality(const entropy_collection_state_t* state);
|
||||||
|
|||||||
1
true_rng
Submodule
1
true_rng
Submodule
Submodule true_rng added at 52ed7af980
Reference in New Issue
Block a user