aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlex Stapleton <alex@ly.st>2015-03-06 11:48:04 +0000
committerAlex Stapleton <alex@ly.st>2015-03-06 11:48:04 +0000
commitf19cf0793869a44ff4241c18ca2e25bd67643105 (patch)
tree114dc05fbb115f0ceffbb7641b462186c7c3bd8d /src
parent0be6ddcadda45177dc082f1714f2edf7c0e30993 (diff)
downloadcryptography-f19cf0793869a44ff4241c18ca2e25bd67643105.tar.gz
cryptography-f19cf0793869a44ff4241c18ca2e25bd67643105.tar.bz2
cryptography-f19cf0793869a44ff4241c18ca2e25bd67643105.zip
Additional DH bindings
Diffstat (limited to 'src')
-rw-r--r--src/cryptography/hazmat/bindings/openssl/dh.py3
-rw-r--r--src/cryptography/hazmat/bindings/openssl/err.py5
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;