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

Android stable version

Browse source
This commit is contained in:
Jakub Lehotsky 2018-11-09 02:08:39 +01:00
parent 3fe6899fbb
commit 984f8eb391
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crypto/message.go
View file

@ -38,9 +38,9 @@ func (pm *PmCrypto) DecryptMessageStringKey(encryptedText string, privateKey str
// encryptedText : string armored encrypted // encryptedText : string armored encrypted
// privateKey : unarmored private use to decrypt message could be mutiple keys // privateKey : unarmored private use to decrypt message could be mutiple keys
// passphrase : match with private key to decrypt message // passphrase : match with private key to decrypt message
func (kr *KeyRing) DecryptMessage(encryptedText string, passphrase string) (string, error) { func (pm *PmCrypto) DecryptMessage(encryptedText string, privateKey *KeyRing, passphrase string) (string, error) {
md, err := pm.decryptCore(encryptedText, nil, kr.entities, passphrase, pm.getTimeGenerator()) md, err := decryptCore(encryptedText, nil, privateKey.entities, passphrase, pm.getTimeGenerator())
if err != nil { if err != nil {
return "", err return "", err
} }
@ -62,7 +62,7 @@ func (pm *PmCrypto) DecryptMessageVerify(encryptedText string, verifierKey []byt
return pm.decryptMessageVerify(encryptedText, verifierKey, privateKeysRing, passphrase, verifyTime) return pm.decryptMessageVerify(encryptedText, verifierKey, privateKeysRing, passphrase, verifyTime)
} }
func (pm *PmCrypto) decryptCore(encryptedText string, additionalEntries openpgp.EntityList, privKeyEntries openpgp.EntityList, passphrase string, timeFunc func() time.Time) (*openpgp.MessageDetails, error) { func decryptCore(encryptedText string, additionalEntries openpgp.EntityList, privKeyEntries openpgp.EntityList, passphrase string, timeFunc func() time.Time) (*openpgp.MessageDetails, error) {
rawPwd := []byte(passphrase) rawPwd := []byte(passphrase)
for _, e := range privKeyEntries { for _, e := range privKeyEntries {
@ -116,7 +116,7 @@ func (pm *PmCrypto) decryptMessageVerify(encryptedText string, verifierKey []byt
out.Verify = noVerifier out.Verify = noVerifier
} }
md, err := pm.decryptCore(encryptedText, verifierEntries, privateKeyRing.entities, passphrase, func() time.Time { return time.Unix(0, 0) }) // TODO: I doubt this time is correct md, err := decryptCore(encryptedText, verifierEntries, privateKeyRing.entities, passphrase, func() time.Time { return time.Unix(0, 0) }) // TODO: I doubt this time is correct
decrypted := md.UnverifiedBody decrypted := md.UnverifiedBody
b, err := ioutil.ReadAll(decrypted) b, err := ioutil.ReadAll(decrypted)