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

Rename conflicting methods (#20)

Browse source
This commit is contained in:
wussler 2019-08-19 12:06:30 +02:00 • committed by Daniel Huigens
parent 7e8dd9ab95
commit 4ef79f1d12
8 changed files with 21 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crypto/symmetrickey.go
View file

@ -47,12 +47,8 @@ func (symmetricKey *SymmetricKey) GetBase64Key() string {
}
func NewSymmetricKeyFromToken(passphrase, algo string) *SymmetricKey {
return NewSymmetricKey([]byte(passphrase), algo)
}
func NewSymmetricKey(key []byte, algo string) *SymmetricKey {
return &SymmetricKey{
Key: key,
Key: []byte(passphrase),
Algo: algo,
}
}
@ -69,7 +65,12 @@ func newSymmetricKeyFromEncrypted(ek *packet.EncryptedKey) (*SymmetricKey, error
return nil, fmt.Errorf("gopenpgp: unsupported cipher function: %v", ek.CipherFunc)
}
return NewSymmetricKey(ek.Key, algo), nil
symmetricKey := &SymmetricKey{
Key: ek.Key,
Algo: algo,
}
return symmetricKey, nil
}
// Encrypt encrypts a PlainMessage to PGPMessage with a SymmetricKey