diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2015-03-06 08:19:15 -0500 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2015-03-06 08:19:15 -0500 |
| commit | 6b99130f2e49271cf46af0b5a5f1fa364f9b2465 (patch) | |
| tree | 85f08d3d3c58128ec5566d542544a9e11bc435c4 | |
| parent | 7bdb2d8a1f4c8837f06d7f78a04d18c6ac3e5240 (diff) | |
| parent | f19cf0793869a44ff4241c18ca2e25bd67643105 (diff) | |
| download | cryptography-6b99130f2e49271cf46af0b5a5f1fa364f9b2465.tar.gz cryptography-6b99130f2e49271cf46af0b5a5f1fa364f9b2465.tar.bz2 cryptography-6b99130f2e49271cf46af0b5a5f1fa364f9b2465.zip | |
Merge pull request #1725 from public/dh-bindings-2015
Additional DH bindings
| -rw-r--r-- | src/cryptography/hazmat/bindings/openssl/dh.py | 3 | ||||
| -rw-r--r-- | src/cryptography/hazmat/bindings/openssl/err.py | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/cryptography/hazmat/bindings/openssl/dh.py b/src/cryptography/hazmat/bindings/openssl/dh.py index 06ac6f41..6f556840 100644 --- a/src/cryptography/hazmat/bindings/openssl/dh.py +++ b/src/cryptography/hazmat/bindings/openssl/dh.py @@ -18,6 +18,9 @@ typedef struct dh_st { BIGNUM *priv_key; /* Public DH value g^x */ BIGNUM *pub_key; + /* X9.42/RFC 2631 */ + BIGNUM *q; + BIGNUM *j; ...; } DH; """ diff --git a/src/cryptography/hazmat/bindings/openssl/err.py b/src/cryptography/hazmat/bindings/openssl/err.py index ec393c1b..0ee19c9e 100644 --- a/src/cryptography/hazmat/bindings/openssl/err.py +++ b/src/cryptography/hazmat/bindings/openssl/err.py @@ -21,6 +21,7 @@ struct ERR_string_data_st { }; typedef struct ERR_string_data_st ERR_STRING_DATA; +static const int ERR_LIB_DH; static const int ERR_LIB_EVP; static const int ERR_LIB_EC; static const int ERR_LIB_PEM; @@ -95,6 +96,10 @@ static const int ASN1_R_UNSUPPORTED_TYPE; static const int ASN1_R_WRONG_TAG; static const int ASN1_R_WRONG_TYPE; +static const int DH_F_COMPUTE_KEY; + +static const int DH_R_INVALID_PUBKEY; + static const int EVP_F_AES_INIT_KEY; static const int EVP_F_D2I_PKEY; static const int EVP_F_DSA_PKEY2PKCS8; |