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

Change time global handling (#29)

Browse source 
* Reverse time

* Change time handling global

* Remove debug functions

* Remove *pgp methods
This commit is contained in:
wussler 2019-10-22 18:44:45 +02:00 • committed by GitHub
parent d398098113
commit 136c0a5495
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 154 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

26
helper/helper.go
View file

@ -7,8 +7,6 @@ import (
"github.com/ProtonMail/gopenpgp/crypto"
)
var pgp = crypto.GetGopenPGP()
// EncryptMessageWithToken encrypts a string with a passphrase using AES256
func EncryptMessageWithToken(
passphrase, plaintext string,
@ -62,7 +60,7 @@ func EncryptMessageArmored(publicKey, plaintext string) (ciphertext string, err
var message = crypto.NewPlainMessageFromString(plaintext)
if publicKeyRing, err = pgp.BuildKeyRingArmored(publicKey); err != nil {
if publicKeyRing, err = crypto.BuildKeyRingArmored(publicKey); err != nil {
return "", err
}
@ -87,11 +85,11 @@ func EncryptSignMessageArmored(
var message = crypto.NewPlainMessageFromString(plaintext)
if publicKeyRing, err = pgp.BuildKeyRingArmored(publicKey); err != nil {
if publicKeyRing, err = crypto.BuildKeyRingArmored(publicKey); err != nil {
return "", err
}
if privateKeyRing, err = pgp.BuildKeyRingArmored(privateKey); err != nil {
if privateKeyRing, err = crypto.BuildKeyRingArmored(privateKey); err != nil {
return "", err
}
@ -118,7 +116,7 @@ func DecryptMessageArmored(
var pgpMessage *crypto.PGPMessage
var message *crypto.PlainMessage
if privateKeyRing, err = pgp.BuildKeyRingArmored(privateKey); err != nil {
if privateKeyRing, err = crypto.BuildKeyRingArmored(privateKey); err != nil {
return "", err
}
@ -147,11 +145,11 @@ func DecryptVerifyMessageArmored(
var pgpMessage *crypto.PGPMessage
var message *crypto.PlainMessage
if publicKeyRing, err = pgp.BuildKeyRingArmored(publicKey); err != nil {
if publicKeyRing, err = crypto.BuildKeyRingArmored(publicKey); err != nil {
return "", err
}
if privateKeyRing, err = pgp.BuildKeyRingArmored(privateKey); err != nil {
if privateKeyRing, err = crypto.BuildKeyRingArmored(privateKey); err != nil {
return "", err
}
@ -163,7 +161,7 @@ func DecryptVerifyMessageArmored(
return "", err
}
if message, err = privateKeyRing.Decrypt(pgpMessage, publicKeyRing, pgp.GetUnixTime()); err != nil {
if message, err = privateKeyRing.Decrypt(pgpMessage, publicKeyRing, crypto.GetUnixTime()); err != nil {
return "", err
}
@ -183,11 +181,11 @@ func EncryptSignAttachment(
var binMessage = crypto.NewPlainMessage(plainData)
if publicKeyRing, err = pgp.BuildKeyRingArmored(publicKey); err != nil {
if publicKeyRing, err = crypto.BuildKeyRingArmored(publicKey); err != nil {
return nil, nil, nil, err
}
if privateKeyRing, err = pgp.BuildKeyRingArmored(privateKey); err != nil {
if privateKeyRing, err = crypto.BuildKeyRingArmored(privateKey); err != nil {
return nil, nil, nil, err
}
@ -220,11 +218,11 @@ func DecryptVerifyAttachment(
var packets = crypto.NewPGPSplitMessage(keyPacket, dataPacket)
if publicKeyRing, err = pgp.BuildKeyRingArmored(publicKey); err != nil {
if publicKeyRing, err = crypto.BuildKeyRingArmored(publicKey); err != nil {
return nil, err
}
if privateKeyRing, err = pgp.BuildKeyRingArmored(privateKey); err != nil {
if privateKeyRing, err = crypto.BuildKeyRingArmored(privateKey); err != nil {
return nil, err
}
@ -240,7 +238,7 @@ func DecryptVerifyAttachment(
return nil, err
}
if publicKeyRing.VerifyDetached(message, detachedSignature, pgp.GetUnixTime()) != nil {
if publicKeyRing.VerifyDetached(message, detachedSignature, crypto.GetUnixTime()) != nil {
return nil, errors.New("gopenpgp: unable to verify attachment")
}