diff options
Diffstat (limited to 'src/_cffi_src/openssl')
| -rw-r--r-- | src/_cffi_src/openssl/aes.py | 11 | ||||
| -rw-r--r-- | src/_cffi_src/openssl/asn1.py | 4 | ||||
| -rw-r--r-- | src/_cffi_src/openssl/bio.py | 1 | 
3 files changed, 11 insertions, 5 deletions
diff --git a/src/_cffi_src/openssl/aes.py b/src/_cffi_src/openssl/aes.py index 8a5d0471..438431b5 100644 --- a/src/_cffi_src/openssl/aes.py +++ b/src/_cffi_src/openssl/aes.py @@ -10,6 +10,7 @@ INCLUDES = """  TYPES = """  static const int Cryptography_HAS_AES_WRAP; +static const int Cryptography_HAS_AES_CTR128_ENCRYPT;  struct aes_key_st {      ...; @@ -50,5 +51,13 @@ int (*AES_wrap_key)(AES_KEY *, const unsigned char *, unsigned char *,  int (*AES_unwrap_key)(AES_KEY *, const unsigned char *, unsigned char *,                        const unsigned char *, unsigned int) = NULL;  #endif - +#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) +static const int Cryptography_HAS_AES_CTR128_ENCRYPT = 0; +void (*AES_ctr128_encrypt)(const unsigned char *, unsigned char *, +                           const size_t, const AES_KEY *, +                           unsigned char[], unsigned char[], +                           unsigned int *) = NULL; +#else +static const int Cryptography_HAS_AES_CTR128_ENCRYPT = 1; +#endif  """ diff --git a/src/_cffi_src/openssl/asn1.py b/src/_cffi_src/openssl/asn1.py index 30bd2451..5d45c583 100644 --- a/src/_cffi_src/openssl/asn1.py +++ b/src/_cffi_src/openssl/asn1.py @@ -24,6 +24,7 @@ struct asn1_string_st {  typedef struct asn1_string_st ASN1_OCTET_STRING;  typedef struct asn1_string_st ASN1_IA5STRING;  typedef struct asn1_string_st ASN1_BIT_STRING; +typedef struct asn1_string_st ASN1_TIME;  typedef ... ASN1_OBJECT;  typedef struct asn1_string_st ASN1_STRING;  typedef struct asn1_string_st ASN1_UTF8STRING; @@ -33,9 +34,6 @@ typedef ... ASN1_ENUMERATED;  typedef ... ASN1_ITEM;  typedef ... ASN1_VALUE; -typedef struct { -    ...; -} ASN1_TIME;  typedef ... ASN1_ITEM_EXP;  typedef ... ASN1_UTCTIME; diff --git a/src/_cffi_src/openssl/bio.py b/src/_cffi_src/openssl/bio.py index 6439e63a..c032f72a 100644 --- a/src/_cffi_src/openssl/bio.py +++ b/src/_cffi_src/openssl/bio.py @@ -113,7 +113,6 @@ long BIO_callback_ctrl(      int,      void (*)(struct bio_st *, int, const char *, int, long, long)  ); -char *BIO_ptr_ctrl(BIO *, int, long);  long BIO_int_ctrl(BIO *, int, long, int);  size_t BIO_ctrl_pending(BIO *);  size_t BIO_ctrl_wpending(BIO *);  | 
