~myers-1/pyopenssl/npn

« back to all changes in this revision

Viewing changes to src/crypto/pkcs12.h

  • Committer: Jean-Paul Calderone
  • Date: 2010-01-25 22:55:30 UTC
  • mfrom: (126 trunk)
  • mto: This revision was merged to the branch mainline in revision 129.
  • Revision ID: exarkun@divmod.com-20100125225530-5e9nsb6bzoesoz42
merge trunk and resolve simple conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
22
22
 
23
23
typedef struct {
24
24
    PyObject_HEAD
 
25
    /*
 
26
     * These either refer to a PyObject* of the appropriate type, or Py_None if
 
27
     * they don't have a value.  They aren't set to NULL except during
 
28
     * finalization.
 
29
     */
25
30
    PyObject            *cert;
26
31
    PyObject            *key;
27
32
    PyObject            *cacerts;
 
33
    PyObject            *friendlyname;
28
34
} crypto_PKCS12Obj;
29
35
 
 
36
crypto_PKCS12Obj *
 
37
crypto_PKCS12_New(PKCS12 *p12, char *passphrase);
 
38
 
30
39
#endif