Skip to content
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

Added option to return Enveloped data as bytes as well as strings. #19

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

Added option to return Enveloped data as bytes as well as strings. #19

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
15 changes: 14 additions & 1 deletion ctypescrypto/cms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,15 @@ def __str__(self):
raise CMSError("writing CMS to DER")
return str(bio)

def __bytes__(self):
"""
Serialize in DER format. Return bytes
"""
bio = Membio()
if not libcrypto.i2d_CMS_bio(bio.bio, self.ptr):
raise CMSError("writing CMS to DER")
return bytes(bio)

def pem(self):
"""
Serialize in PEM format
Expand Down Expand Up @@ -312,7 +321,11 @@ def decrypt(self, pkey, cert, flags=0):
bio.bio, flags)
if res <= 0:
raise CMSError("decrypting CMS")
return str(bio)

if flags & Flags.BINARY != 0: ## If we are expecting binary data
return bytes(bio) # we return bytes
else:
return str(bio) # else we return a string

class EncryptedData(CMSBase):
"""
Expand Down