~myers-1/pyopenssl/npn

« back to all changes in this revision

Viewing changes to src/crypto/crypto.c

  • 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:
12
12
#include <Python.h>
13
13
#define crypto_MODULE
14
14
#include "crypto.h"
 
15
#include "pkcs12.h"
15
16
 
16
17
static char crypto_doc[] = "\n\
17
18
Main file of crypto sub module.\n\
540
541
static PyObject *
541
542
crypto_load_pkcs12(PyObject *spam, PyObject *args)
542
543
{
543
 
    crypto_PKCS12Obj *crypto_PKCS12_New(PKCS12 *, char *);
544
544
    int len;
545
545
    char *buffer, *passphrase = NULL;
546
546
    BIO *bio;