aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-11-24 17:35:06 -0600
committerAlex Gaynor <alex.gaynor@gmail.com>2014-11-24 17:35:06 -0600
commited80d55b222f87dfb58e368f9211cc727951c746 (patch)
tree50fcfd52edad25aa7acbdd73952c667423d523e6
parent04a3f1f2c4086c0d7162b6dd79b6332d9115b2c0 (diff)
parentdf13573c3ba87821d34d05ab3d6a309aaabfa90b (diff)
downloadcryptography-ed80d55b222f87dfb58e368f9211cc727951c746.tar.gz
cryptography-ed80d55b222f87dfb58e368f9211cc727951c746.tar.bz2
cryptography-ed80d55b222f87dfb58e368f9211cc727951c746.zip
Merge pull request #1492 from reaperhulk/add-cc-binding
Add SecItemExport CC Binding
-rw-r--r--src/cryptography/hazmat/bindings/commoncrypto/cf.py2
-rw-r--r--src/cryptography/hazmat/bindings/commoncrypto/secimport.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/cryptography/hazmat/bindings/commoncrypto/cf.py b/src/cryptography/hazmat/bindings/commoncrypto/cf.py
index 6a6dbc4a..77d2d7cc 100644
--- a/src/cryptography/hazmat/bindings/commoncrypto/cf.py
+++ b/src/cryptography/hazmat/bindings/commoncrypto/cf.py
@@ -16,7 +16,7 @@ typedef uint32_t UInt32;
typedef const void * CFAllocatorRef;
const CFAllocatorRef kCFAllocatorDefault;
-typedef const void * CFDataRef;
+typedef ... *CFDataRef;
typedef signed long long CFIndex;
typedef ... *CFStringRef;
typedef ... *CFArrayRef;
diff --git a/src/cryptography/hazmat/bindings/commoncrypto/secimport.py b/src/cryptography/hazmat/bindings/commoncrypto/secimport.py
index 7ee535d8..41a799f9 100644
--- a/src/cryptography/hazmat/bindings/commoncrypto/secimport.py
+++ b/src/cryptography/hazmat/bindings/commoncrypto/secimport.py
@@ -75,6 +75,8 @@ OSStatus SecItemImport(CFDataRef, CFStringRef, SecExternalFormat *,
const SecItemImportExportKeyParameters *,
SecKeychainRef, CFArrayRef *);
OSStatus SecPKCS12Import(CFDataRef, CFDictionaryRef, CFArrayRef *);
+OSStatus SecItemExport(CFTypeRef, SecExternalFormat, SecItemImportExportFlags,
+ const SecItemImportExportKeyParameters *, CFDataRef *);
"""
MACROS = """