From 010bce285235da6fb0653b2b31ea3fabf34f1da4 Mon Sep 17 00:00:00 2001 From: ashfall Date: Thu, 1 May 2014 09:05:51 -0700 Subject: Add some functions from DH docs --- cryptography/hazmat/bindings/openssl/dh.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/cryptography/hazmat/bindings/openssl/dh.py b/cryptography/hazmat/bindings/openssl/dh.py index 1791a670..d1cfaa46 100644 --- a/cryptography/hazmat/bindings/openssl/dh.py +++ b/cryptography/hazmat/bindings/openssl/dh.py @@ -34,9 +34,21 @@ typedef struct dh_st { FUNCTIONS = """ DH *DH_new(void); void DH_free(DH *); +int DH_size(const DH *); +DH *DH_generate_parameters(int, int, void (*)(int, int, void *), void *); +int DH_check(const DH *, int *); +int DH_generate_key(DH *); +int DH_compute_key(unsigned char *, BIGNUM *, DH *); +int DH_set_ex_data(DH *, int, char *); +char *DH_get_ex_data(DH *, int); +DH *d2iDHparams(DH **, unsigned char **, long); +int i2d_DHparams(const DH *, unsigned char **); +int DHparams_print_fp(FILE *, const DH *); +int DHparams_print(BIO *, const DH *); """ MACROS = """ +int DH_generate_parameters_ex(DH *, int, int, BN_GENCB *); """ CUSTOMIZATIONS = """ -- cgit v1.2.3 From 2d6ea66a5ef078ec000dee05ba855ee5e22fbd6c Mon Sep 17 00:00:00 2001 From: ashfall Date: Thu, 1 May 2014 09:59:33 -0700 Subject: Address review comments, fix signatures that the docs lied about --- cryptography/hazmat/bindings/openssl/dh.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cryptography/hazmat/bindings/openssl/dh.py b/cryptography/hazmat/bindings/openssl/dh.py index d1cfaa46..ea965f1f 100644 --- a/cryptography/hazmat/bindings/openssl/dh.py +++ b/cryptography/hazmat/bindings/openssl/dh.py @@ -38,9 +38,9 @@ int DH_size(const DH *); DH *DH_generate_parameters(int, int, void (*)(int, int, void *), void *); int DH_check(const DH *, int *); int DH_generate_key(DH *); -int DH_compute_key(unsigned char *, BIGNUM *, DH *); -int DH_set_ex_data(DH *, int, char *); -char *DH_get_ex_data(DH *, int); +int DH_compute_key(unsigned char *, const BIGNUM *, DH *); +int DH_set_ex_data(DH *, int, void *); +void *DH_get_ex_data(DH *, int); DH *d2iDHparams(DH **, unsigned char **, long); int i2d_DHparams(const DH *, unsigned char **); int DHparams_print_fp(FILE *, const DH *); -- cgit v1.2.3 From 0450a14ae5028cc2bf1a57d5924090bda5e91a1d Mon Sep 17 00:00:00 2001 From: ashfall Date: Thu, 1 May 2014 10:04:04 -0700 Subject: Fix another function signature --- cryptography/hazmat/bindings/openssl/dh.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cryptography/hazmat/bindings/openssl/dh.py b/cryptography/hazmat/bindings/openssl/dh.py index ea965f1f..a0f99479 100644 --- a/cryptography/hazmat/bindings/openssl/dh.py +++ b/cryptography/hazmat/bindings/openssl/dh.py @@ -41,7 +41,7 @@ int DH_generate_key(DH *); int DH_compute_key(unsigned char *, const BIGNUM *, DH *); int DH_set_ex_data(DH *, int, void *); void *DH_get_ex_data(DH *, int); -DH *d2iDHparams(DH **, unsigned char **, long); +DH *d2i_DHparams(DH **, const unsigned char **, long); int i2d_DHparams(const DH *, unsigned char **); int DHparams_print_fp(FILE *, const DH *); int DHparams_print(BIO *, const DH *); -- cgit v1.2.3