X-Git-Url: https://www.wagner.pp.ru/gitweb/?a=blobdiff_plain;f=ctypescrypto%2Fcms.py;h=ede20f5e631bad5d346f90391cde2c97371985f2;hb=4507d5ef438ad37cf587f321e553f43751f70333;hp=4250cbee3ebd66f125cf38553b7b7ba10c029243;hpb=0776aa758ba8d039df88abed2e371cca1d3fb421;p=oss%2Fctypescrypto.git diff --git a/ctypescrypto/cms.py b/ctypescrypto/cms.py index 4250cbe..ede20f5 100644 --- a/ctypescrypto/cms.py +++ b/ctypescrypto/cms.py @@ -120,10 +120,10 @@ class SignedData(CMSBase): raise ValueError("Certificate doesn't match public key") bio = Membio(data) if certs is not None and len(certs) > 0: - certstack = StackOfX509(certs) + certstack = StackOfX509(certs).ptr else: certstack = None - ptr = libcrypto.CMS_sign(cert.cert, pkey.ptr, certstack, bio.bio, flags) + ptr = libcrypto.CMS_sign(cert.cert, pkey.key, certstack, bio.bio, flags) if ptr is None: raise CMSError("signing message") return SignedData(ptr) @@ -142,7 +142,7 @@ class SignedData(CMSBase): raise ValueError("Specified keypair has no private part") if cert.pubkey != pkey: raise ValueError("Certificate doesn't match public key") - if libcrypto.CMS_add1_signer(self.ptr, cert.cert, pkey.ptr, + if libcrypto.CMS_add1_signer(self.ptr, cert.cert, pkey.key, digest_type.digest, flags) is None: raise CMSError("adding signer") if flags & Flags.REUSE_DIGEST == 0: @@ -263,7 +263,7 @@ class EnvelopedData(CMSBase): if pkey != cert.pubkey: raise ValueError("Certificate doesn't match private key") bio = Membio() - res = libcrypto.CMS_decrypt(self.ptr, pkey.ptr, cert.ccert, None, + res = libcrypto.CMS_decrypt(self.ptr, pkey.key, cert.ccert, None, bio.bio, flags) if res <= 0: raise CMSError("decrypting CMS")