Skip to content

Commit

Permalink
Fixed bug, key is now only saved if it is possible to decrypt it
Browse files Browse the repository at this point in the history
  • Loading branch information
looCiprian committed Sep 22, 2023
1 parent e7b169c commit 71b1224
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 13 deletions.
25 changes: 12 additions & 13 deletions internal/crypto_srv/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,18 @@ func GenerateAndSaveNewKeyset(destinationKeyPath string, ym *YubikeyMng) *keyset
log.Fatal("[-] Cannot create new keyset" + err.Error())
}

// get yk serial number and timestamp to create a unique name key
keyByte := getKeysetByte(keysetHandle)

encryptedKey := ym.PivEncrypt(keyByte)
// Check if the keyset can be decrypted
decryptedKey := ym.PivDecrypt(encryptedKey)
keySetHandleDecrypted := getKeysetHandleFromByte(decryptedKey)

if reflect.DeepEqual(keysetHandle, keySetHandleDecrypted) {
log.Fatal("[-] Key saved and loaded are different!!!")
}

// Get yk serial number and timestamp to create a unique name key
ykSerial, err := ym.yk.Serial()
if err != nil {
log.Fatal("[-] Cannot get the yubikey serial number" + err.Error())
Expand All @@ -94,19 +105,7 @@ func GenerateAndSaveNewKeyset(destinationKeyPath string, ym *YubikeyMng) *keyset

}

keyByte := getKeysetByte(keysetHandle)

encryptedKey := ym.PivEncrypt(keyByte)
file_mng.CreateAndWriteNewFile(destinationKeyPath, encryptedKey)

// Check if the keyset has been correctly saved by loading and comparing it
keyContent := file_mng.ReadFile(destinationKeyPath)
decryptedKey := ym.PivDecrypt(keyContent)
keySetHandleDecrypted := getKeysetHandleFromByte(decryptedKey)

if reflect.DeepEqual(keysetHandle, keySetHandleDecrypted) {
log.Fatal("[-] Key saved and loaded are different!!!")
}

return keysetHandle
}
4 changes: 4 additions & 0 deletions internal/file_mng/file.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ func IsStringFile(name string) bool {

ext := filepath.Ext(name)

if ext == "." {
return false
}

return len(ext) != 0
}

Expand Down

0 comments on commit 71b1224

Please sign in to comment.