Skip to content

aes hotfix #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
groob wants to merge 1 commit into
base: sha256
Choose a base branch
from
Open

aes hotfix #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion pkcs7.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,11 @@ func (p7 *PKCS7) EncryptionAlgorithm() (int, error) {
switch {
case alg.Equal(oidEncryptionAlgorithmDESCBC), alg.Equal(oidEncryptionAlgorithmDESEDE3CBC):
return EncryptionAlgorithmDESCBC, nil
case alg.Equal(oidEncryptionAlgorithmAES256CBC), alg.Equal(oidEncryptionAlgorithmAES128GCM), alg.Equal(oidEncryptionAlgorithmAES128CBC):
case alg.Equal(oidEncryptionAlgorithmAES256CBC), alg.Equal(oidEncryptionAlgorithmAES128CBC):
// TODO: we fallback to DESCBC here because iOS and macOS is happy with that.
// a CBC variant should be implemented in https://github.com/groob/pkcs7/blob/9cd374b2a0fc58c461b5b28d6b147fde5027c91f/pkcs7.go#L964-L973
return EncryptionAlgorithmDESCBC, nil
case alg.Equal(oidEncryptionAlgorithmAES128GCM):
return EncryptionAlgorithmAES128GCM, nil
default:
return 0, ErrUnsupportedAlgorithm
Expand Down