Merge pull request #6 from cyclone-github/testing

v0.2.3 - fix #5

Author: cyclone-github

CHANGELOG.md

@@ -0,0 +1,22 @@
+### v0.2.3; 2025-01-13
+```
+fix https://github.com/cyclone-github/atomic_pwn/issues/5
+modified codebase to mirror phantom_decryptor
+```
+### v0.2.2; 2024-05-02-1600
+```
+refactor code
+fix https://github.com/cyclone-github/atomic_pwn/issues/2
+```
+### v0.2.1; 2024-04-18-1200
+```
+optimize code for 111% performance gain (process lines as byte, tweak read/write/chan buffers)
+```
+### v0.2.0; 2024-04-17
+```
+used multi-threading code from hashgen for 40% performance (alpha)
+```
+### v0.1.0; 2024-04-16
+```
+initial release
+```

README.md

@@ -8,8 +8,6 @@
 ### POC tools to extract and decrypt Atomic vault wallets
 _**This tool is proudly the first publicly released Atomic Vault extractor / decryptor.**_
 - Contact me at https://forum.hashpwn.net/user/cyclone if you need help recovering your Atomic wallet password or seed phrase
-
-### Usage example:
 ```
 ./atomic_decryptor_amd64.bin -h atomic.txt -w wordlist.txt
  ----------------------------------------------- 
@@ -21,13 +19,33 @@ Vault file:     atomic.txt
 Valid Vaults:   1
 CPU Threads:    16
 Wordlist:       wordlist.txt
-Working...
+2025/01/13 16:49:42 Working...
+Hash: {foobar hash}
+Password: {password}
+Seed Phrase: {decrypted seed phrase}
+2025/01/13 16:49:50 Finished
+2025/01/13 16:49:50 Decrypted: 1/1 1786145.15 h/s 00h:00m:08s
+```
 
-Decrypted: 0/1  2400342.75 h/s     00h:01m:00s
+### Example Usage:
 ```
+-w {wordlist} (omit -w to read from stdin)
+-h {atomic_wallet_hash}
+-o {output} (omit -o to write to stdout)
+-t {cpu threads}
+-s {print status every nth sec}
+
+-version (version info)
+-help (usage instructions)
+
+./atomic_decryptor.bin -h {atomic_wallet_hash} -w {wordlist} -o {output} -t {cpu threads} -s {print status every nth sec}
 
-### Output example:
-If the tool successfully decrypts the vault, tool will print the vault password and decrypted vault.
+./atomic_decryptor.bin -h atomic.txt -w wordlist.txt -o cracked.txt -t 16 -s 10
+
+cat wordlist | ./atomic_decryptor.bin -h atomic.txt
+
+./atomic_decryptor.bin -h atomic.txt -w wordlist.txt -o output.txt
+```
 
 ### Credits
 - Many thanks to blandyuk for his help with the AES Key and IV implementation - https://github.com/blandyuk
@@ -48,3 +66,6 @@ If the tool successfully decrypts the vault, tool will print the vault password
   - `go build -ldflags="-s -w" .`
 - Compile from source code how-to:
   - https://github.com/cyclone-github/scripts/blob/main/intro_to_go.txt
+
+### Changelog:
+* https://github.com/cyclone-github/atomic_pwn/blob/main/CHANGELOG.md

atomic_decryptor/go.mod

@@ -1,3 +1,3 @@
 module atomic_decryptor
 
-go 1.22.4
+go 1.23.4

atomic_decryptor/main.go

@@ -22,10 +22,18 @@ GNU General Public License v2.0
 https://github.com/cyclone-github/atomic_pwn/blob/main/LICENSE
 
 version history
-v0.1.0-2024-04-16; initial release
-v0.2.0-2024-04-17; used multi-threading code from hashgen for 40% performance (alpha)
-v0.2.1-2024-04-18-1200; optimize code for 111% performance gain (process lines as byte, tweak read/write/chan buffers)
-v0.2.2-2024-05-02-1600; refactor code, fix https://github.com/cyclone-github/atomic_pwn/issues/2
+v0.1.0; 2024-04-16
+	initial release
+v0.2.0; 2024-04-17
+	used multi-threading code from hashgen for 40% performance (alpha)
+v0.2.1; 2024-04-18-1200
+	optimize code for 111% performance gain (process lines as byte, tweak read/write/chan buffers)
+v0.2.2; 2024-05-02-1600
+	refactor code
+	fix https://github.com/cyclone-github/atomic_pwn/issues/2
+v0.2.3; 2025-01-13
+	fix https://github.com/cyclone-github/atomic_pwn/issues/5
+	modified codebase to mirror phantom_decryptor
 */
 
 // main func
@@ -64,19 +72,20 @@ func main() {
 		os.Exit(1)
 	}
 
-	// override outputFile since this has not been implemented yet
-	*outputFile = ""
-
 	startTime := time.Now()
 
 	// set CPU threads
 	numThreads := setNumThreads(*threadFlag)
 
-	// channels / variables
-	crackedCountCh := make(chan int, 10)     // buffer of 10 to reduce blocking
-	linesProcessedCh := make(chan int, 1000) // buffer of 1000 to reduce blocking
+	// variables
+	var (
+		crackedCount   int32
+		linesProcessed int32
+		wg             sync.WaitGroup
+	)
+
+	// channels
 	stopChan := make(chan struct{})
-	var wg sync.WaitGroup
 
 	// goroutine to watch for ctrl+c
 	handleGracefulShutdown(stopChan)
@@ -94,12 +103,16 @@ func main() {
 
 	// monitor status of workers
 	wg.Add(1)
-	go monitorPrintStats(crackedCountCh, linesProcessedCh, stopChan, startTime, validVaultCount, &wg, *statsIntervalFlag)
+	go monitorPrintStats(&crackedCount, &linesProcessed, stopChan, startTime, validVaultCount, &wg, *statsIntervalFlag)
 
 	// start the processing logic
-	startProc(*wordlistFileFlag, *outputFile, numThreads, stopChan, vaults, crackedCountCh, linesProcessedCh)
+	startProc(*wordlistFileFlag, *outputFile, numThreads, vaults, &crackedCount, &linesProcessed, stopChan)
 
 	// close stop channel to signal all workers to stop
-	time.Sleep(10 * time.Millisecond)
 	closeStopChannel(stopChan)
+
+	// wait for monitorPrintStats to finish
+	wg.Wait()
 }
+
+// end code

atomic_decryptor/print_welcome.go

@@ -8,7 +8,7 @@ import (
 
 // version func
 func versionFunc() {
-	fmt.Fprintln(os.Stderr, "Cyclone's Atomic Vault Decryptor v0.2.2-2024-05-02-1600\nhttps://github.com/cyclone-github/atomic_pwn\n")
+	fmt.Fprintln(os.Stderr, "Cyclone's Atomic Vault Decryptor v0.2.3; 2025-01-13\nhttps://github.com/cyclone-github/atomic_pwn\n")
 }
 
 // help func
@@ -18,7 +18,7 @@ func helpFunc() {
 
 -w {wordlist} (omit -w to read from stdin)
 -h {atomic_wallet_hash}
--o {output} (omit -o to write to stdout) (not implemented yet)
+-o {output} (omit -o to write to stdout)
 -t {cpu threads}
 -s {print status every nth sec}
 
@@ -46,7 +46,6 @@ func printWelcomeScreen(vaultFileFlag, wordlistFileFlag *string, validVaultCount
 	fmt.Fprintf(os.Stderr, "Valid Vaults:\t%d\n", validVaultCount)
 	fmt.Fprintf(os.Stderr, "CPU Threads:\t%d\n", numThreads)
 
-	// assume "stdin" if wordlistFileFlag is ""
 	if *wordlistFileFlag == "" {
 		fmt.Fprintf(os.Stderr, "Wordlist:\tReading stdin\n")
 	} else {