Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 862465c5c2 | |||
| 799e34e045 | |||
| 1d6f4a225d | |||
| 4bd0c5aa42 | |||
| dffae799aa | |||
| ed9fb759db | |||
| 2c7f16ce51 | |||
| 6251aa5be8 |
@@ -1,46 +0,0 @@
|
|||||||
|
|
||||||
# Hardware RNG Implementation Status
|
|
||||||
|
|
||||||
## Overview
|
|
||||||
|
|
||||||
The OTP cipher application now includes comprehensive hardware Random Number Generator (RNG) device support with automatic detection, device identification, and graceful handling of different device types.
|
|
||||||
|
|
||||||
## Supported Devices
|
|
||||||
|
|
||||||
### ✅ Fully Supported (TrueRNG Family)
|
|
||||||
- **TrueRNG Original** (VID: 04d8, PID: f5fe)
|
|
||||||
- **TrueRNG Pro** (VID: 04d8, PID: 0aa0)
|
|
||||||
- **TrueRNG Pro V2** (VID: 04d8, PID: ebb5)
|
|
||||||
|
|
||||||
These devices work via serial port communication and are fully integrated into the entropy collection system.
|
|
||||||
|
|
||||||
### ⚠️ Detected but Not Supported (SwiftRNG Family)
|
|
||||||
- **SwiftRNG** (VID: 1fc9, PID: 8111)
|
|
||||||
|
|
||||||
SwiftRNG devices are detected and identified but cannot be used via serial port communication. They require the official SwiftRNG API with libusb-1.0 integration.
|
|
||||||
|
|
||||||
## Implementation Features
|
|
||||||
|
|
||||||
### Device Detection
|
|
||||||
- **Automatic scanning** of `/dev/ttyUSB*` and `/dev/ttyACM*` devices
|
|
||||||
- **VID/PID identification** via sysfs to distinguish device types
|
|
||||||
- **Multi-device support** with interactive selection menus
|
|
||||||
- **Real-time status indicators** showing device availability
|
|
||||||
|
|
||||||
### Device Communication
|
|
||||||
- **Optimized serial port configuration** for each device type
|
|
||||||
- **Timeout protection** to prevent hanging on unresponsive devices
|
|
||||||
- **Error handling** with clear diagnostic messages
|
|
||||||
- **Progress tracking** with speed estimation for large entropy collections
|
|
||||||
|
|
||||||
### Integration Points
|
|
||||||
- **Pad enhancement** via entropy addition to existing pads
|
|
||||||
- **Interactive menus** for device selection when multiple devices are present
|
|
||||||
- **Command-line support** for automated workflows
|
|
||||||
- **Graceful fallback** to other entropy sources when no hardware RNG is available
|
|
||||||
|
|
||||||
## Technical Implementation
|
|
||||||
|
|
||||||
### Core Functions
|
|
||||||
- `detect_all_hardware_rng_devices()` - Scans and identifies all connected devices
|
|
||||||
- `collect_truerng_entropy_from_device()` - Collects entropy from TrueRNG devices
|
|
||||||
2
Makefile
2
Makefile
@@ -11,11 +11,13 @@ OBJS = $(SOURCES:.c=.o)
|
|||||||
$(TARGET): $(OBJS)
|
$(TARGET): $(OBJS)
|
||||||
@mkdir -p build
|
@mkdir -p build
|
||||||
$(CC) $(CFLAGS) -o $(TARGET) $(OBJS) $(LIBS)
|
$(CC) $(CFLAGS) -o $(TARGET) $(OBJS) $(LIBS)
|
||||||
|
@rm -f $(OBJS)
|
||||||
|
|
||||||
# Static linking target
|
# Static linking target
|
||||||
static: $(OBJS)
|
static: $(OBJS)
|
||||||
@mkdir -p build
|
@mkdir -p build
|
||||||
$(CC) $(CFLAGS) -o $(TARGET) $(OBJS) $(LIBS_STATIC)
|
$(CC) $(CFLAGS) -o $(TARGET) $(OBJS) $(LIBS_STATIC)
|
||||||
|
@rm -f $(OBJS)
|
||||||
|
|
||||||
%.o: %.c
|
%.o: %.c
|
||||||
$(CC) $(CFLAGS) -c $< -o $@
|
$(CC) $(CFLAGS) -c $< -o $@
|
||||||
|
|||||||
203
README.md
203
README.md
@@ -1,5 +1,47 @@
|
|||||||
# OTP Cipher - One Time Pad Implementation
|
# OTP Cipher - One Time Pad Implementation
|
||||||
|
|
||||||
|
## Quick Start
|
||||||
|
|
||||||
|
### Download Pre-Built Binaries
|
||||||
|
|
||||||
|
**[📥 Download Latest Release](https://git.laantungir.net/laantungir/otp/releases)**
|
||||||
|
|
||||||
|
Visit the releases page and download the appropriate binary for your system:
|
||||||
|
- `otp-vX.X.X-linux-x86_64` for Intel/AMD 64-bit systems
|
||||||
|
- `otp-vX.X.X-linux-arm64` for Raspberry Pi and ARM 64-bit systems
|
||||||
|
|
||||||
|
After downloading:
|
||||||
|
```bash
|
||||||
|
# Make executable and run
|
||||||
|
chmod +x otp-v*-linux-x86_64
|
||||||
|
./otp-v*-linux-x86_64
|
||||||
|
```
|
||||||
|
|
||||||
|
**Or use the local build:**
|
||||||
|
```bash
|
||||||
|
# After building from source
|
||||||
|
./build/otp-x86_64 # x86_64 systems
|
||||||
|
./build/otp-arm64 # ARM64 systems
|
||||||
|
```
|
||||||
|
|
||||||
|
### First Steps
|
||||||
|
|
||||||
|
1. **Generate your first pad:**
|
||||||
|
```bash
|
||||||
|
./build/otp-x86_64 generate 1GB
|
||||||
|
```
|
||||||
|
|
||||||
|
2. **Encrypt a message:**
|
||||||
|
```bash
|
||||||
|
./build/otp-x86_64 encrypt
|
||||||
|
# Follow the interactive prompts
|
||||||
|
```
|
||||||
|
|
||||||
|
3. **Decrypt a message:**
|
||||||
|
```bash
|
||||||
|
./build/otp-x86_64 decrypt
|
||||||
|
# Paste the encrypted message
|
||||||
|
```
|
||||||
|
|
||||||
## Introduction
|
## Introduction
|
||||||
|
|
||||||
@@ -64,99 +106,98 @@ One-time pads can be trivially encrypted and decrypted using pencil and paper, m
|
|||||||
- GCC compiler
|
- GCC compiler
|
||||||
- Git (for version tracking)
|
- Git (for version tracking)
|
||||||
- Make
|
- Make
|
||||||
|
- Optional: ARM64 cross-compiler (`gcc-aarch64-linux-gnu`) for cross-compilation
|
||||||
|
|
||||||
|
|
||||||
### Build Commands
|
### Build Commands
|
||||||
|
|
||||||
Use the included build script for automatic versioning:
|
Use the included build script for automatic versioning and cross-compilation:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
# Standard build (default)
|
# Build for current architecture (with auto-versioning)
|
||||||
./build.sh build
|
./build.sh "commit message"
|
||||||
|
|
||||||
# Static linking build
|
# Build commands
|
||||||
./build.sh static
|
./build.sh build "commit message" # Build x86_64 and ARM64 (if cross-compiler available)
|
||||||
|
./build.sh clean # Clean build artifacts
|
||||||
# Clean build artifacts
|
./build.sh install # Install to system
|
||||||
./build.sh clean
|
./build.sh uninstall # Remove from system
|
||||||
|
|
||||||
# Generate version files only
|
|
||||||
./build.sh version
|
|
||||||
|
|
||||||
# Install to system
|
|
||||||
./build.sh install
|
|
||||||
|
|
||||||
# Remove from system
|
|
||||||
./build.sh uninstall
|
|
||||||
|
|
||||||
# Show usage
|
|
||||||
./build.sh help
|
|
||||||
```
|
```
|
||||||
|
|
||||||
|
The build script automatically:
|
||||||
|
- Increments patch version (v0.3.24 → v0.3.25)
|
||||||
|
- Creates git commit and tag
|
||||||
|
- Builds for x86_64 and ARM64 (if cross-compiler available)
|
||||||
|
- Outputs to `build/otp-x86_64` and `build/otp-arm64`
|
||||||
|
- Uploads binaries to Gitea releases (if `~/.gitea_token` exists)
|
||||||
|
|
||||||
### Traditional Make
|
### Traditional Make
|
||||||
|
|
||||||
You can also use make directly (without automatic versioning):
|
You can also use make directly (without automatic versioning):
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
make # Standard build
|
make # Build for current architecture
|
||||||
make static # Static linking
|
make static # Static linking
|
||||||
make clean # Clean artifacts
|
make clean # Clean artifacts
|
||||||
make install # Install to /usr/local/bin/
|
make install # Install to /usr/local/bin/otp
|
||||||
make uninstall # Remove from system
|
make uninstall # Remove from system
|
||||||
```
|
```
|
||||||
|
|
||||||
|
Output: `build/otp-$(ARCH)` (e.g., `build/otp-x86_64`)
|
||||||
|
|
||||||
## Usage
|
## Usage
|
||||||
|
|
||||||
### Interactive Mode
|
### Interactive Mode
|
||||||
```bash
|
```bash
|
||||||
./otp
|
./build/otp-x86_64
|
||||||
|
# or
|
||||||
|
./build/otp-arm64 # On ARM systems
|
||||||
```
|
```
|
||||||
|
|
||||||
### Command Line Mode
|
### Command Line Mode
|
||||||
```bash
|
```bash
|
||||||
# Generate a new pad
|
# Generate a new pad
|
||||||
./otp generate 1GB
|
./build/otp-x86_64 generate 1GB
|
||||||
|
|
||||||
# Encrypt text (interactive input)
|
# Encrypt text (interactive input)
|
||||||
./otp encrypt <pad_hash_or_prefix>
|
./build/otp-x86_64 encrypt <pad_hash_or_prefix>
|
||||||
|
|
||||||
# Decrypt message (interactive input)
|
# Decrypt message (interactive input)
|
||||||
./otp decrypt <pad_hash_or_prefix>
|
./build/otp-x86_64 decrypt <pad_hash_or_prefix>
|
||||||
|
|
||||||
# List available pads
|
# List available pads
|
||||||
./otp list
|
./build/otp-x86_64 list
|
||||||
```
|
```
|
||||||
|
|
||||||
## Version System Details
|
## Version System
|
||||||
|
|
||||||
|
### Centralized Version Management
|
||||||
|
Version is defined in a single location: `src/main.h`
|
||||||
|
```c
|
||||||
|
#define OTP_VERSION "v0.3.24"
|
||||||
|
```
|
||||||
|
|
||||||
|
All code references this constant, ensuring consistency across:
|
||||||
|
- Main menu display
|
||||||
|
- ASCII armor output
|
||||||
|
- Help/usage text
|
||||||
|
|
||||||
### Automatic Version Increment
|
### Automatic Version Increment
|
||||||
Every build automatically increments the patch version:
|
The `build.sh` script automatically:
|
||||||
- v0.1.0 → v0.1.1 → v0.1.2, etc.
|
1. Increments patch version (v0.3.24 → v0.3.25)
|
||||||
- Creates git tags for each version
|
2. Updates `OTP_VERSION` in `src/main.h`
|
||||||
- Embeds detailed build information
|
3. Creates git commit and tag
|
||||||
|
4. Pushes to remote repository
|
||||||
|
|
||||||
### Manual Version Control
|
### Manual Version Control
|
||||||
For major/minor releases, create tags manually:
|
For major/minor releases, create tags manually:
|
||||||
```bash
|
```bash
|
||||||
# Feature release (minor bump)
|
# Feature release (minor bump)
|
||||||
git tag v0.2.0 # Next build: v0.2.1
|
git tag v0.4.0 # Next build: v0.4.1
|
||||||
|
|
||||||
# Breaking change (major bump)
|
# Breaking change (major bump)
|
||||||
git tag v1.0.0 # Next build: v1.0.1
|
git tag v1.0.0 # Next build: v1.0.1
|
||||||
```
|
```
|
||||||
|
|
||||||
### Version Information Available
|
|
||||||
- Version number (major.minor.patch)
|
|
||||||
- Git commit hash and branch
|
|
||||||
- Build date and time
|
|
||||||
- Full version display with metadata
|
|
||||||
|
|
||||||
### Generated Files
|
|
||||||
The build system automatically manages Git versioning by incrementing tags.
|
|
||||||
|
|
||||||
These files are excluded from git (.gitignore) and regenerated on each build.
|
|
||||||
|
|
||||||
## Security Features
|
## Security Features
|
||||||
|
|
||||||
- Uses `/dev/urandom` for cryptographically secure random number generation
|
- Uses `/dev/urandom` for cryptographically secure random number generation
|
||||||
@@ -166,28 +207,32 @@ These files are excluded from git (.gitignore) and regenerated on each build.
|
|||||||
- State tracking to prevent pad reuse
|
- State tracking to prevent pad reuse
|
||||||
- **Zero external crypto dependencies** - completely self-contained implementation
|
- **Zero external crypto dependencies** - completely self-contained implementation
|
||||||
|
|
||||||
## File Structure
|
## Project Structure
|
||||||
|
|
||||||
```
|
```
|
||||||
otp/
|
otp/
|
||||||
├── build.sh # Build script with automatic versioning
|
├── build.sh # Build script with automatic versioning
|
||||||
├── Makefile # Traditional make build system
|
├── Makefile # Traditional make build system
|
||||||
├── otp.c # Legacy compatibility and global definitions
|
├── README.md # This file
|
||||||
├── README.md # This file
|
├── .gitignore # Git ignore rules
|
||||||
├── .gitignore # Git ignore rules
|
|
||||||
├── include/
|
|
||||||
│ └── otp.h # Public API header with all function prototypes
|
|
||||||
├── src/
|
├── src/
|
||||||
│ ├── main.c # Main application entry point and command line handling
|
│ ├── main.h # Main header with all prototypes and OTP_VERSION
|
||||||
│ ├── ui.c # Interactive user interface and menu system
|
│ ├── main.c # Application entry point and command line handling
|
||||||
│ ├── state.c # Global state management (pads directory, terminal dimensions)
|
│ ├── ui.c # Interactive user interface and menu system
|
||||||
│ ├── crypto.c # Core cryptographic operations (XOR, ChaCha20)
|
│ ├── state.c # Global state management (pads directory, preferences)
|
||||||
│ ├── pads.c # Pad management and file operations
|
│ ├── crypto.c # Core cryptographic operations (XOR, base64)
|
||||||
│ ├── entropy.c # Entropy collection from various sources
|
│ ├── pads.c # Pad management and file operations
|
||||||
│ ├── trng.c # Hardware RNG device detection and entropy collection
|
│ ├── entropy.c # Entropy collection from various sources
|
||||||
│ └── util.c # Utility functions and helpers
|
│ ├── trng.c # Hardware RNG device detection and collection
|
||||||
├── pads/ # OTP pad storage directory (created at runtime)
|
│ ├── util.c # Utility functions and helpers
|
||||||
└── VERSION # Plain text version (generated)
|
│ ├── nostr_chacha20.c # ChaCha20 implementation for entropy expansion
|
||||||
|
│ └── nostr_chacha20.h # ChaCha20 header
|
||||||
|
├── build/
|
||||||
|
│ ├── otp-x86_64 # Native x86_64 binary (created by build)
|
||||||
|
│ └── otp-arm64 # ARM64 binary (created by cross-compilation)
|
||||||
|
├── pads/ # OTP pad storage directory (created at runtime)
|
||||||
|
├── files/ # Encrypted file storage (created at runtime)
|
||||||
|
└── tests/ # Test scripts and utilities
|
||||||
```
|
```
|
||||||
|
|
||||||
## Architecture
|
## Architecture
|
||||||
@@ -197,13 +242,14 @@ The OTP cipher uses a modular architecture with clean separation of concerns:
|
|||||||
- **main.c**: Application entry point, command line parsing, and mode selection
|
- **main.c**: Application entry point, command line parsing, and mode selection
|
||||||
- **ui.c**: Interactive user interface, menus, and terminal management
|
- **ui.c**: Interactive user interface, menus, and terminal management
|
||||||
- **state.c**: Global state management (pads directory, terminal dimensions, preferences)
|
- **state.c**: Global state management (pads directory, terminal dimensions, preferences)
|
||||||
- **crypto.c**: Core cryptographic operations (XOR encryption, ChaCha20 entropy mixing)
|
- **crypto.c**: Core cryptographic operations (XOR encryption, base64 encoding)
|
||||||
- **pads.c**: Pad file management, checksums, and state tracking
|
- **pads.c**: Pad file management, checksums, and state tracking
|
||||||
- **entropy.c**: Entropy collection from keyboard, dice, and other sources
|
- **entropy.c**: Entropy collection from keyboard, dice, files, and hardware RNG
|
||||||
- **trng.c**: Hardware RNG device detection and entropy collection from USB devices
|
- **trng.c**: Hardware RNG device detection and entropy collection from USB devices
|
||||||
- **util.c**: Utility functions, file operations, and helper routines
|
- **util.c**: Utility functions, file operations, and helper routines
|
||||||
|
- **nostr_chacha20.c**: ChaCha20 stream cipher for entropy expansion
|
||||||
|
|
||||||
All modules share a common header (`include/otp.h`) that defines the public API and data structures.
|
All modules share a common header (`src/main.h`) that defines the public API, data structures, and version constant.
|
||||||
|
|
||||||
## Hardware RNG Device Support
|
## Hardware RNG Device Support
|
||||||
|
|
||||||
@@ -405,9 +451,22 @@ No. ChkSum (first 16 chars) Size Used % Used
|
|||||||
|
|
||||||
This project includes automatic versioning system based on the Generic Automatic Version Increment System.
|
This project includes automatic versioning system based on the Generic Automatic Version Increment System.
|
||||||
|
|
||||||
|
## State Files
|
||||||
|
|
||||||
|
Pad state files (`.state`) use a human-readable text format:
|
||||||
|
```
|
||||||
|
offset=1234567890
|
||||||
|
```
|
||||||
|
|
||||||
|
This tracks how many bytes of each pad have been used. The format is:
|
||||||
|
- **Human-readable**: Can inspect with `cat checksum.state`
|
||||||
|
- **Backward compatible**: Automatically reads old binary format
|
||||||
|
- **Easy to debug**: Can manually edit if needed
|
||||||
|
|
||||||
## Contributing
|
## Contributing
|
||||||
|
|
||||||
When contributing:
|
When contributing:
|
||||||
1. The version will automatically increment on builds
|
1. The version will automatically increment on builds via `build.sh`
|
||||||
2. For major features, consider manually creating minor version tags
|
2. Version is centralized in `src/main.h` as `OTP_VERSION`
|
||||||
3. Generated version files (`src/version.*`, `VERSION`) should not be committed
|
3. For major features, manually create minor/major version tags
|
||||||
|
4. Build artifacts in `build/` and object files are auto-cleaned
|
||||||
|
|||||||
3
TODO.md
3
TODO.md
@@ -1,3 +0,0 @@
|
|||||||
# TODO
|
|
||||||
|
|
||||||
## The pad menu in interactive encrypt mode gives numbers instead of checksum selection
|
|
||||||
26
build.sh
26
build.sh
@@ -146,20 +146,14 @@ increment_version() {
|
|||||||
update_source_version() {
|
update_source_version() {
|
||||||
local NEW_VERSION="$1"
|
local NEW_VERSION="$1"
|
||||||
|
|
||||||
print_status "Updating version strings in source code..."
|
print_status "Updating version constant in source code..."
|
||||||
|
|
||||||
# Replace hardcoded version strings in src/otp.c with the current git tag
|
# Update OTP_VERSION constant in src/main.h
|
||||||
if [ -f "src/otp.c" ]; then
|
if [ -f "src/main.h" ]; then
|
||||||
# Update main menu version
|
sed -i "s/#define OTP_VERSION \"v[0-9]\+\.[0-9]\+\.[0-9]\+\"/#define OTP_VERSION \"$NEW_VERSION\"/g" src/main.h
|
||||||
sed -i "s/OTP v[0-9]\+\.[0-9]\+\.[0-9]\+/OTP $NEW_VERSION/g" src/otp.c
|
print_success "Updated OTP_VERSION in src/main.h to $NEW_VERSION"
|
||||||
# Update ASCII output version
|
|
||||||
sed -i "s/Version: v[0-9]\+\.[0-9]\+\.[0-9]\+/Version: $NEW_VERSION/g" src/otp.c
|
|
||||||
# Update usage/help text version
|
|
||||||
sed -i "s/Implementation v[0-9]\+\.[0-9]\+\.[0-9]\+/Implementation $NEW_VERSION/g" src/otp.c
|
|
||||||
|
|
||||||
print_success "Updated version strings in src/otp.c to $NEW_VERSION"
|
|
||||||
else
|
else
|
||||||
print_warning "src/otp.c not found - skipping version string updates"
|
print_warning "src/main.h not found - skipping version update"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -269,7 +263,6 @@ build_project() {
|
|||||||
else
|
else
|
||||||
# Build both architectures
|
# Build both architectures
|
||||||
print_status "Building OTP project for x86_64..."
|
print_status "Building OTP project for x86_64..."
|
||||||
make clean
|
|
||||||
make CC=gcc ARCH=x86_64
|
make CC=gcc ARCH=x86_64
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
print_success "x86_64 build completed successfully"
|
print_success "x86_64 build completed successfully"
|
||||||
@@ -279,7 +272,8 @@ build_project() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
print_status "Building OTP project for ARM64/AArch64..."
|
print_status "Building OTP project for ARM64/AArch64..."
|
||||||
make clean
|
# Clean only object files, not the x86_64 binary
|
||||||
|
rm -f src/*.o
|
||||||
make CC=aarch64-linux-gnu-gcc ARCH=arm64
|
make CC=aarch64-linux-gnu-gcc ARCH=arm64
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
print_success "ARM64/AArch64 build completed successfully"
|
print_success "ARM64/AArch64 build completed successfully"
|
||||||
@@ -289,6 +283,10 @@ build_project() {
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Clean up object files after successful build
|
||||||
|
print_status "Cleaning up object files..."
|
||||||
|
rm -f src/*.o
|
||||||
|
|
||||||
# Create Gitea release with binaries
|
# Create Gitea release with binaries
|
||||||
if [ -f "$HOME/.gitea_token" ]; then
|
if [ -f "$HOME/.gitea_token" ]; then
|
||||||
create_gitea_release "$NEW_VERSION"
|
create_gitea_release "$NEW_VERSION"
|
||||||
|
|||||||
1
debug.c
1
debug.c
@@ -1 +0,0 @@
|
|||||||
int main() { printf("Testing direct filename: %d\n", strncmp("97d9d82b5414a9439102f3811fb90ab1d6368a00d33229a18b306476f9d04f82.pad", "97", 2)); return 0; }
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
echo "Manual OTP Test"
|
|
||||||
echo "==============="
|
|
||||||
|
|
||||||
# Generate a test pad
|
|
||||||
echo "Generating test pad..."
|
|
||||||
./otp generate demo 1
|
|
||||||
echo
|
|
||||||
|
|
||||||
# Create a test message file for encryption
|
|
||||||
echo "Creating test message..."
|
|
||||||
echo "This is a secret message for testing OTP encryption!" > test_message.txt
|
|
||||||
|
|
||||||
# Test encryption interactively
|
|
||||||
echo "Testing encryption (will prompt for input):"
|
|
||||||
echo "Please enter: This is a secret message for testing OTP encryption!"
|
|
||||||
./otp encrypt demo
|
|
||||||
|
|
||||||
echo
|
|
||||||
echo "Files created:"
|
|
||||||
ls -la demo.*
|
|
||||||
@@ -5,7 +5,7 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include "otp.h"
|
#include "main.h"
|
||||||
|
|
||||||
#define PROGRESS_UPDATE_INTERVAL (64 * 1024 * 1024) // 64MB intervals
|
#define PROGRESS_UPDATE_INTERVAL (64 * 1024 * 1024) // 64MB intervals
|
||||||
|
|
||||||
@@ -198,7 +198,7 @@ int generate_ascii_armor(const char* chksum, uint64_t offset, const unsigned cha
|
|||||||
strcpy(*ascii_output, "-----BEGIN OTP MESSAGE-----\n");
|
strcpy(*ascii_output, "-----BEGIN OTP MESSAGE-----\n");
|
||||||
|
|
||||||
char temp_line[256];
|
char temp_line[256];
|
||||||
snprintf(temp_line, sizeof(temp_line), "Version: v0.3.16\n");
|
snprintf(temp_line, sizeof(temp_line), "Version: %s\n", OTP_VERSION);
|
||||||
strcat(*ascii_output, temp_line);
|
strcat(*ascii_output, temp_line);
|
||||||
|
|
||||||
snprintf(temp_line, sizeof(temp_line), "Pad-ChkSum: %s\n", chksum);
|
snprintf(temp_line, sizeof(temp_line), "Pad-ChkSum: %s\n", chksum);
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include "nostr_chacha20.h"
|
#include "nostr_chacha20.h"
|
||||||
#include "otp.h"
|
#include "main.h"
|
||||||
|
|
||||||
|
|
||||||
// In-place pad entropy addition using Chacha20 or direct XOR
|
// In-place pad entropy addition using Chacha20 or direct XOR
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
#include <termios.h>
|
#include <termios.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include "otp.h"
|
#include "main.h"
|
||||||
|
|
||||||
int main(int argc, char* argv[]) {
|
int main(int argc, char* argv[]) {
|
||||||
// Initialize terminal dimensions first
|
// Initialize terminal dimensions first
|
||||||
@@ -241,7 +241,7 @@ int command_line_mode(int argc, char* argv[]) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void print_usage(const char* program_name) {
|
void print_usage(const char* program_name) {
|
||||||
printf("OTP Cipher - One Time Pad Implementation v0.3.16\n");
|
printf("OTP Cipher - One Time Pad Implementation %s\n", OTP_VERSION);
|
||||||
printf("Built for testing entropy system\n");
|
printf("Built for testing entropy system\n");
|
||||||
printf("Usage:\n");
|
printf("Usage:\n");
|
||||||
printf(" %s - Interactive mode\n", program_name);
|
printf(" %s - Interactive mode\n", program_name);
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
#ifndef OTP_H
|
#ifndef MAIN_H
|
||||||
#define OTP_H
|
#define MAIN_H
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
// OTP CIPHER - FUNCTION PROTOTYPES HEADER
|
// OTP CIPHER - MAIN HEADER FILE
|
||||||
// One Time Pad Implementation v0.2.109
|
// One Time Pad Implementation
|
||||||
//
|
//
|
||||||
// This header file contains all function prototypes extracted from otp.c
|
// This header file contains all function prototypes and type definitions
|
||||||
// Organized by functional categories for better maintainability
|
// for the OTP Cipher project
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
@@ -22,6 +22,9 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
|
|
||||||
|
// Version - Updated automatically by build.sh
|
||||||
|
#define OTP_VERSION "v0.3.30"
|
||||||
|
|
||||||
// Constants
|
// Constants
|
||||||
#define MAX_INPUT_SIZE 4096
|
#define MAX_INPUT_SIZE 4096
|
||||||
#define MAX_LINE_LENGTH 1024
|
#define MAX_LINE_LENGTH 1024
|
||||||
@@ -335,4 +338,4 @@ char* select_pad_interactive(const char* title, const char* prompt, pad_filter_t
|
|||||||
// Help and usage display
|
// Help and usage display
|
||||||
void print_usage(const char* program_name);
|
void print_usage(const char* program_name);
|
||||||
|
|
||||||
#endif // OTP_H
|
#endif // MAIN_H
|
||||||
35
src/otp.c
35
src/otp.c
@@ -1,35 +0,0 @@
|
|||||||
#define _POSIX_C_SOURCE 200809L
|
|
||||||
#define _DEFAULT_SOURCE
|
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <stdint.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
#include <sys/stat.h>
|
|
||||||
#include <sys/statvfs.h>
|
|
||||||
#include <sys/ioctl.h>
|
|
||||||
#include <dirent.h>
|
|
||||||
#include <time.h>
|
|
||||||
#include <ctype.h>
|
|
||||||
#include <termios.h>
|
|
||||||
#include <fcntl.h>
|
|
||||||
#include <math.h>
|
|
||||||
#include "nostr_chacha20.h"
|
|
||||||
#include "otp.h"
|
|
||||||
|
|
||||||
|
|
||||||
#define MAX_INPUT_SIZE 4096
|
|
||||||
#define MAX_LINE_LENGTH 1024
|
|
||||||
#define MAX_HASH_LENGTH 65
|
|
||||||
#define PROGRESS_UPDATE_INTERVAL (64 * 1024 * 1024) // 64MB intervals
|
|
||||||
#define DEFAULT_PADS_DIR "pads"
|
|
||||||
#define FILES_DIR "files"
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
|
||||||
// GLOBAL VARIABLES
|
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
|
||||||
|
|
||||||
char current_pads_dir[512] = DEFAULT_PADS_DIR;
|
|
||||||
40
src/pads.c
40
src/pads.c
@@ -16,7 +16,7 @@
|
|||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include "otp.h"
|
#include "main.h"
|
||||||
|
|
||||||
|
|
||||||
// Extracted pad management functions from otp.c
|
// Extracted pad management functions from otp.c
|
||||||
@@ -89,7 +89,10 @@ int generate_pad(uint64_t size_bytes, int display_progress) {
|
|||||||
const char* pads_dir = get_current_pads_dir();
|
const char* pads_dir = get_current_pads_dir();
|
||||||
struct statvfs stat;
|
struct statvfs stat;
|
||||||
if (statvfs(pads_dir, &stat) == 0) {
|
if (statvfs(pads_dir, &stat) == 0) {
|
||||||
uint64_t available_bytes = stat.f_bavail * stat.f_frsize;
|
// Use f_bfree (total free blocks) instead of f_bavail (available to non-root)
|
||||||
|
// This gives the actual free space on the filesystem, which is more accurate
|
||||||
|
// for removable media and user-owned directories
|
||||||
|
uint64_t available_bytes = stat.f_bfree * stat.f_frsize;
|
||||||
double available_gb = (double)available_bytes / (1024.0 * 1024.0 * 1024.0);
|
double available_gb = (double)available_bytes / (1024.0 * 1024.0 * 1024.0);
|
||||||
double required_gb = (double)size_bytes / (1024.0 * 1024.0 * 1024.0);
|
double required_gb = (double)size_bytes / (1024.0 * 1024.0 * 1024.0);
|
||||||
|
|
||||||
@@ -233,19 +236,41 @@ int read_state_offset(const char* pad_chksum, uint64_t* offset) {
|
|||||||
const char* pads_dir = get_current_pads_dir();
|
const char* pads_dir = get_current_pads_dir();
|
||||||
snprintf(state_filename, sizeof(state_filename), "%s/%s.state", pads_dir, pad_chksum);
|
snprintf(state_filename, sizeof(state_filename), "%s/%s.state", pads_dir, pad_chksum);
|
||||||
|
|
||||||
FILE* state_file = fopen(state_filename, "rb");
|
FILE* state_file = fopen(state_filename, "r");
|
||||||
if (!state_file) {
|
if (!state_file) {
|
||||||
*offset = 0;
|
*offset = 0;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (fread(offset, sizeof(uint64_t), 1, state_file) != 1) {
|
// Try to read as text format first (new format)
|
||||||
|
char line[128];
|
||||||
|
if (fgets(line, sizeof(line), state_file)) {
|
||||||
|
// Check if it's text format (starts with "offset=")
|
||||||
|
if (strncmp(line, "offset=", 7) == 0) {
|
||||||
|
*offset = strtoull(line + 7, NULL, 10);
|
||||||
|
fclose(state_file);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Not text format, try binary format (legacy)
|
||||||
|
fclose(state_file);
|
||||||
|
state_file = fopen(state_filename, "rb");
|
||||||
|
if (!state_file) {
|
||||||
|
*offset = 0;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (fread(offset, sizeof(uint64_t), 1, state_file) != 1) {
|
||||||
|
fclose(state_file);
|
||||||
|
*offset = 0;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
fclose(state_file);
|
fclose(state_file);
|
||||||
*offset = 0;
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
fclose(state_file);
|
fclose(state_file);
|
||||||
|
*offset = 0;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -254,12 +279,13 @@ int write_state_offset(const char* pad_chksum, uint64_t offset) {
|
|||||||
const char* pads_dir = get_current_pads_dir();
|
const char* pads_dir = get_current_pads_dir();
|
||||||
snprintf(state_filename, sizeof(state_filename), "%s/%s.state", pads_dir, pad_chksum);
|
snprintf(state_filename, sizeof(state_filename), "%s/%s.state", pads_dir, pad_chksum);
|
||||||
|
|
||||||
FILE* state_file = fopen(state_filename, "wb");
|
FILE* state_file = fopen(state_filename, "w");
|
||||||
if (!state_file) {
|
if (!state_file) {
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (fwrite(&offset, sizeof(uint64_t), 1, state_file) != 1) {
|
// Write in text format for human readability
|
||||||
|
if (fprintf(state_file, "offset=%lu\n", offset) < 0) {
|
||||||
fclose(state_file);
|
fclose(state_file);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include "otp.h"
|
#include "main.h"
|
||||||
|
|
||||||
// Global state variables
|
// Global state variables
|
||||||
static char current_pads_dir[512] = DEFAULT_PADS_DIR;
|
static char current_pads_dir[512] = DEFAULT_PADS_DIR;
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include "nostr_chacha20.h"
|
#include "nostr_chacha20.h"
|
||||||
#include "otp.h"
|
#include "main.h"
|
||||||
|
|
||||||
// Basic TrueRNG entropy collection function
|
// Basic TrueRNG entropy collection function
|
||||||
int collect_truerng_entropy(unsigned char* entropy_buffer, size_t target_bytes, size_t* collected_bytes, int display_progress) {
|
int collect_truerng_entropy(unsigned char* entropy_buffer, size_t target_bytes, size_t* collected_bytes, int display_progress) {
|
||||||
|
|||||||
6
src/ui.c
6
src/ui.c
@@ -15,7 +15,7 @@
|
|||||||
#include <termios.h>
|
#include <termios.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include "otp.h"
|
#include "main.h"
|
||||||
|
|
||||||
// Initialize terminal dimensions
|
// Initialize terminal dimensions
|
||||||
void init_terminal_dimensions(void) {
|
void init_terminal_dimensions(void) {
|
||||||
@@ -120,7 +120,9 @@ int interactive_mode(void) {
|
|||||||
|
|
||||||
void show_main_menu(void) {
|
void show_main_menu(void) {
|
||||||
printf("\n");
|
printf("\n");
|
||||||
print_centered_header("Main Menu - OTP v0.3.16", 0);
|
char header[64];
|
||||||
|
snprintf(header, sizeof(header), "Main Menu - OTP %s", OTP_VERSION);
|
||||||
|
print_centered_header(header, 0);
|
||||||
printf("\n");
|
printf("\n");
|
||||||
|
|
||||||
printf(" \033[4mT\033[0mext encrypt\n"); //TEXT ENCRYPT
|
printf(" \033[4mT\033[0mext encrypt\n"); //TEXT ENCRYPT
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
#include <termios.h>
|
#include <termios.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include "otp.h"
|
#include "main.h"
|
||||||
|
|
||||||
// Global variables for preferences
|
// Global variables for preferences
|
||||||
static char default_pad_path[1024] = "";
|
static char default_pad_path[1024] = "";
|
||||||
|
|||||||
Reference in New Issue
Block a user