← Back to branch summary

~ubuntu-branches/ubuntu/saucy/m2crypto/saucy

« back to all changes in this revision

Viewing changes to M2Crypto/SSL/Session.py

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2009-11-06 01:28:39 UTC
  • mfrom: (2.2.5 sid)
  • Revision ID: james.westby@ubuntu.com-20091106012839-zjjugwmj8zggokqh
Tags: 0.20.1-1ubuntu1
https://launchpad.net/bugs/451998
* Merge from debian testing, remaining changes:
  - debian/rules; enable testsuite, add more files to "clean" rule.
  - tests/test_ssl.py: use signal 9 to kill old s_server processes
    to work around build HUP signal-ignore-mask (LP: #451998).

Show diffs side-by-side

added added

removed removed

Lines of Context:
M2Crypto/SSL/Session.py
1
 
"""Copyright (c) 1999-2003 Ng Pheng Siong. All rights reserved."""
 
1
"""SSL Session
 
2
 
 
3
Copyright (c) 1999-2003 Ng Pheng Siong. All rights reserved."""
 
4
 
 
5
__all__ = ['Session', 'load_session']
2
6
 
3
7
from M2Crypto import BIO, Err, m2
4
8
 
49
53
    cptr = m2.ssl_session_read_pem(f.bio_ptr())
50
54
    f.close()
51
55
    if cptr is None:
52
 
        raise Err.get_error()
 
56
        from M2Crypto.SSL import SSLError
 
57
        raise SSLError(Err.get_error())
53
58
    return Session(cptr, 1)
54
 
 
55