* Refactor library, remove duplicates * Rebuild structure to use Messages and Signature models * Use PGPSplitMessage * Remove signature model * Various fixes * Add helpers with tests * Fixes, add some docs, add tests * Add attachment helpers * Add helpers Symmetric encryption * Edit docs + examples * Rename kr to keyRing * Various fixes for documentation * Edit JSON handling functions, add decrypt keyring via token * Add proposal changes doc * Fix CI * Drop *Message functions, join CleartextMessage and BinaryMessage * Change canonicalization and trimming only to text signatures * Add cleartextsignature, detach signature from message model, move helpers * Documentation, remove optional parameters * Move verification to separate model * Don't return message in VerifyDetached * Update table of contents in readme * Appease golint * Run go fmt * Rename Encrypt/DecryptMessageWithPassword to ..WithToken These functions shouldn't be used with user-provided passwords, as they don't do any key-stretching. * Change key generation usernames
101 lines
2.6 KiB
Go
101 lines
2.6 KiB
Go
package crypto
|
|
|
|
import (
|
|
"bytes"
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
|
|
"golang.org/x/crypto/openpgp"
|
|
"golang.org/x/crypto/openpgp/packet"
|
|
)
|
|
|
|
// RandomToken generated a random token of the same size of the keysize of the default cipher.
|
|
func (pgp *GopenPGP) RandomToken() ([]byte, error) {
|
|
config := &packet.Config{DefaultCipher: packet.CipherAES256}
|
|
return pgp.RandomTokenSize(config.DefaultCipher.KeySize())
|
|
}
|
|
|
|
// RandomTokenSize generates a random token with the specified key size
|
|
func (pgp *GopenPGP) RandomTokenSize(size int) ([]byte, error) {
|
|
config := &packet.Config{DefaultCipher: packet.CipherAES256}
|
|
symKey := make([]byte, size)
|
|
if _, err := io.ReadFull(config.Random(), symKey); err != nil {
|
|
return nil, err
|
|
}
|
|
return symKey, nil
|
|
}
|
|
|
|
// DecryptSessionKey returns the decrypted session key from a binary encrypted session key packet.
|
|
func (keyRing *KeyRing) DecryptSessionKey(keyPacket []byte) (*SymmetricKey, error) {
|
|
keyReader := bytes.NewReader(keyPacket)
|
|
packets := packet.NewReader(keyReader)
|
|
|
|
var p packet.Packet
|
|
var err error
|
|
if p, err = packets.Next(); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
ek := p.(*packet.EncryptedKey)
|
|
var decryptErr error
|
|
for _, key := range keyRing.entities.DecryptionKeys() {
|
|
priv := key.PrivateKey
|
|
if priv.Encrypted {
|
|
continue
|
|
}
|
|
|
|
if decryptErr = ek.Decrypt(priv, nil); decryptErr == nil {
|
|
break
|
|
}
|
|
}
|
|
|
|
if decryptErr != nil {
|
|
return nil, decryptErr
|
|
}
|
|
|
|
if ek == nil {
|
|
return nil, errors.New("gopenpgp: unable to decrypt session key")
|
|
}
|
|
|
|
return newSymmetricKeyFromEncrypted(ek)
|
|
}
|
|
|
|
// EncryptSessionKey encrypts the session key with the unarmored
|
|
// publicKey and returns a binary public-key encrypted session key packet.
|
|
func (keyRing *KeyRing) EncryptSessionKey(sessionSplit *SymmetricKey) ([]byte, error) {
|
|
outbuf := &bytes.Buffer{}
|
|
|
|
cf := sessionSplit.GetCipherFunc()
|
|
|
|
var pub *packet.PublicKey
|
|
for _, e := range keyRing.GetEntities() {
|
|
for _, subKey := range e.Subkeys {
|
|
if !subKey.Sig.FlagsValid || subKey.Sig.FlagEncryptStorage || subKey.Sig.FlagEncryptCommunications {
|
|
pub = subKey.PublicKey
|
|
break
|
|
}
|
|
}
|
|
if pub == nil && len(e.Identities) > 0 {
|
|
var i *openpgp.Identity
|
|
for _, i = range e.Identities {
|
|
break
|
|
}
|
|
if i.SelfSignature.FlagsValid || i.SelfSignature.FlagEncryptStorage || i.SelfSignature.FlagEncryptCommunications {
|
|
pub = e.PrimaryKey
|
|
}
|
|
}
|
|
if pub != nil {
|
|
break
|
|
}
|
|
}
|
|
if pub == nil {
|
|
return nil, errors.New("cannot set key: no public key available")
|
|
}
|
|
|
|
if err := packet.SerializeEncryptedKey(outbuf, pub, cf, sessionSplit.Key, nil); err != nil {
|
|
err = fmt.Errorf("gopenpgp: cannot set key: %v", err)
|
|
return nil, err
|
|
}
|
|
return outbuf.Bytes(), nil
|
|
}
|