1 --- m2crypto-0.11/M2Crypto/SMIME.py.wiget 2002-12-23 04:48:35.000000000 +0100
2 +++ m2crypto-0.11/M2Crypto/SMIME.py 2003-09-16 13:36:00.000000000 +0200
7 -import BIO, EVP, X509, Err
8 +import BIO, EVP, X509, Err, util
11 PKCS7_TEXT = m2.PKCS7_TEXT
13 m2.smime_init(SMIME_Error)
16 - def load_key(self, keyfile, certfile=None):
17 + def load_key(self, keyfile, certfile=None, callback=util.passphrase_callback):
20 - self.pkey = EVP.load_key(keyfile)
21 + self.pkey = EVP.load_key(keyfile, callback)
22 self.x509 = X509.load_cert(certfile)
24 - def load_key_bio(self, keybio, certbio=None):
25 + def load_key_bio(self, keybio, certbio=None, callback=util.passphrase_callback):
28 - self.pkey = EVP.load_key_bio(keybio)
29 + self.pkey = EVP.load_key_bio(keybio, callback)
30 self.x509 = X509.load_cert_bio(certbio)
32 def set_x509_stack(self, stack):