diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2018-11-13 07:46:34 -0500 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2018-11-13 07:46:34 -0500 |
| commit | b5d07b7f723ca101bbe4b78584df367c014eed96 (patch) | |
| tree | 9d4c581fce321b9e29576805b09bd8d283cb0dc5 /src/_cffi_src | |
| parent | fd64302f08dfb3a296f6da7ec3286872b1d9fce3 (diff) | |
| download | cryptography-b5d07b7f723ca101bbe4b78584df367c014eed96.tar.gz cryptography-b5d07b7f723ca101bbe4b78584df367c014eed96.tar.bz2 cryptography-b5d07b7f723ca101bbe4b78584df367c014eed96.zip | |
Ed bindings (#4586)
* add evp_pkey_ed25519
* ed448 bindings
Diffstat (limited to 'src/_cffi_src')
| -rw-r--r-- | src/_cffi_src/openssl/evp.py | 14 | ||||
| -rw-r--r-- | src/_cffi_src/openssl/nid.py | 7 |
2 files changed, 21 insertions, 0 deletions
diff --git a/src/_cffi_src/openssl/evp.py b/src/_cffi_src/openssl/evp.py index 84b91086..3c10aabf 100644 --- a/src/_cffi_src/openssl/evp.py +++ b/src/_cffi_src/openssl/evp.py @@ -22,7 +22,9 @@ static const int EVP_PKEY_DH; static const int EVP_PKEY_DHX; static const int EVP_PKEY_EC; static const int EVP_PKEY_X25519; +static const int EVP_PKEY_ED25519; static const int EVP_PKEY_X448; +static const int EVP_PKEY_ED448; static const int EVP_MAX_MD_SIZE; static const int EVP_CTRL_AEAD_SET_IVLEN; static const int EVP_CTRL_AEAD_GET_TAG; @@ -298,4 +300,16 @@ static const long Cryptography_HAS_RAW_KEY = 1; #ifndef EVP_PKEY_X448 #define EVP_PKEY_X448 NID_X448 #endif + +/* This is tied to ED25519 support so we reuse the Cryptography_HAS_ED25519 + conditional to remove it. */ +#ifndef EVP_PKEY_ED25519 +#define EVP_PKEY_ED25519 NID_ED25519 +#endif + +/* This is tied to ED448 support so we reuse the Cryptography_HAS_ED448 + conditional to remove it. */ +#ifndef EVP_PKEY_ED448 +#define EVP_PKEY_ED448 NID_ED448 +#endif """ diff --git a/src/_cffi_src/openssl/nid.py b/src/_cffi_src/openssl/nid.py index 226229e9..bf445aa8 100644 --- a/src/_cffi_src/openssl/nid.py +++ b/src/_cffi_src/openssl/nid.py @@ -11,6 +11,7 @@ INCLUDES = """ TYPES = """ static const int Cryptography_HAS_X25519; static const int Cryptography_HAS_X448; +static const int Cryptography_HAS_ED448; static const int Cryptography_HAS_ED25519; static const int NID_undef; @@ -249,4 +250,10 @@ static const int NID_X448 = 0; #else static const long Cryptography_HAS_X448 = 1; #endif +#ifndef NID_ED448 +static const long Cryptography_HAS_ED448 = 0; +static const int NID_ED448 = 0; +#else +static const long Cryptography_HAS_ED448 = 1; +#endif """ |