bcollet/apc-p15-tool
1
0
Fork 0
mirror of https://github.com/gregtwallace/apc-p15-tool.git synced 2025-01-22 08:14:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

minor envelope reorg

Browse source
This commit is contained in:
Greg T. Wallace 2024-03-17 13:45:55 -04:00
parent 02bc7c1239
commit 15c6c6488e
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkg/pkcs15/encrypted_envelope.go
View file

@ -120,9 +120,6 @@ func (p15 *pkcs15KeyCert) encryptedKeyEnvelope() ([]byte, error) {
encryptedContent := make([]byte, len(content)) encryptedContent := make([]byte, len(content))
contentEncrypter.CryptBlocks(encryptedContent, content) contentEncrypter.CryptBlocks(encryptedContent, content)
// encrypted content MAC
macKey := pbkdf2.Key(cek, []byte("authentication"), 1, 32, sha1.New)
// data encryption alg block // data encryption alg block
encAlgObj := asn1obj.Sequence([][]byte{ encAlgObj := asn1obj.Sequence([][]byte{
// ContentEncryptionAlgorithmIdentifier // ContentEncryptionAlgorithmIdentifier
@ -144,6 +141,9 @@ func (p15 *pkcs15KeyCert) encryptedKeyEnvelope() ([]byte, error) {
}), }),
}) })
// encrypted content MAC
macKey := pbkdf2.Key(cek, []byte("authentication"), 1, 32, sha1.New)
macHasher := hmac.New(sha256.New, macKey) macHasher := hmac.New(sha256.New, macKey)
// the data the MAC covers is the algId header bytes + encrypted data bytes // the data the MAC covers is the algId header bytes + encrypted data bytes
hashMe := append(encAlgObj, encryptedContent...) hashMe := append(encAlgObj, encryptedContent...)