aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Stapleton <alexs@prol.etari.at>2014-02-22 09:30:10 +0000
committerAlex Stapleton <alexs@prol.etari.at>2014-02-22 09:30:10 +0000
commit973fc268f73fcaed24b2324fe8b30217c35a06fd (patch)
tree45feb555c7554638710a618de2d9d0f064f160c7
parent5eed941af250567c3deed07dde4f1d741b1d2cd5 (diff)
downloadcryptography-973fc268f73fcaed24b2324fe8b30217c35a06fd.tar.gz
cryptography-973fc268f73fcaed24b2324fe8b30217c35a06fd.tar.bz2
cryptography-973fc268f73fcaed24b2324fe8b30217c35a06fd.zip
Bind X509 attribute methods for EVP_PKEYs
-rw-r--r--cryptography/hazmat/bindings/openssl/evp.py13
-rw-r--r--cryptography/hazmat/bindings/openssl/x509.py2
2 files changed, 15 insertions, 0 deletions
diff --git a/cryptography/hazmat/bindings/openssl/evp.py b/cryptography/hazmat/bindings/openssl/evp.py
index e882bb33..a5e19c3a 100644
--- a/cryptography/hazmat/bindings/openssl/evp.py
+++ b/cryptography/hazmat/bindings/openssl/evp.py
@@ -105,6 +105,19 @@ int PKCS5_PBKDF2_HMAC_SHA1(const char *, int, const unsigned char *, int, int,
int EVP_PKEY_set1_RSA(EVP_PKEY *, struct rsa_st *);
int EVP_PKEY_set1_DSA(EVP_PKEY *, struct dsa_st *);
+
+int EVP_PKEY_get_attr_count(const EVP_PKEY *);
+int EVP_PKEY_get_attr_by_NID(const EVP_PKEY *, int, int);
+int EVP_PKEY_get_attr_by_OBJ(const EVP_PKEY *, ASN1_OBJECT *, int);
+X509_ATTRIBUTE *EVP_PKEY_get_attr(const EVP_PKEY *, int);
+X509_ATTRIBUTE *EVP_PKEY_delete_attr(EVP_PKEY *, int);
+int EVP_PKEY_add1_attr(EVP_PKEY *, X509_ATTRIBUTE *);
+int EVP_PKEY_add1_attr_by_OBJ(EVP_PKEY *, const ASN1_OBJECT *, int,
+ const unsigned char *, int);
+int EVP_PKEY_add1_attr_by_NID(EVP_PKEY *, int, int,
+ const unsigned char *, int);
+int EVP_PKEY_add1_attr_by_txt(EVP_PKEY *, const char *, int,
+ const unsigned char *, int);
"""
MACROS = """
diff --git a/cryptography/hazmat/bindings/openssl/x509.py b/cryptography/hazmat/bindings/openssl/x509.py
index 93098fc7..95c88b3a 100644
--- a/cryptography/hazmat/bindings/openssl/x509.py
+++ b/cryptography/hazmat/bindings/openssl/x509.py
@@ -34,6 +34,8 @@ typedef struct {
...;
} X509_ALGOR;
+typedef ... X509_ATTRIBUTE;
+
typedef struct {
X509_ALGOR *signature;
...;