diff options
author | David Reid <dreid@dreid.org> | 2013-10-19 11:29:07 -0700 |
---|---|---|
committer | David Reid <dreid@dreid.org> | 2013-10-19 11:29:07 -0700 |
commit | 1ceee6937eabe566e8d94da91b2122b128163cf5 (patch) | |
tree | 05b7395f886a94adf49f3e2c35537805e5f07f32 | |
parent | 64fdae0e0abf45d35bd219175f8253f031081801 (diff) | |
parent | bf96bf9d71f432f2db75b0c62b49098235d75661 (diff) | |
download | cryptography-1ceee6937eabe566e8d94da91b2122b128163cf5.tar.gz cryptography-1ceee6937eabe566e8d94da91b2122b128163cf5.tar.bz2 cryptography-1ceee6937eabe566e8d94da91b2122b128163cf5.zip |
Merge pull request #139 from alex/pkcs12-fix
Move these to macros, the exact type of these functions changes by deifn...
-rw-r--r-- | cryptography/bindings/openssl/pkcs12.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cryptography/bindings/openssl/pkcs12.py b/cryptography/bindings/openssl/pkcs12.py index 92e3b12f..5c002b93 100644 --- a/cryptography/bindings/openssl/pkcs12.py +++ b/cryptography/bindings/openssl/pkcs12.py @@ -20,10 +20,6 @@ typedef ... PKCS12; """ FUNCTIONS = """ -int PKCS12_parse(PKCS12 *, const char *, EVP_PKEY **, X509 **, - struct stack_st_X509 **); -PKCS12 *PKCS12_create(char *, char *, EVP_PKEY *, X509 *, - struct stack_st_X509 *, int, int, int, int, int); void PKCS12_free(PKCS12 *); PKCS12 *d2i_PKCS12_bio(BIO *, PKCS12 **); @@ -31,4 +27,8 @@ int i2d_PKCS12_bio(BIO *, PKCS12 *); """ MACROS = """ +int PKCS12_parse(PKCS12 *, const char *, EVP_PKEY **, X509 **, + struct stack_st_X509 **); +PKCS12 *PKCS12_create(char *, char *, EVP_PKEY *, X509 *, + struct stack_st_X509 *, int, int, int, int, int); """ |