lysann/passforios-gopenpgp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #139 from T4cC0re/master

Browse source 
Disregard GNU dummy subkeys when checking (un)locked state and unlocking a crypto.Key
This commit is contained in:
wussler 2021-07-30 14:49:41 +02:00 • committed by GitHub
commit a3d8ed70c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

26
crypto/key.go
View file

@ -156,7 +156,7 @@ func (key *Key) Unlock(passphrase []byte) (*Key, error) {
}
for _, sub := range unlockedKey.entity.Subkeys {
if sub.PrivateKey != nil {
if sub.PrivateKey != nil && !sub.PrivateKey.Dummy() {
if err := sub.PrivateKey.Decrypt(passphrase); err != nil {
return nil, errors.Wrap(err, "gopenpgp: error in unlocking sub key")
}
@ -280,13 +280,19 @@ func (key *Key) IsLocked() (bool, error) {
return true, errors.New("gopenpgp: a public key cannot be locked")
}
encryptedKeys := 0
for _, sub := range key.entity.Subkeys {
if sub.PrivateKey != nil && !sub.PrivateKey.Encrypted {
return false, nil
if sub.PrivateKey != nil && !sub.PrivateKey.Dummy() && sub.PrivateKey.Encrypted {
encryptedKeys++
}
}
return key.entity.PrivateKey.Encrypted, nil
if key.entity.PrivateKey.Encrypted {
encryptedKeys++
}
return encryptedKeys > 0, nil
}
// IsUnlocked checks if a private key is unlocked.
@ -295,13 +301,19 @@ func (key *Key) IsUnlocked() (bool, error) {
return true, errors.New("gopenpgp: a public key cannot be unlocked")
}
encryptedKeys := 0
for _, sub := range key.entity.Subkeys {
if sub.PrivateKey != nil && sub.PrivateKey.Encrypted {
return false, nil
if sub.PrivateKey != nil && !sub.PrivateKey.Dummy() && sub.PrivateKey.Encrypted {
encryptedKeys++
}
}
return !key.entity.PrivateKey.Encrypted, nil
if key.entity.PrivateKey.Encrypted {
encryptedKeys++
}
return encryptedKeys == 0, nil
}
// Check verifies if the public keys match the private key parameters by