miracle091/Picocrypt
miracle091
/
Picocrypt
mirror of https://github.com/HACKERALERT/Picocrypt.git
1
0
Fork 0
Code Releases Activity

Fixed keyfile bug

This commit is contained in:
Evan Su 2021-08-10 12:30:52 -04:00 committed by GitHub
parent ea6739fb43
commit b73de4ca3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 150 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

196
src/unstable/Picocrypt.go
View File

@ -2,7 +2,7 @@ package main
/*
Picocrypt v1.15
Picocrypt v1.16
Copyright (c) Evan Su (https://evansu.cc)
Released under a GNU GPL v3 License
https://github.com/HACKERALERT/Picocrypt
@ -105,7 +105,6 @@ var outputWidth float32 = 370
var orLabel = "or"
var passwordStrength int
var keyfile = false // True if user chooses/chose to use a keyfile
var keyfilePrompt = "Keyfile (optional):" // Changes if decrypting and keyfile was enabled
var showConfirmation = false // True if a confirmation to overwrite is needed
var showProgress = false
var progress float32 = 0 // 0 is 0%, 1 is 100%
@ -128,11 +127,13 @@ var shredOverlay string // Text in shredding progress bar
var shredding = "Ready."
// User input variables
var passwordState = giu.InputTextFlagsPassword
var password string
var cPassword string // Confirm password text entry string variable
var keyfilePath string
var keyfileLabel = "Use a keyfile (Beta)"
var keyfileLabel = "Use a keyfile"
var metadata string
var metadataPrompt = "Metadata (optional):"
var shredTemp bool
var paranoid bool
var keep bool
@ -142,6 +143,12 @@ var splitSize string
var fast bool
var kept = false // If a file was corrupted/modified, but the output was kept
var showGenpass = false
var genpassUpper bool
var genpassLower bool
var genpassNums bool
var genpassSymbols bool
// Reed-Solomon encoders
var rs1,_ = infectious.NewFEC(1,3) // 1 data shards, 3 total -> 2 parity shards
var rs5,_ = infectious.NewFEC(5,15)
@ -201,6 +208,40 @@ func startUI(){
}
}),
// Password generator modal
giu.Custom(func(){
if showGenpass{
giu.PopupModal("Generate password:").Layout(
giu.Checkbox("Uppercase letters",&genpassUpper),
giu.Checkbox("Lowercase letters",&genpassLower),
giu.Checkbox("Numbers",&genpassNums),
giu.Checkbox("Symbols",&genpassSymbols),
giu.Button("Cancel").Size(100,0).OnClick(func(){
giu.CloseCurrentPopup()
showGenpass = false
}),
giu.Button("Generate").Size(100,0).OnClick(func(){
tmp := genPassword()
password = tmp
cPassword = tmp
passwordStrength = zxcvbn.PasswordStrength(password,nil).Score
giu.CloseCurrentPopup()
showGenpass = false
passwordState = giu.InputTextFlagsNone
go func(){
time.Sleep(3*time.Second)
passwordState = giu.InputTextFlagsPassword
giu.Update()
}()
giu.Update()
}),
).Build()
giu.OpenPopup("Generate password:")
giu.Update()
}
}),
// Confirm overwrite with a modal
giu.Custom(func(){
if showConfirmation{
@ -214,7 +255,6 @@ func startUI(){
giu.Button("Yes").Size(100,0).OnClick(func(){
giu.CloseCurrentPopup()
showConfirmation = false
giu.Update()
showProgress = true
giu.Update()
go func (){
@ -298,24 +338,31 @@ func startUI(){
giu.Row(
giu.Label("Password:"),
giu.Custom(func(){
if mode!="decrypt"{
giu.SmallButton("Generate").OnClick(func(){
tmp := genPassword()
giu.Row(
giu.Custom(func(){
if mode!="decrypt"{
giu.Row(
giu.SmallButton("Generate").OnClick(func(){
showGenpass = true
}),
giu.SmallButton("Copy").OnClick(func(){
clipboard.WriteAll(password)
}),
).Build()
}
}),
giu.SmallButton("Paste").OnClick(func(){
tmp,_ := clipboard.ReadAll()
password = tmp
cPassword = tmp
passwordStrength = zxcvbn.PasswordStrength(password,nil).Score
giu.Update()
}).Build()
giu.SmallButton("Copy").OnClick(func(){
clipboard.WriteAll(password)
}).Build()
}
}),
).Build()
}),
giu.Dummy(-200,0),
giu.Label(keyfilePrompt),
),
giu.Row(
giu.InputText(&password).Size(241/dpi).Flags(giu.InputTextFlagsPassword).OnChange(func(){
giu.InputText(&password).Size(241/dpi).Flags(passwordState).OnChange(func(){
passwordStrength = zxcvbn.PasswordStrength(password,nil).Score
}),
@ -351,9 +398,9 @@ func startUI(){
-1)
canvas.PathStroke(col,false,3)
}),
giu.Dummy(-200,0),
giu.Dummy(-160,0),
giu.Checkbox(keyfileLabel,&keyfile).OnChange(func(){
/*giu.Checkbox(keyfileLabel,&keyfile).OnChange(func(){
if !keyfile{
keyfileLabel = "Use a keyfile"
return
@ -365,35 +412,64 @@ func startUI(){
}
keyfileLabel = filename
keyfilePath = filename
}),
),
// Prompt to confirm password
giu.Label("Confirm password:"),
giu.Row(
giu.InputText(&cPassword).Size(241/dpi).Flags(giu.InputTextFlagsPassword),
}),*/
giu.Custom(func(){
canvas := giu.GetCanvas()
pos := giu.GetCursorScreenPos()
col := color.RGBA{76,200,75,255}
if cPassword!=password{
col = color.RGBA{200,76,75,255}
if !(mode=="decrypt"&&!keyfile){
giu.Button(keyfileLabel).OnClick(func(){
filename,err := dialog.File().Load()
if err!=nil{
return
}
keyfile = true
keyfileLabel = filepath.Base(filename)
keyfilePath = filename
}).Build()
}
if password==""||cPassword==""||mode=="decrypt"{
col = color.RGBA{0,0,0,0}
}),
giu.Custom(func(){
if keyfile&&mode=="encrypt"{
giu.Button("Clear").OnClick(func(){
keyfile = false
keyfileLabel = "Use a keyfile"
keyfilePath = ""
}).Build()
}
path := pos.Add(image.Pt(
int(math.Round(float64(6*dpi))),
int(math.Round(float64(12*dpi))),
))
canvas.PathArcTo(path,8*dpi,0,2*math.Pi,-1)
canvas.PathStroke(col,false,3)
}),
giu.Dummy(-0.0000001,0),
),
// Prompt to confirm password
giu.Custom(func(){
if mode!="decrypt"{
giu.Label("Confirm password:").Build()
giu.Row(
giu.InputText(&cPassword).Size(241/dpi).Flags(passwordState),
giu.Custom(func(){
canvas := giu.GetCanvas()
pos := giu.GetCursorScreenPos()
col := color.RGBA{76,200,75,255}
if cPassword!=password{
col = color.RGBA{200,76,75,255}
}
if password==""||cPassword==""||mode=="decrypt"{
col = color.RGBA{0,0,0,0}
}
path := pos.Add(image.Pt(
int(math.Round(float64(6*dpi))),
int(math.Round(float64(12*dpi))),
))
canvas.PathArcTo(path,8*dpi,0,2*math.Pi,-1)
canvas.PathStroke(col,false,3)
}),
giu.Dummy(-0.0000001,0),
).Build()
}else{
giu.Dummy(0,42).Build()
}
}),
// Optional metadata
giu.Label("Metadata (optional):"),
giu.Label(metadataPrompt),
giu.InputText(&metadata).Size(-0.0000001),
giu.Custom(func(){
@ -417,7 +493,11 @@ func startUI(){
giu.Row(
giu.Checkbox("Split output into chunks of",&split),
giu.InputText(&splitSize).Size(50).Flags(giu.InputTextFlagsCharsDecimal).OnChange(func(){
split = true
if splitSize==""{
split = false
}else{
split = true
}
}),
giu.Combo("##splitter",splitUnits[splitSelected],splitUnits,&splitSelected).Size(52),
).Build()
@ -439,6 +519,12 @@ func startUI(){
_status_color = color.RGBA{0xff,0x00,0x00,255}
return
}
fmt.Println(keyfile,keyfilePath)
if keyfile&&keyfilePath==""{
_status = "Please select a keyfile."
_status_color = color.RGBA{0xff,0x00,0x00,255}
return
}
if mode=="encrypt"{
if len(allFiles)>1||len(onlyFolders)>0{
outputFile = outputEntry+".zip.pcv"
@ -708,6 +794,7 @@ func onDrop(names []string){
if strings.HasSuffix(names[0],".pcv")||isSplit{
mode = "decrypt"
inputLabel = name+" (will decrypt)"
metadataPrompt = "Metadata (read-only):"
if isSplit{
inputLabel = name+" (will recombine and decrypt)"
@ -775,9 +862,9 @@ func onDrop(names []string){
return
}
if flags[1]==1{
keyfilePrompt = "Keyfile (required):"
keyfileLabel = "Click here to select keyfile."
if flags[2]==1{
keyfile = true
keyfileLabel = "Select keyfile"
}
fin.Close()
@ -1199,6 +1286,7 @@ func work(){
khash_sha3.Write(khash)
khash_hash = khash_sha3.Sum(nil)
}
fmt.Println(keyfile)
sha3_512 := sha3.New512()
sha3_512.Write(key)
@ -1836,7 +1924,7 @@ func shred(names []string,separate bool){
}
// Clear UI state
shredding = "Ready."
shredding = "Completed."
shredProgress = 0
shredOverlay = ""
}
@ -1862,10 +1950,11 @@ func resetUI(){
outputWidth = 370
password = ""
cPassword = ""
keyfilePrompt = "Keyfile (optional):"
keyfileLabel = "Use a keyfile"
keyfilePath = ""
keyfile = false
metadata = ""
metadataPrompt = "Metadata (optional):"
shredTemp = false
keep = false
reedsolo = false
@ -1933,7 +2022,22 @@ func humanize(seconds int) string{
// Generate cryptographically secure high-entropy passwords
func genPassword() string{
chars := "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-=!@#$^&()_+?"
chars := ""
if genpassUpper{
chars += "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
}
if genpassLower{
chars += "abcdefghijklmnopqrstuvwxyz"
}
if genpassNums{
chars += "1234567890"
}
if genpassSymbols{
chars += "-=!@#$^&()_+?"
}
if chars==""{
return chars
}
tmp := make([]byte,32)
for i:=0;i<32;i++{
j,_ := rand.Int(rand.Reader,new(big.Int).SetUint64(uint64(len(chars))))
@ -1981,7 +2085,7 @@ func main(){
window.SetDropCallback(onDrop)
window.SetCloseCallback(func() bool{
// Disable closing window if a Picocrypt is working to prevent temporary files
if working||shredding!="Ready."{
if working||(shredding!="Ready."&&shredding!="Completed."){
return false
}
return true